Merge branch 'develop' into feature-change-password-validation

package.json

@@ -79,7 +79,7 @@
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.19",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.8",
+    "matrix-widget-api": "^0.1.0-beta.9",
     "minimist": "^1.2.5",
     "pako": "^1.0.11",
     "parse5": "^5.1.1",

res/css/_common.scss

@@ -60,6 +60,10 @@ pre, code {
     color: $accent-color;
 }
 
+.text-muted {
+    color: $muted-fg-color;
+}
+
 b {
     // On Firefox, the default weight for `<b>` is `bolder` which results in no bold
     // effect since we only have specific weights of our fonts available.
@@ -364,6 +368,11 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 .mx_Dialog_buttons {
     margin-top: 20px;
     text-align: right;
+
+    .mx_Dialog_buttons_additive {
+        // The consumer is responsible for positioning their elements.
+        float: left;
+    }
 }
 
 /* XXX: Our button style are a mess: buttons that happen to appear in dialogs get special styles applied

res/css/_components.scss

@@ -91,6 +91,7 @@
 @import "./views/dialogs/_TermsDialog.scss";
 @import "./views/dialogs/_UploadConfirmDialog.scss";
 @import "./views/dialogs/_UserSettingsDialog.scss";
+@import "./views/dialogs/_WidgetCapabilitiesPromptDialog.scss";
 @import "./views/dialogs/_WidgetOpenIDPermissionsDialog.scss";
 @import "./views/dialogs/security/_AccessSecretStorageDialog.scss";
 @import "./views/dialogs/security/_CreateCrossSigningDialog.scss";
@@ -227,6 +228,7 @@
 @import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
 @import "./views/terms/_InlineTermsAgreement.scss";
+@import "./views/toasts/_AnalyticsToast.scss";
 @import "./views/toasts/_NonUrgentEchoFailureToast.scss";
 @import "./views/verification/_VerificationShowSas.scss";
 @import "./views/voip/_CallContainer.scss";

res/css/structures/_HomePage.scss

@@ -26,9 +26,10 @@ limitations under the License.
 
 .mx_HomePage_default {
     text-align: center;
+    display: flex;
 
     .mx_HomePage_default_wrapper {
-        padding: 25vh 0 12px;
+        margin: auto;
     }
 
     img {
@@ -55,7 +56,7 @@ limitations under the License.
     }
 
     .mx_HomePage_default_buttons {
-        margin: 80px auto 0;
+        margin: 60px auto 0;
         width: fit-content;
 
         .mx_AccessibleButton {
@@ -63,7 +64,7 @@ limitations under the License.
 
             width: 160px;
             height: 132px;
-            margin: 0 20px;
+            margin: 20px;
             position: relative;
             display: inline-block;
             border-radius: 8px;

res/css/views/auth/_InteractiveAuthEntryComponents.scss

@@ -14,6 +14,35 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_InteractiveAuthEntryComponents_emailWrapper {
+    padding-right: 60px;
+    position: relative;
+    margin-top: 32px;
+    margin-bottom: 32px;
+
+    &::before, &::after {
+        position: absolute;
+        width: 116px;
+        height: 116px;
+        content: "";
+        right: -10px;
+    }
+
+    &::before {
+        background-color: rgba(244, 246, 250, 0.91);
+        border-radius: 50%;
+        top: -20px;
+    }
+
+    &::after {
+        background-image: url('$(res)/img/element-icons/email-prompt.svg');
+        background-repeat: no-repeat;
+        background-position: center;
+        background-size: contain;
+        top: -25px;
+    }
+}
+
 .mx_InteractiveAuthEntryComponents_msisdnWrapper {
     text-align: center;
 }

res/css/views/dialogs/_WidgetCapabilitiesPromptDialog.scss

@@ -0,0 +1,75 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+.mx_WidgetCapabilitiesPromptDialog {
+    .text-muted {
+        font-size: $font-12px;
+    }
+
+    .mx_Dialog_content {
+        margin-bottom: 16px;
+    }
+
+    .mx_WidgetCapabilitiesPromptDialog_cap {
+        margin-top: 20px;
+        font-size: $font-15px;
+        line-height: $font-15px;
+
+        .mx_WidgetCapabilitiesPromptDialog_byline {
+            color: $muted-fg-color;
+            margin-left: 26px;
+            font-size: $font-12px;
+            line-height: $font-12px;
+        }
+    }
+
+    .mx_Dialog_buttons {
+        margin-top: 40px; // double normal
+    }
+
+    .mx_SettingsFlag {
+        line-height: calc($font-14px + 7px + 7px); // 7px top & bottom padding
+        color: $muted-fg-color;
+        font-size: $font-12px;
+
+        .mx_ToggleSwitch {
+            display: inline-block;
+            vertical-align: middle;
+            margin-right: 8px;
+
+            // downsize the switch + ball
+            width: $font-32px;
+            height: $font-15px;
+
+
+            &.mx_ToggleSwitch_on > .mx_ToggleSwitch_ball {
+                left: calc(100% - $font-15px);
+            }
+
+            .mx_ToggleSwitch_ball {
+                width: $font-15px;
+                height: $font-15px;
+                border-radius: $font-15px;
+            }
+        }
+
+        .mx_SettingsFlag_label {
+            display: inline-block;
+            vertical-align: middle;
+        }
+    }
+}

res/css/views/messages/_MVideoBody.scss

@@ -18,5 +18,6 @@ span.mx_MVideoBody {
     video.mx_MVideoBody {
         max-width: 100%;
         height: auto;
+        border-radius: 4px;
     }
 }

res/css/views/rooms/_IRCLayout.scss

@@ -186,6 +186,7 @@ $irc-line-height: $font-18px;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 min-width: var(--name-width);
+                text-align: end;
             }
         }
     }

res/css/views/rooms/_NewRoomIntro.scss

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 .mx_NewRoomIntro {
-    margin: 80px 0 48px 64px;
+    margin: 40px 0 48px 64px;
 
     .mx_MiniAvatarUploader_hasAvatar:not(.mx_MiniAvatarUploader_busy):not(:hover) {
         &::before, &::after {

res/css/views/rooms/_RoomList.scss

@@ -33,7 +33,6 @@ limitations under the License.
 
     div:first-child {
         font-weight: $font-semi-bold;
-        margin-bottom: 8px;
     }
 
     .mx_AccessibleButton {
@@ -41,6 +40,7 @@ limitations under the License.
         position: relative;
         padding: 0 0 0 24px;
         font-size: inherit;
+        margin-top: 8px;
 
         &::before {
             content: '';
@@ -53,6 +53,13 @@ limitations under the License.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
+        }
+
+        &.mx_RoomList_explorePrompt_startChat::before {
+            mask-image: url('$(res)/img/element-icons/feedback.svg');
+        }
+
+        &.mx_RoomList_explorePrompt_explore::before {
             mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
         }
     }

res/css/views/toasts/_AnalyticsToast.scss

@@ -0,0 +1,27 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_AnalyticsToast {
+    .mx_AccessibleButton_kind_danger {
+        background: none;
+        color: $accent-color;
+    }
+
+    .mx_AccessibleButton_kind_primary {
+        background: $accent-color;
+        color: #ffffff;
+    }
+}

res/img/element-icons/email-prompt.svg

@@ -0,0 +1,13 @@
+<svg width="57" height="77" viewBox="0 0 57 77" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.55298 38.9352H4C1.79086 38.9352 0 40.726 0 42.9352V72.0304C0 74.2396 1.79086 76.0304 4 76.0304H53C55.2091 76.0304 57 74.2396 57 72.0304V42.9352C57 40.726 55.2091 38.9352 53 38.9352H51.365V41.6473H5.55298V38.9352ZM26.9753 61.3068L3.10141 43.4482C2.33137 42.8721 2.73876 41.6474 3.70041 41.6474H28.459H53.3841C54.3282 41.6474 54.7464 42.8352 54.0107 43.4268L31.8776 61.2212C30.4545 62.3653 28.4374 62.4005 26.9753 61.3068Z" fill="#8A8C8E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.5885 33.0898C48.9384 33.2156 48.2703 33.2911 47.5885 33.3119V34.706V44.4238V54.1415H49.5885V44.4238V34.706V33.0898ZM36.5604 14.2706H13.7177C10.9562 14.2706 8.71765 16.5092 8.71765 19.2706V34.706V44.4238V54.1415H10.7177V44.4238V34.706V19.2706C10.7177 17.6138 12.0608 16.2706 13.7177 16.2706H35.5616C35.8354 15.571 36.1706 14.9022 36.5604 14.2706Z" fill="#8A8C8E"/>
+<path d="M16.6589 30.5414H37.4826" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="16.2706" y1="37.8708" x2="40.6473" y2="37.8708" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="16.2706" y1="44.812" x2="40.6473" y2="44.812" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="47.2003" cy="20.8237" r="9.71771" fill="#FE2928"/>
+<rect x="45.812" y="14.5765" width="2.77649" height="8.32946" rx="1" fill="white"/>
+<rect x="45.812" y="24.2943" width="2.77649" height="2.77649" rx="1" fill="white"/>
+<line x1="27.3766" y1="1" x2="27.3766" y2="10.106" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="34.3179" y1="6.55298" x2="34.3179" y2="10.106" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="20.4354" y1="6.55298" x2="20.4354" y2="10.106" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

res/themes/dark/css/_dark.scss

@@ -274,6 +274,10 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
             background-color: #080808;
         }
     }
+
+    blockquote {
+        color: #919191;
+    }
 }
 
 // diff highlight colors

src/Modal.tsx

@@ -147,6 +147,15 @@ export class ModalManager {
         return this.appendDialogAsync<T>(...rest);
     }
 
+    public closeCurrentModal(reason: string) {
+        const modal = this.getCurrentModal();
+        if (!modal) {
+            return;
+        }
+        modal.closeReason = reason;
+        modal.close();
+    }
+
     private buildModal<T extends any[]>(
         prom: Promise<React.ComponentType>,
         props?: IProps<T>,

src/Notifier.ts

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

src/RoomInvite.js

@@ -40,11 +40,11 @@ export function inviteMultipleToRoom(roomId, addrs) {
     return inviter.invite(addrs).then(states => Promise.resolve({states, inviter}));
 }
 
-export function showStartChatInviteDialog() {
+export function showStartChatInviteDialog(initialText) {
     // This dialog handles the room creation internally - we don't need to worry about it.
     const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
     Modal.createTrackedDialog(
-        'Start DM', '', InviteDialog, {kind: KIND_DM},
+        'Start DM', '', InviteDialog, {kind: KIND_DM, initialText},
         /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
     );
 }

src/accessibility/KeyboardShortcuts.tsx

@@ -257,6 +257,12 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.SLASH,
             }],
             description: _td("Toggle this dialog"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL, Modifiers.ALT],
+                key: Key.H,
+            }],
+            description: _td("Go to Home View"),
         },
     ],
 

src/components/structures/GroupView.js

@@ -47,7 +47,7 @@ const LONG_DESC_PLACEHOLDER = _td(
     some important <a href="foo">links</a>
 </p>
 <p>
-    You can even use 'img' tags
+    You can even add images with Matrix URLs <img src="mxc://url" />
 </p>
 `);
 

src/components/structures/HomePage.tsx

@@ -31,10 +31,26 @@ import {UPDATE_EVENT} from "../../stores/AsyncStore";
 import {useEventEmitter} from "../../hooks/useEventEmitter";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import MiniAvatarUploader, {AVATAR_SIZE} from "../views/elements/MiniAvatarUploader";
+import Analytics from "../../Analytics";
+import CountlyAnalytics from "../../CountlyAnalytics";
 
-const onClickSendDm = () => dis.dispatch({action: 'view_create_chat'});
-const onClickExplore = () => dis.fire(Action.ViewRoomDirectory);
-const onClickNewRoom = () => dis.dispatch({action: 'view_create_room'});
+const onClickSendDm = () => {
+    Analytics.trackEvent('home_page', 'button', 'dm');
+    CountlyAnalytics.instance.track("home_page_button", { button: "dm" });
+    dis.dispatch({action: 'view_create_chat'});
+};
+
+const onClickExplore = () => {
+    Analytics.trackEvent('home_page', 'button', 'room_directory');
+    CountlyAnalytics.instance.track("home_page_button", { button: "room_directory" });
+    dis.fire(Action.ViewRoomDirectory);
+};
+
+const onClickNewRoom = () => {
+    Analytics.trackEvent('home_page', 'button', 'create_room');
+    CountlyAnalytics.instance.track("home_page_button", { button: "create_room" });
+    dis.dispatch({action: 'view_create_room'});
+};
 
 interface IProps {
     justRegistered?: boolean;

src/components/structures/LoggedInView.tsx

@@ -21,7 +21,7 @@ import * as PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { DragDropContext } from 'react-beautiful-dnd';
 
-import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
+import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isMac} from '../../Keyboard';
 import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
 import { fixupColorFonts } from '../../utils/FontManager';
@@ -52,6 +52,7 @@ import RoomListStore from "../../stores/room-list/RoomListStore";
 import NonUrgentToastContainer from "./NonUrgentToastContainer";
 import { ToggleRightPanelPayload } from "../../dispatcher/payloads/ToggleRightPanelPayload";
 import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
+import Modal from "../../Modal";
 import { ICollapseConfig } from "../../resizer/distributors/collapse";
 
 // We need to fetch each pinned message individually (if we don't already have it)
@@ -392,6 +393,7 @@ class LoggedInView extends React.Component<IProps, IState> {
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
         const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey;
         const isModifier = ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT;
+        const modKey = isMac ? ev.metaKey : ev.ctrlKey;
 
         switch (ev.key) {
             case Key.PAGE_UP:
@@ -436,6 +438,16 @@ class LoggedInView extends React.Component<IProps, IState> {
                 }
                 break;
 
+            case Key.H:
+                if (ev.altKey && modKey) {
+                    dis.dispatch({
+                        action: 'view_home_page',
+                    });
+                    Modal.closeCurrentModal("homeKeyboardShortcut");
+                    handled = true;
+                }
+                break;
+
             case Key.ARROW_UP:
             case Key.ARROW_DOWN:
                 if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {

src/components/structures/MatrixChat.tsx

@@ -87,38 +87,37 @@ import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
 export enum Views {
     // a special initial state which is only used at startup, while we are
     // trying to re-animate a matrix client or register as a guest.
-    LOADING = 0,
+    LOADING,
 
     // we are showing the welcome view
-    WELCOME = 1,
+    WELCOME,
 
     // we are showing the login view
-    LOGIN = 2,
+    LOGIN,
 
     // we are showing the registration view
-    REGISTER = 3,
-
-    // completing the registration flow
-    POST_REGISTRATION = 4,
+    REGISTER,
 
     // showing the 'forgot password' view
-    FORGOT_PASSWORD = 5,
+    FORGOT_PASSWORD,
 
     // showing flow to trust this new device with cross-signing
-    COMPLETE_SECURITY = 6,
+    COMPLETE_SECURITY,
 
     // flow to setup SSSS / cross-signing on this account
-    E2E_SETUP = 7,
+    E2E_SETUP,
 
     // we are logged in with an active matrix client. The logged_in state also
     // includes guests users as they too are logged in at the client level.
-    LOGGED_IN = 8,
+    LOGGED_IN,
 
     // We are logged out (invalid token) but have our local state again. The user
     // should log back in to rehydrate the client.
-    SOFT_LOGOUT = 9,
+    SOFT_LOGOUT,
 }
 
+const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas"];
+
 // Actions that are redirected through the onboarding process prior to being
 // re-dispatched. NOTE: some actions are non-trivial and would require
 // re-factoring to be included in this list in future.
@@ -562,11 +561,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 ThemeController.isLogin = true;
                 this.themeWatcher.recheck();
                 break;
-            case 'start_post_registration':
-                this.setState({
-                    view: Views.POST_REGISTRATION,
-                });
-                break;
             case 'start_password_recovery':
                 this.setStateForNewView({
                     view: Views.FORGOT_PASSWORD,
@@ -653,8 +647,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             }
             case Action.ViewRoomDirectory: {
                 const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
-                Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
-                    'mx_RoomDirectory_dialogWrapper', false, true);
+                Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
+                    initialText: payload.initialText,
+                }, 'mx_RoomDirectory_dialogWrapper', false, true);
 
                 // View the welcome or home page if we need something to look at
                 this.viewSomethingBehindModal();
@@ -677,7 +672,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.chatCreateOrReuse(payload.user_id);
                 break;
             case 'view_create_chat':
-                showStartChatInviteDialog();
+                showStartChatInviteDialog(payload.initialText || "");
                 break;
             case 'view_invite':
                 showRoomInviteDialog(payload.roomId);
@@ -1554,6 +1549,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     showScreen(screen: string, params?: {[key: string]: any}) {
+        const cli = MatrixClientPeg.get();
+        const isLoggedOutOrGuest = !cli || cli.isGuest();
+        if (!isLoggedOutOrGuest && AUTH_SCREENS.includes(screen)) {
+            // user is logged in and landing on an auth page which will uproot their session, redirect them home instead
+            dis.dispatch({ action: "view_home_page" });
+            return;
+        }
+
         if (screen === 'register') {
             dis.dispatch({
                 action: 'start_registration',
@@ -1570,7 +1573,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 params: params,
             });
         } else if (screen === 'soft_logout') {
-            if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
+            if (cli.getUserId() && !Lifecycle.isSoftLogout()) {
                 // Logged in - visit a room
                 this.viewLastRoom();
             } else {
@@ -1621,14 +1624,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             dis.dispatch({
                 action: 'view_my_groups',
             });
-        } else if (screen === 'complete_security') {
-            dis.dispatch({
-                action: 'start_complete_security',
-            });
-        } else if (screen === 'post_registration') {
-            dis.dispatch({
-                action: 'start_post_registration',
-            });
         } else if (screen.indexOf('room/') === 0) {
             // Rooms can have the following formats:
             // #room_alias:domain or !opaque_id:domain
@@ -1799,14 +1794,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         return Lifecycle.setLoggedIn(credentials);
     }
 
-    onFinishPostRegistration = () => {
-        // Don't confuse this with "PageType" which is the middle window to show
-        this.setState({
-            view: Views.LOGGED_IN,
-        });
-        this.showScreen("settings");
-    };
-
     onSendEvent(roomId: string, event: MatrixEvent) {
         const cli = MatrixClientPeg.get();
         if (!cli) {
@@ -1971,13 +1958,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     accountPassword={this.accountPassword}
                 />
             );
-        } else if (this.state.view === Views.POST_REGISTRATION) {
-            // needs to be before normal PageTypes as you are logged in technically
-            const PostRegistration = sdk.getComponent('structures.auth.PostRegistration');
-            view = (
-                <PostRegistration
-                    onComplete={this.onFinishPostRegistration} />
-            );
         } else if (this.state.view === Views.LOGGED_IN) {
             // store errors stop the client syncing and require user intervention, so we'll
             // be showing a dialog. Don't show anything else.

src/components/structures/RoomDirectory.js

@@ -44,6 +44,7 @@ function track(action) {
 
 export default class RoomDirectory extends React.Component {
     static propTypes = {
+        initialText: PropTypes.string,
         onFinished: PropTypes.func.isRequired,
     };
 
@@ -61,7 +62,7 @@ export default class RoomDirectory extends React.Component {
             error: null,
             instanceId: undefined,
             roomServer: MatrixClientPeg.getHomeserverName(),
-            filterString: null,
+            filterString: this.props.initialText || "",
             selectedCommunityId: SettingsStore.getValue("feature_communities_v2_prototypes")
                 ? selectedCommunityId
                 : null,
@@ -686,6 +687,7 @@ export default class RoomDirectory extends React.Component {
                     onJoinClick={this.onJoinFromSearchClick}
                     placeholder={placeholder}
                     showJoinButton={showJoinButton}
+                    initialText={this.props.initialText}
                 />
                 {dropdown}
             </div>;

src/components/structures/RoomSearch.tsx

@@ -148,7 +148,7 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
                 onBlur={this.onBlur}
                 onChange={this.onChange}
                 onKeyDown={this.onKeyDown}
-                placeholder={_t("Search")}
+                placeholder={_t("Filter")}
                 autoComplete="off"
             />
         );
@@ -164,7 +164,7 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
         if (this.props.isMinimized) {
             icon = (
                 <AccessibleButton
-                    title={_t("Search rooms")}
+                    title={_t("Filter rooms and people")}
                     className="mx_RoomSearch_icon mx_RoomSearch_minimizedHandle"
                     onClick={this.openSearch}
                 />

src/components/structures/RoomView.tsx

@@ -56,7 +56,6 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
 import {E2EStatus, shieldStatusForRoom} from '../../utils/ShieldUtils';
 import {Action} from "../../dispatcher/actions";
 import {SettingLevel} from "../../settings/SettingLevel";
-import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
 import {IMatrixClientCreds} from "../../MatrixClientPeg";
 import ScrollPanel from "./ScrollPanel";
 import TimelinePanel from "./TimelinePanel";
@@ -1324,10 +1323,7 @@ export default class RoomView extends React.Component<IProps, IState> {
     };
 
     private onSettingsClick = () => {
-        dis.dispatch({
-            action: Action.SetRightPanelPhase,
-            phase: RightPanelPhases.RoomSummary,
-        });
+        dis.dispatch({ action: "open_room_settings" });
     };
 
     private onCancelClick = () => {

src/components/structures/ToastContainer.tsx

@@ -55,11 +55,11 @@ export default class ToastContainer extends React.Component<{}, IState> {
         let toast;
         if (totalCount !== 0) {
             const topToast = this.state.toasts[0];
-            const {title, icon, key, component, props} = topToast;
+            const {title, icon, key, component, className, props} = topToast;
             const toastClasses = classNames("mx_Toast_toast", {
                 "mx_Toast_hasIcon": icon,
                 [`mx_Toast_icon_${icon}`]: icon,
-            });
+            }, className);
 
             let countIndicator;
             if (isStacked || this.state.countSeen > 0) {

src/components/structures/auth/PostRegistration.js

@@ -1,77 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import { _t } from '../../../languageHandler';
-import AuthPage from "../../views/auth/AuthPage";
-
-export default class PostRegistration extends React.Component {
-    static propTypes = {
-        onComplete: PropTypes.func.isRequired,
-    };
-
-    state = {
-        avatarUrl: null,
-        errorString: null,
-        busy: false,
-    };
-
-    componentDidMount() {
-        // There is some assymetry between ChangeDisplayName and ChangeAvatar,
-        // as ChangeDisplayName will auto-get the name but ChangeAvatar expects
-        // the URL to be passed to you (because it's also used for room avatars).
-        const cli = MatrixClientPeg.get();
-        this.setState({busy: true});
-        const self = this;
-        cli.getProfileInfo(cli.credentials.userId).then(function(result) {
-            self.setState({
-                avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(result.avatar_url),
-                busy: false,
-            });
-        }, function(error) {
-            self.setState({
-                errorString: _t("Failed to fetch avatar URL"),
-                busy: false,
-            });
-        });
-    }
-
-    render() {
-        const ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
-        const ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
-        const AuthHeader = sdk.getComponent('auth.AuthHeader');
-        const AuthBody = sdk.getComponent("auth.AuthBody");
-        return (
-            <AuthPage>
-                <AuthHeader />
-                <AuthBody>
-                    <div className="mx_Login_profile">
-                        { _t('Set a display name:') }
-                        <ChangeDisplayName />
-                        { _t('Upload an avatar:') }
-                        <ChangeAvatar
-                            initialAvatarUrl={this.state.avatarUrl} />
-                        <button onClick={this.props.onComplete}>{ _t('Continue') }</button>
-                        { this.state.errorString }
-                    </div>
-                </AuthBody>
-            </AuthPage>
-        );
-    }
-}

src/components/structures/auth/Registration.js

@@ -502,6 +502,11 @@ export default class Registration extends React.Component {
             return null;
         }
 
+        // Hide the server picker once the user is doing UI Auth unless encountered a fatal server error
+        if (this.state.phase !== PHASE_SERVER_DETAILS && this.state.doingUIAuth && !this.state.serverErrorIsFatal) {
+            return null;
+        }
+
         // If we're on a different phase, we only show the server type selector,
         // which is always shown if we allow custom URLs at all.
         // (if there's a fatal server error, we need to show the full server
@@ -582,17 +587,6 @@ export default class Registration extends React.Component {
                 <Spinner />
             </div>;
         } else if (this.state.flows.length) {
-            let onEditServerDetailsClick = null;
-            // If custom URLs are allowed and we haven't selected the Free server type, wire
-            // up the server details edit link.
-            if (
-                PHASES_ENABLED &&
-                !SdkConfig.get()['disable_custom_urls'] &&
-                this.state.serverType !== ServerType.FREE
-            ) {
-                onEditServerDetailsClick = this.onEditServerDetailsClick;
-            }
-
             return <RegistrationForm
                 defaultUsername={this.state.formVals.username}
                 defaultEmail={this.state.formVals.email}
@@ -600,7 +594,6 @@ export default class Registration extends React.Component {
                 defaultPhoneNumber={this.state.formVals.phoneNumber}
                 defaultPassword={this.state.formVals.password}
                 onRegisterClick={this.onFormSubmit}
-                onEditServerDetailsClick={onEditServerDetailsClick}
                 flows={this.state.flows}
                 serverConfig={this.props.serverConfig}
                 canSubmit={!this.state.serverErrorIsFatal}
@@ -686,11 +679,48 @@ export default class Registration extends React.Component {
                 { regDoneText }
             </div>;
         } else {
+            let yourMatrixAccountText = _t('Create your Matrix account on %(serverName)s', {
+                serverName: this.props.serverConfig.hsName,
+            });
+            if (this.props.serverConfig.hsNameIsDifferent) {
+                const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
+
+                yourMatrixAccountText = _t('Create your Matrix account on <underlinedServerName />', {}, {
+                    'underlinedServerName': () => {
+                        return <TextWithTooltip
+                            class="mx_Login_underlinedServerName"
+                            tooltip={this.props.serverConfig.hsUrl}
+                        >
+                            {this.props.serverConfig.hsName}
+                        </TextWithTooltip>;
+                    },
+                });
+            }
+
+            // If custom URLs are allowed, user is not doing UIA flows and they haven't selected the Free server type,
+            // wire up the server details edit link.
+            let editLink = null;
+            if (PHASES_ENABLED &&
+                !SdkConfig.get()['disable_custom_urls'] &&
+                this.state.serverType !== ServerType.FREE &&
+                !this.state.doingUIAuth
+            ) {
+                editLink = (
+                    <a className="mx_AuthBody_editServerDetails" href="#" onClick={this.onEditServerDetailsClick}>
+                        {_t('Change')}
+                    </a>
+                );
+            }
+
             body = <div>
                 <h2>{ _t('Create your account') }</h2>
                 { errorText }
                 { serverDeadSection }
                 { this.renderServerComponent() }
+                { this.state.phase !== PHASE_SERVER_DETAILS && <h3>
+                    {yourMatrixAccountText}
+                    {editLink}
+                </h3> }
                 { this.renderRegisterComponent() }
                 { goBack }
                 { signIn }

src/components/views/auth/CaptchaForm.js

@@ -102,6 +102,10 @@ export default class CaptchaForm extends React.Component {
         console.log("Loaded recaptcha script.");
         try {
             this._renderRecaptcha(DIV_ID);
+            // clear error if re-rendered
+            this.setState({
+                errorText: null,
+            });
             CountlyAnalytics.instance.track("onboarding_grecaptcha_loaded");
         } catch (e) {
             this.setState({

src/components/views/auth/InteractiveAuthEntryComponents.js

@@ -421,12 +421,12 @@ export class EmailIdentityAuthEntry extends React.Component {
             return <Spinner />;
         } else {
             return (
-                <div>
-                    <p>{ _t("An email has been sent to %(emailAddress)s",
-                        { emailAddress: (sub) => <i>{ this.props.inputs.emailAddress }</i> },
+                <div className="mx_InteractiveAuthEntryComponents_emailWrapper">
+                    <p>{ _t("A confirmation email has been sent to %(emailAddress)s",
+                        { emailAddress: (sub) => <b>{ this.props.inputs.emailAddress }</b> },
                     ) }
                     </p>
-                    <p>{ _t("Please check your email to continue registration.") }</p>
+                    <p>{ _t("Open the link in the email to continue registration.") }</p>
                 </div>
             );
         }

src/components/views/auth/RegistrationForm.js

@@ -51,7 +51,6 @@ export default class RegistrationForm extends React.Component {
         defaultUsername: PropTypes.string,
         defaultPassword: PropTypes.string,
         onRegisterClick: PropTypes.func.isRequired, // onRegisterClick(Object) => ?Promise
-        onEditServerDetailsClick: PropTypes.func,
         flows: PropTypes.arrayOf(PropTypes.object).isRequired,
         serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
         canSubmit: PropTypes.bool,
@@ -461,7 +460,7 @@ export default class RegistrationForm extends React.Component {
             ref={field => this[FIELD_PASSWORD_CONFIRM] = field}
             type="password"
             autoComplete="new-password"
-            label={_t("Confirm")}
+            label={_t("Confirm password")}
             value={this.state.passwordConfirm}
             onChange={this.onPasswordConfirmChange}
             onValidate={this.onPasswordConfirmValidate}
@@ -513,33 +512,6 @@ export default class RegistrationForm extends React.Component {
     }
 
     render() {
-        let yourMatrixAccountText = _t('Create your Matrix account on %(serverName)s', {
-            serverName: this.props.serverConfig.hsName,
-        });
-        if (this.props.serverConfig.hsNameIsDifferent) {
-            const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
-
-            yourMatrixAccountText = _t('Create your Matrix account on <underlinedServerName />', {}, {
-                'underlinedServerName': () => {
-                    return <TextWithTooltip
-                        class="mx_Login_underlinedServerName"
-                        tooltip={this.props.serverConfig.hsUrl}
-                    >
-                        {this.props.serverConfig.hsName}
-                    </TextWithTooltip>;
-                },
-            });
-        }
-
-        let editLink = null;
-        if (this.props.onEditServerDetailsClick) {
-            editLink = <a className="mx_AuthBody_editServerDetails"
-                href="#" onClick={this.props.onEditServerDetailsClick}
-            >
-                {_t('Change')}
-            </a>;
-        }
-
         const registerButton = (
             <input className="mx_Login_submit" type="submit" value={_t("Register")} disabled={!this.props.canSubmit} />
         );
@@ -575,10 +547,6 @@ export default class RegistrationForm extends React.Component {
 
         return (
             <div>
-                <h3>
-                    {yourMatrixAccountText}
-                    {editLink}
-                </h3>
                 <form onSubmit={this.onSubmit}>
                     <div className="mx_AuthBody_fieldRow">
                         {this.renderUsername()}

src/components/views/dialogs/InviteDialog.js

@@ -31,7 +31,7 @@ import dis from "../../../dispatcher/dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import Modal from "../../../Modal";
 import {humanizeTime} from "../../../utils/humanize";
-import createRoom, {canEncryptToAllUsers, privateShouldBeEncrypted} from "../../../createRoom";
+import createRoom, {canEncryptToAllUsers, findDMForUser, privateShouldBeEncrypted} from "../../../createRoom";
 import {inviteMultipleToRoom, showCommunityInviteDialog} from "../../../RoomInvite";
 import {Key} from "../../../Keyboard";
 import {Action} from "../../../dispatcher/actions";
@@ -41,6 +41,7 @@ import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
 import SettingsStore from "../../../settings/SettingsStore";
 import {UIFeature} from "../../../settings/UIFeature";
 import CountlyAnalytics from "../../../CountlyAnalytics";
+import {Room} from "matrix-js-sdk/src/models/room";
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
@@ -308,10 +309,14 @@ export default class InviteDialog extends React.PureComponent {
 
         // The room ID this dialog is for. Only required for KIND_INVITE.
         roomId: PropTypes.string,
+
+        // Initial value to populate the filter with
+        initialText: PropTypes.string,
     };
 
     static defaultProps = {
         kind: KIND_DM,
+        initialText: "",
     };
 
     _debounceTimer: number = null;
@@ -338,7 +343,7 @@ export default class InviteDialog extends React.PureComponent {
 
         this.state = {
             targets: [], // array of Member objects (see interface above)
-            filterText: "",
+            filterText: this.props.initialText,
             recents: InviteDialog.buildRecents(alreadyInvited),
             numRecentsShown: INITIAL_ROOMS_SHOWN,
             suggestions: this._buildSuggestions(alreadyInvited),
@@ -356,6 +361,12 @@ export default class InviteDialog extends React.PureComponent {
         this._editorRef = createRef();
     }
 
+    componentDidMount() {
+        if (this.props.initialText) {
+            this._updateSuggestions(this.props.initialText);
+        }
+    }
+
     static buildRecents(excludedTargetIds: Set<string>): {userId: string, user: RoomMember, lastActive: number} {
         const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); // map of userId => js-sdk Room
 
@@ -575,7 +586,12 @@ export default class InviteDialog extends React.PureComponent {
         const targetIds = targets.map(t => t.userId);
 
         // Check if there is already a DM with these people and reuse it if possible.
-        const existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
+        let existingRoom: Room;
+        if (targetIds.length === 1) {
+            existingRoom = findDMForUser(MatrixClientPeg.get(), targetIds[0]);
+        } else {
+            existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
+        }
         if (existingRoom) {
             dis.dispatch({
                 action: 'view_room',
@@ -687,6 +703,115 @@ export default class InviteDialog extends React.PureComponent {
         }
     };
 
+    _updateSuggestions = async (term) => {
+        MatrixClientPeg.get().searchUserDirectory({term}).then(async r => {
+            if (term !== this.state.filterText) {
+                // Discard the results - we were probably too slow on the server-side to make
+                // these results useful. This is a race we want to avoid because we could overwrite
+                // more accurate results.
+                return;
+            }
+
+            if (!r.results) r.results = [];
+
+            // While we're here, try and autocomplete a search result for the mxid itself
+            // if there's no matches (and the input looks like a mxid).
+            if (term[0] === '@' && term.indexOf(':') > 1) {
+                try {
+                    const profile = await MatrixClientPeg.get().getProfileInfo(term);
+                    if (profile) {
+                        // If we have a profile, we have enough information to assume that
+                        // the mxid can be invited - add it to the list. We stick it at the
+                        // top so it is most obviously presented to the user.
+                        r.results.splice(0, 0, {
+                            user_id: term,
+                            display_name: profile['displayname'],
+                            avatar_url: profile['avatar_url'],
+                        });
+                    }
+                } catch (e) {
+                    console.warn("Non-fatal error trying to make an invite for a user ID");
+                    console.warn(e);
+
+                    // Add a result anyways, just without a profile. We stick it at the
+                    // top so it is most obviously presented to the user.
+                    r.results.splice(0, 0, {
+                        user_id: term,
+                        display_name: term,
+                        avatar_url: null,
+                    });
+                }
+            }
+
+            this.setState({
+                serverResultsMixin: r.results.map(u => ({
+                    userId: u.user_id,
+                    user: new DirectoryMember(u),
+                })),
+            });
+        }).catch(e => {
+            console.error("Error searching user directory:");
+            console.error(e);
+            this.setState({serverResultsMixin: []}); // clear results because it's moderately fatal
+        });
+
+        // Whenever we search the directory, also try to search the identity server. It's
+        // all debounced the same anyways.
+        if (!this.state.canUseIdentityServer) {
+            // The user doesn't have an identity server set - warn them of that.
+            this.setState({tryingIdentityServer: true});
+            return;
+        }
+        if (term.indexOf('@') > 0 && Email.looksValid(term) && SettingsStore.getValue(UIFeature.IdentityServer)) {
+            // Start off by suggesting the plain email while we try and resolve it
+            // to a real account.
+            this.setState({
+                // per above: the userId is a lie here - it's just a regular identifier
+                threepidResultsMixin: [{user: new ThreepidMember(term), userId: term}],
+            });
+            try {
+                const authClient = new IdentityAuthClient();
+                const token = await authClient.getAccessToken();
+                if (term !== this.state.filterText) return; // abandon hope
+
+                const lookup = await MatrixClientPeg.get().lookupThreePid(
+                    'email',
+                    term,
+                    undefined, // callback
+                    token,
+                );
+                if (term !== this.state.filterText) return; // abandon hope
+
+                if (!lookup || !lookup.mxid) {
+                    // We weren't able to find anyone - we're already suggesting the plain email
+                    // as an alternative, so do nothing.
+                    return;
+                }
+
+                // We append the user suggestion to give the user an option to click
+                // the email anyways, and so we don't cause things to jump around. In
+                // theory, the user would see the user pop up and think "ah yes, that
+                // person!"
+                const profile = await MatrixClientPeg.get().getProfileInfo(lookup.mxid);
+                if (term !== this.state.filterText || !profile) return; // abandon hope
+                this.setState({
+                    threepidResultsMixin: [...this.state.threepidResultsMixin, {
+                        user: new DirectoryMember({
+                            user_id: lookup.mxid,
+                            display_name: profile.displayname,
+                            avatar_url: profile.avatar_url,
+                        }),
+                        userId: lookup.mxid,
+                    }],
+                });
+            } catch (e) {
+                console.error("Error searching identity server:");
+                console.error(e);
+                this.setState({threepidResultsMixin: []}); // clear results because it's moderately fatal
+            }
+        }
+    };
+
     _updateFilter = (e) => {
         const term = e.target.value;
         this.setState({filterText: term});
@@ -697,113 +822,8 @@ export default class InviteDialog extends React.PureComponent {
         if (this._debounceTimer) {
             clearTimeout(this._debounceTimer);
         }
-        this._debounceTimer = setTimeout(async () => {
-            MatrixClientPeg.get().searchUserDirectory({term}).then(async r => {
-                if (term !== this.state.filterText) {
-                    // Discard the results - we were probably too slow on the server-side to make
-                    // these results useful. This is a race we want to avoid because we could overwrite
-                    // more accurate results.
-                    return;
-                }
-
-                if (!r.results) r.results = [];
-
-                // While we're here, try and autocomplete a search result for the mxid itself
-                // if there's no matches (and the input looks like a mxid).
-                if (term[0] === '@' && term.indexOf(':') > 1) {
-                    try {
-                        const profile = await MatrixClientPeg.get().getProfileInfo(term);
-                        if (profile) {
-                            // If we have a profile, we have enough information to assume that
-                            // the mxid can be invited - add it to the list. We stick it at the
-                            // top so it is most obviously presented to the user.
-                            r.results.splice(0, 0, {
-                                user_id: term,
-                                display_name: profile['displayname'],
-                                avatar_url: profile['avatar_url'],
-                            });
-                        }
-                    } catch (e) {
-                        console.warn("Non-fatal error trying to make an invite for a user ID");
-                        console.warn(e);
-
-                        // Add a result anyways, just without a profile. We stick it at the
-                        // top so it is most obviously presented to the user.
-                        r.results.splice(0, 0, {
-                            user_id: term,
-                            display_name: term,
-                            avatar_url: null,
-                        });
-                    }
-                }
-
-                this.setState({
-                    serverResultsMixin: r.results.map(u => ({
-                        userId: u.user_id,
-                        user: new DirectoryMember(u),
-                    })),
-                });
-            }).catch(e => {
-                console.error("Error searching user directory:");
-                console.error(e);
-                this.setState({serverResultsMixin: []}); // clear results because it's moderately fatal
-            });
-
-            // Whenever we search the directory, also try to search the identity server. It's
-            // all debounced the same anyways.
-            if (!this.state.canUseIdentityServer) {
-                // The user doesn't have an identity server set - warn them of that.
-                this.setState({tryingIdentityServer: true});
-                return;
-            }
-            if (term.indexOf('@') > 0 && Email.looksValid(term) && SettingsStore.getValue(UIFeature.IdentityServer)) {
-                // Start off by suggesting the plain email while we try and resolve it
-                // to a real account.
-                this.setState({
-                    // per above: the userId is a lie here - it's just a regular identifier
-                    threepidResultsMixin: [{user: new ThreepidMember(term), userId: term}],
-                });
-                try {
-                    const authClient = new IdentityAuthClient();
-                    const token = await authClient.getAccessToken();
-                    if (term !== this.state.filterText) return; // abandon hope
-
-                    const lookup = await MatrixClientPeg.get().lookupThreePid(
-                        'email',
-                        term,
-                        undefined, // callback
-                        token,
-                    );
-                    if (term !== this.state.filterText) return; // abandon hope
-
-                    if (!lookup || !lookup.mxid) {
-                        // We weren't able to find anyone - we're already suggesting the plain email
-                        // as an alternative, so do nothing.
-                        return;
-                    }
-
-                    // We append the user suggestion to give the user an option to click
-                    // the email anyways, and so we don't cause things to jump around. In
-                    // theory, the user would see the user pop up and think "ah yes, that
-                    // person!"
-                    const profile = await MatrixClientPeg.get().getProfileInfo(lookup.mxid);
-                    if (term !== this.state.filterText || !profile) return; // abandon hope
-                    this.setState({
-                        threepidResultsMixin: [...this.state.threepidResultsMixin, {
-                            user: new DirectoryMember({
-                                user_id: lookup.mxid,
-                                display_name: profile.displayname,
-                                avatar_url: profile.avatar_url,
-                            }),
-                            userId: lookup.mxid,
-                        }],
-                    });
-                } catch (e) {
-                    console.error("Error searching identity server:");
-                    console.error(e);
-                    this.setState({threepidResultsMixin: []}); // clear results because it's moderately fatal
-                }
-            }
+        this._debounceTimer = setTimeout(() => {
+            this._updateSuggestions(term);
         }, 150); // 150ms debounce (human reaction time + some)
     };
 

src/components/views/dialogs/ModalWidgetDialog.tsx

@@ -31,6 +31,7 @@ import {
     ModalButtonKind,
     Widget,
     WidgetApiFromWidgetAction,
+    WidgetKind,
 } from "matrix-widget-api";
 import {StopGapWidgetDriver} from "../../../stores/widgets/StopGapWidgetDriver";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
@@ -72,7 +73,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
     }
 
     public componentDidMount() {
-        const driver = new StopGapWidgetDriver( []);
+        const driver = new StopGapWidgetDriver( [], this.widget, WidgetKind.Modal);
         const messaging = new ClientWidgetApi(this.widget, this.appFrame.current, driver);
         this.setState({messaging});
     }

src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx

@@ -0,0 +1,147 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import BaseDialog from "./BaseDialog";
+import { _t } from "../../../languageHandler";
+import { IDialogProps } from "./IDialogProps";
+import {
+    Capability,
+    Widget,
+    WidgetEventCapability,
+    WidgetKind,
+} from "matrix-widget-api";
+import { objectShallowClone } from "../../../utils/objects";
+import StyledCheckbox from "../elements/StyledCheckbox";
+import DialogButtons from "../elements/DialogButtons";
+import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
+import { CapabilityText } from "../../../widgets/CapabilityText";
+
+export function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
+    return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
+}
+
+function setRememberedCapabilitiesForWidget(widget: Widget, caps: Capability[]) {
+    localStorage.setItem(`widget_${widget.id}_approved_caps`, JSON.stringify(caps));
+}
+
+interface IProps extends IDialogProps {
+    requestedCapabilities: Set<Capability>;
+    widget: Widget;
+    widgetKind: WidgetKind; // TODO: Refactor into the Widget class
+}
+
+interface IBooleanStates {
+    // @ts-ignore - TS wants a string key, but we know better
+    [capability: Capability]: boolean;
+}
+
+interface IState {
+    booleanStates: IBooleanStates;
+    rememberSelection: boolean;
+}
+
+export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<IProps, IState> {
+    private eventPermissionsMap = new Map<Capability, WidgetEventCapability>();
+
+    constructor(props: IProps) {
+        super(props);
+
+        const parsedEvents = WidgetEventCapability.findEventCapabilities(this.props.requestedCapabilities);
+        parsedEvents.forEach(e => this.eventPermissionsMap.set(e.raw, e));
+
+        const states: IBooleanStates = {};
+        this.props.requestedCapabilities.forEach(c => states[c] = true);
+
+        this.state = {
+            booleanStates: states,
+            rememberSelection: true,
+        };
+    }
+
+    private onToggle = (capability: Capability) => {
+        const newStates = objectShallowClone(this.state.booleanStates);
+        newStates[capability] = !newStates[capability];
+        this.setState({booleanStates: newStates});
+    };
+
+    private onRememberSelectionChange = (newVal: boolean) => {
+        this.setState({rememberSelection: newVal});
+    };
+
+    private onSubmit = async (ev) => {
+        this.closeAndTryRemember(Object.entries(this.state.booleanStates)
+            .filter(([_, isSelected]) => isSelected)
+            .map(([cap]) => cap));
+    };
+
+    private onReject = async (ev) => {
+        this.closeAndTryRemember([]); // nothing was approved
+    };
+
+    private closeAndTryRemember(approved: Capability[]) {
+        if (this.state.rememberSelection) {
+            setRememberedCapabilitiesForWidget(this.props.widget, approved);
+        }
+        this.props.onFinished({approved});
+    }
+
+    public render() {
+        const checkboxRows = Object.entries(this.state.booleanStates).map(([cap, isChecked], i) => {
+            const text = CapabilityText.for(cap, this.props.widgetKind);
+            const byline = text.byline
+                ? <span className="mx_WidgetCapabilitiesPromptDialog_byline">{text.byline}</span>
+                : null;
+
+            return (
+                <div className="mx_WidgetCapabilitiesPromptDialog_cap" key={cap + i}>
+                    <StyledCheckbox
+                        checked={isChecked}
+                        onChange={() => this.onToggle(cap)}
+                    >{text.primary}</StyledCheckbox>
+                    {byline}
+                </div>
+            );
+        });
+
+        return (
+            <BaseDialog
+                className="mx_WidgetCapabilitiesPromptDialog"
+                onFinished={this.props.onFinished}
+                title={_t("Approve widget permissions")}
+            >
+                <form onSubmit={this.onSubmit}>
+                    <div className="mx_Dialog_content">
+                        <div className="text-muted">{_t("This widget would like to:")}</div>
+                        {checkboxRows}
+                        <DialogButtons
+                            primaryButton={_t("Approve")}
+                            cancelButton={_t("Decline All")}
+                            onPrimaryButtonClick={this.onSubmit}
+                            onCancel={this.onReject}
+                            additive={
+                                <LabelledToggleSwitch
+                                    value={this.state.rememberSelection}
+                                    toggleInFront={true}
+                                    onChange={this.onRememberSelectionChange}
+                                    label={_t("Remember my selection for this widget")} />}
+                        />
+                    </div>
+                </form>
+            </BaseDialog>
+        );
+    }
+}

src/components/views/elements/DialogButtons.js

@@ -54,6 +54,9 @@ export default class DialogButtons extends React.Component {
 
         // disables only the primary button
         primaryDisabled: PropTypes.bool,
+
+        // something to stick next to the buttons, optionally
+        additive: PropTypes.element,
     };
 
     static defaultProps = {
@@ -85,8 +88,14 @@ export default class DialogButtons extends React.Component {
             </button>;
         }
 
+        let additive = null;
+        if (this.props.additive) {
+            additive = <div className="mx_Dialog_buttons_additive">{this.props.additive}</div>;
+        }
+
         return (
             <div className="mx_Dialog_buttons">
+                { additive }
                 { cancelButton }
                 { this.props.children }
                 <button type={this.props.primaryIsSubmit ? 'submit' : 'button'}

src/components/views/elements/DirectorySearchBox.js

@@ -20,8 +20,8 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default class DirectorySearchBox extends React.Component {
-    constructor() {
-        super();
+    constructor(props) {
+        super(props);
         this._collectInput = this._collectInput.bind(this);
         this._onClearClick = this._onClearClick.bind(this);
         this._onChange = this._onChange.bind(this);
@@ -31,7 +31,7 @@ export default class DirectorySearchBox extends React.Component {
         this.input = null;
 
         this.state = {
-            value: '',
+            value: this.props.initialText || '',
         };
     }
 
@@ -90,15 +90,20 @@ export default class DirectorySearchBox extends React.Component {
         }
 
         return <div className={`mx_DirectorySearchBox ${this.props.className} mx_textinput`}>
-                <input type="text" name="dirsearch" value={this.state.value}
-                    className="mx_textinput_icon mx_textinput_search"
-                    ref={this._collectInput}
-                    onChange={this._onChange} onKeyUp={this._onKeyUp}
-                    placeholder={this.props.placeholder} autoFocus
-                />
-                { joinButton }
-                <AccessibleButton className="mx_DirectorySearchBox_clear" onClick={this._onClearClick}></AccessibleButton>
-            </div>;
+            <input
+                type="text"
+                name="dirsearch"
+                value={this.state.value}
+                className="mx_textinput_icon mx_textinput_search"
+                ref={this._collectInput}
+                onChange={this._onChange}
+                onKeyUp={this._onKeyUp}
+                placeholder={this.props.placeholder}
+                autoFocus
+            />
+            { joinButton }
+            <AccessibleButton className="mx_DirectorySearchBox_clear" onClick={this._onClearClick} />
+        </div>;
     }
 }
 
@@ -109,4 +114,5 @@ DirectorySearchBox.propTypes = {
     onJoinClick: PropTypes.func,
     placeholder: PropTypes.string,
     showJoinButton: PropTypes.bool,
+    initialText: PropTypes.string,
 };

src/components/views/elements/MiniAvatarUploader.tsx

@@ -21,6 +21,8 @@ import AccessibleButton from "./AccessibleButton";
 import Tooltip from './Tooltip';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {useTimeout} from "../../../hooks/useTimeout";
+import Analytics from "../../../Analytics";
+import CountlyAnalytics from '../../../CountlyAnalytics';
 
 export const AVATAR_SIZE = 52;
 
@@ -56,6 +58,8 @@ const MiniAvatarUploader: React.FC<IProps> = ({ hasAvatar, hasAvatarLabel, noAva
             onChange={async (ev) => {
                 if (!ev.target.files?.length) return;
                 setBusy(true);
+                Analytics.trackEvent("mini_avatar", "upload");
+                CountlyAnalytics.instance.track("mini_avatar_upload");
                 const file = ev.target.files[0];
                 const uri = await cli.uploadContent(file);
                 await setAvatarUrl(uri);

src/components/views/messages/MVideoBody.tsx

@@ -39,6 +39,8 @@ interface IState {
 }
 
 export default class MVideoBody extends React.PureComponent<IProps, IState> {
+    private videoRef = React.createRef<HTMLVideoElement>();
+
     constructor(props) {
         super(props);
         this.state = {
@@ -71,7 +73,7 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
         }
     }
 
-    _getContentUrl(): string|null {
+    private getContentUrl(): string|null {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined) {
             return this.state.decryptedUrl;
@@ -80,7 +82,12 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
         }
     }
 
-    _getThumbUrl(): string|null {
+    private hasContentUrl(): boolean {
+        const url = this.getContentUrl();
+        return url && !url.startsWith("data:");
+    }
+
+    private getThumbUrl(): string|null {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined) {
             return this.state.decryptedThumbnailUrl;
@@ -118,7 +125,10 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
                 } else {
                     console.log("NOT preloading video");
                     this.setState({
-                        decryptedUrl: null,
+                        // For Chrome and Electron, we need to set some non-empty `src` to
+                        // enable the play button. Firefox does not seem to care either
+                        // way, so it's fine to do for all browsers.
+                        decryptedUrl: `data:${content?.info?.mimetype},`,
                         decryptedThumbnailUrl: thumbnailUrl,
                         decryptedBlob: null,
                     });
@@ -142,8 +152,8 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
         }
     }
 
-    async _videoOnPlay() {
-        if (this._getContentUrl() || this.state.fetchingData || this.state.error) {
+    private videoOnPlay = async () => {
+        if (this.hasContentUrl() || this.state.fetchingData || this.state.error) {
             // We have the file, we are fetching the file, or there is an error.
             return;
         }
@@ -164,6 +174,9 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
             decryptedUrl: contentUrl,
             decryptedBlob: decryptedBlob,
             fetchingData: false,
+        }, () => {
+            if (!this.videoRef.current) return;
+            this.videoRef.current.play();
         });
         this.props.onHeightChanged();
     }
@@ -195,8 +208,8 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
             );
         }
 
-        const contentUrl = this._getContentUrl();
-        const thumbUrl = this._getThumbUrl();
+        const contentUrl = this.getContentUrl();
+        const thumbUrl = this.getThumbUrl();
         let height = null;
         let width = null;
         let poster = null;
@@ -215,9 +228,20 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
         }
         return (
             <span className="mx_MVideoBody">
-                <video className="mx_MVideoBody" src={contentUrl} title={content.body}
-                    controls preload={preload} muted={autoplay} autoPlay={autoplay}
-                    height={height} width={width} poster={poster} onPlay={this._videoOnPlay.bind(this)}>
+                <video
+                    className="mx_MVideoBody"
+                    ref={this.videoRef}
+                    src={contentUrl}
+                    title={content.body}
+                    controls
+                    preload={preload}
+                    muted={autoplay}
+                    autoPlay={autoplay}
+                    height={height}
+                    width={width}
+                    poster={poster}
+                    onPlay={this.videoOnPlay}
+                >
                 </video>
                 <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />
             </span>

src/components/views/right_panel/UserInfo.tsx

@@ -28,7 +28,7 @@ import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
 import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import {_t} from '../../../languageHandler';
-import createRoom, {privateShouldBeEncrypted} from '../../../createRoom';
+import createRoom, { findDMForUser, privateShouldBeEncrypted } from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import AccessibleButton from '../elements/AccessibleButton';
 import SdkConfig from '../../../SdkConfig';
@@ -105,17 +105,7 @@ export const getE2EStatus = (cli: MatrixClient, userId: string, devices: IDevice
 };
 
 async function openDMForUser(matrixClient: MatrixClient, userId: string) {
-    const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
-    const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
-        const room = matrixClient.getRoom(roomId);
-        if (!room || room.getMyMembership() === "leave") {
-            return lastActiveRoom;
-        }
-        if (!lastActiveRoom || lastActiveRoom.getLastActiveTimestamp() < room.getLastActiveTimestamp()) {
-            return room;
-        }
-        return lastActiveRoom;
-    }, null);
+    const lastActiveRoom = findDMForUser(matrixClient, userId);
 
     if (lastActiveRoom) {
         dis.dispatch({

src/components/views/rooms/EditMessageComposer.js

@@ -29,9 +29,10 @@ import EditorStateTransfer from '../../../utils/EditorStateTransfer';
 import classNames from 'classnames';
 import {EventStatus} from 'matrix-js-sdk';
 import BasicMessageComposer from "./BasicMessageComposer";
-import {Key} from "../../../Keyboard";
+import {Key, isOnlyCtrlOrCmdKeyEvent} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {Action} from "../../../dispatcher/actions";
+import SettingsStore from "../../../settings/SettingsStore";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 
 function _isReply(mxEvent) {
@@ -136,7 +137,10 @@ export default class EditMessageComposer extends React.Component {
         if (event.metaKey || event.altKey || event.shiftKey) {
             return;
         }
-        if (event.key === Key.ENTER) {
+        const ctrlEnterToSend = !!SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend');
+        const send = ctrlEnterToSend ? event.key === Key.ENTER && isOnlyCtrlOrCmdKeyEvent(event)
+            : event.key === Key.ENTER;
+        if (send) {
             this._sendEdit();
             event.preventDefault();
         } else if (event.key === Key.ESCAPE) {

src/components/views/rooms/RoomList.tsx

@@ -58,6 +58,7 @@ interface IProps {
 
 interface IState {
     sublists: ITagMap;
+    isNameFiltering: boolean;
 }
 
 const TAG_ORDER: TagID[] = [
@@ -183,6 +184,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
         this.state = {
             sublists: {},
+            isNameFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
         };
 
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
@@ -253,7 +255,8 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             return CustomRoomTagStore.getTags()[t];
         });
 
-        let doUpdate = arrayHasDiff(previousListIds, newListIds);
+        const isNameFiltering = !!RoomListStore.instance.getFirstNameFilterCondition();
+        let doUpdate = this.state.isNameFiltering !== isNameFiltering || arrayHasDiff(previousListIds, newListIds);
         if (!doUpdate) {
             // so we didn't have the visible sublists change, but did the contents of those
             // sublists change significantly enough to break the sticky headers? Probably, so
@@ -275,14 +278,20 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             const newSublists = objectWithOnly(newLists, newListIds);
             const sublists = objectShallowClone(newSublists, (k, v) => arrayFastClone(v));
 
-            this.setState({sublists}, () => {
+            this.setState({sublists, isNameFiltering}, () => {
                 this.props.onResize();
             });
         }
     };
 
+    private onStartChat = () => {
+        const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search;
+        dis.dispatch({ action: "view_create_chat", initialText });
+    };
+
     private onExplore = () => {
-        dis.fire(Action.ViewRoomDirectory);
+        const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search;
+        dis.dispatch({ action: Action.ViewRoomDirectory, initialText });
     };
 
     private renderCommunityInvites(): TemporaryTile[] {
@@ -332,8 +341,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             return p;
         }, [] as TagID[]);
 
-        // show a skeleton UI if the user is in no rooms
-        const showSkeleton = Object.values(RoomListStore.instance.unfilteredLists).every(list => !list?.length);
+        // show a skeleton UI if the user is in no rooms and they are not filtering
+        const showSkeleton = !this.state.isNameFiltering &&
+            Object.values(RoomListStore.instance.unfilteredLists).every(list => !list?.length);
 
         for (const orderedTagId of tagOrder) {
             const orderedRooms = this.state.sublists[orderedTagId] || [];
@@ -370,10 +380,21 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     public render() {
         let explorePrompt: JSX.Element;
         if (!this.props.isMinimized) {
-            if (RoomListStore.instance.getFirstNameFilterCondition()) {
+            if (this.state.isNameFiltering) {
                 explorePrompt = <div className="mx_RoomList_explorePrompt">
                     <div>{_t("Can't see what you’re looking for?")}</div>
-                    <AccessibleButton kind="link" onClick={this.onExplore}>
+                    <AccessibleButton
+                        className="mx_RoomList_explorePrompt_startChat"
+                        kind="link"
+                        onClick={this.onStartChat}
+                    >
+                        {_t("Start a new chat")}
+                    </AccessibleButton>
+                    <AccessibleButton
+                        className="mx_RoomList_explorePrompt_explore"
+                        kind="link"
+                        onClick={this.onExplore}
+                    >
                         {_t("Explore all public rooms")}
                     </AccessibleButton>
                 </div>;
@@ -385,7 +406,18 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 if (unfilteredRooms.length < 1 && unfilteredHistorical < 1) {
                     explorePrompt = <div className="mx_RoomList_explorePrompt">
                         <div>{_t("Use the + to make a new room or explore existing ones below")}</div>
-                        <AccessibleButton kind="link" onClick={this.onExplore}>
+                        <AccessibleButton
+                            className="mx_RoomList_explorePrompt_startChat"
+                            kind="link"
+                            onClick={this.onStartChat}
+                        >
+                            {_t("Start a new chat")}
+                        </AccessibleButton>
+                        <AccessibleButton
+                            className="mx_RoomList_explorePrompt_explore"
+                            kind="link"
+                            onClick={this.onExplore}
+                        >
                             {_t("Explore all public rooms")}
                         </AccessibleButton>
                     </div>;

src/components/views/rooms/RoomSublist.tsx

@@ -422,7 +422,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
             room = this.state.rooms && this.state.rooms[0];
         } else {
             // find the first room with a count of the same colour as the badge count
-            room = this.state.rooms.find((r: Room) => {
+            room = RoomListStore.instance.unfilteredLists[this.props.tagId].find((r: Room) => {
                 const notifState = this.notificationState.getForRoom(r);
                 return notifState.count > 0 && notifState.color === this.notificationState.color;
             });

src/components/views/rooms/SendMessageComposer.js

@@ -38,10 +38,11 @@ import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import {_t, _td} from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
-import {Key} from "../../../Keyboard";
+import {Key, isOnlyCtrlOrCmdKeyEvent} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import {Action} from "../../../dispatcher/actions";
+import SettingsStore from "../../../settings/SettingsStore";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
@@ -122,7 +123,11 @@ export default class SendMessageComposer extends React.Component {
             return;
         }
         const hasModifier = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
-        if (event.key === Key.ENTER && !hasModifier) {
+        const ctrlEnterToSend = !!SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend');
+        const send = ctrlEnterToSend
+            ? event.key === Key.ENTER && isOnlyCtrlOrCmdKeyEvent(event)
+            : event.key === Key.ENTER && !hasModifier;
+        if (send) {
             this._sendMessage();
             event.preventDefault();
         } else if (event.key === Key.ARROW_UP) {

src/components/views/settings/EventIndexPanel.js

@@ -130,10 +130,13 @@ export default class EventIndexPanel extends React.Component {
                 <div>
                     <div className='mx_SettingsTab_subsectionText'>
                         {_t("Securely cache encrypted messages locally for them " +
-                             "to appear in search results, using %(size)s to store messages from %(count)s rooms.",
+                            "to appear in search results, using %(size)s to store messages from %(rooms)s rooms.",
                             {
                                 size: formatBytes(this.state.eventIndexSize, 0),
-                                count: formatCountLong(this.state.roomCount),
+                                // This drives the singular / plural string
+                                // selection for "room" / "rooms" only.
+                                count: this.state.roomCount,
+                                rooms: formatCountLong(this.state.roomCount),
                             },
                         )}
                     </div>

src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js

@@ -33,6 +33,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'MessageComposerInput.autoReplaceEmoji',
         'MessageComposerInput.suggestEmoji',
         'sendTypingNotifications',
+        'MessageComposerInput.ctrlEnterToSend',
     ];
 
     static TIMELINE_SETTINGS = [

src/createRoom.ts

@@ -15,20 +15,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient} from "matrix-js-sdk/src/client";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import dis from "./dispatcher/dispatcher";
 import * as Rooms from "./Rooms";
 import DMRoomMap from "./utils/DMRoomMap";
-import {getAddressType} from "./UserAddress";
+import { getAddressType } from "./UserAddress";
 import { getE2EEWellKnown } from "./utils/WellKnownUtils";
 import GroupStore from "./stores/GroupStore";
 import CountlyAnalytics from "./CountlyAnalytics";
+import { isJoinedOrNearlyJoined } from "./utils/membership";
 
 // we define a number of interfaces which take their names from the js-sdk
 /* eslint-disable camelcase */
@@ -236,9 +237,16 @@ export function findDMForUser(client: MatrixClient, userId: string): Room {
     const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
     const rooms = roomIds.map(id => client.getRoom(id));
     const suitableDMRooms = rooms.filter(r => {
+        // Validate that we are joined and the other person is also joined. We'll also make sure
+        // that the room also looks like a DM (until we have canonical DMs to tell us). For now,
+        // a DM is a room of two people that contains those two people exactly. This does mean
+        // that bots, assistants, etc will ruin a room's DM-ness, though this is a problem for
+        // canonical DMs to solve.
         if (r && r.getMyMembership() === "join") {
-            const member = r.getMember(userId);
-            return member && (member.membership === "invite" || member.membership === "join");
+            const members = r.currentState.getMembers();
+            const joinedMembers = members.filter(m => isJoinedOrNearlyJoined(m.membership));
+            const otherMember = joinedMembers.find(m => m.userId === userId);
+            return otherMember && joinedMembers.length === 2;
         }
         return false;
     }).sort((r1, r2) => {

src/i18n/strings/bg.json

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

src/i18n/strings/ca.json

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

src/i18n/strings/en_EN.json

@@ -569,6 +569,62 @@
     "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)s others are typing …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s and one other is typing …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s and %(lastPerson)s are typing …",
+    "Remain on your screen when viewing another room, when running": "Remain on your screen when viewing another room, when running",
+    "Remain on your screen while running": "Remain on your screen while running",
+    "Send stickers into this room": "Send stickers into this room",
+    "Send stickers into your active room": "Send stickers into your active room",
+    "Change which room you're viewing": "Change which room you're viewing",
+    "Change the topic of this room": "Change the topic of this room",
+    "See when the topic changes in this room": "See when the topic changes in this room",
+    "Change the topic of your active room": "Change the topic of your active room",
+    "See when the topic changes in your active room": "See when the topic changes in your active room",
+    "Change the name of this room": "Change the name of this room",
+    "See when the name changes in this room": "See when the name changes in this room",
+    "Change the name of your active room": "Change the name of your active room",
+    "See when the name changes in your active room": "See when the name changes in your active room",
+    "Change the avatar of this room": "Change the avatar of this room",
+    "See when the avatar changes in this room": "See when the avatar changes in this room",
+    "Change the avatar of your active room": "Change the avatar of your active room",
+    "See when the avatar changes in your active room": "See when the avatar changes in your active room",
+    "Send stickers to this room as you": "Send stickers to this room as you",
+    "See when a sticker is posted in this room": "See when a sticker is posted in this room",
+    "Send stickers to your active room as you": "Send stickers to your active room as you",
+    "See when anyone posts a sticker to your active room": "See when anyone posts a sticker to your active room",
+    "with an empty state key": "with an empty state key",
+    "with state key %(stateKey)s": "with state key %(stateKey)s",
+    "Send <b>%(eventType)s</b> events as you in this room": "Send <b>%(eventType)s</b> events as you in this room",
+    "See <b>%(eventType)s</b> events posted to this room": "See <b>%(eventType)s</b> events posted to this room",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Send <b>%(eventType)s</b> events as you in your active room",
+    "See <b>%(eventType)s</b> events posted to your active room": "See <b>%(eventType)s</b> events posted to your active room",
+    "The <b>%(capability)s</b> capability": "The <b>%(capability)s</b> capability",
+    "Send messages as you in this room": "Send messages as you in this room",
+    "Send messages as you in your active room": "Send messages as you in your active room",
+    "See messages posted to this room": "See messages posted to this room",
+    "See messages posted to your active room": "See messages posted to your active room",
+    "Send text messages as you in this room": "Send text messages as you in this room",
+    "Send text messages as you in your active room": "Send text messages as you in your active room",
+    "See text messages posted to this room": "See text messages posted to this room",
+    "See text messages posted to your active room": "See text messages posted to your active room",
+    "Send emotes as you in this room": "Send emotes as you in this room",
+    "Send emotes as you in your active room": "Send emotes as you in your active room",
+    "See emotes posted to this room": "See emotes posted to this room",
+    "See emotes posted to your active room": "See emotes posted to your active room",
+    "Send images as you in this room": "Send images as you in this room",
+    "Send images as you in your active room": "Send images as you in your active room",
+    "See images posted to this room": "See images posted to this room",
+    "See images posted to your active room": "See images posted to your active room",
+    "Send videos as you in this room": "Send videos as you in this room",
+    "Send videos as you in your active room": "Send videos as you in your active room",
+    "See videos posted to this room": "See videos posted to this room",
+    "See videos posted to your active room": "See videos posted to your active room",
+    "Send general files as you in this room": "Send general files as you in this room",
+    "Send general files as you in your active room": "Send general files as you in your active room",
+    "See general files posted to this room": "See general files posted to this room",
+    "See general files posted to your active room": "See general files posted to your active room",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Send <b>%(msgtype)s</b> messages as you in this room",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Send <b>%(msgtype)s</b> messages as you in your active room",
+    "See <b>%(msgtype)s</b> messages posted to this room": "See <b>%(msgtype)s</b> messages posted to this room",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "See <b>%(msgtype)s</b> messages posted to your active room",
     "Cannot reach homeserver": "Cannot reach homeserver",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Ensure you have a stable internet connection, or get in touch with the server admin",
     "Your %(brand)s is misconfigured": "Your %(brand)s is misconfigured",
@@ -648,7 +704,7 @@
     "Unknown App": "Unknown App",
     "Help us improve %(brand)s": "Help us improve %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.",
-    "I want to help": "I want to help",
+    "Yes": "Yes",
     "No": "No",
     "Review where you’re logged in": "Review where you’re logged in",
     "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
@@ -730,6 +786,8 @@
     "Enable big emoji in chat": "Enable big emoji in chat",
     "Send typing notifications": "Send typing notifications",
     "Show typing notifications": "Show typing notifications",
+    "Use Command + Enter to send a message": "Use Command + Enter to send a message",
+    "Use Ctrl + Enter to send a message": "Use Ctrl + Enter to send a message",
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Mirror local video feed": "Mirror local video feed",
     "Enable Community Filter Panel": "Enable Community Filter Panel",
@@ -935,8 +993,8 @@
     "Failed to set display name": "Failed to set display name",
     "Encryption": "Encryption",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s room.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s room.",
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",
@@ -1390,6 +1448,7 @@
     "Historical": "Historical",
     "Custom Tag": "Custom Tag",
     "Can't see what you’re looking for?": "Can't see what you’re looking for?",
+    "Start a new chat": "Start a new chat",
     "Explore all public rooms": "Explore all public rooms",
     "Use the + to make a new room or explore existing ones below": "Use the + to make a new room or explore existing ones below",
     "%(count)s results|other": "%(count)s results",
@@ -1615,7 +1674,6 @@
     "Verify by emoji": "Verify by emoji",
     "Almost there! Is your other session showing the same shield?": "Almost there! Is your other session showing the same shield?",
     "Almost there! Is %(displayName)s showing the same shield?": "Almost there! Is %(displayName)s showing the same shield?",
-    "Yes": "Yes",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "In encrypted rooms, verify all users to ensure it’s secure.",
     "You've successfully verified your device!": "You've successfully verified your device!",
@@ -2123,9 +2181,13 @@
     "Upload Error": "Upload Error",
     "Verify other session": "Verify other session",
     "Verification Request": "Verification Request",
+    "Approve widget permissions": "Approve widget permissions",
+    "This widget would like to:": "This widget would like to:",
+    "Approve": "Approve",
+    "Decline All": "Decline All",
+    "Remember my selection for this widget": "Remember my selection for this widget",
     "A widget would like to verify your identity": "A widget would like to verify your identity",
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.",
-    "Remember my selection for this widget": "Remember my selection for this widget",
     "Allow": "Allow",
     "Deny": "Deny",
     "Wrong file type": "Wrong file type",
@@ -2209,8 +2271,8 @@
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.",
     "Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies",
     "Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:",
-    "An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s",
-    "Please check your email to continue registration.": "Please check your email to continue registration.",
+    "A confirmation email has been sent to %(emailAddress)s": "A confirmation email has been sent to %(emailAddress)s",
+    "Open the link in the email to continue registration.": "Open the link in the email to continue registration.",
     "Token incorrect": "Token incorrect",
     "A text message has been sent to %(msisdn)s": "A text message has been sent to %(msisdn)s",
     "Please enter the code it contains:": "Please enter the code it contains:",
@@ -2247,8 +2309,6 @@
     "Enter username": "Enter username",
     "Email (optional)": "Email (optional)",
     "Phone (optional)": "Phone (optional)",
-    "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
     "Register": "Register",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
     "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
@@ -2272,7 +2332,7 @@
     "Attach files from chat or just drag and drop them anywhere in a room.": "Attach files from chat or just drag and drop them anywhere in a room.",
     "Communities": "Communities",
     "Create community": "Create community",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n": "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n",
     "Add rooms to the community summary": "Add rooms to the community summary",
     "Which rooms would you like to add to this summary?": "Which rooms would you like to add to this summary?",
     "Add to summary": "Add to summary",
@@ -2371,8 +2431,9 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.",
     "Explore rooms in %(communityName)s": "Explore rooms in %(communityName)s",
+    "Filter": "Filter",
     "Clear filter": "Clear filter",
-    "Search rooms": "Search rooms",
+    "Filter rooms and people": "Filter rooms and people",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.",
@@ -2460,9 +2521,6 @@
     "Signing In...": "Signing In...",
     "If you've joined lots of rooms, this might take a while": "If you've joined lots of rooms, this might take a while",
     "Create account": "Create account",
-    "Failed to fetch avatar URL": "Failed to fetch avatar URL",
-    "Set a display name:": "Set a display name:",
-    "Upload an avatar:": "Upload an avatar:",
     "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
     "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
@@ -2471,6 +2529,8 @@
     "<a>Log in</a> to your new account.": "<a>Log in</a> to your new account.",
     "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
     "Registration Successful": "Registration Successful",
+    "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
+    "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
     "Create your account": "Create your account",
     "Use Recovery Key or Passphrase": "Use Recovery Key or Passphrase",
     "Use Recovery Key": "Use Recovery Key",
@@ -2632,6 +2692,7 @@
     "Activate selected button": "Activate selected button",
     "Toggle right panel": "Toggle right panel",
     "Toggle this dialog": "Toggle this dialog",
+    "Go to Home View": "Go to Home View",
     "Move autocomplete selection up/down": "Move autocomplete selection up/down",
     "Cancel autocomplete": "Cancel autocomplete",
     "Page Up": "Page Up",

src/i18n/strings/eo.json

@@ -2538,5 +2538,164 @@
     "Add comment": "Aldoni komenton",
     "Please go into as much detail as you like, so we can track down the problem.": "Bonvolu detaligi tiel multe, kiel vi volas, por ke ni povu pli facile trovi la problemon.",
     "Tell us below how you feel about %(brand)s so far.": "Diru al ni, kion vi ĝis nun pensas pri %(brand)s.",
-    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Pratipoj de la 2-a versio de komunumoj. Bezonas konforman hejmservilon. Tre eksperimenta – uzu nur zorge."
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Pratipoj de la 2-a versio de komunumoj. Bezonas konforman hejmservilon. Tre eksperimenta – uzu nur zorge.",
+    "Uzbekistan": "Uzbekujo",
+    "United Arab Emirates": "Unuiĝinaj Arabaj Emirlandoj",
+    "Ukraine": "Ukrainujo",
+    "Uganda": "Ugando",
+    "Turkey": "Turkujo",
+    "Tunisia": "Tunizio",
+    "Tajikistan": "Taĝikujo",
+    "Malta": "Malto",
+    "Mali": "Malio",
+    "Maldives": "Maldivoj",
+    "Malaysia": "Malajzio",
+    "Luxembourg": "Luksemburgo",
+    "Lithuania": "Litovujo",
+    "Liechtenstein": "Liĥtenŝtejno",
+    "Latvia": "Latvujo",
+    "Laos": "Laoso",
+    "Kyrgyzstan": "Kirgizujo",
+    "Kosovo": "Kosovo",
+    "Kenya": "Kenjo",
+    "Kazakhstan": "Kazaĥujo",
+    "Japan": "Japanujo",
+    "Jamaica": "Jamajko",
+    "Italy": "Italujo",
+    "Israel": "Israelo",
+    "Isle of Man": "Manksujo",
+    "Ireland": "Irlando",
+    "Iraq": "Irako",
+    "Iran": "Irano",
+    "Indonesia": "Indonezio",
+    "India": "Barato",
+    "Iceland": "Islando",
+    "Hungary": "Hungarujo",
+    "Hong Kong": "Honkongo",
+    "Honduras": "Honduro",
+    "Haiti": "Haitio",
+    "Guatemala": "Gvatemalo",
+    "Grenada": "Grenado",
+    "Greenland": "Gronlando",
+    "Greece": "Grekujo",
+    "Gibraltar": "Ĝibraltaro",
+    "Germany": "Germanujo",
+    "France": "Francujo",
+    "Finland": "Finlando",
+    "Fiji": "Fiĝio",
+    "Ethiopia": "Etiopujo",
+    "Estonia": "Estonujo",
+    "Eritrea": "Eritreo",
+    "Equatorial Guinea": "Ekvatora Gvineo",
+    "El Salvador": "Salvadoro",
+    "Egypt": "Egiptujo",
+    "Ecuador": "Ekvadoro",
+    "Dominican Republic": "Dominika Respubliko",
+    "Dominica": "Dominiko",
+    "Denmark": "Danujo",
+    "Côte d’Ivoire": "Ebur-Bordo",
+    "Czech Republic": "Ĉeĥujo",
+    "Cyprus": "Kipro",
+    "Cuba": "Kubo",
+    "Croatia": "Kroatujo",
+    "Costa Rica": "Kostariko",
+    "Cook Islands": "Insuloj de Cook",
+    "Comoros": "Komoroj",
+    "Colombia": "Kolombio",
+    "Christmas Island": "Kristnaskinsulo",
+    "China": "Ĉinujo",
+    "Chile": "Ĉilio",
+    "Chad": "Ĉado",
+    "Central African Republic": "Centr-Afriko",
+    "Cape Verde": "Kaboverdo",
+    "Canada": "Kanado",
+    "Cameroon": "Kameruno",
+    "Cambodia": "Kamboĝo",
+    "Burundi": "Burundo",
+    "Bulgaria": "Bulgarujo",
+    "Brunei": "Brunejo",
+    "British Virgin Islands": "Britaj Virgulininsuloj",
+    "Brazil": "Brazilo",
+    "Botswana": "Cvanujo",
+    "Bosnia": "Bosnujo",
+    "Bolivia": "Bolivio",
+    "Bhutan": "Butano",
+    "Bermuda": "Bermudo",
+    "Benin": "Benino",
+    "Belize": "Belizo",
+    "Belgium": "Belgujo",
+    "Belarus": "Belorusujo",
+    "Barbados": "Barbado",
+    "Bangladesh": "Bangladeŝo",
+    "Bahrain": "Barejno",
+    "Bahamas": "Bahamoj",
+    "Azerbaijan": "Azerbajĝano",
+    "Austria": "Aŭstrujo",
+    "Australia": "Aŭstralio",
+    "Aruba": "Arubo",
+    "Armenia": "Armenujo",
+    "Argentina": "Argentino",
+    "Antigua & Barbuda": "Antigvo kaj Barbudo",
+    "Antarctica": "Antarkto",
+    "Angola": "Angolo",
+    "Andorra": "Andoro",
+    "American Samoa": "Usona Samoo",
+    "Algeria": "Alĝerio",
+    "Albania": "Albanujo",
+    "Åland Islands": "Alando",
+    "Afghanistan": "Afganujo",
+    "United States": "Usono",
+    "United Kingdom": "Britujo",
+    "Sri Lanka": "Srilanko",
+    "Spain": "Hispanujo",
+    "South Korea": "Sud-Koreujo",
+    "South Africa": "Sud-Afriko",
+    "Somalia": "Somalujo",
+    "Solomon Islands": "Salomonoj",
+    "Slovenia": "Slovenujo",
+    "Slovakia": "Slovakujo",
+    "Singapore": "Singapuro",
+    "Sierra Leone": "Sieraleono",
+    "Seychelles": "Sejŝeloj",
+    "Serbia": "Serbujo",
+    "Senegal": "Senegalo",
+    "Saudi Arabia": "Sauda Arabujo",
+    "San Marino": "Sanmarino",
+    "Samoa": "Samoo",
+    "Rwanda": "Ruando",
+    "Russia": "Rusujo",
+    "Romania": "Rumanujo",
+    "Qatar": "Kataro",
+    "Puerto Rico": "Portoriko",
+    "Portugal": "Portugalujo",
+    "Poland": "Polujo",
+    "Philippines": "Filipinoj",
+    "Peru": "Peruo",
+    "Paraguay": "Paragvajo",
+    "Papua New Guinea": "Papuo-Nov-Gvineo",
+    "Panama": "Panamo",
+    "Palestine": "Palestino",
+    "Palau": "Palaŭo",
+    "Pakistan": "Pakistano",
+    "Oman": "Omano",
+    "Norway": "Norvegujo",
+    "North Korea": "Nord-Koreujo",
+    "Niue": "Niuo",
+    "Nigeria": "Niĝerio",
+    "Niger": "Niĝero",
+    "New Zealand": "Nov-Zelando",
+    "New Caledonia": "Nova Kaledonio",
+    "Netherlands": "Nederlando",
+    "Nepal": "Nepalo",
+    "Nauru": "Nauro",
+    "Namibia": "Namibio",
+    "Myanmar": "Birmo",
+    "Mozambique": "Mozambiko",
+    "Morocco": "Maroko",
+    "Montserrat": "Moncerato",
+    "Montenegro": "Montenegro",
+    "Caribbean Netherlands": "Kariba Nederlando",
+    "Burkina Faso": "Burkino",
+    "Bouvet Island": "Buvet-Insulo",
+    "Anguilla": "Angvilo"
 }

src/i18n/strings/et.json

@@ -2562,5 +2562,289 @@
     "Rate %(brand)s": "Hinda %(brand)s rakendust",
     "Feedback sent": "Tagasiside on saadetud",
     "%(senderName)s ended the call": "%(senderName)s lõpetas kõne",
-    "You ended the call": "Sina lõpetasid kõne"
+    "You ended the call": "Sina lõpetasid kõne",
+    "Now, lets help you get started": "Nüüd näitame sulle, mida saad järgmiseks teha",
+    "Welcome %(name)s": "Tere tulemast, %(name)s",
+    "Add a photo so people know it's you.": "Enda tutvustamiseks lisa foto.",
+    "Great, that'll help people know it's you": "Suurepärane, nüüd teised teavad et tegemist on sinuga",
+    "Use the + to make a new room or explore existing ones below": "Uue jututoa tegemiseks või olemasolevatega tutvumiseks klõpsi + märki",
+    "New version of %(brand)s is available": "%(brand)s ralenduse uus versioon on saadaval",
+    "Update %(brand)s": "Uuenda %(brand)s rakendust",
+    "Enable desktop notifications": "Võta kasutusele töölauakeskkonna teavitused",
+    "Don't miss a reply": "Ära jäta vastust vahele",
+    "Now, let's help you get started": "Nüüd näitame sulle, mida saad järgmiseks teha",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Kutsu teist osapoolt tema nime, e-posti aadressi, kasutajanime (nagu <userId/>) alusel või <a>jaga seda jututuba</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Alusta vestlust kasutades teise osapoole nime, e-posti aadressi või kasutajanime (näiteks <userId/>).",
+    "Invite by email": "Saada kutse e-kirjaga",
+    "Zambia": "Sambia",
+    "Yemen": "Jeemen",
+    "Western Sahara": "Lääne-Sahara",
+    "Wallis & Futuna": "Wallis ja Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikan",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Usbekistan",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Araabia Ühendemiraadid",
+    "Ukraine": "Ukraina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "USA Neitsisaared",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks ja Caicos",
+    "Turkmenistan": "Türkmenistan",
+    "Turkey": "Türgi",
+    "Tunisia": "Tuneesia",
+    "Trinidad & Tobago": "Trinidad ja Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Ida-Timor",
+    "Thailand": "Tai",
+    "Tanzania": "Tansaania",
+    "Tajikistan": "Tadžikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé ja Príncipe",
+    "Syria": "Süüria",
+    "Switzerland": "Šveits",
+    "Sweden": "Rootsi",
+    "Swaziland": "Svaasimaa",
+    "Svalbard & Jan Mayen": "Svalbard ja Jan Mayen",
+    "Suriname": "Suriname",
+    "Sudan": "Sudaan",
+    "St. Vincent & Grenadines": "Saint Vincent",
+    "St. Pierre & Miquelon": "Saint-Pierre ja Miquelon",
+    "St. Martin": "Saint-Martin",
+    "St. Lucia": "Saint Lucia",
+    "St. Kitts & Nevis": "Saint Kitts ja Nevis",
+    "St. Helena": "Saint Helena",
+    "St. Barthélemy": "Saint-Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Hispaania",
+    "South Sudan": "Lõuna-Sudaan",
+    "South Korea": "Lõuna-Korea",
+    "South Georgia & South Sandwich Islands": "Lõuna-Georgia ja Lõuna-Sandwichi saared",
+    "South Africa": "Lõuna-Aafrika Vabariik",
+    "Somalia": "Somaalia",
+    "Solomon Islands": "Saalomoni Saared",
+    "Slovenia": "Sloveenia",
+    "Slovakia": "Slovakkia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seišellid",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Saudi Araabia",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Rwanda",
+    "Russia": "Venemaa",
+    "Romania": "Rumeenia",
+    "Qatar": "Katar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Poola",
+    "Pitcairn Islands": "Pitcairn",
+    "Philippines": "Filipiinid",
+    "Peru": "Peruu",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Paapua Uus-Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palestiina",
+    "Palau": "Belau",
+    "Pakistan": "Pakistan",
+    "Oman": "Omaan",
+    "Norway": "Norra",
+    "Northern Mariana Islands": "Põhja-Mariaanid",
+    "North Korea": "Põhja-Korea",
+    "Norfolk Island": "Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigeeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Uus-Meremaa",
+    "New Caledonia": "Uus-Kaledoonia",
+    "Netherlands": "Holland",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namiibia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mosambiik",
+    "Morocco": "Maroko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongoolia",
+    "Monaco": "Monaco",
+    "Moldova": "Moldova",
+    "Micronesia": "Mikroneesia",
+    "Mexico": "Mehhiko",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauritaania",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Marshalli Saared",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldiivid",
+    "Malaysia": "Malaisia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Põhja-Makedoonia",
+    "Macau": "Macau",
+    "Luxembourg": "Luksemburg",
+    "Lithuania": "Leedu",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Liibüa",
+    "Liberia": "Libeeria",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Liibanon",
+    "Latvia": "Läti",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kõrgõzstan",
+    "Kuwait": "Kuveit",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Keenia",
+    "Kazakhstan": "Kasahstan",
+    "Jordan": "Jordaania",
+    "Jersey": "Jersey",
+    "Japan": "Jaapan",
+    "Jamaica": "Jamaica",
+    "Italy": "Itaalia",
+    "Israel": "Iisrael",
+    "Isle of Man": "Mani saar",
+    "Ireland": "Iirimaa",
+    "Iraq": "Iraak",
+    "Iran": "Iraan",
+    "Indonesia": "Indoneesia",
+    "India": "India",
+    "Iceland": "Island",
+    "Hungary": "Ungari",
+    "Hong Kong": "Hongkong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard ja McDonald",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Gröönimaa",
+    "Greece": "Kreeka",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Saksamaa",
+    "Georgia": "Gruusia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Prantsuse Lõunaalad",
+    "French Polynesia": "Prantsuse Polüneesia",
+    "French Guiana": "Prantsuse Guajaana",
+    "France": "Prantsusmaa",
+    "Zimbabwe": "Zimbabwe",
+    "Finland": "Soome",
+    "Fiji": "Fidži",
+    "Faroe Islands": "Fääri saared",
+    "Falkland Islands": "Falklandi (Malviini) saared",
+    "Ethiopia": "Etioopia",
+    "Estonia": "Eesti",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Ekvatoriaal-Guinea",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egiptus",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Dominikaani Vabariik",
+    "Dominica": "Dominica",
+    "Djibouti": "Djibouti",
+    "Denmark": "Taani",
+    "Côte d’Ivoire": "Elevandiluurannik",
+    "Czech Republic": "Tšehhi",
+    "Cyprus": "Küpros",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuuba",
+    "Croatia": "Horvaatia",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cooki saared",
+    "Congo - Kinshasa": "Kongo DV",
+    "Congo - Brazzaville": "Kongo Vabariik",
+    "Comoros": "Komoorid",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "Kookossaared",
+    "Christmas Island": "Jõulusaar",
+    "China": "Hiina",
+    "Chile": "Tšiili",
+    "Chad": "Tšaad",
+    "Central African Republic": "Kesk-Aafrika Vabariik",
+    "Cayman Islands": "Kaimanisaared",
+    "Caribbean Netherlands": "Bonaire, Sint Eustatius ja Saba",
+    "Cape Verde": "Roheneemesaared",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodža",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaaria",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Briti Neitsisaared",
+    "British Indian Ocean Territory": "Briti India ookeani ala",
+    "Brazil": "Brasiilia",
+    "Bouvet Island": "Bouvet’ saar",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnia ja Hertsegoviina",
+    "Bolivia": "Boliivia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgia",
+    "Belarus": "Valgevene",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrein",
+    "Bahamas": "Bahama",
+    "Azerbaijan": "Aserbaidžaan",
+    "Austria": "Austria",
+    "Australia": "Austraalia",
+    "Aruba": "Aruba",
+    "Armenia": "Armeenia",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigua ja Barbuda",
+    "Antarctica": "Antarktis",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Ameerika Samoa",
+    "Algeria": "Alžeeria",
+    "Albania": "Albaania",
+    "Åland Islands": "Ahvenamaa",
+    "Afghanistan": "Afganistan",
+    "United States": "Ameerika Ühendriigid",
+    "United Kingdom": "Suurbritannia",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Sõnumid siin jututoas on läbivalt krüptitud. Kui uued kasutajad liituvad, siis klõpsides nende tunnuspilti saad kontrollida nende profiili.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Sõnumid siin jututoas on läbivalt krüptitud. Klõpsides tunnuspilti saad kontrollida kasutaja %(displayName)s profiili.",
+    "%(creator)s created this DM.": "%(creator)s alustas seda otsesuhtlust.",
+    "This is the start of <roomName/>.": "See on <roomName/> jututoa algus.",
+    "Add a photo, so people can easily spot your room.": "Selle, et teised märkaks sinu jututuba lihtsamini, palun lisa üks pilt.",
+    "%(displayName)s created this room.": "%(displayName)s lõi selle jututoa.",
+    "You created this room.": "Sa lõid selle jututoa.",
+    "<a>Add a topic</a> to help people know what it is about.": "Selleks, et teised teaks millega on tegemist, palun <a>lisa teema</a>.",
+    "Topic: %(topic)s ": "Teema: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Teema: %(topic)s (<a>muudetud</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "See on sinu ja kasutaja <displayName/> otsesuhtluse ajaloo algus.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Seni kuni emb-kumb teist kolmandaid osapooli liituma ei kutsu, olete siin vestluses vaid teie kahekesi.",
+    "Call Paused": "Kõne on ajutiselt peatatud",
+    "Takes the call in the current room off hold": "Võtab selles jututoas ootel oleva kõne",
+    "Places the call in the current room on hold": "Jätab kõne selles jututoas ootele",
+    "Role": "Roll",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
+    "Filter rooms and people": "Otsi jututubasid ja inimesi",
+    "Open the link in the email to continue registration.": "Registreerimisega jätkamiseks vajuta e-kirjas olevat linki.",
+    "A confirmation email has been sent to %(emailAddress)s": "Saatsime kinnituskirja %(emailAddress)s aadressile",
+    "Start a new chat": "Alusta uut vestlust"
 }

src/i18n/strings/fa.json

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

src/i18n/strings/gl.json

@@ -42,7 +42,7 @@
     "Invite new community members": "Convidará comunidade a novos participantes",
     "Invite to Community": "Convidar á comunidade",
     "Which rooms would you like to add to this community?": "Que salas desexaría engadir a esta comunidade?",
-    "Show these rooms to non-members on the community page and room list?": "Quere que estas salas se lle mostren a outros membros de fóra da comunidade na lista de salas?",
+    "Show these rooms to non-members on the community page and room list?": "Queres que estas salas se lle mostren a outras participantes de fóra da comunidade e na lista de salas?",
     "Add rooms to the community": "Engadir salas á comunidade",
     "Add to community": "Engadir á comunidade",
     "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar ás seguintes usuarias a %(groupId)s:",
@@ -74,7 +74,7 @@
     "Missing user_id in request": "Falta o user_id na petición",
     "Usage": "Uso",
     "/ddg is not a command": "/ddg non é unha orde",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para  utilizala, agarde que carguen os resultados de autocompletado e escolla entre eles.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Para utilizala, agarda a que carguen os resultados de autocompletado e escolle entre eles.",
     "Ignored user": "Usuaria ignorada",
     "You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s",
     "Unignored user": "Usuarias non ignoradas",
@@ -131,7 +131,7 @@
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
     "Failed to join room": "Non puideches entrar na sala",
     "Message Pinning": "Fixando mensaxe",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas  de tempo con formato 12 horas (ex. 2:30pm)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas de tempo con formato 12 horas (ex. 2:30pm)",
     "Always show message timestamps": "Mostrar sempre marcas de tempo",
     "Autoplay GIFs and videos": "Reprodución automática de GIFs e vídeos",
     "Enable automatic language detection for syntax highlighting": "Activar a detección automática de idioma para o resalte da sintaxe",
@@ -168,8 +168,8 @@
     "Authentication": "Autenticación",
     "Last seen": "Visto por última vez",
     "Failed to set display name": "Fallo ao establecer o nome público",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s",
-    "Mirror local video feed": "Copiar fonte de vídeo local",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "Mirror local video feed": "Replicar a fonte de vídeo local",
     "Cannot add any more widgets": "Non pode engadir máis trebellos",
     "The maximum permitted number of widgets have already been added to this room.": "Xa se lle engadiron o número máximo de trebellos a esta sala.",
     "Add a widget": "Engadir un trebello",
@@ -281,9 +281,9 @@
     "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala no directorio público de salas de %(domain)s?",
     "Who can read history?": "Quen pode ler o histórico?",
     "Anyone": "Calquera",
-    "Members only (since the point in time of selecting this option)": "Só membros (desde o momento en que se selecciona esta opción)",
-    "Members only (since they were invited)": "Só membros (desde que foron convidados)",
-    "Members only (since they joined)": "Só membros (desde que se uniron)",
+    "Members only (since the point in time of selecting this option)": "Só participantes (desde o momento en que se selecciona esta opción)",
+    "Members only (since they were invited)": "Só participantes (desde que foron convidadas)",
+    "Members only (since they joined)": "Só participantes (desde que se uniron)",
     "Permissions": "Permisos",
     "Advanced": "Avanzado",
     "Add a topic": "Engadir asunto",
@@ -298,7 +298,7 @@
     "You have <a>enabled</a> URL previews by default.": "<a>Activou</a> a vista previa de URL por defecto.",
     "You have <a>disabled</a> URL previews by default.": "<a>Desactivou</a> a vista previa de URL por defecto.",
     "URL previews are enabled by default for participants in this room.": "As vistas previas de URL están activas por defecto para os participantes desta sala.",
-    "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por defecto para os  participantes desta sala.",
+    "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por defecto para as participantes desta sala.",
     "URL Previews": "Vista previa de URL",
     "Error decrypting audio": "Fallo ao descifrar audio",
     "Error decrypting attachment": "Fallo descifrando o anexo",
@@ -346,7 +346,7 @@
     "Only visible to community members": "Só visible para os participantes da comunidade",
     "Filter community rooms": "Filtrar salas da comunidade",
     "Something went wrong when trying to get your communities.": "Algo fallou ao intentar obter as súas comunidades.",
-    "You're not currently a member of any communities.": "Ate o momento non é membro de ningunha comunidade.",
+    "You're not currently a member of any communities.": "Ate o momento non es participante en ningunha comunidade.",
     "Unknown Address": "Enderezo descoñecido",
     "Allow": "Permitir",
     "Delete Widget": "Eliminar widget",
@@ -390,13 +390,13 @@
     "was invited %(count)s times|one": "foi convidada",
     "were banned %(count)s times|other": "foron prohibidas %(count)s veces",
     "were banned %(count)s times|one": "foron prohibidas",
-    "was banned %(count)s times|other": "foi prohibida  %(count)s veces",
+    "was banned %(count)s times|other": "foi vetada %(count)s veces",
     "was banned %(count)s times|one": "foi prohibida",
     "were unbanned %(count)s times|other": "retiróuselle a prohibición %(count)s veces",
     "were unbanned %(count)s times|one": "retrouseille a prohibición",
-    "was unbanned %(count)s times|other": "retrouseille a prohibición  %(count)s veces",
+    "was unbanned %(count)s times|other": "retirouselle o veto %(count)s veces",
     "was unbanned %(count)s times|one": "retiróuselle a prohibición",
-    "were kicked %(count)s times|other": "foron expulsadas  %(count)s veces",
+    "were kicked %(count)s times|other": "foron expulsadas %(count)s veces",
     "were kicked %(count)s times|one": "foron expulsadas",
     "was kicked %(count)s times|other": "foi expulsada %(count)s veces",
     "was kicked %(count)s times|one": "foi expulsada",
@@ -465,7 +465,7 @@
     "You must <a>register</a> to use this functionality": "Debe <a>rexistrarse</a> para utilizar esta función",
     "You must join the room to see its files": "Debes unirte a sala para ver os seus ficheiros",
     "There are no visible files in this room": "Non hai ficheiros visibles nesta sala",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML para a páxina da súa comunidade</h1>\n<p>\n    Utilice a descrición longa para presentar novos membros a comunidade, ou publicar algunha  <a href=\"foo\">ligazón</a> importante\n   \n</p>\n<p>\n    Tamén pode utilizar etiquetas 'img'\n</p>\n",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML para a páxina da túa comunidade</h1>\n<p>\n    Utiliza a descrición longa para presentalle a comunidade ás novas participantes, ou publicar algunha  <a href=\"foo\">ligazón</a> importante\n   \n</p>\n<p>\n    Tamén podes usar etiquetas 'img'\n</p>\n",
     "Add rooms to the community summary": "Engadir salas ao resumo da comunidade",
     "Which rooms would you like to add to this summary?": "Que salas desexa engadir a este resumo?",
     "Add to summary": "Engadir ao resumo",
@@ -487,13 +487,13 @@
     "Leave %(groupName)s?": "Deixar %(groupName)s?",
     "Leave": "Saír",
     "Community Settings": "Axustes da comunidade",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas móstranse aos membros da comunidade na páxina da comunidade. Os participantes da comunidade poden unirse ás salas premendo nelas.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas móstranse ás participantes da comunidade na páxina da comunidade. As participantes da comunidade poden unirse ás salas premendo nelas.",
     "Add rooms to this community": "Engadir salas a esta comunidade",
     "Featured Rooms:": "Salas destacadas:",
     "Featured Users:": "Usuarias destacadas:",
     "%(inviter)s has invited you to join this community": "%(inviter)s convidoute a entrar nesta comunidade",
     "You are an administrator of this community": "Administras esta comunidade",
-    "You are a member of this community": "É membro desta comunidade",
+    "You are a member of this community": "Participas nesta comunidade",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "A túa comunidade non ten unha descrición longa, ou unha páxina HTML que lle mostrar ás participantes.<br />Preme aquí para abrir os axustes e publicar unha!",
     "Long Description (HTML)": "Descrición longa (HTML)",
     "Description": "Descrición",
@@ -547,14 +547,14 @@
     "<not supported>": "<non soportado>",
     "Import E2E room keys": "Importar chaves E2E da sala",
     "Cryptography": "Criptografía",
-    "Analytics": "Analytics",
+    "Analytics": "Análise",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s recolle información analítica anónima para permitirnos mellorar a aplicación.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A intimidade impórtanos, así que non recollemos información personal ou identificable nos datos dos nosos análises.",
     "Learn more about how we use analytics.": "Saber máis sobre como utilizamos analytics.",
     "Labs": "Labs",
     "Check for update": "Comprobar actualización",
     "Reject all %(invitedRooms)s invites": "Rexeitar todos os %(invitedRooms)s convites",
-    "Start automatically after system login": "Iniciar automaticamente  despois de iniciar sesión",
+    "Start automatically after system login": "Iniciar automaticamente despois de iniciar sesión",
     "No media permissions": "Sen permisos de medios",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Igual ten que permitir manualmente a %(brand)s acceder ao seus micrófono e cámara",
     "No Microphones detected": "Non se detectaron micrófonos",
@@ -639,11 +639,11 @@
     "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
     "Key request sent.": "Petición de chave enviada.",
     "Flair": "Popularidade",
-    "Showing flair for these communities:": "Mostrar a popularidade destas comunidades:",
+    "Showing flair for these communities:": "Mostrando a popularidade destas comunidades:",
     "Display your community flair in rooms configured to show it.": "Mostrar a popularidade da túa comunidade nas salas configuradas para que a mostren.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Sabías que podes usar as comunidades para filtrar a túa experiencia en %(brand)s!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastra un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Podes premer nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
-    "Deops user with given id": "Degradar á usuaria con ese ID",
+    "Deops user with given id": "Degrada usuaria co id proporcionado",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s",
     "Code": "Código",
     "Unable to join community": "Non te puideches unir a comunidade",
@@ -804,8 +804,8 @@
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Iso fará que a túa deixe de ter uso de xeito permanente. Non poderás acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuaria. Suporá que sairás de todalas salas de conversas nas que estabas e eliminarás os detalles da túa conta do servidores de identidade. <b>Esta acción non ten volta</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Desactivando a súa conta <b>non supón que por defecto esquezamos as súas mensaxes enviadas.</b> Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.",
     "To continue, please enter your password:": "Para continuar introduza o seu contrasinal:",
-    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "A visibilidade das mensaxes en Matrix é parecida á dos correos electrónicos. Que esquezamos as túas mensaxes significa que as mensaxes non se van a compartir con ningún novo membro ou usuaria que non estea rexistrada. Mais aqueles usuarias que xa tiveron acceso a estas mensaxes si que seguirán tendo acceso as súas propias copias desas mensaxes.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Esquezan  todas as mensaxes que eu enviara no momento en que elimine a miña conta. (<b>Aviso</b>: iso suporá que os seguintes participantes só verán unha versión incompleta das conversas.)",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "A visibilidade das mensaxes en Matrix é parecida á dos correos electrónicos. Que esquezamos as túas mensaxes significa que as mensaxes non se van a compartir con ningunha nova participante ou usuaria que non estea rexistrada. Mais aquelas usuarias que xa tiveron acceso a estas mensaxes si que seguirán tendo acceso as súas propias copias desas mensaxes.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Esquece todas as mensaxes que enviei cando a miña conta está desactivada. (<b>Aviso</b>: isto fará que usuarias futuras vexan unha versión incompleta das conversas)",
     "Share Room": "Compartir sala",
     "Link to most recent message": "Ligazón ás mensaxes máis recentes",
     "Share User": "Compartir usuaria",
@@ -833,7 +833,7 @@
     "The email field must not be blank.": "Este campo de correo non pode quedar en branco.",
     "The phone number field must not be blank.": "O número de teléfono non pode quedar en branco.",
     "The password field must not be blank.": "O campo do contrasinal non pode quedar en branco.",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non vai poder enviar mensaxes ata que revise e acepte  <consentLink>os nosos termos e condicións</consentLink>.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non vas poder enviar mensaxes ata que revises e aceptes <consentLink>os nosos termos e condicións</consentLink>.",
     "A call is currently being placed!": "Xa se estableceu a chamada!",
     "Sorry, your homeserver is too old to participate in this room.": "Lametámolo, o seu servidor de inicio é vello de máis para participar en esta sala.",
     "Please contact your homeserver administrator.": "Por favor, contacte coa administración do seu servidor.",
@@ -920,14 +920,14 @@
     "Messages": "Mensaxes",
     "Actions": "Accións",
     "Other": "Outro",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Anteponse ¯\\_(ツ)_/¯  a mensaxe en texto plano",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Anteponse ¯\\_(ツ)_/¯ a mensaxe en texto plano",
     "Sends a message as plain text, without interpreting it as markdown": "Envía unha mensaxe como texto plano, sen interpretalo como markdown",
     "Sends a message as html, without interpreting it as markdown": "Envía unha mensaxe como html, sen interpretalo como markdown",
     "Upgrades a room to a new version": "Subir a sala de versión",
     "You do not have the required permissions to use this command.": "Non tes os permisos suficientes para usar este comando.",
     "Error upgrading room": "Fallo ao actualizar a sala",
     "Double check that your server supports the room version chosen and try again.": "Comproba ben que o servidor soporta a versión da sala escollida e inténtao outra vez.",
-    "Changes your display nickname in the current room only": "Cambia o teu nome mostrado só para esta esta sala",
+    "Changes your display nickname in the current room only": "Cambia o teu nome mostrado só para esta sala",
     "Changes the avatar of the current room": "Cambia o avatar da sala actual",
     "Changes your avatar in this current room only": "Cambia o teu avatar só nesta sala",
     "Changes your avatar in all rooms": "Cambia o teu avatar en todas as salas",
@@ -997,7 +997,7 @@
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Se hai contexto que cres que axudaría a analizar o problema, como o que estabas a facer, ID da sala, ID da usuaria, etc., por favor inclúeo aquí.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Para evitar informes duplicados, mira <existingIssuesLink>os informes existentes</existingIssuesLink> primeiro (e engade un +1) ou <newIssueLink>crea un novo informe</newIssueLink> se non o atopas.",
     "Command Help": "Comando Axuda",
-    "To help us prevent this in future, please <a>send us logs</a>.": "Para axudarnos a previr esto no futuro,  envíanos <a>o rexistro</a>.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Para axudarnos a evitar esto no futuro, envíanos <a>o rexistro</a>.",
     "Help": "Axuda",
     "Explore Public Rooms": "Explorar Salas Públicas",
     "Explore": "Explorar",
@@ -1085,7 +1085,7 @@
     "Unrecognised address": "Enderezo non recoñecible",
     "You do not have permission to invite people to this room.": "Non tes permiso para convidar a xente a esta sala.",
     "User %(userId)s is already in the room": "A usuaria %(userId)s xa está na sala",
-    "User %(user_id)s does not exist": "A usuaria %(user_id)s  non existe",
+    "User %(user_id)s does not exist": "A usuaria %(user_id)s non existe",
     "User %(user_id)s may or may not exist": "A usuaria %(user_id)s podería non existir",
     "The user must be unbanned before they can be invited.": "A usuria debe ser desbloqueada antes de poder convidala.",
     "Messages in this room are end-to-end encrypted.": "As mensaxes desta sala están cifradas de extremo-a-extremo.",
@@ -1153,7 +1153,7 @@
     "Try out new ways to ignore people (experimental)": "Novos xeitos de ignorar persoas (experimental)",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Mostrar mensaxes de entrada/saída (mais non convites/expulsións/bloqueos)",
     "Subscribing to a ban list will cause you to join it!": "Subscribíndote a unha lista de bloqueo fará que te unas a ela!",
-    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Aviso</b>: Actualizando a sala non fará que <i>os membros da sala migren automáticamente a nova versión da sala.</i> Publicaremos unha ligazón a nova sala na versión antiga da sala - os membros terán que premer na ligazón para unirse a nova sala.",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Aviso</b>: Actualizando a sala non farás que <i>as participantes da sala migren automáticamente á nova versión da sala.</i> Publicaremos unha ligazón á nova sala na versión antiga da sala - as participantes terán que premer na ligazón para unirse a nova sala.",
     "Join the conversation with an account": "Únete a conversa cunha conta",
     "Re-join": "Volta a unirte",
     "You can only join it with a working invite.": "Só podes unirte cun convite activo.",
@@ -1555,7 +1555,7 @@
     "Revoke": "Revogar",
     "Share": "Compartir",
     "Discovery options will appear once you have added an email above.": "As opcións de descubrimento aparecerán após ti engadas un email.",
-    "Unable to revoke sharing for phone number": "Non se puido  revogar a compartición do número de teléfono",
+    "Unable to revoke sharing for phone number": "Non se puido revogar a compartición do número de teléfono",
     "Unable to share phone number": "Non se puido compartir o número de teléfono",
     "Unable to verify phone number.": "Non se puido verificar o número de teléfono.",
     "Please enter verification code sent via text.": "Escribe o código de verificación enviado no SMS.",
@@ -1776,7 +1776,7 @@
     "edited": "editada",
     "Can't load this message": "Non se cargou a mensaxe",
     "Submit logs": "Enviar rexistro",
-    "Failed to load group members": "Fallou a carga dos membros do grupo",
+    "Failed to load group members": "Fallou a carga das participantes do grupo",
     "Frequently Used": "Utilizado con frecuencia",
     "Smileys & People": "Sorrisos e Persoas",
     "Animals & Nature": "Animais e Natureza",
@@ -1884,7 +1884,7 @@
     "Message layout": "Disposición da mensaxe",
     "Compact": "Compacta",
     "Modern": "Moderna",
-    "Power level": "Nivel de permisos",
+    "Power level": "Nivel responsabilidade",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifica este dispositivo para marcalo como confiable. Confiando neste dispositivo permite que ti e outras usuarias estedes máis tranquilas ao utilizar mensaxes cifradas.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Ao verificar este dispositivo marcaralo como confiable, e as usuarias que confiaron en ti tamén confiarán nel.",
     "Waiting for partner to confirm...": "Agardando a que o contacto confirme...",
@@ -2042,7 +2042,7 @@
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Falta a chave pública do captcha na configuración do servidor. Informa desto á administración do teu servidor.",
     "Please review and accept all of the homeserver's policies": "Revisa e acepta todas as cláusulas do servidor",
     "Please review and accept the policies of this homeserver:": "Revisa e acepta as cláusulas deste servidor:",
-    "Unable to validate homeserver/identity server": "Non se puido validar o servidor/servidor de identidade",
+    "Unable to validate homeserver/identity server": "Non se puido validar o servidor de inicio/servidor de identidade",
     "Your Modular server": "O teu servidor Modular",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Escribe a localización do teu servidor Modular. Podería utilizar o teu propio nome de dominio ou ser un subdominio de <a>modular.im</a>.",
     "Server Name": "Nome do Servidor",
@@ -2206,7 +2206,7 @@
     "If you don't want to set this up now, you can later in Settings.": "Se non queres configurar esto agora, pódelo facer posteriormente nos Axustes.",
     "Don't ask again": "Non preguntar outra vez",
     "New Recovery Method": "Novo Método de Recuperación",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Detectouse un novo método  de chave e frase de paso de recuperación para Mensaxes Seguras.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Detectouse unha nova frase de paso de recuperación e chave para Mensaxes Seguras.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se non configuras o novo método de recuperación, un atacante podería intentar o acceso á túa conta. Cambia inmediatamente o contrasinal da conta e configura un novo método de recuperación nos Axustes.",
     "This session is encrypting history using the new recovery method.": "Esta sesión está cifrando o historial usando o novo método de recuperación.",
     "Go to Settings": "Ir a Axustes",
@@ -2372,7 +2372,7 @@
     "We’re excited to announce Riot is now Element!": "Emociónanos comunicar que Riot agora é Element!",
     "Learn more at <a>element.io/previously-riot</a>": "Coñece máis en <a>element.io/previously-riot</a>",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Podes usar as opcións de servidor personalizado para conectar con outros servidores Matrix indicando un URL diferente para o servidor. Poderás usar %(brand)s cunha conta Matrix existente noutro servidor de inicio.",
-    "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of <a>element.io</a>.": "Escribe a localización do teu servidor Element Matrix Services. Podería ser o teu propio dominio ou un subdominio de  <a>element.io</a>.",
+    "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of <a>element.io</a>.": "Escribe a localización do teu servidor Element Matrix Services. Podería ser o teu propio dominio ou un subdominio de <a>element.io</a>.",
     "Search rooms": "Buscar salas",
     "User menu": "Menú de usuaria",
     "%(brand)s Web": "Web %(brand)s",
@@ -2453,7 +2453,7 @@
     "Privacy": "Privacidade",
     "There was an error updating your community. The server is unable to process your request.": "Algo fallou ó actualizar a comunidade. O servidor non é quen de procesar a solicitude.",
     "Update community": "Actualizar comunidade",
-    "May include members not in %(communityName)s": "Podería incluir membros que non están en %(communityName)s",
+    "May include members not in %(communityName)s": "Podería incluir participantes que non están en %(communityName)s",
     "Start a conversation with someone using their name, username (like <userId/>) or email address. This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>.": "Iniciar unha conversa con alguén utilizando o seu nome, nome de usuaria (como <userId/>) ou enderezo de email. Esto non as convidará a %(communityName)s. Para convidar a alguén a %(communityName)s, preme <a>aquí</a>.",
     "Failed to find the general chat for this community": "Non se atopou o chat xenérico para esta comunidade",
     "Community settings": "Axustes da comunidade",
@@ -2561,5 +2561,289 @@
     "Add comment": "Engadir comentario",
     "Please go into as much detail as you like, so we can track down the problem.": "Podes entrar en detalle canto desexes, así poderemos entender mellor o problema.",
     "%(senderName)s ended the call": "%(senderName)s finalizou a chamada",
-    "You ended the call": "Finalizaches a chamada"
+    "You ended the call": "Finalizaches a chamada",
+    "Now, let's help you get started": "Ímosche axudar neste comezo",
+    "Welcome %(name)s": "Benvida %(name)s",
+    "Add a photo so people know it's you.": "Engade unha foto así a xente recoñecerate.",
+    "Great, that'll help people know it's you": "Moi ben, así axudarás a que outras persoas te recoñezan",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Convida a persoas usando o seu nome, enderezo de email, nome de usuaria (como <userId/>) ou <a>comparte esta sala</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Inicia unha conversa con alguén usando o seu nome, enderezo de email ou nome de usuaria (como <userId/>).",
+    "Invite by email": "Convidar por email",
+    "Use the + to make a new room or explore existing ones below": "Usa o + para crear unha nova sala ou explora as existentes embaixo",
+    "Offline encrypted messaging using dehydrated devices": "Mensaxería cifrada offline usando dispositivos \"deshidratados\"",
+    "New version of %(brand)s is available": "Hai unha nova versión de %(brand)s dispoñible",
+    "Update %(brand)s": "Actualizar %(brand)s",
+    "Enable desktop notifications": "Activar notificacións de escritorio",
+    "Don't miss a reply": "Non perdas as réplicas",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrain",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbaixán",
+    "Austria": "Austria",
+    "Australia": "Australia",
+    "Aruba": "Aruba",
+    "Armenia": "Armenia",
+    "Argentina": "Arxentina",
+    "Antigua & Barbuda": "Antigua & Barbuda",
+    "Antarctica": "Antártida",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Samoa americana",
+    "Algeria": "Alxeria",
+    "Albania": "Albania",
+    "Åland Islands": "Åland Islands",
+    "Afghanistan": "Afghanistán",
+    "United States": "EEUU de América",
+    "United Kingdom": "Reino Unido",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "República Dominicana",
+    "Dominica": "Dominica",
+    "Djibouti": "Djibouti",
+    "Denmark": "Dinamarca",
+    "Côte d’Ivoire": "Costa de Marfil",
+    "Czech Republic": "República Checa",
+    "Cyprus": "Chipre",
+    "Curaçao": "Curaçao",
+    "Cuba": "Cuba",
+    "Croatia": "Croacia",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cook Islands",
+    "Congo - Kinshasa": "Congo - Kinshasa",
+    "Congo - Brazzaville": "Congo - Brazzaville",
+    "Comoros": "Comoros",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "Cocos (Keeling) Islands",
+    "Christmas Island": "Christmas Island",
+    "China": "China",
+    "Chile": "Chile",
+    "Chad": "Chad",
+    "Central African Republic": "República Centroafricana",
+    "Cayman Islands": "Illas caimán",
+    "Caribbean Netherlands": "Paises baixos do Caribe",
+    "Cape Verde": "Cabo Verde",
+    "Canada": "Canadá",
+    "Cameroon": "Camerún",
+    "Cambodia": "Cambodia",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaria",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "British Virgin Islands",
+    "British Indian Ocean Territory": "British Indian Ocean Territory",
+    "Brazil": "Brasil",
+    "Bouvet Island": "Illa Bouvet",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnia",
+    "Bolivia": "Bolivia",
+    "Bhutan": "Bután",
+    "Bermuda": "Bermuda",
+    "Benin": "Benín",
+    "Belize": "Belice",
+    "Belgium": "Bélxica",
+    "Belarus": "Belarús",
+    "Places the call in the current room on hold": "Pon en pausa a chamada da sala actual",
+    "Takes the call in the current room off hold": "Acepta a chamada na sala actual",
+    "%(creator)s created this DM.": "%(creator)s creou esta MD.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "As mensaxes desta sala están cifradas de extremo-a-extremo. Cando se unan, podes verificar as persoas no seu perfil, tocando no seu avatar.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Aquí as mensaxes están cifradas de extremo-a-extre. Verifica a %(displayName)s no seu perfil - toca no seu avatar.",
+    "Role": "Rol",
+    "This is the start of <roomName/>.": "Este é o comezo de <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Engade unha foto para que se poida identificar a sala facilmente.",
+    "%(displayName)s created this room.": "%(displayName)s creou esta sala.",
+    "You created this room.": "Creaches esta sala.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Engade un tema</a> para axudarlle á xente que coñeza de que trata.",
+    "Topic: %(topic)s ": "Asunto: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Asunto: %(topic)s (<a>editar</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Este é o comezo do teu historial de conversa con <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Só vós as dúas estades nesta conversa, a non ser que convidedes a alguén máis.",
+    "Call Paused": "Chamada en pausa",
+    "Zimbabwe": "Zimbabue",
+    "Zambia": "Zambia",
+    "Yemen": "Yemen",
+    "Western Sahara": "Sahara Occidental",
+    "Wallis & Futuna": "Wallis & Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Cidade do Vaticano",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistan",
+    "Uruguay": "Uruguai",
+    "United Arab Emirates": "Emiratos Árabes Unidos",
+    "Ukraine": "Ucraína",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "U.S. Virgin Islands",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks & Caicos Islands",
+    "Turkmenistan": "Turkmenistán",
+    "Turkey": "Turquía",
+    "Tunisia": "Túnez",
+    "Trinidad & Tobago": "Trinidad & Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor-Leste",
+    "Thailand": "Tailandia",
+    "Tanzania": "Tanzania",
+    "Tajikistan": "Tajikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "Santo Tomé e Príncipe",
+    "Syria": "Siria",
+    "Switzerland": "Suiza",
+    "Sweden": "Suecia",
+    "Swaziland": "Suazilandia",
+    "Svalbard & Jan Mayen": "Svalbard & Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Sudán",
+    "St. Vincent & Grenadines": "St. Vincent & Grenadines",
+    "St. Pierre & Miquelon": "St. Pierre & Miquelon",
+    "St. Martin": "St. Martin",
+    "St. Lucia": "St. Lucia",
+    "St. Kitts & Nevis": "St. Kitts & Nevis",
+    "St. Helena": "St. Helena",
+    "St. Barthélemy": "St. Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "España",
+    "South Sudan": "Sudán do Sur",
+    "South Korea": "Corea do Sur",
+    "South Georgia & South Sandwich Islands": "Illas South Georgia & South Sandwich",
+    "South Africa": "África do Sur",
+    "Somalia": "Somalia",
+    "Solomon Islands": "Illas Salomón",
+    "Slovenia": "Eslovenia",
+    "Slovakia": "Eslovaquia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Serra Leona",
+    "Seychelles": "Seichelles",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Arabia Saudita",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Reunión",
+    "Rwanda": "Ruanda",
+    "Russia": "Rusia",
+    "Romania": "Romanía",
+    "Qatar": "Catar",
+    "Puerto Rico": "Porto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polonia",
+    "Pitcairn Islands": "Illas Pitcairn",
+    "Philippines": "Filipinas",
+    "Peru": "Perú",
+    "Paraguay": "Paraguai",
+    "Papua New Guinea": "Papua Nova Guinea",
+    "Panama": "Panamá",
+    "Palestine": "Palestina",
+    "Palau": "Palau",
+    "Pakistan": "Paquistán",
+    "Oman": "Omán",
+    "Norway": "Noruega",
+    "Northern Mariana Islands": "Illas Marianas do Norte",
+    "North Korea": "Corea do Norte",
+    "Norfolk Island": "Illa Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nixeria",
+    "Niger": "Níxer",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Nova Zelanda",
+    "New Caledonia": "Nova Caledonia",
+    "Netherlands": "Paises Baixos",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mozambique",
+    "Morocco": "Marrocos",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongolia",
+    "Monaco": "Mónaco",
+    "Moldova": "Moldavia",
+    "Micronesia": "Micronesia",
+    "Mexico": "México",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauricio",
+    "Mauritania": "Mauritania",
+    "Martinique": "Martinica",
+    "Marshall Islands": "Illas Marshall",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldivas",
+    "Malaysia": "Malaisia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagascar",
+    "Macedonia": "Macedonia",
+    "Macau": "Macau",
+    "Luxembourg": "Luxemburgo",
+    "Lithuania": "Lituania",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libia",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesoto",
+    "Lebanon": "Líbano",
+    "Latvia": "Letonia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kyrgyzstan",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenia",
+    "Kazakhstan": "Kazakhstan",
+    "Jordan": "Xordania",
+    "Jersey": "Jersey",
+    "Japan": "Xapón",
+    "Jamaica": "Xamaica",
+    "Italy": "Italia",
+    "Israel": "Israel",
+    "Isle of Man": "Illa de Man",
+    "Ireland": "Irlanda",
+    "Iraq": "Iraq",
+    "Iran": "Irán",
+    "Indonesia": "Indonesia",
+    "India": "India",
+    "Iceland": "Islandia",
+    "Hungary": "Hungría",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard & McDonald Islands",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Goam",
+    "Guadeloupe": "Guadalupe",
+    "Grenada": "Granada",
+    "Greenland": "Groenlandia",
+    "Greece": "Grecia",
+    "Gibraltar": "Xibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Alemaña",
+    "Georgia": "Xeorxia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabón",
+    "French Southern Territories": "French Southern Territories",
+    "French Polynesia": "Polinesia francesa",
+    "French Guiana": "Guaiana Francesa",
+    "France": "Francia",
+    "Finland": "Finlandia",
+    "Fiji": "Fiji",
+    "Faroe Islands": "Illas Feroe",
+    "Falkland Islands": "Illas Falkland",
+    "Ethiopia": "Etiopía",
+    "Estonia": "Estonia",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Guinea Ecuatorial",
+    "El Salvador": "O Salvador",
+    "Egypt": "Exipto",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s sala.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s salas.",
+    "Filter rooms and people": "Fitrar salas e persoas",
+    "Open the link in the email to continue registration.": "Abre a ligazón que hai no email para continuar co rexistro.",
+    "A confirmation email has been sent to %(emailAddress)s": "Enviouse un email de confirmación a %(emailAddress)s",
+    "Start a new chat": "Comezar nova conversa"
 }

src/i18n/strings/it.json

@@ -797,7 +797,7 @@
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Il tuo account sarà permanentemente inutilizzabile. Non potrai accedere e nessuno potrà ri-registrare lo stesso ID utente. Il tuo account abbandonerà tutte le stanze a cui partecipa e i dettagli del tuo account saranno rimossi dal server di identità. <b>Questa azione è irreversibile.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Disattivare il tuo account <b>non eliminerà in modo predefinito i messaggi che hai inviato</b>. Se vuoi che noi dimentichiamo i tuoi messaggi, seleziona la casella sotto.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilità dei messaggi in Matrix è simile alle email. Se dimentichiamo i messaggi significa che quelli che hai inviato non verranno condivisi con alcun utente nuovo o non registrato, ma gli utenti registrati che avevano già accesso ai messaggi avranno ancora accesso alla loro copia.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Per favore dimenticate tutti i messaggi che ho inviato quando il mio account viene disattivato (Attenzione: gli utenti futuri vedranno un elenco incompleto di conversazioni)",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Per favore dimenticate tutti i messaggi che ho inviato quando il mio account viene disattivato (<b>Attenzione:</b> gli utenti futuri vedranno un elenco incompleto di conversazioni)",
     "To continue, please enter your password:": "Per continuare, inserisci la tua password:",
     "Can't leave Server Notices room": "Impossibile abbandonare la stanza Notifiche Server",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Questa stanza viene usata per messaggi importanti dall'homeserver, quindi non puoi lasciarla.",
@@ -833,7 +833,7 @@
     "The email field must not be blank.": "Il campo email non deve essere vuoto.",
     "The phone number field must not be blank.": "Il campo telefono non deve essere vuoto.",
     "The password field must not be blank.": "Il campo passwordl non deve essere vuoto.",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non è possibile inviare alcun messaggio fino a quando non si esaminano e si accettano <consentLink> i nostri termini e condizioni </ permissionLink>.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non puoi inviare alcun messaggio fino a quando non leggi ed accetti <consentLink>i nostri termini e condizioni</consentLink>.",
     "A call is currently being placed!": "Attualmente c'è una chiamata in corso!",
     "System Alerts": "Avvisi di sistema",
     "Failed to remove widget": "Rimozione del widget fallita",
@@ -893,7 +893,7 @@
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Sostituzioni prevedibili come '@' al posto di 'a' non aiutano molto",
     "Add another word or two. Uncommon words are better.": "Aggiungi ancora una o due parole. Meglio parole non comuni.",
     "Repeats like \"aaa\" are easy to guess": "Ripetizioni come \"aaa\" sono facili da indovinare",
-    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Ripetizioni come \"abcabcabc\"  sono solo leggermente più difficili da indovinare di \"abc\"",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Ripetizioni come \"abcabcabc\" sono solo leggermente più difficili da indovinare di \"abc\"",
     "Sequences like abc or 6543 are easy to guess": "Sequenze come abc o 6543 sono facili da indovinare",
     "Recent years are easy to guess": "Gli anni recenti sono facili da indovinare",
     "Dates are often easy to guess": "Le date sono spesso facili da indovinare",
@@ -2564,5 +2564,289 @@
     "Rate %(brand)s": "Valuta %(brand)s",
     "Feedback sent": "Feedback inviato",
     "%(senderName)s ended the call": "%(senderName)s ha terminato la chiamata",
-    "You ended the call": "Hai terminato la chiamata"
+    "You ended the call": "Hai terminato la chiamata",
+    "Now, let's help you get started": "Alcuni consigli per iniziare",
+    "Welcome %(name)s": "Benvenuto/a %(name)s",
+    "Add a photo so people know it's you.": "Aggiungi una foto in modo che le persone ti riconoscano.",
+    "Great, that'll help people know it's you": "Ottimo, ciò aiuterà le persone a capire che sei tu",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invita qualcuno usando il suo nome, indirizzo email, nome utente (come <userId/>) o <a>condividi questa stanza</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Inizia una conversazione con qualcuno usando il suo nome, indirizzo email o nome utente (come <userId/>).",
+    "Invite by email": "Invita per email",
+    "Use the + to make a new room or explore existing ones below": "Usa la + per creare una nuova stanza o esplorare quelle esistenti sotto",
+    "New version of %(brand)s is available": "Nuova versione di %(brand)s disponibile",
+    "Update %(brand)s": "Aggiorna %(brand)s",
+    "Enable desktop notifications": "Attiva le notifiche desktop",
+    "Don't miss a reply": "Non perdere una risposta",
+    "Modal Widget": "Widget modale",
+    "%(creator)s created this DM.": "%(creator)s ha creato questo MD.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "I messaggi in questa stanza sono cifrati end-to-end. Quando qualcuno entra puoi verificarlo nel suo profilo, ti basta toccare il suo avatar.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Qui i messaggi sono cifrati end-to-end. Verifica %(displayName)s nel suo profilo - tocca il suo avatar.",
+    "This is the start of <roomName/>.": "Questo è l'inizio di <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Aggiungi una foto, in modo che le persone notino facilmente la stanza.",
+    "%(displayName)s created this room.": "%(displayName)s ha creato questa stanza.",
+    "You created this room.": "Hai creato questa stanza.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Aggiungi un argomento</a> per aiutare le persone a capire di cosa si parla.",
+    "Topic: %(topic)s ": "Argomento: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Argomento: %(topic)s (<a>modifica</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Questo è l'inizio della tua cronologia di messaggi diretti con <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Solo voi due siete in questa conversazione, a meno che uno di voi non inviti qualcuno.",
+    "Call Paused": "Chiamata in pausa",
+    "Takes the call in the current room off hold": "Riprende la chiamata nella stanza attuale",
+    "Places the call in the current room on hold": "Mette in pausa la chiamata nella stanza attuale",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Zambia",
+    "Yemen": "Yemen",
+    "Western Sahara": "Sahara Occidentale",
+    "Wallis & Futuna": "Wallis e Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Città del Vaticano",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistan",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Emirati Arabi Uniti",
+    "Ukraine": "Ucraina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Isole Vergini americane",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks e Caicos",
+    "Turkmenistan": "Turkmenistan",
+    "Turkey": "Turchia",
+    "Tunisia": "Tunisia",
+    "Trinidad & Tobago": "Trinidad e Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor Est",
+    "Thailand": "Tailandia",
+    "Tanzania": "Tanzania",
+    "Tajikistan": "Tagikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé e Príncipe",
+    "Syria": "Siria",
+    "Switzerland": "Svizzera",
+    "Sweden": "Svezia",
+    "Swaziland": "eSwatini",
+    "Svalbard & Jan Mayen": "Svalbard e Jan Mayen",
+    "Suriname": "Suriname",
+    "Sudan": "Sudan",
+    "St. Vincent & Grenadines": "Saint Vincent e Grenadine",
+    "St. Pierre & Miquelon": "Saint-Pierre e Miquelon",
+    "St. Martin": "Saint Martin",
+    "St. Lucia": "Saint Lucia",
+    "St. Kitts & Nevis": "Saint Kitts e Nevis",
+    "St. Helena": "Sant'Elena",
+    "St. Barthélemy": "Saint-Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Spagna",
+    "South Sudan": "Sudan del Sud",
+    "South Korea": "Corea del Sud",
+    "South Georgia & South Sandwich Islands": "Georgia del Sud e Isole Sandwich Australi",
+    "South Africa": "Sudafrica",
+    "Somalia": "Somalia",
+    "Solomon Islands": "Isole Solomone",
+    "Slovenia": "Slovenia",
+    "Slovakia": "Slovacchia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapore",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychelles",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Arabia Saudita",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Riunione",
+    "Rwanda": "Ruanda",
+    "Russia": "Russia",
+    "Romania": "Romania",
+    "Qatar": "Qatar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portogallo",
+    "Poland": "Polonia",
+    "Pitcairn Islands": "Isole Pitcairn",
+    "Philippines": "Filippine",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papua Nuova Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palestina",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Oman": "Oman",
+    "Norway": "Norvegia",
+    "Northern Mariana Islands": "Isole Marianne Settentrionali",
+    "North Korea": "Corea del Nord",
+    "Norfolk Island": "Isola Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Nuova Zelanda",
+    "New Caledonia": "Nuova Caledonia",
+    "Netherlands": "Paesi Bassi",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Birmania",
+    "Mozambique": "Mozambico",
+    "Morocco": "Marocco",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongolia",
+    "Monaco": "Monaco",
+    "Moldova": "Moldavia",
+    "Micronesia": "Micronesia",
+    "Mexico": "Messico",
+    "Mayotte": "Maiotta",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauritania",
+    "Martinique": "Martinica",
+    "Marshall Islands": "Isole Marshall",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldive",
+    "Malaysia": "Malesia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagascar",
+    "Macedonia": "Macedonia",
+    "Macau": "Macau",
+    "Luxembourg": "Lussemburgo",
+    "Lithuania": "Lituania",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libia",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libano",
+    "Latvia": "Lettonia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirghizistan",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenya",
+    "Kazakhstan": "Kazakistan",
+    "Jordan": "Giordania",
+    "Jersey": "Baliato di Jersey",
+    "Japan": "Giappone",
+    "Jamaica": "Giamaica",
+    "Italy": "Italia",
+    "Israel": "Israele",
+    "Isle of Man": "Isola di Man",
+    "Ireland": "Irlanda",
+    "Iraq": "Iraq",
+    "Iran": "Iran",
+    "Indonesia": "Indonesia",
+    "India": "India",
+    "Iceland": "Islanda",
+    "Hungary": "Ungheria",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Isole Heard e McDonald",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadalupa",
+    "Grenada": "Grenada",
+    "Greenland": "Groenlandia",
+    "Greece": "Grecia",
+    "Gibraltar": "Gibilterra",
+    "Ghana": "Ghana",
+    "Germany": "Germania",
+    "Georgia": "Georgia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Terre australi e antartiche francesi",
+    "French Polynesia": "Polinesia Francese",
+    "French Guiana": "Guiana Francese",
+    "France": "Francia",
+    "Finland": "Finlandia",
+    "Fiji": "Figi",
+    "Faroe Islands": "Isole Faroe",
+    "Falkland Islands": "Isole Falkland",
+    "Ethiopia": "Etiopia",
+    "Estonia": "Estonia",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Guinea Equatoriale",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egitto",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Repubblica Dominicana",
+    "Dominica": "Dominica",
+    "Djibouti": "Gibuti",
+    "Denmark": "Danimarca",
+    "Côte d’Ivoire": "Costa d'Avorio",
+    "Czech Republic": "Repubblica Ceca",
+    "Cyprus": "Cipro",
+    "Curaçao": "Curaçao",
+    "Cuba": "Cuba",
+    "Croatia": "Croazia",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Isole Cook",
+    "Congo - Kinshasa": "Congo - Kinshasa",
+    "Congo - Brazzaville": "Congo - Brazzaville",
+    "Comoros": "Comore",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "Isole Cocos (Keeling)",
+    "Christmas Island": "Isola di Natale",
+    "China": "Cina",
+    "Chile": "Cile",
+    "Chad": "Ciad",
+    "Central African Republic": "Repubblica Centrafricana",
+    "Cayman Islands": "Isole Cayman",
+    "Caribbean Netherlands": "Paesi Bassi caraibici",
+    "Cape Verde": "Capo Verde",
+    "Canada": "Canada",
+    "Cameroon": "Camerun",
+    "Cambodia": "Cambogia",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaria",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Isole Vergini britanniche",
+    "British Indian Ocean Territory": "Territorio britannico dell'Oceano Indiano",
+    "Brazil": "Brasile",
+    "Bouvet Island": "Isola Bouvet",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnia",
+    "Bolivia": "Bolivia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgio",
+    "Belarus": "Bielorussia",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrein",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbaigian",
+    "Austria": "Austria",
+    "Australia": "Australia",
+    "Aruba": "Aruba",
+    "Armenia": "Armenia",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigua e Barbuda",
+    "Antarctica": "Antartide",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Samoa Americane",
+    "Algeria": "Algeria",
+    "Albania": "Albania",
+    "Åland Islands": "Isole Åland",
+    "Afghanistan": "Afghanistan",
+    "United States": "Stati Uniti",
+    "United Kingdom": "Regno Unito",
+    "Role": "Ruolo",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanza.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanze.",
+    "Filter rooms and people": "Filtra stanze e persone",
+    "Open the link in the email to continue registration.": "Apri il link nell'email per continuare la registrazione.",
+    "A confirmation email has been sent to %(emailAddress)s": "È stata inviata un'email di conferma a %(emailAddress)s",
+    "Start a new chat": "Inizia una nuova chat"
 }

