diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..afc29f0142
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+patreon: matrixdotorg
+liberapay: matrixdotorg
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 2a91f08ee4..843f314bd1 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -50,7 +50,6 @@
 @import "./views/context_menus/_TopLeftMenu.scss";
 @import "./views/dialogs/_AddressPickerDialog.scss";
 @import "./views/dialogs/_Analytics.scss";
-@import "./views/dialogs/_BugReportDialog.scss";
 @import "./views/dialogs/_ChangelogDialog.scss";
 @import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";
 @import "./views/dialogs/_ConfirmUserActionDialog.scss";
diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index fc1538a13d..b6644c1752 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -39,7 +39,11 @@ limitations under the License.
     z-index: 5001;
 }
 
-.mx_ContextualMenu.mx_ContextualMenu_right {
+.mx_ContextualMenu_right {
+    right: 0;
+}
+
+.mx_ContextualMenu.mx_ContextualMenu_withChevron_right {
     right: 8px;
 }
 
@@ -66,7 +70,11 @@ limitations under the License.
     right: 1px;
 }
 
-.mx_ContextualMenu.mx_ContextualMenu_left {
+.mx_ContextualMenu_left {
+    left: 0;
+}
+
+.mx_ContextualMenu.mx_ContextualMenu_withChevron_left {
     left: 8px;
 }
 
@@ -93,7 +101,11 @@ limitations under the License.
     left: 1px;
 }
 
-.mx_ContextualMenu.mx_ContextualMenu_top {
+.mx_ContextualMenu_top {
+    top: 0;
+}
+
+.mx_ContextualMenu.mx_ContextualMenu_withChevron_top {
     top: 8px;
 }
 
@@ -120,7 +132,11 @@ limitations under the License.
     top: 1px;
 }
 
-.mx_ContextualMenu.mx_ContextualMenu_bottom {
+.mx_ContextualMenu_bottom {
+    bottom: 0;
+}
+
+.mx_ContextualMenu.mx_ContextualMenu_withChevron_bottom {
     bottom: 8px;
 }
 
diff --git a/res/css/structures/_GenericErrorPage.scss b/res/css/structures/_GenericErrorPage.scss
index 44ea73444e..2b9e9f5e7d 100644
--- a/res/css/structures/_GenericErrorPage.scss
+++ b/res/css/structures/_GenericErrorPage.scss
@@ -12,7 +12,7 @@
     right: 0;
     margin: auto;
     width: 500px;
-    height: 200px;
+    height: 125px;
     border: 1px solid #f22;
     padding: 10px 10px 20px;
     background-color: #fcc;
diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index 4eff5c33e4..9bcd79a357 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -62,6 +62,15 @@ limitations under the License.
     margin-bottom: 12px;
 }
 
+.mx_Login_error.mx_Login_serverError {
+    text-align: left;
+    font-weight: normal;
+}
+
+.mx_Login_error.mx_Login_serverError.mx_Login_serverErrorNonFatal {
+    color: $orange-warning-color;
+}
+
 .mx_Login_type_container {
     display: flex;
     align-items: center;
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 16ac876869..cce3b5dbf5 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -72,7 +72,6 @@ limitations under the License.
     }
 
     .mx_Field input {
-        width: 100%;
         box-sizing: border-box;
     }
 
@@ -110,7 +109,6 @@ limitations under the License.
 
 .mx_AuthBody_fieldRow > .mx_Field {
     margin: 0 5px;
-    flex: 1;
 }
 
 .mx_AuthBody_fieldRow > .mx_Field:first-child {
diff --git a/res/css/views/auth/_ServerConfig.scss b/res/css/views/auth/_ServerConfig.scss
index fe96da2019..a31feb75d7 100644
--- a/res/css/views/auth/_ServerConfig.scss
+++ b/res/css/views/auth/_ServerConfig.scss
@@ -20,7 +20,6 @@ limitations under the License.
 }
 
 .mx_ServerConfig_fields .mx_Field {
-    flex: 1;
     margin: 0 5px;
 }
 
diff --git a/res/css/views/dialogs/_BugReportDialog.scss b/res/css/views/dialogs/_BugReportDialog.scss
deleted file mode 100644
index 90ef55b945..0000000000
--- a/res/css/views/dialogs/_BugReportDialog.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2017 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_BugReportDialog .mx_Field {
-    flex: 1;
-}
-
-.mx_BugReportDialog_field_input {
-    // TODO: We should really apply this to all .mx_Field inputs.
-    // See https://github.com/vector-im/riot-web/issues/9344.
-    flex: 1;
-}
diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 1f5d36b57a..8e669acd10 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -23,7 +23,11 @@ limitations under the License.
     cursor: default !important;
 }
 
-.mx_DevTools_RoomStateExplorer_button, .mx_DevTools_ServersInRoomList_button, .mx_DevTools_RoomStateExplorer_query {
+.mx_DevTools_RoomStateExplorer_query {
+    margin-bottom: 10px;
+}
+
+.mx_DevTools_RoomStateExplorer_button, .mx_DevTools_ServersInRoomList_button {
     margin-bottom: 10px;
     width: 100%;
 }
@@ -75,7 +79,6 @@ limitations under the License.
     max-width: 684px;
     min-height: 250px;
     padding: 10px;
-    width: 100%;
 }
 
 .mx_DevTools_content .mx_Field_input {
diff --git a/res/css/views/dialogs/_SetPasswordDialog.scss b/res/css/views/dialogs/_SetPasswordDialog.scss
index 28a8b7c9d7..325ff6c6ed 100644
--- a/res/css/views/dialogs/_SetPasswordDialog.scss
+++ b/res/css/views/dialogs/_SetPasswordDialog.scss
@@ -21,7 +21,6 @@ limitations under the License.
     color: $primary-fg-color;
     background-color: $primary-bg-color;
     font-size: 15px;
-    width: 100%;
     max-width: 280px;
     margin-bottom: 10px;
 }
diff --git a/res/css/views/elements/_EditableItemList.scss b/res/css/views/elements/_EditableItemList.scss
index be96d811d3..51fa4c4423 100644
--- a/res/css/views/elements/_EditableItemList.scss
+++ b/res/css/views/elements/_EditableItemList.scss
@@ -42,12 +42,6 @@ limitations under the License.
     margin-right: 5px;
 }
 
-.mx_EditableItemList_newItem .mx_Field input {
-    // Use 100% of the space available for the input, but don't let the 10px
-    // padding on either side of the input to push it out of alignment.
-    width: calc(100% - 20px);
-}
-
 .mx_EditableItemList_label {
     margin-bottom: 5px;
-}
\ No newline at end of file
+}
diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index 147bb3b471..f9cbf8c541 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -42,6 +42,7 @@ limitations under the License.
     padding: 8px 9px;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
+    flex: 1;
 }
 
 .mx_Field select {
diff --git a/res/css/views/elements/_PowerSelector.scss b/res/css/views/elements/_PowerSelector.scss
index 69f3a8eebb..799f6f246e 100644
--- a/res/css/views/elements/_PowerSelector.scss
+++ b/res/css/views/elements/_PowerSelector.scss
@@ -20,6 +20,5 @@ limitations under the License.
 
 .mx_PowerSelector .mx_Field select,
 .mx_PowerSelector .mx_Field input {
-    width: 100%;
     box-sizing: border-box;
 }
diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index 749cfeebe6..685c2bb018 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -26,6 +26,8 @@ limitations under the License.
     top: -18px;
     right: 8px;
     user-select: none;
+    // Ensure the action bar appears above over things, like the read marker.
+    z-index: 1;
 
     > * {
         display: inline-block;
diff --git a/res/css/views/messages/_ReactionsRow.scss b/res/css/views/messages/_ReactionsRow.scss
index fb66ffbb8c..3b764e97b4 100644
--- a/res/css/views/messages/_ReactionsRow.scss
+++ b/res/css/views/messages/_ReactionsRow.scss
@@ -16,4 +16,5 @@ limitations under the License.
 
 .mx_ReactionsRow {
     margin: 6px 0;
+    color: $primary-fg-color;
 }
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 7d8a58f7a8..a6194832a3 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -56,13 +56,17 @@ limitations under the License.
     color: $primary-fg-color;
     font-size: 14px;
     display: inline-block; /* anti-zalgo, with overflow hidden */
-    overflow-y: hidden;
+    overflow: hidden;
     cursor: pointer;
     padding-left: 65px; /* left gutter */
     padding-bottom: 0px;
     padding-top: 0px;
     margin: 0px;
     line-height: 17px;
+    /* the next three lines, along with overflow hidden, truncate long display names */
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: calc(100% - 65px);
 }
 
 .mx_EventTile .mx_SenderProfile .mx_Flair {
@@ -243,6 +247,7 @@ limitations under the License.
     height: 14px;
     top: 29px;
     user-select: none;
+    z-index: 1;
 }
 
 .mx_EventTile_continuation .mx_EventTile_readAvatars,
diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss
index c3b3ca2f7d..bb38c41581 100644
--- a/res/css/views/rooms/_MemberInfo.scss
+++ b/res/css/views/rooms/_MemberInfo.scss
@@ -43,6 +43,8 @@ limitations under the License.
 
 .mx_MemberInfo_name h2 {
     flex: 1;
+    overflow-x: auto;
+    max-height: 50px;
 }
 
 .mx_MemberInfo h2 {
diff --git a/res/css/views/settings/_EmailAddresses.scss b/res/css/views/settings/_EmailAddresses.scss
index eef804a33b..4f9541af2c 100644
--- a/res/css/views/settings/_EmailAddresses.scss
+++ b/res/css/views/settings/_EmailAddresses.scss
@@ -35,9 +35,3 @@ limitations under the License.
 .mx_ExistingEmailAddress_confirmBtn {
     margin-right: 5px;
 }
-
-.mx_EmailAddresses_new .mx_Field input {
-    // Use 100% of the space available for the input, but don't let the 10px
-    // padding on either side of the input to push it out of alignment.
-    width: calc(100% - 20px);
-}
diff --git a/res/css/views/settings/_PhoneNumbers.scss b/res/css/views/settings/_PhoneNumbers.scss
index 2f54babd6f..a3891882c2 100644
--- a/res/css/views/settings/_PhoneNumbers.scss
+++ b/res/css/views/settings/_PhoneNumbers.scss
@@ -36,12 +36,6 @@ limitations under the License.
     margin-right: 5px;
 }
 
-.mx_PhoneNumbers_new .mx_Field input {
-    // Use 100% of the space available for the input, but don't let the 10px
-    // padding on either side of the input to push it out of alignment.
-    width: calc(100% - 20px);
-}
-
 .mx_PhoneNumbers_input {
     display: flex;
     align-items: center;
diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss
index b2e449ac34..a972162618 100644
--- a/res/css/views/settings/_ProfileSettings.scss
+++ b/res/css/views/settings/_ProfileSettings.scss
@@ -22,11 +22,6 @@ limitations under the License.
     flex-grow: 1;
 }
 
-.mx_ProfileSettings_controls .mx_Field #profileDisplayName,
-.mx_ProfileSettings_controls .mx_Field #profileTopic {
-    width: calc(100% - 20px); // subtract 10px padding on left and right
-}
-
 .mx_ProfileSettings_controls .mx_Field #profileTopic {
     height: 4em;
 }
diff --git a/res/css/views/settings/tabs/room/_GeneralRoomSettingsTab.scss b/res/css/views/settings/tabs/room/_GeneralRoomSettingsTab.scss
index 91d7ed2c7d..af55820d66 100644
--- a/res/css/views/settings/tabs/room/_GeneralRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_GeneralRoomSettingsTab.scss
@@ -17,7 +17,3 @@ limitations under the License.
 .mx_GeneralRoomSettingsTab_profileSection {
     margin-top: 10px;
 }
-
-.mx_GeneralRoomSettingsTab .mx_AliasSettings .mx_Field select {
-    width: 100%;
-}
diff --git a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
index bec013674a..091c98ffb8 100644
--- a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
@@ -14,33 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_GeneralUserSettingsTab_changePassword,
-.mx_GeneralUserSettingsTab_themeSection {
-    display: block;
-}
-
 .mx_GeneralUserSettingsTab_changePassword .mx_Field,
 .mx_GeneralUserSettingsTab_themeSection .mx_Field {
-    display: block;
     margin-right: 100px; // Align with the other fields on the page
 }
 
-.mx_GeneralUserSettingsTab_changePassword .mx_Field input {
-    display: block;
-    width: calc(100% - 20px); // subtract 10px padding on left and right
-}
-
 .mx_GeneralUserSettingsTab_changePassword .mx_Field:first-child {
     margin-top: 0;
 }
 
-.mx_GeneralUserSettingsTab_themeSection .mx_Field select {
-    display: block;
-    width: 100%;
-}
-
 .mx_GeneralUserSettingsTab_accountSection > .mx_EmailAddresses,
 .mx_GeneralUserSettingsTab_accountSection > .mx_PhoneNumbers,
 .mx_GeneralUserSettingsTab_languageInput {
     margin-right: 100px; // Align with the other fields on the page
-}
\ No newline at end of file
+}
diff --git a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
index f447221b7a..b3430f47af 100644
--- a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
@@ -17,11 +17,3 @@ limitations under the License.
 .mx_PreferencesUserSettingsTab .mx_Field {
     margin-right: 100px; // Align with the rest of the controls
 }
-
-.mx_PreferencesUserSettingsTab .mx_Field input {
-    display: block;
-
-    // Subtract 10px padding on left and right
-    // This is to keep the input aligned with the rest of the tab's controls.
-    width: calc(100% - 20px);
-}
diff --git a/res/css/views/settings/tabs/user/_VoiceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_VoiceUserSettingsTab.scss
index f5dba9831e..36c8cfd896 100644
--- a/res/css/views/settings/tabs/user/_VoiceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_VoiceUserSettingsTab.scss
@@ -14,11 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_VoiceUserSettingsTab .mx_Field select {
-    width: 100%;
-    max-width: 100%;
-}
-
 .mx_VoiceUserSettingsTab .mx_Field {
     margin-right: 100px; // align with the rest of the fields
 }
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 712d905b43..8244485ee3 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -35,8 +35,9 @@ $selection-fg-color: $primary-bg-color;
 
 $focus-brightness: 105%;
 
-// red warning colour
-$warning-color: $notice-primary-color;
+// warning colours
+$warning-color: $notice-primary-color; // red
+$orange-warning-color: #ff8d13; // used for true warnings
 // background colour for warnings
 $warning-bg-color: #DF2A8B;
 $info-bg-color: #2A9EDF;
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index a8bbce10dc..6cd06678ea 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -51,6 +51,7 @@ const ZWJ_REGEX = new RegExp("\u200D|\u2003", "g");
 const WHITESPACE_REGEX = new RegExp("\\s", "g");
 
 const BIGEMOJI_REGEX = new RegExp(`^(${EMOJIBASE_REGEX.source})+$`, 'i');
+const SINGLE_EMOJI_REGEX = new RegExp(`^(${EMOJIBASE_REGEX.source})$`, 'i');
 
 const COLOR_REGEX = /^#[0-9a-fA-F]{6}$/;
 
@@ -63,10 +64,19 @@ const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet'];
  * need emojification.
  * unicodeToImage uses this function.
  */
-export function containsEmoji(str) {
+export function mightContainEmoji(str) {
     return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str);
 }
 
