Use brand name from config in all strings

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',
     },
 };
@@ -356,12 +365,17 @@ class Analytics {
         Modal.createTrackedDialog('Analytics Details', '', ErrorDialog, {
             title: _t('Analytics'),
             description: <div className="mx_AnalyticsModal">
-                <div>
+                <div>{_t('The information being sent to us to help make %(brand)s better includes:', {
-                    { _t('The information being sent to us to help make Riot better includes:') }
+                    brand: SdkConfig.get().brand,
-                </div>
+                })}</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) =>

src/Notifier.js

@@ -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,7 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
+import SdkConfig from './SdkConfig';
 import PlatformPeg from './PlatformPeg';
 import * as TextForEvent from './TextForEvent';
 import Analytics from './Analytics';
@@ -226,10 +228,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 - ' +
+                        ? _t('%(brand)s does not have permission to send you notifications - ' +
-                            'please check your browser settings')
+                            'please check your browser settings', { brand })
-                        : _t('Riot was not given permission to send notifications - please try again');
+                        : _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'),

src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js

@@ -18,6 +18,7 @@ import React from 'react';
 import * as sdk from '../../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
+import SdkConfig from '../../../../SdkConfig';
 import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
 
 import Modal from '../../../../Modal';
@@ -134,8 +135,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 +147,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(
-                    _t( "Riot is securely caching encrypted messages locally for them " +
+                    "%(brand)s is securely caching encrypted messages locally for them " +
-                        "to appear in search results:",
+                    "to appear in search results:",
-                    )
+                    { brand },
-                }
+                )}
                 <div className='mx_SettingsTab_subsectionText'>
                     {crawlerState}<br />
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />

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>

src/components/structures/MatrixChat.tsx

@@ -1445,16 +1445,18 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             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;

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,6 +20,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../index';
 import { _t } from '../../languageHandler';
+import SdkConfig from '../../SdkConfig';
 import dis from '../../dispatcher/dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
@@ -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>

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.
@@ -25,6 +25,7 @@ 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:
+                error: (
-                    `${_t('Riot failed to get the public room list.')} ` +
+                    _t('%(brand)s failed to get the public room list.', { brand }) +
-                    `${(err && err.message) ? err.message : _t('The homeserver may be unavailable or overloaded.')}`
+                    (err && err.message) ? err.message : _t('The homeserver may be unavailable or overloaded.')
-                ,
+                ),
             });
         });
     },