src/i18n/strings/ja.json

@@ -151,7 +151,7 @@
     "Preparing to send logs": "ログを送信する準備をしています",
     "Explore Account Data": "アカウントのデータを調べる",
     "The server may be unavailable or overloaded": "サーバは使用できないか、オーバーロードされています",
-    "Reject": "やめる",
+    "Reject": "拒否する",
     "Failed to set Direct Message status of room": "部屋のダイレクトメッセージステータスの設定に失敗しました",
     "Remove from Directory": "ディレクトリから消去する",
     "Enable them now": "今有効化する",
@@ -649,7 +649,7 @@
     "Incorrect password": "間違ったパスワード",
     "Deactivate Account": "アカウントを無効にする",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "これにより、あなたのアカウントは永久に使用できなくなります。ログインできなくなり、誰も同じユーザーIDを再登録できなくなります。これにより、参加しているすべてのルームから退室し、 IDサーバからあなたのアカウントの詳細が削除されます。<b>この操作は元に戻すことができません。</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "アカウントを無効にしても、<b>送信されたメッセージはデフォルトではなくなりません。</b>メッセージを忘れてしまった場合は、下のボックスにチェックを入れてください。",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "アカウントを無効にしても、<b>送信されたメッセージはデフォルトでは忘れられません。</b>メッセージを忘れさせたい場合は、下のボックスにチェックを入れてください。",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrixのメッセージの可視性は電子メールと似ています。メッセージを忘れると、新規または未登録のユーザーと共有することができませんが、既にこれらのメッセージにアクセスしている登録ユーザーは、依然としてそのコピーにアクセスできます。",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "アカウントを無効する際、送信したすべてのメッセージを削除(<b>警告:</b>これにより、今後のユーザーは会話履歴の全文を見ることができなくなります)",
     "To continue, please enter your password:": "続行するには、パスワードを入力してください:",