+/**
+ * Returns true if the string definitely contains a single emoji.
+ * @param {String} str String to test
+ * @return {Boolean}
+ */
+export function isSingleEmoji(str) {
+    return mightContainEmoji(str) && SINGLE_EMOJI_REGEX.test(str);
+}
+
 /**
  * Returns the shortcode for an emoji character.
  *
@@ -428,7 +438,7 @@ export function bodyToHtml(content, highlights, opts={}) {
         if (opts.stripReplyFallback && formattedBody) formattedBody = ReplyThread.stripHTMLReply(formattedBody);
         strippedBody = opts.stripReplyFallback ? ReplyThread.stripPlainReply(content.body) : content.body;
 
-        bodyHasEmoji = containsEmoji(isHtmlMessage ? formattedBody : content.body);
+        bodyHasEmoji = mightContainEmoji(isHtmlMessage ? formattedBody : content.body);
 
         // Only generate safeBody if the message was sent as org.matrix.custom.html
         if (isHtmlMessage) {
diff --git a/src/Keyboard.js b/src/Keyboard.js
index bf83a1a05f..fb7d692ce3 100644
--- a/src/Keyboard.js
+++ b/src/Keyboard.js
@@ -58,6 +58,7 @@ export const KeyCode = {
     KEY_X: 88,
     KEY_Y: 89,
     KEY_Z: 90,
+    KEY_BACKTICK: 223,
 };
 
 export function isOnlyCtrlOrCmdKeyEvent(ev) {
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 7c78b71f2b..195377fbe9 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -233,7 +233,7 @@ function _registerAsGuest(hsUrl, isUrl, defaultDeviceDisplayName) {
             guest: true,
         }, true).then(() => true);
     }, (err) => {
-        console.error("Failed to register as guest: " + err + " " + err.data);
+        console.error("Failed to register as guest", err);
         return false;
     });
 }
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 574f05bf85..07499a3a87 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -51,6 +51,7 @@ interface MatrixClientCreds {
 class MatrixClientPeg {
     constructor() {
         this.matrixClient = null;
+        this._justRegisteredUserId = null;
 
         // These are the default options used when when the
         // client is started in 'start'. These can be altered
@@ -85,6 +86,31 @@ class MatrixClientPeg {
         MatrixActionCreators.stop();
     }
 
+    /*
+     * If we've registered a user ID we set this to the ID of the
+     * user we've just registered. If they then go & log in, we
+     * can send them to the welcome user (obviously this doesn't
+     * guarentee they'll get a chat with the welcome user).
+     *
+     * @param {string} uid The user ID of the user we've just registered
+     */
+    setJustRegisteredUserId(uid) {
+        this._justRegisteredUserId = uid;
+    }
+
+    /*
+     * Returns true if the current user has just been registered by this
+     * client as determined by setJustRegisteredUserId()
+     *
+     * @returns {bool} True if user has just been registered
+     */
+    currentUserIsJustRegistered() {
+        return (
+            this.matrixClient &&
+            this.matrixClient.credentials.userId === this._justRegisteredUserId
+        );
+    }
+
     /**
      * Replace this MatrixClientPeg's client with a client instance that has
      * homeserver / identity server URLs and active credentials
diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 345eae2b18..edd6f79270 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -183,11 +183,14 @@ export default class ContextualMenu extends React.Component {
 
         const menuClasses = classNames({
             'mx_ContextualMenu': true,
-            'mx_ContextualMenu_noChevron': chevronFace === 'none',
-            'mx_ContextualMenu_left': chevronFace === 'left',
-            'mx_ContextualMenu_right': chevronFace === 'right',
-            'mx_ContextualMenu_top': chevronFace === 'top',
-            'mx_ContextualMenu_bottom': chevronFace === 'bottom',
+            'mx_ContextualMenu_left': !hasChevron && position.left,
+            'mx_ContextualMenu_right': !hasChevron && position.right,
+            'mx_ContextualMenu_top': !hasChevron && position.top,
+            'mx_ContextualMenu_bottom': !hasChevron && position.bottom,
+            'mx_ContextualMenu_withChevron_left': chevronFace === 'left',
+            'mx_ContextualMenu_withChevron_right': chevronFace === 'right',
+            'mx_ContextualMenu_withChevron_top': chevronFace === 'top',
+            'mx_ContextualMenu_withChevron_bottom': chevronFace === 'bottom',
         });
 
         const menuStyle = {};
diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index e3c197e1db..ecc01a443d 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -46,6 +46,8 @@ export default class EmbeddedPage extends React.PureComponent {
     constructor(props) {
         super(props);
 
+        this._dispatcherRef = null;
+
         this.state = {
             page: '',
         };
@@ -90,7 +92,7 @@ export default class EmbeddedPage extends React.PureComponent {
 
     componentWillUnmount() {
         this._unmounted = true;
-        dis.unregister(this._dispatcherRef);
+        if (this._dispatcherRef !== null) dis.unregister(this._dispatcherRef);
     }
 
     onAction = (payload) => {
diff --git a/src/components/structures/GenericErrorPage.js b/src/components/structures/GenericErrorPage.js
index 3d8e68cea7..ab7d4f9311 100644
--- a/src/components/structures/GenericErrorPage.js
+++ b/src/components/structures/GenericErrorPage.js
@@ -16,22 +16,18 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {_t} from "../../languageHandler";
 
 export default class GenericErrorPage extends React.PureComponent {
     static propTypes = {
+        title: PropTypes.object.isRequired, // jsx for title
         message: PropTypes.object.isRequired, // jsx to display
     };
 
     render() {
         return <div className='mx_GenericErrorPage'>
             <div className='mx_GenericErrorPage_box'>
-                <h1>{_t("Error loading Riot")}</h1>
+                <h1>{this.props.title}</h1>
                 <p>{this.props.message}</p>
-                <p>{_t(
-                    "If this is unexpected, please contact your system administrator " +
-                    "or technical support representative.",
-                )}</p>
             </div>
         </div>;
     }
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index c893057022..ccc906601c 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -23,6 +23,8 @@ import PropTypes from 'prop-types';
 
 import {getEntryComponentForLoginType} from '../views/auth/InteractiveAuthEntryComponents';
 
+import sdk from '../../index';
+
 export default React.createClass({
     displayName: 'InteractiveAuth',
 
@@ -91,13 +93,14 @@ export default React.createClass({
         this._authLogic = new InteractiveAuth({
             authData: this.props.authData,
             doRequest: this._requestCallback,
+            busyChanged: this._onBusyChanged,
             inputs: this.props.inputs,
             stateUpdated: this._authStateUpdated,
             matrixClient: this.props.matrixClient,
             sessionId: this.props.sessionId,
             clientSecret: this.props.clientSecret,
             emailSid: this.props.emailSid,
-            requestEmailToken: this.props.requestEmailToken,
+            requestEmailToken: this._requestEmailToken,
         });
 
         this._authLogic.attemptAuth().then((result) => {
@@ -135,6 +138,19 @@ export default React.createClass({
         }
     },
 
+    _requestEmailToken: async function(...args) {
+        this.setState({
+            busy: true,
+        });
+        try {
+            return await this.props.requestEmailToken(...args);
+        } finally {
+            this.setState({
+                busy: false,
+            });
+        }
+    },
+
     tryContinue: function() {
         if (this.refs.stageComponent && this.refs.stageComponent.tryContinue) {
             this.refs.stageComponent.tryContinue();
@@ -152,27 +168,26 @@ export default React.createClass({
         });
     },
 
-    _requestCallback: function(auth, background) {
-        const makeRequestPromise = this.props.makeRequest(auth);
+    _requestCallback: function(auth) {
+        // This wrapper just exists because the js-sdk passes a second
+        // 'busy' param for backwards compat. This throws the tests off
+        // so discard it here.
+        return this.props.makeRequest(auth);
+    },
 
-        // if it's a background request, just do it: we don't want
-        // it to affect the state of our UI.
-        if (background) return makeRequestPromise;
-
-        // otherwise, manage the state of the spinner and error messages
-        this.setState({
-            busy: true,
-            errorText: null,
-            stageErrorText: null,
-        });
-        return makeRequestPromise.finally(() => {
-            if (this._unmounted) {
-                return;
-            }
+    _onBusyChanged: function(busy) {
+        // if we've started doing stuff, reset the error messages
+        if (busy) {
+            this.setState({
+                busy: true,
+                errorText: null,
+                stageErrorText: null,
+            });
+        } else {
             this.setState({
                 busy: false,
             });
-        });
+        }
     },
 
     _setFocus: function() {
@@ -187,7 +202,14 @@ export default React.createClass({
 
     _renderCurrentStage: function() {
         const stage = this.state.authStage;
-        if (!stage) return null;
+        if (!stage) {
+            if (this.state.busy) {
+                const Loader = sdk.getComponent("elements.Spinner");
+                return <Loader />;
+            } else {
+                return null;
+            }
+        }
 
         const StageComponent = getEntryComponentForLoginType(stage);
         return (
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 7a5c6e3006..6c05b45111 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -325,10 +325,11 @@ const LoggedInView = React.createClass({
                     handled = true;
                 }
                 break;
-            case KeyCode.KEY_I:
+            case KeyCode.KEY_BACKTICK:
                 // Ideally this would be CTRL+P for "Profile", but that's
                 // taken by the print dialog. CTRL+I for "Information"
-                // will have to do.
+                // was previously chosen but conflicted with italics in
+                // composer, so CTRL+` it is
 
                 if (ctrlCmdOnly) {
                     dis.dispatch({
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index ac328f8387..789649c220 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2017-2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -50,7 +51,9 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import { startAnyRegistrationFlow } from "../../Registration.js";
 import { messageForSyncError } from '../../utils/ErrorUtils';
 import ResizeNotifier from "../../utils/ResizeNotifier";
-import {ValidatedServerConfig} from "../../utils/AutoDiscoveryUtils";
+import { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils from "../../utils/AutoDiscoveryUtils";
+import DMRoomMap from '../../utils/DMRoomMap';
 
 // Disable warnings for now: we use deprecated bluebird functions
 // and need to migrate, but they spam the console with warnings.
@@ -435,9 +438,15 @@ export default React.createClass({
                 break;
             case 'start_registration':
                 // This starts the full registration flow
+                if (payload.screenAfterLogin) {
+                    this._screenAfterLogin = payload.screenAfterLogin;
+                }
                 this._startRegistration(payload.params || {});
                 break;
             case 'start_login':
+                if (payload.screenAfterLogin) {
+                    this._screenAfterLogin = payload.screenAfterLogin;
+                }
                 this.setStateForNewView({
                     view: VIEWS.LOGIN,
                 });
@@ -669,7 +678,7 @@ export default React.createClass({
         });
     },
 
-    _startRegistration: function(params) {
+    _startRegistration: async function(params) {
         const newState = {
             view: VIEWS.REGISTER,
         };
@@ -682,10 +691,12 @@ export default React.createClass({
             params.is_url &&
             params.sid
         ) {
+            newState.serverConfig = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(
+                params.hs_url, params.is_url,
+            );
+
             newState.register_client_secret = params.client_secret;
             newState.register_session_id = params.session_id;
-            newState.register_hs_url = params.hs_url;
-            newState.register_is_url = params.is_url;
             newState.register_id_sid = params.sid;
         }
 
@@ -877,6 +888,7 @@ export default React.createClass({
                     }
                     return;
                 }
+                MatrixClientPeg.setJustRegisteredUserId(credentials.user_id);
                 this.onRegistered(credentials);
             },
             onDifferentServerClicked: (ev) => {
@@ -1121,29 +1133,80 @@ export default React.createClass({
         }
     },
 
+    /**
+     * Starts a chat with the welcome user, if the user doesn't already have one
+     * @returns {string} The room ID of the new room, or null if no room was created
+     */
+    async _startWelcomeUserChat() {
+        // We can end up with multiple tabs post-registration where the user
+        // might then end up with a session and we don't want them all making
+        // a chat with the welcome user: try to de-dupe.
+        // We need to wait for the first sync to complete for this to
+        // work though.
+        let waitFor;
+        if (!this.firstSyncComplete) {
+            waitFor = this.firstSyncPromise.promise;
+        } else {
+            waitFor = Promise.resolve();
+        }
+        await waitFor;
+
+        const welcomeUserRooms = DMRoomMap.shared().getDMRoomsForUserId(
+            this.props.config.welcomeUserId,
+        );
+        if (welcomeUserRooms.length === 0) {
+            const roomId = await createRoom({
+                dmUserId: this.props.config.welcomeUserId,
+                // Only view the welcome user if we're NOT looking at a room
+                andView: !this.state.currentRoomId,
+            });
+            // This is a bit of a hack, but since the deduplication relies
+            // on m.direct being up to date, we need to force a sync
+            // of the database, otherwise if the user goes to the other
+            // tab before the next save happens (a few minutes), the
+            // saved sync will be restored from the db and this code will
+            // run without the update to m.direct, making another welcome
+            // user room (it doesn't wait for new data from the server, just
+            // the saved sync to be loaded).
+            const saveWelcomeUser = (ev) => {
+                if (
+                    ev.getType() == 'm.direct' &&
+                    ev.getContent() &&
+                    ev.getContent()[this.props.config.welcomeUserId]
+                ) {
+                    MatrixClientPeg.get().store.save(true);
+                    MatrixClientPeg.get().removeListener(
+                        "accountData", saveWelcomeUser,
+                    );
+                }
+            };
+            MatrixClientPeg.get().on("accountData", saveWelcomeUser);
+
+            return roomId;
+        }
+        return null;
+    },
+
     /**
      * Called when a new logged in session has started
      */
     _onLoggedIn: async function() {
         this.setStateForNewView({ view: VIEWS.LOGGED_IN });
-        if (this._is_registered) {
-            this._is_registered = false;
+        if (MatrixClientPeg.currentUserIsJustRegistered()) {
+            MatrixClientPeg.setJustRegisteredUserId(null);
 
             if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
-                const roomId = await createRoom({
-                    dmUserId: this.props.config.welcomeUserId,
-                    // Only view the welcome user if we're NOT looking at a room
-                    andView: !this.state.currentRoomId,
-                });
-                // if successful, return because we're already
-                // viewing the welcomeUserId room
-                // else, if failed, fall through to view_home_page
-                if (roomId) {
-                    return;
+                const welcomeUserRoom = await this._startWelcomeUserChat();
+                if (welcomeUserRoom === null) {
+                    // We didn't rediret to the welcome user room, so show
+                    // the homepage.
+                    dis.dispatch({action: 'view_home_page'});
                 }
+            } else {
+                // The user has just logged in after registering,
+                // so show the homepage.
+                dis.dispatch({action: 'view_home_page'});
             }
-            // The user has just logged in after registering
-            dis.dispatch({action: 'view_home_page'});
         } else {
             this._showScreenAfterLogin();
         }
@@ -1684,9 +1747,6 @@ export default React.createClass({
                 return MatrixClientPeg.get();
             }
         }
-        // XXX: This should be in state or ideally store(s) because we risk not
-        //      rendering the most up-to-date view of state otherwise.
-        this._is_registered = true;
         return Lifecycle.setLoggedIn(credentials);
     },
 
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 698768067a..52fd6d9be4 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -517,7 +517,8 @@ module.exports = React.createClass({
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
         const ret = [];
 
-        const isEditing = this.props.editEvent && this.props.editEvent.getId() === mxEv.getId();
+        const isEditing = this.props.editState &&
+            this.props.editState.getEvent().getId() === mxEv.getId();
         // is this a continuation of the previous message?
         let continuation = false;
 
@@ -585,7 +586,7 @@ module.exports = React.createClass({
                     continuation={continuation}
                     isRedacted={mxEv.isRedacted()}
                     replacingEventId={mxEv.replacingEventId()}
-                    isEditing={isEditing}
+                    editState={isEditing && this.props.editState}
                     onHeightChanged={this._onHeightChanged}
                     readReceipts={readReceipts}
                     readReceiptMap={this._readReceiptMap}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 7c0710a18d..cda3f60fce 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2018, 2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -1551,6 +1552,8 @@ module.exports = React.createClass({
                             joining={this.state.joining}
                             inviterName={inviterName}
                             invitedEmail={invitedEmail}
+                            oobData={this.props.oobData}
+                            signUrl={this.props.thirdPartyInvite ? this.props.thirdPartyInvite.inviteSignUrl : null}
                             room={this.state.room}
                         />
                     </div>
@@ -1681,6 +1684,7 @@ module.exports = React.createClass({
                                 joining={this.state.joining}
                                 inviterName={inviterName}
                                 invitedEmail={invitedEmail}
+                                oobData={this.props.oobData}
                                 canPreview={this.state.canPeek}
                                 room={this.state.room}
                 />
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 220c56d754..9c48b8ede1 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -35,6 +35,7 @@ const Modal = require("../../Modal");
 const UserActivity = require("../../UserActivity");
 import { KeyCode } from '../../Keyboard';
 import Timer from '../../utils/Timer';
+import EditorStateTransfer from '../../utils/EditorStateTransfer';
 
 const PAGINATE_SIZE = 20;
 const INITIAL_SIZE = 20;
@@ -411,7 +412,8 @@ const TimelinePanel = React.createClass({
             this.forceUpdate();
         }
         if (payload.action === "edit_event") {
-            this.setState({editEvent: payload.event}, () => {
+            const editState = payload.event ? new EditorStateTransfer(payload.event) : null;
+            this.setState({editState}, () => {
                 if (payload.event && this.refs.messagePanel) {
                     this.refs.messagePanel.scrollToEventIfNeeded(
                         payload.event.getId(),
@@ -1306,7 +1308,7 @@ const TimelinePanel = React.createClass({
                 tileShape={this.props.tileShape}
                 resizeNotifier={this.props.resizeNotifier}
                 getRelationsForEvent={this.getRelationsForEvent}
-                editEvent={this.state.editEvent}
+                editState={this.state.editState}
                 showReactions={this.props.showReactions}
             />
         );
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 2ea39ad657..a5ffc9f008 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -22,7 +22,8 @@ import sdk from '../../../index';
 import Modal from "../../../Modal";
 import SdkConfig from "../../../SdkConfig";
 import PasswordReset from "../../../PasswordReset";
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import classNames from 'classnames';
 
 // Phases
 // Show controls to configure server details
@@ -53,9 +54,41 @@ module.exports = React.createClass({
             password: "",
             password2: "",
             errorText: null,
+
+            // We perform liveliness checks later, but for now suppress the errors.
+            // We also track the server dead errors independently of the regular errors so
+            // that we can render it differently, and override any other error the user may
+            // be seeing.
+            serverIsAlive: true,
+            serverErrorIsFatal: false,
+            serverDeadError: "",
         };
     },
 
+    componentWillMount: function() {
+        this._checkServerLiveliness(this.props.serverConfig);
+    },
+
+    componentWillReceiveProps: function(newProps) {
+        if (newProps.serverConfig.hsUrl === this.props.serverConfig.hsUrl &&
+            newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
+
+        // Do a liveliness check on the new URLs
+        this._checkServerLiveliness(newProps.serverConfig);
+    },
+
+    _checkServerLiveliness: async function(serverConfig) {
+        try {
+            await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(
+                serverConfig.hsUrl,
+                serverConfig.isUrl,
+            );
+            this.setState({serverIsAlive: true});
+        } catch (e) {
+            this.setState(AutoDiscoveryUtils.authComponentStateForError(e, "forgot_password"));
+        }
+    },
+
     submitPasswordReset: function(email, password) {
         this.setState({
             phase: PHASE_SENDING_EMAIL,
@@ -86,9 +119,12 @@ module.exports = React.createClass({
         });
     },
 
-    onSubmitForm: function(ev) {
+    onSubmitForm: async function(ev) {
         ev.preventDefault();
 
+        // refresh the server errors, just in case the server came back online
+        await this._checkServerLiveliness(this.props.serverConfig);
+
         if (!this.state.email) {
             this.showErrorDialog(_t('The email address linked to your account must be entered.'));
         } else if (!this.state.password || !this.state.password2) {
@@ -173,11 +209,25 @@ module.exports = React.createClass({
         const Field = sdk.getComponent('elements.Field');
 
         let errorText = null;
-        const err = this.state.errorText || this.props.defaultServerDiscoveryError;
+        const err = this.state.errorText;
         if (err) {
             errorText = <div className="mx_Login_error">{ err }</div>;
         }
 
+        let serverDeadSection;
+        if (!this.state.serverIsAlive) {
+            const classes = classNames({
+                "mx_Login_error": true,
+                "mx_Login_serverError": true,
+                "mx_Login_serverErrorNonFatal": !this.state.serverErrorIsFatal,
+            });
+            serverDeadSection = (
+                <div className={classes}>
+                    {this.state.serverDeadError}
+                </div>
+            );
+        }
+
         let yourMatrixAccountText = _t('Your Matrix account on %(serverName)s', {
             serverName: this.props.serverConfig.hsName,
         });
@@ -207,11 +257,12 @@ module.exports = React.createClass({
         }
 
         return <div>
+            {errorText}
+            {serverDeadSection}
             <h3>
                 {yourMatrixAccountText}
                 {editLink}
             </h3>
-            {errorText}
             <form onSubmit={this.onSubmitForm}>
                 <div className="mx_AuthBody_fieldRow">
                     <Field
@@ -246,7 +297,11 @@ module.exports = React.createClass({
                     'A verification email will be sent to your inbox to confirm ' +
                     'setting your new password.',
                 )}</span>
-                <input className="mx_Login_submit" type="submit" value={_t('Send Reset Email')} />
+                <input
+                    className="mx_Login_submit"
+                    type="submit"
+                    value={_t('Send Reset Email')}
+                />
             </form>
             <a className="mx_AuthBody_changeFlow" onClick={this.onLoginClick} href="#">
                 {_t('Sign in instead')}
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index b556057cdb..a7bd8ba2ab 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -26,6 +26,7 @@ import Login from '../../../Login';
 import SdkConfig from '../../../SdkConfig';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
 import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import classNames from "classnames";
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -94,6 +95,14 @@ module.exports = React.createClass({
             phase: PHASE_LOGIN,
             // The current login flow, such as password, SSO, etc.
             currentFlow: "m.login.password",
+
+            // We perform liveliness checks later, but for now suppress the errors.
+            // We also track the server dead errors independently of the regular errors so
+            // that we can render it differently, and override any other error the user may
+            // be seeing.
+            serverIsAlive: true,
+            serverErrorIsFatal: false,
+            serverDeadError: "",
         };
     },
 
@@ -138,7 +147,7 @@ module.exports = React.createClass({
 
     onPasswordLogin: function(username, phoneCountry, phoneNumber, password) {
         // Prevent people from submitting their password when something isn't right.
-        if (this.isBusy() || !this.state.canTryLogin) return;
+        if (this.isBusy()) return;
 
         this.setState({
             busy: true,
@@ -149,6 +158,7 @@ module.exports = React.createClass({
         this._loginLogic.loginViaPassword(
             username, phoneCountry, phoneNumber, password,
         ).then((data) => {
+            this.setState({serverIsAlive: true}); // it must be, we logged in.
             this.props.onLoggedIn(data);
         }, (error) => {
             if (this._unmounted) {
@@ -231,7 +241,7 @@ module.exports = React.createClass({
         const doWellknownLookup = username[0] === "@";
         this.setState({
             username: username,
-            busy: doWellknownLookup, // unset later by the result of onServerConfigChange
+            busy: doWellknownLookup,
             errorText: null,
             canTryLogin: true,
         });
@@ -240,6 +250,16 @@ module.exports = React.createClass({
             try {
                 const result = await AutoDiscoveryUtils.validateServerName(serverName);
                 this.props.onServerConfigChange(result);
+                // We'd like to rely on new props coming in via `onServerConfigChange`
+                // so that we know the servers have definitely updated before clearing
+                // the busy state. In the case of a full MXID that resolves to the same
+                // HS as Riot's default HS though, there may not be any server change.
+                // To avoid this trap, we clear busy here. For cases where the server
+                // actually has changed, `_initLoginLogic` will be called and manages
+                // busy state for its own liveness check.
+                this.setState({
+                    busy: false,
+                });
             } catch (e) {
                 console.error("Problem parsing URL or unhandled error doing .well-known discovery:", e);
 
@@ -247,7 +267,19 @@ module.exports = React.createClass({
                 if (e.translatedMessage) {
                     message = e.translatedMessage;
                 }
-                this.setState({errorText: message, busy: false, canTryLogin: false});
+
+                let errorText = message;
+                let discoveryState = {};
+                if (AutoDiscoveryUtils.isLivelinessError(e)) {
+                    errorText = this.state.errorText;
+                    discoveryState = AutoDiscoveryUtils.authComponentStateForError(e);
+                }
+
+                this.setState({
+                    busy: false,
+                    errorText,
+                    ...discoveryState,
+                });
             }
         }
     },
@@ -297,13 +329,18 @@ module.exports = React.createClass({
         });
     },
 
-    _initLoginLogic: function(hsUrl, isUrl) {
-        const self = this;
+    _initLoginLogic: async function(hsUrl, isUrl) {
         hsUrl = hsUrl || this.props.serverConfig.hsUrl;
         isUrl = isUrl || this.props.serverConfig.isUrl;
 
-        // TODO: TravisR - Only use this if the homeserver is the default homeserver
-        const fallbackHsUrl = this.props.fallbackHsUrl;
+        let isDefaultServer = false;
+        if (this.props.serverConfig.isDefault
+            && hsUrl === this.props.serverConfig.hsUrl
+            && isUrl === this.props.serverConfig.isUrl) {
+            isDefaultServer = true;
+        }
+
+        const fallbackHsUrl = isDefaultServer ? this.props.fallbackHsUrl : null;
 
         const loginLogic = new Login(hsUrl, isUrl, fallbackHsUrl, {
             defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
@@ -315,6 +352,20 @@ module.exports = React.createClass({
             loginIncorrect: false,
         });
 
+        // Do a quick liveliness check on the URLs
+        try {
+            await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
+            this.setState({serverIsAlive: true, errorText: ""});
+        } catch (e) {
+            this.setState({
+                busy: false,
+                ...AutoDiscoveryUtils.authComponentStateForError(e),
+            });
+            if (this.state.serverErrorIsFatal) {
+                return; // Server is dead - do not continue.
+            }
+        }
+
         loginLogic.getFlows().then((flows) => {
             // look for a flow where we understand all of the steps.
             for (let i = 0; i < flows.length; i++ ) {
@@ -339,14 +390,14 @@ module.exports = React.createClass({
                         "supported by this client.",
                 ),
             });
-        }, function(err) {
-            self.setState({
-                errorText: self._errorTextFromError(err),
+        }, (err) => {
+            this.setState({
+                errorText: this._errorTextFromError(err),
                 loginIncorrect: false,
                 canTryLogin: false,
             });
-        }).finally(function() {
-            self.setState({
+        }).finally(() => {
+            this.setState({
                 busy: false,
             });
         }).done();
@@ -522,6 +573,20 @@ module.exports = React.createClass({
             );
         }
 
+        let serverDeadSection;
+        if (!this.state.serverIsAlive) {
+            const classes = classNames({
+                "mx_Login_error": true,
+                "mx_Login_serverError": true,
+                "mx_Login_serverErrorNonFatal": !this.state.serverErrorIsFatal,
+            });
+            serverDeadSection = (
+                <div className={classes}>
+                    {this.state.serverDeadError}
+                </div>
+            );
+        }
+
         return (
             <AuthPage>
                 <AuthHeader />
@@ -531,6 +596,7 @@ module.exports = React.createClass({
                         {loader}
                     </h2>
                     { errorTextSection }
+                    { serverDeadSection }
                     { this.renderServerComponent() }
                     { this.renderLoginComponentForStep() }
                     <a className="mx_AuthBody_changeFlow" onClick={this.onRegisterClick} href="#">
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 6e4f076091..1957275505 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -26,7 +26,10 @@ import { _t, _td } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
 import * as ServerType from '../../views/auth/ServerTypeSelector';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import classNames from "classnames";
+import * as Lifecycle from '../../../Lifecycle';
+import MatrixClientPeg from "../../../MatrixClientPeg";
 
 // Phases
 // Show controls to configure server details
@@ -79,6 +82,21 @@ module.exports = React.createClass({
             // Phase of the overall registration dialog.
             phase: PHASE_REGISTRATION,
             flows: null,
+            // If set, we've registered but are not going to log
+            // the user in to their new account automatically.
+            completedNoSignin: false,
+
+            // We perform liveliness checks later, but for now suppress the errors.
+            // We also track the server dead errors independently of the regular errors so
+            // that we can render it differently, and override any other error the user may
+            // be seeing.
+            serverIsAlive: true,
+            serverErrorIsFatal: false,
+            serverDeadError: "",
+
+            // Our matrix client - part of state because we can't render the UI auth
+            // component without it.
+            matrixClient: null,
         };
     },
 
@@ -150,13 +168,37 @@ module.exports = React.createClass({
     _replaceClient: async function(serverConfig) {
         this.setState({
             errorText: null,
+            // busy while we do liveness check (we need to avoid trying to render
+            // the UI auth component while we don't have a matrix client)
+            busy: true,
         });
         if (!serverConfig) serverConfig = this.props.serverConfig;
+
+        // Do a liveliness check on the URLs
+        try {
+            await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(
+                serverConfig.hsUrl,
+                serverConfig.isUrl,
+            );
+            this.setState({serverIsAlive: true});
+        } catch (e) {
+            this.setState({
+                busy: false,
+                ...AutoDiscoveryUtils.authComponentStateForError(e, "register"),
+            });
+            if (this.state.serverErrorIsFatal) {
+                return; // Server is dead - do not continue.
+            }
+        }
+
         const {hsUrl, isUrl} = serverConfig;
-        this._matrixClient = Matrix.createClient({
-            baseUrl: hsUrl,
-            idBaseUrl: isUrl,
+        this.setState({
+            matrixClient: Matrix.createClient({
+                baseUrl: hsUrl,
+                idBaseUrl: isUrl,
+            }),
         });
+        this.setState({busy: false});
         try {
             await this._makeRegisterRequest({});
             // This should never succeed since we specified an empty
@@ -172,6 +214,7 @@ module.exports = React.createClass({
                     errorText: _t("Registration has been disabled on this homeserver."),
                 });
             } else {
+                console.log("Unable to query for supported registration methods.", e);
                 this.setState({
                     errorText: _t("Unable to query for supported registration methods."),
                 });
@@ -189,14 +232,14 @@ module.exports = React.createClass({
     },
 
     _requestEmailToken: function(emailAddress, clientSecret, sendAttempt, sessionId) {
-        return this._matrixClient.requestRegisterEmailToken(
+        return this.state.matrixClient.requestRegisterEmailToken(
             emailAddress,
             clientSecret,
             sendAttempt,
             this.props.makeRegistrationUrl({
                 client_secret: clientSecret,
-                hs_url: this._matrixClient.getHomeserverUrl(),
-                is_url: this._matrixClient.getIdentityServerUrl(),
+                hs_url: this.state.matrixClient.getHomeserverUrl(),
+                is_url: this.state.matrixClient.getIdentityServerUrl(),
                 session_id: sessionId,
             }),
         );
@@ -245,21 +288,29 @@ module.exports = React.createClass({
             return;
         }
 
-        this.setState({
-            // we're still busy until we get unmounted: don't show the registration form again
-            busy: true,
+        MatrixClientPeg.setJustRegisteredUserId(response.user_id);
+
+        const newState = {
             doingUIAuth: false,
-        });
+        };
+        if (response.access_token) {
+            const cli = await this.props.onLoggedIn({
+                userId: response.user_id,
+                deviceId: response.device_id,
+                homeserverUrl: this.state.matrixClient.getHomeserverUrl(),
+                identityServerUrl: this.state.matrixClient.getIdentityServerUrl(),
+                accessToken: response.access_token,
+            });
 
-        const cli = await this.props.onLoggedIn({
-            userId: response.user_id,
-            deviceId: response.device_id,
-            homeserverUrl: this._matrixClient.getHomeserverUrl(),
-            identityServerUrl: this._matrixClient.getIdentityServerUrl(),
-            accessToken: response.access_token,
-        });
+            this._setupPushers(cli);
+            // we're still busy until we get unmounted: don't show the registration form again
+            newState.busy = true;
+        } else {
+            newState.busy = false;
+            newState.completedNoSignin = true;
+        }
 
-        this._setupPushers(cli);
+        this.setState(newState);
     },
 
     _setupPushers: function(matrixClient) {
@@ -316,6 +367,12 @@ module.exports = React.createClass({
     },
 
     _makeRegisterRequest: function(auth) {
+        // We inhibit login if we're trying to register with an email address: this
+        // avoids a lot of complex race conditions that can occur if we try to log
+        // the user in one one or both of the tabs they might end up with after
+        // clicking the email link.
+        let inhibitLogin = Boolean(this.state.formVals.email);
+
         // Only send the bind params if we're sending username / pw params
         // (Since we need to send no params at all to use the ones saved in the
         // session).
@@ -323,14 +380,17 @@ module.exports = React.createClass({
             email: true,
             msisdn: true,
         } : {};
+        // Likewise inhibitLogin
+        if (!this.state.formVals.password) inhibitLogin = null;
 
-        return this._matrixClient.register(
+        return this.state.matrixClient.register(
             this.state.formVals.username,
             this.state.formVals.password,
             undefined, // session id: included in the auth dict already
             auth,
             bindThreepids,
             null,
+            inhibitLogin,
         );
     },
 
@@ -342,6 +402,19 @@ module.exports = React.createClass({
         };
     },
 
+    // Links to the login page shown after registration is completed are routed through this
+    // which checks the user hasn't already logged in somewhere else (perhaps we should do
+    // this more generally?)
+    _onLoginClickWithCheck: async function(ev) {
+        ev.preventDefault();
+
+        const sessionLoaded = await Lifecycle.loadSession({});
+        if (!sessionLoaded) {
+            // ok fine, there's still no session: really go to the login page
+            this.props.onLoginClick();
+        }
+    },
+
     renderServerComponent() {
         const ServerTypeSelector = sdk.getComponent("auth.ServerTypeSelector");
         const ServerConfig = sdk.getComponent("auth.ServerConfig");
@@ -409,9 +482,9 @@ module.exports = React.createClass({
         const Spinner = sdk.getComponent('elements.Spinner');
         const RegistrationForm = sdk.getComponent('auth.RegistrationForm');
 
-        if (this.state.doingUIAuth) {
+        if (this.state.matrixClient && this.state.doingUIAuth) {
             return <InteractiveAuth
-                matrixClient={this._matrixClient}
+                matrixClient={this.state.matrixClient}
                 makeRequest={this._makeRegisterRequest}
                 onAuthFinished={this._onUIAuthFinished}
                 inputs={this._getUIAuthInputs()}
@@ -421,6 +494,8 @@ module.exports = React.createClass({
                 emailSid={this.props.idSid}
                 poll={true}
             />;
+        } else if (!this.state.matrixClient && !this.state.busy) {
+            return null;
         } else if (this.state.busy || !this.state.flows) {
             return <div className="mx_AuthBody_spinner">
                 <Spinner />
@@ -447,6 +522,7 @@ module.exports = React.createClass({
                 onEditServerDetailsClick={onEditServerDetailsClick}
                 flows={this.state.flows}
                 serverConfig={this.props.serverConfig}
+                canSubmit={!this.state.serverErrorIsFatal}
             />;
         }
     },
@@ -462,6 +538,20 @@ module.exports = React.createClass({
             errorText = <div className="mx_Login_error">{ err }</div>;
         }
 
+        let serverDeadSection;
+        if (!this.state.serverIsAlive) {
+            const classes = classNames({
+                "mx_Login_error": true,
+                "mx_Login_serverError": true,
+                "mx_Login_serverErrorNonFatal": !this.state.serverErrorIsFatal,
+            });
+            serverDeadSection = (
+                <div className={classes}>
+                    {this.state.serverDeadError}
+                </div>
+            );
+        }
+
         const signIn = <a className="mx_AuthBody_changeFlow" onClick={this.onLoginClick} href="#">
             { _t('Sign in instead') }
         </a>;
@@ -474,16 +564,49 @@ module.exports = React.createClass({
             </a>;
         }
 
+        let body;
+        if (this.state.completedNoSignin) {
+            let regDoneText;
+            if (this.state.formVals.password) {
+                // We're the client that started the registration
+                regDoneText = _t(
+                    "<a>Log in</a> to your new account.", {},
+                    {
+                        a: (sub) => <a href="#/login" onClick={this._onLoginClickWithCheck}>{sub}</a>,
+                    },
+                );
+            } else {
+                // We're not the original client: the user probably got to us by clicking the
+                // email validation link. We can't offer a 'go straight to your account' link
+                // as we don't have the original creds.
+                regDoneText = _t(
+                    "You can now close this window or <a>log in</a> to your new account.", {},
+                    {
+                        a: (sub) => <a href="#/login" onClick={this._onLoginClickWithCheck}>{sub}</a>,
+                    },
+                );
+            }
+            body = <div>
+                <h2>{_t("Registration Successful")}</h2>
+                <h3>{ regDoneText }</h3>
+            </div>;
+        } else {
+            body = <div>
+                <h2>{ _t('Create your account') }</h2>
+                { errorText }
+                { serverDeadSection }
+                { this.renderServerComponent() }
+                { this.renderRegisterComponent() }
+                { goBack }
+                { signIn }
+            </div>;
+        }
+
         return (
             <AuthPage>
                 <AuthHeader />
                 <AuthBody>
-                    <h2>{ _t('Create your account') }</h2>
-                    { errorText }
-                    { this.renderServerComponent() }
-                    { this.renderRegisterComponent() }
-                    { goBack }
-                    { signIn }
+                    { body }
                 </AuthBody>
             </AuthPage>
         );
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
index 5a3bc23596..b5af58adf1 100644
--- a/src/components/views/auth/ModularServerConfig.js
+++ b/src/components/views/auth/ModularServerConfig.js
@@ -108,6 +108,8 @@ export default class ModularServerConfig extends React.PureComponent {
                 busy: false,
                 errorText: message,
             });
+
+            return null;
         }
     }
 
@@ -132,7 +134,8 @@ export default class ModularServerConfig extends React.PureComponent {
     onSubmit = async (ev) => {
         ev.preventDefault();
         ev.stopPropagation();
-        await this.validateServer();
+        const result = await this.validateServer();
+        if (!result) return; // Do not continue.
 
         if (this.props.onAfterSubmit) {
             this.props.onAfterSubmit();
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index b1af6ea42c..ad663bee47 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -53,11 +53,13 @@ module.exports = React.createClass({
         onEditServerDetailsClick: PropTypes.func,
         flows: PropTypes.arrayOf(PropTypes.object).isRequired,
         serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
+        canSubmit: PropTypes.bool,
     },
 
     getDefaultProps: function() {
         return {
             onValidationChange: console.error,
+            canSubmit: true,
         };
     },
 
@@ -80,6 +82,8 @@ module.exports = React.createClass({
     onSubmit: async function(ev) {
         ev.preventDefault();
 
+        if (!this.props.canSubmit) return;
+
         const allFieldsValid = await this.verifyFieldsBeforeSubmit();
         if (!allFieldsValid) {
             return;
@@ -380,7 +384,7 @@ module.exports = React.createClass({
     },
 
     validateUsernameRules: withValidation({
-        description: () => _t("Use letters, numbers, dashes and underscores only"),
+        description: () => _t("Use lowercase letters, numbers, dashes and underscores only"),
         rules: [
             {
                 key: "required",
@@ -540,7 +544,7 @@ module.exports = React.createClass({
         }
 
         const registerButton = (
-            <input className="mx_Login_submit" type="submit" value={_t("Register")} />
+            <input className="mx_Login_submit" type="submit" value={_t("Register")} disabled={!this.props.canSubmit} />
         );
 
         return (
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
index 3967f49f18..de4f16b684 100644
--- a/src/components/views/auth/ServerConfig.js
+++ b/src/components/views/auth/ServerConfig.js
@@ -101,14 +101,25 @@ export default class ServerConfig extends React.PureComponent {
             return result;
         } catch (e) {
             console.error(e);
-            let message = _t("Unable to validate homeserver/identity server");
-            if (e.translatedMessage) {
-                message = e.translatedMessage;
+
+            const stateForError = AutoDiscoveryUtils.authComponentStateForError(e);
+            if (!stateForError.isFatalError) {
+                // carry on anyway
+                const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
+                this.props.onServerConfigChange(result);
+                return result;
+            } else {
+                let message = _t("Unable to validate homeserver/identity server");
+                if (e.translatedMessage) {
+                    message = e.translatedMessage;
+                }
+                this.setState({
+                    busy: false,
+                    errorText: message,
+                });
+
+                return null;
             }
-            this.setState({
-                busy: false,
-                errorText: message,
-            });
         }
     }
 
@@ -137,7 +148,8 @@ export default class ServerConfig extends React.PureComponent {
     onSubmit = async (ev) => {
         ev.preventDefault();
         ev.stopPropagation();
-        await this.validateServer();
+        const result = await this.validateServer();
+        if (!result) return; // Do not continue.
 
         if (this.props.onAfterSubmit) {
             this.props.onAfterSubmit();
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 67fd197f8a..8dc348d2b0 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -205,7 +205,7 @@ module.exports = React.createClass({
 
     onSelected: function(index) {
         const selectedList = this.state.selectedList.slice();
-        selectedList.push(this.state.suggestedList[index]);
+        selectedList.push(this._getFilteredSuggestions()[index]);
         this.setState({
             selectedList,
             suggestedList: [],
@@ -526,12 +526,7 @@ module.exports = React.createClass({
         });
     },
 
-    render: function() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const AddressSelector = sdk.getComponent("elements.AddressSelector");
-        this.scrollElement = null;
-
+    _getFilteredSuggestions: function() {
         // map addressType => set of addresses to avoid O(n*m) operation
         const selectedAddresses = {};
         this.state.selectedList.forEach(({address, addressType}) => {
@@ -540,9 +535,16 @@ module.exports = React.createClass({
         });
 
         // Filter out any addresses in the above already selected addresses (matching both type and address)
-        const filteredSuggestedList = this.state.suggestedList.filter(({address, addressType}) => {
+        return this.state.suggestedList.filter(({address, addressType}) => {
             return !(selectedAddresses[addressType] && selectedAddresses[addressType].has(address));
         });
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        const AddressSelector = sdk.getComponent("elements.AddressSelector");
+        this.scrollElement = null;
 
         const query = [];
         // create the invite list
@@ -574,6 +576,8 @@ module.exports = React.createClass({
             </textarea>,
         );
 
+        const filteredSuggestedList = this._getFilteredSuggestions();
+
         let error;
         let addressSelector;
         if (this.state.error) {
diff --git a/src/components/views/elements/MessageEditor.js b/src/components/views/elements/MessageEditor.js
index ed86bcb0a3..9faae4588b 100644
--- a/src/components/views/elements/MessageEditor.js
+++ b/src/components/views/elements/MessageEditor.js
@@ -28,13 +28,14 @@ import {parseEvent} from '../../../editor/deserialize';
 import Autocomplete from '../rooms/Autocomplete';
 import {PartCreator} from '../../../editor/parts';
 import {renderModel} from '../../../editor/render';
-import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
+import EditorStateTransfer from '../../../utils/EditorStateTransfer';
+import {MatrixClient} from 'matrix-js-sdk';
 import classNames from 'classnames';
 
 export default class MessageEditor extends React.Component {
     static propTypes = {
         // the message event being edited
-        event: PropTypes.instanceOf(MatrixEvent).isRequired,
+        editState: PropTypes.instanceOf(EditorStateTransfer).isRequired,
     };
 
     static contextTypes = {
@@ -44,16 +45,7 @@ export default class MessageEditor extends React.Component {
     constructor(props, context) {
         super(props, context);
         const room = this._getRoom();
-        const partCreator = new PartCreator(
-            () => this._autocompleteRef,
-            query => this.setState({query}),
-            room,
-        );
-        this.model = new EditorModel(
-            parseEvent(this.props.event, room),
-            partCreator,
-            this._updateEditorState,
-        );
+        this.model = null;
         this.state = {
             autoComplete: null,
             room,
@@ -64,7 +56,7 @@ export default class MessageEditor extends React.Component {
     }
 
     _getRoom() {
-        return this.context.matrixClient.getRoom(this.props.event.getRoomId());
+        return this.context.matrixClient.getRoom(this.props.editState.getEvent().getRoomId());
     }
 
     _updateEditorState = (caret) => {
@@ -133,7 +125,7 @@ export default class MessageEditor extends React.Component {
             if (this._hasModifications || !this._isCaretAtStart()) {
                 return;
             }
-            const previousEvent = findEditableEvent(this._getRoom(), false, this.props.event.getId());
+            const previousEvent = findEditableEvent(this._getRoom(), false, this.props.editState.getEvent().getId());
             if (previousEvent) {
                 dis.dispatch({action: 'edit_event', event: previousEvent});
                 event.preventDefault();
@@ -142,7 +134,7 @@ export default class MessageEditor extends React.Component {
             if (this._hasModifications || !this._isCaretAtEnd()) {
                 return;
             }
-            const nextEvent = findEditableEvent(this._getRoom(), true, this.props.event.getId());
+            const nextEvent = findEditableEvent(this._getRoom(), true, this.props.editState.getEvent().getId());
             if (nextEvent) {
                 dis.dispatch({action: 'edit_event', event: nextEvent});
             } else {
@@ -158,16 +150,28 @@ export default class MessageEditor extends React.Component {
         dis.dispatch({action: 'focus_composer'});
     }
 
+    _isEmote() {
+        const firstPart = this.model.parts[0];
+        return firstPart && firstPart.type === "plain" && firstPart.text.startsWith("/me ");
+    }
+
     _sendEdit = () => {
+        const isEmote = this._isEmote();
+        let model = this.model;
+        if (isEmote) {
+            // trim "/me "
+            model = model.clone();
+            model.removeText({index: 0, offset: 0}, 4);
+        }
         const newContent = {
-            "msgtype": "m.text",
-            "body": textSerialize(this.model),
+            "msgtype": isEmote ? "m.emote" : "m.text",
+            "body": textSerialize(model),
         };
         const contentBody = {
             msgtype: newContent.msgtype,
             body: ` * ${newContent.body}`,
         };
-        const formattedBody = htmlSerializeIfNeeded(this.model);
+        const formattedBody = htmlSerializeIfNeeded(model);
         if (formattedBody) {
             newContent.format = "org.matrix.custom.html";
             newContent.formatted_body = formattedBody;
@@ -178,11 +182,11 @@ export default class MessageEditor extends React.Component {
             "m.new_content": newContent,
             "m.relates_to": {
                 "rel_type": "m.replace",
-                "event_id": this.props.event.getId(),
+                "event_id": this.props.editState.getEvent().getId(),
             },
         }, contentBody);
 
-        const roomId = this.props.event.getRoomId();
+        const roomId = this.props.editState.getEvent().getRoomId();
         this.context.matrixClient.sendMessage(roomId, content);
 
         dis.dispatch({action: "edit_event", event: null});
@@ -197,12 +201,63 @@ export default class MessageEditor extends React.Component {
         this.model.autoComplete.onComponentSelectionChange(completion);
     }
 
+    componentWillUnmount() {
+        const sel = document.getSelection();
+        const {caret} = getCaretOffsetAndText(this._editorRef, sel);
+        const parts = this.model.serializeParts();
+        this.props.editState.setEditorState(caret, parts);
+    }
+
     componentDidMount() {
+        this.model = this._createEditorModel();
+        // initial render of model
         this._updateEditorState();
-        setCaretPosition(this._editorRef, this.model, this.model.getPositionAtEnd());
+        // initial caret position
+        this._initializeCaret();
         this._editorRef.focus();
     }
 
+    _createEditorModel() {
+        const {editState} = this.props;
+        const room = this._getRoom();
+        const partCreator = new PartCreator(
+            () => this._autocompleteRef,
+            query => this.setState({query}),
+            room,
+            this.context.matrixClient,
+        );
+        let parts;
+        if (editState.hasEditorState()) {
+            // if restoring state from a previous editor,
+            // restore serialized parts from the state
+            parts = editState.getSerializedParts().map(p => partCreator.deserializePart(p));
+        } else {
+            // otherwise, parse the body of the event
+            parts = parseEvent(editState.getEvent(), room, this.context.matrixClient);
+        }
+
+        return new EditorModel(
+            parts,
+            partCreator,
+            this._updateEditorState,
+        );
+    }
+
+    _initializeCaret() {
+        const {editState} = this.props;
+        let caretPosition;
+        if (editState.hasEditorState()) {
+            // if restoring state from a previous editor,
+            // restore caret position from the state
+            const caret = editState.getCaret();
+            caretPosition = this.model.positionForOffset(caret.offset, caret.atNodeEnd);
+        } else {
+            // otherwise, set it at the end
+            caretPosition = this.model.getPositionAtEnd();
+        }
+        setCaretPosition(this._editorRef, this.model, caretPosition);
+    }
+
     render() {
         let autoComplete;
         if (this.state.autoComplete) {
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 84474710cd..80f0ba538c 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -36,6 +36,20 @@ export default class MessageActionBar extends React.PureComponent {
         onFocusChange: PropTypes.func,
     };
 
+    componentDidMount() {
+        this.props.mxEvent.on("Event.decrypted", this.onDecrypted);
+    }
+
+    componentWillUnmount() {
+        this.props.mxEvent.removeListener("Event.decrypted", this.onDecrypted);
+    }
+
+    onDecrypted = () => {
+        // When an event decrypts, it is likely to change the set of available
+        // actions, so we force an update to check again.
+        this.forceUpdate();
+    }
+
     onFocusChange = (focused) => {
         if (!this.props.onFocusChange) {
             return;
@@ -69,10 +83,6 @@ export default class MessageActionBar extends React.PureComponent {
         const MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
         const buttonRect = ev.target.getBoundingClientRect();
 
-        // The window X and Y offsets are to adjust position when zoomed in to page
-        const x = buttonRect.right + window.pageXOffset;
-        const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
-
         const { getTile, getReplyThread } = this.props;
         const tile = getTile && getTile();
         const replyThread = getReplyThread && getReplyThread();
@@ -82,11 +92,9 @@ export default class MessageActionBar extends React.PureComponent {
             e2eInfoCallback = () => this.onCryptoClicked();
         }
 
-        createMenu(MessageContextMenu, {
-            chevronOffset: 10,
+        const menuOptions = {
             mxEvent: this.props.mxEvent,
-            left: x,
-            top: y,
+            chevronFace: "none",
             permalinkCreator: this.props.permalinkCreator,
             eventTileOps: tile && tile.getEventTileOps ? tile.getEventTileOps() : undefined,
             collapseReplyThread: replyThread && replyThread.canCollapse() ? replyThread.collapse : undefined,
@@ -94,7 +102,23 @@ export default class MessageActionBar extends React.PureComponent {
             onFinished: () => {
                 this.onFocusChange(false);
             },
-        });
+        };
+
+        // The window X and Y offsets are to adjust position when zoomed in to page
+        const buttonRight = buttonRect.right + window.pageXOffset;
+        const buttonBottom = buttonRect.bottom + window.pageYOffset;
+        const buttonTop = buttonRect.top + window.pageYOffset;
+        // Align the right edge of the menu to the right edge of the button
+        menuOptions.right = window.innerWidth - buttonRight;
+        // Align the menu vertically on whichever side of the button has more
+        // space available.
+        if (buttonBottom < window.innerHeight / 2) {
+            menuOptions.top = buttonBottom;
+        } else {
+            menuOptions.bottom = window.innerHeight - buttonTop;
+        }
+
+        createMenu(MessageContextMenu, menuOptions);
 
         this.onFocusChange(true);
     }
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 8c90ec5a46..6d7aada542 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -90,7 +90,7 @@ module.exports = React.createClass({
             tileShape={this.props.tileShape}
             maxImageHeight={this.props.maxImageHeight}
             replacingEventId={this.props.replacingEventId}
-            isEditing={this.props.isEditing}
+            editState={this.props.editState}
             onHeightChanged={this.props.onHeightChanged} />;
     },
 });
diff --git a/src/components/views/messages/ReactionsRow.js b/src/components/views/messages/ReactionsRow.js
index b14eed88da..51f62807a5 100644
--- a/src/components/views/messages/ReactionsRow.js
+++ b/src/components/views/messages/ReactionsRow.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 import { isContentActionable } from '../../../utils/EventUtils';
+import { isSingleEmoji } from '../../../HtmlUtils';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 
 export default class ReactionsRow extends React.PureComponent {
@@ -103,6 +104,9 @@ export default class ReactionsRow extends React.PureComponent {
 
         const ReactionsRowButton = sdk.getComponent('messages.ReactionsRowButton');
         const items = reactions.getSortedAnnotationsByKey().map(([content, events]) => {
+            if (!isSingleEmoji(content)) {
+                return null;
+            }
             const count = events.size;
             if (!count) {
                 return null;
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 1fc16d6a53..6f480b8d3c 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -90,7 +90,7 @@ module.exports = React.createClass({
 
     componentDidMount: function() {
         this._unmounted = false;
-        if (!this.props.isEditing) {
+        if (!this.props.editState) {
             this._applyFormatting();
         }
     },
@@ -131,8 +131,8 @@ module.exports = React.createClass({
     },
 
     componentDidUpdate: function(prevProps) {
-        if (!this.props.isEditing) {
-            const stoppedEditing = prevProps.isEditing && !this.props.isEditing;
+        if (!this.props.editState) {
+            const stoppedEditing = prevProps.editState && !this.props.editState;
             const messageWasEdited = prevProps.replacingEventId !== this.props.replacingEventId;
             if (messageWasEdited || stoppedEditing) {
                 this._applyFormatting();
@@ -153,7 +153,7 @@ module.exports = React.createClass({
                 nextProps.replacingEventId !== this.props.replacingEventId ||
                 nextProps.highlightLink !== this.props.highlightLink ||
                 nextProps.showUrlPreview !== this.props.showUrlPreview ||
-                nextProps.isEditing !== this.props.isEditing ||
+                nextProps.editState !== this.props.editState ||
                 nextState.links !== this.state.links ||
                 nextState.editedMarkerHovered !== this.state.editedMarkerHovered ||
                 nextState.widgetHidden !== this.state.widgetHidden);
@@ -469,9 +469,9 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        if (this.props.isEditing) {
+        if (this.props.editState) {
             const MessageEditor = sdk.getComponent('elements.MessageEditor');
-            return <MessageEditor event={this.props.mxEvent} className="mx_EventTile_content" />;
+            return <MessageEditor editState={this.props.editState} className="mx_EventTile_content" />;
         }
         const mxEvent = this.props.mxEvent;
         const content = mxEvent.getContent();
diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index 9aef5433c3..243cfe2f75 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -171,26 +171,13 @@ export default class Autocomplete extends React.Component {
     }
 
     // called from MessageComposerInput
-    onUpArrow(): ?Completion {
+    moveSelection(delta): ?Completion {
         const completionCount = this.countCompletions();
-        // completionCount + 1, since 0 means composer is selected
-        const selectionOffset = (completionCount + 1 + this.state.selectionOffset - 1)
-            % (completionCount + 1);
-        if (!completionCount) {
-            return null;
-        }
-        this.setSelection(selectionOffset);
-    }
+        if (completionCount === 0) return; // there are no items to move the selection through
 
-    // called from MessageComposerInput
-    onDownArrow(): ?Completion {
-        const completionCount = this.countCompletions();
-        // completionCount + 1, since 0 means composer is selected
-        const selectionOffset = (this.state.selectionOffset + 1) % (completionCount + 1);
-        if (!completionCount) {
-            return null;
-        }
-        this.setSelection(selectionOffset);
+        // Note: selectionOffset 0 represents the unsubstituted text, while 1 means first pill selected
+        const index = (this.state.selectionOffset + delta + completionCount + 1) % (completionCount + 1);
+        this.setSelection(index);
     }
 
     onEscape(e): boolean {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 850f496e24..9837b4a029 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -552,13 +552,14 @@ module.exports = withMatrixClient(React.createClass({
         const isRedacted = isMessageEvent(this.props.mxEvent) && this.props.isRedacted;
         const isEncryptionFailure = this.props.mxEvent.isDecryptionFailure();
 
+        const isEditing = !!this.props.editState;
         const classes = classNames({
             mx_EventTile: true,
-            mx_EventTile_isEditing: this.props.isEditing,
+            mx_EventTile_isEditing: isEditing,
             mx_EventTile_info: isInfoMessage,
             mx_EventTile_12hr: this.props.isTwelveHour,
             mx_EventTile_encrypting: this.props.eventSendStatus === 'encrypting',
-            mx_EventTile_sending: isSending,
+            mx_EventTile_sending: !isEditing && isSending,
             mx_EventTile_notSent: this.props.eventSendStatus === 'not_sent',
             mx_EventTile_highlight: this.props.tileShape === 'notif' ? false : this.shouldHighlight(),
             mx_EventTile_selected: this.props.isSelectedEvent,
@@ -632,7 +633,7 @@ module.exports = withMatrixClient(React.createClass({
         }
 
         const MessageActionBar = sdk.getComponent('messages.MessageActionBar');
-        const actionBar = !this.props.isEditing ? <MessageActionBar
+        const actionBar = !isEditing ? <MessageActionBar
             mxEvent={this.props.mxEvent}
             reactions={this.state.reactions}
             permalinkCreator={this.props.permalinkCreator}
@@ -794,7 +795,7 @@ module.exports = withMatrixClient(React.createClass({
                             <EventTileType ref="tile"
                                            mxEvent={this.props.mxEvent}
                                            replacingEventId={this.props.replacingEventId}
-                                           isEditing={this.props.isEditing}
+                                           editState={this.props.editState}
                                            highlights={this.props.highlights}
                                            highlightLink={this.props.highlightLink}
                                            showUrlPreview={this.props.showUrlPreview}
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index a525fcb874..e99e87ae1d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -533,21 +533,24 @@ export default class MessageComposerInput extends React.Component {
                 // The first matched group includes just the matched plaintext emoji
                 const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(text.slice(0, currentStartOffset));
                 if (emoticonMatch) {
-                    const data = EMOJIBASE.find(e => e.emoticon === emoticonMatch[1]);
-                    const unicodeEmoji = data ? data.unicode : '';
+                    const query = emoticonMatch[1].toLowerCase().replace("-", "");
+                    const data = EMOJIBASE.find(e => e.emoticon ? e.emoticon.toLowerCase() === query : false);
 
-                    const range = Range.create({
-                        anchor: {
-                            key: editorState.startText.key,
-                            offset: currentStartOffset - emoticonMatch[1].length - 1,
-                        },
-                        focus: {
-                            key: editorState.startText.key,
-                            offset: currentStartOffset - 1,
-                        },
-                    });
-                    change = change.insertTextAtRange(range, unicodeEmoji);
-                    editorState = change.value;
+                    // only perform replacement if we found a match, otherwise we would be not letting user type
+                    if (data) {
+                        const range = Range.create({
+                            anchor: {
+                                key: editorState.startText.key,
+                                offset: currentStartOffset - emoticonMatch[1].length - 1,
+                            },
+                            focus: {
+                                key: editorState.startText.key,
+                                offset: currentStartOffset - 1,
+                            },
+                        });
+                        change = change.insertTextAtRange(range, data.unicode);
+                        editorState = change.value;
+                    }
                 }
             }
         }
@@ -670,6 +673,31 @@ export default class MessageComposerInput extends React.Component {
 
     onKeyDown = (ev: KeyboardEvent, change: Change, editor: Editor) => {
         this.suppressAutoComplete = false;
+        this.direction = '';
+
+        // Navigate autocomplete list with arrow keys
+        if (this.autocomplete.countCompletions() > 0) {
+            if (!(ev.ctrlKey || ev.shiftKey || ev.altKey || ev.metaKey)) {
+                switch (ev.keyCode) {
+                    case KeyCode.LEFT:
+                        this.autocomplete.moveSelection(-1);
+                        ev.preventDefault();
+                        return true;
+                    case KeyCode.RIGHT:
+                        this.autocomplete.moveSelection(+1);
+                        ev.preventDefault();
+                        return true;
+                    case KeyCode.UP:
+                        this.autocomplete.moveSelection(-1);
+                        ev.preventDefault();
+                        return true;
+                    case KeyCode.DOWN:
+                        this.autocomplete.moveSelection(+1);
+                        ev.preventDefault();
+                        return true;
+                }
+            }
+        }
 
         // skip void nodes - see
         // https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
@@ -677,8 +705,6 @@ export default class MessageComposerInput extends React.Component {
             this.direction = 'Previous';
         } else if (ev.keyCode === KeyCode.RIGHT) {
             this.direction = 'Next';
-        } else {
-            this.direction = '';
         }
 
         switch (ev.keyCode) {
@@ -1172,35 +1198,28 @@ export default class MessageComposerInput extends React.Component {
     };
 
     onVerticalArrow = (e, up) => {
-        if (e.ctrlKey || e.shiftKey || e.altKey || e.metaKey) {
-            return;
-        }
+        if (e.ctrlKey || e.shiftKey || e.altKey || e.metaKey) return;
 
-        // Select history only if we are not currently auto-completing
-        if (this.autocomplete.state.completionList.length === 0) {
-            const selection = this.state.editorState.selection;
+        // Select history
+        const selection = this.state.editorState.selection;
 
-            // selection must be collapsed
-            if (!selection.isCollapsed) return;
-            const document = this.state.editorState.document;
+        // selection must be collapsed
+        if (!selection.isCollapsed) return;
+        const document = this.state.editorState.document;
 
-            // and we must be at the edge of the document (up=start, down=end)
-            if (up) {
-                if (!selection.anchor.isAtStartOfNode(document)) return;
+        // and we must be at the edge of the document (up=start, down=end)
+        if (up) {
+            if (!selection.anchor.isAtStartOfNode(document)) return;
 
-                const editEvent = findEditableEvent(this.props.room, false);
-                if (editEvent) {
-                    // We're selecting history, so prevent the key event from doing anything else
-                    e.preventDefault();
-                    dis.dispatch({
-                        action: 'edit_event',
-                        event: editEvent,
-                    });
-                }
+            const editEvent = findEditableEvent(this.props.room, false);
+            if (editEvent) {
+                // We're selecting history, so prevent the key event from doing anything else
+                e.preventDefault();
+                dis.dispatch({
+                    action: 'edit_event',
+                    event: editEvent,
+                });
             }
-        } else {
-            this.moveAutocompleteSelection(up);
-            e.preventDefault();
         }
     };
 
@@ -1209,23 +1228,19 @@ export default class MessageComposerInput extends React.Component {
             someCompletions: null,
         });
         e.preventDefault();
-        if (this.autocomplete.state.completionList.length === 0) {
+        if (this.autocomplete.countCompletions() === 0) {
             // Force completions to show for the text currently entered
             const completionCount = await this.autocomplete.forceComplete();
             this.setState({
                 someCompletions: completionCount > 0,
             });
             // Select the first item by moving "down"
-            await this.moveAutocompleteSelection(false);
+            await this.autocomplete.moveSelection(+1);
         } else {
-            await this.moveAutocompleteSelection(e.shiftKey);
+            await this.autocomplete.moveSelection(e.shiftKey ? -1 : +1);
         }
     };
 
-    moveAutocompleteSelection = (up) => {
-        up ? this.autocomplete.onUpArrow() : this.autocomplete.onDownArrow();
-    };
-
     onEscape = async (e) => {
         e.preventDefault();
         if (this.autocomplete) {
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 5d79463112..cbc44d0933 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -54,6 +55,12 @@ module.exports = React.createClass({
         // If invited by 3rd party invite, the email address the invite was sent to
         invitedEmail: PropTypes.string,
 
+        // For third party invites, information passed about the room out-of-band
+        oobData: PropTypes.object,
+
+        // For third party invites, a URL for a 3pid invite signing service
+        signUrl: PropTypes.string,
+
         // A standard client/server API error object. If supplied, indicates that the
         // caller was unable to fetch details about the room for the given reason.
         error: PropTypes.object,
@@ -87,6 +94,16 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
+        this._checkInvitedEmail();
+    },
+
+    componentDidUpdate: function(prevProps, prevState) {
+        if (this.props.invitedEmail !== prevProps.invitedEmail || this.props.inviterName !== prevProps.inviterName) {
+            this._checkInvitedEmail();
+        }
+    },
+
+    _checkInvitedEmail: function() {
         // If this is an invite and we've been told what email
         // address was invited, fetch the user's list of Threepids
         // so we can check them against the one that was invited
@@ -215,12 +232,25 @@ module.exports = React.createClass({
         return memberContent.membership === "invite" && memberContent.is_direct;
     },
 
+    _makeScreenAfterLogin() {
+        return {
+            screen: 'room',
+            params: {
+                email: this.props.invitedEmail,
+                signurl: this.props.signUrl,
+                room_name: this.props.oobData.room_name,
+                room_avatar_url: this.props.oobData.avatarUrl,
+                inviter_name: this.props.oobData.inviterName,
+            }
+        };
+    },
+
     onLoginClick: function() {
-        dis.dispatch({ action: 'start_login' });
+        dis.dispatch({ action: 'start_login', screenAfterLogin: this._makeScreenAfterLogin() });
     },
 
     onRegisterClick: function() {
-        dis.dispatch({ action: 'start_registration' });
+        dis.dispatch({ action: 'start_registration', screenAfterLogin: this._makeScreenAfterLogin() });
     },
 
     render: function() {
@@ -335,7 +365,7 @@ module.exports = React.createClass({
             }
             case MessageCase.Invite: {
                 const RoomAvatar = sdk.getComponent("views.avatars.RoomAvatar");
-                const avatar = <RoomAvatar room={this.props.room} />;
+                const avatar = <RoomAvatar room={this.props.room} oobData={this.props.oobData} />;
 
                 const inviteMember = this._getInviteMember();
                 let inviterElement;
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 996618bcca..a50b26fed6 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -135,11 +135,27 @@ export default class HelpUserSettingsTab extends React.Component {
                 <ul>
                     <li>
                         The <a href="themes/riot/img/backgrounds/valley.jpg" rel="noopener" target="_blank">
-                        default cover photo</a> is (C)&nbsp;
+                        default cover photo</a> is ©&nbsp;
                         <a href="https://www.flickr.com/golan" rel="noopener" target="_blank">Jesús Roncero</a>{' '}
                         used under the terms of&nbsp;
                         <a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="noopener" target="_blank">
-                        CC-BY-SA 4.0</a>. No warranties are given.
+                        CC-BY-SA 4.0</a>.
+                    </li>
+                    <li>
+                        The <a href="https://github.com/matrix-org/twemoji-colr" rel="noopener" target="_blank">
+                        twemoji-colr</a> font is ©&nbsp;
+                        <a href="https://mozilla.org" rel="noopener" target="_blank">Mozilla Foundation</a>{' '}
+                        used under the terms of&nbsp;
+                        <a href="http://www.apache.org/licenses/LICENSE-2.0" rel="noopener" target="_blank">
+                        Apache 2.0</a>.
+                    </li>
+                    <li>
+                        The <a href="https://twemoji.twitter.com/" rel="noopener" target="_blank">
+                        Twemoji</a> emoji art is ©&nbsp;
+                        <a href="https://twemoji.twitter.com/" rel="noopener" target="_blank">Twitter, Inc and other
+                        contributors</a> used under the terms of&nbsp;
+                        <a href="https://creativecommons.org/licenses/by/4.0/" rel="noopener" target="_blank">
+                        CC-BY 4.0</a>.
                     </li>
                 </ul>
             </div>
diff --git a/src/editor/autocomplete.js b/src/editor/autocomplete.js
index ceaf18c444..6cb5974729 100644
--- a/src/editor/autocomplete.js
+++ b/src/editor/autocomplete.js
@@ -18,12 +18,13 @@ limitations under the License.
 import {UserPillPart, RoomPillPart, PlainPart} from "./parts";
 
 export default class AutocompleteWrapperModel {
-    constructor(updateCallback, getAutocompleterComponent, updateQuery, room) {
+    constructor(updateCallback, getAutocompleterComponent, updateQuery, room, client) {
         this._updateCallback = updateCallback;
         this._getAutocompleterComponent = getAutocompleterComponent;
         this._updateQuery = updateQuery;
         this._query = null;
         this._room = room;
+        this._client = client;
     }
 
     onEscape(e) {
@@ -42,17 +43,13 @@ export default class AutocompleteWrapperModel {
     async onTab(e) {
         const acComponent = this._getAutocompleterComponent();
 
-        if (acComponent.state.completionList.length === 0) {
+        if (acComponent.countCompletions() === 0) {
             // Force completions to show for the text currently entered
             await acComponent.forceComplete();
             // Select the first item by moving "down"
-            await acComponent.onDownArrow();
+            await acComponent.moveSelection(+1);
         } else {
-            if (e.shiftKey) {
-                await acComponent.onUpArrow();
-            } else {
-                await acComponent.onDownArrow();
-            }
+            await acComponent.moveSelection(e.shiftKey ? -1 : +1);
         }
         this._updateCallback({
             close: true,
@@ -60,11 +57,11 @@ export default class AutocompleteWrapperModel {
     }
 
     onUpArrow() {
-        this._getAutocompleterComponent().onUpArrow();
+        this._getAutocompleterComponent().moveSelection(-1);
     }
 
     onDownArrow() {
-        this._getAutocompleterComponent().onDownArrow();
+        this._getAutocompleterComponent().moveSelection(+1);
     }
 
     onPartUpdate(part, offset) {
@@ -106,7 +103,7 @@ export default class AutocompleteWrapperModel {
             }
             case "#": {
                 const displayAlias = completion.completionId;
-                return new RoomPillPart(displayAlias);
+                return new RoomPillPart(displayAlias, this._client);
             }
             // also used for emoji completion
             default:
diff --git a/src/editor/deserialize.js b/src/editor/deserialize.js
index 64b219c2a9..2d98bbc41a 100644
--- a/src/editor/deserialize.js
+++ b/src/editor/deserialize.js
@@ -21,7 +21,7 @@ import { walkDOMDepthFirst } from "./dom";
 
 const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
 
-function parseLink(a, room) {
+function parseLink(a, room, client) {
     const {href} = a;
     const pillMatch = REGEX_MATRIXTO.exec(href) || [];
     const resourceId = pillMatch[1]; // The room/user ID
@@ -34,7 +34,7 @@ function parseLink(a, room) {
                 room.getMember(resourceId),
             );
         case "#":
-            return new RoomPillPart(resourceId);
+            return new RoomPillPart(resourceId, client);
         default: {
             if (href === a.textContent) {
                 return new PlainPart(a.textContent);
@@ -57,10 +57,10 @@ function parseCodeBlock(n) {
     return parts;
 }
 
-function parseElement(n, room) {
+function parseElement(n, room, client) {
     switch (n.nodeName) {
         case "A":
-            return parseLink(n, room);
+            return parseLink(n, room, client);
         case "BR":
             return new NewlinePart("\n");
         case "EM":
@@ -140,7 +140,7 @@ function prefixQuoteLines(isFirstNode, parts) {
     }
 }
 
-function parseHtmlMessage(html, room) {
+function parseHtmlMessage(html, room, client) {
     // no nodes from parsing here should be inserted in the document,
     // as scripts in event handlers, etc would be executed then.
     // we're only taking text, so that is fine
@@ -165,7 +165,7 @@ function parseHtmlMessage(html, room) {
         if (n.nodeType === Node.TEXT_NODE) {
             newParts.push(new PlainPart(n.nodeValue));
         } else if (n.nodeType === Node.ELEMENT_NODE) {
-            const parseResult = parseElement(n, room);
+            const parseResult = parseElement(n, room, client);
             if (parseResult) {
                 if (Array.isArray(parseResult)) {
                     newParts.push(...parseResult);
@@ -205,14 +205,15 @@ function parseHtmlMessage(html, room) {
     return parts;
 }
 
-export function parseEvent(event, room) {
+export function parseEvent(event, room, client) {
     const content = event.getContent();
+    let parts;
     if (content.format === "org.matrix.custom.html") {
-        return parseHtmlMessage(content.formatted_body || "", room);
+        parts = parseHtmlMessage(content.formatted_body || "", room, client);
     } else {
         const body = content.body || "";
         const lines = body.split("\n");
-        const parts = lines.reduce((parts, line, i) => {
+        parts = lines.reduce((parts, line, i) => {
             const isLast = i === lines.length - 1;
             const text = new PlainPart(line);
             const newLine = !isLast && new NewlinePart("\n");
@@ -222,6 +223,9 @@ export function parseEvent(event, room) {
                 return parts.concat(text);
             }
         }, []);
-        return parts;
     }
+    if (content.msgtype === "m.emote") {
+        parts.unshift(new PlainPart("/me "));
+    }
+    return parts;
 }
diff --git a/src/editor/model.js b/src/editor/model.js
index fb6b417530..7cc6041044 100644
--- a/src/editor/model.js
+++ b/src/editor/model.js
@@ -27,6 +27,10 @@ export default class EditorModel {
         this._updateCallback = updateCallback;
     }
 
+    clone() {
+        return new EditorModel(this._parts, this._partCreator, this._updateCallback);
+    }
+
     _insertPart(index, part) {
         this._parts.splice(index, 0, part);
         if (this._activePartIdx >= index) {
@@ -73,7 +77,7 @@ export default class EditorModel {
     }
 
     serializeParts() {
-        return this._parts.map(({type, text}) => {return {type, text};});
+        return this._parts.map(p => p.serialize());
     }
 
     _diff(newValue, inputType, caret) {
@@ -88,10 +92,10 @@ export default class EditorModel {
 
     update(newValue, inputType, caret) {
         const diff = this._diff(newValue, inputType, caret);
-        const position = this._positionForOffset(diff.at, caret.atNodeEnd);
+        const position = this.positionForOffset(diff.at, caret.atNodeEnd);
         let removedOffsetDecrease = 0;
         if (diff.removed) {
-            removedOffsetDecrease = this._removeText(position, diff.removed.length);
+            removedOffsetDecrease = this.removeText(position, diff.removed.length);
         }
         let addedLen = 0;
         if (diff.added) {
@@ -99,7 +103,7 @@ export default class EditorModel {
         }
         this._mergeAdjacentParts();
         const caretOffset = diff.at - removedOffsetDecrease + addedLen;
-        let newPosition = this._positionForOffset(caretOffset, true);
+        let newPosition = this.positionForOffset(caretOffset, true);
         newPosition = newPosition.skipUneditableParts(this._parts);
         this._setActivePart(newPosition);
         this._updateCallback(newPosition);
@@ -177,7 +181,7 @@ export default class EditorModel {
      * @return {Number} how many characters before pos were also removed,
      * usually because of non-editable parts that can only be removed in their entirety.
      */
-    _removeText(pos, len) {
+    removeText(pos, len) {
         let {index, offset} = pos;
         let removedOffsetDecrease = 0;
         while (len > 0) {
@@ -248,7 +252,7 @@ export default class EditorModel {
         return addLen;
     }
 
-    _positionForOffset(totalOffset, atPartEnd) {
+    positionForOffset(totalOffset, atPartEnd) {
         let currentOffset = 0;
         const index = this._parts.findIndex(part => {
             const partLen = part.text.length;
diff --git a/src/editor/parts.js b/src/editor/parts.js
index be3080db12..a122c7ab7a 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -17,7 +17,6 @@ limitations under the License.
 
 import AutocompleteWrapperModel from "./autocomplete";
 import Avatar from "../Avatar";
-import MatrixClientPeg from "../MatrixClientPeg";
 
 class BasePart {
     constructor(text = "") {
@@ -102,6 +101,10 @@ class BasePart {
     toString() {
         return `${this.type}(${this.text})`;
     }
+
+    serialize() {
+        return {type: this.type, text: this.text};
+    }
 }
 
 export class PlainPart extends BasePart {
@@ -233,13 +236,12 @@ export class NewlinePart extends BasePart {
 }
 
 export class RoomPillPart extends PillPart {
-    constructor(displayAlias) {
+    constructor(displayAlias, client) {
         super(displayAlias, displayAlias);
-        this._room = this._findRoomByAlias(displayAlias);
+        this._room = this._findRoomByAlias(displayAlias, client);
     }
 
-    _findRoomByAlias(alias) {
-        const client = MatrixClientPeg.get();
+    _findRoomByAlias(alias, client) {
         if (alias[0] === '#') {
             return client.getRooms().find((r) => {
                 return r.getAliases().includes(alias);
@@ -300,6 +302,12 @@ export class UserPillPart extends PillPart {
     get className() {
         return "mx_UserPill mx_Pill";
     }
+
+    serialize() {
+        const obj = super.serialize();
+        obj.userId = this.resourceId;
+        return obj;
+    }
 }
 
 
@@ -335,13 +343,16 @@ export class PillCandidatePart extends PlainPart {
 }
 
 export class PartCreator {
-    constructor(getAutocompleterComponent, updateQuery, room) {
+    constructor(getAutocompleterComponent, updateQuery, room, client) {
+        this._room = room;
+        this._client = client;
         this._autoCompleteCreator = (updateCallback) => {
             return new AutocompleteWrapperModel(
                 updateCallback,
                 getAutocompleterComponent,
                 updateQuery,
                 room,
+                client,
             );
         };
     }
@@ -362,5 +373,22 @@ export class PartCreator {
     createDefaultPart(text) {
         return new PlainPart(text);
     }
+
+    deserializePart(part) {
+        switch (part.type) {
+            case "plain":
+                return new PlainPart(part.text);
+            case "newline":
+                return new NewlinePart(part.text);
+            case "pill-candidate":
+                return new PillCandidatePart(part.text, this._autoCompleteCreator);
+            case "room-pill":
+                return new RoomPillPart(part.text, this._client);
+            case "user-pill": {
+                const member = this._room.getMember(part.userId);
+                return new UserPillPart(part.userId, part.text, member);
+            }
+        }
+    }
 }
 
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4ad5c2f19e..83e12507ca 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -154,7 +154,7 @@
     "%(senderName)s invited %(targetName)s.": "%(senderName)s покани %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s блокира %(targetName)s.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s смени своето име на %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s си сложи име %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s се преименува на %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s премахна своето име (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s премахна своята профилна снимка.",
     "%(senderName)s changed their profile picture.": "%(senderName)s промени своята профилна снимка.",
@@ -1889,13 +1889,13 @@
     "The user's homeserver does not support the version of the room.": "Сървърът на потребителя не поддържа версията на стаята.",
     "Edit messages after they have been sent (refresh to apply changes)": "Редактиране на съобщения след изпращането им (презаредете за да влезе в сила)",
     "React to messages with emoji (refresh to apply changes)": "Реакция към съобщения с емоджи (презаредете за да влезе в сила)",
-    "Sends the given emote coloured as a rainbow": "Изпрати дадения емотикон, оцветен като дъга",
+    "Sends the given emote coloured as a rainbow": "Изпраща дадената емоция, оцветена като дъга",
     "Show hidden events in timeline": "Покажи скрити събития по времевата линия",
     "When rooms are upgraded": "Когато стаите се актуализират",
     "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Това устройстовото <b>не архивира ключовете ви</b>, вие обаче имате съществуващ архив, от който можете да ги възстановите и към който да ги добавяте в бъдеще.",
     "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Преди да се отпишете, свържете устройство си към архивирането, за да предотвратите загуба на ключове, който може да се намират само на него.",
     "Connect this device to Key Backup": "Свържете това устройство към Архивиране на ключове",
-    "Backup has an <validity>invalid</validity> signature from this device": "Архивирането получи <validity>невалиден</validity> подпис от това устройство.",
+    "Backup has an <validity>invalid</validity> signature from this device": "Архивирането получи <validity>невалиден</validity> подпис от това устройство",
     "this room": "тази стая",
     "View older messages in %(roomName)s.": "Виж по-стари съобщения в %(roomName)s.",
     "Joining room …": "Влизане в стая …",
@@ -1915,7 +1915,7 @@
     "You can still join it because this is a public room.": "Все пак можете да се присъедините, защото това е открита стая.",
     "Join the discussion": "Присъединете се към разговора",
     "Try to join anyway": "Опитай да се присъединиш все пак",
-    "This invite to %(roomName)s wasn't sent to your account": "Тази покана за %(roomName)s не беше изпратена към вашия акаунт.",
+    "This invite to %(roomName)s wasn't sent to your account": "Тази покана за %(roomName)s не беше изпратена към вашия акаунт",
     "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Впишете се различен акаунт и поискайте друга покана или добавете имейл адреса %(email)s към този акаунт.",
     "Do you want to chat with %(user)s?": "Желаете ли да си поговорите с %(user)s?",
     "Do you want to join %(roomName)s?": "Желаете ли да се присъедините към %(roomName)s?",
@@ -1923,5 +1923,53 @@
     "You're previewing %(roomName)s. Want to join it?": "Предварителен преглед на %(roomName)s. Желаете ли да се влезете?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s не може да бъде прегледана предварително. Желаете ли да се влезете?",
     "This room doesn't exist. Are you sure you're at the right place?": "Стаята не съществува. Сигурни ли сте, че сте на правилното място?",
-    "Try again later, or ask a room admin to check if you have access.": "Опитайте отново по-късно или помолете администратора да провери дали имате достъп."
+    "Try again later, or ask a room admin to check if you have access.": "Опитайте отново по-късно или помолете администратора да провери дали имате достъп.",
+    "Custom Notification Sounds": "Собствени звуци за уведомление",
+    "Show recently visited rooms above the room list": "Покажи наскоро-посетените стаи над списъка със стаите",
+    "Low bandwidth mode": "Режим на ниска пропускливост",
+    "Uploaded sound": "Качен звук",
+    "Sounds": "Звуци",
+    "Notification sound": "Звук за уведомление",
+    "Reset": "Нулирай",
+    "Set a new custom sound": "Настрой нов собствен звук",
+    "Browse": "Избор",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s беше върнато при опит за достъп до стаята. Ако мислите, че виждате това съобщение по погрешка, <issueLink>изпратете съобщение за грешка</issueLink>.",
+    "This room has already been upgraded.": "Тази стая вече е била обновена.",
+    "Agree or Disagree": "Съгласете се или не се",
+    "Like or Dislike": "Харесайте или не",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>реагира с %(shortName)s</reactedWith>",
+    "Edited at %(date)s": "Редактирано на %(date)s",
+    "edited": "редактирано",
+    "Rotate Left": "Завърти наляво",
+    "Rotate Right": "Завърти надясно",
+    "Edit message": "Редактирай съобщението",
+    "View Servers in Room": "Виж сървърите в стаята",
+    "Unable to validate homeserver/identity server": "Неуспешно потвърждение на сървъра",
+    "Sign in to your Matrix account on <underlinedServerName />": "Влезте с Matrix акаунт от <underlinedServerName />",
+    "Use an email address to recover your account": "Използвайте имейл адрес за да възстановите акаунта си",
+    "Enter email address (required on this homeserver)": "Въведете имейл адрес (задължително за този сървър)",
+    "Doesn't look like a valid email address": "Не изглежда като валиден имейл адрес",
+    "Enter password": "Въведете парола",
+    "Password is allowed, but unsafe": "Паролата се приема, но не е безопасна",
+    "Nice, strong password!": "Хубава, силна парола!",
+    "Passwords don't match": "Паролите не съвпадат",
+    "Other users can invite you to rooms using your contact details": "Други потребители могат да Ви канят в стаи посредством данните за контакт",
+    "Enter phone number (required on this homeserver)": "Въведете телефонен номер (задължително за този сървър)",
+    "Doesn't look like a valid phone number": "Не изглежда като валиден телефонен номер",
+    "Use letters, numbers, dashes and underscores only": "Използвайте само букви, цифри, тирета и подтирета",
+    "Enter username": "Въведете потребителско име",
+    "Some characters not allowed": "Някои символи не са позволени",
+    "Create your Matrix account on <underlinedServerName />": "Създайте Matrix акаунт в <underlinedServerName />",
+    "Use an email address to recover your account.": "Използвайте имейл адрес за да възстановите акаунта си.",
+    "Other users can invite you to rooms using your contact details.": "Другите потребители могат да Ви канят в стаи посредством данните Ви за контакт.",
+    "Error loading Riot": "Грешка при зареждане на Riot",
+    "If this is unexpected, please contact your system administrator or technical support representative.": "Ако това е неочаквано, свържете се със системния администратор или техническа поддръжка.",
+    "Add room": "Добави стая",
+    "Your profile": "Вашият профил",
+    "Your Matrix account on <underlinedServerName />": "Вашият Matrix акаунт в <underlinedServerName />",
+    "Failed to get autodiscovery configuration from server": "Неуспешно автоматично откриване на конфигурацията за сървъра",
+    "Invalid base_url for m.homeserver": "Невалиден base_url в m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Homeserver адресът не изглежда да е валиден Matrix сървър",
+    "Invalid base_url for m.identity_server": "Невалиден base_url в m.identity_server",
+    "Identity server URL does not appear to be a valid identity server": "Адресът на сървърът за самоличност не изглежда да е валиден сървър за самоличност"
 }
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 21a677121a..d4c0d8e799 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1899,5 +1899,11 @@
     "Notification sound": "Zvuk notifikace",
     "Reset": "Resetovat",
     "Set a new custom sound": "Nastavit vlastní zvuk",
-    "Browse": "Prohlížet"
+    "Browse": "Prohlížet",
+    "Cannot reach homeserver": "Nelze se připojit k domovskému serveru",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Ujistěte se, že máte stabilní internetové připojení. Případně problém řešte s administrátorem serveru",
+    "Your Riot is misconfigured": "Riot je špatně nakonfigurován",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Zeptejte se svého administrátora, jestli by vám nezkontrolovat <a>konfiguraci Riotu</a>, asi obsahuje chyby nebo duplicity.",
+    "Unexpected error resolving identity server configuration": "Chyba při hledání konfigurace serveru identity",
+    "Use lowercase letters, numbers, dashes and underscores only": "Používejte pouze malá písmena, čísla, pomlčky a podtržítka"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7673b5f6ab..53fd82f6f2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -249,8 +249,17 @@
     "%(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 …",
+    "Cannot reach homeserver": "Cannot reach homeserver",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Ensure you have a stable internet connection, or get in touch with the server admin",
+    "Your Riot is misconfigured": "Your Riot is misconfigured",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.",
+    "Cannot reach identity server": "Cannot reach identity server",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
     "No homeserver URL provided": "No homeserver URL provided",
     "Unexpected error resolving homeserver configuration": "Unexpected error resolving homeserver configuration",
+    "Unexpected error resolving identity server configuration": "Unexpected error resolving identity server configuration",
     "This homeserver has hit its Monthly Active User limit.": "This homeserver has hit its Monthly Active User limit.",
     "This homeserver has exceeded one of its resource limits.": "This homeserver has exceeded one of its resource limits.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Please <a>contact your service administrator</a> to continue using the service.",
@@ -304,7 +313,6 @@
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
     "Render simple counters in room header": "Render simple counters in room header",
-    "Custom Notification Sounds": "Custom Notification Sounds",
     "Edit messages after they have been sent (refresh to apply changes)": "Edit messages after they have been sent (refresh to apply changes)",
     "React to messages with emoji (refresh to apply changes)": "React to messages with emoji (refresh to apply changes)",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
@@ -1356,7 +1364,7 @@
     "Other users can invite you to rooms using your contact details": "Other users can invite you to rooms using your contact details",
     "Enter phone number (required on this homeserver)": "Enter phone number (required on this homeserver)",
     "Doesn't look like a valid phone number": "Doesn't look like a valid phone number",
-    "Use letters, numbers, dashes and underscores only": "Use letters, numbers, dashes and underscores only",
+    "Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
     "Enter username": "Enter username",
     "Some characters not allowed": "Some characters not allowed",
     "Email (optional)": "Email (optional)",
@@ -1385,8 +1393,6 @@
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
     "You must join the room to see its files": "You must join the room to see its files",
     "There are no visible files in this room": "There are no visible files in this room",
-    "Error loading Riot": "Error loading Riot",
-    "If this is unexpected, please contact your system administrator or technical support representative.": "If this is unexpected, please contact your system administrator or technical support representative.",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n",
     "Add rooms to the community summary": "Add rooms to the community summary",
     "Which rooms would you like to add to this summary?": "Which rooms would you like to add to this summary?",
@@ -1551,6 +1557,9 @@
     "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
+    "<a>Log in</a> to your new account.": "<a>Log in</a> to your new account.",
+    "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
+    "Registration Successful": "Registration Successful",
     "Create your account": "Create your account",
     "Commands": "Commands",
     "Results from DuckDuckGo": "Results from DuckDuckGo",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 841cf36cd3..24d52f9331 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1543,5 +1543,9 @@
     "Rotate clockwise": "Turni laŭhorloĝe",
     "Edit message": "Redakti mesaĝon",
     "This room has already been upgraded.": "Ĉi tiu ĉambro jam gradaltiĝis.",
-    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ĉi tiu ĉambro uzas ĉambran version <roomVersion />, kiun la hejmservilo markis kiel <i>nestabilan</i>."
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ĉi tiu ĉambro uzas ĉambran version <roomVersion />, kiun la hejmservilo markis kiel <i>nestabilan</i>.",
+    "Your Riot is misconfigured": "Via kliento Riot estas misagordita",
+    "All devices for this user are trusted": "Ĉiuj aparatoj de tiu ĉi uzanto estas fidataj",
+    "All devices in this encrypted room are trusted": "Ĉiuj aparatoj en ĉi tiu ĉifrita ĉambro estas fidataj",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Via peto por havigo de ŝlosilo sendiĝis – bonvolu kontroli viajn aliajn aparatojn pro petoj."
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index c4cb32f713..43e0d25d51 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1523,9 +1523,9 @@
     "Robot": "Robota",
     "Hat": "Txanoa",
     "Glasses": "Betaurrekoak",
-    "Spanner": "Giltza ingelesa",
+    "Spanner": "Giltza",
     "Santa": "Santa",
-    "Umbrella": "Aterkina",
+    "Umbrella": "Aterkia",
     "Clock": "Erlojua",
     "Gift": "Oparia",
     "Light bulb": "Bonbilla",
@@ -1825,5 +1825,122 @@
     "The homeserver may be unavailable or overloaded.": "Hasiera-zerbitzaria eskuraezin edo kargatuegia egon daiteke.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Irakurri gabeko %(count)s jakinarazpen dituzu gela honen aurreko bertsio batean.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Irakurri gabeko %(count)s jakinarazpen duzu gela honen aurreko bertsio batean.",
-    "Replying With Files": "Fitxategiekin erantzutea"
+    "Replying With Files": "Fitxategiekin erantzutea",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "'Ogi puskak' ezaugarria erabiltzen duzun ala ez (gelen zerrenda gaineko abatarrak)",
+    "A conference call could not be started because the integrations server is not available": "Ezin izan da konferentzia dei bat hasi integrazio zerbitzaria ez dagoelako eskuragarri",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Une honetan ezin da fitxategi batekin erantzun. Fitxategia igo nahi duzu erantzun gabe?",
+    "The file '%(fileName)s' failed to upload.": "Huts egin du '%(fileName)s' fitxategia igotzean.",
+    "The server does not support the room version specified.": "Zerbitzariak ez du emandako gela-bertsioa onartzen.",
+    "Name or Matrix ID": "Izena edo Matrix ID-a",
+    "Email, name or Matrix ID": "E-mail, izena edo Matrix ID-a",
+    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Gelak eguneratzeak <i>zerbitzariaren aldeko</i> gelaren prozesamenduan eragiten du besterik ez. Zure Riot bezeroarekin arazoak badituzu, eman arazoaren berri hemen <issueLink />.",
+    "<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>Abisua:</b>: Gela eguneratzeak <i>ez ditu automatikoki migratuko kideak gelaren bertsio berrira</i>. Gela berrira daraman esteka bat argitaratuko da gelaren bertsio zaharrean, gelako kideek estekan sakatu beharko dute gela berrira elkartzeko.",
+    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Berretsi gela eguneratzearekin jarraitu nahi duzula, <oldVersion /> bertsiotik <newVersion /> bertsiora.",
+    "Changes your avatar in this current room only": "Zure abatarra aldatzen du gela honetan bakarrik",
+    "Unbans user with given ID": "ID zehatz bat duen erabiltzaileari debekua altxatzen dio",
+    "Adds a custom widget by URL to the room": "URL bidez trepeta pertsonalizatu bat gehitzen du gelara",
+    "Please supply a https:// or http:// widget URL": "Eman https:// edo http:// motako trepetaren URL-a",
+    "Sends the given message coloured as a rainbow": "Emandako mezua ortzadarraren koloreekin bidaltzen du",
+    "Sends the given emote coloured as a rainbow": "Emandako emote-a ortzadarraren koloreekin bidaltzen du",
+    "Cannot reach homeserver": "Ezin izan da hasiera-zerbitzaria atzitu",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Baieztatu Internet konexio egonkor bat duzula, edo jarri kontaktuan zerbitzariaren administratzailearekin",
+    "Your Riot is misconfigured": "Zure Riot gaizki konfiguratuta dago",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Eskatu zure administratzaileari <a>zure konfigurazioa</a> egiaztatu dezan ea okerrak diren edo bikoiztuta dauden sarrerak dauden.",
+    "No homeserver URL provided": "Ez da hasiera-zerbitzariaren URL-a eman",
+    "Unexpected error resolving homeserver configuration": "Ustekabeko errorea hasiera-zerbitzariaren konfigurazioa ebaztean",
+    "Unexpected error resolving identity server configuration": "Ustekabeko errorea identitate-zerbitzariaren konfigurazioa ebaztean",
+    "The user's homeserver does not support the version of the room.": "Erabiltzailearen hasiera-zerbitzariak ez du gelaren bertsioa onartzen.",
+    "Edit messages after they have been sent (refresh to apply changes)": "Editatu mezuak bidali eta gero (freskatu aldaketak aplikatzeko)",
+    "React to messages with emoji (refresh to apply changes)": "Emojien bidezko erreakzioak mezuei (freskatu aldaketak aplikatzeko)",
+    "Show recently visited rooms above the room list": "Erakutsi bisitatutako azken gelak gelen zerrendaren goialdean",
+    "Show hidden events in timeline": "Erakutsi gertaera ezkutuak denbora-lerroan",
+    "Low bandwidth mode": "Banda-zabalera gutxiko modua",
+    "When rooms are upgraded": "Gelak eguneratzean",
+    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Gailu honek <b>ez du zure gakoen babes-kopia egiten</b>, baina badago babes-kopia bat eta berreskuratu dezakezu aurrera jarraitzeko.",
+    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Konektatu gailu hau gakoen babes-kopiara saioa amaitu aurretik, bakarrik gailu honetan egon daitezkeen gakoak galdu nahi ez badituzu.",
+    "Connect this device to Key Backup": "Konektatu gailu hau gakoen babes-kopiara",
+    "Backup has an <validity>invalid</validity> signature from this device": "Babes-kopiak gailu honen <validity>baliogabeko</validity> sinadura du",
+    "this room": "gela hau",
+    "View older messages in %(roomName)s.": "Ikusi %(roomName)s gelako mezu zaharragoak.",
+    "Uploaded sound": "Igotako soinua",
+    "Sounds": "Soinuak",
+    "Notification sound": "Jakinarazpen soinua",
+    "Reset": "Berrezarri",
+    "Set a new custom sound": "Ezarri soinu pertsonalizatua",
+    "Browse": "Arakatu",
+    "Joining room …": "Gelara elkartzen…",
+    "Loading …": "Kargatzen…",
+    "Rejecting invite …": "Gonbidapena errefusatzen…",
+    "Join the conversation with an account": "Elkartu elkarrizketara kontu batekin",
+    "Sign Up": "Erregistratu",
+    "Sign In": "Hasi saioa",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(roomName)s gelatik kaleratu zaitu %(memberName)s erabiltzaileak",
+    "Reason: %(reason)s": "Arrazoia: %(reason)s",
+    "Forget this room": "Ahaztu gela hau",
+    "Re-join": "Berriro elkartu",
+    "You were banned from %(roomName)s by %(memberName)s": "%(roomName)s gelan sartzea debekatu dizu %(memberName) erabiltzaileak",
+    "Something went wrong with your invite to %(roomName)s": "Arazo bat egon da zure %(roomName)s gelarako gonbidapenarekin",
+    "%(errcode)s was returned while trying to valide your invite. You could try to pass this information on to a room admin.": "%(errcode)s jaso da zure gonbidapena balioztatzean. Saiatu informazio hau gelako administratzaileari ematen.",
+    "You can only join it with a working invite.": "Elkartzeko baliozko gonbidapen bat behar duzu.",
+    "You can still join it because this is a public room.": "Berdin elkartu zaitezke gela publikoa delako.",
+    "Join the discussion": "Elkartu elkarrizketara",
+    "Try to join anyway": "Saiatu elkartzen hala ere",
+    "This invite to %(roomName)s wasn't sent to your account": "%(roomName)s gelarako gonbidapen hau ez da zure kontura bidali",
+    "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Hasi saioa beste kontu batekin, eskatu beste gonbidapen bat, edo gehitu %(email)s e-mail helbidea kontu hontara.",
+    "Do you want to chat with %(user)s?": "%(user)s erabiltzailearekin txateatu nahi duzu?",
+    "Do you want to join %(roomName)s?": "%(roomName)s gelara elkartu nahi duzu?",
+    "<userName/> invited you": "<userName/> erabiltzaileak gonbidatu zaitu",
+    "You're previewing %(roomName)s. Want to join it?": "%(roomName)s aurreikusten ari zara. Elkartu nahi duzu?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s ezin da aurreikusi. Elkartu nahi duzu?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Ez dago gela hau. Ziur toki zuzenean zaudela?",
+    "Try again later, or ask a room admin to check if you have access.": "Saiatu geroago, edo galdetu gelako administratzaileari sarbidea duzun.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s jaso da gela atzitzen saiatzean. Hau akats bat dela uste baduzu, <issueLink>eman arazoaren berri</issueLink>.",
+    "This room has already been upgraded.": "Gela hau dagoeneko eguneratu da.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Gela honek <roomVersion /> bertsioa du, eta hasiera-zerbitzariak<i>ez egonkor</i> gisa markatu du.",
+    "Agree or Disagree": "Ados ala ez ados",
+    "Like or Dislike": "Gogoko ala ez gogoko",
+    "Edited at %(date)s": "%(date)s-n editatua",
+    "edited": "editatua",
+    "Maximize apps": "Maximizatu aplikazioak",
+    "Rotate Left": "Biratu ezkerrera",
+    "Rotate counter-clockwise": "Biratu erlojuaren orratzen zentzuaren kontra",
+    "Rotate Right": "Biratu eskumara",
+    "Rotate clockwise": "Biratu erlojuaren orratzen zentzuan",
+    "Edit message": "Editatu mezua",
+    "GitHub issue": "GitHub arazo-txostena",
+    "Notes": "Oharrak",
+    "View Servers in Room": "Ikusi gelan dauden zerbitzariak",
+    "Sign out and remove encryption keys?": "Amaitu saioa eta kendu zifratze gakoak?",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Etorkizunean hau ekiditeko, <a>bidali guri egunkariak</a>.",
+    "Missing session data": "Saioaren datuak falta dira",
+    "Upload files (%(current)s of %(total)s)": "Igo fitxategiak (%(current)s / %(total)s)",
+    "Upload files": "Igo fitxategiak",
+    "Upload": "Igo",
+    "Upload %(count)s other files|other": "Igo beste %(count)s fitxategiak",
+    "Upload %(count)s other files|one": "Igo beste fitxategi %(count)s",
+    "Cancel All": "Ezeztatu dena",
+    "Upload Error": "Igoera errorea",
+    "Unable to validate homeserver/identity server": "Ezin izan da hasiera-zerbitzaria edo identitate-zerbitzaria balioztatu",
+    "Sign in to your Matrix account on <underlinedServerName />": "Hasi saioa zure <underlinedServerName /> zerbitzariko Matrix kontuarekin",
+    "Use an email address to recover your account": "Erabili e-mail helbidea zure kontua berreskuratzeko",
+    "Enter email address (required on this homeserver)": "Sartu zure e-mail helbidea (hasiera-zerbitzari honetan beharrezkoa da)",
+    "Doesn't look like a valid email address": "Ez dirudi baliozko e-mail helbide bat",
+    "Enter password": "Sartu pasahitza",
+    "Password is allowed, but unsafe": "Pasahitza onartzen da, baina ez segurua da",
+    "Nice, strong password!": "Ongi, pasahitz sendoa!",
+    "Passwords don't match": "Pasahitzak ez datoz bat",
+    "Other users can invite you to rooms using your contact details": "Beste erabiltzaileek geletara gonbidatu zaitzakete zure kontaktu-xehetasunak erabiliz",
+    "Enter phone number (required on this homeserver)": "Sartu telefono zenbakia (hasiera zerbitzari honetan beharrezkoa)",
+    "Doesn't look like a valid phone number": "Ez dirudi baliozko telefono zenbaki bat",
+    "Use lowercase letters, numbers, dashes and underscores only": "Erabili letra xeheak, zenbakiak, gidoiak eta azpimarrak, besterik ez",
+    "Enter username": "Sartu erabiltzaile-izena",
+    "Some characters not allowed": "Karaktere batzuk ez dira onartzen",
+    "Create your Matrix account on <underlinedServerName />": "Sortu zure Matrix kontua <underlinedServerName /> zerbitzarian",
+    "Use an email address to recover your account.": "Erabili e-mail helbidea zure kontua berreskuratzeko.",
+    "Other users can invite you to rooms using your contact details.": "Beste erabiltzaileek geletara gonbidatu zaitzakete zure kontaktu-xehetasunak erabiliz.",
+    "Add room": "Gehitu gela",
+    "Your profile": "Zure profila",
+    "Your Matrix account on <underlinedServerName />": "Zure <underlinedServerName /> zerbitzariko Matrix kontua",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Hasiera-zerbitzariaren URL-a ez dirudi baliozko hasiera-zerbitzari batena",
+    "Identity server URL does not appear to be a valid identity server": "Identitate-zerbitzariaren URL-a ez dirudi baliozko identitate-zerbitzari batena"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 55a204e42e..c5b010b1e4 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1989,5 +1989,15 @@
     "Notification sound": "Son de notification",
     "Reset": "Réinitialiser",
     "Set a new custom sound": "Définir un nouveau son personnalisé",
-    "Browse": "Parcourir"
+    "Browse": "Parcourir",
+    "Cannot reach homeserver": "Impossible de joindre le serveur d’accueil",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Vérifiez que vous avec une connexion internet stable ou contactez l’administrateur du serveur",
+    "Your Riot is misconfigured": "Votre Riot est mal configuré",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Demandez à votre administrateur Riot de vérifier que <a>votre configuration</a> ne contient pas d’entrées incorrectes ou en double.",
+    "Unexpected error resolving identity server configuration": "Une erreur inattendue est survenue pendant la résolution de la configuration du serveur d’identité",
+    "Use lowercase letters, numbers, dashes and underscores only": "Utiliser uniquement des lettres, chiffres, traits d’union et tirets bas",
+    "Cannot reach identity server": "Impossible de joindre le serveur d’identité",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Vous pouvez vous inscrire, mais certaines fonctionnalités ne seront pas disponibles jusqu’au retour du serveur d’identité. Si vous continuez à voir cet avertissement, vérifiez votre configuration ou contactez un administrateur du serveur.",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Vous pouvez réinitialiser votre mot de passe, mais certaines fonctionnalités ne seront pas disponibles jusqu’au retour du serveur d’identité. Si vous continuez à voir cet avertissement, vérifiez votre configuration ou contactez un administrateur du serveur.",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Vous pouvez vous connecter, mais certaines fonctionnalités ne seront pas disponibles jusqu’au retour du serveur d’identité. Si vous continuez à voir cet avertissement, vérifiez votre configuration ou contactez un administrateur du serveur."
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f92cd99d25..3c9deaa0c6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1981,5 +1981,19 @@
     "Sign in to your Matrix account on <underlinedServerName />": "Bejelentkezés a Matrix fiókba itt: <underlinedServerName />",
     "Create your Matrix account on <underlinedServerName />": "Matrix fiók létrehozása itt: <underlinedServerName />",
     "Your Matrix account on <underlinedServerName />": "A Matrix fiókod itt: <underlinedServerName />",
-    "Low bandwidth mode": "Alacsony sávszélesség mód"
+    "Low bandwidth mode": "Alacsony sávszélesség mód",
+    "Cannot reach homeserver": "A matrix szerver elérhetetlen",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Legyen stabil az Internet elérésed vagy a szerver adminisztrátorával vedd fel a kapcsolatot",
+    "Your Riot is misconfigured": "A Riotod hibásan van beállítva",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Kérd meg a Riot adminisztrátorodat, hogy ellenőrizze a <a>beállításaidat</a> hibás vagy duplikált bejegyzéseket keresve.",
+    "Unexpected error resolving identity server configuration": "Az azonosítási szerver beállításainak feldolgozásánál váratlan hiba történt",
+    "Show recently visited rooms above the room list": "Legutóbb meglátogatott szobák megjelenítése a szobalista felett",
+    "Uploaded sound": "Feltöltött hang",
+    "Sounds": "Hangok",
+    "Notification sound": "Értesítési hang",
+    "Reset": "Visszaállít",
+    "Set a new custom sound": "Új egyedi hang beállítása",
+    "Browse": "Böngész",
+    "Use lowercase letters, numbers, dashes and underscores only": "Csak kisbetűt, számokat, kötőjeleket és aláhúzásokat használj",
+    "Cannot reach identity server": "Az azonosítási szerver nem érhető el"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index ec78b2e8bf..bc85aaa387 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1934,5 +1934,13 @@
     "Sign in to your Matrix account on <underlinedServerName />": "Accedi al tuo account Matrix su <underlinedServerName />",
     "Create your Matrix account on <underlinedServerName />": "Crea il tuo account Matrix su <underlinedServerName />",
     "Your Matrix account on <underlinedServerName />": "Il tuo account Matrix su <underlinedServerName />",
-    "Low bandwidth mode": "Modalità larghezza di banda bassa"
+    "Low bandwidth mode": "Modalità larghezza di banda bassa",
+    "Custom Notification Sounds": "Suoni di notifica personalizzati",
+    "Show recently visited rooms above the room list": "Mostra le stanze visitate di recente sopra l'elenco stanze",
+    "Uploaded sound": "Suono inviato",
+    "Sounds": "Suoni",
+    "Notification sound": "Suoni di notifica",
+    "Reset": "Ripristina",
+    "Set a new custom sound": "Imposta un nuovo suono personalizzato",
+    "Browse": "Sfoglia"
 }
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index efd66b8f0e..9252780f9a 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1131,5 +1131,6 @@
     "e.g. <CurrentPageURL>": "piemēram <CurrentPageURL>",
     "Your device resolution": "Tavas iekārtas izšķirtspēja",
     "Sign In": "Ienākt",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Varat arī iestatīt pielāgotu identitātes serveri, bet jūs nevarēsiet uzaicināt lietotājus izmantojot e-pasta adresi, kā arī tikt uzaicināts pēc e-pasta adreses."
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Varat arī iestatīt pielāgotu identitātes serveri, bet jūs nevarēsiet uzaicināt lietotājus izmantojot e-pasta adresi, kā arī tikt uzaicināts pēc e-pasta adreses.",
+    "Whether or not you're logged in (we don't record your username)": "Esat vai neesat pieteicies (mēs nesaglabājam jūsu lietotājvārdu)"
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 0f788ede57..bcc4cbe75e 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -114,7 +114,7 @@
     "No display name": "Geen weergavenaam",
     "No more results": "Geen resultaten meer",
     "No results": "Geen resultaten",
-    "No users have specific privileges in this room": "Geen gebruikers hebben specifieke privileges in dit gesprek",
+    "No users have specific privileges in this room": "Geen enkele gebruiker heeft specifieke bevoegdheden in dit gesprek",
     "olm version:": "olm-versie:",
     "Password": "Wachtwoord",
     "Password:": "Wachtwoord:",
@@ -234,7 +234,7 @@
     "Failed to ban user": "Verbannen van gebruiker is mislukt",
     "Failed to change power level": "Wijzigen van machtsniveau is mislukt",
     "Failed to fetch avatar URL": "Ophalen van avatar-URL is mislukt",
-    "Failed to join room": "Toetreden van gesprek is mislukt",
+    "Failed to join room": "Toetreden tot gesprek is mislukt",
     "Failed to leave room": "Verlaten van gesprek is mislukt",
     "Failed to load timeline position": "Laden van tijdslijnpositie is mislukt",
     "Failed to mute user": "Dempen van gebruiker is mislukt",
@@ -261,7 +261,7 @@
     "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "In verband met veiligheidsredenen zullen alle end-to-endbeveiligingsleutels van deze browser verwijderd worden. Als je je gespreksgeschiedenis van toekomstige Riot sessies wilt kunnen ontsleutelen, exporteer en bewaar dan de ruimte sleutels.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s van %(fromPowerLevel)s naar %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Gasttoegang is uitgeschakeld op deze thuisserver.",
-    "Guests cannot join this room even if explicitly invited.": "Gasten kunnen niet tot dit gesprek toetreden, zelfs niet als ze uitdrukkelijk uitgenodigd zijn.",
+    "Guests cannot join this room even if explicitly invited.": "Gasten - zelfs speficiek uitgenodigde - kunnen niet aan dit gesprek deelnemen.",
     "Hangup": "Ophangen",
     "Hide read receipts": "Leesbewijzen verbergen",
     "Hide Text Formatting Toolbar": "Tekstopmaakwerkbalk verbergen",
@@ -320,7 +320,7 @@
     "Mobile phone number": "Mobiele-telefoonnummer",
     "Mobile phone number (optional)": "Mobiele-telefoonnummer (optioneel)",
     "Never send encrypted messages to unverified devices from this device": "Versleutelde berichten vanaf dit apparaat nooit naar ongeverifieerde apparaten versturen",
-    "Never send encrypted messages to unverified devices in this room from this device": "Versleutelde berichten vanaf dit apparaat nooit naar ongeverifieerde apparaten in dit gesprek versturen",
+    "Never send encrypted messages to unverified devices in this room from this device": "Nooit vanaf dit apparaat versleutelde berichten naar ongeverifieerde apparaten in dit gesprek versturen",
     "New address (e.g. #foo:%(localDomain)s)": "Nieuw adres (bv. #foo:%(localDomain)s)",
     "New passwords don't match": "Nieuwe wachtwoorden komen niet overeen",
     "New passwords must match each other.": "Nieuwe wachtwoorden moeten overeenkomen.",
@@ -352,7 +352,7 @@
     "Scroll to unread messages": "Scroll naar ongelezen berichten",
     "Search failed": "Zoeken mislukt",
     "Searches DuckDuckGo for results": "Zoekt op DuckDuckGo voor resultaten",
-    "Seen by %(userName)s at %(dateTime)s": "Gezien door %(userName)s op %(dateTime)s",
+    "Seen by %(userName)s at %(dateTime)s": "Gezien door %(userName)s om %(dateTime)s",
     "Send anyway": "Alsnog versturen",
     "Sender device information": "Info over apparaat van afzender",
     "Send Reset Email": "E-mail voor opnieuw instellen versturen",
@@ -398,12 +398,12 @@
     "This is a preview of this room. Room interactions have been disabled": "Dit is een voorvertoning van het gesprek. Gespreksinteracties zijn uitgeschakeld",
     "This phone number is already in use": "Dit telefoonnummer is al in gebruik",
     "This room": "Dit gesprek",
-    "This room is not accessible by remote Matrix servers": "Dit gesprek is niet toegankelijk voor externe Matrix-servers",
+    "This room is not accessible by remote Matrix servers": "Dit gesprek is niet toegankelijk vanaf externe Matrix-servers",
     "This room's internal ID is": "Het interne ID van deze ruimte is",
     "To link to a room it must have <a>an address</a>.": "Om naar een ruimte te linken moet het <a>een adres</a> hebben.",
     "To reset your password, enter the email address linked to your account": "Voer het e-mailadres dat met je account verbonden is in om je wachtwoord opnieuw in te stellen",
     "To use it, just wait for autocomplete results to load and tab through them.": "Om het te gebruiken, wacht u tot de automatisch aangevulde resultaten geladen zijn en tabt u erdoorheen.",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U heeft geprobeerd een gegeven punt in de tijdslijn van dit gesprek te laden, maar u heeft geen toestemming om het desbetreffende bericht te zien.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U heeft gepoogd een gegeven punt in de tijdslijn van dit gesprek te laden, maar u bent niet bevoegd het desbetreffende bericht te zien.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Geprobeerd een gegeven punt in de tijdslijn van dit gesprek te laden, maar kon dit niet vinden.",
     "Turn Markdown off": "Zet Markdown uit",
     "Turn Markdown on": "Zet Markdown aan",
@@ -464,7 +464,7 @@
     "Warning!": "Let op!",
     "WARNING: Device already verified, but keys do NOT MATCH!": "LET OP: apparaat reeds geverifieerd, maar de sleutels KOMEN NIET OVEREEN!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "LET OP: SLEUTELVERIFICATIE IS MISLUKT! De ondertekende sleutel voor %(userId)s en apparaat %(deviceId)s is ‘%(fprint)s’, wat niet overeenkomt met de verschafte sleutel ‘%(fingerprint)s’. Dit kan betekenen dat uw communicatie onderschept wordt!",
-    "Who can access this room?": "Wie heeft er toegang tot dit gesprek?",
+    "Who can access this room?": "Wie mag er deelnemen aan dit gesprek?",
     "Who can read history?": "Wie kan de geschiedenis lezen?",
     "Who would you like to add to this room?": "Wie wilt u aan dit gesprek toevoegen?",
     "Who would you like to communicate with?": "Met wie zou u willen communiceren?",
@@ -476,7 +476,7 @@
     "You are trying to access %(roomName)s.": "U probeert toegang te verkrijgen tot %(roomName)s.",
     "You cannot place a call with yourself.": "U kunt uzelf niet bellen.",
     "You cannot place VoIP calls in this browser.": "U kunt in deze browser geen VoIP-oproepen plegen.",
-    "You do not have permission to post to this room": "U heeft geen toestemming om in dit gesprek te posten",
+    "You do not have permission to post to this room": "U heeft geen toestemming actief aan dit gesprek deel te nemen",
     "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s heeft u uit %(roomName)s verbannen.",
     "You have been invited to join this room by %(inviterName)s": "U bent in dit gesprek uitgenodigd door %(inviterName)s",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s heeft u uit %(roomName)s gezet.",
@@ -549,7 +549,7 @@
     "Start new chat": "Nieuw gesprek beginnen",
     "Failed to invite": "Uitnodigen is mislukt",
     "Failed to invite user": "Uitnodigen van gebruiker is mislukt",
-    "Failed to invite the following users to the %(roomName)s room:": "Uitnodigen van volgende gebruikers in gesprek %(roomName)s is mislukt:",
+    "Failed to invite the following users to the %(roomName)s room:": "Uitnodigen van volgende gebruikers tot gesprek %(roomName)s is mislukt:",
     "Confirm Removal": "Verwijdering bevestigen",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Weet u zeker dat u deze gebeurtenis wilt verwijderen? Wees u er wel van bewust dat als u een gespreksnaam of onderwerpswijziging verwijdert, u de verandering mogelijk ongedaan maakt.",
     "Unknown error": "Onbekende fout",
@@ -642,18 +642,18 @@
     "Enable automatic language detection for syntax highlighting": "Automatische taaldetectie voor zinsbouwmarkeringen inschakelen",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Toetreed/verlaat berichten verbergen (uitnodigingen/verwijderingen/verbanningen zullen ongeschonden blijven)",
     "Integrations Error": "Integratiesfout",
-    "Publish this room to the public in %(domain)s's room directory?": "Dit gesprek openbaar maken in de gesprekscatalogus van %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "Dit gesprek vermelden in de gesprekkencatalogus van %(domain)s?",
     "AM": "AM",
     "PM": "PM",
     "NOTE: Apps are not end-to-end encrypted": "LET OP: apps zijn niet eind-tot-eind-versleuteld",
     "Revoke widget access": "Widget-toegang intrekken",
     "Sets the room topic": "Wijzigt het ruimte-onderwerp",
-    "The maximum permitted number of widgets have already been added to this room.": "Het maximale aantal toegestane widgets is al aan dit gesprek toegevoegd.",
+    "The maximum permitted number of widgets have already been added to this room.": "Het maximum aan toegestane widgets voor dit gesprek is al bereikt.",
     "To get started, please pick a username!": "Kies allereerst een gebruikersnaam!",
     "Unable to create widget.": "Kan widget niet aanmaken.",
     "Unbans user with given id": "Ontbant de gebruiker met de gegeven ID",
-    "You are not in this room.": "U zit niet in dit gesprek.",
-    "You do not have permission to do that in this room.": "U heeft geen toestemming om dat in dit gesprek te doen.",
+    "You are not in this room.": "U maakt geen deel uit van dit gesprek.",
+    "You do not have permission to do that in this room.": "U bent niet bevoegd dat in dit gesprek te doen.",
     "Verifies a user, device, and pubkey tuple": "Verifieert een combinatie van gebruiker, apparaat en publieke sleutel",
     "Autocomplete Delay (ms):": "Automatisch-aanvullen-vertraging (ms):",
     "Loading device info...": "Apparaatinformatie wordt geladen…",
@@ -679,21 +679,21 @@
     "Invite new community members": "Nodig nieuwe gemeenschapsleden uit",
     "Name or matrix ID": "Naam of Matrix-ID",
     "Which rooms would you like to add to this community?": "Welke gesprekken wilt u toevoegen aan deze gemeenschap?",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Een widget verwijderen doet dat voor alle gebruikers in dit gesprek. Weet u zeker dat u deze widget wilt verwijderen?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Widgets verwijderen geldt voor alle deelnemers aan dit gesprek. Weet u zeker dat u deze widget wilt verwijderen?",
     "Delete Widget": "Widget verwijderen",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Er zijn onbekende apparaten in dit gesprek: als u verder gaat zonder ze te verifiëren zal het mogelijk zijn dat iemand uw oproep afluistert.",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Dit gesprek bevat onbekende apparaten: tenzij u die verifieert zou iemand uw oproep kunnen afluisteren.",
     "Review Devices": "Apparaten nakijken",
     "Call Anyway": "Toch bellen",
     "Answer Anyway": "Toch beantwoorden",
     "Who would you like to add to this community?": "Wie wilt u toevoegen aan deze gemeenschap?",
-    "Invite to Community": "Uitnodigen in gemeenschap",
+    "Invite to Community": "Uitnodigen tot gemeenschap",
     "Show these rooms to non-members on the community page and room list?": "Deze gesprekken tonen aan niet-leden op de gemeenschapspagina en gesprekslijst?",
     "Add rooms to the community": "Voeg gesprekken toe aan de gemeenschap",
     "Room name or alias": "Gespreks(bij)naam",
     "Add to community": "Toevoegen aan gemeenschap",
-    "Failed to invite the following users to %(groupId)s:": "Uitnodigen van volgende gebruikers in %(groupId)s is mislukt:",
-    "Failed to invite users to community": "Uitnodigen van gebruikers in gemeenschap is mislukt",
-    "Failed to invite users to %(groupId)s": "Uitnodigen van gebruikers in %(groupId)s is mislukt",
+    "Failed to invite the following users to %(groupId)s:": "Uitnodigen van volgende gebruikers tot %(groupId)s is mislukt:",
+    "Failed to invite users to community": "Uitnodigen van gebruikers tot de gemeenschap is mislukt",
+    "Failed to invite users to %(groupId)s": "Uitnodigen van gebruikers tot %(groupId)s is mislukt",
     "Failed to add the following rooms to %(groupId)s:": "Toevoegen van volgende gesprekken aan %(groupId)s is mislukt:",
     "Restricted": "Beperkte toegang",
     "Ignored user": "Genegeerde gebruiker",
@@ -711,7 +711,7 @@
     "Hide display name changes": "Weergavenaam wijzigingen verbergen",
     "Enable inline URL previews by default": "Inline URL-voorvertoning standaard inschakelen",
     "Enable URL previews for this room (only affects you)": "URL-voorvertoning in dit gesprek inschakelen (geldt alleen voor u)",
-    "Enable URL previews by default for participants in this room": "URL-voorvertoning standaard voor de gebruikers in dit gesprek inschakelen",
+    "Enable URL previews by default for participants in this room": "URL-voorvertoning standaard voor alle deelnemers aan dit gesprek inschakelen",
     "Delete %(count)s devices|other": "%(count)s apparaten verwijderen",
     "Delete %(count)s devices|one": "Apparaat verwijderen",
     "Select devices": "Selecteer apparaten",
@@ -954,7 +954,7 @@
     "Your homeserver's URL": "De URL van uw thuisserver",
     "Your identity server's URL": "De URL van uw identiteitsserver",
     "<a>In reply to</a> <pill>": "<a>Als antwoord op</a> <pill>",
-    "This room is not public. You will not be able to rejoin without an invite.": "Dit gesprek is niet openbaar. Zonder uitnodiging zult u niet opnieuw kunnen toetreden.",
+    "This room is not public. You will not be able to rejoin without an invite.": "Dit is geen openbaar gesprek.  Slechts op uitnodiging zult u opnieuw kunnen toetreden.",
     "were unbanned %(count)s times|one": "zijn ontbannen",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s heeft zijn/haar weergavenaam gewijzigd naar %(displayName)s.",
     "Disable Community Filter Panel": "Gemeenschapsfilterpaneel uitzetten",
@@ -975,7 +975,7 @@
     "Add a stickerpack": "Stickerpakket toevoegen",
     "Hide Stickers": "Stickers verbergen",
     "Show Stickers": "Stickers weergeven",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Gezien door %(displayName)s (%(userName)s) op %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Gezien door %(displayName)s (%(userName)s) om %(dateTime)s",
     "Code": "Code",
     "Unable to join community": "Kan niet toetreden tot de gemeenschap",
     "Unable to leave community": "Kan de gemeenschap niet verlaten",
@@ -1013,7 +1013,7 @@
     "Send Custom Event": "Aangepaste gebeurtenis versturen",
     "Advanced notification settings": "Geavanceerde meldingsinstellingen",
     "delete the alias.": "verwijder de bijnaam.",
-    "To return to your account in future you need to <u>set a password</u>": "Om in de toekomst naar uw account terug te gaan is het nodig <u>een wachtwoord in te stellen</u>",
+    "To return to your account in future you need to <u>set a password</u>": "Om in de toekomst naar uw account terug te kunnen dient u <u>een wachtwoord in te stellen</u>",
     "Forget": "Vergeten",
     "#example": "#voorbeeld",
     "Hide panel": "Paneel verbergen",
@@ -1077,7 +1077,7 @@
     "more": "meer",
     "You must specify an event type!": "U dient een gebeurtenistype op te geven!",
     "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
-    "Invite to this room": "Uitnodigen in dit gesprek",
+    "Invite to this room": "Uitnodigen tot dit gesprek",
     "Please install <chromeLink>Chrome</chromeLink> or <firefoxLink>Firefox</firefoxLink> for the best experience.": "Installeer alstublieft <chromeLink>Chrome</chromeLink> of <firefoxLink>Firefox</firefoxLink> voor de beste gebruikerservaring.",
     "Failed to get public room list": "Lijst met publieke kamers ophalen is mislukt",
     "Send logs": "Logboeken versturen",
@@ -1177,7 +1177,7 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Het legen van de opslag van uw browser zal het probleem misschien verhelpen, maar zal u ook afmelden en uw gehele versleutelde gespreksgeschiedenis onleesbaar maken.",
     "Collapse Reply Thread": "Reactieketting dichtvouwen",
     "Can't leave Server Notices room": "Kan servermeldingsgesprek niet verlaten",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek wordt gebruikt voor belangrijke berichten van de thuisserver, dus u kunt het niet verlaten.",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek is bedoeld voor belangrijke berichten van de thuisserver, dus u kunt het niet verlaten.",
     "Terms and Conditions": "Gebruiksvoorwaarden",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Om de %(homeserverDomain)s-thuisserver te blijven gebruiken, zult u de gebruiksvoorwaarden moeten lezen en aanvaarden.",
     "Review terms and conditions": "Gebruiksvoorwaarden lezen",
@@ -1186,7 +1186,7 @@
     "A call is currently being placed!": "Er wordt al een oproep gemaakt!",
     "A call is already in progress!": "Er is al een gesprek actief!",
     "Permission Required": "Toestemming vereist",
-    "You do not have permission to start a conference call in this room": "U heeft geen toestemming om in dit groepsgesprek een vergadergesprek te starten",
+    "You do not have permission to start a conference call in this room": "U heeft geen toestemming in dit groepsgesprek een vergadergesprek te starten",
     "Show empty room list headings": "Lege koppen in ruimtelijst weergeven",
     "This event could not be displayed": "Deze gebeurtenis kon niet weergegeven worden",
     "Encrypting": "Versleutelen",
@@ -1211,7 +1211,7 @@
     "The password field must not be blank.": "Het wachtwoordveld mag niet leeg zijn.",
     "This homeserver has hit its Monthly Active User limit. Please contact your service administrator to continue using the service.": "Deze thuisserver heeft zijn maandelijkse gebruikerslimiet bereikt. Neem contact op met de beheerder van je thuisserver om de dienst weer te kunnen gebruiken.",
     "Failed to remove widget": "Widget kon niet worden verwijderd",
-    "An error ocurred whilst trying to remove the widget from the room": "Er is een fout opgetreden bij het verwijderen van de widget uit dit gesprek",
+    "An error ocurred whilst trying to remove the widget from the room": "Er trad een fout op bij de verwijderpoging van de widget uit dit gesprek",
     "Share Room": "Gesprek delen",
     "Link to most recent message": "Koppeling naar meest recente bericht",
     "Share User": "Gebruiker delen",
@@ -1267,7 +1267,7 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "Gelieve <a>contact op te nemen met uw systeembeheerder</a> om deze dienst te blijven gebruiken.",
     "Unable to connect to Homeserver. Retrying...": "Kon geen verbinding met de thuisserver maken. Nieuwe poging…",
     "Unrecognised address": "Adres niet herkend",
-    "You do not have permission to invite people to this room.": "U heeft geen toestemming om mensen in dit gesprek uit te nodigen.",
+    "You do not have permission to invite people to this room.": "U bent niet bevoegd anderen tot dit gesprek uit te nodigen.",
     "User %(userId)s is already in the room": "De gebruiker %(userId)s is al aanwezig",
     "User %(user_id)s does not exist": "Er bestaat geen gebruiker ‘%(user_id)s’",
     "User %(user_id)s may or may not exist": "Er bestaat mogelijk geen gebruiker ‘%(user_id)s’",
@@ -1494,7 +1494,7 @@
     "Enable encryption?": "Versleuteling inschakelen?",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Van zodra versleuteling voor een gesprek is ingeschakeld, kan dit niet meer worden uitgeschakeld. Berichten die in een versleuteld gesprek worden verstuurd worden niet gezien door de server, enkel door de deelnemers aan het gesprek. Door versleuteling in te schakelen kunnen veel robots en overbruggingen niet correct functioneren. <a>Lees meer over versleuteling.</a>",
     "To link to this room, please add an alias.": "Voeg een bijnaam toe om naar dit gesprek te verwijzen.",
-    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Wijzigingen aan wie de geschiedenis kan lezen zijn enkel van toepassing op toekomstige berichten in dit gesprek. De zichtbaarheid van de bestaande geschiedenis blijft ongewijzigd.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Wijzigingen aan wie de geschiedenis kan lezen gelden enkel voor toekomstige berichten in dit gesprek. De zichtbaarheid van de bestaande geschiedenis blijft ongewijzigd.",
     "Encryption": "Versleuteling",
     "Once enabled, encryption cannot be disabled.": "Eenmaal ingeschakeld kan versleuteling niet meer worden uitgeschakeld.",
     "Encrypted": "Versleuteld",
@@ -1503,12 +1503,12 @@
     "All devices for this user are trusted": "Alle apparaten van deze gebruiker worden vertrouwd",
     "All devices in this encrypted room are trusted": "Alle apparaten in dit versleutelde gesprek worden vertrouwd",
     "The following files cannot be uploaded:": "De volgende bestanden kunnen niet geüpload worden:",
-    "This room has been replaced and is no longer active.": "Dit gesprek is vervangen en is niet langer actief.",
+    "This room has been replaced and is no longer active.": "Dit gesprek is vervangen en niet langer actief.",
     "The conversation continues here.": "Het gesprek gaat hier verder.",
     "Joining room...": "Toetreden tot gesprek…",
     "Use Key Backup": "Sleutelback-up gebruiken",
     "Never lose encrypted messages": "Verlies nooit uw versleutelde berichten",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "De berichten in dit gesprek worden beveiligd met eind-tot-eind-versleuteling. Enkel de ontvanger(s) en u hebben de sleutels om deze berichten te lezen.",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "De berichten in dit gesprek worden beveiligd met eind-tot-eind-versleuteling. Enkel de ontvanger(s) en u hebben de leessleutels voor deze berichten.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Maak een veilige back-up van uw sleutels om ze niet te verliezen. <a>Lees meer.</a>",
     "Not now": "Nu niet",
     "Don't ask me again": "Vraag het me niet opnieuw",
@@ -1527,7 +1527,7 @@
     "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Er is een fout opgetreden bij het verwijderen van die bijnaam. Mogelijk bestaat die niet meer, of er is een tijdelijke fout opgetreden.",
     "Main address": "Hoofdadres",
     "Error updating flair": "Fout bij bijwerken van badge",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Er is een fout opgetreden bij het bijwerken van de badge voor dit gesprek. De server ondersteunt dit mogelijk niet, of er is een tijdelijke fout opgetreden.",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Er is een fout opgetreden bij het bijwerken van de badge voor dit gesprek.  Wellicht ondersteunt de server dit niet, of er is een tijdelijke fout opgetreden.",
     "Room avatar": "Gespreksavatar",
     "Upload room avatar": "Gespreksavatar uploaden",
     "No room avatar": "Geen gespreksavatar",
@@ -1549,7 +1549,7 @@
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Vooraleer u logboeken indient, dient u een <a>melding te openen op GitHub</a> waarin u uw probleem beschrijft.",
     "What GitHub issue are these logs for?": "Voor welke melding op GitHub zijn deze logboeken?",
     "Unable to load commit detail: %(msg)s": "Kan commitdetail niet laden: %(msg)s",
-    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "Om uw gespreksgeschiedenis niet te verliezen, moet u uw gesprekssleutels exporteren vooraleer u zich afmeldt. U zult moeten terugkeren naar de nieuwere versie van Riot om dit te doen",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "Om uw gespreksgeschiedenis niet te verliezen, moet u uw gesprekssleutels exporteren vooraleer u zich afmeldt. Hiertoe zult u moeten terugkeren naar de nieuwere versie van Riot",
     "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "U heeft eerder een nieuwere versie van Riot op %(host)s gebruikt. Om deze versie opnieuw met eind-tot-eind-versleuteling te gebruiken, zult u zich moeten afmelden en opnieuw aanmelden. ",
     "Incompatible Database": "Incompatibele database",
     "Continue With Encryption Disabled": "Verdergaan met versleuteling uitgeschakeld",
@@ -1565,7 +1565,7 @@
     "Waiting for partner to confirm...": "Wachten op bevestiging van partner…",
     "Incoming Verification Request": "Inkomend verificatieverzoek",
     "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "U heeft voorheen Riot op %(host)s gebruikt met lui laden van leden ingeschakeld. In deze versie is lui laden uitgeschakeld. Omdat de lokale cache niet compatibel is tussen deze twee instellingen, moet Riot uw account opnieuw synchroniseren.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Indien de andere versie van Riot nog in een ander tabblad is geopend, sluit u dit beter, want Riot op dezelfde host gelijktijdig met lui laden ingeschakeld en uitgeschakeld gebruiken zal voor problemen zorgen.",
+    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Indien de andere versie van Riot nog open staat in een ander tabblad kunt u dat beter sluiten, want het geeft problemen als Riot op dezelfde host gelijktijdig met lui laden ingeschakeld en uitgeschakeld draait.",
     "Incompatible local cache": "Incompatibele lokale cache",
     "Clear cache and resync": "Cache wissen en hersynchroniseren",
     "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot verbruikt nu 3-5x minder geheugen, door informatie over andere gebruikers enkel te laden wanneer nodig. Even geduld, we hersynchroniseren met de server!",
@@ -1583,7 +1583,7 @@
     "The room upgrade could not be completed": "De gespreksactualisering kon niet voltooid worden",
     "Upgrade this room to version %(version)s": "Actualiseer dit gesprek naar versie %(version)s",
     "Upgrade Room Version": "Gespreksversie actualiseren",
-    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Dit gesprek actualiseren zal de huidige instantie van het gesprek sluiten en er een nieuw gesprek voor in de plaats aanmaken. Om gespreksleden de best mogelijke ervaring te bieden, zullen we:",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Actualisatie van dit gesprek zal de huidige versie ervan sluiten, en in plaats daarvan een nieuw gesprek aanmaken.  Om dit voor de deelnemers zo vlot mogelijk te laten verlopen zullen we:",
     "Create a new room with the same name, description and avatar": "Een nieuw gesprek aanmaken met dezelfde naam, beschrijving en avatar",
     "Update any local room aliases to point to the new room": "Alle lokale gespreksbijnamen bijwerken om naar het nieuwe gesprek te verwijzen",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Gebruikers verhinderen van te praten in de oude versie van het gesprek, en er een bericht in plaatsen waarin de gebruikers worden aanbevolen zich naar het nieuwe gesprek te begeven",
@@ -1753,9 +1753,9 @@
     "Enable audible notifications for this device": "Geluidsmeldingen inschakelen voor dit apparaat",
     "Upgrade this room to the recommended room version": "Actualiseer dit gesprek naar de aanbevolen gespreksversie",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek draait op groepsgespreksversie <roomVersion />, die door deze thuisserver als <i>onstabiel</i> is gemarkeerd.",
-    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Dit gesprek actualiseren zal de huidige instantie van het gesprek sluiten, en een geactualiseerde versie onder dezelfde naam aanmaken.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Het actualiseren van dit gesprek zal de huidige versie ervan sluiten, en een geactualiseerde versie onder dezelfde naam aanmaken.",
     "Failed to revoke invite": "Intrekken van uitnodiging is mislukt",
-    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kon de uitnodiging niet intrekken. De server ondervindt mogelijk een tijdelijk probleem, of u heeft onvoldoende rechten om de uitnodiging in te trekken.",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kon de uitnodiging niet intrekken. De server ondervindt mogelijk een tijdelijk probleem, of u heeft niet het recht de uitnodiging in te trekken.",
     "Revoke invite": "Uitnodiging intrekken",
     "Invited by %(sender)s": "Uitgenodigd door %(sender)s",
     "Maximize apps": "Apps maximaliseren",
@@ -1770,8 +1770,8 @@
     "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot kon de protocollijst niet ophalen van de thuisserver. Mogelijk is de thuisserver te oud om derdepartijnetwerken te ondersteunen.",
     "Riot failed to get the public room list.": "Riot kon de lijst met openbare gesprekken niet verkrijgen.",
     "The homeserver may be unavailable or overloaded.": "De thuisserver is mogelijk onbereikbaar of overbelast.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "U heeft %(count)s ongelezen meldingen in een voorgaande versie van dit gesprek.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "U heeft %(count)s ongelezen melding in een voorgaande versie van dit gesprek.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "U heeft %(count)s ongelezen meldingen in een eerdere versie van dit gesprek.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "U heeft %(count)s ongelezen melding in een eerdere versie van dit gesprek.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Of u de 'broodkruimels'-functie al dan niet gebruikt (avatars boven de gesprekslijst)",
     "Replying With Files": "Beantwoorden met bestanden",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Momenteel is het niet mogelijk om met een bestand te antwoorden. Wilt u dit bestand uploaden zonder te antwoorden?",
@@ -1781,7 +1781,7 @@
     "Rotate clockwise": "Met de klok mee draaien",
     "GitHub issue": "GitHub-melding",
     "Notes": "Opmerkingen",
-    "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.": "Indien er extra context zou kunnen helpen om het probleem te analyseren, zoals wat u aan het doen was, relevante gespreks-ID’s, gebruikers-ID’s, enz., gelieve deze informatie dan hier mee te geven.",
+    "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.": "Indien extra context zou kunnen helpen het probleem te analyseren (wat u aan het doen was, relevante gespreks-ID’s, gebruikers-ID’s, enz.), gelieve deze informatie dan hier mee te geven.",
     "Sign out and remove encryption keys?": "Afmelden en versleutelingssleutels verwijderen?",
     "To help us prevent this in future, please <a>send us logs</a>.": "Gelieve <a>ons logboeken te sturen</a> om dit in de toekomst te helpen voorkomen.",
     "Missing session data": "Sessiegegevens ontbreken",
@@ -1801,7 +1801,7 @@
     "The server does not support the room version specified.": "De server ondersteunt deze versie van gesprekken niet.",
     "Name or Matrix ID": "Naam of Matrix-ID",
     "Email, name or Matrix ID": "E-mailadres, naam, of matrix-ID",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Bevestig dat u dit gesprek van <oldVersion /> wilt opwaarderen naar <newVersion />.",
+    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Bevestig dat u dit gesprek van <oldVersion /> wilt actualiseren tot <newVersion />.",
     "Changes your avatar in this current room only": "Verandert uw avatar enkel in het huidige gesprek",
     "Unbans user with given ID": "Ontbant de gebruiker met de gegeven ID",
     "Sends the given message coloured as a rainbow": "Verstuurt het gegeven bericht in regenboogkleuren",
@@ -1813,7 +1813,7 @@
     "React to messages with emoji (refresh to apply changes)": "Reageer op berichten met emoticons (vernieuw om de wijzigingen toe te passen)",
     "Show hidden events in timeline": "Verborgen gebeurtenissen op de tijdslijn weergeven",
     "When rooms are upgraded": "Wanneer gesprekken opgewaardeerd worden",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Dit apparaat <b>maakt geen back-up van uw sleutels</b>, maar u heeft wel een bestaande back-up die u kunt herstellen, en waaraan u vanaf dan nieuwe sleutels kunt toevoegen.",
+    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Dit apparaat <b>maakt geen back-up van uw sleutels</b>, maar u heeft wel een bestaande back-up die u kunt herstellen, en waaraan u vervolgens nieuwe sleutels kunt toevoegen.",
     "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Verbind dit apparaat met de sleutelback-up vooraleer u zich afmeldt om sleutels die zich enkel op dit apparaat bevinden niet te verliezen.",
     "Connect this device to Key Backup": "Dit apparaat verbinden met sleutelback-up",
     "Backup has an <validity>invalid</validity> signature from this device": "De back-up heeft een <validity>ongeldige</validity> ondertekening van dit apparaat",
@@ -1839,10 +1839,10 @@
     "This invite to %(roomName)s wasn't sent to your account": "Deze uitnodiging voor %(roomName)s is niet naar uw account verstuurd",
     "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Meld u aan met een andere account, vraag om een nieuwe uitnodiging, of voeg het e-mailadres %(email)s aan deze account toe.",
     "Do you want to chat with %(user)s?": "Wilt u een gesprek beginnen met %(user)s?",
-    "Do you want to join %(roomName)s?": "Wilt u %(roomName)s toetreden?",
+    "Do you want to join %(roomName)s?": "Wilt u tot %(roomName)s toetreden?",
     "<userName/> invited you": "<userName/> heeft u uitgenodigd",
     "You're previewing %(roomName)s. Want to join it?": "U bekijkt %(roomName)s. Wilt u eraan deelnemen?",
-    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan niet bekeken worden. Wilt u eraan deelnemen?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan niet vooraf bekeken worden. Wilt u eraan deelnemen?",
     "This room doesn't exist. Are you sure you're at the right place?": "Dit gesprek bestaat niet. Weet u zeker dat u zich op de juiste plaats bevindt?",
     "Try again later, or ask a room admin to check if you have access.": "Probeer het later opnieuw, of vraag een gespreksbeheerder om te controleren of u wel toegang heeft.",
     "%(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>.": "De foutcode %(errcode)s is weergegeven bij het toetreden van het gesprek. Als u meent dat u dit bericht foutief te zien krijgt, gelieve dan <issueLink>een foutmelding in te dienen</issueLink>.",
@@ -1850,7 +1850,7 @@
     "Agree or Disagree": "Akkoord of niet akkoord",
     "Like or Dislike": "Duim omhoog of omlaag",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>heeft gereageerd met %(shortName)s</reactedWith>",
-    "Edited at %(date)s": "Bewerkt op %(date)s",
+    "Edited at %(date)s": "Bewerkt om %(date)s",
     "edited": "bewerkt",
     "Rotate Left": "Links draaien",
     "Rotate Right": "Rechts draaien",
@@ -1892,5 +1892,11 @@
     "Notification sound": "Meldingsgeluid",
     "Reset": "Opnieuw instellen",
     "Set a new custom sound": "Stel een nieuw aangepast geluid in",
-    "Browse": "Bladeren"
+    "Browse": "Bladeren",
+    "Cannot reach homeserver": "Kan thuisserver niet bereiken",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Zorg dat u een stabiele internetverbinding heeft, of neem contact op met de systeembeheerder",
+    "Your Riot is misconfigured": "Uw Riot is verkeerd geconfigureerd",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Vraag uw Riot-beheerder om <a>uw configuratie</a> na te kijken op onjuiste of duplicate items.",
+    "Unexpected error resolving identity server configuration": "Onverwachte fout bij het oplossen van de identiteitsserverconfiguratie",
+    "Use lowercase letters, numbers, dashes and underscores only": "Gebruik enkel letters, cijfers, streepjes en underscores"
 }
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 0089651ee8..77a058a048 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -934,7 +934,7 @@
     "Failed to copy": "Kopiowanie nieudane",
     "Message removed by %(userId)s": "Wiadomość usunięta przez %(userId)s",
     "Message removed": "Wiadomość usunięta",
-    "An email has been sent to %(emailAddress)s": "Email został wysłany do %(emailAddress)s",
+    "An email has been sent to %(emailAddress)s": "E-mail został wysłany do %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Wysłano wiadomość tekstową do %(msisdn)s",
     "Code": "Kod",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</UsageDataLink>. Spowoduje to użycie pliku cookie (zobacz naszą <PolicyLink>Politykę plików cookie</PolicyLink>).",
@@ -1129,7 +1129,7 @@
     "Demote": "Zdegraduj",
     "Hide Stickers": "Ukryj Naklejki",
     "Show Stickers": "Pokaż Naklejki",
-    "The email field must not be blank.": "Pole email nie może być puste.",
+    "The email field must not be blank.": "Pole e-mail nie może być puste.",
     "The user name field must not be blank.": "Pole nazwy użytkownika nie może być puste.",
     "The phone number field must not be blank.": "Pole numeru telefonu nie może być puste.",
     "The password field must not be blank.": "Pole hasła nie może być puste.",
@@ -1398,7 +1398,7 @@
     "Phone Number": "Numer telefonu",
     "Display Name": "Wyświetlana nazwa",
     "Set a new account password...": "Ustaw nowe hasło do konta…",
-    "Email addresses": "Adresy E-mail",
+    "Email addresses": "Adresy e-mail",
     "Phone numbers": "Numery telefonów",
     "Language and region": "Język i region",
     "Theme": "Motyw",
@@ -1413,10 +1413,10 @@
     "Change room avatar": "Zmień awatar pokoju",
     "Change room name": "Zmień nazwę pokoju",
     "Change permissions": "Zmieniać uprawnienia",
-    "Change topic": "Zmieniać temat",
+    "Change topic": "Zmienianie tematu",
     "Default role": "Domyślna rola",
     "Send messages": "Wysyłanie wiadomości",
-    "Change settings": "Zmieniać ustawienia",
+    "Change settings": "Zmienianie ustawień",
     "Remove messages": "Usuwanie wiadomości",
     "Notify everyone": "Powiadamianie wszystkich",
     "Roles & Permissions": "Role i uprawnienia",
@@ -1454,5 +1454,12 @@
     "Restore from Backup": "Przywróć z kopii zapasowej",
     "Deactivating your account is a permanent action - be careful!": "Dezaktywacja konta jest czynnością nieodwracalną — uważaj!",
     "Key backup": "Kopia zapasowa klucza",
-    "Unable to restore backup": "Przywrócenie kopii zapasowej jest niemożliwe"
+    "Unable to restore backup": "Przywrócenie kopii zapasowej jest niemożliwe",
+    "Email Address": "Adres e-mail",
+    "Room version": "Wersja pokoju",
+    "Room version:": "Wersja pokoju:",
+    "Developer options": "Opcje programistyczne",
+    "Change main address for the room": "Zmienianie głównego adresu pokoju",
+    "Modify widgets": "Modyfikowanie widżetów",
+    "Invite users": "Zapraszanie użytkowników"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e0e67210d2..7a873c5210 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1531,7 +1531,7 @@
     "Pin": "Кнопка",
     "Your homeserver does not support device management.": "Ваш сервер не поддерживает управление устройством.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Выполняется резервная копия ключей  (первый раз это может занять несколько минут).",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Размер файла \"%(fileName)s\" превышает лимит загрузок текущего сервера",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Размер файла '%(fileName)s' превышает разрешённый предел для текущего сервера",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения",
     "Changes your display nickname in the current room only": "Изменяет ваш псевдоним только для текущей комнаты",
     "Gets or sets the room topic": "Читает или устанавливает тему комнаты",
@@ -1596,7 +1596,7 @@
     "Room Settings - %(roomName)s": "Настройки комнаты - %(roomName)s",
     "A username can only contain lower case letters, numbers and '=_-./'": "Имя пользователя может содержать только буквы нижнего регистра, цифры и знаки  '=_-./'",
     "Composer": "Редактор",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Используете ли вы функцию \"хлебные крошки\" (аватары над списком комнат) или нет.",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Используете ли вы функцию \"хлебные крошки\" (аватары над списком комнат) или нет",
     "A conference call could not be started because the integrations server is not available": "Конференц-вызов не может быть запущен, так как сервер интеграции недоступен",
     "Replying With Files": "Ответ файлами",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "В настоящее время нет возможности ответить файлом. Хотели бы вы загрузить этот файл без ответа?",
@@ -1656,7 +1656,7 @@
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s включено для %(newGroups)s и отключено для %(oldGroups)s в этой комнате.",
     "Once enabled, encryption cannot be disabled.": "После включения шифрование не может быть отключено.",
     "Some devices for this user are not trusted": "Некоторые устройства для этого пользователя не являются доверенными",
-    "Some devices in this encrypted room are not trusted": "Некоторые устройства в этой зашифрованной комнате не являются доверенными",
+    "Some devices in this encrypted room are not trusted": "Некоторые устройства в этой зашифрованной комнате являются недоверенными",
     "All devices for this user are trusted": "Все устройства для этого пользователя являются доверенными",
     "All devices in this encrypted room are trusted": "Все устройства в этой зашифрованной комнате являются доверенными",
     "inline-code": "встроенный код",
@@ -1824,7 +1824,7 @@
     "Want more than a community? <a>Get your own server</a>": "Хотите больше, чем просто сообщество? <a>Получите свой собственный сервер</a>",
     "This homeserver does not support communities": "Этот сервер не поддерживает сообщества",
     "You are logged in to another account": "Вы вошли в другой аккаунт",
-    "Thank you for verifying your email! The account you're logged into here (%(sessionUserId)s) appears to be different from the account you've verified an email for (%(verifiedUserId)s). If you would like to log in to %(verifiedUserId2)s, please log out first.": "Спасибо за подтверждение вашей электронной почты! Учетная запись, в которую вы вошли здесь (%(sessionUserId)s), похоже отличается от учетной записи, для которой вы подтвердили адрес электронной почты (%(VerifiedUserId)s). Если вы хотите войти в %(VerifiedUserId2)s, сначала выйдите из системы.",
+    "Thank you for verifying your email! The account you're logged into here (%(sessionUserId)s) appears to be different from the account you've verified an email for (%(verifiedUserId)s). If you would like to log in to %(verifiedUserId2)s, please log out first.": "Спасибо за подтверждение вашей электронной почты! Учетная запись, в которую вы вошли (%(sessionUserId)s), похоже отличается от учетной записи, для которой вы подтвердили адрес электронной почты (%(VerifiedUserId)s). Если вы хотите войти в %(VerifiedUserId2)s, сначала выйдите из системы.",
     "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot не смог получить список протоколов с сервера.Сервер может быть слишком старым для поддержки сетей сторонних производителей.",
     "Riot failed to get the public room list.": "Riot не смог получить список публичных комнат.",
     "The homeserver may be unavailable or overloaded.": "Сервер может быть недоступен или перегружен.",
@@ -1878,7 +1878,7 @@
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Как сеть безопасности, вы можете использовать ее для восстановления истории зашифрованных сообщений, если вы забыли свой пароль восстановления.",
     "As a safety net, you can use it to restore your encrypted message history.": "Как сеть безопасности, вы можете использовать ее для восстановления истории зашифрованных сообщений.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Ключ восстановления - это сеть безопасности, с помощью которой можно восстановить доступ к зашифрованным сообщениям, если вы забудете пароль.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Храните ключ восстановления в надежном месте, например в менеджере паролей (или в сейфе).",
+    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Храните ключ восстановления в надежном месте, например в менеджере паролей (или в сейфе)",
     "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Ваш ключ восстановления <b>скопирован в буфер обмена</b>, вставьте его в:",
     "Your Recovery Key is in your <b>Downloads</b> folder.": "Ваш ключ восстановления находится в папке <b>Загрузки</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Распечатайте его</b> и храните в безопасном месте",
@@ -1894,5 +1894,11 @@
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не установили новый метод восстановления, злоумышленник может попытаться получить доступ к вашей учетной записи. Измените пароль учетной записи и сразу установите новый способ восстановления в настройках.",
     "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Это устройство обнаружило, что ваш пароль восстановления и ключ для безопасных сообщений были удалены.",
     "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Если вы сделали это случайно, вы можете настроить безопасные сообщения на этом устройстве, которые будут повторно зашифровать историю сообщений этого устройства с новым методом восстановления.",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не удалили метод восстановления, злоумышленник может попытаться получить доступ к вашей учетной записи. Измените пароль учетной записи и сразу установите новый способ восстановления в настройках."
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не удалили метод восстановления, злоумышленник может попытаться получить доступ к вашей учетной записи. Измените пароль учетной записи и сразу установите новый способ восстановления в настройках.",
+    "Cannot reach homeserver": "Не удается связаться с сервером",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Убедитесь, что у вас есть стабильное подключение к интернету, или свяжитесь с администратором сервера",
+    "Your Riot is misconfigured": "Твой Riot неправильно настроен",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Попросите администратора Riot проверить <a>конфигурационный файл</a > на наличие неправильных или повторяющихся записей.",
+    "Unexpected error resolving identity server configuration": "Неопределённая ошибка при разборе опции сервера идентификации",
+    "Use lowercase letters, numbers, dashes and underscores only": "Используйте только строчные буквы, цифры, тире и подчеркивания"
 }
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index b0f59d42e2..6a57569025 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1947,5 +1947,11 @@
     "Sounds": "Tinguj",
     "Notification sound": "Tingull njoftimi",
     "Set a new custom sound": "Caktoni një tingull të ri vetjak",
-    "Browse": "Shfletoni"
+    "Browse": "Shfletoni",
+    "Cannot reach homeserver": "S’kapet dot shërbyesi Home",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Sigurohuni se keni një lidhje të qëndrueshme internet, ose lidhuni me përgjegjësin e shërbyesit",
+    "Your Riot is misconfigured": "Riot-i juaj është i keqformësuar",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Kërkojini përgjegjësit të Riot-it tuaj të kontrollojë <a>formësimin tuaj</a> për zëra të pasaktë ose të përsëdytur.",
+    "Unexpected error resolving identity server configuration": "Gabim i papritur teksa ftillohej  formësimi i shërbyesit të identiteteve",
+    "Use lowercase letters, numbers, dashes and underscores only": "Përdorni vetëm shkronja të vogla, numra, vija ndarëse dhe nënvija"
 }
diff --git a/src/i18n/strings/vls.json b/src/i18n/strings/vls.json
index decbd892fa..b06f5b9fdd 100644
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -4,7 +4,7 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Kostege ’t e-mailadresse nie verifieern: zorgt dervoor da je de koppelienge in den e-mail èt angeklikt",
     "The platform you're on": "’t Platform wuk da je gebruukt",
     "The version of Riot.im": "De versie van Riot.im",
-    "Whether or not you're logged in (we don't record your username)": "Of da je al dan nie angemeld zyt (we sloan je gebruikersnoame nie ip)",
+    "Whether or not you're logged in (we don't record your username)": "Of da je al dan nie angemeld zyt (we sloan je gebruukersnoame nie ip)",
     "Your language of choice": "De deur joun gekoozn toale",
     "Which officially provided instance you are using, if any": "Welke officieel angeboodn instantie da je eventueel gebruukt",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Of da je den tekstverwerker al of nie in de modus voor ipgemakte tekst gebruukt",
@@ -28,7 +28,7 @@
     "Answer": "Beantwoordn",
     "Call Timeout": "Iproeptime-out",
     "The remote side failed to pick up": "Den andere kant èt nie ipgepakt",
-    "Unable to capture screen": "Kun geen schermafdruk moakn",
+    "Unable to capture screen": "Kostege geen schermafdruk moakn",
     "Existing Call": "Bestoanden iproep",
     "You are already in a call.": "Je zyt al in gesprek.",
     "VoIP is unsupported": "VoIP wor nie oundersteund",
@@ -78,7 +78,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s, %(time)s",
     "Who would you like to add to this community?": "Wien wil je toevoegn an deze gemeenschap?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Let ip: iedere persoon da je toevoegt aan e gemeenschap goat publiek zichtboar zyn voor iedereen da de gemeenschaps-ID kent",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Let ip: iedere persoon da je toevoegt an e gemeenschap goa publiek zichtboar zyn voor iedereen da de gemeenschaps-ID kent",
     "Invite new community members": "Nodigt nieuwe gemeenschapsleedn uut",
     "Name or Matrix ID": "Noame of Matrix-ID",
     "Invite to Community": "Uutnodign in gemeenschap",
@@ -93,7 +93,7 @@
     "Failed to add the following rooms to %(groupId)s:": "Toevoegn van volgende gesprekkn an %(groupId)s es mislukt:",
     "Unnamed Room": "Noamloos gesprek",
     "Error": "Foute",
-    "Unable to load! Check your network connectivity and try again.": "Laadn mislukt! Controleert je netwerktoegang en herprobeer ’t e ki.",
+    "Unable to load! Check your network connectivity and try again.": "Loadn mislukt! Controleer je netwerktoegang en herprobeer ’t e ki.",
     "Dismiss": "Afwyzn",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot èt geen toestemmienge vo je meldiengn te verstuurn - controleert je browserinstelliengn",
     "Riot was not given permission to send notifications - please try again": "Riot èt geen toestemmienge gekreegn ghed vo joun meldiengn te verstuurn - herprobeer ’t e ki",
@@ -139,8 +139,8 @@
     "Upgrades a room to a new version": "Actualiseert ’t gesprek tout e nieuwe versie",
     "Room upgrade confirmation": "Bevestigienge vo ’t gesprek te actualiseern",
     "Upgrading a room can be destructive and isn't always necessary.": "’t Ipwoardeern van e gesprek es meuglik destructief en is nie assan noodzoakelik.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Gespreksipwoarderiengn wordn meestal anbevooln wanneer da der een bepaalde groepsgespreksversie als <i>ounstabiel</i> wor beschouwd. Ounstabiele groepsgespreksversies bevatten meuglik fouten of beveiligingsprobleemn, of beschikkn nie over alle functies.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Gespreksipwoarderiengn beïnvloedn meestal enkel de verwerkienge van ’t gesprek <i>an serverzyde</i>. Indien da je probleemn zoudt oundervindn me je Riot-cliënt, gelieve dit ton te meldn ip <issueLink />.",
+    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Gespreksipwoarderiengn wordn meestal anbevooln wanneer da der e bepoalde groepsgespreksversie als <i>ounstabiel</i> wor beschouwd. Ounstabiele groepsgespreksversies bevattn meuglik fouten of beveiligiengsprobleemn, of beschikkn nie over alle functies.",
+    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Gespreksipwoarderiengn beïnvloedn meestal enkel de verwerkienge van ’t gesprek <i>an serverzyde</i>. Indien da je probleemn zoudt ounderviendn me je Riot-cliënt, gelieve dit ton te meldn ip <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Let ip</b>: ’t ipwoardeern van e gesprek goa <i>gespreksleedn nie automatisch verplatsn noa de nieuwe versie van ’t gesprek</i>. We goan e koppelienge noa ’t nieuw gesprek in d’oude versie van ’t gesprek platsn - gespreksleedn goan ton ip deze koppeliengen moetn klikkn vo ’t nieuw gesprek toe te treedn.",
     "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Bevestigt da je dit gesprek van <oldVersion /> wilt ipwoardeern noa <newVersion />.",
     "Upgrade": "Actualiseern",
@@ -153,12 +153,12 @@
     "Sets the room name": "Stelt de gespreksnoame in",
     "Invites user with given id to current room": "Nodigt de gebruuker me de gegeevn ID uut in ’t huudig gesprek",
     "Joins room with given alias": "Treedt tout ’t gesprek toe me de gegeevn bynoame",
-    "Leave room": "Gesprek verloatn",
+    "Leave room": "Deuregoan uut ’t gesprek",
     "Unrecognised room alias:": "Ounbekende gespreksbynoame:",
     "Kicks user with given id": "Stuurt de gebruuker me de gegeevn ID uut ’t gesprek",
     "Bans user with given id": "Verbant de gebruuker me de gegeevn ID",
     "Unbans user with given ID": "Ountbant de gebruuker me de gegeevn ID",
-    "Ignores a user, hiding their messages from you": "Negeert e gebruiker, woadeure dan de berichtn dervan ounzichtboar vo je wordn",
+    "Ignores a user, hiding their messages from you": "Negeert e gebruuker, woadeure dan de berichtn dervan ounzichtboar vo je wordn",
     "Ignored user": "Genegeerde gebruuker",
     "You are now ignoring %(userId)s": "Je negeert nu %(userId)s",
     "Stops ignoring a user, showing their messages going forward": "Stopt ’t negeern van e gebruuker, hierdeure wordn de berichtn van de gebruuker were zichtboar",
@@ -168,7 +168,7 @@
     "Deops user with given id": "Ountmachtigt de gebruuker me de gegeevn ID",
     "Opens the Developer Tools dialog": "Opent ’t dialoogvenster me ’t ountwikkeloarsgereedschap",
     "Adds a custom widget by URL to the room": "Voegt met een URL een angepaste widget toe an ’t gesprek",
-    "Please supply a https:// or http:// widget URL": "Geeft een https://- of http://-widget-URL in",
+    "Please supply a https:// or http:// widget URL": "Gift een https://- of http://-widget-URL in",
     "You cannot modify widgets in this room.": "J’en kut de widgets in dit gesprek nie anpassn.",
     "Verifies a user, device, and pubkey tuple": "Verifieert e combinoatie van gebruuker, toestel en publieke sleuter",
     "Unknown (user, device) pair:": "Ounbekend poar (gebruuker, toestel):",
@@ -176,8 +176,8 @@
     "WARNING: Device already verified, but keys do NOT MATCH!": "LET IP: toestel es al geverifieerd gewist, moa de sleuters KOMMN NIE OVEREEN!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "LET IP: SLEUTERVERIFICOATIE ES MISLUKT! Den oundertekende sleuter vo %(userId)s en toestel %(deviceId)s is ‘%(fprint)s’, wuk da nie overeenkomt me de verschafte sleuter ‘%(fingerprint)s’. Dit zou kunn betekenn da je communicoatie ounderschept wordt!",
     "Verified key": "Geverifieerde sleuter",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "De versleuteliengssleuter da j’è verstrekt komt overeen me de versleuteliengssleuter da j’ountvangen èt van ’t toestel %(deviceId)s van %(userId)s. ’t Toestel es gemarkeerd als geverifieerd.",
-    "Displays action": "Geeft actie weer",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "De versleuteriengssleuter da j’è verstrekt komt overeen me de versleuteriengssleuter da j’ountvangen èt van ’t toestel %(deviceId)s van %(userId)s. ’t Toestel es gemarkeerd als geverifieerd.",
+    "Displays action": "Toogt actie",
     "Forces the current outbound group session in an encrypted room to be discarded": "Forceert de huudige uutwoartsche groepssessie in e versleuterd gesprek vo verworpn te wordn",
     "Sends the given message coloured as a rainbow": "Verstuurt ’t gegeevn bericht in regenboogkleurn",
     "Sends the given emote coloured as a rainbow": "Verstuurt de gegeevn emoticon in regenboogkleurn",
@@ -198,7 +198,7 @@
     "%(targetName)s joined the room.": "%(targetName)s es tout ’t gesprek toegetreedn.",
     "VoIP conference finished.": "VoIP-vergadering beëindigd.",
     "%(targetName)s rejected the invitation.": "%(targetName)s èt d’uutnodigienge geweigerd.",
-    "%(targetName)s left the room.": "%(targetName)s èt ’t gesprek verloatn.",
+    "%(targetName)s left the room.": "%(targetName)s is uut ’t gesprek deuregegoan.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s èt %(targetName)s ountbann.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s èt %(targetName)s ’t gesprek uutgestuurd.",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s èt d’uutnodigienge van %(targetName)s ingetrokkn.",
@@ -242,7 +242,7 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s van %(fromPowerLevel)s noa %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s èt ’t machtsniveau van %(powerLevelDiffText)s gewyzigd.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s èt de vastgeprikte boodschappn vo ’t gesprek gewyzigd.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget aangepast gewist deur %(senderName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget angepast gewist deur %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget toegevoegd gewist deur %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget verwyderd gewist deur %(senderName)s",
     "%(displayName)s is typing …": "%(displayName)s es an ’t typn…",
@@ -254,13 +254,13 @@
     "This homeserver has hit its Monthly Active User limit.": "Dezen thuusserver èt z’n limiet vo moandeliks actieve gebruukers bereikt.",
     "This homeserver has exceeded one of its resource limits.": "Dezen thuusserver èt één van z’n systeembronlimietn overschreedn.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Gelieve <a>contact ip te neemn me je systeembeheerder</a> vo deze dienst te bluuvn gebruukn.",
-    "Unable to connect to Homeserver. Retrying...": "Kostege geen verbindienge me den thuusserver moakn. Nieuwe poging…",
+    "Unable to connect to Homeserver. Retrying...": "Kostege geen verbindienge me den thuusserver moakn. Nieuwe pogienge…",
     "%(items)s and %(count)s others|other": "%(items)s en %(count)s andere",
     "%(items)s and %(count)s others|one": "%(items)s en één ander",
     "%(items)s and %(lastItem)s": "%(items)s en %(lastItem)s",
     "Your browser does not support the required cryptography extensions": "Je browser oundersteunt de benodigde cryptografie-extensies nie",
     "Not a valid Riot keyfile": "Geen geldig Riot-sleuterbestand",
-    "Authentication check failed: incorrect password?": "Anmeldiengscontrole mislukt: onjust wachtwoord?",
+    "Authentication check failed: incorrect password?": "Anmeldiengscontrole mislukt: verkeerd paswoord?",
     "Unrecognised address": "Adresse nie herkend",
     "You do not have permission to invite people to this room.": "J’en èt geen toestemmienge vo menschn in dit gesprek uut te nodign.",
     "User %(userId)s is already in the room": "De gebruuker %(userId)s is al anwezig",
@@ -287,12 +287,12 @@
     "Sequences like abc or 6543 are easy to guess": "Riksjes lyk ‘abc’ of ‘6543’ zyn gemakkelik te roadn",
     "Recent years are easy to guess": "Recente joartalln zyn gemakkelik te roadn",
     "Dates are often easy to guess": "Data zyn dikkers gemakkelik te roadn",
-    "This is a top-10 common password": "Dit zit in de top 10 van meestgebruukte wachtwoordn",
-    "This is a top-100 common password": "Dit zit in de top 100 van meestgebruukte wachtwoordn",
-    "This is a very common password": "Dit es e veelgebruukt wachtwoord",
-    "This is similar to a commonly used password": "Dit gelykt sterk ip e veelgebruukt wachtwoord",
+    "This is a top-10 common password": "Dit zit in de top 10 van meestgebruukte paswoordn",
+    "This is a top-100 common password": "Dit zit in de top 100 van meestgebruukte paswoordn",
+    "This is a very common password": "Dit es e veelgebruukt paswoord",
+    "This is similar to a commonly used password": "Dit gelykt sterk ip e veelgebruukt paswoord",
     "A word by itself is easy to guess": "Eén enkel woord is vree gemakkelik te roadn",
-    "Names and surnames by themselves are easy to guess": "Een alleenstaande voor- of achternoame es gemakkelik te roadn",
+    "Names and surnames by themselves are easy to guess": "Een alleenstoande voor- of achternoame es gemakkelik te roadn",
     "Common names and surnames are easy to guess": "Voor- en achternoamn zyn gemakkelik te roadn",
     "Straight rows of keys are easy to guess": "Zulk’n aneengeslootn riksje toetsn es gemakkelik te roadn",
     "Short keyboard patterns are easy to guess": "Korte patroonn ip ’t toetsenbord wordn gemakkelik geroadn",
@@ -303,8 +303,8 @@
     "Message Pinning": "Bericht vastprikkn",
     "Custom user status messages": "Angepaste gebruukersstatusberichtn",
     "Show recent room avatars above the room list": "Recente gespreksavatars weergeven boven de gesprekslijst",
-    "Group & filter rooms by custom tags (refresh to apply changes)": "Gesprekkn groepeern en filtern volgens eigen labels (herlaadt vo de veranderienge te zien)",
-    "Render simple counters in room header": "Eenvoudige tellers bovenaan ’t gesprek toogn",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Gesprekkn groepeern en filtern volgens eigen labels (herloadt vo de veranderienge te zien)",
+    "Render simple counters in room header": "Eenvoudige tellers boovnan ’t gesprek toogn",
     "Edit messages after they have been sent (refresh to apply changes)": "Bewerkt berichtn achter dan ze al verstuurd gewist zyn (vernieuwt vo de wyzigiengn toe te passn)",
     "React to messages with emoji (refresh to apply changes)": "Reageert ip berichtn met emoticons (vernieuwt vo de wyzigiengn toe te passn)",
     "Enable Emoji suggestions while typing": "Emoticons voorstelln binst ’t typn",
@@ -318,13 +318,13 @@
     "Always show message timestamps": "Assan de tydstempels van berichtn toogn",
     "Autoplay GIFs and videos": "GIF’s en filmtjes automatisch afspeeln",
     "Always show encryption icons": "Versleuteriengspictogrammn assan toogn",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Herinnerienge toogn vo veilig berichtherstel in te schakeln in versleuterde gesprekkn",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Herinnerienge toogn vo veilig berichtherstel in te schoakeln in versleuterde gesprekkn",
     "Enable automatic language detection for syntax highlighting": "Automatische toaldetectie vo zinsbouwmarkeriengn inschoakeln",
     "Show avatars in user and room mentions": "Avatars toogn wanneer da gebruukers of gesprekkn vermeld wordn",
     "Enable big emoji in chat": "Grote emoticons in gesprekkn inschoakeln",
     "Send typing notifications": "Typmeldiengn verstuurn",
     "Automatically replace plain text Emoji": "Tekst automatisch vervangn deur emoticons",
-    "Mirror local video feed": "Lokale videoaanvoer ook elders ipslaan (spiegeln)",
+    "Mirror local video feed": "Lokoale videoanvoer ook elders ipsloan (spiegeln)",
     "Enable Community Filter Panel": "Gemeenschapsfilterpaneel inschoakeln",
     "Allow Peer-to-Peer for 1:1 calls": "Peer-to-peer toeloatn voor twigesprekkn",
     "Send analytics data": "Statistische gegeevns (analytics) verstuurn",
@@ -335,7 +335,7 @@
     "Enable URL previews by default for participants in this room": "URL-voorvertoniengn standoard vo de gebruukers in dit gesprek inschoakeln",
     "Room Colour": "Gesprekskleur",
     "Enable widget screenshots on supported widgets": "Widget-schermafdrukkn inschoakeln ip oundersteunde widgets",
-    "Prompt before sending invites to potentially invalid matrix IDs": "Bevestigienge vroagn voda uitnodigiengn noar meuglik oungeldige Matrix-ID’s worden verstuurd",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Bevestigienge vroagn voda uutnodigiengn noar meuglik oungeldige Matrix-ID’s wordn verstuurd",
     "Show developer tools": "Ontwikkeliengsgereedschap toogn",
     "Order rooms in the room list by most important first instead of most recent": "Gesprekkn in de gesprekslyste sorteern ip belang in plekke van latste gebruuk",
     "Show hidden events in timeline": "Verborgn gebeurtenissn ip de tydslyn weregeevn",
@@ -370,8 +370,8 @@
     "Got It": "’k Snappen ’t",
     "Verify this user by confirming the following emoji appear on their screen.": "Verifieert deze gebruuker deur te bevestign da zyn/heur scherm de volgende emoji toogt.",
     "Verify this user by confirming the following number appears on their screen.": "Verifieert deze gebruuker deur te bevestign da zyn/heur scherm ’t volgend getal toogt.",
-    "Unable to find a supported verification method.": "Kan geen oundersteunde verificoatiemethode vindn.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Vo maximoale veiligheid kun je dit best ounder vier oogn, of via een ander vertrouwd communicoatiemedium, doen.",
+    "Unable to find a supported verification method.": "Kan geen oundersteunde verificoatiemethode viendn.",
+    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Vo maximoale veiligheid ku je dit best ounder vier oogn, of via een ander vertrouwd communicoatiemedium, doen.",
     "Dog": "Hound",
     "Cat": "Katte",
     "Lion": "Leeuw",
@@ -439,17 +439,17 @@
     "Failed to upload profile picture!": "Iploaden van profielfoto es mislukt!",
     "Upload new:": "Loadt der e nieuwen ip:",
     "No display name": "Geen weergavenoame",
-    "New passwords don't match": "Nieuwe wachtwoordn kommn nie overeen",
-    "Passwords can't be empty": "Wachtwoordn kunn nie leeg zyn",
+    "New passwords don't match": "Nieuwe paswoordn kommn nie overeen",
+    "Passwords can't be empty": "Paswoordn kunn nie leeg zyn",
     "Warning!": "Let ip!",
-    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "’t Verandern van ’t wachtwoord goa vooralsnog alle sleuters voor eind-tout-eind-versleuterienge ip alle apparaatn herinstelln, woadeure da de versleuterde gespreksgeschiedenisse ounleesboar wordt, tenzy da je eest je gesprekssleuters exporteert en nadien herimporteert. Dit goat in den toekomst verbeterd wordn.",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "’t Verandern van ’t paswoord goa vooralsnog alle sleuters voor eind-tout-eind-versleuterienge ip alle toestelln herinstelln, woadeure da de versleuterde gespreksgeschiedenisse ounleesboar wordt, tenzy da je eest je gesprekssleuters exporteert en nadien herimporteert. Dit goat in den toekomst verbeterd wordn.",
     "Export E2E room keys": "E2E-gesprekssleuters exporteern",
     "Do you want to set an email address?": "Wil je een e-mailadresse instelln?",
-    "Current password": "Huudig wachtwoord",
-    "Password": "Wachtwoord",
-    "New Password": "Nieuw wachtwoord",
-    "Confirm password": "Bevestig ’t wachtwoord",
-    "Change Password": "Wachtwoord verandern",
+    "Current password": "Huudig paswoord",
+    "Password": "Paswoord",
+    "New Password": "Nieuw paswoord",
+    "Confirm password": "Bevestig ’t paswoord",
+    "Change Password": "Paswoord verandern",
     "Your homeserver does not support device management.": "Je thuusserver oundersteunt geen toestelbeheer.",
     "Unable to load device list": "Kan de lyste van toestelln nie loadn",
     "Authentication": "Authenticoatie",
@@ -470,18 +470,18 @@
     "Unable to add email address": "Kostege ’t e-mailadresse nie toevoegn",
     "Unable to verify email address.": "Kostege ’t e-mailadresse nie verifieern.",
     "Add": "Toevoegn",
-    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "M'èn joun een e-mail gestuurd vo jen adresse te verifieern. Gelieve de daarin gegeven aanwyziengn ip te volgn en ton ip de knop hierounder te klikkn.",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "M'èn joun een e-mail gestuurd vo jen adresse te verifieern. Gelieve de doarin gegeven anwyziengn ip te volgn en ton ip de knop hierounder te klikkn.",
     "Email Address": "E-mailadresse",
     "Disable Notifications": "Meldiengn uutschoakeln",
     "Enable Notifications": "Meldiengn inschoakeln",
     "Delete Backup": "Back-up verwydern",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Zy je zeker? Je goa je versleuterde berichtn verliezn a je sleuters nie correct geback-upt zyn.",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Zy je zeker? Je goa je versleuterde berichtn kwytspeeln a je sleuters nie correct geback-upt zyn.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Versleuterde berichtn zyn beveiligd me eind-tout-eind-versleuterienge. Alleene d’ountvanger(s) en gy èn de sleuters vo deze berichtn te leezn.",
     "Unable to load key backup status": "Kostege de sleuterback-upstatus nie loadn",
     "Restore from Backup": "Herstelln uut back-up",
     "This device is backing up your keys. ": "Dit toestel makt een back-up van je sleuters. ",
     "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Dit toestel <b>makt geen back-up van je sleuters</b>, ma j’èt wel een bestoande back-up da je kut herstelln, en da je vanaf ton nieuwe sleuters an kut toevoegn.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Verbindt dit toestel me de sleuterback-up vooraleer da je jen afmeldt vo sleuters die hunder alleene mo ip dit toestel bevindn nie te verliezn.",
+    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Verbindt dit toestel me de sleuterback-up vooraleer da je jen afmeldt vo sleuters die hunder alleene mo ip dit toestel bevindn nie kwyt te speeln.",
     "Connect this device to Key Backup": "Dit toestel verbindn me de sleuterback-up",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s sleuters wordn geback-upt…",
     "All keys backed up": "Alle sleuters zyn geback-upt",
@@ -498,7 +498,7 @@
     "Backup version: ": "Back-upversie: ",
     "Algorithm: ": "Algoritme: ",
     "Your keys are <b>not being backed up from this device</b>.": "Je sleuters wordn <b>nie geback-upt van dit toestel</b>.",
-    "Back up your keys before signing out to avoid losing them.": "Maakt een back-up van je sleuters vooraleer da je jen afmeldt vo ze nie te verliezn.",
+    "Back up your keys before signing out to avoid losing them.": "Makt een back-up van je sleuters vooraleer da je jen afmeldt vo ze nie kwyt te speeln.",
     "Start using Key Backup": "Begint me de sleuterback-up te gebruukn",
     "Error saving email notification preferences": "Foute by ’t ipsloan van de meldingsvoorkeurn voor e-mail",
     "An error occurred whilst saving your email notification preferences.": "’t Es e foute ipgetreedn tydens ’t ipsloan van jen e-mailmeldingsvoorkeurn.",
@@ -538,12 +538,12 @@
     "Display Name": "Weergavenoame",
     "Save": "Ipsloan",
     "Flair": "Badge",
-    "Failed to change password. Is your password correct?": "Wyzign van ’t wachtwoord es mislukt. Es je wachtwoord wel juste?",
-    "Success": "Kloar",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Je wachtwoord es gewyzigd. Je goat ip andere toestelln geen pushmeldiengn nie meer ountvangn toutda je je der ip heraanmeldt",
+    "Failed to change password. Is your password correct?": "Wyzign van ’t paswoord es mislukt. Es je paswoord wel juste?",
+    "Success": "Gereed",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Je paswoord es gewyzigd. Je goat ip andere toestelln geen pushmeldiengn nie meer ountvangn toutda je je der ip heranmeldt",
     "Profile": "Profiel",
     "Account": "Account",
-    "Set a new account password...": "Stelt e nieuw accountwachtwoord in…",
+    "Set a new account password...": "Stelt e nieuw accountpaswoord in…",
     "Email addresses": "E-mailadressn",
     "Phone numbers": "Telefongnumero’s",
     "Language and region": "Toale en regio",
@@ -562,7 +562,7 @@
     "Check for update": "Controleern ip updates",
     "Help & About": "Hulp & Info",
     "Bug reporting": "Foutmeldiengn",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Als j’e foute via GitHub èt ingediend ghed, kunn foutipsporiengslogboekn uus helpn me ’t probleem te vindn. Foutipsporiengslogboekn bevattn gebruuksgegeevns van de toepassienge, woarounder je gebruukersnoame, de ID’s of bynoamn van de gesprekkn en groepn da je bezocht ghed èt, evenals de gebruukersnoamn van andere gebruukers. Ze bevattn geen berichtn.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Als j’e foute via GitHub èt ingediend ghed, kunn foutipsporiengslogboekn uus helpn me ’t probleem te viendn. Foutipsporiengslogboekn bevattn gebruuksgegeevns van de toepassienge, woarounder je gebruukersnoame, de ID’s of bynoamn van de gesprekkn en groepn da je bezocht ghed èt, evenals de gebruukersnoamn van andere gebruukers. Ze bevattn geen berichtn.",
     "Submit debug logs": "Foutipsporiengslogboekn indienn",
     "Clear Cache and Reload": "Cache wissn en herloadn",
     "FAQ": "VGV",
@@ -591,8 +591,8 @@
     "Device key:": "Toestelsleuter:",
     "Ignored users": "Genegeerde gebruukers",
     "Bulk options": "Bulkopties",
-    "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uitnodigiengn anveirdn",
-    "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uitnodigiengn weigern",
+    "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uutnodigiengn anveirdn",
+    "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uutnodigiengn weigern",
     "Key backup": "Sleuterback-up",
     "Security & Privacy": "Veiligheid & privacy",
     "Devices": "Toestelln",
@@ -619,7 +619,7 @@
     "Internal room ID:": "Interne gespreks-ID:",
     "Room version": "Gespreksversie",
     "Room version:": "Gespreksversie:",
-    "Developer options": "Ontwikkelaarsopties",
+    "Developer options": "Ontwikkeloarsopties",
     "Open Devtools": "Ontwikkelgereedschap openn",
     "Room Addresses": "Gespreksadressn",
     "Publish this room to the public in %(domain)s's room directory?": "Dit gesprek openboar moakn in de gesprekscatalogus van %(domain)s?",
@@ -638,7 +638,7 @@
     "Send messages": "Berichtn verstuurn",
     "Invite users": "Gebruukers uutnodign",
     "Change settings": "Instelliengn wyzign",
-    "Kick users": "Gebruukers uit ’t gesprek verwydern",
+    "Kick users": "Gebruukers uut ’t gesprek verwydern",
     "Ban users": "Gebruukers verbann",
     "Remove messages": "Berichtn verwydern",
     "Notify everyone": "Iedereen meldn",
@@ -655,7 +655,7 @@
     "Guests cannot join this room even if explicitly invited.": "Gastn kunn nie tout dit gesprek toetreedn, zelfst nie as ze uutdrukkelik uutgenodigd gewist zyn.",
     "Click here to fix": "Klikt hier vo dit ip te lossen",
     "To link to this room, please add an alias.": "Voegt een bynoame toe vo noa dit gesprek te verwyzn.",
-    "Only people who have been invited": "Alleen menschen dat uutgenodigd gewist zyn",
+    "Only people who have been invited": "Alleen menschn dat uutgenodigd gewist zyn",
     "Anyone who knows the room's link, apart from guests": "Iedereen da de koppelienge van ’t gesprek kent, behalve gastn",
     "Anyone who knows the room's link, including guests": "Iedereen da de koppelienge van ’t gesprek kent, inclusief gastn",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Wyzigiengn an wie da de geschiedenisse ku leezn zyn alleene moa van toepassienge ip toekomstige berichtn in dit gesprek. De zichtboarheid van de bestoande geschiedenisse bluuft ongewyzigd.",
@@ -664,7 +664,7 @@
     "Members only (since they were invited)": "Alleen deelnemers (vanaf de moment dan ze uutgenodigd gewist zyn)",
     "Members only (since they joined)": "Alleen deelnemers (vanaf de moment dan ze toegetreedn zyn)",
     "Encryption": "Versleuterienge",
-    "Once enabled, encryption cannot be disabled.": "Eenmaal ingeschoakeld ku versleuterienge nie mi wordn uutgeschoakeld.",
+    "Once enabled, encryption cannot be disabled.": "Eenmoal ingeschoakeld ku versleuterienge nie mi wordn uutgeschoakeld.",
     "Encrypted": "Versleuterd",
     "Who can access this room?": "Wien èt der toegank tout dit gesprek?",
     "Who can read history?": "Wien kut de geschiedenisse leezn?",
@@ -675,11 +675,11 @@
     "Drop file here to upload": "Versleep ’t bestand noar hier vo ’t ip te loaden",
     " (unsupported)": " (nie oundersteund)",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Deelneemn me <voiceText>sproak</voiceText> of <videoText>video</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Loopnd vergoaderingsgesprek %(supportedText)s.",
+    "Ongoing conference call%(supportedText)s.": "Loopnd vergoaderiengsgesprek %(supportedText)s.",
     "Some devices for this user are not trusted": "Der wordn enkele toestelln van deze gebruuker nie vertrouwd",
-    "Some devices in this encrypted room are not trusted": "Der wordn enkele toestelln in dit versleuteld gesprek nie vertrouwd",
+    "Some devices in this encrypted room are not trusted": "Der wordn enkele toestelln in dit versleuterd gesprek nie vertrouwd",
     "All devices for this user are trusted": "Alle toestelln van deze gebruuker wordn vertrouwd",
-    "All devices in this encrypted room are trusted": "Alle toestelln in dit versleuteld gesprek wordn vertrouwd",
+    "All devices in this encrypted room are trusted": "Alle toestelln in dit versleuterd gesprek wordn vertrouwd",
     "This event could not be displayed": "Deze gebeurtenisse kostege nie weergegeevn wordn",
     "%(senderName)s sent an image": "%(senderName)s èt e fotootje gestuurd",
     "%(senderName)s sent a video": "%(senderName)s èt e filmtje gestuurd",
@@ -695,7 +695,7 @@
     "Please select the destination room for this message": "Selecteer ’t bestemmingsgesprek vo dit bericht",
     "Scroll to bottom of page": "Scrollt noa den onderkant van ’t blad",
     "device id: ": "toestel-ID: ",
-    "Disinvite": "Uitnodigienge intrekkn",
+    "Disinvite": "Uutnodigienge intrekkn",
     "Kick": "Uut ’t gesprek stuurn",
     "Disinvite this user?": "Uutnodigienge vo deze gebruuker intrekkn?",
     "Kick this user?": "Deze gebruuker uut ’t gesprek zettn?",
@@ -748,7 +748,7 @@
     "Send a reply (unencrypted)…": "Verstuurt een antwoord (ounversleuterd)…",
     "Send an encrypted message…": "Verstuurt e versleuterd bericht…",
     "Send a message (unencrypted)…": "Verstuurt een bericht (ounversleuterd)…",
-    "Markdown is disabled": "Markdown is uutgeschakeld",
+    "Markdown is disabled": "Markdown is uutgeschoakeld",
     "Hide Text Formatting Toolbar": "Tekstipmoakwerkbalk verbergn",
     "The conversation continues here.": "’t Gesprek goat hier verder.",
     "This room has been replaced and is no longer active.": "Dit gesprek is vervangn gewist en is nie langer actief.",
@@ -763,7 +763,7 @@
     "Loading...": "Bezig me loadn…",
     "Pinned Messages": "Vastgeprikte berichtn",
     "Unpin Message": "Bericht losmoakn",
-    "Jump to message": "Noar bericht springn",
+    "Jump to message": "Noar bericht spriengn",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)su",
@@ -776,8 +776,8 @@
     "Idle": "Afwezig",
     "Offline": "Offline",
     "Unknown": "Ounbekend",
-    "Seen by %(userName)s at %(dateTime)s": "Gezien deur %(userName)s ip %(dateTime)s",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Gezien deur %(displayName)s (%(userName)s) ip %(dateTime)s",
+    "Seen by %(userName)s at %(dateTime)s": "Gezien deur %(userName)s om %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Gezien deur %(displayName)s (%(userName)s) om %(dateTime)s",
     "Replying": "An ’t beantwoordn",
     "Direct Chat": "Twigesprek",
     "No rooms to show": "Geen gesprekkn vo te toogn",
@@ -799,7 +799,7 @@
     "Community Invites": "Gemeenschapsuutnodigiengn",
     "Invites": "Uutnodigiengn",
     "Favourites": "Favorietn",
-    "People": "Menschen",
+    "People": "Menschn",
     "Start chat": "Gesprek beginn",
     "Rooms": "Gesprekkn",
     "Low priority": "Leige prioriteit",
@@ -819,12 +819,12 @@
     "You were banned from %(roomName)s by %(memberName)s": "Je zyt uut %(roomName)s verbann gewist deur %(memberName)s",
     "Something went wrong with your invite to %(roomName)s": "’t Es etwa misgegoan me jen uutnodigienge voor %(roomName)s",
     "%(errcode)s was returned while trying to valide your invite. You could try to pass this information on to a room admin.": "De foutcode %(errcode)s wier weergegeevn by ’t valideern van jen uutnodigienge. Je kut deze informoatie an e gespreksadministrator deuregeevn.",
-    "You can only join it with a working invite.": "Je kut ’t gesprek alleene moa toetreedn met e werkende uitnodigienge.",
+    "You can only join it with a working invite.": "Je kut ’t gesprek alleene moa toetreedn met e werkende uutnodigienge.",
     "You can still join it because this is a public room.": "Je kut ’t nog assan toetreedn, me da ’t een openboar gesprek es.",
     "Join the discussion": "Neemt deel an ’t gesprek",
     "Try to join anyway": "Algelyk probeern deelneemn",
     "This invite to %(roomName)s wasn't sent to your account": "Deze uutnodigienge voor %(roomName)s is nie noa joun account verstuurd gewist",
-    "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Meldt jen an met een anderen account, vroagt achter e nieuwe uitnodigienge, of voeg ’t e-mailadresse %(email)s an dezen account toe.",
+    "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Meldt jen an met een anderen account, vroagt achter e nieuwe uutnodigienge, of voeg ’t e-mailadresse %(email)s an dezen account toe.",
     "Do you want to chat with %(user)s?": "Wil j’e gesprek beginn me %(user)s?",
     "Do you want to join %(roomName)s?": "Wil je %(roomName)s toetreedn?",
     "<userName/> invited you": "<userName/> èt joun uutgenodigd",
@@ -834,18 +834,18 @@
     "%(roomName)s does not exist.": "%(roomName)s bestoa nie.",
     "This room doesn't exist. Are you sure you're at the right place?": "Dit gesprek bestoa nie. Zy je zeker da je jen ip de juste plekke bevindt?",
     "%(roomName)s is not accessible at this time.": "%(roomName)s es vo de moment nie toegankelik.",
-    "Try again later, or ask a room admin to check if you have access.": "Probeer ’t later nog e ki, of vroag e gespreksbeheerder vo te controleren of da je wel toegank èt.",
+    "Try again later, or ask a room admin to check if you have access.": "Probeer ’t loater nog e ki, of vroag e gespreksbeheerder vo te controleern of da je wel toegank èt.",
     "%(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>.": "De foutcode %(errcode)s es getoogd by ’t toetreedn van ’t gesprek. A je meent da je dit bericht foutief te zien krygt, gelieve ton <issueLink>e foutmeldienge in te dienn</issueLink>.",
-    "Never lose encrypted messages": "Verliest nooit je versleutelde berichtn",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "De berichtn in dit gesprek wordn beveiligd met eind-tout-eind-versleutelienge. Alleene d’ountvanger(s) en gy èn de sleuters vo deze berichtn te leezn.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Makt e veilige back-up van je sleuters vo ze nie te verliezn. <a>Leest meer.</a>",
+    "Never lose encrypted messages": "Speelt nooit je versleuterde berichtn kwyt",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "De berichtn in dit gesprek wordn beveiligd met eind-tout-eind-versleuterienge. Alleene d’ountvanger(s) en gy èn de sleuters vo deze berichtn te leezn.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Makt e veilige back-up van je sleuters vo ze nie kwyt te speeln. <a>Leest meer.</a>",
     "Not now": "Nu nie",
     "Don't ask me again": "Vroag ’t myn nie nog e ki",
     "Add a topic": "Voegt een ounderwerp toe",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Dit gesprek actualiseern goat de huudige instantie van ’t gesprek sluutn, en e geactualiseerde versie ounder dezelfste noame anmoakn.",
     "This room has already been upgraded.": "Dit gesprek es al ipgewoardeerd gewist.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek droait ip groepsgespreksversie <roomVersion />, da deur deze thuusserver als <i>ounstabiel</i> gemarkeerd gewist es.",
-    "Only room administrators will see this warning": "Alleene de gespreksbeheerders goan deze waarschuwienge zien",
+    "Only room administrators will see this warning": "Alleene de gespreksbeheerders goan deze woarschuwienge zien",
     "This Room": "Dit gesprek",
     "All Rooms": "Alle gesprekkn",
     "Search…": "Zoekn…",
@@ -858,7 +858,7 @@
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kostege d’uutnodigienge nie intrekkn. De server oundervindt meuglik e tydelik probleem, of j’èt ounvoldoende rechtn vo d’uutnodigienge in te trekkn.",
     "Revoke invite": "Uutnodigienge intrekkn",
     "Invited by %(sender)s": "Uutgenodigd deur %(sender)s",
-    "Jump to first unread message.": "Springt noa ’t eeste oungeleezn bericht.",
+    "Jump to first unread message.": "Spriengt noa ’t eeste oungeleezn bericht.",
     "Error updating main address": "Foute by ’t bywerkn van ’t hoofdadresse",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "’t Es e foute ipgetreedn by ’t bywerkn van ’t hoofdadresse van ’t gesprek. Dit wor meugliks nie toegeloatn deur de server, of der es een tydelik probleem ipgetreedn.",
     "Error creating alias": "Foute by ’t anmoakn van de bynoame",
@@ -925,7 +925,7 @@
     "Failed to copy": "Kopieern mislukt",
     "Add an Integration": "Voegt een integroatie toe",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Je goa sebiet noar en derdepartywebsite gebracht wordn zoda je den account ku legitimeern vo gebruuk me %(integrationsUrl)s. Wil je verdergoan?",
-    "Edited at %(date)s": "Bewerkt ip %(date)s",
+    "Edited at %(date)s": "Bewerkt om %(date)s",
     "edited": "bewerkt",
     "Removed or unknown message type": "Verwyderd of ounbekend berichttype",
     "Message removed by %(userId)s": "Bericht verwyderd deur %(userId)s",
@@ -950,7 +950,7 @@
     "Add rooms to this community": "Voegt gesprekkn toe an deze gemeenschap",
     "Filter community rooms": "Gemeenschapsgesprekkn filtern",
     "Something went wrong when trying to get your communities.": "’t Ging etwa verkeerd by ’t iphoaln van je gemeenschappn.",
-    "Display your community flair in rooms configured to show it.": "Toogt je gemeenschapsbadge in gesprekkn da daarvoorn ingesteld gewist zyn.",
+    "Display your community flair in rooms configured to show it.": "Toogt je gemeenschapsbadge in gesprekkn da doarvoorn ingesteld gewist zyn.",
     "You're not currently a member of any communities.": "Je zy vo de moment geen lid van e gemeenschap.",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Helpt mee me Riot.im te verbetern door <UsageDataLink>anonieme gebruuksgegeevns</UsageDataLink> te verstuurn. Dit goat een cookie gebruukn (bekykt hiervoorn uus <PolicyLink>cookiebeleid</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Helpt mee me Riot.im te verbetern door <UsageDataLink>anonieme gebruuksgegeevns</UsageDataLink> te verstuurn. Dit goat een cookie gebruukn.",
@@ -961,8 +961,8 @@
     "Update": "Bywerkn",
     "What's new?": "Wuk es ’t er nieuw?",
     "A new version of Riot is available.": "Der es e nieuwe versie van Riot beschikboar.",
-    "To return to your account in future you need to <u>set a password</u>": "Voor in de toekomst noa jen account were te keren es ’t nodig van <u>e wachtwoord in te stelln</u>",
-    "Set Password": "Wachtwoord instelln",
+    "To return to your account in future you need to <u>set a password</u>": "Voor in de toekomst noa jen account were te keren es ’t nodig van <u>e paswoord in te stelln</u>",
+    "Set Password": "Paswoord instelln",
     "Please <a>contact your service administrator</a> to get this limit increased.": "Gelieve <a>contact ip te neemn me je dienstbeheerder</a> vo deze limiet te verhoogn.",
     "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Deze thuusserver è z’n limiet vo moandeliks actieve gebruukers bereikt, woadeure da <b>sommige gebruukers hunder nie goan kunn anmeldn</b>.",
     "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Deze thuusserver èt één van z’n systeembronlimietn overschreedn, woadeure da <b>sommige gebruukers hunder nie goan kunn anmeldn</b>.",
@@ -972,8 +972,8 @@
     "Downloading update...": "Update wor gedownload…",
     "Warning": "Let ip",
     "Unknown Address": "Ounbekend adresse",
-    "NOTE: Apps are not end-to-end encrypted": "LET IP: apps zyn nie eind-tout-eind-versleuteld",
-    "Warning: This widget might use cookies.": "Waarschuwing: deze widget gebruikt mogelijk cookies.",
+    "NOTE: Apps are not end-to-end encrypted": "LET IP: apps zyn nie eind-tout-eind-versleuterd",
+    "Warning: This widget might use cookies.": "Woarschuwienge: deze widget gebruukt meuglik cookies.",
     "Do you want to load widget from URL:": "Wil je de widget loadn van den URL:",
     "Allow": "Toeloatn",
     "Delete Widget": "Widget verwydern",
@@ -1058,7 +1058,7 @@
     "Edit message": "Bericht bewerkn",
     "Power level": "Machtsniveau",
     "Custom level": "Angepast niveau",
-    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kostege de gebeurtenisse waarop da der gereageerd gewist was nie loadn. Wellicht bestoa ze nie, of è je geen toeloatienge vo ze te bekykn.",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kostege de gebeurtenisse woarip da der gereageerd gewist was nie loadn. Wellicht bestoa ze nie, of è je geen toeloatienge vo ze te bekykn.",
     "<a>In reply to</a> <pill>": "<a>As antwoord ip</a> <pill>",
     "Room directory": "Gesprekscataloog",
     "And %(count)s more...|other": "En %(count)s meer…",
@@ -1071,17 +1071,17 @@
     "You have entered an invalid address.": "J’èt een oungeldig adresse ingegeevn.",
     "Try using one of the following valid address types: %(validTypesList)s.": "Probeert één van de volgende geldige adrestypes: %(validTypesList)s.",
     "The following users may not exist": "De volgende gebruukers bestoan meugliks nie",
-    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Kostege geen profieln vo de Matrix-ID’s hieroundern vindn - wil je ze algelyk uutnodign?",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Kostege geen profieln vo de Matrix-ID’s hieroundern viendn - wil je ze algelyk uutnodign?",
     "Invite anyway and never warn me again": "Algelyk uutnodign en myn nooit nie mi woarschuwn",
     "Invite anyway": "Algelyk uutnodign",
     "Preparing to send logs": "Logboekn wordn voorbereid vo verzendienge",
     "Logs sent": "Logboekn verstuurd",
     "Thank you!": "Merci!",
     "Failed to send logs: ": "Verstuurn van logboekn mislukt: ",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Foutipsporingslogboekn bevattn gebruuksgegeevns over de toepassinge, inclusief je gebruukersnoame, de ID’s of bynoamn van de gesprekkn en groepn da j’è bezocht, evenals de gebruukersnoamn van andere gebruukers. Ze bevattn geen berichtn.",
-    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Vooraleer da je logboekn indient, moe j’e <a>meldienge openn ip GitHub</a> waarin da je je probleem beschryft.",
-    "GitHub issue": "GitHub-melding",
-    "Notes": "Opmerkingen",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Foutipsporiengslogboekn bevattn gebruuksgegeevns over de toepassienge, inclusief je gebruukersnoame, de ID’s of bynoamn van de gesprekkn en groepn da j’è bezocht, evenals de gebruukersnoamn van andere gebruukers. Ze bevattn geen berichtn.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Vooraleer da je logboekn indient, moe j’e <a>meldienge openn ip GitHub</a> woarin da je je probleem beschryft.",
+    "GitHub issue": "GitHub-meldienge",
+    "Notes": "Ipmerkiengn",
     "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.": "Indien da ’t er bykomende context zou kunn helpn vo ’t probleem t’analyseern, lyk wyk dan je juste an ’t doen woart, relevante gespreks-ID’s, gebruukers-ID’s, enz., gelieve deze informoatie ton hier mee te geevn.",
     "Send logs": "Logboekn verstuurn",
     "Unable to load commit detail: %(msg)s": "Kostege ’t commitdetail nie loadn: %(msg)s",
@@ -1108,20 +1108,20 @@
     "Room name (optional)": "Gespreksnoame (optioneel)",
     "Advanced options": "Geavanceerde opties",
     "Block users on other matrix homeservers from joining this room": "Gebruukers van andere matrix-thuusservers uutsluutn van dit gesprek",
-    "This setting cannot be changed later!": "Deze instellienge ku later nie mi veranderd wordn!",
+    "This setting cannot be changed later!": "Deze instellienge ku loater nie mi veranderd wordn!",
     "Sign out": "Afmeldn",
-    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "Vo je gespreksgeschiedenisse nie te verliezn, moe je je gesprekssleuters exporteern vooraleer da je jen afmeldt. Je goa moetn werekeern noa de nieuwere versie van Riot vo dit te doen",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "Vo je gespreksgeschiedenisse nie kwyt te speeln, moe je je gesprekssleuters exporteern vooraleer da je jen afmeldt. Je goa moetn werekeern noa de nieuwere versie van Riot vo dit te doen",
     "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "J’èt al e ki e nieuwere versie van Riot ip %(host)s gebruukt. Vo deze versie were met eind-tout-eind-versleuterienge te gebruukn, goa je je moetn afmeldn en were anmeldn. ",
     "Incompatible Database": "Incompatibele database",
     "Continue With Encryption Disabled": "Verdergoan me versleuterienge uutgeschoakeld",
     "Unknown error": "Ounbekende foute",
-    "Incorrect password": "Verkeerd wachtwoord",
-    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dit goa jen account voorgoed ounbruukboar moakn. Je goa je nie mi kunn anmeldn, en niemand anders goat hem me dezelfst gebruukers-ID kunn registreern. Hierdoor goa jen account alle gesprekkn waaraan da t’n deelneemt verloatn, en wordn de accountgegeevns verwyderd van den identiteitsserver. <b>Deze actie is ounomkeerboar.</b>",
+    "Incorrect password": "Verkeerd paswoord",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dit goa jen account voorgoed ounbruukboar moakn. Je goa je nie mi kunn anmeldn, en niemand anders goat hem me dezelfste gebruukers-ID kunn registreern. Hierdoor goa jen account deuregoan uut alle gesprekkn woaran da t’n deelneemt, en wordn de accountgegeevns verwyderd van den identiteitsserver. <b>Deze actie is ounomkeerboar.</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.": "’t Deactiveern van jen account <b>goat der standoard nie voorn zorgn da de berichtn da je verstuurd ghed èt vergeetn wordn.</b> A je wilt dan me wyder de berichtn vergeetn, vinkt ton ’t vaksjen hieroundern an.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtboarheid van berichtn in Matrix is lik by e-mails. ’t Vergeetn van je berichtn betekent da berichtn da je gy è verstuurd nie mi gedeeld goan wordn me nieuwe of oungeregistreerde gebruukers, mo geregistreerde gebruukers dat al toegank han tout deze berichtn goan nog assan toegank èn tout hunder eigen kopie dervan.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Vergeet alle berichtn dan ’kik verstuurd ghed èn wanneer da myn account gedeactiveerd gewist es (<b>Let ip:</b> dit goat der voorn zorgn da toekomstige gebruukers een ounvolledig beeld krygn van gesprekkn)",
-    "To continue, please enter your password:": "Voer je wachtwoord in vo verder te goan:",
-    "password": "wachtwoord",
+    "To continue, please enter your password:": "Gif je paswoord in vo verder te goan:",
+    "password": "paswoord",
     "Verify device": "Toestel verifieern",
     "Use Legacy Verification (for older clients)": "Verouderde verificoatie gebruukn (voor oudere cliëntn)",
     "Verify by comparing a short text string.": "Verifieert deur e korte tekenreekse te vergelykn.",
@@ -1170,10 +1170,10 @@
     "Updating Riot": "Riot wor bygewerkt",
     "I don't want my encrypted messages": "’k En willn ik myn versleuterde berichtn nie",
     "Manually export keys": "Sleuters handmatig exporteern",
-    "You'll lose access to your encrypted messages": "Je goat de toegank tou je versleuterde berichtn verliezn",
+    "You'll lose access to your encrypted messages": "Je goat de toegank tou je versleuterde berichtn kwytspeeln",
     "Are you sure you want to sign out?": "Zy je zeker da je je wilt afmeldn?",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Moest je foutn tegenkommn of voorstelln èn, lat ’t uus ton weetn ip GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Bekykt eest de <existingIssuesLink>bestoande meldiengn</existingIssuesLink> (en voegt e +1 toe woa da je wilt), of <newIssueLink>maakt e nieuwe meldienge an</newIssueLink> indien da je der geen kun vindn, azo voorkom je da j’een duplicate meldienge indient.",
+    "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.": "Bekykt eest de <existingIssuesLink>bestoande meldiengn</existingIssuesLink> (en voegt e +1 toe woa da je wilt), of <newIssueLink>makt e nieuwe meldienge an</newIssueLink> indien da je der geen ku viendn, azo voorkom je da j’een duplicate meldienge indient.",
     "Report bugs & give feedback": "Foutn meldn & feedback geevn",
     "Go back": "Were",
     "Room Settings - %(roomName)s": "Gespreksinstelliengn - %(roomName)s",
@@ -1185,19 +1185,19 @@
     "Create a new room with the same name, description and avatar": "E nieuw gesprek anmoakn me dezelfste noame, beschryvienge en avatar",
     "Update any local room aliases to point to the new room": "Alle lokoale gespreksbynoamn bywerkn vo noa ’t nieuw gesprek te verwyzn",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Gebruukers verhindern van te klappn in d’oude versie van ’t gesprek, en der e bericht in platsn woarin dan de gebruukers wordn anbevooln hunder noa ’t nieuw gesprek te begeevn",
-    "Put a link back to the old room at the start of the new room so people can see old messages": "E verwijzienge noa ’t oud gesprek platsn an ’t begin van ’t nieuw gesprek, zoda menschn oude berichtn kunn zien",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "E verwyzienge noa ’t oud gesprek platsn an ’t begin van ’t nieuw gesprek, zoda menschn oude berichtn kunn zien",
     "Sign out and remove encryption keys?": "Afmeldn en versleuteriengssleuters verwydern?",
     "Clear Storage and Sign Out": "Ipslag wissn en afmeldn",
     "Send Logs": "Logboek verstuurn",
     "Refresh": "Herloadn",
     "Unable to restore session": "’t En is nie meuglik van de sessie t’herstelln",
     "We encountered an error trying to restore your previous session.": "’t Is e foute ipgetreedn by ’t herstelln van je vorige sessie.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "A j’al e ki gebruuk gemakt èt van e recentere versie van Riot, is je sessie meugliks ounverenigboar me deze versie. Sluit dit venster en goa were noa de recentere versie.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "A j’al e ki gebruuk gemakt èt van e recentere versie van Riot, is je sessie meugliks ounverenigboar me deze versie. Sluut dit venster en goa were noa de recentere versie.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "’t Legen van den ipslag van je browser goa ’t probleem misschiens verhelpn, mo goa joun ook afmeldn en gans je versleuterde gespreksgeschiedenisse ounleesboar moakn.",
     "Verification Pending": "Verificoatie in afwachtienge",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bekyk jen e-mails en klikt ip de koppelienge derin. Klikt van zodra da je da gedoan èt ip ‘Verdergoan’.",
     "Email address": "E-mailadresse",
-    "This will allow you to reset your password and receive notifications.": "Hierdoor goa je je wachtwoord kunn herinstell en meldiengn ountvangn.",
+    "This will allow you to reset your password and receive notifications.": "Hierdoor goa je je paswoord kunn herinstell en meldiengn ountvangn.",
     "Skip": "Oversloan",
     "A username can only contain lower case letters, numbers and '=_-./'": "E gebruukersnoame kut enkel kleine letters, cyfers en ‘=_-./’ bevattn",
     "Username not available": "Gebruukersnoame nie beschikboar",
@@ -1208,12 +1208,12 @@
     "To get started, please pick a username!": "Kiest vo te begunn e gebruukersnoame!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Dit goa jen accountnoame wordn ip de <span></span>-thuusserver, of je kut een <a>andere server</a> kiezn.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "A j’al e Matrix-account èt, ku je je direct <a>anmeldn</a>.",
-    "You have successfully set a password!": "J’èt e wachtwoord ingesteld!",
-    "You have successfully set a password and an email address!": "J’èt e wachtwoord en e-mailadresse ingesteld!",
+    "You have successfully set a password!": "J’èt e paswoord ingesteld!",
+    "You have successfully set a password and an email address!": "J’èt e paswoord en e-mailadresse ingesteld!",
     "You can now return to your account after signing out, and sign in on other devices.": "Je kun nu werekeern noa jen account nada je j’afgemeld èt, en jen anmeldn ip andere toestelln.",
     "Remember, you can always set an email address in user settings if you change your mind.": "Onthoudt da je nog assan een e-mailadresse kut instelln in de gebruukersinstelliengn.",
     "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
-    "Please set a password!": "Stelt e wachtwoord in!",
+    "Please set a password!": "Stelt e paswoord in!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee ku je noa jen account werekeern nada je j’afgemeld èt, en jen anmeldn ip andere toestelln.",
     "Share Room": "Gesprek deeln",
     "Link to most recent message": "Koppelienge noa ’t recentste bericht",
@@ -1247,24 +1247,24 @@
     "Deny": "Weigern",
     "Unable to load backup status": "Kostege back-upstatus nie loadn",
     "Recovery Key Mismatch": "Herstelsleuter kom nie overeen",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Den back-up kostege me deze sleuter nie ountsleuterd wordn: controleert of da je de juste herstelsleuter èt ingevoerd.",
-    "Incorrect Recovery Passphrase": "Verkeerd herstelwachtwoord",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Den back-up kostege me dit wachtwoord nie ountsleuterd wordn: controleert of da je ’t juste herstelwachtwoord èt ingevoerd.",
+    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Den back-up kostege me deze sleuter nie ountsleuterd wordn: controleert of da je de juste herstelsleuter èt ingegeevn.",
+    "Incorrect Recovery Passphrase": "Verkeerd herstelpaswoord",
+    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Den back-up kostege me dit paswoord nie ountsleuterd wordn: controleert of da je ’t juste herstelpaswoord èt ingegeevn.",
     "Unable to restore backup": "Kostege back-up nie herstelln",
     "No backup found!": "Geen back-up gevoundn!",
     "Backup Restored": "Back-up hersteld",
     "Failed to decrypt %(failedCount)s sessions!": "Ountsleutern van %(failedCount)s sessies is mislukt!",
     "Restored %(sessionCount)s session keys": "%(sessionCount)s sessiesleuters hersteld",
-    "Enter Recovery Passphrase": "Gif ’t herstelwachtwoord in",
-    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Let ip</b>: stelt sleutelback-up alleene moar in ip e vertrouwde computer.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Verkrygt toegank tout je beveiligde berichtgeschiedenisse en stel beveiligd chattn in door jen herstelwachtwoord in te geevn.",
+    "Enter Recovery Passphrase": "Gif ’t herstelpaswoord in",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Let ip</b>: stelt sleuterback-up alleene moar in ip e vertrouwde computer.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Verkrygt toegank tout je beveiligde berichtgeschiedenisse en stel beveiligd chattn in door jen herstelpaswoord in te geevn.",
     "Next": "Volgende",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "A je jen herstelwachtwoord zy vergeetn, ku je <button1>jen herstelsleuter gebruukn</button1> of <button2>nieuwe herstelopties instelln</button2>",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "A je jen herstelpaswoord zy vergeetn, ku je <button1>jen herstelsleuter gebruukn</button1> of <button2>nieuwe herstelopties instelln</button2>",
     "Enter Recovery Key": "Gift de herstelsleuter in",
     "This looks like a valid recovery key!": "Dit is e geldigen herstelsleuter!",
     "Not a valid recovery key": "Geen geldigen herstelsleuter",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Verkrygt toegank tout je beveiligde berichtgeschiedenisse en stel beveiligd chattn in door jen herstelsleuter in te geevn.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "A je jen herstelwachtwoord zy vergeetn, ku je <button>nieuwe herstelopties instelln</button>",
+    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "A je jen herstelpaswoord zy vergeetn, ku je <button>nieuwe herstelopties instelln</button>",
     "Private Chat": "Privégesprek",
     "Public Chat": "Openboar gesprek",
     "Custom": "Angepast",
@@ -1309,12 +1309,12 @@
     "Custom Server Options": "Angepaste serverinstelliengn",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Je kut de angepaste serveropties gebruukn vo jen an te meldn by andere Matrix-servers, deur een andere thuusserver-URL in te geevn. Dit biedt je de meuglikheid vo deze toepassienge te gebruukn met een bestoande Matrix-account ip een andere thuusserver.",
     "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kut ook een angepaste identiteitsserver instelln, ma je goa geen gebruukers kunn uutnodign via e-mail, of zelve via e-mail uutgenodigd wirden.",
-    "To continue, please enter your password.": "Voer je wachtwoord in vo verder te goan.",
-    "Password:": "Wachtwoord:",
+    "To continue, please enter your password.": "Gif je paswoord in vo verder te goan.",
+    "Password:": "Paswoord:",
     "Please review and accept all of the homeserver's policies": "Gelieve ’t beleid van de thuusserver te leezn en ’anveirdn",
     "Please review and accept the policies of this homeserver:": "Gelieve ’t beleid van deze thuusserver te leezn en t’anveirdn:",
     "An email has been sent to %(emailAddress)s": "’t Is een e-mail noa %(emailAddress)s verstuurd gewist",
-    "Please check your email to continue registration.": "Bekijk jen e-mails vo verder te goan me de registroatie.",
+    "Please check your email to continue registration.": "Bekyk jen e-mails vo verder te goan me de registroatie.",
     "Token incorrect": "Verkeerd bewys",
     "A text message has been sent to %(msisdn)s": "’t Is een smse noa %(msisdn)s verstuurd gewist",
     "Please enter the code it contains:": "Gift de code in da ’t er in stoat:",
@@ -1323,7 +1323,7 @@
     "Start authentication": "Authenticoatie beginn",
     "Unable to validate homeserver/identity server": "Kostege de thuus-/identiteitsserver nie valideern",
     "Your Modular server": "Joun Modular-server",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Voert de locoatie van je Modular-thuisserver in. Deze kan jen eigen domeinnoame gebruukn, of e subdomein van <a>modular.im</a> zyn.",
+    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Gift de locoatie van je Modular-thuusserver in. Deze kan jen eigen domeinnoame gebruukn, of e subdomein van <a>modular.im</a> zyn.",
     "Server Name": "Servernoame",
     "The email field must not be blank.": "’t E-mailveld meug nie leeg zyn.",
     "The username field must not be blank.": "’t Gebruukersnoamveld meug nie leeg zyn.",
@@ -1341,7 +1341,7 @@
     "Use an email address to recover your account": "Gebruukt een e-mailadresse vo jen account t’herstelln",
     "Enter email address (required on this homeserver)": "Gift een e-mailadresse in (vereist ip deze thuusserver)",
     "Doesn't look like a valid email address": "Dit ziet der nie uut lik e geldig e-mailadresse",
-    "Enter password": "Voer ’t paswoord in",
+    "Enter password": "Gif ’t paswoord in",
     "Password is allowed, but unsafe": "Paswoord is toegeloatn, moar ounveilig",
     "Nice, strong password!": "Dit is e sterk paswoord!",
     "Keep going...": "Doe moa voort…",
@@ -1399,9 +1399,9 @@
     "Unable to accept invite": "Kostege d’uutnodigienge nie anveirdn",
     "Unable to join community": "Kostege nie toetreedn tout de gemeenschap",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Je zyt e beheerder van deze gemeenschap. Je goa nie were kunn toetreedn zounder een uutnodigienge van een andere beheerder.",
-    "Leave Community": "Gemeenschap verloatn",
-    "Leave %(groupName)s?": "%(groupName)s verloatn?",
-    "Unable to leave community": "Kostege de gemeenschap nie verloatn",
+    "Leave Community": "Deuregoan uut de gemeenschap",
+    "Leave %(groupName)s?": "Deuregoan uut %(groupName)s?",
+    "Unable to leave community": "Kostege nie deuregoan uut de gemeenschap",
     "Community Settings": "Gemeenschapsinstelliengn",
     "Want more than a community? <a>Get your own server</a>": "Wil je meer of een gemeenschap? <a>Verkryg jen eigen server</a>",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Veranderiengn an je gemeenschaps<bold1>noame</bold1> en -<bold2>avatar</bold2> goan meugliks nie gezien wordn door andern tou maximoal 30 minuutn.",
@@ -1427,21 +1427,21 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Dit gesprek is nie openboar. Zounder uutnodigienge goa je nie were kunn toetreedn.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Zy je zeker da je wilt deuregoan uut ’t gesprek ‘%(roomName)s’?",
     "Failed to leave room": "Deuregoan uut gesprek is mislukt",
-    "Can't leave Server Notices room": "Kostege ’t servermeldiengsgesprek nie verloatn",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek wor gebruukt vo belangryke berichtn van de thuusserver, dus je kut ’t nie verloatn.",
+    "Can't leave Server Notices room": "Kostege nie deuregoan uut ’t servermeldiengsgesprek",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek wor gebruukt vo belangryke berichtn van de thuusserver, dus je kut der nie uut deuregoan.",
     "Signed Out": "Afgemeld",
     "For security, this session has been signed out. Please sign in again.": "Wegens veiligheidsredenn is deze sessie afgemeld. Gelieve jen heran te meldn.",
     "Terms and Conditions": "Gebruuksvoorwoardn",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Vo de %(homeserverDomain)s-thuusserver te bluuvn gebruukn, goa je de gebruuksvoorwoardn moetn leezn en anveirdn.",
     "Review terms and conditions": "Gebruuksvoorwoardn leezn",
     "Old cryptography data detected": "Oude cryptografiegegeevns gedetecteerd",
-    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "’t Zyn gegeevns van een oudere versie van Riot gedetecteerd gewist. Dit goa probleemn veroorzaakt ghed èn me de eind-tout-eind-versleuterienge in d’oude versie. Eind-tout-eind-versleuterde berichtn da recent uutgewisseld gewist zyn me d’oude versie zyn meugliks nie t’ountsleutern in deze versie. Dit zoudt der ook voorn kunnn zorgn da berichtn da uutgewisseld gewist zyn in deze versie foaln. Meldt jen heran moest je probleemn ervoarn. Exporteert de sleutels en importeer z’achteraf were vo de berichtgeschiedenisse te behoudn.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "’t Zyn gegeevns van een oudere versie van Riot gedetecteerd gewist. Dit goa probleemn veroorzakt ghed èn me de eind-tout-eind-versleuterienge in d’oude versie. Eind-tout-eind-versleuterde berichtn da recent uutgewisseld gewist zyn me d’oude versie zyn meugliks nie t’ountsleutern in deze versie. Dit zoudt der ook voorn kunnn zorgn da berichtn da uutgewisseld gewist zyn in deze versie foaln. Meldt jen heran moest je probleemn ervoarn. Exporteert de sleuters en importeer z’achteraf were vo de berichtgeschiedenisse te behoudn.",
     "You are logged in to another account": "Je zyt angemeld met een anderen account",
     "Thank you for verifying your email! The account you're logged into here (%(sessionUserId)s) appears to be different from the account you've verified an email for (%(verifiedUserId)s). If you would like to log in to %(verifiedUserId2)s, please log out first.": "Merci vo jen e-mailadresse te verifieern! Den account da je jen hier mee èt angemeld (%(sessionUserId)s) lykt te verschilln van den account da j’een e-mailadresse voorn geverifieerd ghed èt (%(verifiedUserId)s). A je je me %(verifiedUserId2)s wilt anmeldn, gelieve je ton eest af te meldn.",
     "Logout": "Afmeldn",
     "Your Communities": "Je gemeenschappn",
     "Did you know: you can use communities to filter your Riot.im experience!": "Wist je da: je gemeenschappn kun gebruukn vo je Riot.im-belevienge te filtern!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Verslipt e gemeenschapsavatar noa ’t filterpaneel helegans links ip ’t scherm voor e filter in te stelln. Daarachter ku j’ip den avatar in ’t filterpaneel klikkn wanneer da je je wil beperkn tout de gesprekkn en menschn uut die gemeenschap.",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Verslipt e gemeenschapsavatar noa ’t filterpaneel helegans links ip ’t scherm voor e filter in te stelln. Doarachter ku j’ip den avatar in ’t filterpaneel klikkn wanneer da je je wil beperkn tout de gesprekkn en menschn uut die gemeenschap.",
     "Error whilst fetching joined communities": "’t Is e foute ipgetreedn by ’t iphoaln van de gemeenschappn da je lid van zyt",
     "Create a new community": "Makt e nieuwe gemeenschap an",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Makt e gemeenschap an vo gebruukers en gesprekkn by makoar te briengn! Schep met e startblad ip moet jen eigen pleksje in ’t Matrix-universum.",
@@ -1458,7 +1458,7 @@
     "Unable to join network": "Kostege nie toetreedn tout dit netwerk",
     "Riot does not know how to join a room on this network": "Riot weet nie hoe da ’t moet deelneemn an e gesprek ip dit netwerk",
     "Room not found": "Gesprek nie gevoundn",
-    "Couldn't find a matching Matrix room": "Kostege geen byhoornd Matrix-gesprek vindn",
+    "Couldn't find a matching Matrix room": "Kostege geen byhoornd Matrix-gesprek viendn",
     "Fetching third party location failed": "’t Iphoaln van de locoatie van de derde party is mislukt",
     "Unable to look up room ID from server": "Kostege de gesprek-ID nie van de server iphoaln",
     "Search for a room": "Zoekt achter e gesprek",
@@ -1475,163 +1475,176 @@
     "Connectivity to the server has been lost.": "De verbindienge me de server is verbrookn.",
     "Sent messages will be stored until your connection has returned.": "Verstuurde berichtn goan ipgesloagn wordn toutda je verbindienge hersteld is.",
     "Active call": "Actieven iproep",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "’t Is hier geen katte! Wil jen <inviteText>etwien uutnodign</inviteText> of <nowarnText>de waarschuwienge over ’t leeg gesprek stoppn</nowarnText>?",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "’t Is hier geen katte! Wil jen <inviteText>etwien uutnodign</inviteText> of <nowarnText>de woarschuwienge over ’t leeg gesprek stoppn</nowarnText>?",
     "Add room": "Gesprek toevoegn",
-    "You seem to be uploading files, are you sure you want to quit?": "Het ziet er naar uit dat u bestanden aan het uploaden bent, weet u zeker dat u wilt afsluiten?",
-    "You seem to be in a call, are you sure you want to quit?": "Het ziet er naar uit dat u in gesprek bent, weet u zeker dat u wilt afsluiten?",
-    "Search failed": "Zoeken mislukt",
-    "Server may be unavailable, overloaded, or search timed out :(": "De server is misschien onbereikbaar of overbelast, of het zoeken duurde te lang :(",
-    "No more results": "Geen resultaten meer",
-    "Unknown room %(roomId)s": "Onbekend gesprek %(roomId)s",
+    "You seem to be uploading files, are you sure you want to quit?": "’t Ziet er noar uut da je bestandn an ’t iploadn zyt, zy je zeker da je wilt afsluutn?",
+    "You seem to be in a call, are you sure you want to quit?": "’t Ziet er noar uut da je nog in gesprek zyt, zy je zeker da je wilt afsluutn?",
+    "Search failed": "Zoekn mislukt",
+    "Server may be unavailable, overloaded, or search timed out :(": "De server is misschiens ounbereikboar of overbelast, of ’t zoekn deurdege te lank :(",
+    "No more results": "Geen resultoatn nie mi",
+    "Unknown room %(roomId)s": "Ounbekend gesprek %(roomId)s",
     "Room": "Gesprek",
-    "Failed to reject invite": "Weigeren van uitnodiging is mislukt",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "U heeft %(count)s ongelezen meldingen in een voorgaande versie van dit gesprek.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "U heeft %(count)s ongelezen melding in een voorgaande versie van dit gesprek.",
-    "Fill screen": "Scherm vullen",
-    "Click to unmute video": "Klik om het geluid van de video weer aan te zetten",
-    "Click to mute video": "Klik om het geluid van de video uit te zetten",
-    "Click to unmute audio": "Klik om het geluid weer aan te zetten",
-    "Click to mute audio": "Klik om het geluid uit te zetten",
-    "Clear filter": "Filter wissen",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U heeft geprobeerd een gegeven punt in de tijdslijn van dit gesprek te laden, maar u heeft geen toestemming om het desbetreffende bericht te zien.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Geprobeerd een gegeven punt in de tijdslijn van dit gesprek te laden, maar kon dit niet vinden.",
-    "Failed to load timeline position": "Laden van tijdslijnpositie is mislukt",
+    "Failed to reject invite": "Weigern van d’uutnodigienge is mislukt",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "J’èt %(count)s oungeleezn meldiengn in e voorgoande versie van dit gesprek.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "J’èt %(count)s oungeleezn meldieng in e voorgoande versie van dit gesprek.",
+    "Fill screen": "Scherm vulln",
+    "Click to unmute video": "Klikt vo ’t geluud van ’t filmtje were an te zettn",
+    "Click to mute video": "Klikt vo ’t geluud van ’t filmtje uut te zettn",
+    "Click to unmute audio": "Klikt vo ’t geluud were an te zettn",
+    "Click to mute audio": "Klikt vo ’t geluud uut te zettn",
+    "Clear filter": "Filter wissn",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "J’è geprobeerd e gegeven punt in de tydslyn van dit gesprek te loadn, moa j’è geen toeloatienge vo ’t desbetreffend bericht te zien.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Geprobeerd voor e gegeven punt in de tydslyn van dit gesprek te loadn, moar kostege dit nie viendn.",
+    "Failed to load timeline position": "Loadn van tydslynpositie is mislukt",
     "Guest": "Gast",
-    "Your profile": "Uw profiel",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere worden geüpload",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wordt geüpload",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander worden geüpload",
-    "Could not load user profile": "Kon gebruikersprofiel niet laden",
-    "Failed to send email": "Versturen van e-mail is mislukt",
-    "The email address linked to your account must be entered.": "Het e-mailadres dat met uw account verbonden is moet ingevoerd worden.",
-    "A new password must be entered.": "Er moet een nieuw wachtwoord ingevoerd worden.",
-    "New passwords must match each other.": "Nieuwe wachtwoorden moeten overeenkomen.",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Uw wachtwoord opnieuw instellen zal alle sleutels voor eind-tot-eind-versleuteling op al uw apparaten opnieuw instellen, waardoor uw versleutelde gesprekgeschiedenis onleesbaar wordt. Stel sleutelback-up in of exporteer uw gesprekssleutels vanaf een ander apparaat vooraleer u uw wachtwoord opnieuw instelt.",
-    "Your Matrix account on %(serverName)s": "Uw Matrix-account op %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Uw Matrix-account op <underlinedServerName />",
-    "A verification email will be sent to your inbox to confirm setting your new password.": "Er is een verificatie-e-mail naar u gestuurd om het instellen van uw nieuwe wachtwoord te bevestigen.",
-    "Send Reset Email": "E-mail voor opnieuw instellen versturen",
-    "Sign in instead": "Aanmelden",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Er is een e-mail naar %(emailAddress)s verstuurd. Klik hieronder van zodra u de koppeling erin hebt gevolgd.",
-    "I have verified my email address": "Ik heb mijn e-mailadres geverifieerd",
-    "Your password has been reset.": "Uw wachtwoord is opnieuw ingesteld.",
-    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "U bent afgemeld op al uw apparaten en zult geen pushmeldingen meer ontvangen. Meld u op elk apparaat opnieuw aan om weer meldingen te ontvangen.",
-    "Return to login screen": "Terug naar het aanmeldscherm",
-    "Set a new password": "Stel een nieuw wachtwoord in",
-    "Invalid homeserver discovery response": "Ongeldig thuisserverontdekkingsantwoord",
-    "Failed to get autodiscovery configuration from server": "Ophalen van auto-ontdekkingsconfiguratie van server is mislukt",
-    "Invalid base_url for m.homeserver": "Ongeldige base_url voor m.homeserver",
-    "Homeserver URL does not appear to be a valid Matrix homeserver": "De thuisserver-URL lijkt geen geldige Matrix-thuisserver",
-    "Invalid identity server discovery response": "Ongeldig identiteitsserverontdekkingsantwoord",
-    "Invalid base_url for m.identity_server": "Ongeldige base_url voor m.identity_server",
-    "Identity server URL does not appear to be a valid identity server": "De identiteitsserver-URL lijkt geen geldige identiteitsserver",
-    "General failure": "Algemene fout",
-    "This homeserver does not support login using email address.": "Deze thuisserver biedt geen ondersteuning voor aanmelden met e-mailadres.",
-    "Please <a>contact your service administrator</a> to continue using this service.": "Gelieve <a>contact op te nemen met uw dienstbeheerder</a> om deze dienst te blijven gebruiken.",
-    "Incorrect username and/or password.": "Onjuiste gebruikersnaam en/of wachtwoord.",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Merk op dat u zich aanmeldt bij de %(hs)s-server, niet matrix.org.",
-    "Failed to perform homeserver discovery": "Ontdekken van thuisserver is mislukt",
-    "The phone number entered looks invalid": "Het ingevoerde telefoonnummer ziet er ongeldig uit",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Deze thuisserver heeft geen aanmeldmethodes die door deze cliënt worden ondersteund.",
-    "Error: Problem communicating with the given homeserver.": "Fout: probleem bij communicatie met de gegeven thuisserver.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan geen verbinding maken met de thuisserver via HTTP wanneer er een HTTPS-URL in uw browserbalk staat. Gebruik HTTPS of <a>schakel onveilige scripts in</a>.",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Geen verbinding met de thuisserver - controleer uw verbinding, zorg ervoor dat het <a>SSL-certificaat van de thuisserver</a> vertrouwd is en dat er geen browserextensies verzoeken blokkeren.",
-    "Sign in with single sign-on": "Aanmelden met enkele aanmelding",
-    "Create account": "Account aanmaken",
-    "Failed to fetch avatar URL": "Ophalen van avatar-URL is mislukt",
-    "Set a display name:": "Stel een weergavenaam in:",
-    "Upload an avatar:": "Upload een avatar:",
-    "Registration has been disabled on this homeserver.": "Registratie is uitgeschakeld op deze thuisserver.",
-    "Unable to query for supported registration methods.": "Kan ondersteunde registratiemethoden niet opvragen.",
-    "This server does not support authentication with a phone number.": "Deze server biedt geen ondersteuning voor authenticatie met een telefoonnummer.",
-    "Create your account": "Maak uw account aan",
-    "Commands": "Opdrachten",
-    "Results from DuckDuckGo": "Resultaten van DuckDuckGo",
+    "Your profile": "Joun profiel",
+    "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere wordn ipgeloadn",
+    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wordt ipgeloadn",
+    "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander wordn ipgeloadn",
+    "Could not load user profile": "Kostege ’t gebruukersprofiel nie loadn",
+    "Failed to send email": "Verstuurn van den e-mail is mislukt",
+    "The email address linked to your account must be entered.": "’t E-mailadresse da me joun account verboundn is moet ingegeevn wordn.",
+    "A new password must be entered.": "’t Moet e nieuw paswoord ingegeevn wordn.",
+    "New passwords must match each other.": "Nieuwe paswoordn moetn overeenkommn.",
+    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Je paswoord herinstelln goat alle sleuters voor eind-tout-eind-versleuterienge ip al je toestelln herinstelln, woadeure da je versleuterde gesprekgeschiedenisse ounleesboar wordt. Stelt de sleuterback-up in of exporteer je gesprekssleuters van ip een ander toestel vooraleer da je je paswoord herinstelt.",
+    "Your Matrix account on %(serverName)s": "Je Matrix-account ip %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Je Matrix-account ip <underlinedServerName />",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "’t Is e verificoatie-e-mail noa joun gestuurd gewist vo ’t instelln van je nieuw paswoord te bevestign.",
+    "Send Reset Email": "E-mail voor herinstelln verstuurn",
+    "Sign in instead": "Anmeldn",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "’t Is een e-mail noar %(emailAddress)s verstuurd gewist. Klikt hieroundern van zodra da je de koppelienge derin gevolgd ghed èt.",
+    "I have verified my email address": "’k Èn myn e-mailadresse geverifieerd",
+    "Your password has been reset.": "Je paswoord is heringesteld.",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Je zyt afgemeld ip al je toestelln en je goa geen pushmeldiengn nie mi ountvangn. Meldt jen ip ieder toestel heran vo were meldiengn t’ountvangn.",
+    "Return to login screen": "Were noa ’t anmeldiengsscherm",
+    "Set a new password": "Stelt e nieuw paswoord in",
+    "Invalid homeserver discovery response": "Oungeldig thuusserverountdekkiengsantwoord",
+    "Failed to get autodiscovery configuration from server": "Iphoaln van auto-ountdekkiengsconfiguroatie van server is mislukt",
+    "Invalid base_url for m.homeserver": "Oungeldige base_url vo m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "De thuusserver-URL lykt geen geldige Matrix-thuusserver te zyn",
+    "Invalid identity server discovery response": "Oungeldig identiteitsserverountdekkiengsantwoord",
+    "Invalid base_url for m.identity_server": "Oungeldige base_url vo m.identity_server",
+    "Identity server URL does not appear to be a valid identity server": "De identiteitsserver-URL lykt geen geldige identiteitsserver te zyn",
+    "General failure": "Algemene foute",
+    "This homeserver does not support login using email address.": "Deze thuusserver biedt geen oundersteunienge voor anmeldn met een e-mailadresse.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Gelieve <a>contact ip te neemn me je dienstbeheerder</a> vo deze dienst te bluuvn gebruukn.",
+    "Incorrect username and/or password.": "Verkeerde gebruukersnoame en/of paswoord.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Zy je dervan bewust da je jen anmeldt by de %(hs)s-server, nie by matrix.org.",
+    "Failed to perform homeserver discovery": "Ountdekkn van thuusserver is mislukt",
+    "The phone number entered looks invalid": "Den ingegeevn telefongnumero ziet er oungeldig uut",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Deze thuusserver è geen anmeldiengsmethodes da door deze cliënt wordn oundersteund.",
+    "Error: Problem communicating with the given homeserver.": "Foute: probleem by communicoatie me de gegeevn thuusserver.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Je ku geen verbindienge moakn me de thuusserver via HTTP wanneer dat der een HTTPS-URL in je browserbalk stoat. Gebruukt HTTPS of <a>schoakelt ounveilige scripts in</a>.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Geen verbindienge met de thuusserver - controleer je verbindienge, zorgt dervoorn dan ’t <a>SSL-certificoat van de thuusserver</a> vertrouwd is en dat der geen browserextensies verzoekn blokkeern.",
+    "Sign in with single sign-on": "Anmeldn met enkele anmeldienge",
+    "Create account": "Account anmoakn",
+    "Failed to fetch avatar URL": "Iphoaln van avatar-URL is mislukt",
+    "Set a display name:": "Stelt e weergavenoame in:",
+    "Upload an avatar:": "Loadt een avatar ip:",
+    "Registration has been disabled on this homeserver.": "Registroatie is uutgeschoakeld ip deze thuusserver.",
+    "Unable to query for supported registration methods.": "Kostege d’oundersteunde registroatiemethodes nie ipvroagn.",
+    "This server does not support authentication with a phone number.": "Deze server biedt geen oundersteunienge voor authenticoatie met e telefongnumero.",
+    "Create your account": "Mak jen account an",
+    "Commands": "Ipdrachtn",
+    "Results from DuckDuckGo": "Resultoatn van DuckDuckGo",
     "Emoji": "Emoticons",
-    "Notify the whole room": "Laat dit aan het hele groepsgesprek weten",
-    "Room Notification": "Groepsgespreksmelding",
-    "Users": "Gebruikers",
-    "unknown device": "onbekend apparaat",
-    "NOT verified": "NIET geverifieerd",
+    "Notify the whole room": "Loat dit an gans ’t groepsgesprek weetn",
+    "Room Notification": "Groepsgespreksmeldienge",
+    "Users": "Gebruukers",
+    "unknown device": "ounbekend toestel",
+    "NOT verified": "NIE geverifieerd",
     "Blacklisted": "Geblokkeerd",
     "verified": "geverifieerd",
-    "Name": "Naam",
-    "Verification": "Verificatie",
-    "Ed25519 fingerprint": "Ed25519-vingerafdruk",
-    "User ID": "Gebruikers-ID",
-    "Curve25519 identity key": "Curve25519-identiteitssleutel",
+    "Name": "Noame",
+    "Verification": "Verificoatie",
+    "Ed25519 fingerprint": "Ed25519-viengerafdruk",
+    "User ID": "Gebruukers-ID",
+    "Curve25519 identity key": "Curve25519-identiteitssleuter",
     "none": "geen",
-    "Claimed Ed25519 fingerprint key": "Geclaimde Ed25519-vingerafdrukssleutel",
+    "Claimed Ed25519 fingerprint key": "Geclaimde Ed25519-viengerafdrukssleuter",
     "Algorithm": "Algoritme",
-    "unencrypted": "onversleuteld",
-    "Decryption error": "Ontsleutelingsfout",
+    "unencrypted": "ounversleuterd",
+    "Decryption error": "Ountsleuteriengsfoute",
     "Session ID": "Sessie-ID",
-    "Event information": "Gebeurtenisinformatie",
-    "Sender device information": "Info over apparaat van afzender",
-    "Passphrases must match": "Wachtwoorden moeten overeenkomen",
-    "Passphrase must not be empty": "Wachtwoord mag niet leeg zijn",
-    "Export room keys": "Gesprekssleutels exporteren",
-    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Hiermee kunt u de sleutels van uw ontvangen berichten in versleutelde gesprekken naar een lokaal bestand exporteren. U kunt dit bestand later in een andere Matrix-cliënt importeren, zodat ook die cliënt deze berichten zal kunnen ontsleutelen.",
-    "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.": "Iedereen die het geëxporteerde bestand kan lezen, kan daarmee alle versleutelde berichten die u kunt zien ontsleutelen. Wees dus voorzichtig en bewaar dit bestand op een veilige plaats. Daartoe kunt u hieronder een wachtwoord invoeren, dat dan gebruikt zal worden om de geëxporteerde gegevens te versleutelen. Het is dan enkel mogelijk de gegevens in te lezen met hetzelfde wachtwoord.",
-    "Enter passphrase": "Voer wachtwoord in",
-    "Confirm passphrase": "Bevestig wachtwoord",
-    "Export": "Exporteren",
-    "Import room keys": "Gesprekssleutels importeren",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Hiermee kunt u de versleutelingssleutels die u uit een andere Matrix-cliënt had geëxporteerd importeren, zodat u alle berichten die het andere programma kon ontsleutelen ook hier zult kunnen lezen.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Het geëxporteerde bestand is beveiligd met een wachtwoord. Voer dat wachtwoord hier in om het bestand te ontsleutelen.",
-    "File to import": "Te importeren bestand",
-    "Import": "Importeren",
-    "Great! This passphrase looks strong enough.": "Top! Dit wachtwoord ziet er sterk genoeg uit.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We bewaren een versleutelde kopie van uw sleutels op onze server. Bescherm uw back-up met een wachtwoord om deze veilig te houden.",
-    "For maximum security, this should be different from your account password.": "Voor maximale veiligheid zou dit moeten verschillen van uw accountwachtwoord.",
-    "Enter a passphrase...": "Voer een wachtwoord in…",
-    "Set up with a Recovery Key": "Instellen met herstelsleutel",
-    "That matches!": "Dat komt overeen!",
-    "That doesn't match.": "Dat komt niet overeen.",
-    "Go back to set it again.": "Ga terug om het opnieuw in te stellen.",
-    "Please enter your passphrase a second time to confirm.": "Voer uw wachtwoord nogmaals in om te bevestigen.",
-    "Repeat your passphrase...": "Herhaal uw wachtwoord…",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Als veiligheidsnet kunt u dit gebruiken om uw versleutelde berichtgeschiedenis te herstellen indien u uw herstelwachtwoord zou vergeten.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Als veiligheidsnet kunt u het gebruiken om uw versleutelde berichtgeschiedenis te herstellen.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Uw herstelsleutel is een veiligheidsnet - u kunt hem gebruiken om de toegang tot uw versleutelde berichten te herstellen indien u uw wachtwoord zou vergeten.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Bewaar uw herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)",
-    "Your Recovery Key": "Uw herstelsleutel",
-    "Copy to clipboard": "Kopiëren naar klembord",
-    "Download": "Downloaden",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Uw herstelsleutel is <b>gekopieerd naar uw klembord</b>, plak hem in:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Uw herstelsleutel bevindt zich in uw <b>Downloads</b>-map.",
-    "<b>Print it</b> and store it somewhere safe": "<b>Druk hem af</b> en bewaar hem op een veilige plaats",
-    "<b>Save it</b> on a USB key or backup drive": "<b>Sla hem op</b> op een USB-stick of een back-upschijf",
-    "<b>Copy it</b> to your personal cloud storage": "<b>Kopieer hem</b> naar uw persoonlijke cloudopslag",
-    "Your keys are being backed up (the first backup could take a few minutes).": "Er wordt een back-up van uw sleutels gemaakt (de eerste back-up kan enkele minuten duren).",
+    "Event information": "Gebeurtenisinformoatie",
+    "Sender device information": "Info over toestel van afzender",
+    "Passphrases must match": "Paswoordn moetn overeenkommn",
+    "Passphrase must not be empty": "Paswoord meug nie leeg zyn",
+    "Export room keys": "Gesprekssleuters exporteern",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Hiermee ku je de sleuters van jen ontvangn berichtn in versleuterde gesprekkn noar e lokoal bestand exporteern. Je kut dit bestand loater in een andere Matrix-cliënt importeern, zodat ook die cliënt deze berichtn ga kunn ountsleutern.",
+    "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.": "Iedereen da ’t geëxporteerd bestand ku leezn, kut doarmee alle versleuterde berichtn da je gy ku zien ountsleutern. Zyt dus voorzichtig en bewoart dit bestand ip e veilige plekke. Hieroundern ku j’e paswoord ingeevn, dat ton goa gebruukt wordn vo de geëxporteerde gegeevns te versleutern. ’t Is ton enkel meuglik van de gegeevns in te leezn me ’tzelste paswoord.",
+    "Enter passphrase": "Gif ’t paswoord in",
+    "Confirm passphrase": "Bevestig ’t paswoord",
+    "Export": "Exporteern",
+    "Import room keys": "Gesprekssleuters importeern",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Hiermee ku je de versleuteriengssleuters da j’uut een andere Matrix-cliënt had geëxporteerd importeern, zoda j’alle berichtn da ’t ander programma kostege ountsleutern ook hier goa kunn leezn.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "’t Geëxporteerd bestand is beveiligd met e paswoord. Gift da paswoord hier in vo ’t bestand t’ountsleutern.",
+    "File to import": "T’importeern bestand",
+    "Import": "Importeern",
+    "Great! This passphrase looks strong enough.": "Top! Dit paswoord ziet der sterk genoeg uut.",
+    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We bewoarn e versleuterde kopie van je sleuters ip uzze server. Bescherm je back-up met e paswoord vo n’hem veilig t’houdn.",
+    "For maximum security, this should be different from your account password.": "Vo maximoale veiligheid zoudt dit moetn verschilln van jen accountpaswoord.",
+    "Enter a passphrase...": "Gift e paswoord in…",
+    "Set up with a Recovery Key": "Instelln met een herstelsleuter",
+    "That matches!": "Da komt overeen!",
+    "That doesn't match.": "Da kom nie overeen.",
+    "Go back to set it again.": "Goa were vo ’t herin te stelln.",
+    "Please enter your passphrase a second time to confirm.": "Gif je paswoord nog e keer in vo te bevestign.",
+    "Repeat your passphrase...": "Herhoal je paswoord…",
+    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Als veiligheidsnet ku je dit gebruukn vo je versleuterde berichtgeschiedenisse t’herstelln indien da je jen herstelpaswoord zou vergeetn.",
+    "As a safety net, you can use it to restore your encrypted message history.": "Als veiligheidsnet ku je ’t gebruukn vo je versleuterde berichtgeschiedenisse t’herstelln.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Jen herstelsleuter is e veiligheidsnet - je kut hem gebruukn vo de toegank tou je versleuterde berichtn t’herstelln indien da je je paswoord zou vergeetn.",
+    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Bewoar jen herstelsleuter ip e heel veilige plekke, lik e paswoordbeheerder (of e kluuze)",
+    "Your Recovery Key": "Jen herstelsleuter",
+    "Copy to clipboard": "Kopieern noa ’t klembord",
+    "Download": "Downloadn",
+    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Jen herstelsleuter is <b>gekopieerd noa je klembord</b>, plakt hem in:",
+    "Your Recovery Key is in your <b>Downloads</b> folder.": "Jen herstelsleuter bevindt hem in je <b>Downloads</b>-mappe.",
+    "<b>Print it</b> and store it somewhere safe": "<b>Print hem af</b> en bewoart hem ip e veilige plekke",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Sloat hem ip</b> ip een USB-stick of e back-upschyf",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Kopieert hem</b> noa je persoonlike cloudipslag",
+    "Your keys are being backed up (the first backup could take a few minutes).": "’t Wordt e back-up van je sleuters gemakt (den eesten back-up kut e poar minuutn deurn).",
     "Okay": "Oké",
-    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another device.": "Zonder veilig berichtherstel in te stellen, zult u uw versleutelde berichtgeschiedenis niet kunnen herstellen indien u zich afmeldt of een ander apparaat gebruikt.",
-    "Set up Secure Message Recovery": "Veilig berichtherstel instellen",
-    "Secure your backup with a passphrase": "Beveilig uw back-up met een wachtwoord",
-    "Confirm your passphrase": "Bevestig uw wachtwoord",
-    "Recovery key": "Herstelsleutel",
-    "Keep it safe": "Bewaar hem op een veilige plaats",
-    "Starting backup...": "Back-up wordt gestart…",
-    "Success!": "Klaar!",
-    "Create Key Backup": "Sleutelback-up aanmaken",
-    "Unable to create key backup": "Kan sleutelback-up niet aanmaken",
-    "Retry": "Opnieuw proberen",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Zonder veilig berichtherstel in te stellen, zult u uw versleutelde berichtgeschiedenis verliezen wanneer u zich afmeldt.",
-    "If you don't want to set this up now, you can later in Settings.": "Als u dit nu niet wilt instellen, kunt u dit later doen in de instellingen.",
-    "Set up": "Instellen",
-    "Don't ask again": "Niet opnieuw vragen",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another device.": "Zounder veilig berichtherstel in te stelln, goa je je versleuterde berichtgeschiedenisse nie kunn herstelln indien da je jen afmeldt of een ander toestel gebruukt.",
+    "Set up Secure Message Recovery": "Veilig berichtherstel instelln",
+    "Secure your backup with a passphrase": "Beveilig je back-up met e paswoord",
+    "Confirm your passphrase": "Bevestig je paswoord",
+    "Recovery key": "Herstelsleuter",
+    "Keep it safe": "Bewoart hem ip e veilige plekke",
+    "Starting backup...": "Back-up wor gestart…",
+    "Success!": "Gereed!",
+    "Create Key Backup": "Sleuterback-up anmoakn",
+    "Unable to create key backup": "Kostege de sleuterback-up nie anmoakn",
+    "Retry": "Herprobeern",
+    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Zounder veilig berichtherstel in te stelln, goa je je versleuterde berichtgeschiedenisse kwytspeeln wanneer da je jen afmeldt.",
+    "If you don't want to set this up now, you can later in Settings.": "A je dit nu nie wilt instelln, ku je ’t loater algelyk nog doen in d’instelliengn.",
+    "Set up": "Instelln",
+    "Don't ask again": "Vroag ’t myn nie nog e ki",
     "New Recovery Method": "Nieuwe herstelmethode",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Er zijn een nieuw herstelwachtwoord en een nieuwe herstelsleutel voor beveiligde berichten gedetecteerd.",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Als u deze nieuwe herstelmethode niet heeft ingesteld, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel een nieuwe herstelmethode in in de instellingen.",
-    "This device is encrypting history using the new recovery method.": "Dit apparaat versleutelt de geschiedenis met de nieuwe herstelmethode.",
-    "Go to Settings": "Ga naar instellingen",
-    "Set up Secure Messages": "Beveiligde berichten instellen",
-    "Recovery Method Removed": "Herstelmethode verwijderd",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Dit apparaat heeft gedetecteerd dat uw herstelwachtwoord en -sleutel voor beveiligde berichten verwijderd zijn.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Als u dit per ongeluk heeft gedaan, kunt u beveiligde berichten instellen op dit apparaat, waarmee de berichtgeschiedenis van dit apparaat herversleuteld zal worden met een nieuwe herstelmethode.",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Als u de herstelmethode niet heeft verwijderd, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel een nieuwe herstelmethode in in de instellingen.",
-    "Failed to set direct chat tag": "Instellen van tweegesprekslabel is mislukt",
-    "Failed to remove tag %(tagName)s from room": "Verwijderen van %(tagName)s-label van gesprek is mislukt",
-    "Failed to add tag %(tagName)s to room": "Toevoegen van %(tagName)s-label aan gesprek is mislukt",
-    "Show recently visited rooms above the room list": "Recent bezochte gesprekken bovenoan de gesprekslyste weregeevn"
+    "A new recovery passphrase and key for Secure Messages have been detected.": "’t Zyn e nieuw herstelpaswoord en e nieuwen herstelsleuter vo beveiligde berichtn gedetecteerd.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "A je gy deze nieuwe herstelmethode nie èt ingesteld, is ’t meuglik dat der een anvaller toegank tout jen account probeert te verkrygn. Wyzigt ounmiddellik jen accountpaswoord en stelt e nieuwe herstelmethode in in d’instelliengn.",
+    "This device is encrypting history using the new recovery method.": "Dit toestel versleutert de geschiedenisse met de nieuwe herstelmethode.",
+    "Go to Settings": "Goa noa d’instelliengn",
+    "Set up Secure Messages": "Beveiligde berichtn instelln",
+    "Recovery Method Removed": "Herstelmethode verwyderd",
+    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Dit toestel è gedetecteerd da jen herstelpaswoord en -sleuter vo beveiligde berichtn zyn verwyderd.",
+    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "A je dit per accident è gedoan, ku je beveiligde berichtn instelln ip dit toestel, woamee da de berichtgeschiedenisse van dit toestel herversleuterd goa wordn met e nieuwe herstelmethode.",
+    "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.": "A je de herstelmethode nie è verwyderd, is ’t meuglik dat der een anvaller toegank tout jen account probeert te verkrygn. Wyzigt ounmiddellik jen accountpaswoord en stelt e nieuwe herstelmethode in in d’instelliengn.",
+    "Failed to set direct chat tag": "Instelln van twigesprekslabel is mislukt",
+    "Failed to remove tag %(tagName)s from room": "Verwydern van %(tagName)s-label van gesprek is mislukt",
+    "Failed to add tag %(tagName)s to room": "Toevoegn van %(tagName)s-label an gesprek is mislukt",
+    "Show recently visited rooms above the room list": "Recent bezochte gesprekken bovenoan de gesprekslyste weregeevn",
+    "Custom Notification Sounds": "Angepaste meldiengsgeluudn",
+    "Uploaded sound": "Ipgeloadn-geluud",
+    "Sounds": "Geluudn",
+    "Notification sound": "Meldiengsgeluud",
+    "Reset": "Herinstelln",
+    "Set a new custom sound": "Stelt e nieuw angepast geluud in",
+    "Browse": "Bloadern",
+    "Cannot reach homeserver": "Kostege de thuusserver nie bereikn",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Zorgt da j’e stabiele internetverbiendienge èt, of neem contact op met de systeembeheerder",
+    "Your Riot is misconfigured": "Je Riot is verkeerd geconfigureerd gewist",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Vroagt an je Riot-beheerder van <a>je configuroatie</a> noa te kykn ip verkeerde of duplicoate items.",
+    "Unexpected error resolving identity server configuration": "Ounverwachte foute by ’t iplossn van d’identiteitsserverconfiguroatie",
+    "Use lowercase letters, numbers, dashes and underscores only": "Gebruukt alleene moa letters, cyfers, streeptjes en underscores"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index a5d5d87f8f..31e370abed 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1983,5 +1983,15 @@
     "Notification sound": "通知音效",
     "Reset": "重設",
     "Set a new custom sound": "設定新的自訂音效",
-    "Browse": "瀏覽"
+    "Browse": "瀏覽",
+    "Cannot reach homeserver": "無法存取家伺服器",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "請確定您有穩定的網路連線，或與伺服器管理員聯繫",
+    "Your Riot is misconfigured": "您的 Riot 沒有設定好",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "請要求您的 Riot 管理員檢查<a>您的設定</a>是否有不正確或重覆的項目。",
+    "Unexpected error resolving identity server configuration": "解析身份識別伺服器設定時發生未預期的錯誤",
+    "Use lowercase letters, numbers, dashes and underscores only": "僅能使用小寫字母、數字、破折號與底線",
+    "Cannot reach identity server": "無法連線至身份識別伺服器",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "您可以註冊，但有些功能在身份識別伺服器重新上線前會沒辦法運作。如果您一直看到這個警告，請檢查您的設定或聯絡伺服器管理員。",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "您可以重設密碼，但有些功能在身份識別伺服器重新上線前會沒辦法運作。如果您一直看到這個警告，請檢查您的設定或聯絡伺服器管理員。",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "您可以登入，但有些功能在身份識別伺服器重新上線前會沒辦法運作。如果您一直看到這個警告，請檢查您的設定或聯絡伺服器管理員。"
 }
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 0850039344..06823e5d2a 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -14,11 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import {AutoDiscovery} from "matrix-js-sdk";
-import {_td, newTranslatableError} from "../languageHandler";
+import {_t, _td, newTranslatableError} from "../languageHandler";
 import {makeType} from "./TypeUtils";
 import SdkConfig from "../SdkConfig";
 
+const LIVELINESS_DISCOVERY_ERRORS = [
+    AutoDiscovery.ERROR_INVALID_HOMESERVER,
+    AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER,
+];
+
 export class ValidatedServerConfig {
     hsUrl: string;
     hsName: string;
@@ -31,7 +37,96 @@ export class ValidatedServerConfig {
 }
 
 export default class AutoDiscoveryUtils {
-    static async validateServerConfigWithStaticUrls(homeserverUrl: string, identityUrl: string): ValidatedServerConfig {
+    /**
+     * Checks if a given error or error message is considered an error
+     * relating to the liveliness of the server. Must be an error returned
+     * from this AutoDiscoveryUtils class.
+     * @param {string|Error} error The error to check
+     * @returns {boolean} True if the error is a liveliness error.
+     */
+    static isLivelinessError(error: string|Error): boolean {
+        if (!error) return false;
+        return !!LIVELINESS_DISCOVERY_ERRORS.find(e => e === error || e === error.message);
+    }
+
+    /**
+     * Gets the common state for auth components (login, registration, forgot
+     * password) for a given validation error.
+     * @param {Error} err The error encountered.
+     * @param {string} pageName The page for which the error should be customized to. See
+     * implementation for known values.
+     * @returns {*} The state for the component, given the error.
+     */
+    static authComponentStateForError(err: Error, pageName="login"): Object {
+        let title = _t("Cannot reach homeserver");
+        let body = _t("Ensure you have a stable internet connection, or get in touch with the server admin");
+        if (!AutoDiscoveryUtils.isLivelinessError(err)) {
+            title = _t("Your Riot is misconfigured");
+            body = _t(
+                "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.",
+                {}, {
+                    a: (sub) => {
+                        return <a
+                            href="https://github.com/vector-im/riot-web#configjson"
+                            target="_blank"
+                            rel="noopener"
+                        >{sub}</a>;
+                    },
+                },
+            );
+        }
+
+        let isFatalError = true;
+        const errorMessage = err.message ? err.message : err;
+        if (errorMessage === AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER) {
+            isFatalError = false;
+            title = _t("Cannot reach identity server");
+
+            // It's annoying having a ladder for the third word in the same sentence, but our translations
+            // don't make this easy to avoid.
+            if (pageName === "register") {
+                body = _t(
+                    "You can register, but some features will be unavailable until the identity server is " +
+                    "back online. If you keep seeing this warning, check your configuration or contact a server " +
+                    "admin.",
+                );
+            } else if (pageName === "reset_password") {
+                body = _t(
+                    "You can reset your password, but some features will be unavailable until the identity " +
+                    "server is back online. If you keep seeing this warning, check your configuration or contact " +
+                    "a server admin.",
+                );
+            } else {
+                body = _t(
+                    "You can log in, but some features will be unavailable until the identity server is " +
+                    "back online. If you keep seeing this warning, check your configuration or contact a server " +
+                    "admin.",
+                );
+            }
+        }
+
+        return {
+            serverIsAlive: false,
+            serverErrorIsFatal: isFatalError,
+            serverDeadError: (
+                <div>
+                    <strong>{title}</strong>
+                    <div>{body}</div>
+                </div>
+            ),
+        };
+    }
+
+    /**
+     * Validates a server configuration, using a pair of URLs as input.
+     * @param {string} homeserverUrl The homeserver URL.
+     * @param {string} identityUrl The identity server URL.
+     * @param {boolean} syntaxOnly If true, errors relating to liveliness of the servers will
+     * not be raised.
+     * @returns {Promise<ValidatedServerConfig>} Resolves to the validated configuration.
+     */
+    static async validateServerConfigWithStaticUrls(
+        homeserverUrl: string, identityUrl: string, syntaxOnly = false): ValidatedServerConfig {
         if (!homeserverUrl) {
             throw newTranslatableError(_td("No homeserver URL provided"));
         }
@@ -50,15 +145,32 @@ export default class AutoDiscoveryUtils {
         const url = new URL(homeserverUrl);
         const serverName = url.hostname;
 
-        return AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, result);
+        return AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, result, syntaxOnly);
     }
 
-    static async validateServerName(serverName: string): ValidatedServerConfig {
+    /**
+     * Validates a server configuration, using a homeserver domain name as input.
+     * @param {string} serverName The homeserver domain name (eg: "matrix.org") to validate.
+     * @param {boolean} syntaxOnly If true, errors relating to liveliness of the servers will
+     * not be raised.
+     * @returns {Promise<ValidatedServerConfig>} Resolves to the validated configuration.
+     */
+    static async validateServerName(serverName: string, syntaxOnly=false): ValidatedServerConfig {
         const result = await AutoDiscovery.findClientConfig(serverName);
         return AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, result);
     }
 
-    static buildValidatedConfigFromDiscovery(serverName: string, discoveryResult): ValidatedServerConfig {
+    /**
+     * Validates a server configuration, using a pre-calculated AutoDiscovery result as
+     * input.
+     * @param {string} serverName The domain name the AutoDiscovery result is for.
+     * @param {*} discoveryResult The AutoDiscovery result.
+     * @param {boolean} syntaxOnly If true, errors relating to liveliness of the servers will
+     * not be raised.
+     * @returns {Promise<ValidatedServerConfig>} Resolves to the validated configuration.
+     */
+    static buildValidatedConfigFromDiscovery(
+        serverName: string, discoveryResult, syntaxOnly=false): ValidatedServerConfig {
         if (!discoveryResult || !discoveryResult["m.homeserver"]) {
             // This shouldn't happen without major misconfiguration, so we'll log a bit of information
             // in the log so we can find this bit of codee but otherwise tell teh user "it broke".
@@ -67,20 +179,44 @@ export default class AutoDiscoveryUtils {
         }
 
         const hsResult = discoveryResult['m.homeserver'];
-        if (hsResult.state !== AutoDiscovery.SUCCESS) {
-            if (AutoDiscovery.ALL_ERRORS.indexOf(hsResult.error) !== -1) {
-                throw newTranslatableError(hsResult.error);
-            }
-            throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));
-        }
-
         const isResult = discoveryResult['m.identity_server'];
+
+        // Validate the identity server first because an invalid identity server causes
+        // and invalid homeserver, which may not be picked up correctly.
+
+        // Note: In the cases where we rely on this pre-populated "https://vector.im" (namely
+        // lack of identity server provided by the discovery method), we intentionally do not
+        // validate it. We already know the IS is an IS, and this helps some off-the-grid usage
+        // of Riot.
         let preferredIdentityUrl = "https://vector.im";
         if (isResult && isResult.state === AutoDiscovery.SUCCESS) {
             preferredIdentityUrl = isResult["base_url"];
         } else if (isResult && isResult.state !== AutoDiscovery.PROMPT) {
             console.error("Error determining preferred identity server URL:", isResult);
-            throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));
+            if (!syntaxOnly || !AutoDiscoveryUtils.isLivelinessError(isResult.error)) {
+                if (AutoDiscovery.ALL_ERRORS.indexOf(isResult.error) !== -1) {
+                    throw newTranslatableError(isResult.error);
+                }
+                throw newTranslatableError(_td("Unexpected error resolving identity server configuration"));
+            } // else the error is not related to syntax - continue anyways.
+
+            // rewrite homeserver error if we don't care about problems
+            if (syntaxOnly) {
+                hsResult.error = AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER;
+
+                // Also use the user's supplied identity server if provided
+                if (isResult["base_url"]) preferredIdentityUrl = isResult["base_url"];
+            }
+        }
+
+        if (hsResult.state !== AutoDiscovery.SUCCESS) {
+            console.error("Error processing homeserver config:", hsResult);
+            if (!syntaxOnly || !AutoDiscoveryUtils.isLivelinessError(hsResult.error)) {
+                if (AutoDiscovery.ALL_ERRORS.indexOf(hsResult.error) !== -1) {
+                    throw newTranslatableError(hsResult.error);
+                }
+                throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));
+            } // else the error is not related to syntax - continue anyways.
         }
 
         const preferredHomeserverUrl = hsResult["base_url"];
diff --git a/src/utils/EditorStateTransfer.js b/src/utils/EditorStateTransfer.js
new file mode 100644
index 0000000000..c7782a9ea8
--- /dev/null
+++ b/src/utils/EditorStateTransfer.js
@@ -0,0 +1,49 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Used while editing, to pass the event, and to preserve editor state
+ * from one editor instance to another when remounting the editor
+ * upon receiving the remote echo for an unsent event.
+ */
+export default class EditorStateTransfer {
+    constructor(event) {
+        this._event = event;
+        this._serializedParts = null;
+        this.caret = null;
+    }
+
+    setEditorState(caret, serializedParts) {
+        this._caret = caret;
+        this._serializedParts = serializedParts;
+    }
+
+    hasEditorState() {
+        return !!this._serializedParts;
+    }
+
+    getSerializedParts() {
+        return this._serializedParts;
+    }
+
+    getCaret() {
+        return this._caret;
+    }
+
+    getEvent() {
+        return this._event;
+    }
+}
diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index ff20a68e3c..ffc47e2277 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -46,8 +46,12 @@ export function isContentActionable(mxEvent) {
 }
 
 export function canEditContent(mxEvent) {
-    return isContentActionable(mxEvent) &&
-        mxEvent.getOriginalContent().msgtype === "m.text" &&
+    if (mxEvent.status === EventStatus.CANCELLED || mxEvent.getType() !== "m.room.message") {
+        return false;
+    }
+    const content = mxEvent.getOriginalContent();
+    const {msgtype} = content;
+    return (msgtype === "m.text" || msgtype === "m.emote") &&
         mxEvent.getSender() === MatrixClientPeg.get().getUserId();
 }
 
@@ -64,7 +68,7 @@ export function canEditOwnEvent(mxEvent) {
 const MAX_JUMP_DISTANCE = 100;
 export function findEditableEvent(room, isForward, fromEventId = undefined) {
     const liveTimeline = room.getLiveTimeline();
-    const events = liveTimeline.getEvents();
+    const events = liveTimeline.getEvents().concat(room.getPendingEvents());
     const maxIdx = events.length - 1;
     const inc = isForward ? 1 : -1;
     const beginIdx = isForward ? 0 : maxIdx;
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index 6914ed71d7..6a8b35fbc0 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -69,9 +69,11 @@ describe('Registration', function() {
 
         const root = render();
 
-        // Set non-empty flows to get past the loading spinner
+        // Set non-empty flow & matrixClient to get past the loading spinner
         root.setState({
             flows: [],
+            matrixClient: {},
+            busy: false,
         });
 
         const form = ReactTestUtils.findRenderedComponentWithType(
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index 88d1c804ca..2d1fb29bd9 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -103,12 +103,6 @@ describe('InteractiveAuthDialog', function() {
                 password: "s3kr3t",
                 user: "@user:id",
             })).toBe(true);
-
-            // there should now be a spinner
-            ReactTestUtils.findRenderedComponentWithType(
-                dlg, sdk.getComponent('elements.Spinner'),
-            );
-
             // let the request complete
             return Promise.delay(1);
         }).then(() => {