@@ -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;
             }

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 {
@@ -131,6 +132,8 @@ export default class SetupEncryptionBody extends React.Component {
                 </AccessibleButton>;
             }
 
+            const brand = SdkConfig.get().brand;
+
             return (
                 <div>
                     <p>{_t(
@@ -138,17 +141,18 @@ 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>{_t("%(brand)s Web", { brand })}</div>
-                            <div>Riot Desktop</div>
+                            <div>{_t("%(brand)s Desktop", { brand })}</div>
                         </div>
                         <div className="mx_CompleteSecurity_clients_mobile">
-                            <div>Riot iOS</div>
+                            <div>{_t("%(brand)s iOS", { brand })}</div>
-                            <div>Riot X for Android</div>
+                            <div>{_t("%(brand)s X for Android", { brand })}</div>
                         </div>
                         <p>{_t("or another cross-signing capable Matrix client")}</p>
                     </div>

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.
@@ -18,9 +19,12 @@ import React from 'react';
 import * as sdk from '../../../index';
 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,9 +47,12 @@ export default (props) => {
     };
 
     const description =
-        _t("You've previously used a newer version of Riot with this session. " +
+        _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.");
+            "need to sign out and back in again.",
+            { brand },
+        );
 
     const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
     const DialogButtons = sdk.getComponent('views.elements.DialogButtons');

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>

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>

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 =
+    const brand = SdkConfig.get().brand;
-        _t("You've previously used Riot on %(host)s with lazy loading of members enabled. " +
+    const description1 = _t(
-            "In this version lazy loading is disabled. " +
+        "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. " +
-            "As the local cache is not compatible between these two settings, " +
+        "In this version lazy loading is disabled. " +
-            "Riot needs to resync your account.",
+        "As the local cache is not compatible between these two settings, " +
-            {host: props.host});
+        "%(brand)s needs to resync your account.",
-    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 " +
+            brand,
-            "lazy loading enabled and disabled simultaneously will cause issues.");
+            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}

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"
+        _t(
-        + " 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!",
+            { 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}

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>;
                                 },

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(

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>

src/components/views/right_panel/VerificationPanel.js

@@ -24,6 +24,7 @@ import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode"
 
 import VerificationQRCode from "../elements/crypto/VerificationQRCode";
 import {_t} from "../../../languageHandler";
+import SdkConfig from "../../../SdkConfig";
 import E2EIcon from "../rooms/E2EIcon";
 import {
     PHASE_UNSENT,
@@ -63,9 +64,15 @@ export default class VerificationPanel extends React.PureComponent {
         const showSAS = request.otherPartySupportsMethod(verificationMethods.SAS);
         const showQR = 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> :
+            <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') {

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.
@@ -24,6 +24,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 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({
@@ -282,6 +283,7 @@ export default createReactClass({
     },
 
     render: function() {
+        const brand = SdkConfig.get().brand;
         const Spinner = sdk.getComponent('elements.Spinner');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
@@ -398,7 +400,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 +416,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 +432,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;

src/components/views/settings/EventIndexPanel.js

@@ -17,6 +17,7 @@ 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";
@@ -121,6 +122,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 = (
@@ -165,11 +167,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 +186,14 @@ export default class EventIndexPanel extends React.Component {
             eventIndexingSettings = (
                 <div className='mx_SettingsTab_subsectionText'>
                     {
-                        _t( "Riot can't securely cache encrypted messages locally " +
+                        _t( "%(brand)s can't securely cache encrypted messages locally " +
-                            "while running in a web browser. Use <riotLink>Riot Desktop</riotLink> " +
+                            "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://riot.im/download/desktop"
                                     target="_blank" rel="noreferrer noopener">{sub}</a>,
                             },
                         )

src/components/views/settings/Notifications.js

@@ -842,11 +842,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('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(
+                        '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>

src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx

@@ -2,7 +2,6 @@
 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
@@ -18,6 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
+import SdkConfig from "../../../../../SdkConfig";
 import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
 import { enumerateThemes } from "../../../../../theme";
 import ThemeWatcher from "../../../../../settings/watchers/ThemeWatcher";
@@ -438,11 +438,13 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
     }
 
     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 Riot session.")}
+                    {_t("Appearance Settings only affect this %(brand)s session.", { brand })}
                 </div>
                 {this.renderThemeSection()}
                 {SettingsStore.isFeatureEnabled("feature_font_scaling") ? this.renderFontSection() : null}

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.
@@ -36,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) => {
@@ -148,30 +149,52 @@ export default class HelpUserSettingsTab extends React.Component {
     }
 
     render() {
-        let faqText = _t('For help with using Riot, click <a>here</a>.', {}, {
+        const brand = SdkConfig.get().brand;
-            'a': (sub) =>
+
-                <a href="https://about.riot.im/need-help/" rel="noreferrer noopener" target="_blank">{sub}</a>,
+        let faqText = _t(
-        });
+            'For help with using %(brand)s, click <a>here</a>.',
+            {
+                brand,
+            },
+            {
+                'a': (sub) => <a
+                    href="https://about.riot.im/need-help/"
+                    rel="noreferrer noopener"
+                    target="_blank"
+                >
+                    {sub}
+                </a>,
+            },
+        );
         if (SdkConfig.get().welcomeUserId && getCurrentLanguage().startsWith('en')) {
             faqText = (
                 <div>
-                    {
+                    {_t(
-                        _t('For help with using Riot, click <a>here</a> or start a chat with our ' +
+                        'For help with using %(brand)s, click <a>here</a> or start a chat with our ' +
-                            'bot using the button below.', {}, {
+                        'bot using the button below.',
-                            'a': (sub) => <a href="https://about.riot.im/need-help/" rel='noreferrer noopener'
+                        {
-                                             target='_blank'>{sub}</a>,
+                            brand,
-                        })
+                        },
-                    }
+                        {
+                            'a': (sub) => <a
+                                href="https://about.riot.im/need-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>';
@@ -228,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>

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";
@@ -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(

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,6 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
+import SdkConfig from "../../../../../SdkConfig";
 import {SettingLevel} from "../../../../../settings/SettingsStore";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as FormattingUtils from "../../../../../utils/FormattingUtils";
@@ -281,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');
@@ -355,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.")}

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,6 +17,7 @@ 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";
@@ -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);

src/i18n/strings/en_EN.json

@@ -14,22 +14,22 @@
     "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.",
@@ -114,8 +114,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",
+    "%(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",
-    "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
+    "%(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.",
@@ -320,8 +320,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",
+    "Your %(brand)s is misconfigured": "Your %(brand)s 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.",
+    "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.",
@@ -353,7 +353,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.",
@@ -390,8 +390,8 @@
     "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 Riot": "Help us improve Riot",
+    "Help us improve %(brand)s": "Help us improve %(brand)s",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. 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>.": "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",
@@ -424,8 +424,8 @@
     "What's New": "What's New",
     "Update": "Update",
     "Restart": "Restart",
-    "Upgrade your Riot": "Upgrade your Riot",
+    "Upgrade your %(brand)s": "Upgrade your %(brand)s",
-    "A new version of Riot is available!": "A new version of Riot is available!",
+    "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.",
@@ -731,8 +731,8 @@
     "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>.",
+    "%(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>.",
-    "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 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.",
@@ -785,8 +785,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",
+    "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",
+    "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",
@@ -851,7 +851,7 @@
     "Compact": "Compact",
     "Modern": "Modern",
     "Customise your appearance": "Customise your appearance",
-    "Appearance Settings only affect this Riot session.": "Appearance Settings only affect this Riot session.",
+    "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",
@@ -871,9 +871,9 @@
     "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 %(brand)s, click <a>here</a>.": "For help with using %(brand)s, 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.",
+    "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 Riot Bot": "Chat with Riot Bot",
+    "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.",
@@ -883,7 +883,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",
@@ -911,7 +911,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.",
@@ -950,11 +950,11 @@
     "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",
@@ -1189,10 +1189,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.",
+    "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 Riot.": "Share this email in Settings to receive invites directly in Riot.",
+    "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",
@@ -1374,7 +1374,7 @@
     "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.",
@@ -1494,7 +1494,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.",
@@ -1669,8 +1669,8 @@
     "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",
+    "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 Riot 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 Riot 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.": "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",
     "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.",
@@ -1711,7 +1711,7 @@
     "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.",
@@ -1731,18 +1731,18 @@
     "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.",
+    "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 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.",
+    "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!",
+    "%(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 Riot": "Updating Riot",
+    "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",
@@ -1791,7 +1791,7 @@
     "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 />.",
     "Sign out and remove encryption keys?": "Sign out and remove encryption keys?",
     "Clear Storage and Sign Out": "Clear Storage and Sign Out",
@@ -1799,7 +1799,7 @@
     "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.",
@@ -2004,8 +2004,8 @@
     "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.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, your browser is <b>not</b> able to run %(brand)s.",
-    "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.",
     "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",
@@ -2077,20 +2077,20 @@
     "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.",
+    "%(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.",
-    "Riot failed to get the public room list.": "Riot failed to get the public room list.",
+    "%(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 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?",
@@ -2099,7 +2099,7 @@
     "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",
@@ -2207,7 +2207,11 @@
     "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 X for Android": "%(brand)s X for Android",
     "or another cross-signing capable Matrix client": "or another cross-signing capable Matrix client",
     "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.",
@@ -2321,7 +2325,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:",

src/toasts/AnalyticsToast.tsx

@@ -17,6 +17,7 @@ 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";
@@ -42,14 +43,17 @@ const onUsageDataClicked = () => {
 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 Riot"),
+        title: _t("Help us improve %(brand)s", { brand }),
         props: {
             description: _t(
-                "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. " +
+                "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>

src/toasts/UpdateToast.tsx

@@ -17,6 +17,7 @@ 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";
@@ -76,11 +77,12 @@ export const showToast = (version: string, newVersion: string, releaseNotes?: st
         acceptLabel = _t("Restart");
     }
 
+    const brand = SdkConfig.get().brand;
     ToastStore.sharedInstance().addOrReplaceToast({
         key: TOAST_KEY,
-        title: _t("Upgrade your Riot"),
+        title: _t("Upgrade your %(brand)s", { brand }),
         props: {
-            description: _t("A new version of Riot is available!"),
+            description: _t("A new version of %(brand)s is available!", { brand }),
             acceptLabel,
             onAccept,
             rejectLabel: _t("Later"),

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,10 +70,14 @@ 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"

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);