@@ -1433,5 +1433,38 @@
     "Go back": "戻る",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "重複した issue の報告が発生しないようにするため、まず<existingIssuesLink>既存の issue を確認</existingIssuesLink>してあなたが行おうとしているのと同様の報告が見つかった場合はその issue を +1 してください。見つからなかった場合は、<newIssueLink>新しい issue を作成</newIssueLink>して報告を行ってください。",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "バグが発生したり、共有したいフィードバックがある場合は、GitHub でお知らせください。",
-    "Report bugs & give feedback": "バグ報告とフィードバック"
+    "Report bugs & give feedback": "バグ報告とフィードバック",
+    "Everyone in this room is verified": "この部屋内の全員を検証済み",
+    "Verify all users in a room to ensure it's secure.": "この部屋内のすべてのユーザーが安全であることを確認しました。",
+    "You've successfully verified %(displayName)s!": "%(displayName)s は正常に検証されました。",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "%(deviceName)s (%(deviceId)s) は正常に検証されました。",
+    "You've successfully verified your device!": "このデバイスは正常に検証されました。",
+    "You've successfully verified this user.": "このユーザーは正常に検証されました。",
+    "Reject & Ignore user": "拒否した上でこのユーザーを無視する",
+    "<userName/> invited you": "<userName/> があなたを招待しています",
+    "Do you want to join %(roomName)s?": "%(roomName)s に参加しますか？",
+    "Start chatting": "チャットを開始",
+    "<userName/> wants to chat": "<userName/> がチャット開始を求めています",
+    "Do you want to chat with %(user)s?": "%(user)s とのチャットを開始しますか？",
+    "Use the <a>Desktop app</a> to search encrypted messages": "<a>デスクトップアプリ</a>を使用すると暗号化されたメッセージを検索できます",
+    "You have no visible notifications in this room.": "この部屋に確認すべき通知はありません。",
+    "You’re all caught up": "確認するものはありません",
+    "Got it": "了解",
+    "Got It": "了解",
+    "Accepting…": "了承中…",
+    "Waiting for %(displayName)s to verify…": "%(displayName)s が検証するのを待っています…",
+    "Waiting for %(displayName)s to accept…": "%(displayName)s が了承するのを待っています…",
+    "Room avatar": "部屋のアバター",
+    "Start Verification": "検証を開始",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "セキュリティ強化するために、両者のデバイスでワンタイムコードを確認し、このユーザーを検証することができます。",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "あなたのメッセージは保護されており、あなたと宛先だけが保護を解除してメッセージを閲覧するための固有の鍵を持っています。",
+    "%(name)s wants to verify": "%(name)s が検証を求めています",
+    "You sent a verification request": "あなたが検証リクエストを送信しました",
+    "This account has been deactivated.": "このアカウントは、無効化されています。",
+    "Forget Room": "部屋を忘れる",
+    "Forget this room": "部屋を忘れる",
+    "Recently Direct Messaged": "最近ダイレクトメッセージで会話したユーザー",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "この部屋に誰かを招待したい場合は、招待したいユーザーの名前、（ <userId/> の様な）ユーザー名、またはメールアドレスを指定するか、<a>この部屋を共有</a>してください。",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "この部屋に誰かを招待したい場合は、招待したいユーザーの名前、メールアドレス、または（ <userId/> の様な）ユーザー名を指定するか、<a>この部屋を共有</a>してください。",
+    "Upgrade your encryption": "暗号化をアップグレード"
 }

src/i18n/strings/pl.json

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

src/i18n/strings/pt_BR.json

@@ -300,7 +300,7 @@
     "Ongoing conference call%(supportedText)s.": "Chamada em grupo em andamento%(supportedText)s.",
     "Online": "Conectada/o",
     "Idle": "Ocioso",
-    "Offline": "Desconectado",
+    "Offline": "Offline",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O arquivo exportado irá permitir a qualquer pessoa que o acesse a descriptografar qualquer uma das mensagens criptografadas que você veja, portanto seja bastante cuidadosa(o) em manter este arquivo seguro. Para deixar este arquivo mais protegido, recomendamos que você insira uma senha abaixo, que será usada para criptografar o arquivo. Só será possível importar os dados usando exatamente a mesma senha.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este processo faz com que você possa importar as chaves de criptografia que tinha previamente exportado de outro cliente Matrix. Você poderá então descriptografar todas as mensagens que o outro cliente pôde criptografar.",
     "Start automatically after system login": "Iniciar automaticamente ao iniciar o sistema",
@@ -461,7 +461,7 @@
     "%(duration)sd": "%(duration)sd",
     "Online for %(duration)s": "Online há %(duration)s",
     "Idle for %(duration)s": "Inativo há %(duration)s",
-    "Offline for %(duration)s": "Desconectado há %(duration)s",
+    "Offline for %(duration)s": "Offline há %(duration)s",
     "Unknown for %(duration)s": "Status desconhecido há %(duration)s",
     "Unknown": "Desconhecido",
     "Replying": "Em resposta a",
@@ -1431,7 +1431,7 @@
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s não consegue pesquisar as mensagens criptografadas armazenadas localmente em um navegador de internet. Use o <desktopLink>%(brand)s para Computador</desktopLink> para que as mensagens criptografadas sejam exibidas nos resultados de buscas.",
     "Connecting to integration manager...": "Conectando ao gestor de integrações...",
     "Cannot connect to integration manager": "Não foi possível conectar ao gerenciador de integrações",
-    "The integration manager is offline or it cannot reach your homeserver.": "Ou o gerenciador de integrações está desconectado, ou ele não conseguiu acessar o seu servidor.",
+    "The integration manager is offline or it cannot reach your homeserver.": "Ou o gerenciador de integrações está indisponível, ou ele não conseguiu acessar o seu servidor.",
     "This session is backing up your keys. ": "Esta sessão está fazendo backup das suas chaves. ",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Esta sessão <b>não está fazendo backup de suas chaves</b>, mas você tem um backup existente que pode restaurar para continuar.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Autorize esta sessão a fazer o backup de chaves antes de se desconectar, para evitar perder chaves que possam estar apenas nesta sessão.",
@@ -1781,7 +1781,7 @@
     "Disconnect identity server": "Desconectar servidor de identidade",
     "Disconnect from the identity server <idserver />?": "Desconectar-se do servidor de identidade <idserver />?",
     "Disconnect": "Desconectar",
-    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Você deve <b>remover seus dados pessoais</b> do servidor de identidade <idserver /> antes de desconectar. Infelizmente, o servidor de identidade <idserver /> ou está desconectado no momento, ou não pode ser acessado.",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Você deve <b>remover seus dados pessoais</b> do servidor de identidade <idserver /> antes de desconectar. Infelizmente, o servidor de identidade <idserver /> ou está indisponível no momento, ou não pode ser acessado.",
     "You should:": "Você deveria:",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "verifique se há extensões no seu navegador que possam bloquear o servidor de identidade (por exemplo, Privacy Badger)",
     "contact the administrators of identity server <idserver />": "entre em contato com os administradores do servidor de identidade <idserver />",
@@ -1829,7 +1829,7 @@
     "Change settings": "Alterar configurações",
     "Send %(eventType)s events": "Enviar eventos de %(eventType)s",
     "Roles & Permissions": "Papeis & Permissões",
-    "Select the roles required to change various parts of the room": "Selecione as permissões necessárias para alterar várias partes da sala",
+    "Select the roles required to change various parts of the room": "Selecione os papeis necessários para alterar várias partes da sala",
     "Emoji picker": "Enviar emoji",
     "Room %(name)s": "Sala %(name)s",
     "No recently visited rooms": "Nenhuma sala foi visitada recentemente",
@@ -1918,7 +1918,7 @@
     "Collapse room list section": "Esconder seção da lista de salas",
     "Expand room list section": "Mostrar seção da lista de salas",
     "The person who invited you already left the room.": "A pessoa que convidou você já saiu da sala.",
-    "The person who invited you already left the room, or their server is offline.": "A pessoa que convidou você já saiu da sala, ou o servidor dela está desconectado.",
+    "The person who invited you already left the room, or their server is offline.": "A pessoa que convidou você já saiu da sala, ou o servidor dela está indisponível.",
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use o Gerenciador de Integrações em <b>(%(serverName)s)</b> para gerenciar bots, widgets e pacotes de figurinhas.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use o Gerenciador de Integrações para gerenciar bots, widgets e pacotes de figurinhas.",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "O Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.",
@@ -2493,5 +2493,284 @@
     "Tell us below how you feel about %(brand)s so far.": "Conte-nos abaixo o que você sente sobre o %(brand)s até o momento.",
     "Rate %(brand)s": "Avalie o %(brand)s",
     "%(senderName)s ended the call": "%(senderName)s encerrou a chamada",
-    "You ended the call": "Você encerrou a chamada"
+    "You ended the call": "Você encerrou a chamada",
+    "Now, let's help you get started": "Agora, vamos começar",
+    "Don't miss a reply": "Não perca uma resposta",
+    "Enable desktop notifications": "Ativar notificações na área de trabalho",
+    "Welcome %(name)s": "Boas-vindas, %(name)s",
+    "Add a photo so people know it's you.": "Adicione uma foto para as pessoas identificarem você.",
+    "Great, that'll help people know it's you": "Ótimo, agora as pessoas identificarão você",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Convide alguém a partir do nome, e-mail ou nome de usuário (por exemplo: <userId/>) ou <a>compartilhe esta sala</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Comece uma conversa, a partir do nome, e-mail ou nome de usuário de alguém (por exemplo: <userId/>).",
+    "Invite by email": "Convidar por e-mail",
+    "Use the + to make a new room or explore existing ones below": "Clique em + para criar uma nova sala ou explore as salas existentes abaixo",
+    "New version of %(brand)s is available": "Uma nova versão do %(brand)s está disponível",
+    "Update %(brand)s": "Atualizar o %(brand)s",
+    "Jordan": "Jordânia",
+    "Japan": "Japão",
+    "Jamaica": "Jamaica",
+    "Italy": "Itália",
+    "Israel": "Israel",
+    "Ireland": "Irlanda",
+    "Iraq": "Iraque",
+    "Iran": "Irã",
+    "Indonesia": "Indonésia",
+    "India": "Índia",
+    "Iceland": "Islândia",
+    "Hungary": "Hungria",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Haiti": "Haiti",
+    "Guyana": "Guiana",
+    "Guinea-Bissau": "Guiné-Bissau",
+    "Comoros": "Comores",
+    "Vietnam": "Vietnã",
+    "Venezuela": "Venezuela",
+    "Uruguay": "Uruguai",
+    "United Arab Emirates": "Emirados Árabes Unidos",
+    "Ukraine": "Ucrânia",
+    "Uganda": "Uganda",
+    "Turkey": "Turquia",
+    "Spain": "Espanha",
+    "South Sudan": "Sudão do Sul",
+    "South Korea": "Coreia do Sul",
+    "South Africa": "África do Sul",
+    "Somalia": "Somália",
+    "Solomon Islands": "Ilhas Salomão",
+    "Slovenia": "Eslovênia",
+    "Slovakia": "Eslováquia",
+    "Singapore": "Singapura",
+    "Sierra Leone": "Serra Leoa",
+    "Serbia": "Sérvia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Arábia Saudita",
+    "Russia": "Rússia",
+    "Romania": "Romênia",
+    "Puerto Rico": "Porto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polônia",
+    "Peru": "Peru",
+    "Paraguay": "Paraguai",
+    "Panama": "Panamá",
+    "Palestine": "Palestina",
+    "Pakistan": "Paquistão",
+    "Norway": "Noruega",
+    "North Korea": "Coreia do Norte",
+    "Niger": "Níger",
+    "Nigeria": "Nigéria",
+    "Nicaragua": "Nicarágua",
+    "New Zealand": "Nova Zelândia",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Zambia": "Zâmbia",
+    "Zimbabwe": "Zimbábue",
+    "France": "França",
+    "Egypt": "Egito",
+    "Ecuador": "Equador",
+    "Denmark": "Dinamarca",
+    "Côte d’Ivoire": "Costa do Marfim",
+    "Cyprus": "Chipre",
+    "Cuba": "Cuba",
+    "Croatia": "Croácia",
+    "Costa Rica": "Costa Rica",
+    "Colombia": "Colômbia",
+    "China": "China",
+    "Chile": "Chile",
+    "Chad": "Chade",
+    "Cape Verde": "Cabo Verde",
+    "Canada": "Canadá",
+    "Cameroon": "Camarões",
+    "Cambodia": "Camboja",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgária",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Ilhas Virgens Britânicas",
+    "British Indian Ocean Territory": "Território Britânico do Oceano Índico",
+    "Brazil": "Brasil",
+    "Bouvet Island": "Ilha Bouvet",
+    "Botswana": "Botsuana",
+    "Bosnia": "Bósnia e Herzegovina",
+    "Bolivia": "Bolívia",
+    "Bhutan": "Butão",
+    "Bermuda": "Bermudas",
+    "Benin": "Benim",
+    "Belize": "Belize",
+    "Belgium": "Bélgica",
+    "Belarus": "Bielorrússia",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrein",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbaijão",
+    "Austria": "Áustria",
+    "Australia": "Austrália",
+    "Aruba": "Aruba",
+    "Armenia": "Armênia",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antígua e Barbuda",
+    "Antarctica": "Antártica",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Samoa Americana",
+    "Algeria": "Argélia",
+    "Albania": "Albânia",
+    "Åland Islands": "Ilhas Aland",
+    "Afghanistan": "Afeganistão",
+    "United States": "Estados Unidos",
+    "United Kingdom": "Reino Unido",
+    "French Southern Territories": "Territórios Austrais e Antárticos Franceses",
+    "Congo - Brazzaville": "Congo",
+    "Czech Republic": "República Tcheca",
+    "Congo - Kinshasa": "República Democrática do Congo",
+    "U.S. Virgin Islands": "Ilhas Virgens Americanas",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Ilhas Turcas e Caicos",
+    "St. Pierre & Miquelon": "São Pedro e Miquelon",
+    "Turkmenistan": "Turcomenistão",
+    "Tokelau": "Tokelau",
+    "Tajikistan": "Tajiquistão",
+    "Swaziland": "Suazilândia",
+    "Svalbard & Jan Mayen": "Svalbard e Jan Mayen",
+    "St. Vincent & Grenadines": "São Vicente e Granadinas",
+    "St. Martin": "São Martinho",
+    "St. Kitts & Nevis": "São Cristóvão e Nevis",
+    "Seychelles": "Seychelles",
+    "Netherlands": "Países Baixos",
+    "Kazakhstan": "Cazaquistão",
+    "Jersey": "Jersey",
+    "Heard & McDonald Islands": "Ilha Heard e Ilhas McDonald",
+    "Dominica": "Dominica",
+    "Caribbean Netherlands": "Países Baixos Caribenhos",
+    "South Georgia & South Sandwich Islands": "Ilhas Geórgia do Sul e Sandwich do Sul",
+    "Sint Maarten": "São Martinho",
+    "Libya": "Líbia",
+    "Liberia": "Libéria",
+    "Lesotho": "Lesoto",
+    "Lebanon": "Líbano",
+    "Latvia": "Letônia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Quirguistão",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Tunisia": "Tunísia",
+    "Trinidad & Tobago": "Trindade e Tobago",
+    "Tonga": "Tonga",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor-Leste",
+    "Thailand": "Tailândia",
+    "Tanzania": "Tanzânia",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé e Príncipe",
+    "Syria": "Síria",
+    "Switzerland": "Suíça",
+    "Sweden": "Suécia",
+    "Suriname": "Suriname",
+    "Sudan": "Sudão",
+    "St. Lucia": "Santa Lúcia",
+    "St. Helena": "Santa Helena",
+    "St. Barthélemy": "São Bartolomeu",
+    "Sri Lanka": "Sri Lanka",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Reunião",
+    "Rwanda": "Ruanda",
+    "Qatar": "Catar",
+    "Pitcairn Islands": "Ilhas Pitcairn",
+    "Philippines": "Filipinas",
+    "Montserrat": "Montserrat",
+    "Macedonia": "Macedônia",
+    "Papua New Guinea": "Papua-Nova Guiné",
+    "Palau": "Palau",
+    "Oman": "Omã",
+    "Northern Mariana Islands": "Ilhas Marianas do Norte",
+    "Norfolk Island": "Ilha Norfolk",
+    "Niue": "Niue",
+    "New Caledonia": "Nova Caledônia",
+    "Namibia": "Namíbia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Moçambique",
+    "Morocco": "Marrocos",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongólia",
+    "Monaco": "Mônaco",
+    "Moldova": "Moldávia",
+    "Micronesia": "Micronésia",
+    "Mexico": "México",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Maurício",
+    "Mauritania": "Mauritânia",
+    "Martinique": "Martinica",
+    "Marshall Islands": "Ilhas Marshall",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldivas",
+    "Malaysia": "Malásia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagascar",
+    "Macau": "Macau",
+    "Luxembourg": "Luxemburgo",
+    "Lithuania": "Lituânia",
+    "Liechtenstein": "Liechtenstein",
+    "Kenya": "Quênia",
+    "Isle of Man": "Ilha de Man",
+    "Guinea": "Guiné",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadalupe",
+    "Grenada": "Granada",
+    "Greenland": "Groenlândia",
+    "Greece": "Grécia",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Gana",
+    "Germany": "Alemanha",
+    "Georgia": "Geórgia",
+    "Gambia": "Gâmbia",
+    "Gabon": "Gabão",
+    "French Polynesia": "Polinésia Francesa",
+    "French Guiana": "Guiana Francesa",
+    "Finland": "Finlândia",
+    "Fiji": "Fiji",
+    "Faroe Islands": "Ilhas Faroé",
+    "Falkland Islands": "Ilhas Malvinas",
+    "Ethiopia": "Etiópia",
+    "Estonia": "Estônia",
+    "Eritrea": "Eritreia",
+    "Equatorial Guinea": "Guiné Equatorial",
+    "El Salvador": "El Salvador",
+    "Dominican Republic": "República Dominicana",
+    "Djibouti": "Djibouti",
+    "Curaçao": "Curaçao",
+    "Cook Islands": "Ilhas Cook",
+    "Cocos (Keeling) Islands": "Ilhas Cocos (Keeling)",
+    "Christmas Island": "Ilha Christmas",
+    "Central African Republic": "República Centro-Africana",
+    "Cayman Islands": "Ilhas Cayman",
+    "%(creator)s created this DM.": "%(creator)s criou esta conversa.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "As mensagens nesta sala são criptografadas de ponta a ponta. Quando as pessoas entrarem na conversa, você poderá confirmá-las em seus perfis. Basta clicar em suas fotos de perfil.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "As mensagens aqui são criptografadas de ponta a ponta. Confirme o perfil de %(displayName)s - clique em sua foto de perfil.",
+    "This is the start of <roomName/>.": "Este é o início de <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Adicione uma imagem para que as pessoas possam identificar facilmente sua sala.",
+    "%(displayName)s created this room.": "%(displayName)s criou esta sala.",
+    "You created this room.": "Você criou esta sala.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Adicione uma descrição</a> para ajudar as pessoas a saber do que se trata essa conversa.",
+    "Topic: %(topic)s ": "Descrição: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Descrição: %(topic)s (<a>editar</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Este é o início do seu histórico da conversa com <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Apenas vocês dois estão nesta conversa, a menos que algum de vocês convide mais alguém.",
+    "Call Paused": "Chamada em pausa",
+    "Takes the call in the current room off hold": "Retoma a chamada na sala atual",
+    "Places the call in the current room on hold": "Pausa a chamada na sala atual",
+    "Yemen": "Iêmen",
+    "Western Sahara": "Saara Ocidental",
+    "Wallis & Futuna": "Wallis e Futuna",
+    "Vatican City": "Cidade do Vaticano",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbequistão",
+    "Role": "Função",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s sala.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s salas."
 }

src/i18n/strings/sl.json

@@ -20,5 +20,10 @@
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potrdite dodajanje te telefonske številke z enkratno prijavo, da dokažete svojo identiteto.",
     "Confirm adding phone number": "Potrdi dodajanje telefonske številke",
     "Click the button below to confirm adding this phone number.": "Pritisnite gumb spodaj da potrdite dodajanje te telefonske številke.",
-    "Add Phone Number": "Dodaj telefonsko številko"
+    "Add Phone Number": "Dodaj telefonsko številko",
+    "Analytics": "Analitika",
+    "Call Declined": "Klic zavrnjen",
+    "Call Failed": "Klic ni uspel",
+    "Your homeserver's URL": "URL domačega strežnika",
+    "End": "Konec"
 }

src/i18n/strings/sq.json

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

src/i18n/strings/sv.json

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

src/i18n/strings/zh_Hans.json

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

src/i18n/strings/zh_Hant.json

@@ -2565,5 +2565,284 @@
     "Rate %(brand)s": "評價 %(brand)s",
     "Feedback sent": "已傳送回饋",
     "%(senderName)s ended the call": "%(senderName)s 結束了通話",
-    "You ended the call": "您結束了通話"
+    "You ended the call": "您結束了通話",
+    "Now, let's help you get started": "現在，讓我們協助您開始",
+    "Welcome %(name)s": "歡迎 %(name)s",
+    "Add a photo so people know it's you.": "新增照片以讓其他人知道是您。",
+    "Great, that'll help people know it's you": "太好了，這會讓人們知道是您",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "使用某人的名字、電子郵件地址或使用者名稱來與他們開始對話（如 <userId/>）或是<a>分享此聊天室</a>。",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "使用某人的名字、電子郵件地址或使用者名稱來與他們開始對話（如 <userId/>）。",
+    "Invite by email": "透過電子郵件邀請",
+    "Use the + to make a new room or explore existing ones below": "使用 + 建立新的聊天室或在下方探索既有的聊天室",
+    "New version of %(brand)s is available": "%(brand)s 的新版本已可使用",
+    "Update %(brand)s": "更新 %(brand)s",
+    "Enable desktop notifications": "啟用桌面通知",
+    "Don't miss a reply": "不要錯過回覆",
+    "Zimbabwe": "辛巴威",
+    "Zambia": "尚比亞",
+    "Yemen": "葉門",
+    "Western Sahara": "西撒哈拉",
+    "Wallis & Futuna": "瓦利斯和富圖那",
+    "Vietnam": "越南",
+    "Venezuela": "委內瑞拉",
+    "Vatican City": "梵蒂岡",
+    "Vanuatu": "萬那杜",
+    "Uzbekistan": "烏茲別克",
+    "Uruguay": "烏拉圭",
+    "United Arab Emirates": "阿拉伯聯合大公國",
+    "Ukraine": "烏克蘭",
+    "Uganda": "烏干達",
+    "U.S. Virgin Islands": "美屬維京群島",
+    "Tuvalu": "吐瓦魯",
+    "Turks & Caicos Islands": "土克凱可群島",
+    "Turkmenistan": "土庫曼",
+    "Turkey": "土耳其",
+    "Tunisia": "突尼西亞",
+    "Trinidad & Tobago": "千里達及托巴哥",
+    "Tonga": "東加",
+    "Tokelau": "托克勞",
+    "Togo": "多哥",
+    "Timor-Leste": "東帝汶",
+    "Thailand": "泰國",
+    "Tanzania": "坦尚尼亞",
+    "Tajikistan": "塔吉克",
+    "Taiwan": "台灣",
+    "São Tomé & Príncipe": "聖多美普林西比",
+    "Syria": "敘利亞",
+    "Switzerland": "瑞士",
+    "Sweden": "瑞典",
+    "Swaziland": "史瓦帝尼",
+    "Svalbard & Jan Mayen": "斯瓦巴和揚馬延",
+    "Suriname": "蘇利南",
+    "Sudan": "蘇丹",
+    "St. Vincent & Grenadines": "聖文森及格瑞那丁",
+    "St. Pierre & Miquelon": "聖皮埃與密克隆",
+    "St. Martin": "聖馬丁",
+    "St. Lucia": "聖露西亞",
+    "St. Kitts & Nevis": "聖克里斯多福及尼維斯",
+    "St. Helena": "聖赫勒拿",
+    "St. Barthélemy": "聖巴瑟米",
+    "Sri Lanka": "斯里蘭卡",
+    "Spain": "西班牙",
+    "South Sudan": "南蘇丹",
+    "South Korea": "南韓",
+    "South Georgia & South Sandwich Islands": "南喬治亞與南桑威奇群島",
+    "South Africa": "南非",
+    "Somalia": "索馬利亞",
+    "Solomon Islands": "索羅門群島",
+    "Slovenia": "斯洛維尼亞",
+    "Slovakia": "斯洛伐克",
+    "Sint Maarten": "荷屬聖馬丁",
+    "Singapore": "新加坡",
+    "Sierra Leone": "獅子山",
+    "Seychelles": "塞席爾",
+    "Serbia": "塞爾維亞",
+    "Senegal": "塞內加爾",
+    "Saudi Arabia": "沙烏地阿拉伯",
+    "San Marino": "聖馬利諾",
+    "Samoa": "薩摩亞",
+    "Réunion": "留尼旺",
+    "Rwanda": "盧安達",
+    "Russia": "俄羅斯",
+    "Romania": "羅馬尼亞",
+    "Qatar": "卡達",
+    "Puerto Rico": "波多黎各",
+    "Portugal": "葡萄牙",
+    "Poland": "波蘭",
+    "Pitcairn Islands": "皮特肯群島",
+    "Philippines": "菲律賓",
+    "Peru": "秘魯",
+    "Paraguay": "巴拉圭",
+    "Papua New Guinea": "巴布亞紐幾內亞",
+    "Panama": "巴拿馬",
+    "Palestine": "巴勒斯坦",
+    "Palau": "帛琉",
+    "Pakistan": "巴基斯坦",
+    "Oman": "阿曼",
+    "Norway": "挪威",
+    "Northern Mariana Islands": "北馬利安納群島",
+    "North Korea": "北韓",
+    "Norfolk Island": "諾福克島",
+    "Niue": "紐埃",
+    "Nigeria": "奈及利亞",
+    "Niger": "尼日",
+    "Nicaragua": "尼加拉瓜",
+    "New Zealand": "紐西蘭",
+    "New Caledonia": "新喀里多尼亞",
+    "Netherlands": "荷蘭",
+    "Nepal": "尼泊爾",
+    "Nauru": "諾魯",
+    "Namibia": "納米比亞",
+    "Myanmar": "緬甸",
+    "Mozambique": "莫三比克",
+    "Morocco": "摩洛哥",
+    "Montserrat": "蒙哲臘",
+    "Montenegro": "蒙特內哥羅",
+    "Mongolia": "蒙古",
+    "Monaco": "摩納哥",
+    "Moldova": "摩爾多瓦",
+    "Micronesia": "密克羅尼西亞",
+    "Mexico": "墨西哥",
+    "Mayotte": "馬約特",
+    "Mauritius": "模里西斯",
+    "Mauritania": "茅利塔尼亞",
+    "Martinique": "馬丁尼克",
+    "Marshall Islands": "馬紹爾群島",
+    "Malta": "馬爾他",
+    "Mali": "馬利",
+    "Maldives": "馬爾地夫",
+    "Malaysia": "馬來西亞",
+    "Malawi": "馬拉威",
+    "Madagascar": "馬達加斯加",
+    "Macedonia": "馬其頓",
+    "Macau": "澳門",
+    "Luxembourg": "盧森堡",
+    "Lithuania": "立陶宛",
+    "Liechtenstein": "列支敦斯登",
+    "Libya": "利比亞",
+    "Liberia": "賴比瑞亞",
+    "Lesotho": "賴索托",
+    "Lebanon": "黎巴嫩",
+    "Latvia": "拉脫維亞",
+    "Laos": "寮國",
+    "Kyrgyzstan": "吉爾吉斯",
+    "Kuwait": "科威特",
+    "Kosovo": "科索沃",
+    "Kiribati": "吉里巴斯",
+    "Kenya": "肯亞",
+    "Kazakhstan": "哈薩克",
+    "Jordan": "約旦",
+    "Jersey": "澤西",
+    "Japan": "日本",
+    "Jamaica": "牙買加",
+    "Italy": "義大利",
+    "Israel": "以色列",
+    "Isle of Man": "曼島",
+    "Ireland": "愛爾蘭",
+    "Iraq": "伊拉克",
+    "Iran": "伊朗",
+    "Indonesia": "印度尼西亞",
+    "India": "印度",
+    "Iceland": "冰島",
+    "Hungary": "匈牙利",
+    "Hong Kong": "香港",
+    "Honduras": "宏都拉斯",
+    "Heard & McDonald Islands": "赫德島和麥克唐納群島",
+    "Haiti": "海地",
+    "Guyana": "蓋亞那",
+    "Guinea-Bissau": "幾內亞比索",
+    "Guinea": "幾內亞",
+    "Guernsey": "根西",
+    "Guatemala": "瓜地馬拉",
+    "Guam": "關島",
+    "Guadeloupe": "瓜地洛普",
+    "Grenada": "格瑞那達",
+    "Greenland": "格陵蘭",
+    "Greece": "希臘",
+    "Gibraltar": "直布羅陀",
+    "Ghana": "迦納",
+    "Germany": "德國",
+    "Georgia": "喬治亞",
+    "Gambia": "甘比亞",
+    "Gabon": "加彭",
+    "French Southern Territories": "法屬南部領地",
+    "French Polynesia": "法屬玻里尼西亞",
+    "French Guiana": "法屬圭亞那",
+    "France": "法國",
+    "Finland": "芬蘭",
+    "Fiji": "斐濟",
+    "Faroe Islands": "法羅群島",
+    "Falkland Islands": "福克蘭群島",
+    "Ethiopia": "衣索比亞",
+    "Estonia": "愛沙尼亞",
+    "Eritrea": "厄利垂亞",
+    "Equatorial Guinea": "赤道幾內亞",
+    "El Salvador": "薩爾瓦多",
+    "Egypt": "埃及",
+    "Ecuador": "厄瓜多",
+    "Dominican Republic": "多明尼加",
+    "Dominica": "多米尼克",
+    "Djibouti": "吉布地",
+    "Denmark": "丹麥",
+    "Côte d’Ivoire": "象牙海岸",
+    "Czech Republic": "捷克",
+    "Cyprus": "賽普勒斯",
+    "Curaçao": "古拉索",
+    "Cuba": "古巴",
+    "Croatia": "克羅埃西亞",
+    "Costa Rica": "哥斯大黎加",
+    "Cook Islands": "庫克群島",
+    "Congo - Kinshasa": "剛果 - 金夏沙",
+    "Congo - Brazzaville": "剛果 - 布拉薩",
+    "Comoros": "葛摩",
+    "Colombia": "哥倫比亞",
+    "Cocos (Keeling) Islands": "科科斯（基林）群島",
+    "Christmas Island": "聖誕島",
+    "China": "中國",
+    "Chile": "智利",
+    "Chad": "查德",
+    "Central African Republic": "中非共和國",
+    "Cayman Islands": "開曼群島",
+    "Caribbean Netherlands": "荷屬加勒比",
+    "Cape Verde": "維德角",
+    "Canada": "加拿大",
+    "Cameroon": "喀麥隆",
+    "Cambodia": "柬埔寨",
+    "Burundi": "蒲隆地",
+    "Burkina Faso": "布吉納法索",
+    "Bulgaria": "保加利亞",
+    "Brunei": "汶萊",
+    "British Virgin Islands": "英屬維京群島",
+    "British Indian Ocean Territory": "英屬印度洋屬地",
+    "Brazil": "巴西",
+    "Bouvet Island": "布威島",
+    "Botswana": "波札那",
+    "Bosnia": "波士尼亞",
+    "Bolivia": "玻利維亞",
+    "Bhutan": "不丹",
+    "Bermuda": "百慕達",
+    "Benin": "貝南",
+    "Belize": "貝里斯",
+    "Belgium": "比利時",
+    "Belarus": "白俄羅斯",
+    "Barbados": "巴貝多",
+    "Bangladesh": "孟加拉",
+    "Bahrain": "巴林",
+    "Bahamas": "巴哈馬",
+    "Azerbaijan": "亞塞拜然",
+    "Austria": "奧地利",
+    "Australia": "澳洲",
+    "Aruba": "阿魯巴",
+    "Armenia": "亞美尼亞",
+    "Argentina": "阿根廷",
+    "Antigua & Barbuda": "安地卡及巴布達",
+    "Antarctica": "南極洲",
+    "Anguilla": "安吉拉",
+    "Angola": "安哥拉",
+    "Andorra": "安道爾",
+    "American Samoa": "美屬薩摩亞",
+    "Algeria": "阿爾及利亞",
+    "Albania": "阿爾巴尼亞",
+    "Åland Islands": "奧蘭",
+    "Afghanistan": "阿富汗",
+    "United States": "美國",
+    "United Kingdom": "英國",
+    "%(creator)s created this DM.": "%(creator)s 建立了此直接訊息。",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "此聊天適中的訊息為端到端加密。當人們加入，您可以在他們的個人檔案中驗證他們，只要點擊他們的大頭照就可以了。",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "此處的訊息為端到端加密。請在他們的個人檔案中驗證 %(displayName)s，只要點擊他們的大頭照就可以了。",
+    "This is the start of <roomName/>.": "這是 <roomName/> 的開頭。",
+    "Add a photo, so people can easily spot your room.": "新增圖片，這樣人們就可以輕鬆發現您的聊天室。",
+    "%(displayName)s created this room.": "%(displayName)s 建立了此聊天室。",
+    "You created this room.": "您建立了此聊天室。",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>新增主題</a>以協助人們了解這裡在做什麼。",
+    "Topic: %(topic)s ": "主題：%(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "主題：%(topic)s（<a>編輯</a>）",
+    "This is the beginning of your direct message history with <displayName/>.": "這是使用 <displayName/> 傳送的您的直接訊息歷史紀錄的開頭。",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "除非你們兩個其中一個邀請任何人加入，否則只會有你們兩個在此對話中。",
+    "Call Paused": "通話已暫停",
+    "Takes the call in the current room off hold": "讓目前聊天室中的通話保持等候接聽的狀態",
+    "Places the call in the current room on hold": "在目前的聊天室撥打通話並等候接聽",
+    "Role": "角色",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "使用 %(size)s 儲存來自 %(count)s 個聊天室的訊息，在本機安全地快取已加密的訊息以讓它們可以在搜尋結果中出現。",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "使用 %(size)s 儲存來自 %(count)s 個聊天室的訊息，在本機安全地快取已加密的訊息以讓它們可以在搜尋結果中出現。"
 }

src/languageHandler.tsx

@@ -103,6 +103,8 @@ export interface IVariables {
 
 type Tags = Record<string, (sub: string) => React.ReactNode>;
 
+export type TranslatedString = string | React.ReactNode;
+
 /*
  * Translates text and optionally also replaces XML-ish elements in the text with e.g. React components
  * @param {string} text The untranslated text, e.g "click <a>here</a> now to %(foo)s".
@@ -121,7 +123,7 @@ type Tags = Record<string, (sub: string) => React.ReactNode>;
  */
 export function _t(text: string, variables?: IVariables): string;
 export function _t(text: string, variables: IVariables, tags: Tags): React.ReactNode;
-export function _t(text: string, variables?: IVariables, tags?: Tags): string | React.ReactNode {
+export function _t(text: string, variables?: IVariables, tags?: Tags): TranslatedString {
     // Don't do substitutions in counterpart. We handle it ourselves so we can replace with React components
     // However, still pass the variables to counterpart so that it can choose the correct plural if count is given
     // It is enough to pass the count variable, but in the future counterpart might make use of other information too

src/settings/Settings.ts

@@ -32,6 +32,7 @@ import UseSystemFontController from './controllers/UseSystemFontController';
 import { SettingLevel } from "./SettingLevel";
 import SettingController from "./controllers/SettingController";
 import { RightPanelPhases } from "../stores/RightPanelStorePhases";
+import { isMac } from '../Keyboard';
 import UIFeatureController from "./controllers/UIFeatureController";
 import { UIFeature } from "./UIFeature";
 import { OrderedMultiController } from "./controllers/OrderedMultiController";
@@ -324,6 +325,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Show typing notifications"),
         default: true,
     },
+    "MessageComposerInput.ctrlEnterToSend": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: isMac ? _td("Use Command + Enter to send a message") : _td("Use Ctrl + Enter to send a message"),
+        default: false,
+    },
     "MessageComposerInput.autoReplaceEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Automatically replace plain text Emoji'),

src/stores/ToastStore.ts

@@ -25,6 +25,7 @@ export interface IToast<C extends ComponentClass> {
     title: string;
     icon?: string;
     component: C;
+    className?: string;
     props?: Omit<React.ComponentProps<C>, "toastKey">; // toastKey is injected by ToastContainer
 }
 

src/stores/widgets/ElementWidgetActions.ts

@@ -14,8 +14,17 @@
  * limitations under the License.
  */
 
+import { IWidgetApiRequest } from "matrix-widget-api";
+
 export enum ElementWidgetActions {
     ClientReady = "im.vector.ready",
     HangupCall = "im.vector.hangup",
     OpenIntegrationManager = "integration_manager_open",
+    ViewRoom = "io.element.view_room",
+}
+
+export interface IViewRoomApiRequest extends IWidgetApiRequest {
+    data: {
+        room_id: string; // eslint-disable-line camelcase
+    };
 }

src/stores/widgets/ElementWidgetCapabilities.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export enum ElementWidgetCapabilities {
+    CanChangeViewedRoom = "io.element.view_room",
+}

src/stores/widgets/StopGapWidget.ts

@@ -33,6 +33,8 @@ import {
     WidgetApiToWidgetAction,
     WidgetApiFromWidgetAction,
     IModalWidgetOpenRequest,
+    IWidgetApiErrorResponseData,
+    WidgetKind,
 } from "matrix-widget-api";
 import { StopGapWidgetDriver } from "./StopGapWidgetDriver";
 import { EventEmitter } from "events";
@@ -47,13 +49,15 @@ import { WidgetType } from "../../widgets/WidgetType";
 import ActiveWidgetStore from "../ActiveWidgetStore";
 import { objectShallowClone } from "../../utils/objects";
 import defaultDispatcher from "../../dispatcher/dispatcher";
-import { ElementWidgetActions } from "./ElementWidgetActions";
+import { ElementWidgetActions, IViewRoomApiRequest } from "./ElementWidgetActions";
 import Modal from "../../Modal";
 import WidgetOpenIDPermissionsDialog from "../../components/views/dialogs/WidgetOpenIDPermissionsDialog";
 import {ModalWidgetStore} from "../ModalWidgetStore";
 import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
 import {getCustomTheme} from "../../theme";
 import CountlyAnalytics from "../../CountlyAnalytics";
+import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 // TODO: Destroy all of this code
 
@@ -148,6 +152,8 @@ export class StopGapWidget extends EventEmitter {
     private messaging: ClientWidgetApi;
     private mockWidget: ElementWidget;
     private scalarToken: string;
+    private roomId?: string;
+    private kind: WidgetKind;
 
     constructor(private appTileProps: IAppTileProps) {
         super();
@@ -160,6 +166,19 @@ export class StopGapWidget extends EventEmitter {
         }
 
         this.mockWidget = new ElementWidget(app);
+        this.roomId = appTileProps.room?.roomId;
+        this.kind = appTileProps.userWidget ? WidgetKind.Account : WidgetKind.Room; // probably
+    }
+
+    private get eventListenerRoomId(): string {
+        // When widgets are listening to events, we need to make sure they're only
+        // receiving events for the right room. In particular, room widgets get locked
+        // to the room they were added in while account widgets listen to the currently
+        // active room.
+
+        if (this.roomId) return this.roomId;
+
+        return RoomViewStore.getRoomId();
     }
 
     public get widgetApi(): ClientWidgetApi {
@@ -286,7 +305,8 @@ export class StopGapWidget extends EventEmitter {
 
     public start(iframe: HTMLIFrameElement) {
         if (this.started) return;
-        const driver = new StopGapWidgetDriver( this.appTileProps.whitelistCapabilities || []);
+        const allowedCapabilities = this.appTileProps.whitelistCapabilities || [];
+        const driver = new StopGapWidgetDriver( allowedCapabilities, this.mockWidget, this.kind);
         this.messaging = new ClientWidgetApi(this.mockWidget, iframe, driver);
         this.messaging.on("preparing", () => this.emit("preparing"));
         this.messaging.on("ready", () => this.emit("ready"));
@@ -298,6 +318,39 @@ export class StopGapWidget extends EventEmitter {
             ActiveWidgetStore.setRoomId(this.mockWidget.id, this.appTileProps.room.roomId);
         }
 
+        // Always attach a handler for ViewRoom, but permission check it internally
+        this.messaging.on(`action:${ElementWidgetActions.ViewRoom}`, (ev: CustomEvent<IViewRoomApiRequest>) => {
+            ev.preventDefault(); // stop the widget API from auto-rejecting this
+
+            // Check up front if this is even a valid request
+            const targetRoomId = (ev.detail.data || {}).room_id;
+            if (!targetRoomId) {
+                return this.messaging.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
+                    error: {message: "Room ID not supplied."},
+                });
+            }
+
+            // Check the widget's permission
+            if (!this.messaging.hasCapability(ElementWidgetCapabilities.CanChangeViewedRoom)) {
+                return this.messaging.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
+                    error: {message: "This widget does not have permission for this action (denied)."},
+                });
+            }
+
+            // at this point we can change rooms, so do that
+            defaultDispatcher.dispatch({
+                action: 'view_room',
+                room_id: targetRoomId,
+            });
+
+            // acknowledge so the widget doesn't freak out
+            this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
+        });
+
+        // Attach listeners for feeding events - the underlying widget classes handle permissions for us
+        MatrixClientPeg.get().on('event', this.onEvent);
+        MatrixClientPeg.get().on('Event.decrypted', this.onEventDecrypted);
+
         if (WidgetType.JITSI.matches(this.mockWidget.type)) {
             this.messaging.on("action:set_always_on_screen",
                 (ev: CustomEvent<IStickyActionRequest>) => {
@@ -391,5 +444,31 @@ export class StopGapWidget extends EventEmitter {
         if (!this.started) return;
         WidgetMessagingStore.instance.stopMessaging(this.mockWidget);
         ActiveWidgetStore.delRoomId(this.mockWidget.id);
+
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().off('event', this.onEvent);
+            MatrixClientPeg.get().off('Event.decrypted', this.onEventDecrypted);
+        }
+    }
+
+    private onEvent = (ev: MatrixEvent) => {
+        if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
+        if (ev.getRoomId() !== this.eventListenerRoomId) return;
+        this.feedEvent(ev);
+    };
+
+    private onEventDecrypted = (ev: MatrixEvent) => {
+        if (ev.isDecryptionFailure()) return;
+        if (ev.getRoomId() !== this.eventListenerRoomId) return;
+        this.feedEvent(ev);
+    };
+
+    private feedEvent(ev: MatrixEvent) {
+        if (!this.messaging) return;
+
+        const raw = ev.event;
+        this.messaging.feedEvent(raw).catch(e => {
+            console.error("Error sending event to widget: ", e);
+        });
     }
 }

src/stores/widgets/StopGapWidgetDriver.ts

@@ -14,17 +14,80 @@
  * limitations under the License.
  */
 
-import { Capability, WidgetDriver } from "matrix-widget-api";
-import { iterableUnion } from "../../utils/iterables";
+import {
+    Capability,
+    ISendEventDetails,
+    MatrixCapabilities,
+    Widget,
+    WidgetDriver,
+    WidgetKind,
+} from "matrix-widget-api";
+import { iterableDiff, iterableUnion } from "../../utils/iterables";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import ActiveRoomObserver from "../../ActiveRoomObserver";
+import Modal from "../../Modal";
+import WidgetCapabilitiesPromptDialog, {
+    getRememberedCapabilitiesForWidget,
+} from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
 
 // TODO: Purge this from the universe
 
 export class StopGapWidgetDriver extends WidgetDriver {
-    constructor(private allowedCapabilities: Capability[]) {
+    private allowedCapabilities: Set<Capability>;
+
+    // TODO: Refactor widgetKind into the Widget class
+    constructor(allowedCapabilities: Capability[], private forWidget: Widget, private forWidgetKind: WidgetKind) {
         super();
+
+        // Always allow screenshots to be taken because it's a client-induced flow. The widget can't
+        // spew screenshots at us and can't request screenshots of us, so it's up to us to provide the
+        // button if the widget says it supports screenshots.
+        this.allowedCapabilities = new Set([...allowedCapabilities, MatrixCapabilities.Screenshots]);
     }
 
     public async validateCapabilities(requested: Set<Capability>): Promise<Set<Capability>> {
-        return new Set(iterableUnion(requested, this.allowedCapabilities));
+        // Check to see if any capabilities aren't automatically accepted (such as sticker pickers
+        // allowing stickers to be sent). If there are excess capabilities to be approved, the user
+        // will be prompted to accept them.
+        const diff = iterableDiff(requested, this.allowedCapabilities);
+        const missing = new Set(diff.removed); // "removed" is "in A (requested) but not in B (allowed)"
+        const allowedSoFar = new Set(this.allowedCapabilities);
+        getRememberedCapabilitiesForWidget(this.forWidget).forEach(cap => allowedSoFar.add(cap));
+        // TODO: Do something when the widget requests new capabilities not yet asked for
+        if (missing.size > 0) {
+            try {
+                const [result] = await Modal.createTrackedDialog(
+                    'Approve Widget Caps', '',
+                    WidgetCapabilitiesPromptDialog,
+                    {
+                        requestedCapabilities: missing,
+                        widget: this.forWidget,
+                        widgetKind: this.forWidgetKind,
+                    }).finished;
+                (result.approved || []).forEach(cap => allowedSoFar.add(cap));
+            } catch (e) {
+                console.error("Non-fatal error getting capabilities: ", e);
+            }
+        }
+
+        return new Set(iterableUnion(allowedSoFar, requested));
+    }
+
+    public async sendEvent(eventType: string, content: any, stateKey: string = null): Promise<ISendEventDetails> {
+        const client = MatrixClientPeg.get();
+        const roomId = ActiveRoomObserver.activeRoomId;
+
+        if (!client || !roomId) throw new Error("Not in a room or not attached to a client");
+
+        let r: {event_id: string} = null; // eslint-disable-line camelcase
+        if (stateKey !== null) {
+            // state event
+            r = await client.sendStateEvent(roomId, eventType, content, stateKey);
+        } else {
+            // message event
+            r = await client.sendEvent(roomId, eventType, content);
+        }
+
+        return {roomId, eventId: r.event_id};
     }
 }

src/toasts/AnalyticsToast.tsx

@@ -64,12 +64,13 @@ export const showToast = (policyUrl?: string) => {
                     ) : sub,
                 },
             ),
-            acceptLabel: _t("I want to help"),
+            acceptLabel: _t("Yes"),
             onAccept,
             rejectLabel: _t("No"),
             onReject,
         },
         component: GenericToast,
+        className: "mx_AnalyticsToast",
         priority: 10,
     });
 };

src/utils/iterables.ts

@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
-import { arrayUnion } from "./arrays";
+import { arrayDiff, arrayUnion } from "./arrays";
 
 export function iterableUnion<T>(a: Iterable<T>, b: Iterable<T>): Iterable<T> {
     return arrayUnion(Array.from(a), Array.from(b));
 }
+
+export function iterableDiff<T>(a: Iterable<T>, b: Iterable<T>): { added: Iterable<T>, removed: Iterable<T> } {
+    return arrayDiff(Array.from(a), Array.from(b));
+}

src/utils/membership.ts

@@ -78,6 +78,11 @@ export function getEffectiveMembership(membership: string): EffectiveMembership
     }
 }
 
+export function isJoinedOrNearlyJoined(membership: string): boolean {
+    const effective = getEffectiveMembership(membership);
+    return effective === EffectiveMembership.Join || effective === EffectiveMembership.Invite;
+}
+
 export async function leaveRoomBehaviour(roomId: string) {
     let leavingAllVersions = true;
     const history = await MatrixClientPeg.get().getRoomUpgradeHistory(roomId);

src/widgets/CapabilityText.tsx

@@ -0,0 +1,342 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Capability, EventDirection, MatrixCapabilities, WidgetEventCapability, WidgetKind } from "matrix-widget-api";
+import { _t, _td, TranslatedString } from "../languageHandler";
+import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
+import { ElementWidgetCapabilities } from "../stores/widgets/ElementWidgetCapabilities";
+import React from "react";
+
+type GENERIC_WIDGET_KIND = "generic";
+const GENERIC_WIDGET_KIND: GENERIC_WIDGET_KIND = "generic";
+
+interface ISendRecvStaticCapText {
+    // @ts-ignore - TS wants the key to be a string, but we know better
+    [eventType: EventType]: {
+        // @ts-ignore - TS wants the key to be a string, but we know better
+        [widgetKind: WidgetKind | GENERIC_WIDGET_KIND]: {
+            // @ts-ignore - TS wants the key to be a string, but we know better
+            [direction: EventDirection]: string;
+        };
+    };
+}
+
+interface IStaticCapText {
+    // @ts-ignore - TS wants the key to be a string, but we know better
+    [capability: Capability]: {
+        // @ts-ignore - TS wants the key to be a string, but we know better
+        [widgetKind: WidgetKind | GENERIC_WIDGET_KIND]: string;
+    };
+}
+
+export interface TranslatedCapabilityText {
+    primary: TranslatedString;
+    byline?: TranslatedString;
+}
+
+export class CapabilityText {
+    private static simpleCaps: IStaticCapText = {
+        [MatrixCapabilities.AlwaysOnScreen]: {
+            [WidgetKind.Room]: _td("Remain on your screen when viewing another room, when running"),
+            [GENERIC_WIDGET_KIND]: _td("Remain on your screen while running"),
+        },
+        [MatrixCapabilities.StickerSending]: {
+            [WidgetKind.Room]: _td("Send stickers into this room"),
+            [GENERIC_WIDGET_KIND]: _td("Send stickers into your active room"),
+        },
+        [ElementWidgetCapabilities.CanChangeViewedRoom]: {
+            [GENERIC_WIDGET_KIND]: _td("Change which room you're viewing"),
+        },
+    };
+
+    private static stateSendRecvCaps: ISendRecvStaticCapText = {
+        [EventType.RoomTopic]: {
+            [WidgetKind.Room]: {
+                [EventDirection.Send]: _td("Change the topic of this room"),
+                [EventDirection.Receive]: _td("See when the topic changes in this room"),
+            },
+            [GENERIC_WIDGET_KIND]: {
+                [EventDirection.Send]: _td("Change the topic of your active room"),
+                [EventDirection.Receive]: _td("See when the topic changes in your active room"),
+            },
+        },
+        [EventType.RoomName]: {
+            [WidgetKind.Room]: {
+                [EventDirection.Send]: _td("Change the name of this room"),
+                [EventDirection.Receive]: _td("See when the name changes in this room"),
+            },
+            [GENERIC_WIDGET_KIND]: {
+                [EventDirection.Send]: _td("Change the name of your active room"),
+                [EventDirection.Receive]: _td("See when the name changes in your active room"),
+            },
+        },
+        [EventType.RoomAvatar]: {
+            [WidgetKind.Room]: {
+                [EventDirection.Send]: _td("Change the avatar of this room"),
+                [EventDirection.Receive]: _td("See when the avatar changes in this room"),
+            },
+            [GENERIC_WIDGET_KIND]: {
+                [EventDirection.Send]: _td("Change the avatar of your active room"),
+                [EventDirection.Receive]: _td("See when the avatar changes in your active room"),
+            },
+        },
+    };
+
+    private static nonStateSendRecvCaps: ISendRecvStaticCapText = {
+        [EventType.Sticker]: {
+            [WidgetKind.Room]: {
+                [EventDirection.Send]: _td("Send stickers to this room as you"),
+                [EventDirection.Receive]: _td("See when a sticker is posted in this room"),
+            },
+            [GENERIC_WIDGET_KIND]: {
+                [EventDirection.Send]: _td("Send stickers to your active room as you"),
+                [EventDirection.Receive]: _td("See when anyone posts a sticker to your active room"),
+            },
+        },
+    };
+
+    private static bylineFor(eventCap: WidgetEventCapability): TranslatedString {
+        if (eventCap.isState) {
+            return !eventCap.keyStr
+                ? _t("with an empty state key")
+                : _t("with state key %(stateKey)s", {stateKey: eventCap.keyStr});
+        }
+        return null; // room messages are handled specially
+    }
+
+    public static for(capability: Capability, kind: WidgetKind): TranslatedCapabilityText {
+        // First see if we have a super simple line of text to provide back
+        if (CapabilityText.simpleCaps[capability]) {
+            const textForKind = CapabilityText.simpleCaps[capability];
+            if (textForKind[kind]) return {primary: _t(textForKind[kind])};
+            if (textForKind[GENERIC_WIDGET_KIND]) return {primary: _t(textForKind[GENERIC_WIDGET_KIND])};
+
+            // ... we'll fall through to the generic capability processing at the end of this
+            // function if we fail to locate a simple string and the capability isn't for an
+            // event.
+        }
+
+        // We didn't have a super simple line of text, so try processing the capability as the
+        // more complex event send/receive permission type.
+        const [eventCap] = WidgetEventCapability.findEventCapabilities([capability]);
+        if (eventCap) {
+            // Special case room messages so they show up a bit cleaner to the user. Result is
+            // effectively "Send images" instead of "Send messages... of type images" if we were
+            // to handle the msgtype nuances in this function.
+            if (!eventCap.isState && eventCap.eventType === EventType.RoomMessage) {
+                return CapabilityText.forRoomMessageCap(eventCap, kind);
+            }
+
+            // See if we have a static line of text to provide for the given event type and
+            // direction. The hope is that we do for common event types for friendlier copy.
+            const evSendRecv = eventCap.isState
+                ? CapabilityText.stateSendRecvCaps
+                : CapabilityText.nonStateSendRecvCaps;
+            if (evSendRecv[eventCap.eventType]) {
+                const textForKind = evSendRecv[eventCap.eventType];
+                const textForDirection = textForKind[kind] || textForKind[GENERIC_WIDGET_KIND];
+                if (textForDirection && textForDirection[eventCap.direction]) {
+                    return {
+                        primary: _t(textForDirection[eventCap.direction]),
+                        // no byline because we would have already represented the event properly
+                    };
+                }
+            }
+
+            // We don't have anything simple, so just return a generic string for the event cap
+            if (kind === WidgetKind.Room) {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: _t("Send <b>%(eventType)s</b> events as you in this room", {
+                            eventType: eventCap.eventType,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        }),
+                        byline: CapabilityText.bylineFor(eventCap),
+                    };
+                } else {
+                    return {
+                        primary: _t("See <b>%(eventType)s</b> events posted to this room", {
+                            eventType: eventCap.eventType,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        }),
+                        byline: CapabilityText.bylineFor(eventCap),
+                    };
+                }
+            } else { // assume generic
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: _t("Send <b>%(eventType)s</b> events as you in your active room", {
+                            eventType: eventCap.eventType,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        }),
+                        byline: CapabilityText.bylineFor(eventCap),
+                    };
+                } else {
+                    return {
+                        primary: _t("See <b>%(eventType)s</b> events posted to your active room", {
+                            eventType: eventCap.eventType,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        }),
+                        byline: CapabilityText.bylineFor(eventCap),
+                    };
+                }
+            }
+        }
+
+        // We don't have enough context to render this capability specially, so we'll present it as-is
+        return {
+            primary: _t("The <b>%(capability)s</b> capability", {capability}, {
+                b: sub => <b>{sub}</b>,
+            }),
+        };
+    }
+
+    private static forRoomMessageCap(eventCap: WidgetEventCapability, kind: WidgetKind): TranslatedCapabilityText {
+        // First handle the case of "all messages" to make the switch later on a bit clearer
+        if (!eventCap.keyStr) {
+            if (eventCap.direction === EventDirection.Send) {
+                return {
+                    primary: kind === WidgetKind.Room
+                        ? _t("Send messages as you in this room")
+                        : _t("Send messages as you in your active room"),
+                };
+            } else {
+                return {
+                    primary: kind === WidgetKind.Room
+                        ? _t("See messages posted to this room")
+                        : _t("See messages posted to your active room"),
+                };
+            }
+        }
+
+        // Now handle all the message types we care about. There are more message types available, however
+        // they are not as common so we don't bother rendering them. They'll fall into the generic case.
+        switch (eventCap.keyStr) {
+            case MsgType.Text: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send text messages as you in this room")
+                            : _t("Send text messages as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See text messages posted to this room")
+                            : _t("See text messages posted to your active room"),
+                    };
+                }
+            }
+            case MsgType.Emote: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send emotes as you in this room")
+                            : _t("Send emotes as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See emotes posted to this room")
+                            : _t("See emotes posted to your active room"),
+                    };
+                }
+            }
+            case MsgType.Image: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send images as you in this room")
+                            : _t("Send images as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See images posted to this room")
+                            : _t("See images posted to your active room"),
+                    };
+                }
+            }
+            case MsgType.Video: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send videos as you in this room")
+                            : _t("Send videos as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See videos posted to this room")
+                            : _t("See videos posted to your active room"),
+                    };
+                }
+            }
+            case MsgType.File: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send general files as you in this room")
+                            : _t("Send general files as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See general files posted to this room")
+                            : _t("See general files posted to your active room"),
+                    };
+                }
+            }
+            default: {
+                let primary: TranslatedString;
+                if (eventCap.direction === EventDirection.Send) {
+                    if (kind === WidgetKind.Room) {
+                        primary = _t("Send <b>%(msgtype)s</b> messages as you in this room", {
+                            msgtype: eventCap.keyStr,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        });
+                    } else {
+                        primary = _t("Send <b>%(msgtype)s</b> messages as you in your active room", {
+                            msgtype: eventCap.keyStr,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        });
+                    }
+                } else {
+                    if (kind === WidgetKind.Room) {
+                        primary = _t("See <b>%(msgtype)s</b> messages posted to this room", {
+                            msgtype: eventCap.keyStr,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        });
+                    } else {
+                        primary = _t("See <b>%(msgtype)s</b> messages posted to your active room", {
+                            msgtype: eventCap.keyStr,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        });
+                    }
+                }
+                return {primary};
+            }
+        }
+    }
+}

yarn.lock

@@ -6532,10 +6532,10 @@ matrix-react-test-utils@^0.2.2:
   resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
   integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
 
-matrix-widget-api@^0.1.0-beta.8:
-  version "0.1.0-beta.8"
-  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.8.tgz#17e85c03c46353373890b869b1fd46162bdb0026"
-  integrity sha512-sWqyWs0RQqny/BimZUOxUd9BTJBzQmJlJ1i3lsSh1JBygV+aK5xQsONL97fc4i6/nwQPK72uCVDF+HwTtkpAbQ==
+matrix-widget-api@^0.1.0-beta.9:
+  version "0.1.0-beta.9"
+  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.9.tgz#83952132c1610e013acb3e695f923f971ddd5637"
+  integrity sha512-nXo4iaquSya6hYLXccX8o1K960ckSQ0YXIubRDha+YmB+L09F5a7bUPS5JN2tYANOMzyfFAzWVuFwjHv4+K+rg==
   dependencies:
     events "^3.2.0"