From 75a2be1a8d2564bbd531652afc17ca7734e842c8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 23 Apr 2018 01:13:18 +0100
Subject: [PATCH 001/702] WIP (doesn't build yet) replacing draft with slate

---
 package.json                                  |   7 +-
 src/ComposerHistoryManager.js                 |  51 ++++---
 .../views/rooms/MessageComposerInput.js       | 135 ++++++++++--------
 src/stores/MessageComposerStore.js            |  20 +--
 4 files changed, 125 insertions(+), 88 deletions(-)

diff --git a/package.json b/package.json
index 77338b4874..7856304757 100644
--- a/package.json
+++ b/package.json
@@ -58,9 +58,6 @@
     "classnames": "^2.1.2",
     "commonmark": "^0.28.1",
     "counterpart": "^0.18.0",
-    "draft-js": "^0.11.0-alpha",
-    "draft-js-export-html": "^0.6.0",
-    "draft-js-export-markdown": "^0.3.0",
     "emojione": "2.2.7",
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
@@ -84,6 +81,10 @@
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^15.6.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
+    "slate": "^0.33.4",
+    "slate-react": "^0.12.4",
+    "slate-html-serializer": "^0.6.1",
+    "slate-md-serializer": "^3.0.3",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 2757c5bd3d..5c9ae26af0 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -15,38 +15,55 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ContentState, convertToRaw, convertFromRaw} from 'draft-js';
+import { Value } from 'slate';
+import Html from 'slate-html-serializer';
+import Markdown as Md from 'slate-md-serializer';
+import Plain from 'slate-plain-serializer';
 import * as RichText from './RichText';
 import Markdown from './Markdown';
+
 import _clamp from 'lodash/clamp';
 
-type MessageFormat = 'html' | 'markdown';
+type MessageFormat = 'rich' | 'markdown';
 
 class HistoryItem {
 
     // Keeping message for backwards-compatibility
     message: string;
-    rawContentState: RawDraftContentState;
-    format: MessageFormat = 'html';
+    value: Value;
+    format: MessageFormat = 'rich';
 
-    constructor(contentState: ?ContentState, format: ?MessageFormat) {
+    constructor(value: ?Value, format: ?MessageFormat) {
         this.rawContentState = contentState ? convertToRaw(contentState) : null;
         this.format = format;
+
     }
 
-    toContentState(outputFormat: MessageFormat): ContentState {
-        const contentState = convertFromRaw(this.rawContentState);
+    toValue(outputFormat: MessageFormat): Value {
         if (outputFormat === 'markdown') {
-            if (this.format === 'html') {
-                return ContentState.createFromText(RichText.stateToMarkdown(contentState));
+            if (this.format === 'rich') {
+                // convert a rich formatted history entry to its MD equivalent
+                const markdown = new Markdown({});
+                return new Value({ data: markdown.serialize(value) });
+                // return ContentState.createFromText(RichText.stateToMarkdown(contentState));
             }
-        } else {
+            else if (this.format === 'markdown') {
+                return value;
+            }
+        } else if (outputFormat === 'rich') {
             if (this.format === 'markdown') {
-                return RichText.htmlToContentState(new Markdown(contentState.getPlainText()).toHTML());
+                // convert MD formatted string to its rich equivalent.
+                const plain = new Plain({});
+                const md = new Md({});
+                return md.deserialize(plain.serialize(value));
+                // return RichText.htmlToContentState(new Markdown(contentState.getPlainText()).toHTML());
+            }
+            else if (this.format === 'rich') {
+                return value;
             }
         }
-        // history item has format === outputFormat
-        return contentState;
+        log.error("unknown format -> outputFormat conversion");
+        return value;
     }
 }
 
@@ -69,16 +86,16 @@ export default class ComposerHistoryManager {
         this.lastIndex = this.currentIndex;
     }
 
-    save(contentState: ContentState, format: MessageFormat) {
-        const item = new HistoryItem(contentState, format);
+    save(value: Value, format: MessageFormat) {
+        const item = new HistoryItem(value, format);
         this.history.push(item);
         this.currentIndex = this.lastIndex + 1;
         sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item));
     }
 
-    getItem(offset: number, format: MessageFormat): ?ContentState {
+    getItem(offset: number, format: MessageFormat): ?Value {
         this.currentIndex = _clamp(this.currentIndex + offset, 0, this.lastIndex - 1);
         const item = this.history[this.currentIndex];
-        return item ? item.toContentState(format) : null;
+        return item ? item.toValue(format) : null;
     }
 }
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c142d97b28..1984f72bf9 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -18,9 +18,16 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
-import {Editor, EditorState, RichUtils, CompositeDecorator, Modifier,
-    getDefaultKeyBinding, KeyBindingUtil, ContentState, ContentBlock, SelectionState,
-    Entity} from 'draft-js';
+import { Editor } from 'slate-react';
+import { Value } from 'slate';
+
+import Html from 'slate-html-serializer';
+import Markdown as Md from 'slate-md-serializer';
+import Plain from 'slate-plain-serializer';
+
+// import {Editor, EditorState, RichUtils, CompositeDecorator, Modifier,
+//     getDefaultKeyBinding, KeyBindingUtil, ContentState, ContentBlock, SelectionState,
+//     Entity} from 'draft-js';
 
 import classNames from 'classnames';
 import escape from 'lodash/escape';
@@ -61,20 +68,10 @@ const REGEX_EMOJI_WHITESPACE = new RegExp('(?:^|\\s)(' + asciiRegexp + ')\\s$');
 
 const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;
 
-const ZWS_CODE = 8203;
-const ZWS = String.fromCharCode(ZWS_CODE); // zero width space
-
 const ENTITY_TYPES = {
     AT_ROOM_PILL: 'ATROOMPILL',
 };
 
-function stateToMarkdown(state) {
-    return __stateToMarkdown(state)
-        .replace(
-            ZWS, // draft-js-export-markdown adds these
-            ''); // this is *not* a zero width space, trust me :)
-}
-
 function onSendMessageFailed(err, room) {
     // XXX: temporary logging to try to diagnose
     // https://github.com/vector-im/riot-web/issues/3148
@@ -103,8 +100,6 @@ export default class MessageComposerInput extends React.Component {
     };
 
     static getKeyBinding(ev: SyntheticKeyboardEvent): string {
-        const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
-
         // Restrict a subset of key bindings to ONLY having ctrl/meta* pressed and
         // importantly NOT having alt, shift, meta/ctrl* pressed. draft-js does not
         // handle this in `getDefaultKeyBinding` so we do it ourselves here.
@@ -121,7 +116,7 @@ export default class MessageComposerInput extends React.Component {
         }[ev.keyCode];
 
         if (ctrlCmdCommand) {
-            if (!ctrlCmdOnly) {
+            if (!isOnlyCtrlOrCmdKeyEvent(ev)) {
                 return null;
             }
             return ctrlCmdCommand;
@@ -145,17 +140,6 @@ export default class MessageComposerInput extends React.Component {
 
     constructor(props, context) {
         super(props, context);
-        this.onAction = this.onAction.bind(this);
-        this.handleReturn = this.handleReturn.bind(this);
-        this.handleKeyCommand = this.handleKeyCommand.bind(this);
-        this.onEditorContentChanged = this.onEditorContentChanged.bind(this);
-        this.onUpArrow = this.onUpArrow.bind(this);
-        this.onDownArrow = this.onDownArrow.bind(this);
-        this.onTab = this.onTab.bind(this);
-        this.onEscape = this.onEscape.bind(this);
-        this.setDisplayedCompletion = this.setDisplayedCompletion.bind(this);
-        this.onMarkdownToggleClicked = this.onMarkdownToggleClicked.bind(this);
-        this.onTextPasted = this.onTextPasted.bind(this);
 
         const isRichtextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
 
@@ -185,6 +169,7 @@ export default class MessageComposerInput extends React.Component {
         this.client = MatrixClientPeg.get();
     }
 
+/*
     findPillEntities(contentState: ContentState, contentBlock: ContentBlock, callback) {
         contentBlock.findEntityRanges(
             (character) => {
@@ -199,13 +184,15 @@ export default class MessageComposerInput extends React.Component {
             }, callback,
         );
     }
+*/
 
     /*
-     * "Does the right thing" to create an EditorState, based on:
+     * "Does the right thing" to create an Editor value, based on:
      * - whether we've got rich text mode enabled
      * - contentState was passed in
      */
-    createEditorState(richText: boolean, contentState: ?ContentState): EditorState {
+    createEditorState(richText: boolean, value: ?Value): Value {
+/*
         const decorators = richText ? RichText.getScopedRTDecorators(this.props) :
                 RichText.getScopedMDDecorators(this.props);
         const shouldShowPillAvatar = !SettingsStore.getValue("Pill.shouldHidePillAvatar");
@@ -239,7 +226,6 @@ export default class MessageComposerInput extends React.Component {
             },
         });
         const compositeDecorator = new CompositeDecorator(decorators);
-
         let editorState = null;
         if (contentState) {
             editorState = EditorState.createWithContent(contentState, compositeDecorator);
@@ -248,6 +234,8 @@ export default class MessageComposerInput extends React.Component {
         }
 
         return EditorState.moveFocusToEnd(editorState);
+*/
+        return value;        
     }
 
     componentDidMount() {
@@ -260,12 +248,14 @@ export default class MessageComposerInput extends React.Component {
     }
 
     componentWillUpdate(nextProps, nextState) {
+/*        
         // this is dirty, but moving all this state to MessageComposer is dirtier
         if (this.props.onInputStateChanged && nextState !== this.state) {
             const state = this.getSelectionInfo(nextState.editorState);
             state.isRichtextEnabled = nextState.isRichtextEnabled;
             this.props.onInputStateChanged(state);
         }
+*/        
     }
 
     onAction = (payload) => {
@@ -277,6 +267,7 @@ export default class MessageComposerInput extends React.Component {
             case 'focus_composer':
                 editor.focus();
                 break;
+/*                
             case 'insert_mention': {
                 // Pretend that we've autocompleted this user because keeping two code
                 // paths for inserting a user pill is not fun
@@ -322,6 +313,7 @@ export default class MessageComposerInput extends React.Component {
                 }
             }
                 break;
+*/                
         }
     };
 
@@ -372,7 +364,7 @@ export default class MessageComposerInput extends React.Component {
 
     stopServerTypingTimer() {
         if (this.serverTypingTimer) {
-            clearTimeout(this.servrTypingTimer);
+            clearTimeout(this.serverTypingTimer);
             this.serverTypingTimer = null;
         }
     }
@@ -492,9 +484,9 @@ export default class MessageComposerInput extends React.Component {
             // Record the editor state for this room so that it can be retrieved after
             // switching to another room and back
             dis.dispatch({
-                action: 'content_state',
+                action: 'editor_state',
                 room_id: this.props.room.roomId,
-                content_state: state.editorState.getCurrentContent(),
+                editor_state: state.editorState.getCurrentContent(),
             });
 
             if (!state.hasOwnProperty('originalEditorState')) {
@@ -528,28 +520,36 @@ export default class MessageComposerInput extends React.Component {
     enableRichtext(enabled: boolean) {
         if (enabled === this.state.isRichtextEnabled) return;
 
-        let contentState = null;
+        // FIXME: this conversion should be handled in the store, surely
+        // i.e. "convert my current composer value into Rich or MD, as ComposerHistoryManager already does"
+
+        let value = null;
         if (enabled) {
-            const md = new Markdown(this.state.editorState.getCurrentContent().getPlainText());
-            contentState = RichText.htmlToContentState(md.toHTML());
+            // const md = new Markdown(this.state.editorState.getCurrentContent().getPlainText());
+            // contentState = RichText.htmlToContentState(md.toHTML());
+
+            const plain = new Plain({});
+            const md = new Md({});
+            value = md.deserialize(plain.serialize(this.state.editorState));
         } else {
-            let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
-            if (markdown[markdown.length - 1] === '\n') {
-                markdown = markdown.substring(0, markdown.length - 1); // stateToMarkdown tacks on an extra newline (?!?)
-            }
-            contentState = ContentState.createFromText(markdown);
+            // let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
+            // value = ContentState.createFromText(markdown);
+
+            const markdown = new Markdown({});
+            value = Value({ data: markdown.serialize(value) });
         }
 
         Analytics.setRichtextMode(enabled);
 
         this.setState({
-            editorState: this.createEditorState(enabled, contentState),
+            editorState: this.createEditorState(enabled, value),
             isRichtextEnabled: enabled,
         });
         SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled);
     }
 
     handleKeyCommand = (command: string): boolean => {
+/*
         if (command === 'toggle-mode') {
             this.enableRichtext(!this.state.isRichtextEnabled);
             return true;
@@ -658,11 +658,11 @@ export default class MessageComposerInput extends React.Component {
             this.setState({editorState: newState});
             return true;
         }
-
+*/    
         return false;
     };
-
-    onTextPasted(text: string, html?: string) {
+/*
+    onTextPasted = (text: string, html?: string) => {
         const currentSelection = this.state.editorState.getSelection();
         const currentContent = this.state.editorState.getCurrentContent();
 
@@ -682,9 +682,10 @@ export default class MessageComposerInput extends React.Component {
         newEditorState = EditorState.forceSelection(newEditorState, contentState.getSelectionAfter());
         this.onEditorContentChanged(newEditorState);
         return true;
-    }
-
-    handleReturn(ev) {
+    };
+*/
+    handleReturn = (ev) => {
+/*        
         if (ev.shiftKey) {
             this.onEditorContentChanged(RichUtils.insertSoftNewline(this.state.editorState));
             return true;
@@ -701,15 +702,21 @@ export default class MessageComposerInput extends React.Component {
             // See handleKeyCommand (when command === 'backspace')
             return false;
         }
-
-        const contentState = this.state.editorState.getCurrentContent();
+*/
+        const contentState = this.state.editorState;
+/*
         if (!contentState.hasText()) {
             return true;
         }
+*/
 
+        const plain = new Plain({});
+        value = md.deserialize();
 
-        let contentText = contentState.getPlainText(), contentHTML;
+        let contentText = plain.serialize(contentState);
+        let contentHTML;
 
+/*
         // Strip MD user (tab-completed) mentions to preserve plaintext mention behaviour.
         // We have to do this now as opposed to after calculating the contentText for MD
         // mode because entity positions may not be maintained when using
@@ -720,10 +727,12 @@ export default class MessageComposerInput extends React.Component {
 
         // Some commands (/join) require pills to be replaced with their text content
         const commandText = this.removeMDLinks(contentState, ['#']);
+*/
+        const commandText = contentText;
         const cmd = SlashCommands.processInput(this.props.room.roomId, commandText);
         if (cmd) {
             if (!cmd.error) {
-                this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'html' : 'markdown');
+                this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'rich' : 'markdown');
                 this.setState({
                     editorState: this.createEditorState(),
                 });
@@ -754,6 +763,7 @@ export default class MessageComposerInput extends React.Component {
         const quotingEv = RoomViewStore.getQuotingEvent();
 
         if (this.state.isRichtextEnabled) {
+/*
             // We should only send HTML if any block is styled or contains inline style
             let shouldSendHTML = false;
 
@@ -788,6 +798,8 @@ export default class MessageComposerInput extends React.Component {
                 });
                 shouldSendHTML = hasLink;
             }
+*/
+            let shouldSendHTML = true;            
             if (shouldSendHTML) {
                 contentHTML = HtmlUtils.processHtmlForSending(
                     RichText.contentStateToHTML(contentState),
@@ -797,6 +809,7 @@ export default class MessageComposerInput extends React.Component {
             // Use the original contentState because `contentText` has had mentions
             // stripped and these need to end up in contentHTML.
 
+/*
             // Replace all Entities of type `LINK` with markdown link equivalents.
             // TODO: move this into `Markdown` and do the same conversion in the other
             // two places (toggling from MD->RT mode and loading MD history into RT mode)
@@ -817,7 +830,7 @@ export default class MessageComposerInput extends React.Component {
                 });
                 return blockText;
             }).join('\n');
-
+*/
             const md = new Markdown(pt);
             // if contains no HTML and we're not quoting (needing HTML)
             if (md.isPlainText() && !quotingEv) {
@@ -832,7 +845,7 @@ export default class MessageComposerInput extends React.Component {
 
         this.historyManager.save(
             contentState,
-            this.state.isRichtextEnabled ? 'html' : 'markdown',
+            this.state.isRichtextEnabled ? 'rich' : 'markdown',
         );
 
         if (contentText.startsWith('/me')) {
@@ -881,7 +894,7 @@ export default class MessageComposerInput extends React.Component {
         });
 
         return true;
-    }
+    };
 
     onUpArrow = (e) => {
         this.onVerticalArrow(e, true);
@@ -896,6 +909,7 @@ export default class MessageComposerInput extends React.Component {
             return;
         }
 
+/*
         // Select history only if we are not currently auto-completing
         if (this.autocomplete.state.completionList.length === 0) {
             // Don't go back in history if we're in the middle of a multi-line message
@@ -927,8 +941,10 @@ export default class MessageComposerInput extends React.Component {
             this.moveAutocompleteSelection(up);
             e.preventDefault();
         }
+*/        
     };
 
+/*
     selectHistory = async (up) => {
         const delta = up ? -1 : 1;
 
@@ -950,7 +966,7 @@ export default class MessageComposerInput extends React.Component {
             return;
         }
 
-        const newContent = this.historyManager.getItem(delta, this.state.isRichtextEnabled ? 'html' : 'markdown');
+        const newContent = this.historyManager.getItem(delta, this.state.isRichtextEnabled ? 'rich' : 'markdown');
         if (!newContent) return false;
         let editorState = EditorState.push(
             this.state.editorState,
@@ -969,6 +985,7 @@ export default class MessageComposerInput extends React.Component {
         this.setState({editorState});
         return true;
     };
+*/    
 
     onTab = async (e) => {
         this.setState({
@@ -1061,8 +1078,9 @@ export default class MessageComposerInput extends React.Component {
         return true;
     };
 
-    onFormatButtonClicked(name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", e) {
+    onFormatButtonClicked = (name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", e) => {
         e.preventDefault(); // don't steal focus from the editor!
+/*
         const command = {
                 code: 'code-block',
                 quote: 'blockquote',
@@ -1070,7 +1088,8 @@ export default class MessageComposerInput extends React.Component {
                 numbullet: 'ordered-list-item',
             }[name] || name;
         this.handleKeyCommand(command);
-    }
+*/        
+    };
 
     /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
      buttons. */
diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index d02bcf953f..3b1ab1fa72 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -14,16 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import dis from '../dispatcher';
-import {Store} from 'flux/utils';
-import {convertToRaw, convertFromRaw} from 'draft-js';
+import { Store } from 'flux/utils';
 
 const INITIAL_STATE = {
-    editorStateMap: localStorage.getItem('content_state') ?
-        JSON.parse(localStorage.getItem('content_state')) : {},
+    // a map of room_id to rich text editor composer state
+    editorStateMap: localStorage.getItem('editor_state') ?
+        JSON.parse(localStorage.getItem('editor_state')) : {},
 };
 
 /**
- * A class for storing application state to do with the message composer. This is a simple
+ * A class for storing application state to do with the message composer (specifically
+ * in-progress message drafts). This is a simple
  * flux store that listens for actions and updates its state accordingly, informing any
  * listeners (views) of state changes.
  */
@@ -42,7 +43,7 @@ class MessageComposerStore extends Store {
 
     __onDispatch(payload) {
         switch (payload.action) {
-            case 'content_state':
+            case 'editor_state':
                 this._contentState(payload);
                 break;
             case 'on_logged_out':
@@ -53,16 +54,15 @@ class MessageComposerStore extends Store {
 
     _contentState(payload) {
         const editorStateMap = this._state.editorStateMap;
-        editorStateMap[payload.room_id] = convertToRaw(payload.content_state);
-        localStorage.setItem('content_state', JSON.stringify(editorStateMap));
+        editorStateMap[payload.room_id] = payload.editor_state;
+        localStorage.setItem('editor_state', JSON.stringify(editorStateMap));
         this._setState({
             editorStateMap: editorStateMap,
         });
     }
 
     getContentState(roomId) {
-        return this._state.editorStateMap[roomId] ?
-            convertFromRaw(this._state.editorStateMap[roomId]) : null;
+        return this._state.editorStateMap[roomId];
     }
 
     reset() {

From e62e43def6401a0c9c518308418f5a90fc2b10b1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 5 May 2018 23:25:04 +0100
Subject: [PATCH 002/702] comment out more draft stuff

---
 src/ComposerHistoryManager.js                 |  2 +-
 src/components/views/avatars/RoomAvatar.js    |  2 +-
 .../views/rooms/MessageComposerInput.js       | 36 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 5c9ae26af0..938be9eee4 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import { Value } from 'slate';
 import Html from 'slate-html-serializer';
-import Markdown as Md from 'slate-md-serializer';
+import { Markdown as Md } from 'slate-md-serializer';
 import Plain from 'slate-plain-serializer';
 import * as RichText from './RichText';
 import Markdown from './Markdown';
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 499e575227..e37d8d5d19 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -177,7 +177,7 @@ module.exports = React.createClass({
     render: function() {
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
-        const {room, oobData, ...otherProps} = this.props;
+        const {room, oobData, viewAvatarOnClick, ...otherProps} = this.props;
 
         const roomName = room ? room.name : oobData.name;
 
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c8523acea1..af942a75e6 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -22,7 +22,7 @@ import { Editor } from 'slate-react';
 import { Value } from 'slate';
 
 import Html from 'slate-html-serializer';
-import Markdown as Md from 'slate-md-serializer';
+import { Markdown as Md } from 'slate-md-serializer';
 import Plain from 'slate-plain-serializer';
 
 // import {Editor, EditorState, RichUtils, CompositeDecorator, Modifier,
@@ -1103,6 +1103,10 @@ export default class MessageComposerInput extends React.Component {
     /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
      buttons. */
     getSelectionInfo(editorState: EditorState) {
+        return {
+            [], null
+        };
+/*
         const styleName = {
             BOLD: _td('bold'),
             ITALIC: _td('italic'),
@@ -1130,13 +1134,17 @@ export default class MessageComposerInput extends React.Component {
             style,
             blockType,
         };
+*/
     }
 
     getAutocompleteQuery(contentState: ContentState) {
+        return [];
+
         // Don't send markdown links to the autocompleter
-        return this.removeMDLinks(contentState, ['@', '#']);
+        // return this.removeMDLinks(contentState, ['@', '#']);
     }
 
+/*
     removeMDLinks(contentState: ContentState, prefixes: string[]) {
         const plaintext = contentState.getPlainText();
         if (!plaintext) return '';
@@ -1169,7 +1177,7 @@ export default class MessageComposerInput extends React.Component {
             }
         });
     }
-
+*/
     onMarkdownToggleClicked = (e) => {
         e.preventDefault(); // don't steal focus from the editor!
         this.handleKeyCommand('toggle-mode');
@@ -1178,25 +1186,14 @@ export default class MessageComposerInput extends React.Component {
     render() {
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
-        // From https://github.com/facebook/draft-js/blob/master/examples/rich/rich.html#L92
-        // If the user changes block type before entering any text, we can
-        // either style the placeholder or hide it.
-        let hidePlaceholder = false;
-        const contentState = activeEditorState.getCurrentContent();
-        if (!contentState.hasText()) {
-            if (contentState.getBlockMap().first().getType() !== 'unstyled') {
-                hidePlaceholder = true;
-            }
-        }
-
         const className = classNames('mx_MessageComposer_input', {
             mx_MessageComposer_input_empty: hidePlaceholder,
             mx_MessageComposer_input_error: this.state.someCompletions === false,
         });
 
-        const content = activeEditorState.getCurrentContent();
-        const selection = RichText.selectionStateToTextOffsets(activeEditorState.getSelection(),
-            activeEditorState.getCurrentContent().getBlocksAsArray());
+        // const content = activeEditorState.getCurrentContent();
+        // const selection = RichText.selectionStateToTextOffsets(activeEditorState.getSelection(),
+        //     activeEditorState.getCurrentContent().getBlocksAsArray());
 
         return (
             <div className="mx_MessageComposer_input_wrapper">
@@ -1219,6 +1216,7 @@ export default class MessageComposerInput extends React.Component {
                     <Editor ref="editor"
                             dir="auto"
                             placeholder={this.props.placeholder}
+                            /*
                             editorState={this.state.editorState}
                             onChange={this.onEditorContentChanged}
                             blockStyleFn={MessageComposerInput.getBlockStyle}
@@ -1232,7 +1230,9 @@ export default class MessageComposerInput extends React.Component {
                             onUpArrow={this.onUpArrow}
                             onDownArrow={this.onDownArrow}
                             onEscape={this.onEscape}
-                            spellCheck={true} />
+                            spellCheck={true}
+                            */
+                            />
                 </div>
             </div>
         );

From f4ed820b6f0d8bb4d0aa6441c7633a334d47afcc Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 5 May 2018 23:38:14 +0100
Subject: [PATCH 003/702] fix stubbing

---
 src/components/views/rooms/MessageComposerInput.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index af942a75e6..6290a5c15d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1103,9 +1103,7 @@ export default class MessageComposerInput extends React.Component {
     /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
      buttons. */
     getSelectionInfo(editorState: EditorState) {
-        return {
-            [], null
-        };
+        return {};
 /*
         const styleName = {
             BOLD: _td('bold'),

From 05eba3fa32703b075c9012f125b9a79cf135e038 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 6 May 2018 00:18:11 +0100
Subject: [PATCH 004/702] stub out more until it loads...

---
 .../views/rooms/MessageComposerInput.js       | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 6290a5c15d..e7cbb1abde 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -237,7 +237,13 @@ export default class MessageComposerInput extends React.Component {
 
         return EditorState.moveFocusToEnd(editorState);
 */
-        return value;        
+        if (value) {
+            // create with this value
+        }
+        else {
+            value = Value.create();
+        }
+        return value;
     }
 
     componentDidMount() {
@@ -262,7 +268,7 @@ export default class MessageComposerInput extends React.Component {
 
     onAction = (payload) => {
         const editor = this.refs.editor;
-        let contentState = this.state.editorState.getCurrentContent();
+        let editorState = this.state.editorState;
 
         switch (payload.action) {
             case 'reply_to_event':
@@ -1030,6 +1036,7 @@ export default class MessageComposerInput extends React.Component {
      * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
      */
     setDisplayedCompletion = async (displayedCompletion: ?Completion): boolean => {
+/*        
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
         if (displayedCompletion == null) {
@@ -1084,6 +1091,7 @@ export default class MessageComposerInput extends React.Component {
 
         // for some reason, doing this right away does not update the editor :(
         // setTimeout(() => this.refs.editor.focus(), 50);
+*/        
         return true;
     };
 
@@ -1102,7 +1110,7 @@ export default class MessageComposerInput extends React.Component {
 
     /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
      buttons. */
-    getSelectionInfo(editorState: EditorState) {
+    getSelectionInfo(editorState: Value) {
         return {};
 /*
         const styleName = {
@@ -1136,7 +1144,7 @@ export default class MessageComposerInput extends React.Component {
     }
 
     getAutocompleteQuery(contentState: ContentState) {
-        return [];
+        return '';
 
         // Don't send markdown links to the autocompleter
         // return this.removeMDLinks(contentState, ['@', '#']);
@@ -1184,11 +1192,20 @@ export default class MessageComposerInput extends React.Component {
     render() {
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
+        let hidePlaceholder = false;
+        // FIXME: in case we need to implement manual placeholdering
+
         const className = classNames('mx_MessageComposer_input', {
             mx_MessageComposer_input_empty: hidePlaceholder,
             mx_MessageComposer_input_error: this.state.someCompletions === false,
         });
 
+        const content = null;
+        const selection = {
+            start: 0,
+            end: 0,
+        };
+
         // const content = activeEditorState.getCurrentContent();
         // const selection = RichText.selectionStateToTextOffsets(activeEditorState.getSelection(),
         //     activeEditorState.getCurrentContent().getBlocksAsArray());
@@ -1214,6 +1231,7 @@ export default class MessageComposerInput extends React.Component {
                     <Editor ref="editor"
                             dir="auto"
                             placeholder={this.props.placeholder}
+                            value={this.state.editorState}
                             /*
                             editorState={this.state.editorState}
                             onChange={this.onEditorContentChanged}

From a2233a48c24b15a24940499ae5bcb5df32dd8ebe Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 6 May 2018 01:18:26 +0100
Subject: [PATCH 005/702] stub out yet more

---
 res/css/views/rooms/_MessageComposer.scss     |  8 ++++++
 .../views/rooms/MessageComposerInput.js       | 26 ++++++++++++-------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 2e8f07b7ef..531c4442c1 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -84,6 +84,14 @@ limitations under the License.
     margin-right: 6px;
 }
 
+.mx_MessageComposer_editor {
+    width: 100%;
+    flex: 1;
+    max-height: 120px;
+    min-height: 21px;
+    overflow: auto;
+}
+
 @keyframes visualbell
 {
     from { background-color: #faa }
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index e7cbb1abde..e560ddb5c7 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
 import { Editor } from 'slate-react';
-import { Value } from 'slate';
+import { Value, Document } from 'slate';
 
 import Html from 'slate-html-serializer';
 import { Markdown as Md } from 'slate-md-serializer';
@@ -238,12 +238,17 @@ export default class MessageComposerInput extends React.Component {
         return EditorState.moveFocusToEnd(editorState);
 */
         if (value) {
-            // create with this value
+            // create from the existing value...
         }
         else {
-            value = Value.create();
+            // ...or create a new one.
         }
-        return value;
+
+        return Value.create({
+            document: Document.create({
+                nodes: [],
+            }),
+        });
     }
 
     componentDidMount() {
@@ -394,6 +399,7 @@ export default class MessageComposerInput extends React.Component {
 
     // Called by Draft to change editor contents
     onEditorContentChanged = (editorState: EditorState) => {
+/*        
         editorState = RichText.attachImmutableEntitiesToEmoji(editorState);
 
         const currentBlock = editorState.getSelection().getStartKey();
@@ -449,7 +455,7 @@ export default class MessageComposerInput extends React.Component {
                 editorState = EditorState.forceSelection(editorState, newContentState.getSelectionAfter());
             }
         }
-
+*/
         /* Since a modification was made, set originalEditorState to null, since newState is now our original */
         this.setState({
             editorState,
@@ -466,6 +472,7 @@ export default class MessageComposerInput extends React.Component {
      * @param callback
      */
     setState(state, callback) {
+/*            
         if (state.editorState != null) {
             state.editorState = RichText.attachImmutableEntitiesToEmoji(
                 state.editorState);
@@ -501,12 +508,12 @@ export default class MessageComposerInput extends React.Component {
                 state.originalEditorState = null;
             }
         }
-
+*/        
         super.setState(state, () => {
             if (callback != null) {
                 callback();
             }
-
+/*
             const textContent = this.state.editorState.getCurrentContent().getPlainText();
             const selection = RichText.selectionStateToTextOffsets(
                 this.state.editorState.getSelection(),
@@ -522,6 +529,7 @@ export default class MessageComposerInput extends React.Component {
                 let editorRoot = this.refs.editor.refs.editor.parentNode.parentNode;
                 editorRoot.scrollTop = editorRoot.scrollHeight;
             }
+*/        
         });
     }
 
@@ -1230,11 +1238,11 @@ export default class MessageComposerInput extends React.Component {
                          src={`img/button-md-${!this.state.isRichtextEnabled}.png`} />
                     <Editor ref="editor"
                             dir="auto"
+                            className="mx_MessageComposer_editor"
                             placeholder={this.props.placeholder}
                             value={this.state.editorState}
-                            /*
-                            editorState={this.state.editorState}
                             onChange={this.onEditorContentChanged}
+                            /*
                             blockStyleFn={MessageComposerInput.getBlockStyle}
                             keyBindingFn={MessageComposerInput.getKeyBinding}
                             handleKeyCommand={this.handleKeyCommand}

From 190f6d948354631ca037c912989045bb277b9046 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 6 May 2018 15:27:27 +0100
Subject: [PATCH 006/702] make slate actually work as a textarea

---
 .../views/rooms/MessageComposerInput.js           | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index e560ddb5c7..9a0863810e 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -237,18 +237,13 @@ export default class MessageComposerInput extends React.Component {
 
         return EditorState.moveFocusToEnd(editorState);
 */
-        if (value) {
-            // create from the existing value...
+        if (value instanceof Value) {
+            return value;
         }
         else {
             // ...or create a new one.
+            return Plain.deserialize('')
         }
-
-        return Value.create({
-            document: Document.create({
-                nodes: [],
-            }),
-        });
     }
 
     componentDidMount() {
@@ -398,7 +393,7 @@ export default class MessageComposerInput extends React.Component {
     }
 
     // Called by Draft to change editor contents
-    onEditorContentChanged = (editorState: EditorState) => {
+    onEditorContentChanged = (change: Change) => {
 /*        
         editorState = RichText.attachImmutableEntitiesToEmoji(editorState);
 
@@ -458,7 +453,7 @@ export default class MessageComposerInput extends React.Component {
 */
         /* Since a modification was made, set originalEditorState to null, since newState is now our original */
         this.setState({
-            editorState,
+            editorState: change.value,
             originalEditorState: null,
         });
     };

From ff42ef4a58baf57580cd504b103b474a46dbb4cf Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 6 May 2018 22:08:36 +0100
Subject: [PATCH 007/702] make it work for MD mode (modulo history)

---
 src/ComposerHistoryManager.js                 | 10 ++--
 src/RichText.js                               | 48 +++++++++++++------
 .../views/rooms/MessageComposerInput.js       | 31 ++++++------
 3 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 938be9eee4..e52a8a677f 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -34,17 +34,15 @@ class HistoryItem {
     format: MessageFormat = 'rich';
 
     constructor(value: ?Value, format: ?MessageFormat) {
-        this.rawContentState = contentState ? convertToRaw(contentState) : null;
+        this.value = value;
         this.format = format;
-
     }
 
     toValue(outputFormat: MessageFormat): Value {
         if (outputFormat === 'markdown') {
             if (this.format === 'rich') {
                 // convert a rich formatted history entry to its MD equivalent
-                const markdown = new Markdown({});
-                return new Value({ data: markdown.serialize(value) });
+                return Plain.deserialize(Md.serialize(value));
                 // return ContentState.createFromText(RichText.stateToMarkdown(contentState));
             }
             else if (this.format === 'markdown') {
@@ -53,9 +51,7 @@ class HistoryItem {
         } else if (outputFormat === 'rich') {
             if (this.format === 'markdown') {
                 // convert MD formatted string to its rich equivalent.
-                const plain = new Plain({});
-                const md = new Md({});
-                return md.deserialize(plain.serialize(value));
+                return Md.deserialize(Plain.serialize(value));
                 // return RichText.htmlToContentState(new Markdown(contentState.getPlainText()).toHTML());
             }
             else if (this.format === 'rich') {
diff --git a/src/RichText.js b/src/RichText.js
index 12274ee9f3..7ffb4dd785 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -1,4 +1,24 @@
+/*
+Copyright 2015 - 2017 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
+
+/*
 import {
     Editor,
     EditorState,
@@ -12,11 +32,15 @@ import {
     SelectionState,
     Entity,
 } from 'draft-js';
+import { stateToMarkdown as __stateToMarkdown } from 'draft-js-export-markdown';
+*/
+
+import Html from 'slate-html-serializer';
+
 import * as sdk from './index';
 import * as emojione from 'emojione';
-import {stateToHTML} from 'draft-js-export-html';
-import {SelectionRange} from "./autocomplete/Autocompleter";
-import {stateToMarkdown as __stateToMarkdown} from 'draft-js-export-markdown';
+
+import { SelectionRange } from "./autocomplete/Autocompleter";
 
 const MARKDOWN_REGEX = {
     LINK: /(?:\[([^\]]+)\]\(([^\)]+)\))|\<(\w+:\/\/[^\>]+)\>/g,
@@ -33,6 +57,7 @@ const EMOJI_REGEX = new RegExp(emojione.unicodeRegexp, 'g');
 
 const ZWS_CODE = 8203;
 const ZWS = String.fromCharCode(ZWS_CODE); // zero width space
+
 export function stateToMarkdown(state) {
     return __stateToMarkdown(state)
         .replace(
@@ -40,19 +65,12 @@ export function stateToMarkdown(state) {
             ''); // this is *not* a zero width space, trust me :)
 }
 
-export const contentStateToHTML = (contentState: ContentState) => {
-    return stateToHTML(contentState, {
-        inlineStyles: {
-            UNDERLINE: {
-                element: 'u',
-            },
-        },
-    });
-};
+export const editorStateToHTML = (editorState: Value) => {
+    return Html.deserialize(editorState);
+}
 
-export function htmlToContentState(html: string): ContentState {
-    const blockArray = convertFromHTML(html).contentBlocks;
-    return ContentState.createFromBlockArray(blockArray);
+export function htmlToEditorState(html: string): Value {
+    return Html.serialize(html);
 }
 
 function unicodeToEmojiUri(str) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 9a0863810e..53f7a6d474 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
 import { Editor } from 'slate-react';
-import { Value, Document } from 'slate';
+import { Value, Document, Event } from 'slate';
 
 import Html from 'slate-html-serializer';
 import { Markdown as Md } from 'slate-md-serializer';
@@ -539,15 +539,12 @@ export default class MessageComposerInput extends React.Component {
             // const md = new Markdown(this.state.editorState.getCurrentContent().getPlainText());
             // contentState = RichText.htmlToContentState(md.toHTML());
 
-            const plain = new Plain({});
-            const md = new Md({});
-            value = md.deserialize(plain.serialize(this.state.editorState));
+            value = Md.deserialize(Plain.serialize(this.state.editorState));
         } else {
             // let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
             // value = ContentState.createFromText(markdown);
 
-            const markdown = new Markdown({});
-            value = Value({ data: markdown.serialize(value) });
+            value = Plain.deserialize(Md.serialize(this.state.editorState));
         }
 
         Analytics.setRichtextMode(enabled);
@@ -559,6 +556,12 @@ export default class MessageComposerInput extends React.Component {
         SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled);
     }
 
+    onKeyDown = (ev: Event, change: Change, editor: Editor) => {
+        if (ev.keyCode === KeyCode.ENTER) {
+            return this.handleReturn(ev);
+        }
+    }
+
     handleKeyCommand = (command: string): boolean => {
 /*
         if (command === 'toggle-mode') {
@@ -721,10 +724,7 @@ export default class MessageComposerInput extends React.Component {
         }
 */
 
-        const plain = new Plain({});
-        value = md.deserialize();
-
-        let contentText = plain.serialize(contentState);
+        let contentText = Plain.serialize(contentState);
         let contentHTML;
 
 /*
@@ -808,10 +808,10 @@ export default class MessageComposerInput extends React.Component {
                 shouldSendHTML = hasLink;
             }
 */
-            let shouldSendHTML = true;            
+            let shouldSendHTML = true;
             if (shouldSendHTML) {
                 contentHTML = HtmlUtils.processHtmlForSending(
-                    RichText.contentStateToHTML(contentState),
+                    RichText.editorStateToHTML(contentState),
                 );
             }
         } else {
@@ -840,11 +840,12 @@ export default class MessageComposerInput extends React.Component {
                 return blockText;
             }).join('\n');
 */
-            const md = new Markdown(pt);
+            const md = new Markdown(contentText);
             // if contains no HTML and we're not quoting (needing HTML)
             if (md.isPlainText() && !mustSendHTML) {
                 contentText = md.toPlaintext();
             } else {
+                contentText = md.toPlaintext();
                 contentHTML = md.toHTML();
             }
         }
@@ -898,7 +899,6 @@ export default class MessageComposerInput extends React.Component {
             });
         }
 
-
         this.client.sendMessage(this.props.room.roomId, content).then((res) => {
             dis.dispatch({
                 action: 'message_sent',
@@ -909,7 +909,7 @@ export default class MessageComposerInput extends React.Component {
 
         this.setState({
             editorState: this.createEditorState(),
-        });
+        }, ()=>{ this.refs.editor.focus() });
 
         return true;
     };
@@ -1237,6 +1237,7 @@ export default class MessageComposerInput extends React.Component {
                             placeholder={this.props.placeholder}
                             value={this.state.editorState}
                             onChange={this.onEditorContentChanged}
+                            onKeyDown={this.onKeyDown}
                             /*
                             blockStyleFn={MessageComposerInput.getBlockStyle}
                             keyBindingFn={MessageComposerInput.getKeyBinding}

From 8b2eb2c4003acc63af3689e9ff7e4f235b32ed39 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 8 May 2018 01:54:06 +0100
Subject: [PATCH 008/702] make history work again

---
 res/css/views/rooms/_MessageComposer.scss     |   7 +-
 src/ComposerHistoryManager.js                 |  30 +++--
 .../views/rooms/MessageComposerInput.js       | 108 +++++++++---------
 3 files changed, 78 insertions(+), 67 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 531c4442c1..a11ebeff7b 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -78,7 +78,7 @@ limitations under the License.
     display: flex;
     flex-direction: column;
     min-height: 60px;
-    justify-content: center;
+    justify-content: start;
     align-items: flex-start;
     font-size: 14px;
     margin-right: 6px;
@@ -86,9 +86,8 @@ limitations under the License.
 
 .mx_MessageComposer_editor {
     width: 100%;
-    flex: 1;
     max-height: 120px;
-    min-height: 21px;
+    min-height: 19px;
     overflow: auto;
 }
 
@@ -106,6 +105,7 @@ limitations under the License.
     display: none;
 }
 
+/*
 .mx_MessageComposer_input .DraftEditor-root {
     width: 100%;
     flex: 1;
@@ -114,6 +114,7 @@ limitations under the License.
     min-height: 21px;
     overflow: auto;
 }
+*/
 
 .mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
     /* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index e52a8a677f..9a6970a376 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -38,28 +38,44 @@ class HistoryItem {
         this.format = format;
     }
 
+    static fromJSON(obj): HistoryItem {
+        return new HistoryItem(
+            Value.fromJSON(obj.value),
+            obj.format
+        );
+    }
+
+    toJSON(): Object {
+        return {
+            value: this.value.toJSON(),
+            format: this.format
+        };
+    }
+
+    // FIXME: rather than supporting storing history in either format, why don't we pick
+    // one canonical form?
     toValue(outputFormat: MessageFormat): Value {
         if (outputFormat === 'markdown') {
             if (this.format === 'rich') {
                 // convert a rich formatted history entry to its MD equivalent
-                return Plain.deserialize(Md.serialize(value));
+                return Plain.deserialize(Md.serialize(this.value));
                 // return ContentState.createFromText(RichText.stateToMarkdown(contentState));
             }
             else if (this.format === 'markdown') {
-                return value;
+                return this.value;
             }
         } else if (outputFormat === 'rich') {
             if (this.format === 'markdown') {
                 // convert MD formatted string to its rich equivalent.
-                return Md.deserialize(Plain.serialize(value));
+                return Md.deserialize(Plain.serialize(this.value));
                 // return RichText.htmlToContentState(new Markdown(contentState.getPlainText()).toHTML());
             }
             else if (this.format === 'rich') {
-                return value;
+                return this.value;
             }
         }
         log.error("unknown format -> outputFormat conversion");
-        return value;
+        return this.value;
     }
 }
 
@@ -76,7 +92,7 @@ export default class ComposerHistoryManager {
         let item;
         for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) {
             this.history.push(
-                Object.assign(new HistoryItem(), JSON.parse(item)),
+                HistoryItem.fromJSON(JSON.parse(item))
             );
         }
         this.lastIndex = this.currentIndex;
@@ -86,7 +102,7 @@ export default class ComposerHistoryManager {
         const item = new HistoryItem(value, format);
         this.history.push(item);
         this.currentIndex = this.lastIndex + 1;
-        sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item));
+        sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item.toJSON()));
     }
 
     getItem(offset: number, format: MessageFormat): ?Value {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 53f7a6d474..4b950c429d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
@@ -101,6 +102,7 @@ export default class MessageComposerInput extends React.Component {
         onInputStateChanged: PropTypes.func,
     };
 
+/*
     static getKeyBinding(ev: SyntheticKeyboardEvent): string {
         // Restrict a subset of key bindings to ONLY having ctrl/meta* pressed and
         // importantly NOT having alt, shift, meta/ctrl* pressed. draft-js does not
@@ -135,6 +137,7 @@ export default class MessageComposerInput extends React.Component {
 
         return null;
     }
+*/    
 
     client: MatrixClient;
     autocomplete: Autocomplete;
@@ -392,8 +395,7 @@ export default class MessageComposerInput extends React.Component {
         }
     }
 
-    // Called by Draft to change editor contents
-    onEditorContentChanged = (change: Change) => {
+    onChange = (change: Change) => {
 /*        
         editorState = RichText.attachImmutableEntitiesToEmoji(editorState);
 
@@ -557,17 +559,25 @@ export default class MessageComposerInput extends React.Component {
     }
 
     onKeyDown = (ev: Event, change: Change, editor: Editor) => {
-        if (ev.keyCode === KeyCode.ENTER) {
-            return this.handleReturn(ev);
+        switch (ev.keyCode) {
+            case KeyCode.ENTER:
+                return this.handleReturn(ev);
+            case KeyCode.UP:
+                return this.onVerticalArrow(ev, true);
+            case KeyCode.DOWN:
+                return this.onVerticalArrow(ev, false);
+            default:
+                // don't intercept it
+                return;
         }
     }
 
     handleKeyCommand = (command: string): boolean => {
-/*
         if (command === 'toggle-mode') {
             this.enableRichtext(!this.state.isRichtextEnabled);
             return true;
         }
+/*
         let newState: ?EditorState = null;
 
         // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
@@ -699,12 +709,10 @@ export default class MessageComposerInput extends React.Component {
     };
 */
     handleReturn = (ev) => {
-/*        
         if (ev.shiftKey) {
-            this.onEditorContentChanged(RichUtils.insertSoftNewline(this.state.editorState));
-            return true;
+            return;
         }
-
+/*
         const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
         if (
             ['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item']
@@ -718,15 +726,12 @@ export default class MessageComposerInput extends React.Component {
         }
 */
         const contentState = this.state.editorState;
-/*
-        if (!contentState.hasText()) {
-            return true;
-        }
-*/
 
         let contentText = Plain.serialize(contentState);
         let contentHTML;
 
+        if (contentText === '') return true;
+
 /*
         // Strip MD user (tab-completed) mentions to preserve plaintext mention behaviour.
         // We have to do this now as opposed to after calculating the contentText for MD
@@ -914,41 +919,39 @@ export default class MessageComposerInput extends React.Component {
         return true;
     };
 
-    onUpArrow = (e) => {
-        this.onVerticalArrow(e, true);
-    };
-
-    onDownArrow = (e) => {
-        this.onVerticalArrow(e, false);
-    };
-
     onVerticalArrow = (e, up) => {
         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) {
-            // Don't go back in history if we're in the middle of a multi-line message
-            const selection = this.state.editorState.getSelection();
-            const blockKey = selection.getStartKey();
-            const firstBlock = this.state.editorState.getCurrentContent().getFirstBlock();
-            const lastBlock = this.state.editorState.getCurrentContent().getLastBlock();
 
-            let canMoveUp = false;
-            let canMoveDown = false;
-            if (blockKey === firstBlock.getKey()) {
-                canMoveUp = selection.getStartOffset() === selection.getEndOffset() &&
-                    selection.getStartOffset() === 0;
+            // determine whether our cursor is at the top or bottom of the multiline
+            // input box by just looking at the position of the plain old DOM selection.
+            const selection = window.getSelection();
+            const range = selection.getRangeAt(0);
+            const cursorRect = range.getBoundingClientRect();
+
+            const editorNode = ReactDOM.findDOMNode(this.refs.editor);
+            const editorRect = editorNode.getBoundingClientRect();
+
+            let navigateHistory = false;
+            if (up) {
+                let scrollCorrection = editorNode.scrollTop;
+                if (cursorRect.top - editorRect.top + scrollCorrection == 0) {
+                    navigateHistory = true;
+                }
+            }
+            else {
+                let scrollCorrection =
+                    editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop;
+                if (cursorRect.bottom - editorRect.bottom + scrollCorrection == 0) {
+                    navigateHistory = true;
+                }
             }
 
-            if (blockKey === lastBlock.getKey()) {
-                canMoveDown = selection.getStartOffset() === selection.getEndOffset() &&
-                    selection.getStartOffset() === lastBlock.getText().length;
-            }
-
-            if ((up && !canMoveUp) || (!up && !canMoveDown)) return;
+            if (!navigateHistory) return;
 
             const selected = this.selectHistory(up);
             if (selected) {
@@ -959,10 +962,8 @@ export default class MessageComposerInput extends React.Component {
             this.moveAutocompleteSelection(up);
             e.preventDefault();
         }
-*/        
     };
 
-/*
     selectHistory = async (up) => {
         const delta = up ? -1 : 1;
 
@@ -984,26 +985,19 @@ export default class MessageComposerInput extends React.Component {
             return;
         }
 
-        const newContent = this.historyManager.getItem(delta, this.state.isRichtextEnabled ? 'rich' : 'markdown');
-        if (!newContent) return false;
-        let editorState = EditorState.push(
-            this.state.editorState,
-            newContent,
-            'insert-characters',
-        );
+        let editorState = this.historyManager.getItem(delta, this.state.isRichtextEnabled ? 'rich' : 'markdown');
 
         // Move selection to the end of the selected history
-        let newSelection = SelectionState.createEmpty(newContent.getLastBlock().getKey());
-        newSelection = newSelection.merge({
-            focusOffset: newContent.getLastBlock().getLength(),
-            anchorOffset: newContent.getLastBlock().getLength(),
-        });
-        editorState = EditorState.forceSelection(editorState, newSelection);
+        const change = editorState.change().collapseToEndOf(editorState.document);
+        // XXX: should we be calling this.onChange(change) now?
+        // we skip it for now given we know we're about to setState anyway
+        editorState = change.value;
 
-        this.setState({editorState});
+        this.setState({ editorState }, ()=>{
+            this.refs.editor.focus();
+        });
         return true;
     };
-*/    
 
     onTab = async (e) => {
         this.setState({
@@ -1236,7 +1230,7 @@ export default class MessageComposerInput extends React.Component {
                             className="mx_MessageComposer_editor"
                             placeholder={this.props.placeholder}
                             value={this.state.editorState}
-                            onChange={this.onEditorContentChanged}
+                            onChange={this.onChange}
                             onKeyDown={this.onKeyDown}
                             /*
                             blockStyleFn={MessageComposerInput.getBlockStyle}

From 984961a3ed22ddd233266c9f014c0a71fc1d05bd Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 8 May 2018 09:49:53 +0100
Subject: [PATCH 009/702] blind fix to the overlapping sticker bug

---
 src/components/views/messages/MStickerBody.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 08ddb6de20..501db5e22b 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -40,6 +40,7 @@ export default class MStickerBody extends MImageBody {
     }
 
     _onImageLoad() {
+        this.fixupHeight();
         this.setState({
             placeholderClasses: 'mx_MStickerBody_placeholder_invisible',
         });

From cbb8432873937e0fb4c03b26a5f7194b7cac907a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 9 May 2018 01:03:40 +0100
Subject: [PATCH 010/702] unbreak switching from draft to slate

---
 src/ComposerHistoryManager.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 9a6970a376..ce0eb8f0c3 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -74,7 +74,7 @@ class HistoryItem {
                 return this.value;
             }
         }
-        log.error("unknown format -> outputFormat conversion");
+        console.error("unknown format -> outputFormat conversion");
         return this.value;
     }
 }
@@ -91,9 +91,14 @@ export default class ComposerHistoryManager {
         // TODO: Performance issues?
         let item;
         for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) {
-            this.history.push(
-                HistoryItem.fromJSON(JSON.parse(item))
-            );
+            try {
+                this.history.push(
+                    HistoryItem.fromJSON(JSON.parse(item))
+                );
+            }
+            catch (e) {
+                console.warn("Throwing away unserialisable history", e);
+            }
         }
         this.lastIndex = this.currentIndex;
     }

From 410a1683fe05862e1b777aa32ba9cfe7fb0f069f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 12 May 2018 01:10:38 +0100
Subject: [PATCH 011/702] make autocomplete selection work

---
 .../views/rooms/MessageComposerInput.js       | 203 ++++++++++--------
 1 file changed, 112 insertions(+), 91 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 4b950c429d..f50acb8bef 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
 import { Editor } from 'slate-react';
-import { Value, Document, Event } from 'slate';
+import { Value, Document, Event, Inline, Range, Node } from 'slate';
 
 import Html from 'slate-html-serializer';
 import { Markdown as Md } from 'slate-md-serializer';
@@ -197,49 +197,6 @@ export default class MessageComposerInput extends React.Component {
      * - contentState was passed in
      */
     createEditorState(richText: boolean, value: ?Value): Value {
-/*
-        const decorators = richText ? RichText.getScopedRTDecorators(this.props) :
-                RichText.getScopedMDDecorators(this.props);
-        const shouldShowPillAvatar = !SettingsStore.getValue("Pill.shouldHidePillAvatar");
-        decorators.push({
-            strategy: this.findPillEntities.bind(this),
-            component: (entityProps) => {
-                const Pill = sdk.getComponent('elements.Pill');
-                const type = entityProps.contentState.getEntity(entityProps.entityKey).getType();
-                const {url} = entityProps.contentState.getEntity(entityProps.entityKey).getData();
-                if (type === ENTITY_TYPES.AT_ROOM_PILL) {
-                    return <Pill
-                        type={Pill.TYPE_AT_ROOM_MENTION}
-                        room={this.props.room}
-                        offsetKey={entityProps.offsetKey}
-                        shouldShowPillAvatar={shouldShowPillAvatar}
-                    />;
-                } else if (Pill.isPillUrl(url)) {
-                    return <Pill
-                        url={url}
-                        room={this.props.room}
-                        offsetKey={entityProps.offsetKey}
-                        shouldShowPillAvatar={shouldShowPillAvatar}
-                    />;
-                }
-
-                return (
-                    <a href={url} data-offset-key={entityProps.offsetKey}>
-                        { entityProps.children }
-                    </a>
-                );
-            },
-        });
-        const compositeDecorator = new CompositeDecorator(decorators);
-        let editorState = null;
-        if (contentState) {
-            editorState = EditorState.createWithContent(contentState, compositeDecorator);
-        } else {
-            editorState = EditorState.createEmpty(compositeDecorator);
-        }
-
-        return EditorState.moveFocusToEnd(editorState);
-*/
         if (value instanceof Value) {
             return value;
         }
@@ -566,6 +523,10 @@ export default class MessageComposerInput extends React.Component {
                 return this.onVerticalArrow(ev, true);
             case KeyCode.DOWN:
                 return this.onVerticalArrow(ev, false);
+            case KeyCode.TAB:
+                return this.onTab(ev);
+            case KeyCode.ESCAPE:
+                return this.onEscape(ev);
             default:
                 // don't intercept it
                 return;
@@ -938,15 +899,19 @@ export default class MessageComposerInput extends React.Component {
 
             let navigateHistory = false;
             if (up) {
-                let scrollCorrection = editorNode.scrollTop;
-                if (cursorRect.top - editorRect.top + scrollCorrection == 0) {
+                const scrollCorrection = editorNode.scrollTop;
+                const distanceFromTop = cursorRect.top - editorRect.top + scrollCorrection;
+                //console.log(`Cursor distance from editor top is ${distanceFromTop}`);
+                if (distanceFromTop == 0) {
                     navigateHistory = true;
                 }
             }
             else {
-                let scrollCorrection =
+                const scrollCorrection =
                     editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop;
-                if (cursorRect.bottom - editorRect.bottom + scrollCorrection == 0) {
+                const distanceFromBottom = cursorRect.bottom - editorRect.bottom + scrollCorrection;
+                //console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
+                if (distanceFromBottom == 0) {
                     navigateHistory = true;
                 }
             }
@@ -1033,38 +998,50 @@ export default class MessageComposerInput extends React.Component {
      * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
      */
     setDisplayedCompletion = async (displayedCompletion: ?Completion): boolean => {
-/*        
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
         if (displayedCompletion == null) {
             if (this.state.originalEditorState) {
                 let editorState = this.state.originalEditorState;
-                // This is a workaround from https://github.com/facebook/draft-js/issues/458
-                // Due to the way we swap editorStates, Draft does not rerender at times
-                editorState = EditorState.forceSelection(editorState,
-                    editorState.getSelection());
                 this.setState({editorState});
             }
             return false;
         }
 
         const {range = null, completion = '', href = null, suffix = ''} = displayedCompletion;
-        let contentState = activeEditorState.getCurrentContent();
 
-        let entityKey;
+        let inline;
         if (href) {
-            contentState = contentState.createEntity('LINK', 'IMMUTABLE', {
-                url: href,
-                isCompletion: true,
+            inline = Inline.create({
+                type: 'pill',
+                isVoid: true,
+                data: { url: href },
             });
-            entityKey = contentState.getLastCreatedEntityKey();
         } else if (completion === '@room') {
-            contentState = contentState.createEntity(ENTITY_TYPES.AT_ROOM_PILL, 'IMMUTABLE', {
-                isCompletion: true,
+            inline = Inline.create({
+                type: 'pill',
+                isVoid: true,
+                data: { type: Pill.TYPE_AT_ROOM_MENTION },
             });
-            entityKey = contentState.getLastCreatedEntityKey();
         }
 
+        let editorState = activeEditorState;
+
+        if (range) {
+            const change = editorState.change().moveOffsetsTo(range.start, range.end);
+            editorState = change.value;
+        }
+
+        const change = editorState.change().insertInlineAtRange(
+            editorState.selection, inline
+        );
+        editorState = change.value;
+
+        this.setState({ editorState, originalEditorState: activeEditorState }, ()=>{
+//            this.refs.editor.focus();
+        });
+
+/*
         let selection;
         if (range) {
             selection = RichText.textOffsetsToSelectionState(
@@ -1085,16 +1062,51 @@ export default class MessageComposerInput extends React.Component {
         let editorState = EditorState.push(activeEditorState, contentState, 'insert-characters');
         editorState = EditorState.forceSelection(editorState, contentState.getSelectionAfter());
         this.setState({editorState, originalEditorState: activeEditorState});
-
-        // for some reason, doing this right away does not update the editor :(
-        // setTimeout(() => this.refs.editor.focus(), 50);
-*/        
+*/
         return true;
     };
 
+    renderNode = props => {
+        const { attributes, children, node, isSelected } = props;
+
+        switch (node.type) {
+            case 'paragraph': {
+                return <p {...attributes}>{children}</p>
+            }
+            case 'pill': {
+                const { data, text } = node;
+                const url = data.get('url');
+                const type = data.get('type');
+
+                const shouldShowPillAvatar = !SettingsStore.getValue("Pill.shouldHidePillAvatar");
+                const Pill = sdk.getComponent('elements.Pill');
+
+                if (type === Pill.TYPE_AT_ROOM_MENTION) {
+                    return <Pill
+                            type={Pill.TYPE_AT_ROOM_MENTION}
+                            room={this.props.room}
+                            shouldShowPillAvatar={shouldShowPillAvatar}
+                            />;
+                }
+                else if (Pill.isPillUrl(url)) {
+                    return <Pill
+                            url={url}
+                            room={this.props.room}
+                            shouldShowPillAvatar={shouldShowPillAvatar}
+                            />;
+                }
+                else {
+                    return <a href={url} {...props.attributes}>
+                                { text }
+                           </a>;
+                }
+            }
+        }
+    };
+
     onFormatButtonClicked = (name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", e) => {
         e.preventDefault(); // don't steal focus from the editor!
-/*
+
         const command = {
                 code: 'code-block',
                 quote: 'blockquote',
@@ -1102,7 +1114,6 @@ export default class MessageComposerInput extends React.Component {
                 numbullet: 'ordered-list-item',
             }[name] || name;
         this.handleKeyCommand(command);
-*/        
     };
 
     /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
@@ -1140,14 +1151,41 @@ export default class MessageComposerInput extends React.Component {
 */
     }
 
-    getAutocompleteQuery(contentState: ContentState) {
-        return '';
+    getAutocompleteQuery(editorState: Value) {
+        // FIXME: do we really want to regenerate this every time the control is rerendered?
+        
+        // We can just return the current block where the selection begins, which
+        // should be enough to capture any autocompletion input, given autocompletion
+        // providers only search for the first match which intersects with the current selection.
+        // This avoids us having to serialize the whole thing to plaintext and convert
+        // selection offsets in & out of the plaintext domain.
+        return editorState.document.getDescendant(editorState.selection.anchorKey).text;
 
         // Don't send markdown links to the autocompleter
         // return this.removeMDLinks(contentState, ['@', '#']);
     }
 
+    getSelectionRange(editorState: Value) {
+        // return a character range suitable for handing to an autocomplete provider.
+        // the range is relative to the anchor of the current editor selection.
+        // if the selection spans multiple blocks, then we collapse it for the calculation.
+        const range = {
+            start: editorState.selection.anchorOffset,
+            end: (editorState.selection.anchorKey == editorState.selection.focusKey) ? 
+                 editorState.selection.focusOffset : editorState.selection.anchorOffset,
+        }
+        if (range.start > range.end) {
+            const tmp = range.start;
+            range.start = range.end;
+            range.end = tmp;
+        }
+        return range;
+    }
+
 /*
+    // delinkifies any matrix.to markdown links (i.e. pills) of form
+    // [#foo:matrix.org](https://matrix.to/#/#foo:matrix.org).
+    // the prefixes is an array of sigils that will be matched on.
     removeMDLinks(contentState: ContentState, prefixes: string[]) {
         const plaintext = contentState.getPlainText();
         if (!plaintext) return '';
@@ -1189,24 +1227,10 @@ export default class MessageComposerInput extends React.Component {
     render() {
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
-        let hidePlaceholder = false;
-        // FIXME: in case we need to implement manual placeholdering
-
         const className = classNames('mx_MessageComposer_input', {
-            mx_MessageComposer_input_empty: hidePlaceholder,
             mx_MessageComposer_input_error: this.state.someCompletions === false,
         });
 
-        const content = null;
-        const selection = {
-            start: 0,
-            end: 0,
-        };
-
-        // const content = activeEditorState.getCurrentContent();
-        // const selection = RichText.selectionStateToTextOffsets(activeEditorState.getSelection(),
-        //     activeEditorState.getCurrentContent().getBlocksAsArray());
-
         return (
             <div className="mx_MessageComposer_input_wrapper">
                 <div className="mx_MessageComposer_autocomplete_wrapper">
@@ -1216,8 +1240,8 @@ export default class MessageComposerInput extends React.Component {
                         room={this.props.room}
                         onConfirm={this.setDisplayedCompletion}
                         onSelectionChange={this.setDisplayedCompletion}
-                        query={this.getAutocompleteQuery(content)}
-                        selection={selection}
+                        query={this.getAutocompleteQuery(activeEditorState)}
+                        selection={this.getSelectionRange(activeEditorState)}
                     />
                 </div>
                 <div className={className}>
@@ -1232,6 +1256,8 @@ export default class MessageComposerInput extends React.Component {
                             value={this.state.editorState}
                             onChange={this.onChange}
                             onKeyDown={this.onKeyDown}
+                            renderNode={this.renderNode}
+                            spellCheck={true}
                             /*
                             blockStyleFn={MessageComposerInput.getBlockStyle}
                             keyBindingFn={MessageComposerInput.getKeyBinding}
@@ -1240,11 +1266,6 @@ export default class MessageComposerInput extends React.Component {
                             handlePastedText={this.onTextPasted}
                             handlePastedFiles={this.props.onFilesPasted}
                             stripPastedStyles={!this.state.isRichtextEnabled}
-                            onTab={this.onTab}
-                            onUpArrow={this.onUpArrow}
-                            onDownArrow={this.onDownArrow}
-                            onEscape={this.onEscape}
-                            spellCheck={true}
                             */
                             />
                 </div>

From d7c2c8ba7bfc8229176a588cdf530295e438792e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 12 May 2018 16:21:36 +0100
Subject: [PATCH 012/702] include the plaintext representation of a pill within
 it

---
 src/components/views/rooms/MessageComposerInput.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f50acb8bef..e1c5d1a190 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
 import { Editor } from 'slate-react';
-import { Value, Document, Event, Inline, Range, Node } from 'slate';
+import { Value, Document, Event, Inline, Text, Range, Node } from 'slate';
 
 import Html from 'slate-html-serializer';
 import { Markdown as Md } from 'slate-md-serializer';
@@ -781,6 +781,7 @@ export default class MessageComposerInput extends React.Component {
                 );
             }
         } else {
+
             // Use the original contentState because `contentText` has had mentions
             // stripped and these need to end up in contentHTML.
 
@@ -1014,14 +1015,14 @@ export default class MessageComposerInput extends React.Component {
         if (href) {
             inline = Inline.create({
                 type: 'pill',
-                isVoid: true,
                 data: { url: href },
+                nodes: [Text.create(completion)],
             });
         } else if (completion === '@room') {
             inline = Inline.create({
                 type: 'pill',
-                isVoid: true,
                 data: { type: Pill.TYPE_AT_ROOM_MENTION },
+                nodes: [Text.create(completion)],
             });
         }
 
@@ -1262,7 +1263,6 @@ export default class MessageComposerInput extends React.Component {
                             blockStyleFn={MessageComposerInput.getBlockStyle}
                             keyBindingFn={MessageComposerInput.getKeyBinding}
                             handleKeyCommand={this.handleKeyCommand}
-                            handleReturn={this.handleReturn}
                             handlePastedText={this.onTextPasted}
                             handlePastedFiles={this.props.onFilesPasted}
                             stripPastedStyles={!this.state.isRichtextEnabled}

From 9c0c806af4b272458cdd8874347982d86cc70ea0 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 12 May 2018 20:04:58 +0100
Subject: [PATCH 013/702] correctly send pills in messages

---
 src/Markdown.js                               |  13 ++-
 src/autocomplete/NotifProvider.js             |   1 +
 src/autocomplete/PlainWithPillsSerializer.js  |  89 ++++++++++++++
 src/autocomplete/RoomProvider.js              |   1 +
 src/autocomplete/UserProvider.js              |   1 +
 src/components/views/rooms/Autocomplete.js    |   2 -
 .../views/rooms/MessageComposerInput.js       | 109 +++++++++---------
 src/stores/MessageComposerStore.js            |   6 +-
 8 files changed, 159 insertions(+), 63 deletions(-)
 create mode 100644 src/autocomplete/PlainWithPillsSerializer.js

diff --git a/src/Markdown.js b/src/Markdown.js
index aa1c7e45b1..e67f4df4fd 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -133,7 +133,10 @@ export default class Markdown {
      * Render the markdown message to plain text. That is, essentially
      * just remove any backslashes escaping what would otherwise be
      * markdown syntax
-     * (to fix https://github.com/vector-im/riot-web/issues/2870)
+     * (to fix https://github.com/vector-im/riot-web/issues/2870).
+     *
+     * N.B. this does **NOT** render arbitrary MD to plain text - only MD
+     * which has no formatting.  Otherwise it emits HTML(!).
      */
     toPlaintext() {
         const renderer = new commonmark.HtmlRenderer({safe: false});
@@ -161,6 +164,14 @@ export default class Markdown {
             if (is_multi_line(node) && node.next) this.lit('\n\n');
         };
 
+        // convert MD links into console-friendly ' < http://foo >' style links
+        // ...except given this function never gets called with links, it's useless.
+        // renderer.link = function(node, entering) {
+        //     if (!entering) {
+        //         this.lit(` < ${node.destination} >`);
+        //     }
+        // };
+
         return renderer.render(this.parsed);
     }
 }
diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.js
index b7ac645525..5d2f05ecb9 100644
--- a/src/autocomplete/NotifProvider.js
+++ b/src/autocomplete/NotifProvider.js
@@ -40,6 +40,7 @@ export default class NotifProvider extends AutocompleteProvider {
         if (command && command[0] && '@room'.startsWith(command[0]) && command[0].length > 1) {
             return [{
                 completion: '@room',
+                completionId: '@room',
                 suffix: ' ',
                 component: (
                     <PillCompletion initialComponent={<RoomAvatar width={24} height={24} room={this.room} />} title="@room" description={_t("Notify the whole room")} />
diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
new file mode 100644
index 0000000000..77391d5bbb
--- /dev/null
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -0,0 +1,89 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Based originally on slate-plain-serializer
+
+import { Block } from 'slate';
+
+/**
+ * Plain text serializer, which converts a Slate `value` to a plain text string,
+ * serializing pills into various different formats as required.
+ *
+ * @type {PlainWithPillsSerializer}
+ */
+
+class PlainWithPillsSerializer {
+
+    /*
+     * @param {String} options.pillFormat - either 'md', 'plain', 'id'
+     */
+    constructor(options = {}) {
+        let {
+            pillFormat = 'plain',
+        } = options;
+        this.pillFormat = pillFormat;
+    }
+
+    /**
+     * Serialize a Slate `value` to a plain text string,
+     * serializing pills as either MD links, plain text representations or
+     * ID representations as required.
+     *
+     * @param {Value} value
+     * @return {String}
+     */
+    serialize = value => {
+        return this._serializeNode(value.document)
+    }
+
+    /**
+     * Serialize a `node` to plain text.
+     *
+     * @param {Node} node
+     * @return {String}
+     */
+    _serializeNode = node => {
+        if (
+            node.object == 'document' ||
+            (node.object == 'block' && Block.isBlockList(node.nodes))
+        ) {
+            return node.nodes.map(this._serializeNode).join('\n');
+        } else if (node.type == 'pill') {
+            switch (this.pillFormat) {
+                case 'plain':
+                    return node.text;
+                case 'md':
+                    return `[${ node.text }](${ node.data.get('url') })`;
+                case 'id':
+                    return node.data.completionId || node.text;
+            }
+        }
+        else if (node.nodes) {
+            return node.nodes.map(this._serializeNode).join('');
+        }
+        else {
+            return node.text;
+        }
+    }
+}
+
+/**
+ * Export.
+ *
+ * @type {PlainWithPillsSerializer}
+ */
+
+export default PlainWithPillsSerializer
\ No newline at end of file
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 31599703c2..b9346e75cc 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -78,6 +78,7 @@ export default class RoomProvider extends AutocompleteProvider {
                 const displayAlias = getDisplayAliasForRoom(room.room) || room.roomId;
                 return {
                     completion: displayAlias,
+                    completionId: displayAlias,
                     suffix: ' ',
                     href: makeRoomPermalink(displayAlias),
                     component: (
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index ce8f1020a1..a6dd13051b 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -113,6 +113,7 @@ export default class UserProvider extends AutocompleteProvider {
                     // Length of completion should equal length of text in decorator. draft-js
                     // relies on the length of the entity === length of the text in the decoration.
                     completion: user.rawDisplayName.replace(' (IRC)', ''),
+                    completionId: user.userId,
                     suffix: range.start === 0 ? ': ' : ' ',
                     href: makeUserPermalink(user.userId),
                     component: (
diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index 4fb2a29381..5b56727705 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -263,7 +263,6 @@ export default class Autocomplete extends React.Component {
                 const componentPosition = position;
                 position++;
 
-                const onMouseMove = () => this.setSelection(componentPosition);
                 const onClick = () => {
                     this.setSelection(componentPosition);
                     this.onCompletionClicked();
@@ -273,7 +272,6 @@ export default class Autocomplete extends React.Component {
                     key: i,
                     ref: `completion${position - 1}`,
                     className,
-                    onMouseMove,
                     onClick,
                 });
             });
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index e1c5d1a190..1bdbb86549 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -25,6 +25,7 @@ import { Value, Document, Event, Inline, Text, Range, Node } from 'slate';
 import Html from 'slate-html-serializer';
 import { Markdown as Md } from 'slate-md-serializer';
 import Plain from 'slate-plain-serializer';
+import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerializer";
 
 // import {Editor, EditorState, RichUtils, CompositeDecorator, Modifier,
 //     getDefaultKeyBinding, KeyBindingUtil, ContentState, ContentBlock, SelectionState,
@@ -157,7 +158,7 @@ export default class MessageComposerInput extends React.Component {
             // the currently displayed editor state (note: this is always what is modified on input)
             editorState: this.createEditorState(
                 isRichtextEnabled,
-                MessageComposerStore.getContentState(this.props.room.roomId),
+                MessageComposerStore.getEditorState(this.props.room.roomId),
             ),
 
             // the original editor state, before we started tabbing through completions
@@ -172,6 +173,10 @@ export default class MessageComposerInput extends React.Component {
         };
 
         this.client = MatrixClientPeg.get();
+
+        this.plainWithMdPills    = new PlainWithPillsSerializer({ pillFormat: 'md' });
+        this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
+        this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
     }
 
 /*
@@ -686,30 +691,27 @@ export default class MessageComposerInput extends React.Component {
             return false;
         }
 */
-        const contentState = this.state.editorState;
+        const editorState = this.state.editorState;
 
-        let contentText = Plain.serialize(contentState);
+        let contentText;
         let contentHTML;
 
-        if (contentText === '') return true;
+        // only look for commands if the first block contains simple unformatted text
+        // i.e. no pills or rich-text formatting.
+        let cmd, commandText;
+        const firstChild = editorState.document.nodes.get(0);
+        const firstGrandChild = firstChild && firstChild.nodes.get(0);
+        if (firstChild && firstGrandChild &&
+            firstChild.object === 'block' && firstGrandChild.object === 'text' &&
+            firstGrandChild.text[0] === '/' && firstGrandChild.text[1] !== '/')
+        {
+            commandText = this.plainWithIdPills.serialize(editorState);
+            cmd = SlashCommands.processInput(this.props.room.roomId, commandText);
+        }
 
-/*
-        // Strip MD user (tab-completed) mentions to preserve plaintext mention behaviour.
-        // We have to do this now as opposed to after calculating the contentText for MD
-        // mode because entity positions may not be maintained when using
-        // md.toPlaintext().
-        // Unfortunately this means we lose mentions in history when in MD mode. This
-        // would be fixed if history was stored as contentState.
-        contentText = this.removeMDLinks(contentState, ['@']);
-
-        // Some commands (/join) require pills to be replaced with their text content
-        const commandText = this.removeMDLinks(contentState, ['#']);
-*/
-        const commandText = contentText;
-        const cmd = SlashCommands.processInput(this.props.room.roomId, commandText);
         if (cmd) {
             if (!cmd.error) {
-                this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'rich' : 'markdown');
+                this.historyManager.save(editorState, this.state.isRichtextEnabled ? 'rich' : 'markdown');
                 this.setState({
                     editorState: this.createEditorState(),
                 });
@@ -774,46 +776,31 @@ export default class MessageComposerInput extends React.Component {
                 shouldSendHTML = hasLink;
             }
 */
+            contentText = this.plainWithPlainPills.serialize(editorState);
+            if (contentText === '') return true;
+
             let shouldSendHTML = true;
             if (shouldSendHTML) {
                 contentHTML = HtmlUtils.processHtmlForSending(
-                    RichText.editorStateToHTML(contentState),
+                    RichText.editorStateToHTML(editorState),
                 );
             }
         } else {
+            const sourceWithPills = this.plainWithMdPills.serialize(editorState);
+            if (sourceWithPills === '') return true;
 
-            // Use the original contentState because `contentText` has had mentions
-            // stripped and these need to end up in contentHTML.
+            const mdWithPills = new Markdown(sourceWithPills);
 
-/*
-            // Replace all Entities of type `LINK` with markdown link equivalents.
-            // TODO: move this into `Markdown` and do the same conversion in the other
-            // two places (toggling from MD->RT mode and loading MD history into RT mode)
-            // but this can only be done when history includes Entities.
-            const pt = contentState.getBlocksAsArray().map((block) => {
-                let blockText = block.getText();
-                let offset = 0;
-                this.findPillEntities(contentState, block, (start, end) => {
-                    const entity = contentState.getEntity(block.getEntityAt(start));
-                    if (entity.getType() !== 'LINK') {
-                        return;
-                    }
-                    const text = blockText.slice(offset + start, offset + end);
-                    const url = entity.getData().url;
-                    const mdLink = `[${text}](${url})`;
-                    blockText = blockText.slice(0, offset + start) + mdLink + blockText.slice(offset + end);
-                    offset += mdLink.length - text.length;
-                });
-                return blockText;
-            }).join('\n');
-*/
-            const md = new Markdown(contentText);
             // if contains no HTML and we're not quoting (needing HTML)
-            if (md.isPlainText() && !mustSendHTML) {
-                contentText = md.toPlaintext();
+            if (mdWithPills.isPlainText() && !mustSendHTML) {
+                // N.B. toPlainText is only usable here because we know that the MD
+                // didn't contain any formatting in the first place...
+                contentText = mdWithPills.toPlaintext();
             } else {
-                contentText = md.toPlaintext();
-                contentHTML = md.toHTML();
+                // to avoid ugliness clients which can't parse HTML we don't send pills
+                // in the plaintext body.
+                contentText = this.plainWithPlainPills.serialize(editorState);
+                contentHTML = mdWithPills.toHTML();
             }
         }
 
@@ -821,11 +808,11 @@ export default class MessageComposerInput extends React.Component {
         let sendTextFn = ContentHelpers.makeTextMessage;
 
         this.historyManager.save(
-            contentState,
+            editorState,
             this.state.isRichtextEnabled ? 'rich' : 'markdown',
         );
 
-        if (contentText.startsWith('/me')) {
+        if (commandText && commandText.startsWith('/me')) {
             if (replyingToEv) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Emote Reply Fail', '', ErrorDialog, {
@@ -842,14 +829,16 @@ export default class MessageComposerInput extends React.Component {
             sendTextFn = ContentHelpers.makeEmoteMessage;
         }
 
-
-        let content = contentHTML ? sendHtmlFn(contentText, contentHTML) : sendTextFn(contentText);
+        let content = contentHTML ?
+                      sendHtmlFn(contentText, contentHTML) :
+                      sendTextFn(contentText);
 
         if (replyingToEv) {
             const replyContent = ReplyThread.makeReplyMixIn(replyingToEv);
             content = Object.assign(replyContent, content);
 
-            // Part of Replies fallback support - prepend the text we're sending with the text we're replying to
+            // Part of Replies fallback support - prepend the text we're sending
+            // with the text we're replying to
             const nestedReply = ReplyThread.getNestedReplyText(replyingToEv);
             if (nestedReply) {
                 if (content.formatted_body) {
@@ -1009,20 +998,26 @@ export default class MessageComposerInput extends React.Component {
             return false;
         }
 
-        const {range = null, completion = '', href = null, suffix = ''} = displayedCompletion;
+        const {
+            range = null,
+            completion = '',
+            completionId = '',
+            href = null,
+            suffix = ''
+        } = displayedCompletion;
 
         let inline;
         if (href) {
             inline = Inline.create({
                 type: 'pill',
                 data: { url: href },
-                nodes: [Text.create(completion)],
+                nodes: [Text.create(completionId || completion)],
             });
         } else if (completion === '@room') {
             inline = Inline.create({
                 type: 'pill',
                 data: { type: Pill.TYPE_AT_ROOM_MENTION },
-                nodes: [Text.create(completion)],
+                nodes: [Text.create(completionId || completion)],
             });
         }
 
diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index 3b1ab1fa72..0e6c856e1b 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -44,7 +44,7 @@ class MessageComposerStore extends Store {
     __onDispatch(payload) {
         switch (payload.action) {
             case 'editor_state':
-                this._contentState(payload);
+                this._editorState(payload);
                 break;
             case 'on_logged_out':
                 this.reset();
@@ -52,7 +52,7 @@ class MessageComposerStore extends Store {
         }
     }
 
-    _contentState(payload) {
+    _editorState(payload) {
         const editorStateMap = this._state.editorStateMap;
         editorStateMap[payload.room_id] = payload.editor_state;
         localStorage.setItem('editor_state', JSON.stringify(editorStateMap));
@@ -61,7 +61,7 @@ class MessageComposerStore extends Store {
         });
     }
 
-    getContentState(roomId) {
+    getEditorState(roomId) {
         return this._state.editorStateMap[roomId];
     }
 

From c91dcffe82605c7ca1cb3693029089a6438cab06 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 00:40:54 +0100
Subject: [PATCH 014/702] fix cursor behaviour around pills

---
 src/autocomplete/PlainWithPillsSerializer.js  |  4 +-
 .../views/rooms/MessageComposerInput.js       | 48 ++++++++++++++++---
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
index 77391d5bbb..6827f1fe73 100644
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -64,11 +64,11 @@ class PlainWithPillsSerializer {
         } else if (node.type == 'pill') {
             switch (this.pillFormat) {
                 case 'plain':
-                    return node.text;
+                    return node.data.get('completion');
                 case 'md':
                     return `[${ node.text }](${ node.data.get('url') })`;
                 case 'id':
-                    return node.data.completionId || node.text;
+                    return node.data.get('completionId') || node.data.get('completion');
             }
         }
         else if (node.nodes) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 1bdbb86549..dfc0a2ee21 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -177,6 +177,8 @@ export default class MessageComposerInput extends React.Component {
         this.plainWithMdPills    = new PlainWithPillsSerializer({ pillFormat: 'md' });
         this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
         this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
+
+        this.direction = '';
     }
 
 /*
@@ -358,6 +360,17 @@ export default class MessageComposerInput extends React.Component {
     }
 
     onChange = (change: Change) => {
+
+        let editorState = change.value;
+
+        if (this.direction !== '') {
+            const focusedNode = editorState.focusInline || editorState.focusText;
+            if (focusedNode.isVoid) {
+                change = change[`collapseToEndOf${ this.direction }Text`]();
+                editorState = change.value;
+            }
+        }
+
 /*        
         editorState = RichText.attachImmutableEntitiesToEmoji(editorState);
 
@@ -417,7 +430,7 @@ export default class MessageComposerInput extends React.Component {
 */
         /* Since a modification was made, set originalEditorState to null, since newState is now our original */
         this.setState({
-            editorState: change.value,
+            editorState,
             originalEditorState: null,
         });
     };
@@ -521,6 +534,18 @@ export default class MessageComposerInput extends React.Component {
     }
 
     onKeyDown = (ev: Event, change: Change, editor: Editor) => {
+
+        // skip void nodes - see
+        // https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
+        if (ev.keyCode === KeyCode.LEFT) {
+            this.direction = 'Previous';
+        }
+        else if (ev.keyCode === KeyCode.RIGHT) {
+            this.direction = 'Next';
+        } else {
+            this.direction = '';
+        }
+
         switch (ev.keyCode) {
             case KeyCode.ENTER:
                 return this.handleReturn(ev);
@@ -1010,14 +1035,23 @@ export default class MessageComposerInput extends React.Component {
         if (href) {
             inline = Inline.create({
                 type: 'pill',
-                data: { url: href },
-                nodes: [Text.create(completionId || completion)],
+                data: { completion, completionId, url: href },
+                // we can't put text in here otherwise the editor tries to select it
+                isVoid: true,
+                nodes: [],
             });
         } else if (completion === '@room') {
             inline = Inline.create({
                 type: 'pill',
-                data: { type: Pill.TYPE_AT_ROOM_MENTION },
-                nodes: [Text.create(completionId || completion)],
+                data: { completion, completionId },
+                // we can't put text in here otherwise the editor tries to select it
+                isVoid: true,
+                nodes: [],
+            });
+        } else {
+            inline = Inline.create({
+                type: 'autocompletion',
+                nodes: [Text.create(completion)]
             });
         }
 
@@ -1072,12 +1106,12 @@ export default class MessageComposerInput extends React.Component {
             case 'pill': {
                 const { data, text } = node;
                 const url = data.get('url');
-                const type = data.get('type');
+                const completion = data.get('completion');
 
                 const shouldShowPillAvatar = !SettingsStore.getValue("Pill.shouldHidePillAvatar");
                 const Pill = sdk.getComponent('elements.Pill');
 
-                if (type === Pill.TYPE_AT_ROOM_MENTION) {
+                if (completion === '@room') {
                     return <Pill
                             type={Pill.TYPE_AT_ROOM_MENTION}
                             room={this.props.room}

From 33eaa84bdff5f28ca1bb0bac8505cb4be224f3d2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 00:48:52 +0100
Subject: [PATCH 015/702] fix NPEs when deleting mentions

---
 src/components/views/rooms/MessageComposerInput.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index dfc0a2ee21..919b38e741 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1038,7 +1038,6 @@ export default class MessageComposerInput extends React.Component {
                 data: { completion, completionId, url: href },
                 // we can't put text in here otherwise the editor tries to select it
                 isVoid: true,
-                nodes: [],
             });
         } else if (completion === '@room') {
             inline = Inline.create({
@@ -1046,7 +1045,6 @@ export default class MessageComposerInput extends React.Component {
                 data: { completion, completionId },
                 // we can't put text in here otherwise the editor tries to select it
                 isVoid: true,
-                nodes: [],
             });
         } else {
             inline = Inline.create({

From 877a6195ae9c73f29908286347639e9112ef5b0f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 00:54:01 +0100
Subject: [PATCH 016/702] unbreak history scrolling for pills & emoji

---
 src/components/views/rooms/MessageComposerInput.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 919b38e741..a8a9188971 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -912,12 +912,17 @@ export default class MessageComposerInput extends React.Component {
             const editorNode = ReactDOM.findDOMNode(this.refs.editor);
             const editorRect = editorNode.getBoundingClientRect();
 
+            // heuristic to handle tall emoji, pills, etc pushing the cursor away from the top
+            // or bottom of the page.
+            // XXX: is this going to break on large inline images or top-to-bottom scripts?
+            const EDGE_THRESHOLD = 8;
+
             let navigateHistory = false;
             if (up) {
                 const scrollCorrection = editorNode.scrollTop;
                 const distanceFromTop = cursorRect.top - editorRect.top + scrollCorrection;
-                //console.log(`Cursor distance from editor top is ${distanceFromTop}`);
-                if (distanceFromTop == 0) {
+                console.log(`Cursor distance from editor top is ${distanceFromTop}`);
+                if (distanceFromTop < EDGE_THRESHOLD) {
                     navigateHistory = true;
                 }
             }
@@ -925,8 +930,8 @@ export default class MessageComposerInput extends React.Component {
                 const scrollCorrection =
                     editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop;
                 const distanceFromBottom = cursorRect.bottom - editorRect.bottom + scrollCorrection;
-                //console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
-                if (distanceFromBottom == 0) {
+                console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
+                if (distanceFromBottom < EDGE_THRESHOLD) {
                     navigateHistory = true;
                 }
             }

From c967ecc4e59cc475feaed9f36a6f447fa327b139 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 03:04:40 +0100
Subject: [PATCH 017/702] autocomplete polishing

* suppress autocomplete when navigating through history
* only search for slashcommands if in the first block of the editor
* handle suffix returns from providers correctly
* fix SelectionRange typing in the providers
* fix bugs when pressing ctrl-a, typing and then tab to complete a replacement by collapsing selection to anchor when inserting a completion in the editor
* fix https://github.com/vector-im/riot-web/issues/4762
---
 src/autocomplete/AutocompleteProvider.js | 12 +++++++++---
 src/autocomplete/Autocompleter.js        |  9 +++++----
 src/autocomplete/CommandProvider.js      |  4 +++-
 src/autocomplete/DuckDuckGoProvider.js   |  3 ++-
 src/autocomplete/NotifProvider.js        |  3 ++-
 src/autocomplete/RoomProvider.js         |  9 ++-------
 src/autocomplete/UserProvider.js         | 19 ++++++++-----------
 7 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/autocomplete/AutocompleteProvider.js b/src/autocomplete/AutocompleteProvider.js
index c93ae4fb2a..2d3bad14c5 100644
--- a/src/autocomplete/AutocompleteProvider.js
+++ b/src/autocomplete/AutocompleteProvider.js
@@ -20,13 +20,19 @@ import React from 'react';
 import type {Completion, SelectionRange} from './Autocompleter';
 
 export default class AutocompleteProvider {
-    constructor(commandRegex?: RegExp) {
+    constructor(commandRegex?: RegExp, forcedCommandRegex?: RegExp) {
         if (commandRegex) {
             if (!commandRegex.global) {
                 throw new Error('commandRegex must have global flag set');
             }
             this.commandRegex = commandRegex;
         }
+        if (forcedCommandRegex) {
+            if (!forcedCommandRegex.global) {
+                throw new Error('forcedCommandRegex must have global flag set');
+            }
+            this.forcedCommandRegex = forcedCommandRegex;
+        }
     }
 
     destroy() {
@@ -36,11 +42,11 @@ export default class AutocompleteProvider {
     /**
      * Of the matched commands in the query, returns the first that contains or is contained by the selection, or null.
      */
-    getCurrentCommand(query: string, selection: {start: number, end: number}, force: boolean = false): ?string {
+    getCurrentCommand(query: string, selection: SelectionRange, force: boolean = false): ?string {
         let commandRegex = this.commandRegex;
 
         if (force && this.shouldForceComplete()) {
-            commandRegex = /\S+/g;
+            commandRegex = this.forcedCommandRegex || /\S+/g;
         }
 
         if (commandRegex == null) {
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index 3d30363d9f..db3ba5a7e1 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -27,6 +27,7 @@ import NotifProvider from './NotifProvider';
 import Promise from 'bluebird';
 
 export type SelectionRange = {
+    beginning: boolean,
     start: number,
     end: number
 };
@@ -77,12 +78,12 @@ export default class Autocompleter {
             // Array of inspections of promises that might timeout. Instead of allowing a
             // single timeout to reject the Promise.all, reflect each one and once they've all
             // settled, filter for the fulfilled ones
-            this.providers.map((provider) => {
-                return provider
+            this.providers.map(provider =>
+                provider
                     .getCompletions(query, selection, force)
                     .timeout(PROVIDER_COMPLETION_TIMEOUT)
-                    .reflect();
-            }),
+                    .reflect()
+            ),
         );
 
         return completionsList.filter(
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index e33fa7861f..0545095cf0 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -21,6 +21,7 @@ import { _t, _td } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import FuzzyMatcher from './FuzzyMatcher';
 import {TextualCompletion} from './Components';
+import type {SelectionRange} from './Autocompleter';
 
 // TODO merge this with the factory mechanics of SlashCommands?
 // Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file
@@ -123,8 +124,9 @@ export default class CommandProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}) {
+    async getCompletions(query: string, selection: SelectionRange) {
         let completions = [];
+        if (!selection.beginning) return completions;
         const {command, range} = this.getCurrentCommand(query, selection);
         if (command) {
             completions = this.matcher.match(command[0]).map((result) => {
diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js
index 68d4915f56..236ab49b62 100644
--- a/src/autocomplete/DuckDuckGoProvider.js
+++ b/src/autocomplete/DuckDuckGoProvider.js
@@ -22,6 +22,7 @@ import AutocompleteProvider from './AutocompleteProvider';
 import 'whatwg-fetch';
 
 import {TextualCompletion} from './Components';
+import type {SelectionRange} from './Autocompleter';
 
 const DDG_REGEX = /\/ddg\s+(.+)$/g;
 const REFERRER = 'vector';
@@ -36,7 +37,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
          + `&format=json&no_redirect=1&no_html=1&t=${encodeURIComponent(REFERRER)}`;
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}) {
+    async getCompletions(query: string, selection: SelectionRange) {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!query || !command) {
             return [];
diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.js
index 5d2f05ecb9..a426528567 100644
--- a/src/autocomplete/NotifProvider.js
+++ b/src/autocomplete/NotifProvider.js
@@ -20,6 +20,7 @@ import { _t } from '../languageHandler';
 import MatrixClientPeg from '../MatrixClientPeg';
 import {PillCompletion} from './Components';
 import sdk from '../index';
+import type {SelectionRange} from './Autocompleter';
 
 const AT_ROOM_REGEX = /@\S*/g;
 
@@ -29,7 +30,7 @@ export default class NotifProvider extends AutocompleteProvider {
         this.room = room;
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}, force = false) {
+    async getCompletions(query: string, selection: SelectionRange, force = false) {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
         const client = MatrixClientPeg.get();
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index b9346e75cc..139ac87041 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -26,6 +26,7 @@ import {getDisplayAliasForRoom} from '../Rooms';
 import sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../matrix-to";
+import type {SelectionRange} from './Autocompleter';
 
 const ROOM_REGEX = /(?=#)(\S*)/g;
 
@@ -46,15 +47,9 @@ export default class RoomProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}, force = false) {
+    async getCompletions(query: string, selection: SelectionRange, force = false) {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
-        // Disable autocompletions when composing commands because of various issues
-        // (see https://github.com/vector-im/riot-web/issues/4762)
-        if (/^(\/join|\/leave)/.test(query)) {
-            return [];
-        }
-
         const client = MatrixClientPeg.get();
         let completions = [];
         const {command, range} = this.getCurrentCommand(query, selection, force);
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index a6dd13051b..c25dad8877 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -28,18 +28,21 @@ import _sortBy from 'lodash/sortBy';
 import MatrixClientPeg from '../MatrixClientPeg';
 
 import type {Room, RoomMember} from 'matrix-js-sdk';
+import type {SelectionRange} from './Autocompleter';
 import {makeUserPermalink} from "../matrix-to";
 
 const USER_REGEX = /@\S*/g;
 
+// used when you hit 'tab' - we allow some separator chars at the beginning
+// to allow you to tab-complete /mat into /(matthew)
+const FORCED_USER_REGEX = /[^/,:; \t\n]\S*/g;
+
 export default class UserProvider extends AutocompleteProvider {
     users: Array<RoomMember> = null;
     room: Room = null;
 
     constructor(room) {
-        super(USER_REGEX, {
-            keys: ['name'],
-        });
+        super(USER_REGEX, FORCED_USER_REGEX);
         this.room = room;
         this.matcher = new FuzzyMatcher([], {
             keys: ['name', 'userId'],
@@ -87,15 +90,9 @@ export default class UserProvider extends AutocompleteProvider {
         this.users = null;
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}, force = false) {
+    async getCompletions(query: string, selection: SelectionRange, force = false) {
         const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
 
-        // Disable autocompletions when composing commands because of various issues
-        // (see https://github.com/vector-im/riot-web/issues/4762)
-        if (/^(\/ban|\/unban|\/op|\/deop|\/invite|\/kick|\/verify)/.test(query)) {
-            return [];
-        }
-
         // lazy-load user list into matcher
         if (this.users === null) this._makeUsers();
 
@@ -114,7 +111,7 @@ export default class UserProvider extends AutocompleteProvider {
                     // relies on the length of the entity === length of the text in the decoration.
                     completion: user.rawDisplayName.replace(' (IRC)', ''),
                     completionId: user.userId,
-                    suffix: range.start === 0 ? ': ' : ' ',
+                    suffix: (selection.beginning && range.start === 0) ? ': ' : ' ',
                     href: makeUserPermalink(user.userId),
                     component: (
                         <PillCompletion

From 5605439e766f19d25a0f9362d5c4be373c8fcc80 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 03:16:55 +0100
Subject: [PATCH 018/702] autocomplete polishing

* suppress autocomplete when navigating through history
* only search for slashcommands if in the first block of the editor
* handle suffix returns from providers correctly
* fix bugs when pressing ctrl-a, typing and then tab to complete a replacement by collapsing selection to anchor when inserting a completion in the editor
---
 src/components/views/rooms/Autocomplete.js    |  2 +-
 .../views/rooms/MessageComposerInput.js       | 29 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index 5b56727705..4bc91b5c2b 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -114,7 +114,7 @@ export default class Autocomplete extends React.Component {
 
     processQuery(query, selection) {
         return this.autocompleter.getCompletions(
-            query, selection, this.state.forceComplete,
+            query, selection, this.state.forceComplete
         ).then((completions) => {
             // Only ever process the completions for the most recent query being processed
             if (query !== this.queryRequested) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index a8a9188971..83760d932d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -178,6 +178,7 @@ export default class MessageComposerInput extends React.Component {
         this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
         this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
 
+        this.suppressAutoComplete = false;
         this.direction = '';
     }
 
@@ -535,6 +536,8 @@ export default class MessageComposerInput extends React.Component {
 
     onKeyDown = (ev: Event, change: Change, editor: Editor) => {
 
+        this.suppressAutoComplete = false;
+
         // skip void nodes - see
         // https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
         if (ev.keyCode === KeyCode.LEFT) {
@@ -978,6 +981,8 @@ export default class MessageComposerInput extends React.Component {
         // we skip it for now given we know we're about to setState anyway
         editorState = change.value;
 
+        this.suppressAutoComplete = true;
+
         this.setState({ editorState }, ()=>{
             this.refs.editor.focus();
         });
@@ -1061,13 +1066,15 @@ export default class MessageComposerInput extends React.Component {
         let editorState = activeEditorState;
 
         if (range) {
-            const change = editorState.change().moveOffsetsTo(range.start, range.end);
+            const change = editorState.change()
+                                      .collapseToAnchor()
+                                      .moveOffsetsTo(range.start, range.end);
             editorState = change.value;
         }
 
-        const change = editorState.change().insertInlineAtRange(
-            editorState.selection, inline
-        );
+        const change = editorState.change()
+                                  .insertInlineAtRange(editorState.selection, inline)
+                                  .insertText(suffix);
         editorState = change.value;
 
         this.setState({ editorState, originalEditorState: activeEditorState }, ()=>{
@@ -1185,13 +1192,12 @@ export default class MessageComposerInput extends React.Component {
     }
 
     getAutocompleteQuery(editorState: Value) {
-        // FIXME: do we really want to regenerate this every time the control is rerendered?
-        
         // We can just return the current block where the selection begins, which
         // should be enough to capture any autocompletion input, given autocompletion
         // providers only search for the first match which intersects with the current selection.
         // This avoids us having to serialize the whole thing to plaintext and convert
         // selection offsets in & out of the plaintext domain.
+
         return editorState.document.getDescendant(editorState.selection.anchorKey).text;
 
         // Don't send markdown links to the autocompleter
@@ -1199,10 +1205,19 @@ export default class MessageComposerInput extends React.Component {
     }
 
     getSelectionRange(editorState: Value) {
+        let beginning = false;
+        const query = this.getAutocompleteQuery(editorState);
+        const firstChild = editorState.document.nodes.get(0);
+        const firstGrandChild = firstChild && firstChild.nodes.get(0);
+        beginning = (firstChild && firstGrandChild &&
+                     firstChild.object === 'block' && firstGrandChild.object === 'text' &&
+                     editorState.selection.anchorKey === firstGrandChild.key);
+
         // return a character range suitable for handing to an autocomplete provider.
         // the range is relative to the anchor of the current editor selection.
         // if the selection spans multiple blocks, then we collapse it for the calculation.
         const range = {
+            beginning, // whether the selection is in the first block of the editor or not
             start: editorState.selection.anchorOffset,
             end: (editorState.selection.anchorKey == editorState.selection.focusKey) ? 
                  editorState.selection.focusOffset : editorState.selection.anchorOffset,
@@ -1273,7 +1288,7 @@ export default class MessageComposerInput extends React.Component {
                         room={this.props.room}
                         onConfirm={this.setDisplayedCompletion}
                         onSelectionChange={this.setDisplayedCompletion}
-                        query={this.getAutocompleteQuery(activeEditorState)}
+                        query={ this.suppressAutoComplete ? '' : this.getAutocompleteQuery(activeEditorState) }
                         selection={this.getSelectionRange(activeEditorState)}
                     />
                 </div>

From e06763cd59da8b07255f46ab7e1abc4604c637cc Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 03:18:41 +0100
Subject: [PATCH 019/702] show all slashcommands on /

---
 src/autocomplete/CommandProvider.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 0545095cf0..4f2aed3dc6 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -129,7 +129,14 @@ export default class CommandProvider extends AutocompleteProvider {
         if (!selection.beginning) return completions;
         const {command, range} = this.getCurrentCommand(query, selection);
         if (command) {
-            completions = this.matcher.match(command[0]).map((result) => {
+            let results;
+            if (command[0] == '/') {
+                results = COMMANDS;
+            }
+            else {
+                results = this.matcher.match(command[0]);
+            }
+            completions = results.map((result) => {
                 return {
                     completion: result.command + ' ',
                     component: (<TextualCompletion

From 4c3588d26064f966681556256a9faebaade6dfc5 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 03:26:22 +0100
Subject: [PATCH 020/702] don't lose focus after a / command

---
 src/components/views/rooms/MessageComposerInput.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 83760d932d..a1b569b5f4 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -745,9 +745,10 @@ export default class MessageComposerInput extends React.Component {
                 });
             }
             if (cmd.promise) {
-                cmd.promise.then(function() {
+                cmd.promise.then(()=>{
                     console.log("Command success.");
-                }, function(err) {
+                    this.refs.editor.focus();
+                }, (err)=>{
                     console.error("Command failure: %s", err);
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createTrackedDialog('Server error', '', ErrorDialog, {

From 79f7c5d6ab0e7b0bad860039403fef195381cdbe Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 03:29:56 +0100
Subject: [PATCH 021/702] remove // support, as it never worked

if you want to escape a /, do it with \/ or just precede with a space
---
 src/SlashCommands.js                               | 2 +-
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index d45e45e84c..7f32c1e25a 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -434,7 +434,7 @@ module.exports = {
         // trim any trailing whitespace, as it can confuse the parser for
         // IRC-style commands
         input = input.replace(/\s+$/, "");
-        if (input[0] === "/" && input[1] !== "/") {
+        if (input[0] === "/") {
             const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
             let cmd;
             let args;
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index a1b569b5f4..2a59ccbe7d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -731,7 +731,7 @@ export default class MessageComposerInput extends React.Component {
         const firstGrandChild = firstChild && firstChild.nodes.get(0);
         if (firstChild && firstGrandChild &&
             firstChild.object === 'block' && firstGrandChild.object === 'text' &&
-            firstGrandChild.text[0] === '/' && firstGrandChild.text[1] !== '/')
+            firstGrandChild.text[0] === '/')
         {
             commandText = this.plainWithIdPills.serialize(editorState);
             cmd = SlashCommands.processInput(this.props.room.roomId, commandText);

From dd0726f06802666f531db8a7c5784797b7148010 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 21:17:43 +0100
Subject: [PATCH 022/702] fix navigating history downwards on tall messages;
 remove obsolete code

---
 src/RichText.js                               | 36 -------------------
 .../views/rooms/MessageComposerInput.js       | 32 +----------------
 2 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/src/RichText.js b/src/RichText.js
index 7ffb4dd785..d867636dc9 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -223,42 +223,6 @@ export function selectionStateToTextOffsets(selectionState: SelectionState,
     };
 }
 
-export function textOffsetsToSelectionState({start, end}: SelectionRange,
-                                            contentBlocks: Array<ContentBlock>): SelectionState {
-    let selectionState = SelectionState.createEmpty();
-    // Subtract block lengths from `start` and `end` until they are less than the current
-    // block length (accounting for the NL at the end of each block). Set them to -1 to
-    // indicate that the corresponding selection state has been determined.
-    for (const block of contentBlocks) {
-        const blockLength = block.getLength();
-        // -1 indicating that the position start position has been found
-        if (start !== -1) {
-            if (start < blockLength + 1) {
-                selectionState = selectionState.merge({
-                    anchorKey: block.getKey(),
-                    anchorOffset: start,
-                });
-                start = -1; // selection state for the start calculated
-            } else {
-                start -= blockLength + 1; // +1 to account for newline between blocks
-            }
-        }
-        // -1 indicating that the position end position has been found
-        if (end !== -1) {
-            if (end < blockLength + 1) {
-                selectionState = selectionState.merge({
-                    focusKey: block.getKey(),
-                    focusOffset: end,
-                });
-                end = -1; // selection state for the end calculated
-            } else {
-                end -= blockLength + 1; // +1 to account for newline between blocks
-            }
-        }
-    }
-    return selectionState;
-}
-
 // modified version of https://github.com/draft-js-plugins/draft-js-plugins/blob/master/draft-js-emoji-plugin/src/modifiers/attachImmutableEntitiesToEmojis.js
 export function attachImmutableEntitiesToEmoji(editorState: EditorState): EditorState {
     const contentState = editorState.getCurrentContent();
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 2a59ccbe7d..3e8d3cd868 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -494,14 +494,6 @@ export default class MessageComposerInput extends React.Component {
             if (this.props.onContentChanged) {
                 this.props.onContentChanged(textContent, selection);
             }
-
-            // Scroll to the bottom of the editor if the cursor is on the last line of the
-            // composer. For some reason the editor won't scroll automatically if we paste
-            // blocks of text in or insert newlines.
-            if (textContent.slice(selection.start).indexOf("\n") === -1) {
-                let editorRoot = this.refs.editor.refs.editor.parentNode.parentNode;
-                editorRoot.scrollTop = editorRoot.scrollHeight;
-            }
 */        
         });
     }
@@ -933,7 +925,7 @@ export default class MessageComposerInput extends React.Component {
             else {
                 const scrollCorrection =
                     editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop;
-                const distanceFromBottom = cursorRect.bottom - editorRect.bottom + scrollCorrection;
+                const distanceFromBottom = editorRect.bottom - cursorRect.bottom + scrollCorrection;
                 console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
                 if (distanceFromBottom < EDGE_THRESHOLD) {
                     navigateHistory = true;
@@ -1082,28 +1074,6 @@ export default class MessageComposerInput extends React.Component {
 //            this.refs.editor.focus();
         });
 
-/*
-        let selection;
-        if (range) {
-            selection = RichText.textOffsetsToSelectionState(
-                range, contentState.getBlocksAsArray(),
-            );
-        } else {
-            selection = activeEditorState.getSelection();
-        }
-
-        contentState = Modifier.replaceText(contentState, selection, completion, null, entityKey);
-
-        // Move the selection to the end of the block
-        const afterSelection = contentState.getSelectionAfter();
-        if (suffix) {
-            contentState = Modifier.replaceText(contentState, afterSelection, suffix);
-        }
-
-        let editorState = EditorState.push(activeEditorState, contentState, 'insert-characters');
-        editorState = EditorState.forceSelection(editorState, contentState.getSelectionAfter());
-        this.setState({editorState, originalEditorState: activeEditorState});
-*/
         return true;
     };
 

From ddfe0691c43c309e5f4265e6663667c15da10557 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 22:41:39 +0100
Subject: [PATCH 023/702] fix insert_mention

---
 .../views/rooms/MessageComposerInput.js       | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 3e8d3cd868..8b72dc1a0b 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -243,23 +243,24 @@ export default class MessageComposerInput extends React.Component {
             case 'focus_composer':
                 editor.focus();
                 break;
-/*                
-            case 'insert_mention': {
-                // Pretend that we've autocompleted this user because keeping two code
-                // paths for inserting a user pill is not fun
-                const selection = this.state.editorState.getSelection();
-                const member = this.props.room.getMember(payload.user_id);
-                const completion = member ?
-                    member.rawDisplayName.replace(' (IRC)', '') : payload.user_id;
-                this.setDisplayedCompletion({
-                    completion,
-                    selection,
-                    href: makeUserPermalink(payload.user_id),
-                    suffix: selection.getStartOffset() === 0 ? ': ' : ' ',
-                });
-            }
+            case 'insert_mention':
+                {
+                    // Pretend that we've autocompleted this user because keeping two code
+                    // paths for inserting a user pill is not fun
+                    const selection = this.getSelectionRange(this.state.editorState);
+                    const member = this.props.room.getMember(payload.user_id);
+                    const completion = member ?
+                        member.rawDisplayName.replace(' (IRC)', '') : payload.user_id;
+                    this.setDisplayedCompletion({
+                        completion,
+                        completionId: payload.user_id,
+                        selection,
+                        href: makeUserPermalink(payload.user_id),
+                        suffix: (selection.beginning && selection.start === 0) ? ': ' : ' ',
+                    });
+                }
                 break;
-
+/*
             case 'quote': { // old quoting, whilst rich quoting is in labs
                 /// XXX: Not doing rich-text quoting from formatted-body because draft-js
                 /// has regressed such that when links are quoted, errors are thrown. See

From a247ea2f77d0ad10faf63c3c798abb59c8b237d1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 22:43:20 +0100
Subject: [PATCH 024/702] delete duplicate propTypes(!!!)

---
 .../views/rooms/MessageComposerInput.js        | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 8b72dc1a0b..756c9eb1a9 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -100,6 +100,8 @@ export default class MessageComposerInput extends React.Component {
         // called with current plaintext content (as a string) whenever it changes
         onContentChanged: PropTypes.func,
 
+        onFilesPasted: PropTypes.func,
+
         onInputStateChanged: PropTypes.func,
     };
 
@@ -1292,19 +1294,3 @@ export default class MessageComposerInput extends React.Component {
         );
     }
 }
-
-MessageComposerInput.propTypes = {
-    // a callback which is called when the height of the composer is
-    // changed due to a change in content.
-    onResize: PropTypes.func,
-
-    // js-sdk Room object
-    room: PropTypes.object.isRequired,
-
-    // called with current plaintext content (as a string) whenever it changes
-    onContentChanged: PropTypes.func,
-
-    onFilesPasted: PropTypes.func,
-
-    onInputStateChanged: PropTypes.func,
-};

From 7405b49b4416ab8803c64283f26c983097e8fd5d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 23:34:00 +0100
Subject: [PATCH 025/702] unify setState() and onChange() also make emoji
 autocomplete work again also remove the onInputContentChanged prop also
 slateify the onInputStateChanged prop

---
 src/components/views/rooms/MessageComposer.js |  18 +-
 .../views/rooms/MessageComposerInput.js       | 163 +++++-------------
 2 files changed, 42 insertions(+), 139 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 28a90b375a..9aaa33f0fa 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -35,7 +35,6 @@ export default class MessageComposer extends React.Component {
         this.onUploadFileSelected = this.onUploadFileSelected.bind(this);
         this.uploadFiles = this.uploadFiles.bind(this);
         this.onVoiceCallClick = this.onVoiceCallClick.bind(this);
-        this.onInputContentChanged = this.onInputContentChanged.bind(this);
         this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this);
         this.onToggleFormattingClicked = this.onToggleFormattingClicked.bind(this);
         this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
@@ -44,13 +43,10 @@ export default class MessageComposer extends React.Component {
         this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
 
         this.state = {
-            autocompleteQuery: '',
-            selection: null,
             inputState: {
-                style: [],
+                marks: [],
                 blockType: null,
                 isRichtextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
-                wordCount: 0,
             },
             showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
             isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
@@ -209,13 +205,6 @@ export default class MessageComposer extends React.Component {
         // this._startCallApp(true);
     }
 
-    onInputContentChanged(content: string, selection: {start: number, end: number}) {
-        this.setState({
-            autocompleteQuery: content,
-            selection,
-        });
-    }
-
     onInputStateChanged(inputState) {
         this.setState({inputState});
     }
@@ -348,7 +337,6 @@ export default class MessageComposer extends React.Component {
                     room={this.props.room}
                     placeholder={placeholderText}
                     onFilesPasted={this.uploadFiles}
-                    onContentChanged={this.onInputContentChanged}
                     onInputStateChanged={this.onInputStateChanged} />,
                 formattingButton,
                 stickerpickerButton,
@@ -365,10 +353,10 @@ export default class MessageComposer extends React.Component {
             );
         }
 
-        const {style, blockType} = this.state.inputState;
+        const {marks, blockType} = this.state.inputState;
         const formatButtons = ["bold", "italic", "strike", "underline", "code", "quote", "bullet", "numbullet"].map(
             (name) => {
-                const active = style.includes(name) || blockType === name;
+                const active = marks.includes(name) || blockType === name;
                 const suffix = active ? '-o-n' : '';
                 const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
                 const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 756c9eb1a9..025e42be1a 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -184,23 +184,6 @@ export default class MessageComposerInput extends React.Component {
         this.direction = '';
     }
 
-/*
-    findPillEntities(contentState: ContentState, contentBlock: ContentBlock, callback) {
-        contentBlock.findEntityRanges(
-            (character) => {
-                const entityKey = character.getEntity();
-                return (
-                    entityKey !== null &&
-                    (
-                        contentState.getEntity(entityKey).getType() === 'LINK' ||
-                        contentState.getEntity(entityKey).getType() === ENTITY_TYPES.AT_ROOM_PILL
-                    )
-                );
-            }, callback,
-        );
-    }
-*/
-
     /*
      * "Does the right thing" to create an Editor value, based on:
      * - whether we've got rich text mode enabled
@@ -226,14 +209,12 @@ export default class MessageComposerInput extends React.Component {
     }
 
     componentWillUpdate(nextProps, nextState) {
-/*        
         // this is dirty, but moving all this state to MessageComposer is dirtier
         if (this.props.onInputStateChanged && nextState !== this.state) {
             const state = this.getSelectionInfo(nextState.editorState);
             state.isRichtextEnabled = nextState.isRichtextEnabled;
             this.props.onInputStateChanged(state);
         }
-*/        
     }
 
     onAction = (payload) => {
@@ -375,6 +356,19 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
+        if (editorState.document.getFirstText().text !== '') {
+            this.onTypingActivity();
+        } else {
+            this.onFinishedTyping();
+        }
+
+        /*
+        // XXX: what was this ever doing?
+        if (!state.hasOwnProperty('originalEditorState')) {
+            state.originalEditorState = null;
+        }
+        */
+
 /*        
         editorState = RichText.attachImmutableEntitiesToEmoji(editorState);
 
@@ -405,6 +399,10 @@ export default class MessageComposerInput extends React.Component {
             // Reset selection
             editorState = EditorState.forceSelection(editorState, currentSelection);
         }
+*/
+
+        const text = editorState.startText.text;
+        const currentStartOffset = editorState.startOffset;
 
         // Automatic replacement of plaintext emoji to Unicode emoji
         if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
@@ -415,23 +413,26 @@ export default class MessageComposerInput extends React.Component {
                 const emojiUc = asciiList[emojiMatch[1]];
                 // hex unicode -> shortname -> actual unicode
                 const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
-                const newContentState = Modifier.replaceText(
-                    editorState.getCurrentContent(),
-                    currentSelection.merge({
-                        anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
-                        focusOffset: currentStartOffset,
-                    }),
-                    unicodeEmoji,
-                );
-                editorState = EditorState.push(
-                    editorState,
-                    newContentState,
-                    'insert-characters',
-                );
-                editorState = EditorState.forceSelection(editorState, newContentState.getSelectionAfter());
+
+                const range = Range.create({
+                    anchorKey: editorState.selection.startKey,
+                    anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
+                    focusKey: editorState.selection.startKey,
+                    focusOffset: currentStartOffset,
+                });
+                change = change.insertTextAtRange(range, unicodeEmoji);
+                editorState = change.value;
             }
         }
-*/
+
+        // Record the editor state for this room so that it can be retrieved after
+        // switching to another room and back
+        dis.dispatch({
+            action: 'editor_state',
+            room_id: this.props.room.roomId,
+            editor_state: editorState,
+        });
+
         /* Since a modification was made, set originalEditorState to null, since newState is now our original */
         this.setState({
             editorState,
@@ -439,68 +440,6 @@ export default class MessageComposerInput extends React.Component {
         });
     };
 
-    /**
-     * We're overriding setState here because it's the most convenient way to monitor changes to the editorState.
-     * Doing it using a separate function that calls setState is a possibility (and was the old approach), but that
-     * approach requires a callback and an extra setState whenever trying to set multiple state properties.
-     *
-     * @param state
-     * @param callback
-     */
-    setState(state, callback) {
-/*            
-        if (state.editorState != null) {
-            state.editorState = RichText.attachImmutableEntitiesToEmoji(
-                state.editorState);
-
-            // Hide the autocomplete if the cursor location changes but the plaintext
-            // content stays the same. We don't hide if the pt has changed because the
-            // autocomplete will probably have different completions to show.
-            if (
-                !state.editorState.getSelection().equals(
-                    this.state.editorState.getSelection(),
-                )
-                && state.editorState.getCurrentContent().getPlainText() ===
-                this.state.editorState.getCurrentContent().getPlainText()
-            ) {
-                this.autocomplete.hide();
-            }
-
-            if (state.editorState.getCurrentContent().hasText()) {
-                this.onTypingActivity();
-            } else {
-                this.onFinishedTyping();
-            }
-
-            // Record the editor state for this room so that it can be retrieved after
-            // switching to another room and back
-            dis.dispatch({
-                action: 'editor_state',
-                room_id: this.props.room.roomId,
-                editor_state: state.editorState.getCurrentContent(),
-            });
-
-            if (!state.hasOwnProperty('originalEditorState')) {
-                state.originalEditorState = null;
-            }
-        }
-*/        
-        super.setState(state, () => {
-            if (callback != null) {
-                callback();
-            }
-/*
-            const textContent = this.state.editorState.getCurrentContent().getPlainText();
-            const selection = RichText.selectionStateToTextOffsets(
-                this.state.editorState.getSelection(),
-                this.state.editorState.getCurrentContent().getBlocksAsArray());
-            if (this.props.onContentChanged) {
-                this.props.onContentChanged(textContent, selection);
-            }
-*/        
-        });
-    }
-
     enableRichtext(enabled: boolean) {
         if (enabled === this.state.isRichtextEnabled) return;
 
@@ -1133,36 +1072,12 @@ export default class MessageComposerInput extends React.Component {
     /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
      buttons. */
     getSelectionInfo(editorState: Value) {
-        return {};
-/*
-        const styleName = {
-            BOLD: _td('bold'),
-            ITALIC: _td('italic'),
-            STRIKETHROUGH: _td('strike'),
-            UNDERLINE: _td('underline'),
-        };
-
-        const originalStyle = editorState.getCurrentInlineStyle().toArray();
-        const style = originalStyle
-            .map((style) => styleName[style] || null)
-            .filter((styleName) => !!styleName);
-
-        const blockName = {
-            'code-block': _td('code'),
-            'blockquote': _td('quote'),
-            'unordered-list-item': _td('bullet'),
-            'ordered-list-item': _td('numbullet'),
-        };
-        const originalBlockType = editorState.getCurrentContent()
-            .getBlockForKey(editorState.getSelection().getStartKey())
-            .getType();
-        const blockType = blockName[originalBlockType] || null;
-
         return {
-            style,
-            blockType,
+            marks: editorState.activeMarks,
+            // XXX: shouldn't we return all the types of blocks in the current selection,
+            // not just the anchor?
+            blockType: editorState.anchorBlock.type,
         };
-*/
     }
 
     getAutocompleteQuery(editorState: Value) {

From 7ecb4e3b188890946712cca2580c7904ddadcb4a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 13 May 2018 23:35:39 +0100
Subject: [PATCH 026/702] remove dead removeMDLinks code

---
 .../views/rooms/MessageComposerInput.js       | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 025e42be1a..4a9dfa4b4c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1088,9 +1088,6 @@ export default class MessageComposerInput extends React.Component {
         // selection offsets in & out of the plaintext domain.
 
         return editorState.document.getDescendant(editorState.selection.anchorKey).text;
-
-        // Don't send markdown links to the autocompleter
-        // return this.removeMDLinks(contentState, ['@', '#']);
     }
 
     getSelectionRange(editorState: Value) {
@@ -1119,43 +1116,6 @@ export default class MessageComposerInput extends React.Component {
         return range;
     }
 
-/*
-    // delinkifies any matrix.to markdown links (i.e. pills) of form
-    // [#foo:matrix.org](https://matrix.to/#/#foo:matrix.org).
-    // the prefixes is an array of sigils that will be matched on.
-    removeMDLinks(contentState: ContentState, prefixes: string[]) {
-        const plaintext = contentState.getPlainText();
-        if (!plaintext) return '';
-        return plaintext.replace(REGEX_MATRIXTO_MARKDOWN_GLOBAL,
-        (markdownLink, text, resource, prefix, offset) => {
-            if (!prefixes.includes(prefix)) return markdownLink;
-            // Calculate the offset relative to the current block that the offset is in
-            let sum = 0;
-            const blocks = contentState.getBlocksAsArray();
-            let block;
-            for (let i = 0; i < blocks.length; i++) {
-                block = blocks[i];
-                sum += block.getLength();
-                if (sum > offset) {
-                    sum -= block.getLength();
-                    break;
-                }
-            }
-            offset -= sum;
-
-            const entityKey = block.getEntityAt(offset);
-            const entity = entityKey ? contentState.getEntity(entityKey) : null;
-            if (entity && entity.getData().isCompletion) {
-                // This is a completed mention, so do not insert MD link, just text
-                return text;
-            } else {
-                // This is either a MD link that was typed into the composer or another
-                // type of pill (e.g. room pill)
-                return markdownLink;
-            }
-        });
-    }
-*/
     onMarkdownToggleClicked = (e) => {
         e.preventDefault(); // don't steal focus from the editor!
         this.handleKeyCommand('toggle-mode');

From b10f9a9cb780a209b6e64c9b2343571eff7a93bb Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 14 May 2018 02:54:55 +0100
Subject: [PATCH 027/702] remove spurious vendor prefixing

---
 res/css/structures/_RoomView.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index b8e1190375..02418f70db 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -176,10 +176,7 @@ hr.mx_RoomView_myReadMarker {
     z-index: 1000;
     overflow: hidden;
 
-    -webkit-transition: all .2s ease-out;
-    -moz-transition: all .2s ease-out;
-    -ms-transition: all .2s ease-out;
-    -o-transition: all .2s ease-out;
+    transition: all .2s ease-out;
 }
 
 .mx_RoomView_statusArea_expanded {

From c1000a7cd5aaecded59d0ffa0456012af4e15e8d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 14 May 2018 03:02:12 +0100
Subject: [PATCH 028/702] emojioneify the composer and also fix up the
 selectedness CSS for pills and emoji

---
 res/css/_common.scss                          |  4 +
 res/css/views/elements/_RichText.scss         |  4 +
 src/RichText.js                               | 81 +----------------
 src/autocomplete/PlainWithPillsSerializer.js  |  3 +
 src/components/views/elements/Pill.js         |  3 +
 .../views/rooms/MessageComposerInput.js       | 91 +++++++++++++++----
 6 files changed, 88 insertions(+), 98 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index c4cda6821e..38f576a532 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -291,6 +291,10 @@ textarea {
     vertical-align: middle;
 }
 
+.mx_emojione_selected {
+    background-color: $accent-color;
+}
+
 ::-moz-selection {
     background-color: $accent-color;
     color: $selection-fg-color;
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 474a123455..5c390af30a 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -25,6 +25,10 @@
     padding-right: 5px;
 }
 
+.mx_UserPill_selected {
+    background-color: $accent-color ! important;
+}
+
 .mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me,
 .mx_EventTile_content .mx_AtRoomPill,
 .mx_MessageComposer_input .mx_AtRoomPill {
diff --git a/src/RichText.js b/src/RichText.js
index d867636dc9..50ed33d803 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -51,10 +51,6 @@ const MARKDOWN_REGEX = {
     STRIKETHROUGH: /~{2}[^~]*~{2}/g,
 };
 
-const USERNAME_REGEX = /@\S+:\S+/g;
-const ROOM_REGEX = /#\S+:\S+/g;
-const EMOJI_REGEX = new RegExp(emojione.unicodeRegexp, 'g');
-
 const ZWS_CODE = 8203;
 const ZWS = String.fromCharCode(ZWS_CODE); // zero width space
 
@@ -73,7 +69,7 @@ export function htmlToEditorState(html: string): Value {
     return Html.serialize(html);
 }
 
-function unicodeToEmojiUri(str) {
+export function unicodeToEmojiUri(str) {
     let replaceWith, unicode, alt;
     if ((!emojione.unicodeAlt) || (emojione.sprites)) {
         // if we are using the shortname as the alt tag then we need a reversed array to map unicode code point to shortnames
@@ -113,27 +109,6 @@ function findWithRegex(regex, contentBlock: ContentBlock, callback: (start: numb
     }
 }
 
-// Workaround for https://github.com/facebook/draft-js/issues/414
-const emojiDecorator = {
-    strategy: (contentState, contentBlock, callback) => {
-        findWithRegex(EMOJI_REGEX, contentBlock, callback);
-    },
-    component: (props) => {
-        const uri = unicodeToEmojiUri(props.children[0].props.text);
-        const shortname = emojione.toShort(props.children[0].props.text);
-        const style = {
-            display: 'inline-block',
-            width: '1em',
-            maxHeight: '1em',
-            background: `url(${uri})`,
-            backgroundSize: 'contain',
-            backgroundPosition: 'center center',
-            overflow: 'hidden',
-        };
-        return (<span title={shortname} style={style}><span style={{opacity: 0}}>{ props.children }</span></span>);
-    },
-};
-
 /**
  * Returns a composite decorator which has access to provided scope.
  */
@@ -223,60 +198,6 @@ export function selectionStateToTextOffsets(selectionState: SelectionState,
     };
 }
 
-// modified version of https://github.com/draft-js-plugins/draft-js-plugins/blob/master/draft-js-emoji-plugin/src/modifiers/attachImmutableEntitiesToEmojis.js
-export function attachImmutableEntitiesToEmoji(editorState: EditorState): EditorState {
-    const contentState = editorState.getCurrentContent();
-    const blocks = contentState.getBlockMap();
-    let newContentState = contentState;
-
-    blocks.forEach((block) => {
-        const plainText = block.getText();
-
-        const addEntityToEmoji = (start, end) => {
-            const existingEntityKey = block.getEntityAt(start);
-            if (existingEntityKey) {
-                // avoid manipulation in case the emoji already has an entity
-                const entity = newContentState.getEntity(existingEntityKey);
-                if (entity && entity.get('type') === 'emoji') {
-                    return;
-                }
-            }
-
-            const selection = SelectionState.createEmpty(block.getKey())
-                .set('anchorOffset', start)
-                .set('focusOffset', end);
-            const emojiText = plainText.substring(start, end);
-            newContentState = newContentState.createEntity(
-                'emoji', 'IMMUTABLE', { emojiUnicode: emojiText },
-            );
-            const entityKey = newContentState.getLastCreatedEntityKey();
-            newContentState = Modifier.replaceText(
-                newContentState,
-                selection,
-                emojiText,
-                null,
-                entityKey,
-            );
-        };
-
-        findWithRegex(EMOJI_REGEX, block, addEntityToEmoji);
-    });
-
-    if (!newContentState.equals(contentState)) {
-        const oldSelection = editorState.getSelection();
-        editorState = EditorState.push(
-            editorState,
-            newContentState,
-            'convert-to-immutable-emojis',
-        );
-        // this is somewhat of a hack, we're undoing selection changes caused above
-        // it would be better not to make those changes in the first place
-        editorState = EditorState.forceSelection(editorState, oldSelection);
-    }
-
-    return editorState;
-}
-
 export function hasMultiLineSelection(editorState: EditorState): boolean {
     const selectionState = editorState.getSelection();
     const anchorKey = selectionState.getAnchorKey();
diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
index 6827f1fe73..0e850f2a33 100644
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -61,6 +61,9 @@ class PlainWithPillsSerializer {
             (node.object == 'block' && Block.isBlockList(node.nodes))
         ) {
             return node.nodes.map(this._serializeNode).join('\n');
+        }
+        else if (node.type == 'emoji') {
+            return node.data.get('emojiUnicode');
         } else if (node.type == 'pill') {
             switch (this.pillFormat) {
                 case 'plain':
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 7e5ad379de..673e4fdd03 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -59,6 +59,8 @@ const Pill = React.createClass({
         room: PropTypes.instanceOf(Room),
         // Whether to include an avatar in the pill
         shouldShowPillAvatar: PropTypes.bool,
+        // Whether to render this pill as if it were highlit by a selection
+        isSelected: PropTypes.bool,
     },
 
 
@@ -233,6 +235,7 @@ const Pill = React.createClass({
 
         const classes = classNames(pillClass, {
             "mx_UserPill_me": userId === MatrixClientPeg.get().credentials.userId,
+            "mx_UserPill_selected": this.props.isSelected,
         });
 
         if (this.state.pillType) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 4a9dfa4b4c..e682d28ff6 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -58,7 +58,7 @@ import {MATRIXTO_URL_PATTERN, MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-m
 const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
 const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g');
 
-import {asciiRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort} from 'emojione';
+import {asciiRegexp, unicodeRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort, toShort} from 'emojione';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import {makeUserPermalink} from "../../../matrix-to";
 import ReplyPreview from "./ReplyPreview";
@@ -69,6 +69,7 @@ import {ContentHelpers} from 'matrix-js-sdk';
 const EMOJI_SHORTNAMES = Object.keys(emojioneList);
 const EMOJI_UNICODE_TO_SHORTNAME = mapUnicodeToShort();
 const REGEX_EMOJI_WHITESPACE = new RegExp('(?:^|\\s)(' + asciiRegexp + ')\\s$');
+const EMOJI_REGEX = new RegExp(unicodeRegexp, 'g');
 
 const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;
 
@@ -76,6 +77,7 @@ const ENTITY_TYPES = {
     AT_ROOM_PILL: 'ATROOMPILL',
 };
 
+
 function onSendMessageFailed(err, room) {
     // XXX: temporary logging to try to diagnose
     // https://github.com/vector-im/riot-web/issues/3148
@@ -351,12 +353,20 @@ export default class MessageComposerInput extends React.Component {
         if (this.direction !== '') {
             const focusedNode = editorState.focusInline || editorState.focusText;
             if (focusedNode.isVoid) {
-                change = change[`collapseToEndOf${ this.direction }Text`]();
+                if (editorState.isCollapsed) {
+                    change = change[`collapseToEndOf${ this.direction }Text`]();
+                }
+                else {
+                    const block = this.direction === 'Previous' ? editorState.previousText : editorState.nextText;
+                    if (block) {
+                        change = change.moveFocusToEndOf(block)
+                    }
+                }
                 editorState = change.value;
             }
         }
 
-        if (editorState.document.getFirstText().text !== '') {
+        if (!editorState.document.isEmpty) {
             this.onTypingActivity();
         } else {
             this.onFinishedTyping();
@@ -369,9 +379,33 @@ export default class MessageComposerInput extends React.Component {
         }
         */
 
-/*        
-        editorState = RichText.attachImmutableEntitiesToEmoji(editorState);
+        // emojioneify any emoji
 
+        // deliberately lose any inlines and pills via Plain.serialize as we know
+        // they won't contain emoji
+        // XXX: is getTextsAsArray a private API?
+        editorState.document.getTextsAsArray().forEach(node => {
+            if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) {
+                let match;
+                while ((match = EMOJI_REGEX.exec(node.text)) !== null) {
+                    const range = Range.create({
+                        anchorKey: node.key,
+                        anchorOffset: match.index,
+                        focusKey: node.key,
+                        focusOffset: match.index + match[0].length,
+                    });
+                    const inline = Inline.create({
+                        type: 'emoji',
+                        data: { emojiUnicode: match[0] },
+                        isVoid: true,
+                    });
+                    change = change.insertInlineAtRange(range, inline);
+                    editorState = change.value;
+                }
+            }
+        });
+
+/*        
         const currentBlock = editorState.getSelection().getStartKey();
         const currentSelection = editorState.getSelection();
         const currentStartOffset = editorState.getSelection().getStartOffset();
@@ -400,7 +434,6 @@ export default class MessageComposerInput extends React.Component {
             editorState = EditorState.forceSelection(editorState, currentSelection);
         }
 */
-
         const text = editorState.startText.text;
         const currentStartOffset = editorState.startOffset;
 
@@ -912,8 +945,12 @@ export default class MessageComposerInput extends React.Component {
 
         // Move selection to the end of the selected history
         const change = editorState.change().collapseToEndOf(editorState.document);
+
         // XXX: should we be calling this.onChange(change) now?
-        // we skip it for now given we know we're about to setState anyway
+        // Answer: yes, if we want it to do any of the fixups on stuff like emoji.
+        // however, this should already have been done and persisted in the history,
+        // so shouldn't be necessary.
+
         editorState = change.value;
 
         this.suppressAutoComplete = true;
@@ -991,11 +1028,6 @@ export default class MessageComposerInput extends React.Component {
                 // we can't put text in here otherwise the editor tries to select it
                 isVoid: true,
             });
-        } else {
-            inline = Inline.create({
-                type: 'autocompletion',
-                nodes: [Text.create(completion)]
-            });
         }
 
         let editorState = activeEditorState;
@@ -1007,13 +1039,23 @@ export default class MessageComposerInput extends React.Component {
             editorState = change.value;
         }
 
-        const change = editorState.change()
-                                  .insertInlineAtRange(editorState.selection, inline)
-                                  .insertText(suffix);
+        let change;
+        if (inline) {
+            change = editorState.change()
+                                .insertInlineAtRange(editorState.selection, inline)
+                                .insertText(suffix);
+        }
+        else {
+            change = editorState.change()
+                                .insertTextAtRange(editorState.selection, completion)
+                                .insertText(suffix);
+        }
         editorState = change.value;
 
-        this.setState({ editorState, originalEditorState: activeEditorState }, ()=>{
-//            this.refs.editor.focus();
+        this.onChange(change);
+
+        this.setState({
+            originalEditorState: activeEditorState
         });
 
         return true;
@@ -1027,7 +1069,7 @@ export default class MessageComposerInput extends React.Component {
                 return <p {...attributes}>{children}</p>
             }
             case 'pill': {
-                const { data, text } = node;
+                const { data } = node;
                 const url = data.get('url');
                 const completion = data.get('completion');
 
@@ -1039,6 +1081,7 @@ export default class MessageComposerInput extends React.Component {
                             type={Pill.TYPE_AT_ROOM_MENTION}
                             room={this.props.room}
                             shouldShowPillAvatar={shouldShowPillAvatar}
+                            isSelected={isSelected}
                             />;
                 }
                 else if (Pill.isPillUrl(url)) {
@@ -1046,14 +1089,26 @@ export default class MessageComposerInput extends React.Component {
                             url={url}
                             room={this.props.room}
                             shouldShowPillAvatar={shouldShowPillAvatar}
+                            isSelected={isSelected}
                             />;
                 }
                 else {
+                    const { text } = node;
                     return <a href={url} {...props.attributes}>
                                 { text }
                            </a>;
                 }
             }
+            case 'emoji': {
+                const { data } = node;
+                const emojiUnicode = data.get('emojiUnicode');
+                const uri = RichText.unicodeToEmojiUri(emojiUnicode);
+                const shortname = toShort(emojiUnicode);
+                const className = classNames('mx_emojione', {
+                    mx_emojione_selected: isSelected
+                });
+                return <img className={ className } src={ uri } title={ shortname } alt={ emojiUnicode }/>;
+            }
         }
     };
 

From 12a56e8b8e13e9d49c191605a6fb5591566e17d6 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 15 May 2018 00:59:55 +0100
Subject: [PATCH 029/702] remove spurious comment

---
 src/components/views/rooms/MessageComposerInput.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index e682d28ff6..204ad524fe 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -381,8 +381,6 @@ export default class MessageComposerInput extends React.Component {
 
         // emojioneify any emoji
 
-        // deliberately lose any inlines and pills via Plain.serialize as we know
-        // they won't contain emoji
         // XXX: is getTextsAsArray a private API?
         editorState.document.getTextsAsArray().forEach(node => {
             if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) {

From 4eb6942211e613a11c999d1c44f38691d47fd49a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 15 May 2018 01:16:06 +0100
Subject: [PATCH 030/702] let onChange set originalEditorState

---
 src/components/views/rooms/MessageComposerInput.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 204ad524fe..39d49ecf83 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -346,7 +346,7 @@ export default class MessageComposerInput extends React.Component {
         }
     }
 
-    onChange = (change: Change) => {
+    onChange = (change: Change, originalEditorState: value) => {
 
         let editorState = change.value;
 
@@ -467,7 +467,7 @@ export default class MessageComposerInput extends React.Component {
         /* Since a modification was made, set originalEditorState to null, since newState is now our original */
         this.setState({
             editorState,
-            originalEditorState: null,
+            originalEditorState: originalEditorState || null
         });
     };
 
@@ -1050,11 +1050,7 @@ export default class MessageComposerInput extends React.Component {
         }
         editorState = change.value;
 
-        this.onChange(change);
-
-        this.setState({
-            originalEditorState: activeEditorState
-        });
+        this.onChange(change, activeEditorState);
 
         return true;
     };

From f5c67229a46648268aefd3b3206c54c8227818a3 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Mon, 14 May 2018 23:41:38 +0000
Subject: [PATCH 031/702] Translated using Weblate (Swedish)

Currently translated at 69.0% (811 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 95 ++++++++++++++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 18 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index e987ed29e2..a35509e1b4 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -135,7 +135,7 @@
     "Failed to save settings": "Det gick inte att spara inställningarna",
     "Failed to send email": "Det gick inte att skicka epost",
     "Failed to send request.": "Det gick inte att sända begäran.",
-    "Failed to set avatar.": "Det gick inte att sätta profilbilden.",
+    "Failed to set avatar.": "Misslyckades med att ange avatar.",
     "Failed to set display name": "Det gick inte att sätta namnet",
     "Failed to set up conference call": "Det gick inte att starta konferenssamtalet",
     "Failed to toggle moderator status": "Det gick inte att växla moderator-status",
@@ -181,7 +181,7 @@
     "Guest access is disabled on this Home Server.": "Gäståtkomst är inte aktiverat på den här hemservern.",
     "Guests cannot join this room even if explicitly invited.": "Gäster kan inte gå med i det här rummet fastän de är uttryckligen inbjudna.",
     "Hangup": "Lägg på",
-    "Hide read receipts": "Göm kvitteringar",
+    "Hide read receipts": "Dölj läskvitton",
     "Hide Text Formatting Toolbar": "Göm textformatteringsverktygsfältet",
     "Historical": "Historiska",
     "Home": "Hem",
@@ -293,7 +293,7 @@
     "Reject invitation": "Avvisa inbjudan",
     "Rejoin": "Gå med tillbaka",
     "Remote addresses for this room:": "Fjärradresser för det här rummet:",
-    "Remove Contact Information?": "Ta bort kontaktinformation?",
+    "Remove Contact Information?": "Ta bort kontaktuppgifter?",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s tog bort sitt visningsnamn (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s tog bort sin profilbild.",
     "Remove": "Ta bort",
@@ -403,18 +403,18 @@
     "Thu": "Tors",
     "Fri": "Fre",
     "Sat": "Lör",
-    "Jan": "Jan",
-    "Feb": "Feb",
-    "Mar": "Mar",
-    "Apr": "Apr",
-    "May": "Maj",
-    "Jun": "Jun",
-    "Jul": "Juli",
-    "Aug": "Aug",
-    "Sep": "Sep",
-    "Oct": "Okt",
-    "Nov": "Nov",
-    "Dec": "Dec",
+    "Jan": "jan",
+    "Feb": "feb",
+    "Mar": "mar",
+    "Apr": "apr",
+    "May": "maj",
+    "Jun": "jun",
+    "Jul": "jul",
+    "Aug": "aug",
+    "Sep": "sep",
+    "Oct": "okt",
+    "Nov": "nov",
+    "Dec": "dec",
     "Name or matrix ID": "Namn eller matrix ID",
     "Invite to Community": "",
     "Unable to enable Notifications": "Det går inte att aktivera Notifieringar",
@@ -647,8 +647,8 @@
     "Offline": "Offline",
     "(~%(count)s results)|other": "(~%(count)s resultat)",
     "(~%(count)s results)|one": "(~%(count)s resultat)",
-    "Upload avatar": "Ladda upp profilbild",
-    "Remove avatar": "Ta bort profilbild",
+    "Upload avatar": "Ladda upp avatar",
+    "Remove avatar": "Ta bort avatar",
     "This invitation was sent to an email address which is not associated with this account:": "Den här inbjudan skickades till en epostadress som inte är kopplad till detta konto:",
     "To link to a room it must have <a>an address</a>.": "För att länka till ett rum behöver det <a>en adress</a>.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nivå %(powerLevelNumber)s)",
@@ -752,5 +752,64 @@
     "This will allow you to reset your password and receive notifications.": "Det här låter dig återställa lösenordet och ta emot aviseringar.",
     "You have no visible notifications": "Du har inga synliga aviseringar",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ditt lösenord har ändrats. Du kommer inte att få push-aviseringar på andra enheter förrän du har loggat in på dem igen",
-    "Failed to upload image": "Det gick inte att ladda upp bild"
+    "Failed to upload image": "Det gick inte att ladda upp bild",
+    "New Password": "Nytt lösenord",
+    "Do you want to set an email address?": "Vill du ange en epostadress?",
+    "Your home server does not support device management.": "Din hemserver stöder inte enhetshantering.",
+    "Unable to load device list": "Det gick inte att ladda enhetslista",
+    "Delete %(count)s devices|other": "Ta bort %(count)s enheter",
+    "Delete %(count)s devices|one": "Ta bort enhet",
+    "Device Name": "Enhetsnamn",
+    "Select devices": "Välj enheter",
+    "Disable Emoji suggestions while typing": "Inaktivera Emoji-förslag medan du skriver",
+    "Use compact timeline layout": "Använd kompakt chattlayout",
+    "Not a valid Riot keyfile": "Inte en giltig Riot-nyckelfil",
+    "Authentication check failed: incorrect password?": "Autentiseringskontroll misslyckades: felaktigt lösenord?",
+    "Always show encryption icons": "Visa alltid krypteringsikoner",
+    "Disable big emoji in chat": "Inaktivera stor emoji i chatt",
+    "Hide avatars in user and room mentions": "Dölj avatarer i användar- och rumsnämningar",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s bytte avatar för %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s tog bort rummets avatar.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ändrade rummets avatar till <img/>",
+    "Automatically replace plain text Emoji": "Ersätt text-emojis automatiskt",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(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",
+    "You seem to be uploading files, are you sure you want to quit?": "Du verkar ladda upp filer, är du säker på att du vill avsluta?",
+    "You seem to be in a call, are you sure you want to quit?": "Du verkar vara i ett samtal, är du säker på att du vill avsluta?",
+    "Active call": "Aktivt samtal",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Visa enheter</showDevicesText>, <sendAnywayText>skicka ändå</sendAnywayText> eller <cancelText>avbryt</cancelText>.",
+    "%(count)s of your messages have not been sent.|one": "Ditt meddelande skickades inte.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Skicka om alla</resendText> eller <cancelText>ångra alla</cancelText> nu. Du kan även välja enskilda meddelanden för att skicka om eller ångra.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Skicka om meddelande</resendText> eller <cancelText>ångra meddelande</cancelText> nu.",
+    "Connectivity to the server has been lost.": "Anslutning till servern har brutits.",
+    "Sent messages will be stored until your connection has returned.": "Skickade meddelanden kommer att lagras tills anslutningen är tillbaka.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det är ingen annan här! Vill du <inviteText>bjuda in någon</inviteText> eller <nowarnText>sluta varna om det tomma rummet</nowarnText>?",
+    "Unknown room %(roomId)s": "Okänt rum %(roomId)s",
+    "Room": "Rum",
+    "Clear filter": "Töm filter",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Försökte ladda en viss punkt i det här rummets tidslinje, men du har inte behörighet att visa det aktuella meddelandet.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Försökte ladda en specifik punkt i det här rummets tidslinje, men kunde inte hitta den.",
+    "Success": "Det lyckades",
+    "Unable to remove contact information": "Det gick inte att ta bort kontaktuppgifter",
+    "Autocomplete Delay (ms):": "Autokompletteringsfördröjning (ms):",
+    "Ignored Users": "Ignorerade användare",
+    "These are experimental features that may break in unexpected ways": "Detta är experimentell funktionalitet som kan sluta fungera helt oväntat",
+    "Use with caution": "Använd med försiktighet",
+    "To return to your account in future you need to set a password": "För att återvända till ditt konto i framtiden måste du ange ett lösenord",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Ett epostmeddelande har skickats till %(emailAddress)s. När du har öppnat länken i det, klicka nedan.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Observera att du loggar in på %(hs)s-servern, inte matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Denna hemserver erbjuder inga inloggningsflöden som stöds av den här klienten.",
+    "Upload new:": "Ladda upp ny:",
+    "Copied!": "Kopierat!",
+    "Failed to copy": "Det gick inte att kopiera",
+    "Removed or unknown message type": "Borttagen eller okänd meddelandetyp",
+    "Message removed by %(userId)s": "Meddelande borttaget av %(userId)s",
+    "Message removed": "Meddelande borttaget",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robotkontrollen är för närvarande inte tillgänglig för skrivbordsversionen - vänligen använd en <a>webbläsare</a>",
+    "This Home Server would like to make sure you are not a robot": "Den här hemservern vill bekräfta att du inte är en robot",
+    "Sign in with CAS": "Logga in med CAS",
+    "Unknown devices": "Okända enheter",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" innehåller enheter som du inte har sett tidigare."
 }

From 05c469399d10927509640f84c42f97d27083dc8c Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Tue, 8 May 2018 09:26:45 +0000
Subject: [PATCH 032/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1172 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index e478c3270b..93acd5fbc2 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1176,5 +1176,6 @@
     "Unable to reply": "Ezin erantzun",
     "At this time it is not possible to reply with an emote.": "Une honetan ezin da irriabartxo batekin erantzun.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ezin izan da erantzundako gertaera kargatu, edo ez dago edo ez duzu ikusteko baimenik.",
-    "Collapse Reply Thread": "Tolestu erantzun-haria"
+    "Collapse Reply Thread": "Tolestu erantzun-haria",
+    "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan"
 }

From 5b26a56b9ab7c7afc4af918f9d912fc1bee9e096 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 16 May 2018 09:42:07 +0000
Subject: [PATCH 033/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1172 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 2a2b90f59f..9322865c7a 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1167,5 +1167,15 @@
     "At this time it is not possible to reply with a file so this will be sent without being a reply.": "В момента не може да се отговаря с файл, така че това ще се изпрати без да бъде отговор.",
     "Unable to reply": "Не може да се отговори",
     "At this time it is not possible to reply with an emote.": "В момента не може да се отговори с емотикона.",
-    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не може да се зареди събитието, на което е отговорено. Или не съществува или нямате достъп да го видите."
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не може да се зареди събитието, на което е отговорено. Или не съществува или нямате достъп да го видите.",
+    "Popout widget": "Изкарай в нов прозорец",
+    "Log out and remove encryption keys?": "Изход и изтриване на ключовете за шифроване?",
+    "Clear Storage and Sign Out": "Изчисти запазените данни и излез",
+    "Send Logs": "Изпрати логове",
+    "Refresh": "Опресни",
+    "We encountered an error trying to restore your previous session.": "Възникна грешка при възстановяване на предишната Ви сесия.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Изчистване на запазените данни в браузъра може да поправи проблема, но ще Ви изкара от профила и ще направи шифрованите съобщения нечетими.",
+    "Collapse Reply Thread": "Свий отговорите",
+    "Enable widget screenshots on supported widgets": "Включи скрийншоти за поддържащи ги приспособления",
+    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Бъговете по Riot се следят в GitHub: <a>създайте проблем в GitHub</a>."
 }

From c5c3c51cf0bd9908ff9fc3ad6b50c55572f94492 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Wed, 16 May 2018 09:55:27 +0000
Subject: [PATCH 034/702] Translated using Weblate (Swedish)

Currently translated at 69.9% (820 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index a35509e1b4..edb7f4b065 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -347,7 +347,7 @@
     "Start authentication": "Starta autentisering",
     "Start Chat": "Starta en chatt",
     "Cancel": "Avbryt",
-    "Create new room": "Nytt rum",
+    "Create new room": "Skapa nytt rum",
     "Custom Server Options": "Egna serverinställningar",
     "Dismiss": "Avvisa",
     "powered by Matrix": "drivs av Matrix",
@@ -361,7 +361,7 @@
     "Delete widget": "Ta bort widget",
     "Define the power level of a user": "Definiera anseende för en användare",
     "Do you want to load widget from URL:": "Vill du ladda widgeten från URL:",
-    "Edit": "Editera",
+    "Edit": "Ändra",
     "Enable automatic language detection for syntax highlighting": "Aktivera automatisk språkdetektering för syntaxmarkering",
     "Integrations Error": "Integrationsfel",
     "Publish this room to the public in %(domain)s's room directory?": "Publicera rummet i den offentliga rumskatalogen på %(domain)s?",
@@ -417,14 +417,14 @@
     "Dec": "dec",
     "Name or matrix ID": "Namn eller matrix ID",
     "Invite to Community": "",
-    "Unable to enable Notifications": "Det går inte att aktivera Notifieringar",
-    "Failed to invite user": "Misslyckades med att bjuda in användaren",
+    "Unable to enable Notifications": "Det går inte att aktivera aviseringar",
+    "Failed to invite user": "Det gick inte att bjuda in användaren",
     "The information being sent to us to help make Riot.im better includes:": "Informationen som skickas till oss för att hjälpa Riot.im att bli bättre inkluderar:",
     "Review Devices": "Granska enheter",
     "Answer Anyway": "Svara ändå",
     "VoIP is unsupported": "VoIP stöds ej",
     "Who would you like to add to this room?": "Vem vill du lägga till i det här rummet?",
-    "Failed to invite": "Misslyckades med att bjuda in",
+    "Failed to invite": "Inbjudan misslyckades",
     "You need to be logged in.": "Du måste vara inloggad.",
     "You need to be able to invite users to do that.": "Du måste kunna bjuda in användare för att göra det.",
     "You are not in this room.": "Du är inte i det här rummet.",
@@ -791,7 +791,7 @@
     "Clear filter": "Töm filter",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Försökte ladda en viss punkt i det här rummets tidslinje, men du har inte behörighet att visa det aktuella meddelandet.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Försökte ladda en specifik punkt i det här rummets tidslinje, men kunde inte hitta den.",
-    "Success": "Det lyckades",
+    "Success": "Slutfört",
     "Unable to remove contact information": "Det gick inte att ta bort kontaktuppgifter",
     "Autocomplete Delay (ms):": "Autokompletteringsfördröjning (ms):",
     "Ignored Users": "Ignorerade användare",
@@ -811,5 +811,14 @@
     "This Home Server would like to make sure you are not a robot": "Den här hemservern vill bekräfta att du inte är en robot",
     "Sign in with CAS": "Logga in med CAS",
     "Unknown devices": "Okända enheter",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" innehåller enheter som du inte har sett tidigare."
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" innehåller enheter som du inte har sett tidigare.",
+    "Delete Widget": "Ta bort widget",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Widget tas bort för alla användare i rummet. Är du säker på att du vill ta bort den?",
+    "Minimize apps": "Minimera appar",
+    "Picture": "Bild",
+    "Blacklist": "Svartlista",
+    "Unblacklist": "Ta bort svartlistning",
+    "Failed to invite the following users to %(groupId)s:": "Det gick inte att bjuda in följande användare till %(groupId)s:",
+    "Failed to invite users to %(groupId)s": "Det gick inte att bjuda in användare till %(groupId)s",
+    "This room is not public. You will not be able to rejoin without an invite.": "Detta rum är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan."
 }

From ae208da805f693cf016655834f267ecf9846c22c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 17 May 2018 00:01:23 +0100
Subject: [PATCH 035/702] nudge towards supporting formatting buttons in MD

---
 .../views/rooms/MessageComposerInput.js       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 39d49ecf83..1a2450696c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -536,11 +536,12 @@ export default class MessageComposerInput extends React.Component {
             this.enableRichtext(!this.state.isRichtextEnabled);
             return true;
         }
-/*
-        let newState: ?EditorState = null;
+
+        let newState: ?Value = null;
 
         // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
         if (this.state.isRichtextEnabled) {
+/*
             // These are block types, not handled by RichUtils by default.
             const blockCommands = ['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item'];
             const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
@@ -563,7 +564,9 @@ export default class MessageComposerInput extends React.Component {
                     newState = RichUtils.toggleBlockType(this.state.editorState, currentBlockType);
                 }
             }
+*/            
         } else {
+/*            
             const contentState = this.state.editorState.getCurrentContent();
             const multipleLinesSelected = RichText.hasMultiLineSelection(this.state.editorState);
 
@@ -599,16 +602,17 @@ export default class MessageComposerInput extends React.Component {
                 'blockquote': -2,
             }[command];
 
-            // Returns a function that collapses a selectionState to its end and moves it by offset
-            const collapseAndOffsetSelection = (selectionState, offset) => {
-                const key = selectionState.getEndKey();
-                return new SelectionState({
+            // Returns a function that collapses a selection to its end and moves it by offset
+            const collapseAndOffsetSelection = (selection, offset) => {
+                const key = selection.endKey();
+                return new Range({
                     anchorKey: key, anchorOffset: offset,
                     focusKey: key, focusOffset: offset,
                 });
             };
 
             if (modifyFn) {
+
                 const previousSelection = this.state.editorState.getSelection();
                 const newContentState = RichText.modifyText(contentState, previousSelection, modifyFn);
                 newState = EditorState.push(
@@ -633,15 +637,11 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
-        if (newState == null) {
-            newState = RichUtils.handleKeyCommand(this.state.editorState, command);
-        }
-
         if (newState != null) {
             this.setState({editorState: newState});
             return true;
         }
-*/    
+*/        
         return false;
     };
 /*

From e51554c626429c3ce42a100824d56762670446c6 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 17 May 2018 02:13:17 +0100
Subject: [PATCH 036/702] actually hook up RTE

---
 src/ComposerHistoryManager.js                 |   2 +-
 .../views/rooms/MessageComposerInput.js       | 295 +++++++++++-------
 2 files changed, 189 insertions(+), 108 deletions(-)

diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index ce0eb8f0c3..28749ace15 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import { Value } from 'slate';
 import Html from 'slate-html-serializer';
-import { Markdown as Md } from 'slate-md-serializer';
+import Md from 'slate-md-serializer';
 import Plain from 'slate-plain-serializer';
 import * as RichText from './RichText';
 import Markdown from './Markdown';
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 1a2450696c..70a9b9bd83 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -23,7 +23,7 @@ import { Editor } from 'slate-react';
 import { Value, Document, Event, Inline, Text, Range, Node } from 'slate';
 
 import Html from 'slate-html-serializer';
-import { Markdown as Md } from 'slate-md-serializer';
+import Md from 'slate-md-serializer';
 import Plain from 'slate-plain-serializer';
 import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerializer";
 
@@ -107,43 +107,6 @@ export default class MessageComposerInput extends React.Component {
         onInputStateChanged: PropTypes.func,
     };
 
-/*
-    static getKeyBinding(ev: SyntheticKeyboardEvent): string {
-        // Restrict a subset of key bindings to ONLY having ctrl/meta* pressed and
-        // importantly NOT having alt, shift, meta/ctrl* pressed. draft-js does not
-        // handle this in `getDefaultKeyBinding` so we do it ourselves here.
-        //
-        // * if macOS, read second option
-        const ctrlCmdCommand = {
-            // C-m => Toggles between rich text and markdown modes
-            [KeyCode.KEY_M]: 'toggle-mode',
-            [KeyCode.KEY_B]: 'bold',
-            [KeyCode.KEY_I]: 'italic',
-            [KeyCode.KEY_U]: 'underline',
-            [KeyCode.KEY_J]: 'code',
-            [KeyCode.KEY_O]: 'split-block',
-        }[ev.keyCode];
-
-        if (ctrlCmdCommand) {
-            if (!isOnlyCtrlOrCmdKeyEvent(ev)) {
-                return null;
-            }
-            return ctrlCmdCommand;
-        }
-
-        // Handle keys such as return, left and right arrows etc.
-        return getDefaultKeyBinding(ev);
-    }
-
-    static getBlockStyle(block: ContentBlock): ?string {
-        if (block.getType() === 'strikethrough') {
-            return 'mx_Markdown_STRIKETHROUGH';
-        }
-
-        return null;
-    }
-*/    
-
     client: MatrixClient;
     autocomplete: Autocomplete;
     historyManager: ComposerHistoryManager;
@@ -181,6 +144,8 @@ export default class MessageComposerInput extends React.Component {
         this.plainWithMdPills    = new PlainWithPillsSerializer({ pillFormat: 'md' });
         this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
         this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
+        this.md                  = new Md();
+        this.html                = new Html();
 
         this.suppressAutoComplete = false;
         this.direction = '';
@@ -191,9 +156,9 @@ export default class MessageComposerInput extends React.Component {
      * - whether we've got rich text mode enabled
      * - contentState was passed in
      */
-    createEditorState(richText: boolean, value: ?Value): Value {
-        if (value instanceof Value) {
-            return value;
+    createEditorState(richText: boolean, editorState: ?Value): Value {
+        if (editorState instanceof Value) {
+            return editorState;
         }
         else {
             // ...or create a new one.
@@ -275,7 +240,7 @@ export default class MessageComposerInput extends React.Component {
                 }
             }
                 break;
-*/                
+*/
         }
     };
 
@@ -403,7 +368,7 @@ export default class MessageComposerInput extends React.Component {
             }
         });
 
-/*        
+/*
         const currentBlock = editorState.getSelection().getStartKey();
         const currentSelection = editorState.getSelection();
         const currentStartOffset = editorState.getSelection().getStartOffset();
@@ -477,27 +442,54 @@ export default class MessageComposerInput extends React.Component {
         // FIXME: this conversion should be handled in the store, surely
         // i.e. "convert my current composer value into Rich or MD, as ComposerHistoryManager already does"
 
-        let value = null;
+        let editorState = null;
         if (enabled) {
-            // const md = new Markdown(this.state.editorState.getCurrentContent().getPlainText());
-            // contentState = RichText.htmlToContentState(md.toHTML());
+            // const sourceWithPills = this.plainWithMdPills.serialize(this.state.editorState);
+            // const markdown = new Markdown(sourceWithPills);
+            // editorState = this.html.deserialize(markdown.toHTML());
 
-            value = Md.deserialize(Plain.serialize(this.state.editorState));
+            // we don't really want a custom MD parser hanging around, but the
+            // alternative would be:
+            editorState = this.md.deserialize(this.plainWithMdPills.serialize(this.state.editorState));
         } else {
             // let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
             // value = ContentState.createFromText(markdown);
 
-            value = Plain.deserialize(Md.serialize(this.state.editorState));
+            editorState = Plain.deserialize(this.md.serialize(this.state.editorState));
         }
 
         Analytics.setRichtextMode(enabled);
 
         this.setState({
-            editorState: this.createEditorState(enabled, value),
+            editorState: this.createEditorState(enabled, editorState),
             isRichtextEnabled: enabled,
         });
         SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled);
-    }
+    };
+
+    /**
+    * Check if the current selection has a mark with `type` in it.
+    *
+    * @param {String} type
+    * @return {Boolean}
+    */
+
+    hasMark = type => {
+        const { editorState } = this.state
+        return editorState.activeMarks.some(mark => mark.type == type)
+    };
+
+    /**
+    * Check if the any of the currently selected blocks are of `type`.
+    *
+    * @param {String} type
+    * @return {Boolean}
+    */
+
+    hasBlock = type => {
+        const { editorState } = this.state
+        return editorState.blocks.some(node => node.type == type)
+    };
 
     onKeyDown = (ev: Event, change: Change, editor: Editor) => {
 
@@ -514,6 +506,22 @@ export default class MessageComposerInput extends React.Component {
             this.direction = '';
         }
 
+        if (isOnlyCtrlOrCmdKeyEvent(ev)) {
+            const ctrlCmdCommand = {
+                // C-m => Toggles between rich text and markdown modes
+                [KeyCode.KEY_M]: 'toggle-mode',
+                [KeyCode.KEY_B]: 'bold',
+                [KeyCode.KEY_I]: 'italic',
+                [KeyCode.KEY_U]: 'underline',
+                [KeyCode.KEY_J]: 'code',
+            }[ev.keyCode];
+
+            if (ctrlCmdCommand) {
+                return this.handleKeyCommand(ctrlCmdCommand);
+            }
+            return false;
+        }
+
         switch (ev.keyCode) {
             case KeyCode.ENTER:
                 return this.handleReturn(ev);
@@ -529,7 +537,7 @@ export default class MessageComposerInput extends React.Component {
                 // don't intercept it
                 return;
         }
-    }
+    };
 
     handleKeyCommand = (command: string): boolean => {
         if (command === 'toggle-mode') {
@@ -541,32 +549,79 @@ export default class MessageComposerInput extends React.Component {
 
         // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
         if (this.state.isRichtextEnabled) {
-/*
-            // These are block types, not handled by RichUtils by default.
-            const blockCommands = ['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item'];
-            const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
+            const type = command;
+            const { editorState } = this.state;
+            const change = editorState.change();
+            const { document } = editorState;
+            switch (type) {
+                // list-blocks:
+                case 'bulleted-list':
+                case 'numbered-list': {
+                    // Handle the extra wrapping required for list buttons.
+                    const isList = this.hasBlock('list-item');
+                    const isType = editorState.blocks.some(block => {
+                        return !!document.getClosest(block.key, parent => parent.type == type);
+                    });
 
-            const shouldToggleBlockFormat = (
-                command === 'backspace' ||
-                command === 'split-block'
-            ) && currentBlockType !== 'unstyled';
-
-            if (blockCommands.includes(command)) {
-                newState = RichUtils.toggleBlockType(this.state.editorState, command);
-            } else if (command === 'strike') {
-                // this is the only inline style not handled by Draft by default
-                newState = RichUtils.toggleInlineStyle(this.state.editorState, 'STRIKETHROUGH');
-            } else if (shouldToggleBlockFormat) {
-                const currentStartOffset = this.state.editorState.getSelection().getStartOffset();
-                const currentEndOffset = this.state.editorState.getSelection().getEndOffset();
-                if (currentStartOffset === 0 && currentEndOffset === 0) {
-                    // Toggle current block type (setting it to 'unstyled')
-                    newState = RichUtils.toggleBlockType(this.state.editorState, currentBlockType);
+                    if (isList && isType) {
+                        change
+                            .setBlocks(DEFAULT_NODE)
+                            .unwrapBlock('bulleted-list')
+                            .unwrapBlock('numbered-list');
+                    } else if (isList) {
+                        change
+                            .unwrapBlock(
+                                type == 'bulleted-list' ? 'numbered-list' : 'bulleted-list'
+                            )
+                            .wrapBlock(type);
+                    } else {
+                        change.setBlocks('list-item').wrapBlock(type);
+                    }
                 }
+                break;
+
+                // simple blocks
+                case 'paragraph':
+                case 'block-quote':
+                case 'heading-one':
+                case 'heading-two':
+                case 'heading-three':
+                case 'list-item':
+                case 'code-block': {
+                    const isActive = this.hasBlock(type);
+                    const isList = this.hasBlock('list-item');
+
+                    if (isList) {
+                        change
+                            .setBlocks(isActive ? DEFAULT_NODE : type)
+                            .unwrapBlock('bulleted-list')
+                            .unwrapBlock('numbered-list');
+                    } else {
+                        change.setBlocks(isActive ? DEFAULT_NODE : type);
+                    }
+                }
+                break;
+
+                // marks:
+                case 'bold':
+                case 'italic':
+                case 'code':
+                case 'underline':
+                case 'strikethrough': {
+                    change.toggleMark(type);
+                }
+                break;
+
+                default:
+                    console.warn(`ignoring unrecognised RTE command ${type}`);
+                    return false;
             }
-*/            
+
+            this.onChange(change);
+
+            return true;
         } else {
-/*            
+/*
             const contentState = this.state.editorState.getCurrentContent();
             const multipleLinesSelected = RichText.hasMultiLineSelection(this.state.editorState);
 
@@ -641,7 +696,8 @@ export default class MessageComposerInput extends React.Component {
             this.setState({editorState: newState});
             return true;
         }
-*/        
+*/
+        }
         return false;
     };
 /*
@@ -671,19 +727,14 @@ export default class MessageComposerInput extends React.Component {
         if (ev.shiftKey) {
             return;
         }
-/*
-        const currentBlockType = RichUtils.getCurrentBlockType(this.state.editorState);
-        if (
-            ['code-block', 'blockquote', 'unordered-list-item', 'ordered-list-item']
-            .includes(currentBlockType)
-        ) {
-            // By returning false, we allow the default draft-js key binding to occur,
-            // which in this case invokes "split-block". This creates a new block of the
-            // same type, allowing the user to delete it with backspace.
-            // See handleKeyCommand (when command === 'backspace')
-            return false;
+
+        if (this.state.editorState.blocks.some(
+            block => block in ['code-block', 'block-quote', 'bulleted-list', 'numbered-list']
+        )) {
+            // allow the user to terminate blocks by hitting return rather than sending a msg
+            return;
         }
-*/
+
         const editorState = this.state.editorState;
 
         let contentText;
@@ -989,6 +1040,17 @@ export default class MessageComposerInput extends React.Component {
         await this.setDisplayedCompletion(null); // restore originalEditorState
     };
 
+    /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
+     buttons. */
+    getSelectionInfo(editorState: Value) {
+        return {
+            marks: editorState.activeMarks,
+            // XXX: shouldn't we return all the types of blocks in the current selection,
+            // not just the anchor?
+            blockType: editorState.anchorBlock.type,
+        };
+    }
+
     /* If passed null, restores the original editor content from state.originalEditorState.
      * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
      */
@@ -1059,9 +1121,24 @@ export default class MessageComposerInput extends React.Component {
         const { attributes, children, node, isSelected } = props;
 
         switch (node.type) {
-            case 'paragraph': {
-                return <p {...attributes}>{children}</p>
-            }
+            case 'paragraph':
+                return <p {...attributes}>{children}</p>;
+            case 'block-quote':
+                return <blockquote {...attributes}>{children}</blockquote>;
+            case 'bulleted-list':
+                return <ul {...attributes}>{children}</ul>;
+            case 'heading-one':
+                return <h1 {...attributes}>{children}</h1>;
+            case 'heading-two':
+                return <h2 {...attributes}>{children}</h2>;
+            case 'heading-three':
+                return <h3 {...attributes}>{children}</h3>;
+            case 'list-item':
+                return <li {...attributes}>{children}</li>;
+            case 'numbered-list':
+                return <ol {...attributes}>{children}</ol>;
+            case 'code-block':
+                return <p {...attributes}><code {...attributes}>{children}</code></p>;
             case 'pill': {
                 const { data } = node;
                 const url = data.get('url');
@@ -1106,29 +1183,35 @@ export default class MessageComposerInput extends React.Component {
         }
     };
 
+    renderMark = props => {
+        const { children, mark, attributes } = props;
+        switch (mark.type) {
+            case 'bold':
+                return <strong {...{ attributes }}>{children}</strong>;
+            case 'italic':
+                return <em {...{ attributes }}>{children}</em>;
+            case 'code':
+                return <code {...{ attributes }}>{children}</code>;
+            case 'underline':
+                return <u {...{ attributes }}>{children}</u>;
+            case 'strikethrough':
+                return <del {...{ attributes }}>{children}</del>;
+        }
+    };
+
     onFormatButtonClicked = (name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", e) => {
         e.preventDefault(); // don't steal focus from the editor!
 
         const command = {
                 code: 'code-block',
-                quote: 'blockquote',
-                bullet: 'unordered-list-item',
-                numbullet: 'ordered-list-item',
+                quote: 'block-quote',
+                bullet: 'bulleted-list',
+                numbullet: 'numbered-list',
+                strike: 'strike-through',
             }[name] || name;
         this.handleKeyCommand(command);
     };
 
-    /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
-     buttons. */
-    getSelectionInfo(editorState: Value) {
-        return {
-            marks: editorState.activeMarks,
-            // XXX: shouldn't we return all the types of blocks in the current selection,
-            // not just the anchor?
-            blockType: editorState.anchorBlock.type,
-        };
-    }
-
     getAutocompleteQuery(editorState: Value) {
         // We can just return the current block where the selection begins, which
         // should be enough to capture any autocompletion input, given autocompletion
@@ -1154,7 +1237,7 @@ export default class MessageComposerInput extends React.Component {
         const range = {
             beginning, // whether the selection is in the first block of the editor or not
             start: editorState.selection.anchorOffset,
-            end: (editorState.selection.anchorKey == editorState.selection.focusKey) ? 
+            end: (editorState.selection.anchorKey == editorState.selection.focusKey) ?
                  editorState.selection.focusOffset : editorState.selection.anchorOffset,
         }
         if (range.start > range.end) {
@@ -1203,11 +1286,9 @@ export default class MessageComposerInput extends React.Component {
                             onChange={this.onChange}
                             onKeyDown={this.onKeyDown}
                             renderNode={this.renderNode}
+                            renderMark={this.renderMark}
                             spellCheck={true}
                             /*
-                            blockStyleFn={MessageComposerInput.getBlockStyle}
-                            keyBindingFn={MessageComposerInput.getKeyBinding}
-                            handleKeyCommand={this.handleKeyCommand}
                             handlePastedText={this.onTextPasted}
                             handlePastedFiles={this.props.onFilesPasted}
                             stripPastedStyles={!this.state.isRichtextEnabled}

From 123c4d0f6c027c6b74db273486d4d230c3217908 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 16 May 2018 15:51:37 +0000
Subject: [PATCH 037/702] Translated using Weblate (Italian)

Currently translated at 99.1% (1162 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index ba7417bcc8..82382a3967 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1151,5 +1151,21 @@
     "Collapse panel": "Riduci pannello",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Con il tuo attuale browser, l'aspetto e la sensazione generale dell'applicazione potrebbero essere completamente sbagliati e alcune delle funzionalità potrebbero non funzionare. Se vuoi provare comunque puoi continuare, ma non riceverai aiuto per qualsiasi problema tu possa riscontrare!",
     "Checking for an update...": "Controllo aggiornamenti...",
-    "There are advanced notifications which are not shown here": "Ci sono notifiche avanzate che non sono mostrate qui"
+    "There are advanced notifications which are not shown here": "Ci sono notifiche avanzate che non sono mostrate qui",
+    "Every page you use in the app": "Ogni pagina che usi nell'app",
+    "e.g. <CurrentPageURL>": "es. <CurrentPageURL>",
+    "Your User Agent": "Il tuo User Agent",
+    "Your device resolution": "La risoluzione del dispositivo",
+    "Missing roomId.": "ID stanza mancante.",
+    "Always show encryption icons": "Mostra sempre icone di cifratura",
+    "Enable widget screenshots on supported widgets": "Attiva le schermate dei widget sui widget supportati",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Al momento non è possibile rispondere con un file quindi verrà inviato senza essere una risposta.",
+    "Unable to reply": "Impossibile rispondere",
+    "At this time it is not possible to reply with an emote.": "Al momento non è possibile rispondere con una emoticon.",
+    "Picture": "Immagine",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossibile caricare l'evento a cui si è risposto, o non esiste o non hai il permesso di visualizzarlo.",
+    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Gli errori di Riot sono monitorati su GitHub: <a>segnala un problema su GitHub</a>.",
+    "Log out and remove encryption keys?": "Disconnettere e rimuovere le chiavi di cifratura?",
+    "Refresh": "Aggiorna",
+    "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente."
 }

From d9236a58487beaa6ac7a814663e0f01b84009330 Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Wed, 16 May 2018 16:09:18 +0000
Subject: [PATCH 038/702] Translated using Weblate (Ukrainian)

Currently translated at 23.1% (271 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index cb7809814a..c3ff95b938 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -265,5 +265,11 @@
     "To return to your account in future you need to set a password": "Щоб мати змогу користуватись обліковкою у майбутньому, треба зазначити пароль",
     "Logged in as:": "Ви зайшли як:",
     "click to reveal": "натисніть щоб побачити",
-    "Homeserver is": "Домашній сервер —"
+    "Homeserver is": "Домашній сервер —",
+    "The version of Riot.im": "Версія Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Чи увійшли ви, чи ні (ми не зберігаємо ваше ім'я користувача)",
+    "Your language of choice": "Обрана мова",
+    "Which officially provided instance you are using, if any": "Яким офіційно наданим примірником ви користуєтесь (якщо користуєтесь)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Чи використовуєте ви режим Richtext у редакторі Rich Text Editor",
+    "Your homeserver's URL": "URL адреса вашого домашнього серверу"
 }

From b28ed6075bbf65fdb78bd09e4773ab2a6f25a936 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 17 May 2018 18:15:34 +0100
Subject: [PATCH 039/702] Implement slightly hacky CSS soln. to thumbnail
 sizing

As the slightly nicer alternative to fixupHeight being applied once
we actually have a timelineWidth.

The niceness comes from not needing timelineWidth, which means we can
implement at render time with CSS. (Despite still calculating aspect
ratios when we render.)
---
 res/css/views/messages/_MImageBody.scss     | 13 +++-
 src/components/views/messages/MImageBody.js | 66 ++++++---------------
 2 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 1c809f0743..9f0e77f765 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -20,5 +20,14 @@ limitations under the License.
 }
 
 .mx_MImageBody_thumbnail {
-    max-width: 100%;
-}
\ No newline at end of file
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+}
+
+.mx_MImageBody_thumbnail_container {
+    overflow: hidden;
+    position: relative;
+}
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 6cc492acf8..87fe8d906c 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -21,15 +21,15 @@ import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
 
 import MFileBody from './MFileBody';
-import ImageUtils from '../../../ImageUtils';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
-import dis from '../../../dispatcher';
 import { decryptFile } from '../../../utils/DecryptFile';
 import Promise from 'bluebird';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 
+const THUMBNAIL_MAX_HEIGHT = 600;
+
 export default class extends React.Component {
     displayName: 'MImageBody'
 
@@ -48,14 +48,12 @@ export default class extends React.Component {
     constructor(props) {
         super(props);
 
-        this.onAction = this.onAction.bind(this);
         this.onImageError = this.onImageError.bind(this);
         this.onImageLoad = this.onImageLoad.bind(this);
         this.onImageEnter = this.onImageEnter.bind(this);
         this.onImageLeave = this.onImageLeave.bind(this);
         this.onClientSync = this.onClientSync.bind(this);
         this.onClick = this.onClick.bind(this);
-        this.fixupHeight = this.fixupHeight.bind(this);
         this._isGif = this._isGif.bind(this);
 
         this.state = {
@@ -140,7 +138,6 @@ export default class extends React.Component {
     }
 
     onImageLoad() {
-        this.fixupHeight();
         this.props.onWidgetLoad();
     }
 
@@ -176,7 +173,6 @@ export default class extends React.Component {
     }
 
     componentDidMount() {
-        this.dispatcherRef = dis.register(this.onAction);
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined && this.state.decryptedUrl === null) {
             let thumbnailPromise = Promise.resolve(null);
@@ -217,7 +213,6 @@ export default class extends React.Component {
 
     componentWillUnmount() {
         this.unmounted = true;
-        dis.unregister(this.dispatcherRef);
         this.context.matrixClient.removeListener('sync', this.onClientSync);
         this._afterComponentWillUnmount();
 
@@ -234,50 +229,25 @@ export default class extends React.Component {
     _afterComponentWillUnmount() {
     }
 
-    onAction(payload) {
-        if (payload.action === "timeline_resize") {
-            this.fixupHeight();
-        }
-    }
-
-    fixupHeight() {
-        if (!this.refs.image) {
-            console.warn(`Refusing to fix up height on ${this.displayName} with no image element`);
-            return;
-        }
-
-        const content = this.props.mxEvent.getContent();
-        const timelineWidth = this.refs.body.offsetWidth;
-        const maxHeight = 600; // let images take up as much width as they can so long as the height doesn't exceed 600px.
-        // the alternative here would be 600*timelineWidth/800; to scale them down to fit inside a 4:3 bounding box
-
-        // FIXME: this will break on clientside generated thumbnails (as per e2e rooms)
-        // which may well be much smaller than the 800x600 bounding box.
-
-        // FIXME: It will also break really badly for images with broken or missing thumbnails
-
-        // FIXME: Because we don't know what size of thumbnail the server's actually going to send
-        // us, we can't even really layout the page nicely for it.  Instead we have to assume
-        // it'll target 800x600 and we'll downsize if needed to make things fit.
-
-        // console.log("trying to fit image into timelineWidth of " + this.refs.body.offsetWidth + " or " + this.refs.body.clientWidth);
-        let thumbHeight = null;
-        if (content.info) {
-            thumbHeight = ImageUtils.thumbHeight(content.info.w, content.info.h, timelineWidth, maxHeight);
-        }
-        this.refs.image.style.height = thumbHeight + "px";
-        // console.log("Image height now", thumbHeight);
-    }
-
     _messageContent(contentUrl, thumbUrl, content) {
+        const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h);
+        const maxWidth = content.info.w * maxHeight / content.info.h;
         const thumbnail = (
             <a href={contentUrl} onClick={this.onClick}>
-                <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
-                    alt={content.body}
-                    onError={this.onImageError}
-                    onLoad={this.onImageLoad}
-                    onMouseEnter={this.onImageEnter}
-                    onMouseLeave={this.onImageLeave} />
+                <div className="mx_MImageBody_thumbnail_container" style={{ "max-height": maxHeight + "px" }} >
+                    { /* Calculate aspect ratio, using %padding will size _container correctly */ }
+                    <div style={{ paddingBottom: (100 * content.info.h / content.info.w) + '%' }}></div>
+
+                    { /* Thumbnail CSS class resizes to exactly container size with inline CSS
+                         to restrict width */ }
+                    <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
+                        style={{ "max-width": maxWidth + "px" }}
+                        alt={content.body}
+                        onError={this.onImageError}
+                        onLoad={this.onImageLoad}
+                        onMouseEnter={this.onImageEnter}
+                        onMouseLeave={this.onImageLeave} />
+                </div>
             </a>
         );
 

From bbcf2fea53d81cb344e36e21221c298be46e30d5 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 18 May 2018 09:47:49 +0100
Subject: [PATCH 040/702] Fix e2e image thumbnail spinner containing box
 correct size

---
 src/components/views/messages/MImageBody.js | 55 ++++++++++-----------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 87fe8d906c..f1454d1ac5 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -232,7 +232,29 @@ export default class extends React.Component {
     _messageContent(contentUrl, thumbUrl, content) {
         const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h);
         const maxWidth = content.info.w * maxHeight / content.info.h;
-        const thumbnail = (
+
+        let img = null;
+        // e2e image hasn't been decrypted yet
+        if (content.file !== undefined && this.state.decryptedUrl === null) {
+            img = <div className="mx_MImageBody_thumbnail" ref="image" style={{
+                "display": "flex",
+                "alignItems": "center",
+                "width": "100%",
+            }}>
+                <img src="img/spinner.gif" alt={content.body} width="32" height="32" style={{
+                    "margin": "auto",
+                }} />
+            </div>;
+        } else if (thumbUrl && !this.state.imgError) {
+            img = <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
+                style={{ "max-width": maxWidth + "px" }}
+                alt={content.body}
+                onError={this.onImageError}
+                onLoad={this.onImageLoad}
+                onMouseEnter={this.onImageEnter}
+                onMouseLeave={this.onImageLeave} />;
+        }
+        const thumbnail = img ?
             <a href={contentUrl} onClick={this.onClick}>
                 <div className="mx_MImageBody_thumbnail_container" style={{ "max-height": maxHeight + "px" }} >
                     { /* Calculate aspect ratio, using %padding will size _container correctly */ }
@@ -240,20 +262,13 @@ export default class extends React.Component {
 
                     { /* Thumbnail CSS class resizes to exactly container size with inline CSS
                          to restrict width */ }
-                    <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
-                        style={{ "max-width": maxWidth + "px" }}
-                        alt={content.body}
-                        onError={this.onImageError}
-                        onLoad={this.onImageLoad}
-                        onMouseEnter={this.onImageEnter}
-                        onMouseLeave={this.onImageLeave} />
+                    { img }
                 </div>
-            </a>
-        );
+            </a> : null;
 
         return (
             <span className="mx_MImageBody" ref="body">
-                { thumbUrl && !this.state.imgError ? thumbnail : '' }
+                { thumbnail }
                 <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />
             </span>
       );
@@ -271,24 +286,6 @@ export default class extends React.Component {
             );
         }
 
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
-            // Need to decrypt the attachment
-            // The attachment is decrypted in componentDidMount.
-            // For now add an img tag with a spinner.
-            return (
-                <span className="mx_MImageBody" ref="body">
-                    <div className="mx_MImageBody_thumbnail" ref="image" style={{
-                        "display": "flex",
-                        "alignItems": "center",
-                        "width": "100%",
-                    }}>
-                        <img src="img/spinner.gif" alt={content.body} width="32" height="32" style={{
-                            "margin": "auto",
-                        }} />
-                    </div>
-                </span>
-            );
-        }
 
         const contentUrl = this._getContentUrl();
         let thumbUrl;

From b41b9aa4facd2e4767d993f1d173ec9fdbc03c37 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 18 May 2018 09:58:52 +0100
Subject: [PATCH 041/702] Remove fixupHeight call from MStickerBody

---
 src/components/views/messages/MStickerBody.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 3a412fc2e2..cdb60f0074 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -40,7 +40,6 @@ export default class MStickerBody extends MImageBody {
     }
 
     _onImageLoad() {
-        this.fixupHeight();
         this.setState({
             placeholderClasses: 'mx_MStickerBody_placeholder_invisible',
         });
@@ -110,8 +109,6 @@ export default class MStickerBody extends MImageBody {
         // The pixel size of sticker images is generally larger than their intended display
         // size so they render at native reolution on HiDPI displays. We therefore need to
         // explicity set the size so they render at the intended size.
-        // XXX: This will be clobberred when we run fixupHeight(), but we need to do it
-        // here otherwise the stickers are momentarily displayed at the pixel size.
         const imageStyle = {
             height: content.info.h,
             // leave the browser the calculate the width automatically

From d11442de0434282c70052327420ab359de9bd161 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 18 May 2018 10:15:59 +0100
Subject: [PATCH 042/702] Adjust comment

---
 src/components/views/messages/MImageBody.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index f1454d1ac5..f98432a166 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -260,8 +260,7 @@ export default class extends React.Component {
                     { /* Calculate aspect ratio, using %padding will size _container correctly */ }
                     <div style={{ paddingBottom: (100 * content.info.h / content.info.w) + '%' }}></div>
 
-                    { /* Thumbnail CSS class resizes to exactly container size with inline CSS
-                         to restrict width */ }
+                    { /* mx_MImageBody_thumbnail resizes img to exactly container size */ }
                     { img }
                 </div>
             </a> : null;

From 7e7e2a747313d2d9d45d67bb5019b1fc0b7ef20a Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 18 May 2018 10:27:22 +0100
Subject: [PATCH 043/702] Add more comments to explain thumbnail sizing

---
 res/css/views/messages/_MImageBody.scss     | 4 ++++
 src/components/views/messages/MImageBody.js | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 9f0e77f765..9667337f5a 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -28,6 +28,10 @@ limitations under the License.
 }
 
 .mx_MImageBody_thumbnail_container {
+    // Prevent the padding-bottom (added inline in MImageBody.js) from
+    // effecting elements below the container.
     overflow: hidden;
+
+    // Make sure the _thumbnail is positioned relative to the _container
     position: relative;
 }
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index f98432a166..656bd02840 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -230,7 +230,10 @@ export default class extends React.Component {
     }
 
     _messageContent(contentUrl, thumbUrl, content) {
+        // The maximum height of the thumbnail as it is rendered as an <img>
         const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h);
+        // The maximum width of the thumbnail, as dictated by it's natural
+        // maximum height.
         const maxWidth = content.info.w * maxHeight / content.info.h;
 
         let img = null;
@@ -246,6 +249,8 @@ export default class extends React.Component {
                 }} />
             </div>;
         } else if (thumbUrl && !this.state.imgError) {
+            // Restrict the width of the thumbnail here, otherwise it will fill the container
+            // which has the same width as the timeline
             img = <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
                 style={{ "max-width": maxWidth + "px" }}
                 alt={content.body}

From 6b559aaf40378d59fb5e94483833845a87fc4106 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 17 May 2018 18:41:24 +0000
Subject: [PATCH 044/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1170 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 50 ++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index f766069b16..24e9750698 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1,6 +1,6 @@
 {
     "Account": "Аккаунт",
-    "Add email address": "Добавить адрес email",
+    "Add email address": "Добавить email",
     "Add phone number": "Добавить номер телефона",
     "Admin": "Администратор",
     "Advanced": "Подробности",
@@ -39,7 +39,7 @@
     "Display name": "Отображаемое имя",
     "Displays action": "Отображение действий",
     "Ed25519 fingerprint": "Ed25519 отпечаток",
-    "Email, name or matrix ID": "Email-адрес, имя или идентификатор",
+    "Email, name or matrix ID": "Email, имя или matrix ID",
     "Emoji": "Смайлы",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Зашифрованные сообщения не будут видны в клиентах, еще не поддерживающих сквозное шифрование",
     "Encrypted room": "Зашифрованная комната",
@@ -47,7 +47,7 @@
     "End-to-end encryption is in beta and may not be reliable": "Сквозное шифрование сейчас в бета-тестировании и может не работать",
     "Error": "Ошибка",
     "Event information": "Информация о событии",
-    "Export E2E room keys": "Экспорт ключей сквозного шифрования",
+    "Export E2E room keys": "Экспорт ключей шифрования",
     "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
     "Failed to leave room": "Не удалось выйти из комнаты",
     "Failed to reject invitation": "Не удалось отклонить приглашение",
@@ -64,9 +64,9 @@
     "Historical": "Архив",
     "Homeserver is": "Домашний сервер это",
     "Identity Server is": "Сервер идентификации это",
-    "I have verified my email address": "Я подтвердил свой адрес email",
-    "Import E2E room keys": "Импорт ключей сквозного шифрования",
-    "Invalid Email Address": "Недопустимый адрес email",
+    "I have verified my email address": "Я подтвердил свой email",
+    "Import E2E room keys": "Импорт ключей шифрования",
+    "Invalid Email Address": "Недопустимый email",
     "Invite new room members": "Пригласить в комнату новых участников",
     "Invites": "Приглашения",
     "Invites user with given id to current room": "Приглашает пользователя с заданным ID в текущую комнату",
@@ -103,9 +103,9 @@
     "Settings": "Настройки",
     "Start a chat": "Начать разговор",
     "Start Chat": "Начать разговор",
-    "Unable to add email address": "Не удается добавить адрес email",
+    "Unable to add email address": "Не удается добавить email",
     "Unable to remove contact information": "Не удалось удалить контактную информацию",
-    "Unable to verify email address.": "Не удалось проверить адрес email.",
+    "Unable to verify email address.": "Не удалось проверить email.",
     "Unban": "Разблокировать",
     "Unencrypted room": "Нешифрованная комната",
     "unencrypted": "без шифрования",
@@ -159,7 +159,7 @@
     "Failed to lookup current room": "Не удалось найти текущую комнату",
     "Failed to send request.": "Не удалось отправить запрос.",
     "Failed to set up conference call": "Не удалось сделать конференц-звонок",
-    "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить email-адрес: убедитесь, что вы перешли по ссылке в письме",
+    "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить email: убедитесь, что вы перешли по ссылке в письме",
     "Failure to create room": "Не удалось создать комнату",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "click to reveal": "нажмите для открытия",
@@ -185,7 +185,7 @@
     "Set a display name:": "Введите отображаемое имя:",
     "Passwords don't match.": "Пароли не совпадают.",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Пароль слишком короткий (мин. %(MIN_PASSWORD_LENGTH)s).",
-    "This doesn't look like a valid email address.": "Это не похоже на допустимый адрес email.",
+    "This doesn't look like a valid email address.": "Это не похоже на допустимый email.",
     "This server does not support authentication with a phone number.": "Этот сервер не поддерживает аутентификацию с помощью номера телефона.",
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Имена пользователей могут содержать только буквы, цифры, точки, дефисы и символы подчеркивания.",
     "An unknown error occurred.": "Произошла неизвестная ошибка.",
@@ -224,7 +224,7 @@
     "Thu": "Чт",
     "Fri": "Пт",
     "Sat": "Сб",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш email-адрес не связан ни с одним пользователем на этом сервере.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш email не связан ни с одним пользователем на этом сервере.",
     "To use it, just wait for autocomplete results to load and tab through them.": "Чтобы воспользоваться этой функцией, дождитесь загрузки результатов в окне автодополнения, а затем используйте Tab для прокрутки.",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включил(а) в комнате сквозное шифрование (алгоритм %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s разблокировал(а) %(targetName)s.",
@@ -337,7 +337,7 @@
     "Success": "Успех",
     "The default role for new room members is": "Права по умолчанию для новых участников комнаты",
     "The main address for this room is": "Основной адрес этой комнаты",
-    "This email address is already in use": "Этот email-адрес уже используется",
+    "This email address is already in use": "Этот email уже используется",
     "This email address was not found": "Этот адрес электронной почты не найден",
     "The email address linked to your account must be entered.": "Необходимо ввести адрес электронной почты, связанный с вашей учетной записью.",
     "The file '%(fileName)s' failed to upload": "Не удалось отправить файл '%(fileName)s'",
@@ -404,8 +404,8 @@
     "Device ID:": "ID устройства:",
     "device id: ": "ID устройства: ",
     "Device key:": "Ключ устройства:",
-    "Email address": "Email-адрес",
-    "Email address (optional)": "Email-адрес (необязательно)",
+    "Email address": "Email",
+    "Email address (optional)": "Email (необязательно)",
     "Error decrypting attachment": "Ошибка расшифровки вложения",
     "Export": "Экспорт",
     "Failed to set avatar.": "Не удалось установить аватар.",
@@ -510,11 +510,11 @@
     "Sign in with CAS": "Войти с помощью CAS",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Вы можете войти на другой сервер Matrix, указав его URL-адрес.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Это позволяет использовать приложение с учетной записью Matrix на другом сервере.",
-    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Кроме того, можно выбрать другой сервер идентификации, однако в таком случае вы, скорее всего, не сможете взаимодействовать с пользователями посредством их email-адресов.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Кроме того, можно выбрать другой сервер идентификации, однако в таком случае вы, скорее всего, не сможете взаимодействовать с пользователями посредством их emailов.",
     "Please check your email to continue registration.": "Чтобы продолжить регистрацию, проверьте электронную почту.",
     "Token incorrect": "Неверный код проверки",
     "Please enter the code it contains:": "Введите полученный код:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Если не указать email-адрес, вы не сможете при необходимости сбросить свой пароль. Уверены?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Если не указать email, вы не сможете при необходимости сбросить свой пароль. Уверены?",
     "You are registering with %(SelectedTeamName)s": "Вы регистрируетесь в %(SelectedTeamName)s",
     "Default server": "Сервер по умолчанию",
     "Custom server": "Другой сервер",
@@ -603,7 +603,7 @@
     "Seen by %(userName)s at %(dateTime)s": "Прочитано %(userName)s в %(dateTime)s",
     "Send anyway": "Отправить в любом случае",
     "Show Text Formatting Toolbar": "Показать инструменты форматирования текста",
-    "This invitation was sent to an email address which is not associated with this account:": "Это приглашение было отправлено на email-адрес, не связанный с вашей учетной записью:",
+    "This invitation was sent to an email address which is not associated with this account:": "Это приглашение было отправлено на email, не связанный с вашей учетной записью:",
     "To link to a room it must have <a>an address</a>.": "Чтобы иметь возможность ссылаться на комнату, ей нужно присвоить <a>адрес</a>.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Не удалось установить, что адрес в этом приглашении соответствует вашей учетной записи.",
     "Undecryptable": "Невозможно расшифровать",
@@ -619,7 +619,7 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не удается подключиться к домашнему серверу - проверьте подключение, убедитесь, что ваш <a>SSL-сертификат домашнего сервера</a> является доверенным и что расширение браузера не блокирует запросы.",
     "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s заблокировал(а) вас в %(roomName)s.",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s выгнал(а) вас из %(roomName)s.",
-    "You may wish to login with a different account, or add this email to this account.": "При желании вы можете войти в систему под другим именем или привязать этот email-адрес к вашей учетной записи.",
+    "You may wish to login with a different account, or add this email to this account.": "При желании вы можете войти в систему под другим именем или привязать этот email к вашей учетной записи.",
     "Your home server does not support device management.": "Ваш сервер не поддерживает управление устройствами.",
     "(could not connect media)": "(сбой подключения)",
     "(no answer)": "(нет ответа)",
@@ -628,7 +628,7 @@
     "Not a valid Riot keyfile": "Недействительный файл ключей Riot",
     "Your browser does not support the required cryptography extensions": "Ваш браузер не поддерживает требуемые криптографические расширения",
     "Authentication check failed: incorrect password?": "Ошибка аутентификации: возможно, неправильный пароль?",
-    "Do you want to set an email address?": "Хотите указать email-адрес?",
+    "Do you want to set an email address?": "Хотите указать email?",
     "This will allow you to reset your password and receive notifications.": "Это позволит при необходимости сбросить пароль и получать уведомления.",
     "Press <StartChatButton> to start a chat with someone": "Нажмите <StartChatButton>, чтобы начать разговор с кем-либо",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Вы еще не вошли ни в одну из комнат! Нажмите <CreateRoomButton>, чтобы создать комнату, или <RoomDirectoryButton>, чтобы посмотреть каталог комнат",
@@ -745,7 +745,7 @@
     "Failed to add the following rooms to %(groupId)s:": "Не удалось добавить эти комнаты в %(groupId)s:",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix ID комнаты",
-    "email address": "адрес email",
+    "email address": "email",
     "Try using one of the following valid address types: %(validTypesList)s.": "Попробуйте использовать один из следующих допустимых типов адресов: %(validTypesList)s.",
     "You have entered an invalid address.": "Введен неправильный адрес.",
     "Unpin Message": "Открепить сообщение",
@@ -953,7 +953,7 @@
     "Send a message (unencrypted)…": "Отправить сообщение (нешифрованное)…",
     "Replying": "Отвечает",
     "Minimize apps": "Свернуть приложения",
-    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Конфиденциальность важна для нас, поэтому мы не собираем никаких личных или идентифицируемых данных для нашей аналитики.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Конфиденциальность важна для нас, поэтому мы не собираем никаких личных или идентифицирующих данных для нашей аналитики.",
     "Learn more about how we use analytics.": "Подробнее о том, как мы используем аналитику.",
     "The information being sent to us to help make Riot.im better includes:": "Информация, отправляемая нам, чтобы помочь нам сделать Riot.im лучше, включает в себя:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Если на этой странице встречаются сведения личного характера, например имя комнаты, имя пользователя или группы, они удаляются перед отправкой на сервер.",
@@ -1017,7 +1017,7 @@
     "Friday": "Пятница",
     "Update": "Обновить",
     "What's New": "Что изменилось",
-    "Add an email address above to configure email notifications": "Добавьте email-адрес выше для настройки email-уведомлений",
+    "Add an email address above to configure email notifications": "Добавьте email выше для настройки уведомлений",
     "Expand panel": "Развернуть панель",
     "On": "Включить",
     "%(count)s Members|other": "%(count)s членов",
@@ -1073,7 +1073,7 @@
     "Tuesday": "Вторник",
     "Enter keywords separated by a comma:": "Введите ключевые слова, разделенные запятой:",
     "Search…": "Поиск…",
-    "You have successfully set a password and an email address!": "Вы успешно установили пароль и адрес email!",
+    "You have successfully set a password and an email address!": "Вы успешно установили пароль и email!",
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует многие передовые возможности браузера, некоторые из которых недоступны или являются экспериментальным в вашем текущем браузере.",
     "Developer Tools": "Инструменты разработчика",
@@ -1082,7 +1082,7 @@
     "Explore Account Data": "Просмотр данных аккаунта",
     "All messages (noisy)": "Все сообщения (со звуком)",
     "Saturday": "Суббота",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Помните, что вы всегда сможете задать адрес email в настройках пользователя, если передумаете.",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Помните, что вы всегда сможете задать email в настройках пользователя, если передумаете.",
     "Direct Chat": "Прямой чат",
     "The server may be unavailable or overloaded": "Сервер, вероятно, недоступен или перегружен",
     "Reject": "Отклонить",
@@ -1141,7 +1141,7 @@
     "Mentions only": "Только при упоминаниях",
     "Wednesday": "Среда",
     "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы сможете вернуться к своей учетной записи после выхода из системы и войти на других устройствах.",
-    "Enable email notifications": "Включить уведомления по email",
+    "Enable email notifications": "Включить уведомления на email",
     "Event Type": "Тип мероприятия",
     "Download this file": "Скачать файл",
     "Pin Message": "Закрепить сообщение",

From 40e9091724d0cfb41823db2b180f95a41d1bfc54 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 18 May 2018 09:46:58 +0000
Subject: [PATCH 045/702] Translated using Weblate (Hungarian)

Currently translated at 99.7% (1172 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b7d0561c34..c27f76737f 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1177,5 +1177,6 @@
     "At this time it is not possible to reply with an emote.": "Jelenleg nem lehet emodzsival válaszolni.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nem lehet betölteni azt az eseményt amire válaszoltál, mert vagy nem létezik, vagy nincs jogod megnézni.",
     "Collapse Reply Thread": "Beszélgetés szál becsukása",
-    "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése"
+    "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
+    "Send analytics data": "Analitikai adatok küldése"
 }

From 23ea8ca91743241d67ca7257e667597d762f5eee Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 18 May 2018 09:51:16 +0000
Subject: [PATCH 046/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index c27f76737f..096989f514 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1178,5 +1178,8 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nem lehet betölteni azt az eseményt amire válaszoltál, mert vagy nem létezik, vagy nincs jogod megnézni.",
     "Collapse Reply Thread": "Beszélgetés szál becsukása",
     "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
-    "Send analytics data": "Analitikai adatok küldése"
+    "Send analytics data": "Analitikai adatok küldése",
+    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a <PolicyLink>sütikről és titoktartási irányelvekről</PolicyLink> szóló leírást).",
+    "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
+    "Yes please": "Igen, kérlek"
 }

From 6699c4faed2cb5e9bf43afecfac8b34f86b20a52 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 18 May 2018 11:29:30 +0100
Subject: [PATCH 047/702] Spelling/grammar

---
 res/css/views/messages/_MImageBody.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 9667337f5a..5eef236b26 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -29,7 +29,7 @@ limitations under the License.
 
 .mx_MImageBody_thumbnail_container {
     // Prevent the padding-bottom (added inline in MImageBody.js) from
-    // effecting elements below the container.
+    // affecting elements below the container.
     overflow: hidden;
 
     // Make sure the _thumbnail is positioned relative to the _container

From 015093b371074c1318fa140c166585c4c68b6778 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 18 May 2018 11:33:33 +0100
Subject: [PATCH 048/702] Move inline style to stylesheet

---
 res/css/views/messages/_MImageBody.scss     | 10 ++++++++++
 src/components/views/messages/MImageBody.js | 10 ++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 5eef236b26..64821434dd 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -35,3 +35,13 @@ limitations under the License.
     // Make sure the _thumbnail is positioned relative to the _container
     position: relative;
 }
+
+.mx_MImageBody_thumbnail_spinner {
+    display: flex;
+    align-items: center;
+    width: 100%;
+}
+
+.mx_MImageBody_thumbnail_spinner img {
+    margin: auto;
+}
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 656bd02840..d9108a2fe1 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -239,14 +239,8 @@ export default class extends React.Component {
         let img = null;
         // e2e image hasn't been decrypted yet
         if (content.file !== undefined && this.state.decryptedUrl === null) {
-            img = <div className="mx_MImageBody_thumbnail" ref="image" style={{
-                "display": "flex",
-                "alignItems": "center",
-                "width": "100%",
-            }}>
-                <img src="img/spinner.gif" alt={content.body} width="32" height="32" style={{
-                    "margin": "auto",
-                }} />
+            img = <div className="mx_MImageBody_thumbnail mx_MImageBody_thumbnail_spinner" ref="image">
+                <img src="img/spinner.gif" alt={content.body} width="32" height="32" />
             </div>;
         } else if (thumbUrl && !this.state.imgError) {
             // Restrict the width of the thumbnail here, otherwise it will fill the container

From f79a8f5a5342aa7e2a23bb62caaad21d3fb054af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Fri, 18 May 2018 12:37:28 +0000
Subject: [PATCH 049/702] Translated using Weblate (French)

Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 4ff8900965..c9d8fcae69 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1177,5 +1177,9 @@
     "At this time it is not possible to reply with an emote.": "Pour le moment il n'est pas possible de répondre avec un émoji.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossible de charger l'événement auquel il a été répondu, soit il n'existe pas, soit vous n'avez pas l'autorisation de le voir.",
     "Collapse Reply Thread": "Dévoiler le fil de réponse",
-    "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge"
+    "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
+    "Send analytics data": "Envoyer les données analytiques",
+    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
+    "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
+    "Yes please": "Oui, s'il vous plaît"
 }

From b19a9969fe2965e99cfc593eb751fba4d05bd634 Mon Sep 17 00:00:00 2001
From: Klaus Marx <km@slsx.de>
Date: Fri, 18 May 2018 10:27:30 +0000
Subject: [PATCH 050/702] Translated using Weblate (German)

Currently translated at 99.7% (1172 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4464940c69..66dc3a7b81 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1177,5 +1177,6 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Den Browser-Speicher zu löschen kann das Problem lösen, wird dich aber abmelden und verschlüsselte Chats unlesbar machen.",
     "Collapse Reply Thread": "Antwort-Thread zusammenklappen",
     "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.",
-    "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren"
+    "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren",
+    "Send analytics data": "Analysedaten senden"
 }

From bd10768c9e6dc2cf99f020f071cb2d4a66044230 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Fri, 18 May 2018 13:47:07 +0000
Subject: [PATCH 051/702] Translated using Weblate (German)

Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 66dc3a7b81..a8f72e7fa1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -977,7 +977,7 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "Wusstest du: Du kannst Communities nutzen um deine Riot.im-Erfahrung zu filtern!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Um einen Filter zu setzen, siehe einen Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",
     "Clear filter": "Filter zurücksetzen",
-    "Disable Community Filter Panel": "Deaktivere Community-Filter-Panel",
+    "Disable Community Filter Panel": "Deaktiviere Community-Filter-Panel",
     "Your key share request has been sent - please check your other devices for key share requests.": "Deine Schlüssel-Teil-Anfragen wurden gesendet. Bitte prüfe deine anderen Geräte auf die Schlüssel-Teil-Anfragen.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Schlüssel-Anfragen wurden automatisch zu den anderen Geräten gesendet. Wenn du diese Anfragen auf deinen anderen Geräten abgelehnt oder verpasst hast, klicke hier um die Schlüssel für diese Sitzung erneut anzufragen.",
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Wenn deine anderen Geräte keine Schlüssel für diese Nachricht haben, wirst du diese nicht entschlüsseln können.",
@@ -1178,5 +1178,8 @@
     "Collapse Reply Thread": "Antwort-Thread zusammenklappen",
     "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.",
     "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren",
-    "Send analytics data": "Analysedaten senden"
+    "Send analytics data": "Analysedaten senden",
+    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere <PolicyLink>Datenschutzerklärung</PolicyLink>).",
+    "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
+    "Yes please": "Ja, bitte"
 }

From 089ac337f4125c34823709afabd4b9788728e740 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 18 May 2018 15:22:24 +0100
Subject: [PATCH 052/702] remove unused html serializer

---
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 70a9b9bd83..acd7c0fab3 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -145,7 +145,7 @@ export default class MessageComposerInput extends React.Component {
         this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
         this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
         this.md                  = new Md();
-        this.html                = new Html();
+        //this.html              = new Html(); // not used atm
 
         this.suppressAutoComplete = false;
         this.direction = '';

From 167742d9008a7588c1c3bf044563db1fcc8e9816 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 20:28:38 +0100
Subject: [PATCH 053/702] make RTE sending work

---
 res/css/views/rooms/_MessageComposer.scss     |   9 ++
 src/RichText.js                               |   8 -
 .../views/rooms/MessageComposerInput.js       | 137 ++++++++++--------
 3 files changed, 85 insertions(+), 69 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 14f52832f6..72d31cfddd 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -91,6 +91,15 @@ limitations under the License.
     overflow: auto;
 }
 
+// FIXME: rather unpleasant hack to get rid of <p/> margins.
+// really we should be mixing in markdown-body from gfm.css instead
+.mx_MessageComposer_editor > :first-child {
+    margin-top: 0 ! important;
+}
+.mx_MessageComposer_editor > :last-child {
+    margin-bottom: 0 ! important;
+}
+
 @keyframes visualbell
 {
     from { background-color: #faa }
diff --git a/src/RichText.js b/src/RichText.js
index 50ed33d803..e3162a4e2c 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -61,14 +61,6 @@ export function stateToMarkdown(state) {
             ''); // this is *not* a zero width space, trust me :)
 }
 
-export const editorStateToHTML = (editorState: Value) => {
-    return Html.deserialize(editorState);
-}
-
-export function htmlToEditorState(html: string): Value {
-    return Html.serialize(html);
-}
-
 export function unicodeToEmojiUri(str) {
     let replaceWith, unicode, alt;
     if ((!emojione.unicodeAlt) || (emojione.sprites)) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index acd7c0fab3..ae4d5b6264 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -145,7 +145,26 @@ export default class MessageComposerInput extends React.Component {
         this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
         this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
         this.md                  = new Md();
-        //this.html              = new Html(); // not used atm
+        this.html                = new Html({
+            rules: [
+                {
+                    serialize: (obj, children) => {
+                        if (obj.object === 'block' || obj.object === 'inline') {
+                            return this.renderNode({
+                                node: obj,
+                                children: children, 
+                            });
+                        }
+                        else if (obj.object === 'mark') {
+                            return this.renderMark({
+                                mark: obj,
+                                children: children, 
+                            });
+                        }
+                    }
+                }
+            ]
+        });
 
         this.suppressAutoComplete = false;
         this.direction = '';
@@ -397,27 +416,29 @@ export default class MessageComposerInput extends React.Component {
             editorState = EditorState.forceSelection(editorState, currentSelection);
         }
 */
-        const text = editorState.startText.text;
-        const currentStartOffset = editorState.startOffset;
+        if (editorState.startText !== null) {
+            const text = editorState.startText.text;
+            const currentStartOffset = editorState.startOffset;
 
-        // Automatic replacement of plaintext emoji to Unicode emoji
-        if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
-            // The first matched group includes just the matched plaintext emoji
-            const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
-            if (emojiMatch) {
-                // plaintext -> hex unicode
-                const emojiUc = asciiList[emojiMatch[1]];
-                // hex unicode -> shortname -> actual unicode
-                const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
+            // Automatic replacement of plaintext emoji to Unicode emoji
+            if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+                // The first matched group includes just the matched plaintext emoji
+                const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
+                if (emojiMatch) {
+                    // plaintext -> hex unicode
+                    const emojiUc = asciiList[emojiMatch[1]];
+                    // hex unicode -> shortname -> actual unicode
+                    const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
 
-                const range = Range.create({
-                    anchorKey: editorState.selection.startKey,
-                    anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
-                    focusKey: editorState.selection.startKey,
-                    focusOffset: currentStartOffset,
-                });
-                change = change.insertTextAtRange(range, unicodeEmoji);
-                editorState = change.value;
+                    const range = Range.create({
+                        anchorKey: editorState.selection.startKey,
+                        anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
+                        focusKey: editorState.selection.startKey,
+                        focusOffset: currentStartOffset,
+                    });
+                    change = change.insertTextAtRange(range, unicodeEmoji);
+                    editorState = change.value;
+                }
             }
         }
 
@@ -444,13 +465,15 @@ export default class MessageComposerInput extends React.Component {
 
         let editorState = null;
         if (enabled) {
+            // for simplicity when roundtripping, we use slate-md-serializer rather than commonmark
+            editorState = this.md.deserialize(this.plainWithMdPills.serialize(this.state.editorState));
+
+            // the alternative would be something like:
+            //
             // const sourceWithPills = this.plainWithMdPills.serialize(this.state.editorState);
             // const markdown = new Markdown(sourceWithPills);
             // editorState = this.html.deserialize(markdown.toHTML());
 
-            // we don't really want a custom MD parser hanging around, but the
-            // alternative would be:
-            editorState = this.md.deserialize(this.plainWithMdPills.serialize(this.state.editorState));
         } else {
             // let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
             // value = ContentState.createFromText(markdown);
@@ -547,6 +570,8 @@ export default class MessageComposerInput extends React.Component {
 
         let newState: ?Value = null;
 
+        const DEFAULT_NODE = 'paragraph';
+
         // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
         if (this.state.isRichtextEnabled) {
             const type = command;
@@ -725,11 +750,14 @@ export default class MessageComposerInput extends React.Component {
 */
     handleReturn = (ev) => {
         if (ev.shiftKey) {
+            // FIXME: we should insert a <br/> equivalent rather than letting Slate
+            // split the current block, otherwise <p> will be split into two paragraphs
+            // and it'll look like a double line-break.
             return;
         }
 
         if (this.state.editorState.blocks.some(
-            block => block in ['code-block', 'block-quote', 'bulleted-list', 'numbered-list']
+            block => ['code-block', 'block-quote', 'list-item'].includes(block.type)
         )) {
             // allow the user to terminate blocks by hitting return rather than sending a msg
             return;
@@ -788,47 +816,25 @@ export default class MessageComposerInput extends React.Component {
         const mustSendHTML = Boolean(replyingToEv);
 
         if (this.state.isRichtextEnabled) {
-/*
             // We should only send HTML if any block is styled or contains inline style
             let shouldSendHTML = false;
 
             if (mustSendHTML) shouldSendHTML = true;
 
-            const blocks = contentState.getBlocksAsArray();
-            if (blocks.some((block) => block.getType() !== 'unstyled')) {
-                shouldSendHTML = true;
-            } else {
-                const characterLists = blocks.map((block) => block.getCharacterList());
-                // For each block of characters, determine if any inline styles are applied
-                // and if yes, send HTML
-                characterLists.forEach((characters) => {
-                    const numberOfStylesForCharacters = characters.map(
-                        (character) => character.getStyle().toArray().length,
-                    ).toArray();
-                    // If any character has more than 0 inline styles applied, send HTML
-                    if (numberOfStylesForCharacters.some((styles) => styles > 0)) {
-                        shouldSendHTML = true;
-                    }
-                });
-            }
             if (!shouldSendHTML) {
-                const hasLink = blocks.some((block) => {
-                    return block.getCharacterList().filter((c) => {
-                        const entityKey = c.getEntity();
-                        return entityKey && contentState.getEntity(entityKey).getType() === 'LINK';
-                    }).size > 0;
+                shouldSendHTML = !!editorState.document.findDescendant(node => {
+                    // N.B. node.getMarks() might be private?
+                    return ((node.object === 'block' && node.type !== 'line') ||
+                            (node.object === 'inline') ||
+                            (node.object === 'text' && node.getMarks().size > 0));
                 });
-                shouldSendHTML = hasLink;
             }
-*/
+
             contentText = this.plainWithPlainPills.serialize(editorState);
             if (contentText === '') return true;
 
-            let shouldSendHTML = true;
             if (shouldSendHTML) {
-                contentHTML = HtmlUtils.processHtmlForSending(
-                    RichText.editorStateToHTML(editorState),
-                );
+                contentHTML = this.html.serialize(editorState); // HtmlUtils.processHtmlForSending();
             }
         } else {
             const sourceWithPills = this.plainWithMdPills.serialize(editorState);
@@ -1047,7 +1053,7 @@ export default class MessageComposerInput extends React.Component {
             marks: editorState.activeMarks,
             // XXX: shouldn't we return all the types of blocks in the current selection,
             // not just the anchor?
-            blockType: editorState.anchorBlock.type,
+            blockType: editorState.anchorBlock ? editorState.anchorBlock.type : null,
         };
     }
 
@@ -1121,6 +1127,10 @@ export default class MessageComposerInput extends React.Component {
         const { attributes, children, node, isSelected } = props;
 
         switch (node.type) {
+            case 'line':
+                // ideally we'd return { children }<br/>, but as this isn't
+                // a valid react component, we don't have much choice.
+                return <div {...attributes}>{children}</div>;
             case 'paragraph':
                 return <p {...attributes}>{children}</p>;
             case 'block-quote':
@@ -1138,7 +1148,7 @@ export default class MessageComposerInput extends React.Component {
             case 'numbered-list':
                 return <ol {...attributes}>{children}</ol>;
             case 'code-block':
-                return <p {...attributes}><code {...attributes}>{children}</code></p>;
+                return <pre {...attributes}><code {...attributes}>{children}</code></pre>;
             case 'pill': {
                 const { data } = node;
                 const url = data.get('url');
@@ -1187,15 +1197,15 @@ export default class MessageComposerInput extends React.Component {
         const { children, mark, attributes } = props;
         switch (mark.type) {
             case 'bold':
-                return <strong {...{ attributes }}>{children}</strong>;
+                return <strong {...attributes}>{children}</strong>;
             case 'italic':
-                return <em {...{ attributes }}>{children}</em>;
+                return <em {...attributes}>{children}</em>;
             case 'code':
-                return <code {...{ attributes }}>{children}</code>;
+                return <code {...attributes}>{children}</code>;
             case 'underline':
-                return <u {...{ attributes }}>{children}</u>;
+                return <u {...attributes}>{children}</u>;
             case 'strikethrough':
-                return <del {...{ attributes }}>{children}</del>;
+                return <del {...attributes}>{children}</del>;
         }
     };
 
@@ -1219,7 +1229,12 @@ export default class MessageComposerInput extends React.Component {
         // This avoids us having to serialize the whole thing to plaintext and convert
         // selection offsets in & out of the plaintext domain.
 
-        return editorState.document.getDescendant(editorState.selection.anchorKey).text;
+        if (editorState.selection.anchorKey) {
+            return editorState.document.getDescendant(editorState.selection.anchorKey).text;
+        }
+        else {
+            return '';
+        }
     }
 
     getSelectionRange(editorState: Value) {

From a4d9338cf0d63fa6f637a96bbb52694f97bd791a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 20:38:07 +0100
Subject: [PATCH 054/702] let backspace delete list nodes in RTE

---
 .../views/rooms/MessageComposerInput.js       | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index ae4d5b6264..ab104f825a 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -77,6 +77,10 @@ const ENTITY_TYPES = {
     AT_ROOM_PILL: 'ATROOMPILL',
 };
 
+// the Slate node type to default to for unstyled text when in RTE mode.
+// (we use 'line' for oneliners however)
+const DEFAULT_NODE = 'paragraph';
+
 
 function onSendMessageFailed(err, room) {
     // XXX: temporary logging to try to diagnose
@@ -152,13 +156,13 @@ export default class MessageComposerInput extends React.Component {
                         if (obj.object === 'block' || obj.object === 'inline') {
                             return this.renderNode({
                                 node: obj,
-                                children: children, 
+                                children: children,
                             });
                         }
                         else if (obj.object === 'mark') {
                             return this.renderMark({
                                 mark: obj,
-                                children: children, 
+                                children: children,
                             });
                         }
                     }
@@ -548,6 +552,8 @@ export default class MessageComposerInput extends React.Component {
         switch (ev.keyCode) {
             case KeyCode.ENTER:
                 return this.handleReturn(ev);
+            case KeyCode.BACKSPACE:
+                return this.onBackspace(ev);
             case KeyCode.UP:
                 return this.onVerticalArrow(ev, true);
             case KeyCode.DOWN:
@@ -562,6 +568,23 @@ export default class MessageComposerInput extends React.Component {
         }
     };
 
+    onBackspace = (ev: Event): boolean => {
+        if (this.state.isRichtextEnabled) {
+            // let backspace exit lists
+            const isList = this.hasBlock('list-item');
+            if (isList) {
+                const change = this.state.editorState.change();
+                change
+                    .setBlocks(DEFAULT_NODE)
+                    .unwrapBlock('bulleted-list')
+                    .unwrapBlock('numbered-list');
+                this.onChange(change);
+                return true;
+            }
+        }
+        return;
+    };
+
     handleKeyCommand = (command: string): boolean => {
         if (command === 'toggle-mode') {
             this.enableRichtext(!this.state.isRichtextEnabled);
@@ -570,8 +593,6 @@ export default class MessageComposerInput extends React.Component {
 
         let newState: ?Value = null;
 
-        const DEFAULT_NODE = 'paragraph';
-
         // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
         if (this.state.isRichtextEnabled) {
             const type = command;

From 58670cc3e54114c00f5bccf43d21440e5c3ceec8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 21:14:39 +0100
Subject: [PATCH 055/702] exit list more sanely on backspace

---
 src/components/views/rooms/MessageComposerInput.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index ab104f825a..6eadbae5ec 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -572,8 +572,9 @@ export default class MessageComposerInput extends React.Component {
         if (this.state.isRichtextEnabled) {
             // let backspace exit lists
             const isList = this.hasBlock('list-item');
-            if (isList) {
-                const change = this.state.editorState.change();
+            const { editorState } = this.state;
+            if (isList && editorState.anchorOffset == 0) {
+                const change = editorState.change();
                 change
                     .setBlocks(DEFAULT_NODE)
                     .unwrapBlock('bulleted-list')

From d426c3474f2b5703b5c1f69b5ae1313a791c8a6d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 21:36:22 +0100
Subject: [PATCH 056/702] fix strikethough & code, improve shift-return &
 backspace

---
 .../views/rooms/MessageComposerInput.js       | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 6eadbae5ec..d7884e3c83 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -551,9 +551,9 @@ export default class MessageComposerInput extends React.Component {
 
         switch (ev.keyCode) {
             case KeyCode.ENTER:
-                return this.handleReturn(ev);
+                return this.handleReturn(ev, change);
             case KeyCode.BACKSPACE:
-                return this.onBackspace(ev);
+                return this.onBackspace(ev, change);
             case KeyCode.UP:
                 return this.onVerticalArrow(ev, true);
             case KeyCode.DOWN:
@@ -568,19 +568,27 @@ export default class MessageComposerInput extends React.Component {
         }
     };
 
-    onBackspace = (ev: Event): boolean => {
+    onBackspace = (ev: Event, change: Change): Change => {
         if (this.state.isRichtextEnabled) {
             // let backspace exit lists
             const isList = this.hasBlock('list-item');
             const { editorState } = this.state;
+
             if (isList && editorState.anchorOffset == 0) {
-                const change = editorState.change();
                 change
                     .setBlocks(DEFAULT_NODE)
                     .unwrapBlock('bulleted-list')
                     .unwrapBlock('numbered-list');
-                this.onChange(change);
-                return true;
+                return change;
+            }
+            else if (editorState.anchorOffset == 0 &&
+                     (this.hasBlock('block-quote') ||
+                      this.hasBlock('heading-one') ||
+                      this.hasBlock('heading-two') ||
+                      this.hasBlock('heading-three') ||
+                      this.hasBlock('code-block')))
+            {
+                return change.setBlocks(DEFAULT_NODE);
             }
         }
         return;
@@ -770,12 +778,13 @@ export default class MessageComposerInput extends React.Component {
         return true;
     };
 */
-    handleReturn = (ev) => {
+    handleReturn = (ev, change) => {
         if (ev.shiftKey) {
+
             // FIXME: we should insert a <br/> equivalent rather than letting Slate
             // split the current block, otherwise <p> will be split into two paragraphs
             // and it'll look like a double line-break.
-            return;
+            return change.insertText('\n');
         }
 
         if (this.state.editorState.blocks.some(
@@ -1235,11 +1244,11 @@ export default class MessageComposerInput extends React.Component {
         e.preventDefault(); // don't steal focus from the editor!
 
         const command = {
-                code: 'code-block',
+                // code: 'code-block', // let's have the button do inline code for now
                 quote: 'block-quote',
                 bullet: 'bulleted-list',
                 numbullet: 'numbered-list',
-                strike: 'strike-through',
+                strike: 'strikethrough',
             }[name] || name;
         this.handleKeyCommand(command);
     };

From 1536ab433acf2ad5bed2eff14e9e9e8534fc2433 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 22:05:31 +0100
Subject: [PATCH 057/702] make file pasting work again

---
 .../views/rooms/MessageComposerInput.js       | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index d7884e3c83..c783a7dd7f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -20,6 +20,7 @@ import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
 import { Editor } from 'slate-react';
+import { getEventTransfer } from 'slate-react';
 import { Value, Document, Event, Inline, Text, Range, Node } from 'slate';
 
 import Html from 'slate-html-serializer';
@@ -755,6 +756,18 @@ export default class MessageComposerInput extends React.Component {
         }
         return false;
     };
+
+    onPaste = (event: Event, change: Change, editor: Editor): Change => {
+        const transfer = getEventTransfer(event);
+
+        if (transfer.type === "files") {
+            return this.props.onFilesPasted(transfer.files);
+        }
+        if (transfer.type === "html") {
+
+        }
+    };
+
 /*
     onTextPasted = (text: string, html?: string) => {
         const currentSelection = this.state.editorState.getSelection();
@@ -1331,14 +1344,10 @@ export default class MessageComposerInput extends React.Component {
                             value={this.state.editorState}
                             onChange={this.onChange}
                             onKeyDown={this.onKeyDown}
+                            onPaste={this.onPaste}
                             renderNode={this.renderNode}
                             renderMark={this.renderMark}
                             spellCheck={true}
-                            /*
-                            handlePastedText={this.onTextPasted}
-                            handlePastedFiles={this.props.onFilesPasted}
-                            stripPastedStyles={!this.state.isRichtextEnabled}
-                            */
                             />
                 </div>
             </div>

From 1f05aea884de58efda88c9c3327e8a4e4a06d594 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 23:33:07 +0100
Subject: [PATCH 058/702] make HTML pasting work

---
 .../views/rooms/MessageComposerInput.js       | 78 +++++++++++++------
 1 file changed, 53 insertions(+), 25 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c783a7dd7f..6c178ce078 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -82,6 +82,32 @@ const ENTITY_TYPES = {
 // (we use 'line' for oneliners however)
 const DEFAULT_NODE = 'paragraph';
 
+// map HTML elements through to our Slate schema node types
+// used for the HTML deserializer.
+// (We don't use the same names so that they are closer to the MD serializer's schema)
+const BLOCK_TAGS = {
+    p: 'paragraph',
+    blockquote: 'block-quote',
+    ul: 'bulleted-list',
+    h1: 'heading-one',
+    h2: 'heading-two',
+    h3: 'heading-three',
+    li: 'list-item',
+    ol: 'numbered-list',
+    pre: 'code-block',
+};
+
+const MARK_TAGS = {
+    strong: 'bold',
+    b: 'bold', // deprecated
+    em: 'italic',
+    i: 'italic', // deprecated
+    code: 'code',
+    u: 'underline',
+    del: 'strikethrough',
+    strike: 'strikethrough', // deprecated
+    s: 'strikethrough', // deprecated
+};
 
 function onSendMessageFailed(err, room) {
     // XXX: temporary logging to try to diagnose
@@ -153,6 +179,25 @@ export default class MessageComposerInput extends React.Component {
         this.html                = new Html({
             rules: [
                 {
+                    deserialize: (el, next) => {
+                        const tag = el.tagName.toLowerCase();
+                        let type = BLOCK_TAGS[tag];
+                        if (type) {
+                            return {
+                                object: 'block',
+                                type: type,
+                                nodes: next(el.childNodes),
+                            }
+                        }
+                        type = MARK_TAGS[tag];
+                        if (type) {
+                            return {
+                                object: 'mark',
+                                type: type,
+                                nodes: next(el.childNodes),
+                            }
+                        }
+                    },
                     serialize: (obj, children) => {
                         if (obj.object === 'block' || obj.object === 'inline') {
                             return this.renderNode({
@@ -763,34 +808,17 @@ export default class MessageComposerInput extends React.Component {
         if (transfer.type === "files") {
             return this.props.onFilesPasted(transfer.files);
         }
-        if (transfer.type === "html") {
-
+        else if (transfer.type === "html") {
+            const fragment = this.html.deserialize(transfer.html);
+            if (this.state.isRichtextEnabled) {
+                return change.insertFragment(fragment.document);
+            }
+            else {
+                return change.insertText(this.md.serialize(fragment));
+            }
         }
     };
 
-/*
-    onTextPasted = (text: string, html?: string) => {
-        const currentSelection = this.state.editorState.getSelection();
-        const currentContent = this.state.editorState.getCurrentContent();
-
-        let contentState = null;
-        if (html && this.state.isRichtextEnabled) {
-            contentState = Modifier.replaceWithFragment(
-                currentContent,
-                currentSelection,
-                RichText.htmlToContentState(html).getBlockMap(),
-            );
-        } else {
-            contentState = Modifier.replaceText(currentContent, currentSelection, text);
-        }
-
-        let newEditorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
-
-        newEditorState = EditorState.forceSelection(newEditorState, contentState.getSelectionAfter());
-        this.onEditorContentChanged(newEditorState);
-        return true;
-    };
-*/
     handleReturn = (ev, change) => {
         if (ev.shiftKey) {
 

From 572a31334fa87b6c1fc8e1b39962f0a6f823b06e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 23:34:30 +0100
Subject: [PATCH 059/702] add h4, h5 and h6

---
 .../views/rooms/MessageComposerInput.js           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 6c178ce078..30461ca816 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -92,6 +92,9 @@ const BLOCK_TAGS = {
     h1: 'heading-one',
     h2: 'heading-two',
     h3: 'heading-three',
+    h4: 'heading-four,
+    h5: 'heading-five',
+    h6: 'heading-six',
     li: 'list-item',
     ol: 'numbered-list',
     pre: 'code-block',
@@ -632,6 +635,9 @@ export default class MessageComposerInput extends React.Component {
                       this.hasBlock('heading-one') ||
                       this.hasBlock('heading-two') ||
                       this.hasBlock('heading-three') ||
+                      this.hasBlock('heading-four') ||
+                      this.hasBlock('heading-five') ||
+                      this.hasBlock('heading-six') ||
                       this.hasBlock('code-block')))
             {
                 return change.setBlocks(DEFAULT_NODE);
@@ -687,6 +693,9 @@ export default class MessageComposerInput extends React.Component {
                 case 'heading-one':
                 case 'heading-two':
                 case 'heading-three':
+                case 'heading-four':
+                case 'heading-five':
+                case 'heading-six':
                 case 'list-item':
                 case 'code-block': {
                     const isActive = this.hasBlock(type);
@@ -1215,6 +1224,12 @@ export default class MessageComposerInput extends React.Component {
                 return <h2 {...attributes}>{children}</h2>;
             case 'heading-three':
                 return <h3 {...attributes}>{children}</h3>;
+            case 'heading-four':
+                return <h4 {...attributes}>{children}</h4>;
+            case 'heading-five':
+                return <h5 {...attributes}>{children}</h5>;
+            case 'heading-six':
+                return <h6 {...attributes}>{children}</h6>;
             case 'list-item':
                 return <li {...attributes}>{children}</li>;
             case 'numbered-list':

From 65f0b0571902f723fefee82b90a62c47fc73a54c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 23:40:22 +0100
Subject: [PATCH 060/702] fix typo

---
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 30461ca816..a426d69918 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -92,7 +92,7 @@ const BLOCK_TAGS = {
     h1: 'heading-one',
     h2: 'heading-two',
     h3: 'heading-three',
-    h4: 'heading-four,
+    h4: 'heading-four',
     h5: 'heading-five',
     h6: 'heading-six',
     li: 'list-item',

From 117519566e2721fa50e422db26b4baeab603b3bd Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 May 2018 23:40:48 +0100
Subject: [PATCH 061/702] remove HRs from H1/H2s

---
 res/css/views/rooms/_EventTile.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index ce2bf9c8a4..67c8b8b2d8 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -443,6 +443,7 @@ limitations under the License.
 .mx_EventTile_content .markdown-body h2
 {
     font-size: 1.5em;
+    border-bottom: none ! important; // override GFM
 }
 
 .mx_EventTile_content .markdown-body a {

From f2116943c89c3b8ec4b58a270a5b22de7739ff98 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 00:17:11 +0100
Subject: [PATCH 062/702] switch schema to match the MD serializer

---
 .../views/rooms/MessageComposerInput.js       | 80 +++++++++----------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index a426d69918..5126fb2813 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -84,17 +84,17 @@ const DEFAULT_NODE = 'paragraph';
 
 // map HTML elements through to our Slate schema node types
 // used for the HTML deserializer.
-// (We don't use the same names so that they are closer to the MD serializer's schema)
+// (The names here are chosen to match the MD serializer's schema for convenience)
 const BLOCK_TAGS = {
     p: 'paragraph',
     blockquote: 'block-quote',
     ul: 'bulleted-list',
-    h1: 'heading-one',
-    h2: 'heading-two',
-    h3: 'heading-three',
-    h4: 'heading-four',
-    h5: 'heading-five',
-    h6: 'heading-six',
+    h1: 'heading1',
+    h2: 'heading2',
+    h3: 'heading3',
+    h4: 'heading4',
+    h5: 'heading5',
+    h6: 'heading6',
     li: 'list-item',
     ol: 'numbered-list',
     pre: 'code-block',
@@ -106,10 +106,10 @@ const MARK_TAGS = {
     em: 'italic',
     i: 'italic', // deprecated
     code: 'code',
-    u: 'underline',
-    del: 'strikethrough',
-    strike: 'strikethrough', // deprecated
-    s: 'strikethrough', // deprecated
+    u: 'underlined',
+    del: 'deleted',
+    strike: 'deleted', // deprecated
+    s: 'deleted', // deprecated
 };
 
 function onSendMessageFailed(err, room) {
@@ -513,8 +513,8 @@ export default class MessageComposerInput extends React.Component {
     enableRichtext(enabled: boolean) {
         if (enabled === this.state.isRichtextEnabled) return;
 
-        // FIXME: this conversion should be handled in the store, surely
-        // i.e. "convert my current composer value into Rich or MD, as ComposerHistoryManager already does"
+        // FIXME: this duplicates similar conversions which happen in the history & store.
+        // they should be factored out.
 
         let editorState = null;
         if (enabled) {
@@ -540,6 +540,7 @@ export default class MessageComposerInput extends React.Component {
             editorState: this.createEditorState(enabled, editorState),
             isRichtextEnabled: enabled,
         });
+
         SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled);
     };
 
@@ -588,7 +589,7 @@ export default class MessageComposerInput extends React.Component {
                 [KeyCode.KEY_M]: 'toggle-mode',
                 [KeyCode.KEY_B]: 'bold',
                 [KeyCode.KEY_I]: 'italic',
-                [KeyCode.KEY_U]: 'underline',
+                [KeyCode.KEY_U]: 'underlined',
                 [KeyCode.KEY_J]: 'code',
             }[ev.keyCode];
 
@@ -632,12 +633,12 @@ export default class MessageComposerInput extends React.Component {
             }
             else if (editorState.anchorOffset == 0 &&
                      (this.hasBlock('block-quote') ||
-                      this.hasBlock('heading-one') ||
-                      this.hasBlock('heading-two') ||
-                      this.hasBlock('heading-three') ||
-                      this.hasBlock('heading-four') ||
-                      this.hasBlock('heading-five') ||
-                      this.hasBlock('heading-six') ||
+                      this.hasBlock('heading1') ||
+                      this.hasBlock('heading2') ||
+                      this.hasBlock('heading3') ||
+                      this.hasBlock('heading4') ||
+                      this.hasBlock('heading5') ||
+                      this.hasBlock('heading6') ||
                       this.hasBlock('code-block')))
             {
                 return change.setBlocks(DEFAULT_NODE);
@@ -690,12 +691,12 @@ export default class MessageComposerInput extends React.Component {
                 // simple blocks
                 case 'paragraph':
                 case 'block-quote':
-                case 'heading-one':
-                case 'heading-two':
-                case 'heading-three':
-                case 'heading-four':
-                case 'heading-five':
-                case 'heading-six':
+                case 'heading1':
+                case 'heading2':
+                case 'heading3':
+                case 'heading4':
+                case 'heading5':
+                case 'heading6':
                 case 'list-item':
                 case 'code-block': {
                     const isActive = this.hasBlock(type);
@@ -716,8 +717,8 @@ export default class MessageComposerInput extends React.Component {
                 case 'bold':
                 case 'italic':
                 case 'code':
-                case 'underline':
-                case 'strikethrough': {
+                case 'underlined':
+                case 'deleted': {
                     change.toggleMark(type);
                 }
                 break;
@@ -830,10 +831,6 @@ export default class MessageComposerInput extends React.Component {
 
     handleReturn = (ev, change) => {
         if (ev.shiftKey) {
-
-            // FIXME: we should insert a <br/> equivalent rather than letting Slate
-            // split the current block, otherwise <p> will be split into two paragraphs
-            // and it'll look like a double line-break.
             return change.insertText('\n');
         }
 
@@ -1218,17 +1215,17 @@ export default class MessageComposerInput extends React.Component {
                 return <blockquote {...attributes}>{children}</blockquote>;
             case 'bulleted-list':
                 return <ul {...attributes}>{children}</ul>;
-            case 'heading-one':
+            case 'heading1':
                 return <h1 {...attributes}>{children}</h1>;
-            case 'heading-two':
+            case 'heading2':
                 return <h2 {...attributes}>{children}</h2>;
-            case 'heading-three':
+            case 'heading3':
                 return <h3 {...attributes}>{children}</h3>;
-            case 'heading-four':
+            case 'heading4':
                 return <h4 {...attributes}>{children}</h4>;
-            case 'heading-five':
+            case 'heading5':
                 return <h5 {...attributes}>{children}</h5>;
-            case 'heading-six':
+            case 'heading6':
                 return <h6 {...attributes}>{children}</h6>;
             case 'list-item':
                 return <li {...attributes}>{children}</li>;
@@ -1289,9 +1286,9 @@ export default class MessageComposerInput extends React.Component {
                 return <em {...attributes}>{children}</em>;
             case 'code':
                 return <code {...attributes}>{children}</code>;
-            case 'underline':
+            case 'underlined':
                 return <u {...attributes}>{children}</u>;
-            case 'strikethrough':
+            case 'deleted':
                 return <del {...attributes}>{children}</del>;
         }
     };
@@ -1304,7 +1301,8 @@ export default class MessageComposerInput extends React.Component {
                 quote: 'block-quote',
                 bullet: 'bulleted-list',
                 numbullet: 'numbered-list',
-                strike: 'strikethrough',
+                underline: 'underlined',
+                strike: 'deleted',
             }[name] || name;
         this.handleKeyCommand(command);
     };

From c3a6a41e5ded05be0bb370644cbd5e0079a821bf Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 00:49:29 +0100
Subject: [PATCH 063/702] support links in RTE

---
 src/autocomplete/PlainWithPillsSerializer.js  |  2 +-
 .../views/rooms/MessageComposerInput.js       | 31 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
index 0e850f2a33..8fa73be6a3 100644
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -69,7 +69,7 @@ class PlainWithPillsSerializer {
                 case 'plain':
                     return node.data.get('completion');
                 case 'md':
-                    return `[${ node.text }](${ node.data.get('url') })`;
+                    return `[${ node.text }](${ node.data.get('href') })`;
                 case 'id':
                     return node.data.get('completionId') || node.data.get('completion');
             }
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 5126fb2813..5853525832 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -200,6 +200,31 @@ export default class MessageComposerInput extends React.Component {
                                 nodes: next(el.childNodes),
                             }
                         }
+                        // special case links
+                        if (tag === 'a') {
+                            const href = el.getAttribute('href');
+                            let m = href.match(MATRIXTO_URL_PATTERN);
+                            if (m) {
+                                return {
+                                    object: 'inline',
+                                    type: 'pill',
+                                    data: { 
+                                        href,
+                                        completion: el.innerText,
+                                        completionId: m[1],
+                                    },
+                                    isVoid: true,
+                                }
+                            }
+                            else {
+                                return {
+                                    object: 'inline',
+                                    type: 'link',
+                                    data: { href },
+                                    nodes: next(el.childNodes),
+                                }
+                            }
+                        }
                     },
                     serialize: (obj, children) => {
                         if (obj.object === 'block' || obj.object === 'inline') {
@@ -1161,7 +1186,7 @@ export default class MessageComposerInput extends React.Component {
         if (href) {
             inline = Inline.create({
                 type: 'pill',
-                data: { completion, completionId, url: href },
+                data: { completion, completionId, href },
                 // we can't put text in here otherwise the editor tries to select it
                 isVoid: true,
             });
@@ -1233,9 +1258,11 @@ export default class MessageComposerInput extends React.Component {
                 return <ol {...attributes}>{children}</ol>;
             case 'code-block':
                 return <pre {...attributes}><code {...attributes}>{children}</code></pre>;
+            case 'link': 
+                return <a {...attributes} href={ node.data.get('href') }>{children}</a>;
             case 'pill': {
                 const { data } = node;
-                const url = data.get('url');
+                const url = data.get('href');
                 const completion = data.get('completion');
 
                 const shouldShowPillAvatar = !SettingsStore.getValue("Pill.shouldHidePillAvatar");

From d76a2aba9baa055614effe28501ed83800e07804 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 01:07:25 +0100
Subject: [PATCH 064/702] use <p/> as our root node everywhere and fix blank
 roundtrip bug

---
 .../views/rooms/MessageComposerInput.js       | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 5853525832..754f208373 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -78,8 +78,7 @@ const ENTITY_TYPES = {
     AT_ROOM_PILL: 'ATROOMPILL',
 };
 
-// the Slate node type to default to for unstyled text when in RTE mode.
-// (we use 'line' for oneliners however)
+// the Slate node type to default to for unstyled text
 const DEFAULT_NODE = 'paragraph';
 
 // map HTML elements through to our Slate schema node types
@@ -259,7 +258,7 @@ export default class MessageComposerInput extends React.Component {
         }
         else {
             // ...or create a new one.
-            return Plain.deserialize('')
+            return Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
         }
     }
 
@@ -544,7 +543,13 @@ export default class MessageComposerInput extends React.Component {
         let editorState = null;
         if (enabled) {
             // for simplicity when roundtripping, we use slate-md-serializer rather than commonmark
-            editorState = this.md.deserialize(this.plainWithMdPills.serialize(this.state.editorState));
+            const markdown = this.plainWithMdPills.serialize(this.state.editorState);
+            if (markdown !== '') {
+                editorState = this.md.deserialize(markdown);
+            }
+            else {
+                editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
+            }
 
             // the alternative would be something like:
             //
@@ -556,7 +561,10 @@ export default class MessageComposerInput extends React.Component {
             // let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
             // value = ContentState.createFromText(markdown);
 
-            editorState = Plain.deserialize(this.md.serialize(this.state.editorState));
+            editorState = Plain.deserialize(
+                this.md.serialize(this.state.editorState),
+                { defaultBlock: DEFAULT_NODE }
+            );
         }
 
         Analytics.setRichtextMode(enabled);
@@ -937,6 +945,7 @@ export default class MessageComposerInput extends React.Component {
             if (contentText === '') return true;
 
             if (shouldSendHTML) {
+                // FIXME: should we strip out the surrounding <p></p>?
                 contentHTML = this.html.serialize(editorState); // HtmlUtils.processHtmlForSending();
             }
         } else {
@@ -1230,10 +1239,6 @@ export default class MessageComposerInput extends React.Component {
         const { attributes, children, node, isSelected } = props;
 
         switch (node.type) {
-            case 'line':
-                // ideally we'd return { children }<br/>, but as this isn't
-                // a valid react component, we don't have much choice.
-                return <div {...attributes}>{children}</div>;
             case 'paragraph':
                 return <p {...attributes}>{children}</p>;
             case 'block-quote':

From a0d88a829da8ee71b3a7910e1c534f808727f36a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 02:53:32 +0100
Subject: [PATCH 065/702] support sending inlines from the RTE.

includes a horrific hack for sending emoji until
https://github.com/ianstormtaylor/slate/pull/1854 is merged
or otherwise solved
---
 .../views/rooms/MessageComposerInput.js       | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 754f208373..8c5ab2394f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -202,12 +202,15 @@ export default class MessageComposerInput extends React.Component {
                         // special case links
                         if (tag === 'a') {
                             const href = el.getAttribute('href');
-                            let m = href.match(MATRIXTO_URL_PATTERN);
+                            let m;
+                            if (href) {
+                                m = href.match(MATRIXTO_URL_PATTERN);
+                            }
                             if (m) {
                                 return {
                                     object: 'inline',
                                     type: 'pill',
-                                    data: { 
+                                    data: {
                                         href,
                                         completion: el.innerText,
                                         completionId: m[1],
@@ -226,7 +229,7 @@ export default class MessageComposerInput extends React.Component {
                         }
                     },
                     serialize: (obj, children) => {
-                        if (obj.object === 'block' || obj.object === 'inline') {
+                        if (obj.object === 'block') {
                             return this.renderNode({
                                 node: obj,
                                 children: children,
@@ -238,6 +241,26 @@ export default class MessageComposerInput extends React.Component {
                                 children: children,
                             });
                         }
+                        else if (obj.object === 'inline') {
+                            // special case links, pills and emoji otherwise we
+                            // end up with React components getting rendered out(!)
+                            switch (obj.type) {
+                                case 'pill':
+                                    return <a href={ obj.data.get('href') }>{ obj.data.get('completion') }</a>;
+                                case 'link':
+                                    return <a href={ obj.data.get('href') }>{ children }</a>;
+                                case 'emoji':
+                                    // XXX: apparently you can't return plain strings from serializer rules
+                                    // until https://github.com/ianstormtaylor/slate/pull/1854 is merged.
+                                    // So instead we temporarily wrap emoji from RTE in an arbitrary tag
+                                    // (<b/>).  <span/> would be nicer, but in practice it causes CSS issues.
+                                    return <b>{ obj.data.get('emojiUnicode') }</b>;
+                            }
+                            return this.renderNode({
+                                node: obj,
+                                children: children,
+                            });
+                        }
                     }
                 }
             ]
@@ -545,6 +568,7 @@ export default class MessageComposerInput extends React.Component {
             // for simplicity when roundtripping, we use slate-md-serializer rather than commonmark
             const markdown = this.plainWithMdPills.serialize(this.state.editorState);
             if (markdown !== '') {
+                // weirdly, the Md serializer can't deserialize '' to a valid Value...
                 editorState = this.md.deserialize(markdown);
             }
             else {
@@ -572,6 +596,8 @@ export default class MessageComposerInput extends React.Component {
         this.setState({
             editorState: this.createEditorState(enabled, editorState),
             isRichtextEnabled: enabled,
+        }, ()=>{
+            this.refs.editor.focus();
         });
 
         SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled);
@@ -852,6 +878,8 @@ export default class MessageComposerInput extends React.Component {
             return this.props.onFilesPasted(transfer.files);
         }
         else if (transfer.type === "html") {
+            // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
+            // that we will silently discard nested blocks (e.g. nested lists) :(
             const fragment = this.html.deserialize(transfer.html);
             if (this.state.isRichtextEnabled) {
                 return change.insertFragment(fragment.document);
@@ -1263,7 +1291,7 @@ export default class MessageComposerInput extends React.Component {
                 return <ol {...attributes}>{children}</ol>;
             case 'code-block':
                 return <pre {...attributes}><code {...attributes}>{children}</code></pre>;
-            case 'link': 
+            case 'link':
                 return <a {...attributes} href={ node.data.get('href') }>{children}</a>;
             case 'pill': {
                 const { data } = node;

From e9cabf0e8564a30f7e0432fac063144e4a28a8be Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 03:17:51 +0100
Subject: [PATCH 066/702] add pill and emoji serialisation to Md

---
 .../views/rooms/MessageComposerInput.js       | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 8c5ab2394f..d1bf4e4544 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -177,8 +177,23 @@ export default class MessageComposerInput extends React.Component {
         this.plainWithMdPills    = new PlainWithPillsSerializer({ pillFormat: 'md' });
         this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
         this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
-        this.md                  = new Md();
-        this.html                = new Html({
+
+        this.md = new Md({
+            rules: [
+                {
+                    serialize: (obj, children) => {
+                        switch (obj.type) {
+                            case 'pill':
+                                return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
+                            case 'emoji':
+                                return obj.data.get('emojiUnicode');
+                        }
+                    }
+                }
+            ]
+        });
+
+        this.html = new Html({
             rules: [
                 {
                     deserialize: (el, next) => {
@@ -567,8 +582,13 @@ export default class MessageComposerInput extends React.Component {
         if (enabled) {
             // for simplicity when roundtripping, we use slate-md-serializer rather than commonmark
             const markdown = this.plainWithMdPills.serialize(this.state.editorState);
+
+            // weirdly, the Md serializer can't deserialize '' to a valid Value...
             if (markdown !== '') {
-                // weirdly, the Md serializer can't deserialize '' to a valid Value...
+                // FIXME: the MD deserializer doesn't know how to deserialize pills
+                // and gives no hooks for doing so, so we should manually fix up
+                // the editorState first in order to preserve them.
+
                 editorState = this.md.deserialize(markdown);
             }
             else {

From ad7782bc22628f633f147f3df3066a0d106269a0 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 14:07:33 +0100
Subject: [PATCH 067/702] remove the remaining Draft specific stuff from
 RichText

---
 src/RichText.js | 150 ------------------------------------------------
 1 file changed, 150 deletions(-)

diff --git a/src/RichText.js b/src/RichText.js
index e3162a4e2c..65b5dad107 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -18,48 +18,11 @@ limitations under the License.
 
 import React from 'react';
 
-/*
-import {
-    Editor,
-    EditorState,
-    Modifier,
-    ContentState,
-    ContentBlock,
-    convertFromHTML,
-    DefaultDraftBlockRenderMap,
-    DefaultDraftInlineStyle,
-    CompositeDecorator,
-    SelectionState,
-    Entity,
-} from 'draft-js';
-import { stateToMarkdown as __stateToMarkdown } from 'draft-js-export-markdown';
-*/
-
-import Html from 'slate-html-serializer';
-
 import * as sdk from './index';
 import * as emojione from 'emojione';
 
 import { SelectionRange } from "./autocomplete/Autocompleter";
 
-const MARKDOWN_REGEX = {
-    LINK: /(?:\[([^\]]+)\]\(([^\)]+)\))|\<(\w+:\/\/[^\>]+)\>/g,
-    ITALIC: /([\*_])([\w\s]+?)\1/g,
-    BOLD: /([\*_])\1([\w\s]+?)\1\1/g,
-    HR: /(\n|^)((-|\*|_) *){3,}(\n|$)/g,
-    CODE: /`[^`]*`/g,
-    STRIKETHROUGH: /~{2}[^~]*~{2}/g,
-};
-
-const ZWS_CODE = 8203;
-const ZWS = String.fromCharCode(ZWS_CODE); // zero width space
-
-export function stateToMarkdown(state) {
-    return __stateToMarkdown(state)
-        .replace(
-            ZWS, // draft-js-export-markdown adds these
-            ''); // this is *not* a zero width space, trust me :)
-}
 
 export function unicodeToEmojiUri(str) {
     let replaceWith, unicode, alt;
@@ -87,116 +50,3 @@ export function unicodeToEmojiUri(str) {
 
     return str;
 }
-
-/**
- * Utility function that looks for regex matches within a ContentBlock and invokes {callback} with (start, end)
- * From https://facebook.github.io/draft-js/docs/advanced-topics-decorators.html
- */
-function findWithRegex(regex, contentBlock: ContentBlock, callback: (start: number, end: number) => any) {
-    const text = contentBlock.getText();
-    let matchArr, start;
-    while ((matchArr = regex.exec(text)) !== null) {
-        start = matchArr.index;
-        callback(start, start + matchArr[0].length);
-    }
-}
-
-/**
- * Returns a composite decorator which has access to provided scope.
- */
-export function getScopedRTDecorators(scope: any): CompositeDecorator {
-    return [emojiDecorator];
-}
-
-export function getScopedMDDecorators(scope: any): CompositeDecorator {
-    const markdownDecorators = ['HR', 'BOLD', 'ITALIC', 'CODE', 'STRIKETHROUGH'].map(
-        (style) => ({
-            strategy: (contentState, contentBlock, callback) => {
-                return findWithRegex(MARKDOWN_REGEX[style], contentBlock, callback);
-            },
-            component: (props) => (
-                <span className={"mx_MarkdownElement mx_Markdown_" + style}>
-                    { props.children }
-                </span>
-            ),
-        }));
-
-    markdownDecorators.push({
-        strategy: (contentState, contentBlock, callback) => {
-            return findWithRegex(MARKDOWN_REGEX.LINK, contentBlock, callback);
-        },
-        component: (props) => (
-            <a href="#" className="mx_MarkdownElement mx_Markdown_LINK">
-                { props.children }
-            </a>
-        ),
-    });
-    // markdownDecorators.push(emojiDecorator);
-    // TODO Consider renabling "syntax highlighting" when we can do it properly
-    return [emojiDecorator];
-}
-
-/**
- * Passes rangeToReplace to modifyFn and replaces it in contentState with the result.
- */
-export function modifyText(contentState: ContentState, rangeToReplace: SelectionState,
-                           modifyFn: (text: string) => string, inlineStyle, entityKey): ContentState {
-    let getText = (key) => contentState.getBlockForKey(key).getText(),
-        startKey = rangeToReplace.getStartKey(),
-        startOffset = rangeToReplace.getStartOffset(),
-        endKey = rangeToReplace.getEndKey(),
-        endOffset = rangeToReplace.getEndOffset(),
-        text = "";
-
-
-    for (let currentKey = startKey;
-            currentKey && currentKey !== endKey;
-            currentKey = contentState.getKeyAfter(currentKey)) {
-        const blockText = getText(currentKey);
-        text += blockText.substring(startOffset, blockText.length);
-
-        // from now on, we'll take whole blocks
-        startOffset = 0;
-    }
-
-    // add remaining part of last block
-    text += getText(endKey).substring(startOffset, endOffset);
-
-    return Modifier.replaceText(contentState, rangeToReplace, modifyFn(text), inlineStyle, entityKey);
-}
-
-/**
- * Computes the plaintext offsets of the given SelectionState.
- * Note that this inherently means we make assumptions about what that means (no separator between ContentBlocks, etc)
- * Used by autocomplete to show completions when the current selection lies within, or at the edges of a command.
- */
-export function selectionStateToTextOffsets(selectionState: SelectionState,
-                                            contentBlocks: Array<ContentBlock>): {start: number, end: number} {
-    let offset = 0, start = 0, end = 0;
-    for (const block of contentBlocks) {
-        if (selectionState.getStartKey() === block.getKey()) {
-            start = offset + selectionState.getStartOffset();
-        }
-        if (selectionState.getEndKey() === block.getKey()) {
-            end = offset + selectionState.getEndOffset();
-            break;
-        }
-        offset += block.getLength();
-    }
-
-    return {
-        start,
-        end,
-    };
-}
-
-export function hasMultiLineSelection(editorState: EditorState): boolean {
-    const selectionState = editorState.getSelection();
-    const anchorKey = selectionState.getAnchorKey();
-    const currentContent = editorState.getCurrentContent();
-    const currentContentBlock = currentContent.getBlockForKey(anchorKey);
-    const start = selectionState.getStartOffset();
-    const end = selectionState.getEndOffset();
-    const selectedText = currentContentBlock.getText().slice(start, end);
-    return selectedText.includes('\n');
-}

From c5676eef89aa9784a78040ddd6ed16e117aa7d80 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 14:32:06 +0100
Subject: [PATCH 068/702] comment out more old draft stuff

---
 src/HtmlUtils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 7ca404be31..4c1564297d 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -112,7 +112,7 @@ export function charactersToImageNode(alt, useSvg, ...unicode) {
     />;
 }
 
-
+/*
 export function processHtmlForSending(html: string): string {
     const contentDiv = document.createElement('div');
     contentDiv.innerHTML = html;
@@ -146,6 +146,7 @@ export function processHtmlForSending(html: string): string {
 
     return contentHTML;
 }
+*/
 
 /*
  * Given an untrusted HTML string, return a React node with an sanitized version

From 9aba046f21d67b19b5e3b5c4a13814e919f56446 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 14:32:20 +0100
Subject: [PATCH 069/702] fix MD pill serialization

---
 src/autocomplete/PlainWithPillsSerializer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
index 8fa73be6a3..7428241b05 100644
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -69,7 +69,7 @@ class PlainWithPillsSerializer {
                 case 'plain':
                     return node.data.get('completion');
                 case 'md':
-                    return `[${ node.text }](${ node.data.get('href') })`;
+                    return `[${ node.data.get('completion') }](${ node.data.get('href') })`;
                 case 'id':
                     return node.data.get('completionId') || node.data.get('completion');
             }

From aac6866779f935a23e876a0ffc5efc5e881c7168 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 14:33:14 +0100
Subject: [PATCH 070/702] switch back to using commonmark for serialising MD
 when roundtripping

and escape MD correctly when serialising via slate-md-serializer
---
 .../views/rooms/MessageComposerInput.js       | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index d1bf4e4544..0d603d3135 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -182,11 +182,21 @@ export default class MessageComposerInput extends React.Component {
             rules: [
                 {
                     serialize: (obj, children) => {
-                        switch (obj.type) {
-                            case 'pill':
-                                return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
-                            case 'emoji':
-                                return obj.data.get('emojiUnicode');
+                        if (obj.object === 'string') {
+                            // escape any MD in it. i have no idea why the serializer doesn't
+                            // do this already.
+                            // TODO: this can probably be more robust - it doesn't consider
+                            // indenting or lists for instance.
+                            return children.replace(/([*_~`+])/g, '\\$1')
+                                           .replace(/^([>#\|])/g, '\\$1');
+                        }
+                        else if (obj.object === 'inline') {
+                            switch (obj.type) {
+                                case 'pill':
+                                    return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
+                                case 'emoji':
+                                    return obj.data.get('emojiUnicode');
+                            }
                         }
                     }
                 }
@@ -580,27 +590,29 @@ export default class MessageComposerInput extends React.Component {
 
         let editorState = null;
         if (enabled) {
-            // for simplicity when roundtripping, we use slate-md-serializer rather than commonmark
-            const markdown = this.plainWithMdPills.serialize(this.state.editorState);
-
-            // weirdly, the Md serializer can't deserialize '' to a valid Value...
-            if (markdown !== '') {
-                // FIXME: the MD deserializer doesn't know how to deserialize pills
-                // and gives no hooks for doing so, so we should manually fix up
-                // the editorState first in order to preserve them.
-
-                editorState = this.md.deserialize(markdown);
-            }
-            else {
-                editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
-            }
-
-            // the alternative would be something like:
+            // for consistency when roundtripping, we could use slate-md-serializer rather than
+            // commonmark, but then we would lose pills as the MD deserialiser doesn't know about
+            // them and doesn't have any extensibility hooks.
             //
-            // const sourceWithPills = this.plainWithMdPills.serialize(this.state.editorState);
-            // const markdown = new Markdown(sourceWithPills);
-            // editorState = this.html.deserialize(markdown.toHTML());
+            // The code looks like this:
+            //
+            // const markdown = this.plainWithMdPills.serialize(this.state.editorState);
+            //
+            // // weirdly, the Md serializer can't deserialize '' to a valid Value...
+            // if (markdown !== '') {
+            //     editorState = this.md.deserialize(markdown);
+            // }
+            // else {
+            //     editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
+            // }
 
+            // so, instead, we use commonmark proper (which is arguably more logical to the user
+            // anyway, as they'll expect the RTE view to match what they'll see in the timeline,
+            // but the HTML->MD conversion is anyone's guess).
+
+            const sourceWithPills = this.plainWithMdPills.serialize(this.state.editorState);
+            const markdown = new Markdown(sourceWithPills);
+            editorState = this.html.deserialize(markdown.toHTML());
         } else {
             // let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
             // value = ContentState.createFromText(markdown);

From d799b7e424d54a52bc91d83ab17e06dead767964 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 16:30:39 +0100
Subject: [PATCH 071/702] refactor roundtripping into a single place

and fix isRichTextEnabled to be correctly camelCased everywhere...
---
 src/ComposerHistoryManager.js                 |  34 +----
 src/components/views/rooms/MessageComposer.js |   8 +-
 .../views/rooms/MessageComposerInput.js       | 129 ++++++++++--------
 .../views/rooms/MessageComposerInput-test.js  |   2 +-
 4 files changed, 84 insertions(+), 89 deletions(-)

diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 28749ace15..f997e1d1cd 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -28,8 +28,8 @@ type MessageFormat = 'rich' | 'markdown';
 
 class HistoryItem {
 
-    // Keeping message for backwards-compatibility
-    message: string;
+    // We store history items in their native format to ensure history is accurate
+    // and then convert them if our RTE has subsequently changed format.
     value: Value;
     format: MessageFormat = 'rich';
 
@@ -51,32 +51,6 @@ class HistoryItem {
             format: this.format
         };
     }
-
-    // FIXME: rather than supporting storing history in either format, why don't we pick
-    // one canonical form?
-    toValue(outputFormat: MessageFormat): Value {
-        if (outputFormat === 'markdown') {
-            if (this.format === 'rich') {
-                // convert a rich formatted history entry to its MD equivalent
-                return Plain.deserialize(Md.serialize(this.value));
-                // return ContentState.createFromText(RichText.stateToMarkdown(contentState));
-            }
-            else if (this.format === 'markdown') {
-                return this.value;
-            }
-        } else if (outputFormat === 'rich') {
-            if (this.format === 'markdown') {
-                // convert MD formatted string to its rich equivalent.
-                return Md.deserialize(Plain.serialize(this.value));
-                // return RichText.htmlToContentState(new Markdown(contentState.getPlainText()).toHTML());
-            }
-            else if (this.format === 'rich') {
-                return this.value;
-            }
-        }
-        console.error("unknown format -> outputFormat conversion");
-        return this.value;
-    }
 }
 
 export default class ComposerHistoryManager {
@@ -110,9 +84,9 @@ export default class ComposerHistoryManager {
         sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item.toJSON()));
     }
 
-    getItem(offset: number, format: MessageFormat): ?Value {
+    getItem(offset: number): ?HistoryItem {
         this.currentIndex = _clamp(this.currentIndex + offset, 0, this.lastIndex - 1);
         const item = this.history[this.currentIndex];
-        return item ? item.toValue(format) : null;
+        return item;
     }
 }
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 9aaa33f0fa..157dc9e704 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -46,7 +46,7 @@ export default class MessageComposer extends React.Component {
             inputState: {
                 marks: [],
                 blockType: null,
-                isRichtextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
+                isRichTextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
             },
             showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
             isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
@@ -227,7 +227,7 @@ export default class MessageComposer extends React.Component {
 
     onToggleMarkdownClicked(e) {
         e.preventDefault(); // don't steal focus from the editor!
-        this.messageComposerInput.enableRichtext(!this.state.inputState.isRichtextEnabled);
+        this.messageComposerInput.enableRichtext(!this.state.inputState.isRichTextEnabled);
     }
 
     render() {
@@ -380,10 +380,10 @@ export default class MessageComposer extends React.Component {
                     <div className="mx_MessageComposer_formatbar" style={this.state.showFormatting ? {} : {display: 'none'}}>
                         { formatButtons }
                         <div style={{flex: 1}}></div>
-                        <img title={this.state.inputState.isRichtextEnabled ? _t("Turn Markdown on") : _t("Turn Markdown off")}
+                        <img title={this.state.inputState.isRichTextEnabled ? _t("Turn Markdown on") : _t("Turn Markdown off")}
                              onMouseDown={this.onToggleMarkdownClicked}
                             className="mx_MessageComposer_formatbar_markdown mx_filterFlipColor"
-                            src={`img/button-md-${!this.state.inputState.isRichtextEnabled}.png`} />
+                            src={`img/button-md-${!this.state.inputState.isRichTextEnabled}.png`} />
                         <img title={_t("Hide Text Formatting Toolbar")}
                              onClick={this.onToggleFormattingClicked}
                              className="mx_MessageComposer_formatbar_cancel mx_filterFlipColor"
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 0d603d3135..aac7c7ddbb 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -147,17 +147,17 @@ export default class MessageComposerInput extends React.Component {
     constructor(props, context) {
         super(props, context);
 
-        const isRichtextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
+        const isRichTextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
 
-        Analytics.setRichtextMode(isRichtextEnabled);
+        Analytics.setRichtextMode(isRichTextEnabled);
 
         this.state = {
             // whether we're in rich text or markdown mode
-            isRichtextEnabled,
+            isRichTextEnabled,
 
             // the currently displayed editor state (note: this is always what is modified on input)
             editorState: this.createEditorState(
-                isRichtextEnabled,
+                isRichTextEnabled,
                 MessageComposerStore.getEditorState(this.props.room.roomId),
             ),
 
@@ -323,7 +323,7 @@ export default class MessageComposerInput extends React.Component {
         // this is dirty, but moving all this state to MessageComposer is dirtier
         if (this.props.onInputStateChanged && nextState !== this.state) {
             const state = this.getSelectionInfo(nextState.editorState);
-            state.isRichtextEnabled = nextState.isRichtextEnabled;
+            state.isRichTextEnabled = nextState.isRichTextEnabled;
             this.props.onInputStateChanged(state);
         }
     }
@@ -362,7 +362,7 @@ export default class MessageComposerInput extends React.Component {
                 const body = escape(payload.text);
                 if (body) {
                     let content = RichText.htmlToContentState(`<blockquote>${body}</blockquote>`);
-                    if (!this.state.isRichtextEnabled) {
+                    if (!this.state.isRichTextEnabled) {
                         content = ContentState.createFromText(RichText.stateToMarkdown(content));
                     }
 
@@ -374,7 +374,7 @@ export default class MessageComposerInput extends React.Component {
                         startSelection,
                         blockMap);
                     startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    if (this.state.isRichtextEnabled) {
+                    if (this.state.isRichTextEnabled) {
                         contentState = Modifier.setBlockType(contentState, startSelection, 'blockquote');
                     }
                     let editorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
@@ -582,52 +582,61 @@ export default class MessageComposerInput extends React.Component {
         });
     };
 
-    enableRichtext(enabled: boolean) {
-        if (enabled === this.state.isRichtextEnabled) return;
+    mdToRichEditorState(editorState: Value): Value {
+        // for consistency when roundtripping, we could use slate-md-serializer rather than
+        // commonmark, but then we would lose pills as the MD deserialiser doesn't know about
+        // them and doesn't have any extensibility hooks.
+        //
+        // The code looks like this:
+        //
+        // const markdown = this.plainWithMdPills.serialize(editorState);
+        //
+        // // weirdly, the Md serializer can't deserialize '' to a valid Value...
+        // if (markdown !== '') {
+        //     editorState = this.md.deserialize(markdown);
+        // }
+        // else {
+        //     editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
+        // }
 
-        // FIXME: this duplicates similar conversions which happen in the history & store.
-        // they should be factored out.
+        // so, instead, we use commonmark proper (which is arguably more logical to the user
+        // anyway, as they'll expect the RTE view to match what they'll see in the timeline,
+        // but the HTML->MD conversion is anyone's guess).
+
+        const textWithMdPills = this.plainWithMdPills.serialize(editorState);
+        const markdown = new Markdown(textWithMdPills);
+        // HTML deserialize has custom rules to turn matrix.to links into pill objects.
+        return this.html.deserialize(markdown.toHTML());
+    }
+
+    richToMdEditorState(editorState: Value): Value {
+        // FIXME: this conversion loses pills (turning them into pure MD links).
+        // We need to add a pill-aware deserialize method
+        // to PlainWithPillsSerializer which recognises pills in raw MD and turns them into pills.
+        return Plain.deserialize(
+            // FIXME: we compile the MD out of the RTE state using slate-md-serializer
+            // which doesn't roundtrip symmetrically with commonmark, which we use for
+            // compiling MD out of the MD editor state above.
+            this.md.serialize(editorState),
+            { defaultBlock: DEFAULT_NODE }
+        );
+    }
+
+    enableRichtext(enabled: boolean) {
+        if (enabled === this.state.isRichTextEnabled) return;
 
         let editorState = null;
         if (enabled) {
-            // for consistency when roundtripping, we could use slate-md-serializer rather than
-            // commonmark, but then we would lose pills as the MD deserialiser doesn't know about
-            // them and doesn't have any extensibility hooks.
-            //
-            // The code looks like this:
-            //
-            // const markdown = this.plainWithMdPills.serialize(this.state.editorState);
-            //
-            // // weirdly, the Md serializer can't deserialize '' to a valid Value...
-            // if (markdown !== '') {
-            //     editorState = this.md.deserialize(markdown);
-            // }
-            // else {
-            //     editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
-            // }
-
-            // so, instead, we use commonmark proper (which is arguably more logical to the user
-            // anyway, as they'll expect the RTE view to match what they'll see in the timeline,
-            // but the HTML->MD conversion is anyone's guess).
-
-            const sourceWithPills = this.plainWithMdPills.serialize(this.state.editorState);
-            const markdown = new Markdown(sourceWithPills);
-            editorState = this.html.deserialize(markdown.toHTML());
+            editorState = this.mdToRichEditorState(this.state.editorState);
         } else {
-            // let markdown = RichText.stateToMarkdown(this.state.editorState.getCurrentContent());
-            // value = ContentState.createFromText(markdown);
-
-            editorState = Plain.deserialize(
-                this.md.serialize(this.state.editorState),
-                { defaultBlock: DEFAULT_NODE }
-            );
+            editorState = this.richToMdEditorState(this.state.editorState);
         }
 
         Analytics.setRichtextMode(enabled);
 
         this.setState({
             editorState: this.createEditorState(enabled, editorState),
-            isRichtextEnabled: enabled,
+            isRichTextEnabled: enabled,
         }, ()=>{
             this.refs.editor.focus();
         });
@@ -710,7 +719,7 @@ export default class MessageComposerInput extends React.Component {
     };
 
     onBackspace = (ev: Event, change: Change): Change => {
-        if (this.state.isRichtextEnabled) {
+        if (this.state.isRichTextEnabled) {
             // let backspace exit lists
             const isList = this.hasBlock('list-item');
             const { editorState } = this.state;
@@ -740,14 +749,14 @@ export default class MessageComposerInput extends React.Component {
 
     handleKeyCommand = (command: string): boolean => {
         if (command === 'toggle-mode') {
-            this.enableRichtext(!this.state.isRichtextEnabled);
+            this.enableRichtext(!this.state.isRichTextEnabled);
             return true;
         }
 
         let newState: ?Value = null;
 
         // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
-        if (this.state.isRichtextEnabled) {
+        if (this.state.isRichTextEnabled) {
             const type = command;
             const { editorState } = this.state;
             const change = editorState.change();
@@ -913,7 +922,7 @@ export default class MessageComposerInput extends React.Component {
             // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
             // that we will silently discard nested blocks (e.g. nested lists) :(
             const fragment = this.html.deserialize(transfer.html);
-            if (this.state.isRichtextEnabled) {
+            if (this.state.isRichTextEnabled) {
                 return change.insertFragment(fragment.document);
             }
             else {
@@ -954,7 +963,7 @@ export default class MessageComposerInput extends React.Component {
 
         if (cmd) {
             if (!cmd.error) {
-                this.historyManager.save(editorState, this.state.isRichtextEnabled ? 'rich' : 'markdown');
+                this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
                 this.setState({
                     editorState: this.createEditorState(),
                 });
@@ -986,7 +995,7 @@ export default class MessageComposerInput extends React.Component {
         const replyingToEv = RoomViewStore.getQuotingEvent();
         const mustSendHTML = Boolean(replyingToEv);
 
-        if (this.state.isRichtextEnabled) {
+        if (this.state.isRichTextEnabled) {
             // We should only send HTML if any block is styled or contains inline style
             let shouldSendHTML = false;
 
@@ -1032,7 +1041,7 @@ export default class MessageComposerInput extends React.Component {
 
         this.historyManager.save(
             editorState,
-            this.state.isRichtextEnabled ? 'rich' : 'markdown',
+            this.state.isRichTextEnabled ? 'rich' : 'markdown',
         );
 
         if (commandText && commandText.startsWith('/me')) {
@@ -1119,7 +1128,7 @@ export default class MessageComposerInput extends React.Component {
             if (up) {
                 const scrollCorrection = editorNode.scrollTop;
                 const distanceFromTop = cursorRect.top - editorRect.top + scrollCorrection;
-                console.log(`Cursor distance from editor top is ${distanceFromTop}`);
+                //console.log(`Cursor distance from editor top is ${distanceFromTop}`);
                 if (distanceFromTop < EDGE_THRESHOLD) {
                     navigateHistory = true;
                 }
@@ -1128,7 +1137,7 @@ export default class MessageComposerInput extends React.Component {
                 const scrollCorrection =
                     editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop;
                 const distanceFromBottom = editorRect.bottom - cursorRect.bottom + scrollCorrection;
-                console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
+                //console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
                 if (distanceFromBottom < EDGE_THRESHOLD) {
                     navigateHistory = true;
                 }
@@ -1168,7 +1177,19 @@ export default class MessageComposerInput extends React.Component {
             return;
         }
 
-        let editorState = this.historyManager.getItem(delta, this.state.isRichtextEnabled ? 'rich' : 'markdown');
+        let editorState;
+        const historyItem = this.historyManager.getItem(delta);
+        if (historyItem) {
+            if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
+                editorState = this.richToMdEditorState(historyItem.value);
+            }
+            else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
+                editorState = this.mdToRichEditorState(historyItem.value);
+            }
+            else {
+                editorState = historyItem.value;
+            }
+        }
 
         // Move selection to the end of the selected history
         const change = editorState.change().collapseToEndOf(editorState.document);
@@ -1468,8 +1489,8 @@ export default class MessageComposerInput extends React.Component {
                 <div className={className}>
                     <img className="mx_MessageComposer_input_markdownIndicator mx_filterFlipColor"
                          onMouseDown={this.onMarkdownToggleClicked}
-                         title={this.state.isRichtextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
-                         src={`img/button-md-${!this.state.isRichtextEnabled}.png`} />
+                         title={this.state.isRichTextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
+                         src={`img/button-md-${!this.state.isRichTextEnabled}.png`} />
                     <Editor ref="editor"
                             dir="auto"
                             className="mx_MessageComposer_editor"
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index eadd923726..42921db975 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -69,7 +69,7 @@ describe('MessageComposerInput', () => {
                 'mx_MessageComposer_input_markdownIndicator');
             ReactTestUtils.Simulate.click(indicator);
 
-            expect(mci.state.isRichtextEnabled).toEqual(false, 'should have changed mode');
+            expect(mci.state.isRichTextEnabled).toEqual(false, 'should have changed mode');
             done();
         });
     });

From f981d7b7293c0eb2ad869091cabbb836b0c86a23 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 22:39:40 +0100
Subject: [PATCH 072/702] unify buttons on the node type names, and make them
 work

---
 ...o-n.svg => button-text-block-quote-on.svg} |  0
 ...-quote.svg => button-text-block-quote.svg} |  0
 ...t-bold-o-n.svg => button-text-bold-on.svg} |  0
 ...n.svg => button-text-bulleted-list-on.svg} |  0
 ...llet.svg => button-text-bulleted-list.svg} |  0
 ...t-code-o-n.svg => button-text-code-on.svg} |  0
 ...ike-o-n.svg => button-text-deleted-on.svg} |  0
 ...ext-strike.svg => button-text-deleted.svg} |  0
 ...alic-o-n.svg => button-text-italic-on.svg} |  0
 ...n.svg => button-text-numbered-list-on.svg} |  0
 ...llet.svg => button-text-numbered-list.svg} |  0
 ...-o-n.svg => button-text-underlined-on.svg} |  0
 ...derline.svg => button-text-underlined.svg} |  0
 src/components/views/rooms/MessageComposer.js | 58 ++++++++-------
 .../views/rooms/MessageComposerInput.js       | 70 ++++++++++---------
 15 files changed, 68 insertions(+), 60 deletions(-)
 rename res/img/{button-text-quote-o-n.svg => button-text-block-quote-on.svg} (100%)
 rename res/img/{button-text-quote.svg => button-text-block-quote.svg} (100%)
 rename res/img/{button-text-bold-o-n.svg => button-text-bold-on.svg} (100%)
 rename res/img/{button-text-bullet-o-n.svg => button-text-bulleted-list-on.svg} (100%)
 rename res/img/{button-text-bullet.svg => button-text-bulleted-list.svg} (100%)
 rename res/img/{button-text-code-o-n.svg => button-text-code-on.svg} (100%)
 rename res/img/{button-text-strike-o-n.svg => button-text-deleted-on.svg} (100%)
 rename res/img/{button-text-strike.svg => button-text-deleted.svg} (100%)
 rename res/img/{button-text-italic-o-n.svg => button-text-italic-on.svg} (100%)
 rename res/img/{button-text-numbullet-o-n.svg => button-text-numbered-list-on.svg} (100%)
 rename res/img/{button-text-numbullet.svg => button-text-numbered-list.svg} (100%)
 rename res/img/{button-text-underline-o-n.svg => button-text-underlined-on.svg} (100%)
 rename res/img/{button-text-underline.svg => button-text-underlined.svg} (100%)

diff --git a/res/img/button-text-quote-o-n.svg b/res/img/button-text-block-quote-on.svg
similarity index 100%
rename from res/img/button-text-quote-o-n.svg
rename to res/img/button-text-block-quote-on.svg
diff --git a/res/img/button-text-quote.svg b/res/img/button-text-block-quote.svg
similarity index 100%
rename from res/img/button-text-quote.svg
rename to res/img/button-text-block-quote.svg
diff --git a/res/img/button-text-bold-o-n.svg b/res/img/button-text-bold-on.svg
similarity index 100%
rename from res/img/button-text-bold-o-n.svg
rename to res/img/button-text-bold-on.svg
diff --git a/res/img/button-text-bullet-o-n.svg b/res/img/button-text-bulleted-list-on.svg
similarity index 100%
rename from res/img/button-text-bullet-o-n.svg
rename to res/img/button-text-bulleted-list-on.svg
diff --git a/res/img/button-text-bullet.svg b/res/img/button-text-bulleted-list.svg
similarity index 100%
rename from res/img/button-text-bullet.svg
rename to res/img/button-text-bulleted-list.svg
diff --git a/res/img/button-text-code-o-n.svg b/res/img/button-text-code-on.svg
similarity index 100%
rename from res/img/button-text-code-o-n.svg
rename to res/img/button-text-code-on.svg
diff --git a/res/img/button-text-strike-o-n.svg b/res/img/button-text-deleted-on.svg
similarity index 100%
rename from res/img/button-text-strike-o-n.svg
rename to res/img/button-text-deleted-on.svg
diff --git a/res/img/button-text-strike.svg b/res/img/button-text-deleted.svg
similarity index 100%
rename from res/img/button-text-strike.svg
rename to res/img/button-text-deleted.svg
diff --git a/res/img/button-text-italic-o-n.svg b/res/img/button-text-italic-on.svg
similarity index 100%
rename from res/img/button-text-italic-o-n.svg
rename to res/img/button-text-italic-on.svg
diff --git a/res/img/button-text-numbullet-o-n.svg b/res/img/button-text-numbered-list-on.svg
similarity index 100%
rename from res/img/button-text-numbullet-o-n.svg
rename to res/img/button-text-numbered-list-on.svg
diff --git a/res/img/button-text-numbullet.svg b/res/img/button-text-numbered-list.svg
similarity index 100%
rename from res/img/button-text-numbullet.svg
rename to res/img/button-text-numbered-list.svg
diff --git a/res/img/button-text-underline-o-n.svg b/res/img/button-text-underlined-on.svg
similarity index 100%
rename from res/img/button-text-underline-o-n.svg
rename to res/img/button-text-underlined-on.svg
diff --git a/res/img/button-text-underline.svg b/res/img/button-text-underlined.svg
similarity index 100%
rename from res/img/button-text-underline.svg
rename to res/img/button-text-underlined.svg
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 157dc9e704..4d00927767 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -215,7 +215,7 @@ export default class MessageComposer extends React.Component {
         }
     }
 
-    onFormatButtonClicked(name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", event) {
+    onFormatButtonClicked(name, event) {
         event.preventDefault();
         this.messageComposerInput.onFormatButtonClicked(name, event);
     }
@@ -303,14 +303,14 @@ export default class MessageComposer extends React.Component {
                 </div>
             );
 
-            const formattingButton = (
+            const formattingButton = this.state.inputState.isRichTextEnabled ? (
                 <img className="mx_MessageComposer_formatting"
                      title={_t("Show Text Formatting Toolbar")}
                      src="img/button-text-formatting.svg"
                      onClick={this.onToggleFormattingClicked}
                      style={{visibility: this.state.showFormatting ? 'hidden' : 'visible'}}
                      key="controls_formatting" />
-            );
+            ) : null;
 
             let placeholderText;
             if (this.state.isQuoting) {
@@ -353,31 +353,27 @@ export default class MessageComposer extends React.Component {
             );
         }
 
-        const {marks, blockType} = this.state.inputState;
-        const formatButtons = ["bold", "italic", "strike", "underline", "code", "quote", "bullet", "numbullet"].map(
-            (name) => {
-                const active = marks.includes(name) || blockType === name;
-                const suffix = active ? '-o-n' : '';
-                const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
-                const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
-                return <img className={className}
-                            title={_t(name)}
-                            onMouseDown={onFormatButtonClicked}
-                            key={name}
-                            src={`img/button-text-${name}${suffix}.svg`}
-                            height="17" />;
-            },
-        );
+        let formatBar;
+        if (this.state.showFormatting) {
+            const {marks, blockType} = this.state.inputState;
+            const formatButtons = ["bold", "italic", "deleted", "underlined", "code", "block-quote", "bulleted-list", "numbered-list"].map(
+                (name) => {
+                    const active = marks.some(mark => mark.type === name) || blockType === name;
+                    const suffix = active ? '-on' : '';
+                    const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
+                    const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
+                    return <img className={className}
+                                title={_t(name)}
+                                onMouseDown={onFormatButtonClicked}
+                                key={name}
+                                src={`img/button-text-${name}${suffix}.svg`}
+                                height="17" />;
+                },
+            );
 
-        return (
-            <div className="mx_MessageComposer">
-                <div className="mx_MessageComposer_wrapper">
-                    <div className="mx_MessageComposer_row">
-                        { controls }
-                    </div>
-                </div>
+            formatBar =
                 <div className="mx_MessageComposer_formatbar_wrapper">
-                    <div className="mx_MessageComposer_formatbar" style={this.state.showFormatting ? {} : {display: 'none'}}>
+                    <div className="mx_MessageComposer_formatbar">
                         { formatButtons }
                         <div style={{flex: 1}}></div>
                         <img title={this.state.inputState.isRichTextEnabled ? _t("Turn Markdown on") : _t("Turn Markdown off")}
@@ -390,6 +386,16 @@ export default class MessageComposer extends React.Component {
                              src="img/icon-text-cancel.svg" />
                     </div>
                 </div>
+        }
+
+        return (
+            <div className="mx_MessageComposer">
+                <div className="mx_MessageComposer_wrapper">
+                    <div className="mx_MessageComposer_row">
+                        { controls }
+                    </div>
+                </div>
+                { formatBar }
             </div>
         );
     }
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index aac7c7ddbb..2d5e6d050d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -132,9 +132,6 @@ export default class MessageComposerInput extends React.Component {
         // js-sdk Room object
         room: PropTypes.object.isRequired,
 
-        // called with current plaintext content (as a string) whenever it changes
-        onContentChanged: PropTypes.func,
-
         onFilesPasted: PropTypes.func,
 
         onInputStateChanged: PropTypes.func,
@@ -319,15 +316,6 @@ export default class MessageComposerInput extends React.Component {
         dis.unregister(this.dispatcherRef);
     }
 
-    componentWillUpdate(nextProps, nextState) {
-        // this is dirty, but moving all this state to MessageComposer is dirtier
-        if (this.props.onInputStateChanged && nextState !== this.state) {
-            const state = this.getSelectionInfo(nextState.editorState);
-            state.isRichTextEnabled = nextState.isRichTextEnabled;
-            this.props.onInputStateChanged(state);
-        }
-    }
-
     onAction = (payload) => {
         const editor = this.refs.editor;
         let editorState = this.state.editorState;
@@ -567,6 +555,27 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
+        if (this.props.onInputStateChanged) {
+            let blockType = editorState.blocks.first().type;
+            console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
+
+            if (blockType === 'list-item') {
+                const parent = editorState.document.getParent(editorState.blocks.first().key);
+                if (parent.type === 'numbered-list') {
+                    blockType = 'numbered-list';
+                }
+                else if (parent.type === 'bulleted-list') {
+                    blockType = 'bulleted-list';
+                }
+            }
+            const inputState = {
+                marks: editorState.activeMarks,
+                isRichTextEnabled: this.state.isRichTextEnabled,
+                blockType
+            };
+            this.props.onInputStateChanged(inputState);
+        }
+
         // Record the editor state for this room so that it can be retrieved after
         // switching to another room and back
         dis.dispatch({
@@ -1239,17 +1248,6 @@ export default class MessageComposerInput extends React.Component {
         await this.setDisplayedCompletion(null); // restore originalEditorState
     };
 
-    /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
-     buttons. */
-    getSelectionInfo(editorState: Value) {
-        return {
-            marks: editorState.activeMarks,
-            // XXX: shouldn't we return all the types of blocks in the current selection,
-            // not just the anchor?
-            blockType: editorState.anchorBlock ? editorState.anchorBlock.type : null,
-        };
-    }
-
     /* If passed null, restores the original editor content from state.originalEditorState.
      * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
      */
@@ -1406,18 +1404,22 @@ export default class MessageComposerInput extends React.Component {
         }
     };
 
-    onFormatButtonClicked = (name: "bold" | "italic" | "strike" | "code" | "underline" | "quote" | "bullet" | "numbullet", e) => {
-        e.preventDefault(); // don't steal focus from the editor!
+    onFormatButtonClicked = (name, e) => {
+        if (e) {
+            e.preventDefault(); // don't steal focus from the editor!
+        }
 
-        const command = {
-                // code: 'code-block', // let's have the button do inline code for now
-                quote: 'block-quote',
-                bullet: 'bulleted-list',
-                numbullet: 'numbered-list',
-                underline: 'underlined',
-                strike: 'deleted',
-            }[name] || name;
-        this.handleKeyCommand(command);
+        // XXX: horrible evil hack to ensure the editor is focused so the act
+        // of focusing it doesn't then cancel the format button being pressed
+        if (document.activeElement && document.activeElement.className !== 'mx_MessageComposer_editor') {
+            this.refs.editor.focus();
+            setTimeout(()=>{
+                this.handleKeyCommand(name);
+            }, 500); // can't find any callback to hook this to. onFocus and onChange and willComponentUpdate fire too early.
+            return;
+        }
+
+        this.handleKeyCommand(name);
     };
 
     getAutocompleteQuery(editorState: Value) {

From e460cf35e0c553825a5d3ee2f11b449249acdcbd Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 22:48:40 +0100
Subject: [PATCH 073/702] hide formatting bar for MD editor

---
 src/components/views/rooms/MessageComposer.js      | 2 +-
 src/components/views/rooms/MessageComposerInput.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4d00927767..28502c348d 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -354,7 +354,7 @@ export default class MessageComposer extends React.Component {
         }
 
         let formatBar;
-        if (this.state.showFormatting) {
+        if (this.state.showFormatting && this.state.inputState.isRichTextEnabled) {
             const {marks, blockType} = this.state.inputState;
             const formatButtons = ["bold", "italic", "deleted", "underlined", "code", "block-quote", "bulleted-list", "numbered-list"].map(
                 (name) => {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 2d5e6d050d..2bb35c5656 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1405,9 +1405,7 @@ export default class MessageComposerInput extends React.Component {
     };
 
     onFormatButtonClicked = (name, e) => {
-        if (e) {
-            e.preventDefault(); // don't steal focus from the editor!
-        }
+        e.preventDefault(); // don't steal focus from the editor!
 
         // XXX: horrible evil hack to ensure the editor is focused so the act
         // of focusing it doesn't then cancel the format button being pressed

From b616fd025e56fe9b338c1bada5fb9c12ecb84c71 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 23:34:06 +0100
Subject: [PATCH 074/702] comment out all the tests for now

---
 src/components/views/rooms/MessageComposerInput.js       | 2 +-
 test/components/views/rooms/MessageComposerInput-test.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 2bb35c5656..1f0a544246 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -557,7 +557,7 @@ export default class MessageComposerInput extends React.Component {
 
         if (this.props.onInputStateChanged) {
             let blockType = editorState.blocks.first().type;
-            console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
+            // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
 
             if (blockType === 'list-item') {
                 const parent = editorState.document.getParent(editorState.blocks.first().key);
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 42921db975..708071df23 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -10,6 +10,7 @@ const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput'
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 import RoomMember from 'matrix-js-sdk';
 
+/*
 function addTextToDraft(text) {
     const components = document.getElementsByClassName('public-DraftEditor-content');
     if (components && components.length) {
@@ -300,3 +301,4 @@ describe('MessageComposerInput', () => {
         expect(spy.args[0][1].formatted_body).toEqual('<a href="https://some.lovely.url">Click here</a>');
     });
 });
+*/
\ No newline at end of file

From 4439a04689605f7244505915e3494a86954cf28c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 20 May 2018 23:43:42 +0100
Subject: [PATCH 075/702] fix lint

---
 .eslintrc.js                                 |  1 +
 src/ComposerHistoryManager.js                | 16 +++++-----------
 src/autocomplete/CommandProvider.js          |  3 +--
 src/autocomplete/PlainWithPillsSerializer.js | 15 ++++++---------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index bf423a1ad8..62d24ea707 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -95,6 +95,7 @@ module.exports = {
         "new-cap": ["warn"],
         "key-spacing": ["warn"],
         "prefer-const": ["warn"],
+        "arrow-parens": "off",
 
         // crashes currently: https://github.com/eslint/eslint/issues/6274
         "generator-star-spacing": "off",
diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index f997e1d1cd..e78fbcdc3b 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -16,11 +16,6 @@ limitations under the License.
 */
 
 import { Value } from 'slate';
-import Html from 'slate-html-serializer';
-import Md from 'slate-md-serializer';
-import Plain from 'slate-plain-serializer';
-import * as RichText from './RichText';
-import Markdown from './Markdown';
 
 import _clamp from 'lodash/clamp';
 
@@ -38,17 +33,17 @@ class HistoryItem {
         this.format = format;
     }
 
-    static fromJSON(obj): HistoryItem {
+    static fromJSON(obj: Object): HistoryItem {
         return new HistoryItem(
             Value.fromJSON(obj.value),
-            obj.format
+            obj.format,
         );
     }
 
     toJSON(): Object {
         return {
             value: this.value.toJSON(),
-            format: this.format
+            format: this.format,
         };
     }
 }
@@ -67,10 +62,9 @@ export default class ComposerHistoryManager {
         for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) {
             try {
                 this.history.push(
-                    HistoryItem.fromJSON(JSON.parse(item))
+                    HistoryItem.fromJSON(JSON.parse(item)),
                 );
-            }
-            catch (e) {
+            } catch (e) {
                 console.warn("Throwing away unserialisable history", e);
             }
         }
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 4f2aed3dc6..d56cefb021 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -132,8 +132,7 @@ export default class CommandProvider extends AutocompleteProvider {
             let results;
             if (command[0] == '/') {
                 results = COMMANDS;
-            }
-            else {
+            } else {
                 results = this.matcher.match(command[0]);
             }
             completions = results.map((result) => {
diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
index 7428241b05..c1194ae2e1 100644
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -31,7 +31,7 @@ class PlainWithPillsSerializer {
      * @param {String} options.pillFormat - either 'md', 'plain', 'id'
      */
     constructor(options = {}) {
-        let {
+        const {
             pillFormat = 'plain',
         } = options;
         this.pillFormat = pillFormat;
@@ -46,7 +46,7 @@ class PlainWithPillsSerializer {
      * @return {String}
      */
     serialize = value => {
-        return this._serializeNode(value.document)
+        return this._serializeNode(value.document);
     }
 
     /**
@@ -61,8 +61,7 @@ class PlainWithPillsSerializer {
             (node.object == 'block' && Block.isBlockList(node.nodes))
         ) {
             return node.nodes.map(this._serializeNode).join('\n');
-        }
-        else if (node.type == 'emoji') {
+        } else if (node.type == 'emoji') {
             return node.data.get('emojiUnicode');
         } else if (node.type == 'pill') {
             switch (this.pillFormat) {
@@ -73,11 +72,9 @@ class PlainWithPillsSerializer {
                 case 'id':
                     return node.data.get('completionId') || node.data.get('completion');
             }
-        }
-        else if (node.nodes) {
+        } else if (node.nodes) {
             return node.nodes.map(this._serializeNode).join('');
-        }
-        else {
+        } else {
             return node.text;
         }
     }
@@ -89,4 +86,4 @@ class PlainWithPillsSerializer {
  * @type {PlainWithPillsSerializer}
  */
 
-export default PlainWithPillsSerializer
\ No newline at end of file
+export default PlainWithPillsSerializer;

From 7de45f8b7beb9e7069b643b02f8b9c904cb5aab4 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 21 May 2018 03:48:59 +0100
Subject: [PATCH 076/702] make quoting work

---
 src/HtmlUtils.js                              |  32 ++++--
 .../views/context_menus/MessageContextMenu.js |   2 +-
 .../views/rooms/MessageComposerInput.js       | 107 +++++++++++-------
 3 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 4c1564297d..607686d46d 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -403,19 +403,22 @@ class TextHighlighter extends BaseHighlighter {
 }
 
 
-    /* turn a matrix event body into html
-     *
-     * content: 'content' of the MatrixEvent
-     *
-     * highlights: optional list of words to highlight, ordered by longest word first
-     *
-     * opts.highlightLink: optional href to add to highlighted words
-     * opts.disableBigEmoji: optional argument to disable the big emoji class.
-     * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing
-     */
+/* turn a matrix event body into html
+ *
+ * content: 'content' of the MatrixEvent
+ *
+ * highlights: optional list of words to highlight, ordered by longest word first
+ *
+ * opts.highlightLink: optional href to add to highlighted words
+ * opts.disableBigEmoji: optional argument to disable the big emoji class.
+ * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing
+ * opts.returnString: return an HTML string rather than JSX elements
+ * opts.emojiOne: optional param to do emojiOne (default true)
+ */
 export function bodyToHtml(content, highlights, opts={}) {
     const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body;
 
+    const doEmojiOne = opts.emojiOne === undefined ? true : opts.emojiOne;
     let bodyHasEmoji = false;
 
     let strippedBody;
@@ -441,8 +444,9 @@ 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);
-
+        if (doEmojiOne) {
+            bodyHasEmoji = containsEmoji(isHtmlMessage ? formattedBody : content.body);
+        }
 
         // Only generate safeBody if the message was sent as org.matrix.custom.html
         if (isHtmlMessage) {
@@ -467,6 +471,10 @@ export function bodyToHtml(content, highlights, opts={}) {
         delete sanitizeHtmlParams.textFilter;
     }
 
+    if (opts.returnString) {
+        return isDisplayedWithHtml ? safeBody : strippedBody;
+    }
+
     let emojiBody = false;
     if (!opts.disableBigEmoji && bodyHasEmoji) {
         EMOJI_REGEX.lastIndex = 0;
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 99ec493ced..22c6f2aa70 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -179,7 +179,7 @@ module.exports = React.createClass({
     onQuoteClick: function() {
         dis.dispatch({
             action: 'quote',
-            text: this.props.eventTileOps.getInnerText(),
+            event: this.props.mxEvent,
         });
         this.closeMenu();
     },
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 1f0a544246..eb4edfcfcb 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -21,7 +21,7 @@ import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
 import { Editor } from 'slate-react';
 import { getEventTransfer } from 'slate-react';
-import { Value, Document, Event, Inline, Text, Range, Node } from 'slate';
+import { Value, Document, Event, Block, Inline, Text, Range, Node } from 'slate';
 
 import Html from 'slate-html-serializer';
 import Md from 'slate-md-serializer';
@@ -342,37 +342,44 @@ export default class MessageComposerInput extends React.Component {
                     });
                 }
                 break;
-/*
-            case 'quote': { // old quoting, whilst rich quoting is in labs
-                /// XXX: Not doing rich-text quoting from formatted-body because draft-js
-                /// has regressed such that when links are quoted, errors are thrown. See
-                /// https://github.com/vector-im/riot-web/issues/4756.
-                const body = escape(payload.text);
-                if (body) {
-                    let content = RichText.htmlToContentState(`<blockquote>${body}</blockquote>`);
-                    if (!this.state.isRichTextEnabled) {
-                        content = ContentState.createFromText(RichText.stateToMarkdown(content));
-                    }
+            case 'quote': {
+                const html = HtmlUtils.bodyToHtml(payload.event.getContent(), null, {
+                    returnString: true,
+                    emojiOne: false,
+                });
+                const fragment = this.html.deserialize(html);
+                // FIXME: do we want to put in a permalink to the original quote here?
+                // If so, what should be the format, and how do we differentiate it from replies?
 
-                    const blockMap = content.getBlockMap();
-                    let startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    contentState = Modifier.splitBlock(contentState, startSelection);
-                    startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    contentState = Modifier.replaceWithFragment(contentState,
-                        startSelection,
-                        blockMap);
-                    startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    if (this.state.isRichTextEnabled) {
-                        contentState = Modifier.setBlockType(contentState, startSelection, 'blockquote');
+                const quote = Block.create('block-quote');
+                if (this.state.isRichTextEnabled) {    
+                    let change = editorState.change();
+                    if (editorState.anchorText.text === '' && editorState.anchorBlock.nodes.size === 1) {
+                        // replace the current block rather than split the block
+                        change = change.replaceNodeByKey(editorState.anchorBlock.key, quote);
                     }
-                    let editorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
-                    editorState = EditorState.moveSelectionToEnd(editorState);
-                    this.onEditorContentChanged(editorState);
-                    editor.focus();
+                    else {
+                        // insert it into the middle of the block (splitting it)
+                        change = change.insertBlock(quote);
+                    }
+                    change = change.insertFragmentByKey(quote.key, 0, fragment.document)
+                                   .focus();
+                    this.onChange(change);
+                }
+                else {
+                    let fragmentChange = fragment.change();
+                    fragmentChange.moveToRangeOf(fragment.document)
+                                  .wrapBlock(quote);
+
+                    // FIXME: handle pills and use commonmark rather than md-serialize
+                    const md = this.md.serialize(fragmentChange.value);
+                    let change = editorState.change()
+                                            .insertText(md + '\n\n')
+                                            .focus();
+                    this.onChange(change);
                 }
             }
                 break;
-*/
         }
     };
 
@@ -555,7 +562,7 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
-        if (this.props.onInputStateChanged) {
+        if (this.props.onInputStateChanged && editorState.blocks.size > 0) {
             let blockType = editorState.blocks.first().type;
             // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
 
@@ -740,17 +747,31 @@ export default class MessageComposerInput extends React.Component {
                     .unwrapBlock('numbered-list');
                 return change;
             }
-            else if (editorState.anchorOffset == 0 &&
-                     (this.hasBlock('block-quote') ||
-                      this.hasBlock('heading1') ||
-                      this.hasBlock('heading2') ||
-                      this.hasBlock('heading3') ||
-                      this.hasBlock('heading4') ||
-                      this.hasBlock('heading5') ||
-                      this.hasBlock('heading6') ||
-                      this.hasBlock('code-block')))
-            {
-                return change.setBlocks(DEFAULT_NODE);
+            else if (editorState.anchorOffset == 0 && editorState.isCollapsed) {
+                // turn blocks back into paragraphs
+                if ((this.hasBlock('block-quote') ||
+                     this.hasBlock('heading1') ||
+                     this.hasBlock('heading2') ||
+                     this.hasBlock('heading3') ||
+                     this.hasBlock('heading4') ||
+                     this.hasBlock('heading5') ||
+                     this.hasBlock('heading6') ||
+                     this.hasBlock('code-block')))
+                {
+                    return change.setBlocks(DEFAULT_NODE);
+                }
+
+                // remove paragraphs entirely if they're nested
+                const parent = editorState.document.getParent(editorState.anchorBlock.key);
+                if (editorState.anchorOffset == 0 &&
+                    this.hasBlock('paragraph') &&
+                    parent.nodes.size == 1 &&
+                    parent.object !== 'document')
+                {
+                    return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText)
+                                 .collapseToEndOf(parent)
+                                 .focus();
+                }
             }
         }
         return;
@@ -1013,7 +1034,7 @@ export default class MessageComposerInput extends React.Component {
             if (!shouldSendHTML) {
                 shouldSendHTML = !!editorState.document.findDescendant(node => {
                     // N.B. node.getMarks() might be private?
-                    return ((node.object === 'block' && node.type !== 'line') ||
+                    return ((node.object === 'block' && node.type !== 'paragraph') ||
                             (node.object === 'inline') ||
                             (node.object === 'text' && node.getMarks().size > 0));
                 });
@@ -1131,13 +1152,13 @@ export default class MessageComposerInput extends React.Component {
             // heuristic to handle tall emoji, pills, etc pushing the cursor away from the top
             // or bottom of the page.
             // XXX: is this going to break on large inline images or top-to-bottom scripts?
-            const EDGE_THRESHOLD = 8;
+            const EDGE_THRESHOLD = 15;
 
             let navigateHistory = false;
             if (up) {
                 const scrollCorrection = editorNode.scrollTop;
                 const distanceFromTop = cursorRect.top - editorRect.top + scrollCorrection;
-                //console.log(`Cursor distance from editor top is ${distanceFromTop}`);
+                console.log(`Cursor distance from editor top is ${distanceFromTop}`);
                 if (distanceFromTop < EDGE_THRESHOLD) {
                     navigateHistory = true;
                 }
@@ -1146,7 +1167,7 @@ export default class MessageComposerInput extends React.Component {
                 const scrollCorrection =
                     editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop;
                 const distanceFromBottom = editorRect.bottom - cursorRect.bottom + scrollCorrection;
-                //console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
+                console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
                 if (distanceFromBottom < EDGE_THRESHOLD) {
                     navigateHistory = true;
                 }

From 35ab573bc54c56911a6f566ce6227289658e6e22 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Mon, 21 May 2018 18:44:00 +0900
Subject: [PATCH 077/702] Update sinon to 5.0.7

---
 package-lock.json                             | 2353 +++++++++--------
 package.json                                  |    2 +-
 .../structures/TimelinePanel-test.js          |    2 +-
 3 files changed, 1210 insertions(+), 1147 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f183f1635d..97ed7b5dea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,25 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@sinonjs/formatio": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
+      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
+      "dev": true,
+      "requires": {
+        "samsam": "1.3.0"
+      }
+    },
     "accepts": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
       "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.17",
+        "mime-types": "~2.1.11",
         "negotiator": "0.6.1"
       }
     },
@@ -26,7 +35,7 @@
       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
       "dev": true,
       "requires": {
-        "acorn": "3.3.0"
+        "acorn": "^3.0.4"
       },
       "dependencies": {
         "acorn": {
@@ -44,14 +53,14 @@
       "dev": true
     },
     "ajv": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
       "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.0.0",
-        "json-schema-traverse": "0.3.1",
-        "json-stable-stringify": "1.0.1"
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
       }
     },
     "ajv-keywords": {
@@ -66,9 +75,9 @@
       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2",
-        "longest": "1.0.1",
-        "repeat-string": "1.6.1"
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
       }
     },
     "amdefine": {
@@ -106,8 +115,8 @@
       "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
-        "micromatch": "2.3.11",
-        "normalize-path": "2.1.1"
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
       }
     },
     "argparse": {
@@ -116,7 +125,7 @@
       "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
       "dev": true,
       "requires": {
-        "sprintf-js": "1.0.3"
+        "sprintf-js": "~1.0.2"
       },
       "dependencies": {
         "sprintf-js": {
@@ -133,7 +142,7 @@
       "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
       "dev": true,
       "requires": {
-        "arr-flatten": "1.1.0"
+        "arr-flatten": "^1.0.1"
       }
     },
     "arr-flatten": {
@@ -148,8 +157,8 @@
       "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.2",
-        "es-abstract": "1.9.0"
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
       }
     },
     "array-slice": {
@@ -164,7 +173,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "1.0.3"
+        "array-uniq": "^1.0.1"
       }
     },
     "array-uniq": {
@@ -238,9 +247,9 @@
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
+      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
     },
     "babel-cli": {
       "version": "6.26.0",
@@ -248,21 +257,21 @@
       "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
       "dev": true,
       "requires": {
-        "babel-core": "6.26.0",
-        "babel-polyfill": "6.26.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "chokidar": "1.7.0",
-        "commander": "2.11.0",
-        "convert-source-map": "1.5.0",
-        "fs-readdir-recursive": "1.0.0",
-        "glob": "7.1.2",
-        "lodash": "4.17.4",
-        "output-file-sync": "1.1.2",
-        "path-is-absolute": "1.0.1",
-        "slash": "1.0.0",
-        "source-map": "0.5.7",
-        "v8flags": "2.1.1"
+        "babel-core": "^6.26.0",
+        "babel-polyfill": "^6.26.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "chokidar": "^1.6.1",
+        "commander": "^2.11.0",
+        "convert-source-map": "^1.5.0",
+        "fs-readdir-recursive": "^1.0.0",
+        "glob": "^7.1.2",
+        "lodash": "^4.17.4",
+        "output-file-sync": "^1.1.2",
+        "path-is-absolute": "^1.0.1",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.6",
+        "v8flags": "^2.1.1"
       },
       "dependencies": {
         "glob": {
@@ -271,12 +280,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -287,9 +296,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       }
     },
     "babel-core": {
@@ -298,25 +307,25 @@
       "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-generator": "6.26.0",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "convert-source-map": "1.5.0",
-        "debug": "2.6.9",
-        "json5": "0.5.1",
-        "lodash": "4.17.4",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.8",
-        "slash": "1.0.0",
-        "source-map": "0.5.7"
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.0",
+        "debug": "^2.6.8",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.7",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.6"
       }
     },
     "babel-eslint": {
@@ -325,11 +334,11 @@
       "integrity": "sha1-UpNBn+NnLWZZjTJ9qWlFZ7pqXy8=",
       "dev": true,
       "requires": {
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "lodash.assign": "4.2.0",
-        "lodash.pickby": "4.6.0"
+        "babel-traverse": "^6.0.20",
+        "babel-types": "^6.0.19",
+        "babylon": "^6.0.18",
+        "lodash.assign": "^4.0.0",
+        "lodash.pickby": "^4.0.0"
       }
     },
     "babel-generator": {
@@ -338,14 +347,14 @@
       "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
       "dev": true,
       "requires": {
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "detect-indent": "4.0.0",
-        "jsesc": "1.3.0",
-        "lodash": "4.17.4",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.6",
+        "trim-right": "^1.0.1"
       }
     },
     "babel-helper-builder-binary-assignment-operator-visitor": {
@@ -354,9 +363,9 @@
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
       "dev": true,
       "requires": {
-        "babel-helper-explode-assignable-expression": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-explode-assignable-expression": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-builder-react-jsx": {
@@ -365,9 +374,9 @@
       "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "esutils": "2.0.2"
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "esutils": "^2.0.2"
       }
     },
     "babel-helper-call-delegate": {
@@ -376,10 +385,10 @@
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-define-map": {
@@ -388,10 +397,10 @@
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.4"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-helper-explode-assignable-expression": {
@@ -400,9 +409,9 @@
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-function-name": {
@@ -411,11 +420,11 @@
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-get-function-arity": {
@@ -424,8 +433,8 @@
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-hoist-variables": {
@@ -434,8 +443,8 @@
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-optimise-call-expression": {
@@ -444,8 +453,8 @@
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-regex": {
@@ -454,9 +463,9 @@
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.4"
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-helper-remap-async-to-generator": {
@@ -465,11 +474,11 @@
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-replace-supers": {
@@ -478,12 +487,12 @@
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helpers": {
@@ -492,8 +501,8 @@
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-loader": {
@@ -502,10 +511,10 @@
       "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
       "dev": true,
       "requires": {
-        "find-cache-dir": "0.1.1",
-        "loader-utils": "0.2.17",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1"
+        "find-cache-dir": "^0.1.1",
+        "loader-utils": "^0.2.16",
+        "mkdirp": "^0.5.1",
+        "object-assign": "^4.0.1"
       }
     },
     "babel-messages": {
@@ -514,7 +523,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-add-module-exports": {
@@ -529,7 +538,7 @@
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-syntax-async-functions": {
@@ -580,10 +589,10 @@
       "integrity": "sha1-Ruo+fFr2KXgqyfHtG3zTj4Qlr9Q=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0"
+        "babel-helper-function-name": "^6.8.0",
+        "babel-plugin-syntax-async-functions": "^6.8.0",
+        "babel-template": "^6.9.0",
+        "babel-traverse": "^6.10.4"
       }
     },
     "babel-plugin-transform-async-to-generator": {
@@ -592,9 +601,9 @@
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
       "dev": true,
       "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-functions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-class-properties": {
@@ -603,10 +612,10 @@
       "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-plugin-syntax-class-properties": "6.13.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-plugin-syntax-class-properties": "^6.8.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-arrow-functions": {
@@ -615,7 +624,7 @@
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
@@ -624,7 +633,7 @@
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoping": {
@@ -633,11 +642,11 @@
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.4"
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -646,15 +655,15 @@
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
       "dev": true,
       "requires": {
-        "babel-helper-define-map": "6.26.0",
-        "babel-helper-function-name": "6.24.1",
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -663,8 +672,8 @@
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-destructuring": {
@@ -673,7 +682,7 @@
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-duplicate-keys": {
@@ -682,8 +691,8 @@
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-for-of": {
@@ -692,7 +701,7 @@
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-function-name": {
@@ -701,9 +710,9 @@
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-literals": {
@@ -712,7 +721,7 @@
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-modules-amd": {
@@ -721,9 +730,9 @@
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
@@ -732,10 +741,10 @@
       "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-strict-mode": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
@@ -744,9 +753,9 @@
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-modules-umd": {
@@ -755,9 +764,9 @@
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-object-super": {
@@ -766,8 +775,8 @@
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-runtime": "6.26.0"
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-parameters": {
@@ -776,12 +785,12 @@
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "6.24.1",
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
@@ -790,8 +799,8 @@
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-spread": {
@@ -800,7 +809,7 @@
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-sticky-regex": {
@@ -809,9 +818,9 @@
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-template-literals": {
@@ -820,7 +829,7 @@
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
@@ -829,7 +838,7 @@
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -838,9 +847,9 @@
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "regexpu-core": "2.0.0"
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
       }
     },
     "babel-plugin-transform-exponentiation-operator": {
@@ -849,9 +858,9 @@
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-flow-strip-types": {
@@ -860,8 +869,8 @@
       "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-flow": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-flow": "^6.18.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-object-rest-spread": {
@@ -870,8 +879,8 @@
       "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-object-rest-spread": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+        "babel-runtime": "^6.26.0"
       }
     },
     "babel-plugin-transform-react-display-name": {
@@ -880,7 +889,7 @@
       "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-react-jsx": {
@@ -889,9 +898,9 @@
       "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-react-jsx": "6.26.0",
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-builder-react-jsx": "^6.24.1",
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-react-jsx-self": {
@@ -900,8 +909,8 @@
       "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-react-jsx-source": {
@@ -910,8 +919,8 @@
       "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-regenerator": {
@@ -920,7 +929,7 @@
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
       "dev": true,
       "requires": {
-        "regenerator-transform": "0.10.1"
+        "regenerator-transform": "^0.10.0"
       }
     },
     "babel-plugin-transform-runtime": {
@@ -929,7 +938,7 @@
       "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-strict-mode": {
@@ -938,8 +947,8 @@
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-polyfill": {
@@ -948,9 +957,9 @@
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "core-js": "2.5.1",
-        "regenerator-runtime": "0.10.5"
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "regenerator-runtime": "^0.10.5"
       },
       "dependencies": {
         "regenerator-runtime": {
@@ -967,30 +976,30 @@
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.26.0"
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+        "babel-plugin-transform-es2015-classes": "^6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+        "babel-plugin-transform-es2015-for-of": "^6.22.0",
+        "babel-plugin-transform-es2015-function-name": "^6.24.1",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+        "babel-plugin-transform-es2015-object-super": "^6.24.1",
+        "babel-plugin-transform-es2015-parameters": "^6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+        "babel-plugin-transform-regenerator": "^6.24.1"
       }
     },
     "babel-preset-es2016": {
@@ -999,7 +1008,7 @@
       "integrity": "sha1-+QC/k+LrwNJ235uKtZck6/2Vn4s=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-exponentiation-operator": "6.24.1"
+        "babel-plugin-transform-exponentiation-operator": "^6.24.1"
       }
     },
     "babel-preset-es2017": {
@@ -1008,8 +1017,8 @@
       "integrity": "sha1-WXvq37n38gi8/YoS6bKym4svFNE=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-to-generator": "6.24.1"
+        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+        "babel-plugin-transform-async-to-generator": "^6.24.1"
       }
     },
     "babel-preset-flow": {
@@ -1018,7 +1027,7 @@
       "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-flow-strip-types": "6.22.0"
+        "babel-plugin-transform-flow-strip-types": "^6.22.0"
       }
     },
     "babel-preset-react": {
@@ -1027,12 +1036,12 @@
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-plugin-transform-react-display-name": "6.25.0",
-        "babel-plugin-transform-react-jsx": "6.24.1",
-        "babel-plugin-transform-react-jsx-self": "6.22.0",
-        "babel-plugin-transform-react-jsx-source": "6.22.0",
-        "babel-preset-flow": "6.23.0"
+        "babel-plugin-syntax-jsx": "^6.3.13",
+        "babel-plugin-transform-react-display-name": "^6.23.0",
+        "babel-plugin-transform-react-jsx": "^6.24.1",
+        "babel-plugin-transform-react-jsx-self": "^6.22.0",
+        "babel-plugin-transform-react-jsx-source": "^6.22.0",
+        "babel-preset-flow": "^6.23.0"
       }
     },
     "babel-register": {
@@ -1041,13 +1050,13 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "core-js": "2.5.1",
-        "home-or-tmp": "2.0.0",
-        "lodash": "4.17.4",
-        "mkdirp": "0.5.1",
-        "source-map-support": "0.4.18"
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
       }
     },
     "babel-runtime": {
@@ -1055,8 +1064,8 @@
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "2.5.1",
-        "regenerator-runtime": "0.11.0"
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
       }
     },
     "babel-template": {
@@ -1065,11 +1074,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "lodash": "4.17.4"
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-traverse": {
@@ -1078,15 +1087,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "debug": "2.6.9",
-        "globals": "9.18.0",
-        "invariant": "2.2.2",
-        "lodash": "4.17.4"
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
       }
     },
     "babel-types": {
@@ -1095,10 +1104,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "esutils": "2.0.2",
-        "lodash": "4.17.4",
-        "to-fast-properties": "1.0.3"
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
       }
     },
     "babylon": {
@@ -1142,7 +1151,7 @@
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
       "optional": true,
       "requires": {
-        "tweetnacl": "0.14.5"
+        "tweetnacl": "^0.14.3"
       }
     },
     "better-assert": {
@@ -1189,28 +1198,23 @@
       "dev": true,
       "requires": {
         "bytes": "3.0.0",
-        "content-type": "1.0.4",
+        "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "1.1.1",
-        "http-errors": "1.6.2",
+        "depd": "~1.1.1",
+        "http-errors": "~1.6.2",
         "iconv-lite": "0.4.19",
-        "on-finished": "2.3.0",
+        "on-finished": "~2.3.0",
         "qs": "6.5.1",
         "raw-body": "2.3.2",
-        "type-is": "1.6.15"
+        "type-is": "~1.6.15"
       }
     },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE="
-    },
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
       "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -1220,9 +1224,9 @@
       "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
       "dev": true,
       "requires": {
-        "expand-range": "1.8.2",
-        "preserve": "0.2.0",
-        "repeat-element": "1.1.2"
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
       }
     },
     "browser-encrypt-attachment": {
@@ -1247,7 +1251,7 @@
       "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "^2.0.1"
       }
     },
     "browserify-zlib": {
@@ -1256,7 +1260,7 @@
       "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
       "dev": true,
       "requires": {
-        "pako": "0.2.9"
+        "pako": "~0.2.0"
       },
       "dependencies": {
         "pako": {
@@ -1273,9 +1277,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "1.2.1",
-        "ieee754": "1.1.8",
-        "isarray": "1.0.0"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "builtin-status-codes": {
@@ -1296,7 +1300,7 @@
       "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
       "dev": true,
       "requires": {
-        "callsites": "0.2.0"
+        "callsites": "^0.2.0"
       }
     },
     "callsite": {
@@ -1328,8 +1332,8 @@
       "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
       "dev": true,
       "requires": {
-        "align-text": "0.1.4",
-        "lazy-cache": "1.0.4"
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
       }
     },
     "chalk": {
@@ -1338,11 +1342,11 @@
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "dev": true,
       "requires": {
-        "ansi-styles": "2.2.1",
-        "escape-string-regexp": "1.0.5",
-        "has-ansi": "2.0.0",
-        "strip-ansi": "3.0.1",
-        "supports-color": "2.0.0"
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
       }
     },
     "chokidar": {
@@ -1351,15 +1355,15 @@
       "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
       "dev": true,
       "requires": {
-        "anymatch": "1.3.2",
-        "async-each": "1.0.1",
-        "fsevents": "1.1.2",
-        "glob-parent": "2.0.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "2.0.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0"
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "fsevents": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
       }
     },
     "circular-json": {
@@ -1379,7 +1383,7 @@
       "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
       "dev": true,
       "requires": {
-        "restore-cursor": "1.0.1"
+        "restore-cursor": "^1.0.1"
       }
     },
     "cli-width": {
@@ -1394,8 +1398,8 @@
       "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
       "dev": true,
       "requires": {
-        "center-align": "0.1.3",
-        "right-align": "0.1.3",
+        "center-align": "^0.1.1",
+        "right-align": "^0.1.1",
         "wordwrap": "0.0.2"
       },
       "dependencies": {
@@ -1436,15 +1440,15 @@
       "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.4"
+        "lodash": "^4.5.0"
       }
     },
     "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "requires": {
-        "delayed-stream": "1.0.0"
+        "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
@@ -1464,10 +1468,10 @@
       "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz",
       "integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=",
       "requires": {
-        "entities": "1.1.1",
-        "mdurl": "1.0.1",
-        "minimist": "1.2.0",
-        "string.prototype.repeat": "0.2.0"
+        "entities": "~ 1.1.1",
+        "mdurl": "~ 1.0.1",
+        "minimist": "~ 1.2.0",
+        "string.prototype.repeat": "^0.2.0"
       }
     },
     "component-bind": {
@@ -1499,9 +1503,9 @@
       "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "typedarray": "0.0.6"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
     "connect": {
@@ -1512,7 +1516,7 @@
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.0.6",
-        "parseurl": "1.3.2",
+        "parseurl": "~1.3.2",
         "utils-merge": "1.0.1"
       }
     },
@@ -1522,7 +1526,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "0.1.4"
+        "date-now": "^0.1.4"
       }
     },
     "constants-browserify": {
@@ -1563,11 +1567,11 @@
       "resolved": "https://registry.npmjs.org/counterpart/-/counterpart-0.18.3.tgz",
       "integrity": "sha512-tli4qPAFeYB34LvvCc/1xYRLCWjf4WsUt6sXfpggDfGDKoI8rhnabz0SljDoBpAK8z1u8GBCg0YDkbvWb16uUQ==",
       "requires": {
-        "date-names": "0.1.10",
-        "except": "0.1.3",
-        "extend": "3.0.1",
-        "pluralizers": "0.1.6",
-        "sprintf-js": "1.1.1"
+        "date-names": "^0.1.9",
+        "except": "^0.1.3",
+        "extend": "^3.0.0",
+        "pluralizers": "^0.1.6",
+        "sprintf-js": "^1.0.3"
       }
     },
     "create-react-class": {
@@ -1575,24 +1579,9 @@
       "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.2.tgz",
       "integrity": "sha1-zx7RXxKq1/FO9fLf4F5sQvke8Co=",
       "requires": {
-        "fbjs": "0.8.16",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1"
-      }
-    },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "requires": {
-        "boom": "5.2.0"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw=="
-        }
+        "fbjs": "^0.8.9",
+        "loose-envify": "^1.3.1",
+        "object-assign": "^4.1.1"
       }
     },
     "crypto-browserify": {
@@ -1619,7 +1608,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.35"
+        "es5-ext": "^0.10.9"
       }
     },
     "dashdash": {
@@ -1627,7 +1616,7 @@
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
     "date-names": {
@@ -1668,8 +1657,8 @@
       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
       "dev": true,
       "requires": {
-        "foreach": "2.0.5",
-        "object-keys": "1.0.11"
+        "foreach": "^2.0.5",
+        "object-keys": "^1.0.8"
       }
     },
     "del": {
@@ -1678,13 +1667,13 @@
       "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
       "dev": true,
       "requires": {
-        "globby": "5.0.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.0",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.2"
+        "globby": "^5.0.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "rimraf": "^2.2.8"
       }
     },
     "delayed-stream": {
@@ -1704,7 +1693,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "repeating": "^2.0.0"
       }
     },
     "di": {
@@ -1713,14 +1702,20 @@
       "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
       "dev": true
     },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
     "doctrine": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
       "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
       "dev": true,
       "requires": {
-        "esutils": "2.0.2",
-        "isarray": "1.0.0"
+        "esutils": "^2.0.2",
+        "isarray": "^1.0.0"
       }
     },
     "dom-serialize": {
@@ -1729,10 +1724,10 @@
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
-        "custom-event": "1.0.1",
-        "ent": "2.2.0",
-        "extend": "3.0.1",
-        "void-elements": "2.0.1"
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
       }
     },
     "dom-serializer": {
@@ -1740,8 +1735,8 @@
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "requires": {
-        "domelementtype": "1.1.3",
-        "entities": "1.1.1"
+        "domelementtype": "~1.1.1",
+        "entities": "~1.1.1"
       },
       "dependencies": {
         "domelementtype": {
@@ -1767,7 +1762,7 @@
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
       "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
       "requires": {
-        "domelementtype": "1.3.0"
+        "domelementtype": "1"
       }
     },
     "domutils": {
@@ -1775,8 +1770,8 @@
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
       "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
       "requires": {
-        "dom-serializer": "0.1.0",
-        "domelementtype": "1.3.0"
+        "dom-serializer": "0",
+        "domelementtype": "1"
       }
     },
     "draft-js": {
@@ -1784,9 +1779,9 @@
       "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0-alpha.tgz",
       "integrity": "sha1-MtshCPkn6bhEbaH3nkR1wrf4aK4=",
       "requires": {
-        "fbjs": "0.8.16",
-        "immutable": "3.7.6",
-        "object-assign": "4.1.1"
+        "fbjs": "^0.8.12",
+        "immutable": "~3.7.4",
+        "object-assign": "^4.1.0"
       }
     },
     "draft-js-export-html": {
@@ -1794,7 +1789,7 @@
       "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz",
       "integrity": "sha1-zIDwVExD0Kf+28U8DLCRToCQ92k=",
       "requires": {
-        "draft-js-utils": "1.2.0"
+        "draft-js-utils": ">=0.2.0"
       }
     },
     "draft-js-export-markdown": {
@@ -1802,7 +1797,7 @@
       "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz",
       "integrity": "sha1-hjkOA86vHTR/xhaGerf1Net2v0I=",
       "requires": {
-        "draft-js-utils": "1.2.0"
+        "draft-js-utils": ">=0.2.0"
       }
     },
     "draft-js-utils": {
@@ -1816,7 +1811,7 @@
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
       "optional": true,
       "requires": {
-        "jsbn": "0.1.1"
+        "jsbn": "~0.1.0"
       }
     },
     "ee-first": {
@@ -1847,7 +1842,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
-        "iconv-lite": "0.4.19"
+        "iconv-lite": "~0.4.13"
       }
     },
     "engine.io": {
@@ -1944,9 +1939,9 @@
       "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "memory-fs": "0.2.0",
-        "tapable": "0.1.10"
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.2.0",
+        "tapable": "^0.1.8"
       },
       "dependencies": {
         "memory-fs": {
@@ -1974,7 +1969,7 @@
       "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
       "dev": true,
       "requires": {
-        "prr": "0.0.0"
+        "prr": "~0.0.0"
       }
     },
     "es-abstract": {
@@ -1983,11 +1978,11 @@
       "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "1.1.1",
-        "function-bind": "1.1.1",
-        "has": "1.0.1",
-        "is-callable": "1.1.3",
-        "is-regex": "1.0.4"
+        "es-to-primitive": "^1.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
       }
     },
     "es-to-primitive": {
@@ -1996,9 +1991,9 @@
       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "is-callable": "1.1.3",
-        "is-date-object": "1.0.1",
-        "is-symbol": "1.0.1"
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
       }
     },
     "es5-ext": {
@@ -2007,8 +2002,8 @@
       "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
       "dev": true,
       "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1"
+        "es6-iterator": "~2.0.1",
+        "es6-symbol": "~3.1.1"
       }
     },
     "es6-iterator": {
@@ -2017,9 +2012,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35",
-        "es6-symbol": "3.1.1"
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
       }
     },
     "es6-map": {
@@ -2028,12 +2023,12 @@
       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35",
-        "es6-iterator": "2.0.3",
-        "es6-set": "0.1.5",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
       }
     },
     "es6-set": {
@@ -2042,11 +2037,11 @@
       "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35",
-        "es6-iterator": "2.0.3",
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
         "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
+        "event-emitter": "~0.3.5"
       }
     },
     "es6-symbol": {
@@ -2055,8 +2050,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "es6-weak-map": {
@@ -2065,10 +2060,10 @@
       "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35",
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1"
+        "d": "1",
+        "es5-ext": "^0.10.14",
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
       }
     },
     "escape-html": {
@@ -2089,10 +2084,10 @@
       "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
       "dev": true,
       "requires": {
-        "es6-map": "0.1.5",
-        "es6-weak-map": "2.0.2",
-        "esrecurse": "4.2.0",
-        "estraverse": "4.2.0"
+        "es6-map": "^0.1.3",
+        "es6-weak-map": "^2.0.1",
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
       }
     },
     "eslint": {
@@ -2101,41 +2096,41 @@
       "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "chalk": "1.1.3",
-        "concat-stream": "1.6.0",
-        "debug": "2.6.9",
-        "doctrine": "2.0.0",
-        "escope": "3.6.0",
-        "espree": "3.5.1",
-        "esquery": "1.0.0",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "file-entry-cache": "2.0.0",
-        "glob": "7.1.2",
-        "globals": "9.18.0",
-        "ignore": "3.3.5",
-        "imurmurhash": "0.1.4",
-        "inquirer": "0.12.0",
-        "is-my-json-valid": "2.16.1",
-        "is-resolvable": "1.0.0",
-        "js-yaml": "3.10.0",
-        "json-stable-stringify": "1.0.1",
-        "levn": "0.3.0",
-        "lodash": "4.17.4",
-        "mkdirp": "0.5.1",
-        "natural-compare": "1.4.0",
-        "optionator": "0.8.2",
-        "path-is-inside": "1.0.2",
-        "pluralize": "1.2.1",
-        "progress": "1.1.8",
-        "require-uncached": "1.0.3",
-        "shelljs": "0.7.8",
-        "strip-bom": "3.0.0",
-        "strip-json-comments": "2.0.1",
-        "table": "3.8.3",
-        "text-table": "0.2.0",
-        "user-home": "2.0.0"
+        "babel-code-frame": "^6.16.0",
+        "chalk": "^1.1.3",
+        "concat-stream": "^1.5.2",
+        "debug": "^2.1.1",
+        "doctrine": "^2.0.0",
+        "escope": "^3.6.0",
+        "espree": "^3.4.0",
+        "esquery": "^1.0.0",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "glob": "^7.0.3",
+        "globals": "^9.14.0",
+        "ignore": "^3.2.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^0.12.0",
+        "is-my-json-valid": "^2.10.0",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.5.1",
+        "json-stable-stringify": "^1.0.0",
+        "levn": "^0.3.0",
+        "lodash": "^4.0.0",
+        "mkdirp": "^0.5.0",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.1",
+        "pluralize": "^1.2.1",
+        "progress": "^1.1.8",
+        "require-uncached": "^1.0.2",
+        "shelljs": "^0.7.5",
+        "strip-bom": "^3.0.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "^3.7.8",
+        "text-table": "~0.2.0",
+        "user-home": "^2.0.0"
       },
       "dependencies": {
         "glob": {
@@ -2144,12 +2139,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "user-home": {
@@ -2158,7 +2153,7 @@
           "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
           "dev": true,
           "requires": {
-            "os-homedir": "1.0.2"
+            "os-homedir": "^1.0.0"
           }
         }
       }
@@ -2181,7 +2176,7 @@
       "integrity": "sha512-RiQv+7Z9QDJuzt+NO8sYgkLGT+h+WeCrxP7y8lI7wpU41x3x/2o3PGtHk9ck8QnA9/mlbNcy/hG0eKvmd7npaA==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.4"
+        "lodash": "^4.15.0"
       }
     },
     "eslint-plugin-react": {
@@ -2190,10 +2185,10 @@
       "integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==",
       "dev": true,
       "requires": {
-        "doctrine": "2.1.0",
-        "has": "1.0.1",
-        "jsx-ast-utils": "2.0.1",
-        "prop-types": "15.6.0"
+        "doctrine": "^2.0.2",
+        "has": "^1.0.1",
+        "jsx-ast-utils": "^2.0.1",
+        "prop-types": "^15.6.0"
       },
       "dependencies": {
         "doctrine": {
@@ -2202,7 +2197,7 @@
           "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
           "requires": {
-            "esutils": "2.0.2"
+            "esutils": "^2.0.2"
           }
         }
       }
@@ -2213,8 +2208,8 @@
       "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
       "dev": true,
       "requires": {
-        "acorn": "5.1.2",
-        "acorn-jsx": "3.0.1"
+        "acorn": "^5.1.1",
+        "acorn-jsx": "^3.0.0"
       }
     },
     "esprima": {
@@ -2229,7 +2224,7 @@
       "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0"
+        "estraverse": "^4.0.0"
       }
     },
     "esrecurse": {
@@ -2238,8 +2233,8 @@
       "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0",
-        "object-assign": "4.1.1"
+        "estraverse": "^4.1.0",
+        "object-assign": "^4.0.1"
       }
     },
     "estraverse": {
@@ -2266,8 +2261,8 @@
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "eventemitter3": {
@@ -2302,9 +2297,9 @@
       "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
       "dev": true,
       "requires": {
-        "array-slice": "0.2.3",
-        "array-unique": "0.2.1",
-        "braces": "0.1.5"
+        "array-slice": "^0.2.3",
+        "array-unique": "^0.2.1",
+        "braces": "^0.1.2"
       },
       "dependencies": {
         "braces": {
@@ -2313,7 +2308,7 @@
           "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
           "dev": true,
           "requires": {
-            "expand-range": "0.1.1"
+            "expand-range": "^0.1.0"
           }
         },
         "expand-range": {
@@ -2322,8 +2317,8 @@
           "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
           "dev": true,
           "requires": {
-            "is-number": "0.1.1",
-            "repeat-string": "0.2.2"
+            "is-number": "^0.1.1",
+            "repeat-string": "^0.2.2"
           }
         },
         "is-number": {
@@ -2346,7 +2341,7 @@
       "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
       "dev": true,
       "requires": {
-        "is-posix-bracket": "0.1.1"
+        "is-posix-bracket": "^0.1.0"
       }
     },
     "expand-range": {
@@ -2355,7 +2350,7 @@
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "dev": true,
       "requires": {
-        "fill-range": "2.2.3"
+        "fill-range": "^2.1.0"
       }
     },
     "expect": {
@@ -2364,13 +2359,13 @@
       "integrity": "sha1-1Fj+TFYAQDa64yMkFqP2Nh8E+WU=",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.2",
-        "has": "1.0.1",
-        "is-equal": "1.5.5",
-        "is-regex": "1.0.4",
-        "object-inspect": "1.3.0",
-        "object-keys": "1.0.11",
-        "tmatch": "2.0.1"
+        "define-properties": "~1.1.2",
+        "has": "^1.0.1",
+        "is-equal": "^1.5.1",
+        "is-regex": "^1.0.3",
+        "object-inspect": "^1.1.0",
+        "object-keys": "^1.0.9",
+        "tmatch": "^2.0.1"
       }
     },
     "extend": {
@@ -2384,7 +2379,7 @@
       "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
       "dev": true,
       "requires": {
-        "is-extglob": "1.0.0"
+        "is-extglob": "^1.0.0"
       }
     },
     "extsprintf": {
@@ -2393,9 +2388,14 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -2408,7 +2408,7 @@
       "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz",
       "integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=",
       "requires": {
-        "fbjs": "0.8.16"
+        "fbjs": "^0.8.4"
       }
     },
     "fbjs": {
@@ -2416,13 +2416,13 @@
       "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
       "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
       "requires": {
-        "core-js": "1.2.7",
-        "isomorphic-fetch": "2.2.1",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1",
-        "promise": "7.3.1",
-        "setimmediate": "1.0.5",
-        "ua-parser-js": "0.7.17"
+        "core-js": "^1.0.0",
+        "isomorphic-fetch": "^2.1.1",
+        "loose-envify": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "promise": "^7.1.1",
+        "setimmediate": "^1.0.5",
+        "ua-parser-js": "^0.7.9"
       },
       "dependencies": {
         "core-js": {
@@ -2438,8 +2438,8 @@
       "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "1.0.5",
-        "object-assign": "4.1.1"
+        "escape-string-regexp": "^1.0.5",
+        "object-assign": "^4.1.0"
       }
     },
     "file-entry-cache": {
@@ -2448,8 +2448,8 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "1.3.0",
-        "object-assign": "4.1.1"
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
       }
     },
     "file-saver": {
@@ -2474,11 +2474,11 @@
       "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
       "dev": true,
       "requires": {
-        "is-number": "2.1.0",
-        "isobject": "2.1.0",
-        "randomatic": "1.1.7",
-        "repeat-element": "1.1.2",
-        "repeat-string": "1.6.1"
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^1.1.3",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
       }
     },
     "finalhandler": {
@@ -2488,12 +2488,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
+        "encodeurl": "~1.0.1",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.3.1",
+        "unpipe": "~1.0.0"
       }
     },
     "find-cache-dir": {
@@ -2502,9 +2502,9 @@
       "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
       "dev": true,
       "requires": {
-        "commondir": "1.0.1",
-        "mkdirp": "0.5.1",
-        "pkg-dir": "1.0.0"
+        "commondir": "^1.0.1",
+        "mkdirp": "^0.5.1",
+        "pkg-dir": "^1.0.0"
       }
     },
     "find-up": {
@@ -2513,8 +2513,8 @@
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
       "dev": true,
       "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "flat-cache": {
@@ -2523,10 +2523,10 @@
       "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
       "dev": true,
       "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
+        "circular-json": "^0.3.1",
+        "del": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "write": "^0.2.1"
       }
     },
     "flow-parser": {
@@ -2540,9 +2540,9 @@
       "resolved": "https://registry.npmjs.org/flux/-/flux-2.1.1.tgz",
       "integrity": "sha1-LGrGUtQzdIiWhInGWG86/yajjqQ=",
       "requires": {
-        "fbemitter": "2.1.1",
+        "fbemitter": "^2.0.0",
         "fbjs": "0.1.0-alpha.7",
-        "immutable": "3.7.6"
+        "immutable": "^3.7.4"
       },
       "dependencies": {
         "core-js": {
@@ -2555,9 +2555,9 @@
           "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.1.0-alpha.7.tgz",
           "integrity": "sha1-rUMIuPIy+zxzYDNJ6nJdHpw5Mjw=",
           "requires": {
-            "core-js": "1.2.7",
-            "promise": "7.3.1",
-            "whatwg-fetch": "0.9.0"
+            "core-js": "^1.0.0",
+            "promise": "^7.0.3",
+            "whatwg-fetch": "^0.9.0"
           }
         },
         "whatwg-fetch": {
@@ -2572,7 +2572,7 @@
       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-2.4.3.tgz",
       "integrity": "sha512-sT5Ip9nyAIxWq8Apt1Fdv6yTci5GotaOtO5Ro1/+F3PizttNBcCYz8j/Qze54PPFK73KUbOqh++HUCiyNPqvhA==",
       "requires": {
-        "tabbable": "1.1.2"
+        "tabbable": "^1.0.3"
       }
     },
     "focus-trap-react": {
@@ -2580,7 +2580,7 @@
       "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-3.1.2.tgz",
       "integrity": "sha512-MoQmONoy9gRPyrC5DGezkcOMGgx7MtIOAQDHe098UtL2sA2vmucJwEmQisb+8LRXNYFHxuw5zJ1oLFeKu4Mteg==",
       "requires": {
-        "focus-trap": "2.4.3"
+        "focus-trap": "^2.0.1"
       }
     },
     "for-in": {
@@ -2595,7 +2595,7 @@
       "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2"
+        "for-in": "^1.0.1"
       }
     },
     "foreach": {
@@ -2616,22 +2616,13 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
-    "formatio": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
-      "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
-      "dev": true,
-      "requires": {
-        "samsam": "1.1.2"
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
       }
     },
     "fs-access": {
@@ -2640,7 +2631,7 @@
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
-        "null-check": "1.0.0"
+        "null-check": "^1.0.0"
       }
     },
     "fs-readdir-recursive": {
@@ -2662,8 +2653,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "2.7.0",
-        "node-pre-gyp": "0.6.36"
+        "nan": "^2.3.0",
+        "node-pre-gyp": "^0.6.36"
       },
       "dependencies": {
         "abbrev": {
@@ -2699,8 +2690,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
           }
         },
         "asn1": {
@@ -2744,7 +2735,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "tweetnacl": "0.14.5"
+            "tweetnacl": "^0.14.3"
           }
         },
         "block-stream": {
@@ -2752,15 +2743,16 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "inherits": "2.0.3"
+            "inherits": "~2.0.0"
           }
         },
         "boom": {
           "version": "2.10.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "hoek": "2.16.3"
+            "hoek": "2.x.x"
           }
         },
         "brace-expansion": {
@@ -2768,7 +2760,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "balanced-match": "0.4.2",
+            "balanced-match": "^0.4.1",
             "concat-map": "0.0.1"
           }
         },
@@ -2799,7 +2791,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "delayed-stream": "1.0.0"
+            "delayed-stream": "~1.0.0"
           }
         },
         "concat-map": {
@@ -2823,7 +2815,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "boom": "2.10.1"
+            "boom": "2.x.x"
           }
         },
         "dashdash": {
@@ -2832,7 +2824,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "1.0.0"
+            "assert-plus": "^1.0.0"
           },
           "dependencies": {
             "assert-plus": {
@@ -2875,7 +2867,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsbn": "0.1.1"
+            "jsbn": "~0.1.0"
           }
         },
         "extend": {
@@ -2916,10 +2908,10 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
+            "graceful-fs": "^4.1.2",
+            "inherits": "~2.0.0",
+            "mkdirp": ">=0.5 0",
+            "rimraf": "2"
           }
         },
         "fstream-ignore": {
@@ -2928,9 +2920,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
+            "fstream": "^1.0.0",
+            "inherits": "2",
+            "minimatch": "^3.0.0"
           }
         },
         "gauge": {
@@ -2939,14 +2931,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "1.1.1",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
           }
         },
         "getpass": {
@@ -2955,7 +2947,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "1.0.0"
+            "assert-plus": "^1.0.0"
           },
           "dependencies": {
             "assert-plus": {
@@ -2971,12 +2963,12 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "graceful-fs": {
@@ -3021,7 +3013,8 @@
         "hoek": {
           "version": "2.16.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "http-signature": {
           "version": "1.1.1",
@@ -3029,9 +3022,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
+            "assert-plus": "^0.2.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
           }
         },
         "inflight": {
@@ -3039,8 +3032,8 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "once": "^1.3.0",
+            "wrappy": "1"
           }
         },
         "inherits": {
@@ -3085,7 +3078,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsbn": "0.1.1"
+            "jsbn": "~0.1.0"
           }
         },
         "jsbn": {
@@ -3106,7 +3099,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsonify": "0.0.0"
+            "jsonify": "~0.0.0"
           }
         },
         "json-stringify-safe": {
@@ -3187,15 +3180,15 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.0"
+            "mkdirp": "^0.5.1",
+            "nopt": "^4.0.1",
+            "npmlog": "^4.0.2",
+            "rc": "^1.1.7",
+            "request": "^2.81.0",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^2.2.1",
+            "tar-pack": "^3.4.0"
           }
         },
         "nopt": {
@@ -3214,10 +3207,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
           }
         },
         "number-is-nan": {
@@ -3242,7 +3235,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "wrappy": "1.0.2"
+            "wrappy": "1"
           }
         },
         "os-homedir": {
@@ -3320,13 +3313,13 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "buffer-shims": "1.0.0",
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
+            "buffer-shims": "~1.0.0",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~1.0.6",
+            "string_decoder": "~1.0.0",
+            "util-deprecate": "~1.0.1"
           }
         },
         "request": {
@@ -3335,28 +3328,28 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
+            "aws-sign2": "~0.6.0",
+            "aws4": "^1.2.1",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.0",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.1.1",
+            "har-validator": "~4.2.1",
+            "hawk": "~3.1.3",
+            "http-signature": "~1.1.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.7",
+            "oauth-sign": "~0.8.1",
+            "performance-now": "^0.2.0",
+            "qs": "~6.4.0",
+            "safe-buffer": "^5.0.1",
+            "stringstream": "~0.0.4",
+            "tough-cookie": "~2.3.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.0.0"
           }
         },
         "rimraf": {
@@ -3364,7 +3357,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "glob": "7.1.2"
+            "glob": "^7.0.5"
           }
         },
         "safe-buffer": {
@@ -3405,15 +3398,15 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
+            "asn1": "~0.2.3",
+            "assert-plus": "^1.0.0",
+            "bcrypt-pbkdf": "^1.0.0",
+            "dashdash": "^1.12.0",
+            "ecc-jsbn": "~0.1.1",
+            "getpass": "^0.1.1",
+            "jodid25519": "^1.0.0",
+            "jsbn": "~0.1.0",
+            "tweetnacl": "~0.14.0"
           },
           "dependencies": {
             "assert-plus": {
@@ -3467,9 +3460,9 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
+            "block-stream": "*",
+            "fstream": "^1.0.2",
+            "inherits": "2"
           }
         },
         "tar-pack": {
@@ -3478,14 +3471,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.2.9",
-            "rimraf": "2.6.1",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
+            "debug": "^2.2.0",
+            "fstream": "^1.0.10",
+            "fstream-ignore": "^1.0.5",
+            "once": "^1.3.3",
+            "readable-stream": "^2.1.4",
+            "rimraf": "^2.5.1",
+            "tar": "^2.2.1",
+            "uid-number": "^0.0.6"
           }
         },
         "tough-cookie": {
@@ -3544,7 +3537,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2"
           }
         },
         "wrappy": {
@@ -3566,7 +3559,8 @@
       "integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk="
     },
     "gemini-scrollbar": {
-      "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
+      "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
+      "from": "gemini-scrollbar@github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
     },
     "generate-function": {
       "version": "2.0.0",
@@ -3580,7 +3574,7 @@
       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
       "dev": true,
       "requires": {
-        "is-property": "1.0.2"
+        "is-property": "^1.0.0"
       }
     },
     "getpass": {
@@ -3588,7 +3582,7 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
     "gfm.css": {
@@ -3601,11 +3595,11 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
       "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
       "requires": {
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
     "glob-base": {
@@ -3614,8 +3608,8 @@
       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
       "dev": true,
       "requires": {
-        "glob-parent": "2.0.0",
-        "is-glob": "2.0.1"
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
       }
     },
     "glob-parent": {
@@ -3624,7 +3618,7 @@
       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
       "dev": true,
       "requires": {
-        "is-glob": "2.0.1"
+        "is-glob": "^2.0.0"
       }
     },
     "globals": {
@@ -3639,12 +3633,12 @@
       "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
       "dev": true,
       "requires": {
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       },
       "dependencies": {
         "glob": {
@@ -3653,12 +3647,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -3679,8 +3673,8 @@
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "5.2.3",
-        "har-schema": "2.0.0"
+        "ajv": "^5.1.0",
+        "har-schema": "^2.0.0"
       }
     },
     "has": {
@@ -3689,7 +3683,7 @@
       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
       "dev": true,
       "requires": {
-        "function-bind": "1.1.1"
+        "function-bind": "^1.0.2"
       }
     },
     "has-ansi": {
@@ -3698,7 +3692,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "has-binary": {
@@ -3730,16 +3724,6 @@
       "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
       "dev": true
     },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-      "requires": {
-        "boom": "4.3.1",
-        "cryptiles": "3.1.2",
-        "sntp": "2.0.2"
-      }
-    },
     "he": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
@@ -3762,8 +3746,8 @@
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
       }
     },
     "htmlparser2": {
@@ -3771,12 +3755,12 @@
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
       "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
       "requires": {
-        "domelementtype": "1.3.0",
-        "domhandler": "2.4.1",
-        "domutils": "1.6.2",
-        "entities": "1.1.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "domelementtype": "^1.3.0",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.2"
       }
     },
     "http-errors": {
@@ -3788,7 +3772,7 @@
         "depd": "1.1.1",
         "inherits": "2.0.3",
         "setprototypeof": "1.0.3",
-        "statuses": "1.3.1"
+        "statuses": ">= 1.3.1 < 2"
       }
     },
     "http-proxy": {
@@ -3797,8 +3781,8 @@
       "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
       "dev": true,
       "requires": {
-        "eventemitter3": "1.2.0",
-        "requires-port": "1.0.0"
+        "eventemitter3": "1.x.x",
+        "requires-port": "1.x.x"
       }
     },
     "http-signature": {
@@ -3806,9 +3790,9 @@
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
       }
     },
     "https-browserify": {
@@ -3855,8 +3839,8 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
@@ -3870,19 +3854,19 @@
       "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
       "dev": true,
       "requires": {
-        "ansi-escapes": "1.4.0",
-        "ansi-regex": "2.1.1",
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "cli-width": "2.2.0",
-        "figures": "1.7.0",
-        "lodash": "4.17.4",
-        "readline2": "1.0.1",
-        "run-async": "0.1.0",
-        "rx-lite": "3.1.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "through": "2.3.8"
+        "ansi-escapes": "^1.1.0",
+        "ansi-regex": "^2.0.0",
+        "chalk": "^1.0.0",
+        "cli-cursor": "^1.0.1",
+        "cli-width": "^2.0.0",
+        "figures": "^1.3.5",
+        "lodash": "^4.3.0",
+        "readline2": "^1.0.1",
+        "run-async": "^0.1.0",
+        "rx-lite": "^3.1.2",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.0",
+        "through": "^2.3.6"
       }
     },
     "interpret": {
@@ -3896,7 +3880,7 @@
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
       "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
       "requires": {
-        "loose-envify": "1.3.1"
+        "loose-envify": "^1.0.0"
       }
     },
     "is-arrow-function": {
@@ -3905,7 +3889,7 @@
       "integrity": "sha1-Kb4sLY2UUIUri7r7Y1unuNjofsI=",
       "dev": true,
       "requires": {
-        "is-callable": "1.1.3"
+        "is-callable": "^1.0.4"
       }
     },
     "is-binary-path": {
@@ -3914,7 +3898,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "1.10.0"
+        "binary-extensions": "^1.0.0"
       }
     },
     "is-boolean-object": {
@@ -3953,17 +3937,17 @@
       "integrity": "sha1-XoXxlX4FKIMkf+s4aWWju6Ffuz0=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
-        "is-arrow-function": "2.0.3",
-        "is-boolean-object": "1.0.0",
-        "is-callable": "1.1.3",
-        "is-date-object": "1.0.1",
-        "is-generator-function": "1.0.6",
-        "is-number-object": "1.0.3",
-        "is-regex": "1.0.4",
-        "is-string": "1.0.4",
-        "is-symbol": "1.0.1",
-        "object.entries": "1.0.4"
+        "has": "^1.0.1",
+        "is-arrow-function": "^2.0.3",
+        "is-boolean-object": "^1.0.0",
+        "is-callable": "^1.1.3",
+        "is-date-object": "^1.0.1",
+        "is-generator-function": "^1.0.6",
+        "is-number-object": "^1.0.3",
+        "is-regex": "^1.0.3",
+        "is-string": "^1.0.4",
+        "is-symbol": "^1.0.1",
+        "object.entries": "^1.0.4"
       }
     },
     "is-equal-shallow": {
@@ -3972,7 +3956,7 @@
       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
       "dev": true,
       "requires": {
-        "is-primitive": "2.0.0"
+        "is-primitive": "^2.0.0"
       }
     },
     "is-extendable": {
@@ -3993,7 +3977,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-fullwidth-code-point": {
@@ -4002,7 +3986,7 @@
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-generator-function": {
@@ -4017,7 +4001,7 @@
       "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
       "dev": true,
       "requires": {
-        "is-extglob": "1.0.0"
+        "is-extglob": "^1.0.0"
       }
     },
     "is-my-json-valid": {
@@ -4026,10 +4010,10 @@
       "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
       "dev": true,
       "requires": {
-        "generate-function": "2.0.0",
-        "generate-object-property": "1.2.0",
-        "jsonpointer": "4.0.1",
-        "xtend": "4.0.1"
+        "generate-function": "^2.0.0",
+        "generate-object-property": "^1.1.0",
+        "jsonpointer": "^4.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "is-number": {
@@ -4038,7 +4022,7 @@
       "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       }
     },
     "is-number-object": {
@@ -4059,7 +4043,7 @@
       "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
       "dev": true,
       "requires": {
-        "is-path-inside": "1.0.0"
+        "is-path-inside": "^1.0.0"
       }
     },
     "is-path-inside": {
@@ -4068,7 +4052,7 @@
       "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
       "dev": true,
       "requires": {
-        "path-is-inside": "1.0.2"
+        "path-is-inside": "^1.0.1"
       }
     },
     "is-posix-bracket": {
@@ -4095,7 +4079,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "1.0.1"
+        "has": "^1.0.1"
       }
     },
     "is-resolvable": {
@@ -4104,7 +4088,7 @@
       "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
       "dev": true,
       "requires": {
-        "tryit": "1.0.3"
+        "tryit": "^1.0.1"
       }
     },
     "is-stream": {
@@ -4160,8 +4144,8 @@
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
       "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
       "requires": {
-        "node-fetch": "1.7.3",
-        "whatwg-fetch": "1.1.1"
+        "node-fetch": "^1.0.1",
+        "whatwg-fetch": ">=0.10.0"
       }
     },
     "isstream": {
@@ -4185,8 +4169,8 @@
       "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
       "dev": true,
       "requires": {
-        "argparse": "1.0.9",
-        "esprima": "4.0.0"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       }
     },
     "jsbn": {
@@ -4221,8 +4205,9 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
       "requires": {
-        "jsonify": "0.0.0"
+        "jsonify": "~0.0.0"
       }
     },
     "json-stringify-safe": {
@@ -4245,7 +4230,8 @@
     "jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
     },
     "jsonpointer": {
       "version": "4.0.1",
@@ -4270,42 +4256,48 @@
       "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
       "dev": true,
       "requires": {
-        "array-includes": "3.0.3"
+        "array-includes": "^3.0.3"
       }
     },
+    "just-extend": {
+      "version": "1.1.27",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz",
+      "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==",
+      "dev": true
+    },
     "karma": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
       "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1",
-        "body-parser": "1.18.2",
-        "chokidar": "1.7.0",
-        "colors": "1.1.2",
-        "combine-lists": "1.0.1",
-        "connect": "3.6.5",
-        "core-js": "2.5.1",
-        "di": "0.0.1",
-        "dom-serialize": "2.2.1",
-        "expand-braces": "0.1.2",
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "http-proxy": "1.16.2",
-        "isbinaryfile": "3.0.2",
-        "lodash": "3.10.1",
-        "log4js": "0.6.38",
-        "mime": "1.4.1",
-        "minimatch": "3.0.4",
-        "optimist": "0.6.1",
-        "qjobs": "1.1.5",
-        "range-parser": "1.2.0",
-        "rimraf": "2.6.2",
-        "safe-buffer": "5.1.1",
+        "bluebird": "^3.3.0",
+        "body-parser": "^1.16.1",
+        "chokidar": "^1.4.1",
+        "colors": "^1.1.0",
+        "combine-lists": "^1.0.0",
+        "connect": "^3.6.0",
+        "core-js": "^2.2.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.0",
+        "expand-braces": "^0.1.1",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "http-proxy": "^1.13.0",
+        "isbinaryfile": "^3.0.0",
+        "lodash": "^3.8.0",
+        "log4js": "^0.6.31",
+        "mime": "^1.3.4",
+        "minimatch": "^3.0.2",
+        "optimist": "^0.6.1",
+        "qjobs": "^1.1.4",
+        "range-parser": "^1.2.0",
+        "rimraf": "^2.6.0",
+        "safe-buffer": "^5.0.1",
         "socket.io": "1.7.3",
-        "source-map": "0.5.7",
+        "source-map": "^0.5.3",
         "tmp": "0.0.31",
-        "useragent": "2.2.1"
+        "useragent": "^2.1.12"
       },
       "dependencies": {
         "glob": {
@@ -4314,12 +4306,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "lodash": {
@@ -4336,8 +4328,8 @@
       "integrity": "sha1-TG1wDRY6nTTGGO/YeRi+SeekqMk=",
       "dev": true,
       "requires": {
-        "fs-access": "1.0.1",
-        "which": "1.3.0"
+        "fs-access": "^1.0.0",
+        "which": "^1.2.1"
       }
     },
     "karma-cli": {
@@ -4346,7 +4338,7 @@
       "integrity": "sha1-ys6oQ3Hs4Zh2JlyPoQLru5/uSow=",
       "dev": true,
       "requires": {
-        "resolve": "1.4.0"
+        "resolve": "^1.1.6"
       }
     },
     "karma-junit-reporter": {
@@ -4355,7 +4347,7 @@
       "integrity": "sha1-SSojZyj+TJKqz0GfzQEQpDJ+nX8=",
       "dev": true,
       "requires": {
-        "path-is-absolute": "1.0.1",
+        "path-is-absolute": "^1.0.0",
         "xmlbuilder": "3.1.0"
       }
     },
@@ -4377,7 +4369,7 @@
       "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11"
+        "graceful-fs": "^4.1.2"
       }
     },
     "karma-spec-reporter": {
@@ -4386,7 +4378,7 @@
       "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
       "dev": true,
       "requires": {
-        "colors": "1.1.2"
+        "colors": "^1.1.2"
       }
     },
     "karma-summary-reporter": {
@@ -4395,7 +4387,7 @@
       "integrity": "sha1-nHQKJLYL+RNes59acylsTM0Q2Zs=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3"
+        "chalk": "^1.1.3"
       }
     },
     "karma-webpack": {
@@ -4404,11 +4396,11 @@
       "integrity": "sha1-OdX9Lt7qPMPvW0BZibN9Ww5qO04=",
       "dev": true,
       "requires": {
-        "async": "0.9.2",
-        "loader-utils": "0.2.17",
-        "lodash": "3.10.1",
-        "source-map": "0.1.43",
-        "webpack-dev-middleware": "1.12.0"
+        "async": "~0.9.0",
+        "loader-utils": "^0.2.5",
+        "lodash": "^3.8.0",
+        "source-map": "^0.1.41",
+        "webpack-dev-middleware": "^1.0.11"
       },
       "dependencies": {
         "lodash": {
@@ -4423,7 +4415,7 @@
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -4434,7 +4426,7 @@
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "requires": {
-        "is-buffer": "1.1.5"
+        "is-buffer": "^1.1.5"
       }
     },
     "lazy-cache": {
@@ -4449,8 +4441,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       }
     },
     "linkifyjs": {
@@ -4458,9 +4450,9 @@
       "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.5.tgz",
       "integrity": "sha512-8FqxPXQDLjI2nNHlM7eGewxE6DHvMbtiW0AiXzm0s4RkTwVZYRDTeVXkiRxLHTd4CuRBQY/JPtvtqJWdS7gHyA==",
       "requires": {
-        "jquery": "3.2.1",
-        "react": "15.6.2",
-        "react-dom": "15.6.2"
+        "jquery": ">=1.9.0",
+        "react": ">=0.14.0",
+        "react-dom": ">=0.14.0"
       }
     },
     "loader-utils": {
@@ -4469,10 +4461,10 @@
       "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
       "dev": true,
       "requires": {
-        "big.js": "3.2.0",
-        "emojis-list": "2.1.0",
-        "json5": "0.5.1",
-        "object-assign": "4.1.1"
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0",
+        "object-assign": "^4.0.1"
       }
     },
     "lodash": {
@@ -4491,6 +4483,12 @@
       "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
       "dev": true
     },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
+    },
     "lodash.pickby": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
@@ -4503,8 +4501,8 @@
       "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
       "dev": true,
       "requires": {
-        "readable-stream": "1.0.34",
-        "semver": "4.3.6"
+        "readable-stream": "~1.0.2",
+        "semver": "~4.3.3"
       },
       "dependencies": {
         "isarray": {
@@ -4519,10 +4517,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         },
         "string_decoder": {
@@ -4534,10 +4532,9 @@
       }
     },
     "lolex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
-      "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
-      "dev": true
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
+      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
     },
     "longest": {
       "version": "1.0.1",
@@ -4550,7 +4547,7 @@
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
       "requires": {
-        "js-tokens": "3.0.2"
+        "js-tokens": "^3.0.0"
       }
     },
     "lru-cache": {
@@ -4560,16 +4557,16 @@
       "dev": true
     },
     "matrix-js-sdk": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.1.tgz",
-      "integrity": "sha512-BLo+Okn2o///TyWBKtjFXvhlD32vGfr10eTE51hHx/jwaXO82VyGMzMi+IDPS4SDYUbvXI7PpamECeh9TXnV2w==",
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.2.tgz",
+      "integrity": "sha512-7o9a+4wWmxoW4cfdGVLGjZgTFLpWf/I0UqyicIzdV73qotYIO/q6k1bLf1+G0hgwZ/umwke4CB7GemxvvvxMcA==",
       "requires": {
-        "another-json": "0.2.0",
-        "babel-runtime": "6.26.0",
-        "bluebird": "3.5.1",
-        "browser-request": "0.3.3",
-        "content-type": "1.0.4",
-        "request": "2.83.0"
+        "another-json": "^0.2.0",
+        "babel-runtime": "^6.26.0",
+        "bluebird": "^3.5.0",
+        "browser-request": "^0.3.3",
+        "content-type": "^1.0.2",
+        "request": "^2.53.0"
       }
     },
     "matrix-mock-request": {
@@ -4578,8 +4575,8 @@
       "integrity": "sha1-2aWrqNPYJG6I/3YyWYuZwUE/QjI=",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1",
-        "expect": "1.20.2"
+        "bluebird": "^3.5.0",
+        "expect": "^1.20.2"
       }
     },
     "matrix-react-test-utils": {
@@ -4588,8 +4585,8 @@
       "integrity": "sha1-tUiETQ6+M46hucjxZHTDDRfDvfQ=",
       "dev": true,
       "requires": {
-        "react": "15.6.2",
-        "react-dom": "15.6.2"
+        "react": "^15.6.1",
+        "react-dom": "^15.6.1"
       }
     },
     "mdurl": {
@@ -4614,8 +4611,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "0.1.4",
-        "readable-stream": "2.3.3"
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
       }
     },
     "micromatch": {
@@ -4624,19 +4621,19 @@
       "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
       "dev": true,
       "requires": {
-        "arr-diff": "2.0.0",
-        "array-unique": "0.2.1",
-        "braces": "1.8.5",
-        "expand-brackets": "0.1.5",
-        "extglob": "0.3.2",
-        "filename-regex": "2.0.1",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1",
-        "kind-of": "3.2.2",
-        "normalize-path": "2.1.1",
-        "object.omit": "2.0.1",
-        "parse-glob": "3.0.4",
-        "regex-cache": "0.4.4"
+        "arr-diff": "^2.0.0",
+        "array-unique": "^0.2.1",
+        "braces": "^1.8.2",
+        "expand-brackets": "^0.1.4",
+        "extglob": "^0.3.1",
+        "filename-regex": "^2.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "normalize-path": "^2.0.1",
+        "object.omit": "^2.0.0",
+        "parse-glob": "^3.0.4",
+        "regex-cache": "^0.4.2"
       }
     },
     "mime": {
@@ -4655,7 +4652,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "requires": {
-        "mime-db": "1.30.0"
+        "mime-db": "~1.30.0"
       }
     },
     "minimatch": {
@@ -4663,7 +4660,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "requires": {
-        "brace-expansion": "1.1.8"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
@@ -4728,12 +4725,12 @@
           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "growl": {
@@ -4754,7 +4751,7 @@
           "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "^2.0.0"
           }
         }
       }
@@ -4790,13 +4787,34 @@
       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
       "dev": true
     },
+    "nise": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz",
+      "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/formatio": "^2.0.0",
+        "just-extend": "^1.1.27",
+        "lolex": "^2.3.2",
+        "path-to-regexp": "^1.7.0",
+        "text-encoding": "^0.6.4"
+      },
+      "dependencies": {
+        "lolex": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz",
+          "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==",
+          "dev": true
+        }
+      }
+    },
     "node-fetch": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
       "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
       "requires": {
-        "encoding": "0.1.12",
-        "is-stream": "1.1.0"
+        "encoding": "^0.1.11",
+        "is-stream": "^1.0.1"
       }
     },
     "node-libs-browser": {
@@ -4805,28 +4823,28 @@
       "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
       "dev": true,
       "requires": {
-        "assert": "1.4.1",
-        "browserify-zlib": "0.1.4",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.1.4",
+        "buffer": "^4.9.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
         "crypto-browserify": "3.3.0",
-        "domain-browser": "1.1.7",
-        "events": "1.1.1",
+        "domain-browser": "^1.1.1",
+        "events": "^1.0.0",
         "https-browserify": "0.0.1",
-        "os-browserify": "0.2.1",
+        "os-browserify": "^0.2.0",
         "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.3",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.7.2",
-        "string_decoder": "0.10.31",
-        "timers-browserify": "2.0.4",
+        "process": "^0.11.0",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.0.5",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.3.1",
+        "string_decoder": "^0.10.25",
+        "timers-browserify": "^2.0.2",
         "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
@@ -4844,7 +4862,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "1.1.0"
+        "remove-trailing-separator": "^1.0.1"
       }
     },
     "null-check": {
@@ -4893,10 +4911,10 @@
       "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.2",
-        "es-abstract": "1.9.0",
-        "function-bind": "1.1.1",
-        "has": "1.0.1"
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.6.1",
+        "function-bind": "^1.1.0",
+        "has": "^1.0.1"
       }
     },
     "object.omit": {
@@ -4905,8 +4923,8 @@
       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
       "dev": true,
       "requires": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
       }
     },
     "on-finished": {
@@ -4923,7 +4941,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
-        "wrappy": "1.0.2"
+        "wrappy": "1"
       }
     },
     "onetime": {
@@ -4937,8 +4955,8 @@
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "requires": {
-        "minimist": "0.0.10",
-        "wordwrap": "0.0.3"
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
       },
       "dependencies": {
         "minimist": {
@@ -4954,12 +4972,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
       },
       "dependencies": {
         "wordwrap": {
@@ -5000,9 +5018,9 @@
       "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1"
+        "graceful-fs": "^4.1.4",
+        "mkdirp": "^0.5.1",
+        "object-assign": "^4.1.0"
       }
     },
     "pako": {
@@ -5022,10 +5040,10 @@
       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
       "dev": true,
       "requires": {
-        "glob-base": "0.3.0",
-        "is-dotfile": "1.0.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
       }
     },
     "parsejson": {
@@ -5034,7 +5052,7 @@
       "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
       "dev": true,
       "requires": {
-        "better-assert": "1.0.2"
+        "better-assert": "~1.0.0"
       }
     },
     "parseqs": {
@@ -5043,7 +5061,7 @@
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "dev": true,
       "requires": {
-        "better-assert": "1.0.2"
+        "better-assert": "~1.0.0"
       }
     },
     "parseuri": {
@@ -5052,7 +5070,7 @@
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "dev": true,
       "requires": {
-        "better-assert": "1.0.2"
+        "better-assert": "~1.0.0"
       }
     },
     "parseurl": {
@@ -5073,7 +5091,7 @@
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
       "dev": true,
       "requires": {
-        "pinkie-promise": "2.0.1"
+        "pinkie-promise": "^2.0.0"
       }
     },
     "path-is-absolute": {
@@ -5093,6 +5111,23 @@
       "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
       "dev": true
     },
+    "path-to-regexp": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+      "dev": true,
+      "requires": {
+        "isarray": "0.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        }
+      }
+    },
     "pbkdf2-compat": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz",
@@ -5122,7 +5157,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^2.0.0"
       }
     },
     "pkg-dir": {
@@ -5131,7 +5166,7 @@
       "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
       "dev": true,
       "requires": {
-        "find-up": "1.1.2"
+        "find-up": "^1.0.0"
       }
     },
     "pluralize": {
@@ -5185,7 +5220,7 @@
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "requires": {
-        "asap": "2.0.6"
+        "asap": "~2.0.3"
       }
     },
     "prop-types": {
@@ -5193,9 +5228,9 @@
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
       "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
       "requires": {
-        "fbjs": "0.8.16",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1"
+        "fbjs": "^0.8.16",
+        "loose-envify": "^1.3.1",
+        "object-assign": "^4.1.1"
       }
     },
     "prr": {
@@ -5236,7 +5271,7 @@
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
       "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
       "requires": {
-        "performance-now": "2.1.0"
+        "performance-now": "^2.1.0"
       }
     },
     "raf-schd": {
@@ -5250,8 +5285,8 @@
       "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -5260,7 +5295,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "3.2.2"
+            "kind-of": "^3.0.2"
           },
           "dependencies": {
             "kind-of": {
@@ -5269,7 +5304,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "1.1.5"
+                "is-buffer": "^1.1.5"
               }
             }
           }
@@ -5280,7 +5315,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -5308,11 +5343,11 @@
       "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
       "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
       "requires": {
-        "create-react-class": "15.6.2",
-        "fbjs": "0.8.16",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1",
-        "prop-types": "15.6.0"
+        "create-react-class": "^15.6.0",
+        "fbjs": "^0.8.9",
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.0",
+        "prop-types": "^15.5.10"
       }
     },
     "react-addons-css-transition-group": {
@@ -5331,16 +5366,16 @@
       "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz",
       "integrity": "sha512-d73RMu4QOFCyjUELLWFyY/EuclnfqulI9pECx+2gIuJvV0ycf1uR88o+1x0RSB9ILD70inHMzCBKNkWVbbt+vA==",
       "requires": {
-        "babel-runtime": "6.26.0",
-        "invariant": "2.2.2",
-        "memoize-one": "3.1.1",
-        "prop-types": "15.6.0",
-        "raf-schd": "2.1.1",
-        "react-motion": "0.5.2",
-        "react-redux": "5.0.7",
-        "redux": "3.7.2",
-        "redux-thunk": "2.2.0",
-        "reselect": "3.0.1"
+        "babel-runtime": "^6.26.0",
+        "invariant": "^2.2.2",
+        "memoize-one": "^3.0.1",
+        "prop-types": "^15.6.0",
+        "raf-schd": "^2.1.0",
+        "react-motion": "^0.5.2",
+        "react-redux": "^5.0.6",
+        "redux": "^3.7.2",
+        "redux-thunk": "^2.2.0",
+        "reselect": "^3.0.1"
       }
     },
     "react-dom": {
@@ -5348,14 +5383,15 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
       "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
       "requires": {
-        "fbjs": "0.8.16",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1",
-        "prop-types": "15.6.0"
+        "fbjs": "^0.8.9",
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.0",
+        "prop-types": "^15.5.10"
       }
     },
     "react-gemini-scrollbar": {
       "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
+      "from": "react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
       "requires": {
         "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
       }
@@ -5365,9 +5401,9 @@
       "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
       "integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==",
       "requires": {
-        "performance-now": "0.2.0",
-        "prop-types": "15.6.0",
-        "raf": "3.4.0"
+        "performance-now": "^0.2.0",
+        "prop-types": "^15.5.8",
+        "raf": "^3.1.0"
       },
       "dependencies": {
         "performance-now": {
@@ -5382,12 +5418,12 @@
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
       "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
       "requires": {
-        "hoist-non-react-statics": "2.5.0",
-        "invariant": "2.2.2",
-        "lodash": "4.17.10",
-        "lodash-es": "4.17.10",
-        "loose-envify": "1.3.1",
-        "prop-types": "15.6.0"
+        "hoist-non-react-statics": "^2.5.0",
+        "invariant": "^2.0.0",
+        "lodash": "^4.17.5",
+        "lodash-es": "^4.17.5",
+        "loose-envify": "^1.1.0",
+        "prop-types": "^15.6.0"
       },
       "dependencies": {
         "lodash": {
@@ -5402,13 +5438,13 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
       "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
@@ -5417,10 +5453,10 @@
       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "readable-stream": "2.3.3",
-        "set-immediate-shim": "1.0.1"
+        "graceful-fs": "^4.1.2",
+        "minimatch": "^3.0.2",
+        "readable-stream": "^2.0.2",
+        "set-immediate-shim": "^1.0.1"
       }
     },
     "readline2": {
@@ -5429,8 +5465,8 @@
       "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
       "dev": true,
       "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
         "mute-stream": "0.0.5"
       }
     },
@@ -5440,7 +5476,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "1.4.0"
+        "resolve": "^1.1.6"
       }
     },
     "redux": {
@@ -5448,10 +5484,10 @@
       "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
       "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
       "requires": {
-        "lodash": "4.17.4",
-        "lodash-es": "4.17.10",
-        "loose-envify": "1.3.1",
-        "symbol-observable": "1.2.0"
+        "lodash": "^4.2.1",
+        "lodash-es": "^4.2.1",
+        "loose-envify": "^1.1.0",
+        "symbol-observable": "^1.0.3"
       }
     },
     "redux-thunk": {
@@ -5476,9 +5512,9 @@
       "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "private": "0.1.8"
+        "babel-runtime": "^6.18.0",
+        "babel-types": "^6.19.0",
+        "private": "^0.1.6"
       }
     },
     "regex-cache": {
@@ -5487,7 +5523,7 @@
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "0.1.3"
+        "is-equal-shallow": "^0.1.3"
       }
     },
     "regexp-quote": {
@@ -5501,9 +5537,9 @@
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
       "dev": true,
       "requires": {
-        "regenerate": "1.3.3",
-        "regjsgen": "0.2.0",
-        "regjsparser": "0.1.5"
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
       }
     },
     "regjsgen": {
@@ -5518,7 +5554,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "0.5.0"
+        "jsesc": "~0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -5553,36 +5589,34 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "1.0.2"
+        "is-finite": "^1.0.0"
       }
     },
     "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "version": "2.87.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
       "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.6.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.5",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.1",
-        "har-validator": "5.0.3",
-        "hawk": "6.0.2",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.17",
-        "oauth-sign": "0.8.2",
-        "performance-now": "2.1.0",
-        "qs": "6.5.1",
-        "safe-buffer": "5.1.1",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.1.0"
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.6.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.5",
+        "extend": "~3.0.1",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.1",
+        "har-validator": "~5.0.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.17",
+        "oauth-sign": "~0.8.2",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.1",
+        "safe-buffer": "^5.1.1",
+        "tough-cookie": "~2.3.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.1.0"
       }
     },
     "require-json": {
@@ -5597,8 +5631,8 @@
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
       "dev": true,
       "requires": {
-        "caller-path": "0.1.0",
-        "resolve-from": "1.0.1"
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
       }
     },
     "requires-port": {
@@ -5618,7 +5652,7 @@
       "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
       "dev": true,
       "requires": {
-        "path-parse": "1.0.5"
+        "path-parse": "^1.0.5"
       }
     },
     "resolve-from": {
@@ -5633,8 +5667,8 @@
       "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
       "dev": true,
       "requires": {
-        "exit-hook": "1.1.1",
-        "onetime": "1.1.0"
+        "exit-hook": "^1.0.0",
+        "onetime": "^1.0.0"
       }
     },
     "right-align": {
@@ -5643,7 +5677,7 @@
       "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
       "dev": true,
       "requires": {
-        "align-text": "0.1.4"
+        "align-text": "^0.1.1"
       }
     },
     "rimraf": {
@@ -5652,7 +5686,7 @@
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
-        "glob": "7.1.2"
+        "glob": "^7.0.5"
       },
       "dependencies": {
         "glob": {
@@ -5661,12 +5695,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -5683,7 +5717,7 @@
       "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
       "dev": true,
       "requires": {
-        "once": "1.4.0"
+        "once": "^1.3.0"
       }
     },
     "rx-lite": {
@@ -5698,9 +5732,9 @@
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "samsam": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
-      "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
+      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
       "dev": true
     },
     "sanitize-html": {
@@ -5708,9 +5742,9 @@
       "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz",
       "integrity": "sha1-cw/6Ikm98YMz7/5FsoYXPJxa0Lg=",
       "requires": {
-        "htmlparser2": "3.9.2",
+        "htmlparser2": "^3.9.0",
         "regexp-quote": "0.0.0",
-        "xtend": "4.0.1"
+        "xtend": "^4.0.0"
       }
     },
     "semver": {
@@ -5748,9 +5782,9 @@
       "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "interpret": "1.0.4",
-        "rechoir": "0.6.2"
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
       },
       "dependencies": {
         "glob": {
@@ -5759,26 +5793,52 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
     },
     "sinon": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
-      "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-5.0.7.tgz",
+      "integrity": "sha512-GvNLrwpvLZ8jIMZBUhHGUZDq5wlUdceJWyHvZDmqBxnjazpxY1L0FNbGBX6VpcOEoQ8Q4XMWFzm2myJMvx+VjA==",
       "dev": true,
       "requires": {
-        "formatio": "1.1.1",
-        "lolex": "1.3.2",
-        "samsam": "1.1.2",
-        "util": "0.10.3"
+        "@sinonjs/formatio": "^2.0.0",
+        "diff": "^3.1.0",
+        "lodash.get": "^4.4.2",
+        "lolex": "^2.2.0",
+        "nise": "^1.2.0",
+        "supports-color": "^5.1.0",
+        "type-detect": "^4.0.5"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "lolex": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz",
+          "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "slash": {
@@ -5793,11 +5853,6 @@
       "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
       "dev": true
     },
-    "sntp": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
-      "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys="
-    },
     "socket.io": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz",
@@ -5958,9 +6013,9 @@
       "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==",
       "dev": true,
       "requires": {
-        "async": "2.6.0",
-        "loader-utils": "0.2.17",
-        "source-map": "0.6.1"
+        "async": "^2.5.0",
+        "loader-utils": "~0.2.2",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "async": {
@@ -5969,7 +6024,7 @@
           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
           "dev": true,
           "requires": {
-            "lodash": "4.17.4"
+            "lodash": "^4.14.0"
           }
         },
         "source-map": {
@@ -5986,7 +6041,7 @@
       "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "^0.5.6"
       }
     },
     "sprintf-js": {
@@ -5995,18 +6050,18 @@
       "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
     },
     "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
+      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
       "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "tweetnacl": "~0.14.0"
       }
     },
     "statuses": {
@@ -6021,8 +6076,8 @@
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
       }
     },
     "stream-http": {
@@ -6031,11 +6086,11 @@
       "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "3.0.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "to-arraybuffer": "1.0.1",
-        "xtend": "4.0.1"
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.2.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "string-width": {
@@ -6044,9 +6099,9 @@
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
       "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
       }
     },
     "string.prototype.repeat": {
@@ -6059,21 +6114,16 @@
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
       "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "~5.1.0"
       }
     },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -6110,12 +6160,12 @@
       "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
       "dev": true,
       "requires": {
-        "ajv": "4.11.8",
-        "ajv-keywords": "1.5.1",
-        "chalk": "1.1.3",
-        "lodash": "4.17.4",
+        "ajv": "^4.7.0",
+        "ajv-keywords": "^1.0.0",
+        "chalk": "^1.1.1",
+        "lodash": "^4.0.0",
         "slice-ansi": "0.0.4",
-        "string-width": "2.1.1"
+        "string-width": "^2.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -6124,8 +6174,8 @@
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "co": "^4.6.0",
+            "json-stable-stringify": "^1.0.1"
           }
         },
         "ansi-regex": {
@@ -6146,8 +6196,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -6156,7 +6206,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -6167,6 +6217,12 @@
       "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
       "dev": true
     },
+    "text-encoding": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
+      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
+      "dev": true
+    },
     "text-encoding-utf-8": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.1.tgz",
@@ -6196,7 +6252,7 @@
       "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
       "dev": true,
       "requires": {
-        "setimmediate": "1.0.5"
+        "setimmediate": "^1.0.4"
       }
     },
     "tmatch": {
@@ -6211,7 +6267,7 @@
       "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "1.0.2"
+        "os-tmpdir": "~1.0.1"
       }
     },
     "to-array": {
@@ -6233,11 +6289,11 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "requires": {
-        "punycode": "1.4.1"
+        "punycode": "^1.4.1"
       }
     },
     "trim-right": {
@@ -6263,7 +6319,7 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "^5.0.1"
       }
     },
     "tweetnacl": {
@@ -6278,9 +6334,15 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2"
+        "prelude-ls": "~1.1.2"
       }
     },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
     "type-is": {
       "version": "1.6.15",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
@@ -6288,7 +6350,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.17"
+        "mime-types": "~2.1.15"
       }
     },
     "typedarray": {
@@ -6308,10 +6370,10 @@
       "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
       "dev": true,
       "requires": {
-        "async": "0.2.10",
-        "source-map": "0.5.7",
-        "uglify-to-browserify": "1.0.2",
-        "yargs": "3.10.0"
+        "async": "~0.2.6",
+        "source-map": "~0.5.1",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.10.0"
       },
       "dependencies": {
         "async": {
@@ -6368,8 +6430,8 @@
       "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
       "dev": true,
       "requires": {
-        "lru-cache": "2.2.4",
-        "tmp": "0.0.31"
+        "lru-cache": "2.2.x",
+        "tmp": "0.0.x"
       }
     },
     "util": {
@@ -6401,9 +6463,9 @@
       "dev": true
     },
     "uuid": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
     },
     "v8flags": {
       "version": "2.1.1",
@@ -6411,13 +6473,14 @@
       "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
       "dev": true,
       "requires": {
-        "user-home": "1.1.1"
+        "user-home": "^1.1.1"
       }
     },
     "velocity-vector": {
       "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
+      "from": "velocity-vector@github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
       "requires": {
-        "jquery": "3.2.1"
+        "jquery": ">= 1.4.3"
       }
     },
     "verror": {
@@ -6425,9 +6488,9 @@
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
-        "assert-plus": "1.0.0",
+        "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
+        "extsprintf": "^1.2.0"
       }
     },
     "vm-browserify": {
@@ -6451,7 +6514,7 @@
       "integrity": "sha1-MbTbZnjyrgHDnqn7hyWpAx5Vins=",
       "dev": true,
       "requires": {
-        "foreachasync": "3.0.0"
+        "foreachasync": "^3.0.0"
       }
     },
     "watchpack": {
@@ -6460,9 +6523,9 @@
       "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
       "dev": true,
       "requires": {
-        "async": "0.9.2",
-        "chokidar": "1.7.0",
-        "graceful-fs": "4.1.11"
+        "async": "^0.9.0",
+        "chokidar": "^1.0.0",
+        "graceful-fs": "^4.1.2"
       }
     },
     "webpack": {
@@ -6471,21 +6534,21 @@
       "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
       "dev": true,
       "requires": {
-        "acorn": "3.3.0",
-        "async": "1.5.2",
-        "clone": "1.0.2",
-        "enhanced-resolve": "0.9.1",
-        "interpret": "0.6.6",
-        "loader-utils": "0.2.17",
-        "memory-fs": "0.3.0",
-        "mkdirp": "0.5.1",
-        "node-libs-browser": "0.7.0",
-        "optimist": "0.6.1",
-        "supports-color": "3.2.3",
-        "tapable": "0.1.10",
-        "uglify-js": "2.7.5",
-        "watchpack": "0.2.9",
-        "webpack-core": "0.6.9"
+        "acorn": "^3.0.0",
+        "async": "^1.3.0",
+        "clone": "^1.0.2",
+        "enhanced-resolve": "~0.9.0",
+        "interpret": "^0.6.4",
+        "loader-utils": "^0.2.11",
+        "memory-fs": "~0.3.0",
+        "mkdirp": "~0.5.0",
+        "node-libs-browser": "^0.7.0",
+        "optimist": "~0.6.0",
+        "supports-color": "^3.1.0",
+        "tapable": "~0.1.8",
+        "uglify-js": "~2.7.3",
+        "watchpack": "^0.2.1",
+        "webpack-core": "~0.6.9"
       },
       "dependencies": {
         "acorn": {
@@ -6512,8 +6575,8 @@
           "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
           "dev": true,
           "requires": {
-            "errno": "0.1.4",
-            "readable-stream": "2.3.3"
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
           }
         },
         "supports-color": {
@@ -6522,7 +6585,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -6533,8 +6596,8 @@
       "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
       "dev": true,
       "requires": {
-        "source-list-map": "0.1.8",
-        "source-map": "0.4.4"
+        "source-list-map": "~0.1.7",
+        "source-map": "~0.4.1"
       },
       "dependencies": {
         "source-map": {
@@ -6543,7 +6606,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -6554,11 +6617,11 @@
       "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
       "dev": true,
       "requires": {
-        "memory-fs": "0.4.1",
-        "mime": "1.4.1",
-        "path-is-absolute": "1.0.1",
-        "range-parser": "1.2.0",
-        "time-stamp": "2.0.0"
+        "memory-fs": "~0.4.1",
+        "mime": "^1.3.4",
+        "path-is-absolute": "^1.0.0",
+        "range-parser": "^1.0.3",
+        "time-stamp": "^2.0.0"
       }
     },
     "whatwg-fetch": {
@@ -6572,7 +6635,7 @@
       "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "dev": true,
       "requires": {
-        "isexe": "2.0.0"
+        "isexe": "^2.0.0"
       }
     },
     "window-size": {
@@ -6597,7 +6660,7 @@
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
       "dev": true,
       "requires": {
-        "mkdirp": "0.5.1"
+        "mkdirp": "^0.5.1"
       }
     },
     "ws": {
@@ -6606,8 +6669,8 @@
       "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
       "dev": true,
       "requires": {
-        "options": "0.0.6",
-        "ultron": "1.0.2"
+        "options": ">=0.0.5",
+        "ultron": "1.0.x"
       }
     },
     "wtf-8": {
@@ -6622,7 +6685,7 @@
       "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
       "dev": true,
       "requires": {
-        "lodash": "3.10.1"
+        "lodash": "^3.5.0"
       },
       "dependencies": {
         "lodash": {
@@ -6650,9 +6713,9 @@
       "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
       "dev": true,
       "requires": {
-        "camelcase": "1.2.1",
-        "cliui": "2.1.0",
-        "decamelize": "1.2.0",
+        "camelcase": "^1.0.2",
+        "cliui": "^2.1.0",
+        "decamelize": "^1.0.0",
         "window-size": "0.1.0"
       }
     },
diff --git a/package.json b/package.json
index 60f65f4c39..5864b35fc4 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,7 @@
     "react-addons-test-utils": "^15.4.0",
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
-    "sinon": "^1.17.3",
+    "sinon": "^5.0.7",
     "source-map-loader": "^0.2.3",
     "walk": "^2.3.9",
     "webpack": "^1.12.14"
diff --git a/test/components/structures/TimelinePanel-test.js b/test/components/structures/TimelinePanel-test.js
index 74037d2926..ea62d427bc 100644
--- a/test/components/structures/TimelinePanel-test.js
+++ b/test/components/structures/TimelinePanel-test.js
@@ -235,7 +235,7 @@ describe('TimelinePanel', function() {
 
             // now, if we update the events, there shouldn't be any
             // more requests.
-            client.paginateEventTimeline.reset();
+            client.paginateEventTimeline.resetHistory();
             panel.forceUpdate();
             expect(messagePanel.props.backPaginating).toBe(false);
             setTimeout(() => {

From 11cea616615989157e335d7ea2e323ce7fc978f8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 21 May 2018 12:28:08 +0100
Subject: [PATCH 078/702] refocus editor after clicking on autocompletes

---
 src/components/views/rooms/MessageComposerInput.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index eb4edfcfcb..6919a304c2 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1313,7 +1313,8 @@ export default class MessageComposerInput extends React.Component {
         if (range) {
             const change = editorState.change()
                                       .collapseToAnchor()
-                                      .moveOffsetsTo(range.start, range.end);
+                                      .moveOffsetsTo(range.start, range.end)
+                                      .focus();
             editorState = change.value;
         }
 
@@ -1321,12 +1322,14 @@ export default class MessageComposerInput extends React.Component {
         if (inline) {
             change = editorState.change()
                                 .insertInlineAtRange(editorState.selection, inline)
-                                .insertText(suffix);
+                                .insertText(suffix)
+                                .focus();
         }
         else {
             change = editorState.change()
                                 .insertTextAtRange(editorState.selection, completion)
-                                .insertText(suffix);
+                                .insertText(suffix)
+                                .focus();
         }
         editorState = change.value;
 

From 836dc8b0ef2b3d086747c85fbcdd885d7102304c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 21 May 2018 16:59:13 +0100
Subject: [PATCH 079/702] Factor out all shared logic between MStickerBody and
 MImageBody

The benefits of this:
 - One code path for determining spinner/placeholder and it's position
   for loading images/stickers. This includes spinner used in e2e
   decryption of images.
 - Very small definition for MStickerBody, only overriding the minimal
   differences is has from MImageBody.

The disadvantages:
 - Slightly more complicated MImageBody, but hopefully not less
   readable.
---
 res/css/views/messages/_MImageBody.scss       |  11 +-
 res/css/views/messages/_MStickerBody.scss     |  32 +---
 src/components/views/messages/MImageBody.js   |  89 ++++++++--
 src/components/views/messages/MStickerBody.js | 162 ++++--------------
 4 files changed, 111 insertions(+), 183 deletions(-)

diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 64821434dd..4c763c5991 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -37,11 +37,12 @@ limitations under the License.
 }
 
 .mx_MImageBody_thumbnail_spinner {
-    display: flex;
-    align-items: center;
-    width: 100%;
+    position: absolute;
+    left: 50%;
+    top: 50%;
 }
 
-.mx_MImageBody_thumbnail_spinner img {
-    margin: auto;
+// Inner img and TintableSvg should be centered around 0, 0
+.mx_MImageBody_thumbnail_spinner > * {
+    transform: translate(-50%, -50%);
 }
diff --git a/res/css/views/messages/_MStickerBody.scss b/res/css/views/messages/_MStickerBody.scss
index 3e6bbe5aa4..e4977bcc34 100644
--- a/res/css/views/messages/_MStickerBody.scss
+++ b/res/css/views/messages/_MStickerBody.scss
@@ -14,33 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_MStickerBody {
-  display: block;
-  margin-right: 34px;
-  min-height: 110px;
-  padding: 20px 0;
+.mx_MStickerBody_wrapper {
+    padding: 20px 0px;
 }
 
-.mx_MStickerBody_image_container {
-  display: inline-block;
-  position: relative;
-}
-
-.mx_MStickerBody_image {
-  max-width: 100%;
-  opacity: 0;
-}
-
-.mx_MStickerBody_image_visible {
-  opacity: 1;
-}
-
-.mx_MStickerBody_placeholder {
-  position: absolute;
-  opacity: 1;
-}
-
-.mx_MStickerBody_placeholder_invisible {
-  transition: 500ms;
-  opacity: 0;
+.mx_MStickerBody_tooltip {
+    position: absolute;
+    top: 50%;
 }
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index d9108a2fe1..03dad5e439 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -62,6 +62,8 @@ export default class extends React.Component {
             decryptedBlob: null,
             error: null,
             imgError: false,
+            imgLoaded: false,
+            hover: false,
         };
     }
 
@@ -116,6 +118,8 @@ export default class extends React.Component {
     }
 
     onImageEnter(e) {
+        this.setState({ hover: true });
+
         if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
             return;
         }
@@ -124,6 +128,8 @@ export default class extends React.Component {
     }
 
     onImageLeave(e) {
+        this.setState({ hover: false });
+
         if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
             return;
         }
@@ -139,6 +145,7 @@ export default class extends React.Component {
 
     onImageLoad() {
         this.props.onWidgetLoad();
+        this.setState({ imgLoaded: true });
     }
 
     _getContentUrl() {
@@ -237,14 +244,22 @@ export default class extends React.Component {
         const maxWidth = content.info.w * maxHeight / content.info.h;
 
         let img = null;
+        let placeholder = null;
+
         // e2e image hasn't been decrypted yet
         if (content.file !== undefined && this.state.decryptedUrl === null) {
-            img = <div className="mx_MImageBody_thumbnail mx_MImageBody_thumbnail_spinner" ref="image">
-                <img src="img/spinner.gif" alt={content.body} width="32" height="32" />
-            </div>;
-        } else if (thumbUrl && !this.state.imgError) {
+            placeholder = <img src="img/spinner.gif" alt={content.body} width="32" height="32" />;
+        } else if (!this.state.imgLoaded) {
+            // Deliberately, getSpinner is left unimplemented here, MStickerBody overides
+            placeholder = this.getPlaceholder();
+        }
+
+        const showPlaceholder = Boolean(placeholder);
+
+        if (thumbUrl && !this.state.imgError) {
             // Restrict the width of the thumbnail here, otherwise it will fill the container
             // which has the same width as the timeline
+            // mx_MImageBody_thumbnail resizes img to exactly container size
             img = <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
                 style={{ "max-width": maxWidth + "px" }}
                 alt={content.body}
@@ -253,23 +268,54 @@ export default class extends React.Component {
                 onMouseEnter={this.onImageEnter}
                 onMouseLeave={this.onImageLeave} />;
         }
-        const thumbnail = img ?
-            <a href={contentUrl} onClick={this.onClick}>
-                <div className="mx_MImageBody_thumbnail_container" style={{ "max-height": maxHeight + "px" }} >
-                    { /* Calculate aspect ratio, using %padding will size _container correctly */ }
-                    <div style={{ paddingBottom: (100 * content.info.h / content.info.w) + '%' }}></div>
 
-                    { /* mx_MImageBody_thumbnail resizes img to exactly container size */ }
+        const thumbnail = (
+            <div className="mx_MImageBody_thumbnail_container" style={{ "max-height": maxHeight + "px" }} >
+                { /* Calculate aspect ratio, using %padding will size _container correctly */ }
+                <div style={{ paddingBottom: (100 * content.info.h / content.info.w) + '%' }}></div>
+
+                <div className="mx_MImageBody_thumbnail" style={{
+                    "display": showPlaceholder ? undefined : 'none',
+                    // Constrain width here so that spinner appears central to the loaded thumbnail
+                    "max-width": content.info.w + "px",
+                }}>
+                    <div className="mx_MImageBody_thumbnail_spinner">
+                        { placeholder }
+                    </div>
+                </div>
+
+                <div style={{display: !showPlaceholder ? undefined : 'none'}}>
                     { img }
                 </div>
-            </a> : null;
 
-        return (
-            <span className="mx_MImageBody" ref="body">
-                { thumbnail }
-                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />
-            </span>
-      );
+                { this.state.hover && this.getTooltip() }
+            </div>
+        );
+
+        return this.wrapImage(contentUrl, thumbnail);
+    }
+
+    // Overidden by MStickerBody
+    wrapImage(contentUrl, children) {
+        return <a href={contentUrl} onClick={this.onClick}>
+            {children}
+        </a>;
+    }
+
+    // Overidden by MStickerBody
+    getPlaceholder() {
+        // MImageBody doesn't show a placeholder whilst the image loads, (but it could do)
+        return null;
+    }
+
+    // Overidden by MStickerBody
+    getTooltip() {
+        return null;
+    }
+
+    // Overidden by MStickerBody
+    getFileBody() {
+        return <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />;
     }
 
     render() {
@@ -284,7 +330,6 @@ export default class extends React.Component {
             );
         }
 
-
         const contentUrl = this._getContentUrl();
         let thumbUrl;
         if (this._isGif() && SettingsStore.getValue("autoplayGifsAndVideos")) {
@@ -293,6 +338,12 @@ export default class extends React.Component {
           thumbUrl = this._getThumbUrl();
         }
 
-        return this._messageContent(contentUrl, thumbUrl, content);
+        const thumbnail = this._messageContent(contentUrl, thumbUrl, content);
+        const fileBody = this.getFileBody();
+
+        return <span className="mx_MImageBody" ref="body">
+            { thumbnail }
+            { fileBody }
+        </span>;
     }
 }
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index cdb60f0074..d9ed668e42 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -18,141 +18,39 @@ limitations under the License.
 
 import MImageBody from './MImageBody';
 import sdk from '../../../index';
-import TintableSVG from '../elements/TintableSvg';
 
 export default class MStickerBody extends MImageBody {
-    displayName: 'MStickerBody'
-
-    constructor(props) {
-      super(props);
-
-      this._onMouseEnter = this._onMouseEnter.bind(this);
-      this._onMouseLeave = this._onMouseLeave.bind(this);
-      this._onImageLoad = this._onImageLoad.bind(this);
-    }
-
-    _onMouseEnter() {
-        this.setState({showTooltip: true});
-    }
-
-    _onMouseLeave() {
-        this.setState({showTooltip: false});
-    }
-
-    _onImageLoad() {
-        this.setState({
-            placeholderClasses: 'mx_MStickerBody_placeholder_invisible',
-        });
-        const hidePlaceholderTimer = setTimeout(() => {
-            this.setState({
-                placeholderVisible: false,
-                imageClasses: 'mx_MStickerBody_image_visible',
-            });
-        }, 500);
-        this.setState({hidePlaceholderTimer});
-        if (this.props.onWidgetLoad) {
-            this.props.onWidgetLoad();
-        }
-    }
-
-    _afterComponentDidMount() {
-        if (this.refs.image.complete) {
-            // Image already loaded
-            this.setState({
-                placeholderVisible: false,
-                placeholderClasses: '.mx_MStickerBody_placeholder_invisible',
-                imageClasses: 'mx_MStickerBody_image_visible',
-            });
-        } else {
-            // Image not already loaded
-            this.setState({
-                placeholderVisible: true,
-                placeholderClasses: '',
-                imageClasses: '',
-            });
-        }
-    }
-
-    _afterComponentWillUnmount() {
-        if (this.state.hidePlaceholderTimer) {
-            clearTimeout(this.state.hidePlaceholderTimer);
-            this.setState({hidePlaceholderTimer: null});
-        }
-    }
-
-    _messageContent(contentUrl, thumbUrl, content) {
-        let tooltip;
-        const tooltipBody = (
-            this.props.mxEvent &&
-            this.props.mxEvent.getContent() &&
-            this.props.mxEvent.getContent().body) ?
-            this.props.mxEvent.getContent().body : null;
-        if (this.state.showTooltip && tooltipBody) {
-            const RoomTooltip = sdk.getComponent('rooms.RoomTooltip');
-            tooltip = <RoomTooltip
-                className='mx_RoleButton_tooltip'
-                label={tooltipBody} />;
-        }
-
-        const gutterSize = 0;
-        let placeholderSize = 75;
-        let placeholderFixupHeight = '100px';
-        let placeholderTop = 0;
-        let placeholderLeft = 0;
-
-        if (content.info) {
-            placeholderTop = Math.floor((content.info.h/2) - (placeholderSize/2)) + 'px';
-            placeholderLeft = Math.floor((content.info.w/2) - (placeholderSize/2) + gutterSize) + 'px';
-            placeholderFixupHeight = content.info.h + 'px';
-        }
-
-        // The pixel size of sticker images is generally larger than their intended display
-        // size so they render at native reolution on HiDPI displays. We therefore need to
-        // explicity set the size so they render at the intended size.
-        const imageStyle = {
-            height: content.info.h,
-            // leave the browser the calculate the width automatically
-        };
-
-        placeholderSize = placeholderSize + 'px';
-
-        // Body 'ref' required by MImageBody
-        return (
-            <span className='mx_MStickerBody' ref='body'
-                style={{
-                    height: placeholderFixupHeight,
-                }}>
-                <div className={'mx_MStickerBody_image_container'}>
-                  { this.state.placeholderVisible &&
-                    <div
-                        className={'mx_MStickerBody_placeholder ' + this.state.placeholderClasses}
-                        style={{
-                            top: placeholderTop,
-                            left: placeholderLeft,
-                        }}
-                    >
-                        <TintableSVG
-                            src={'img/icons-show-stickers.svg'}
-                            width={placeholderSize}
-                            height={placeholderSize} />
-                    </div> }
-                    <img
-                        className={'mx_MStickerBody_image ' + this.state.imageClasses}
-                        src={contentUrl}
-                        style={imageStyle}
-                        ref='image'
-                        alt={content.body}
-                        onLoad={this._onImageLoad}
-                        onMouseEnter={this._onMouseEnter}
-                        onMouseLeave={this._onMouseLeave}
-                    />
-                    { tooltip }
-                </div>
-            </span>
-        );
-    }
-
     // Empty to prevent default behaviour of MImageBody
     onClick() {
     }
+
+    // MStickerBody doesn't need a wrapping `<a href=...>`, but it does need extra padding
+    // which is added by mx_MStickerBody_wrapper
+    wrapImage(contentUrl, children) {
+        return <div className="mx_MStickerBody_wrapper"> { children } </div>;
+    }
+
+    // Placeholder to show in place of the sticker image if
+    // img onLoad hasn't fired yet.
+    getPlaceholder() {
+        const TintableSVG = sdk.getComponent('elements.TintableSvg');
+        return <TintableSVG src="img/icons-show-stickers.svg" width="75" height="75" />;
+    }
+
+    // Tooltip to show on mouse over
+    getTooltip() {
+        const content = this.props.mxEvent && this.props.mxEvent.getContent();
+
+        if (!content || !content.body || !content.info || !content.info.w) return null;
+
+        const RoomTooltip = sdk.getComponent('rooms.RoomTooltip');
+        return <div style={{left: content.info.w + 'px'}} className="mx_MStickerBody_tooltip">
+            <RoomTooltip label={content.body} />
+        </div>;
+    }
+
+    // Don't show "Download this_file.png ..."
+    getFileBody() {
+        return null;
+    }
 }

From a0bc681052c38f9d3529bc29d8874926dbe14621 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 18 May 2018 10:16:41 +0000
Subject: [PATCH 080/702] Translated using Weblate (Italian)

Currently translated at 99.4% (1169 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 82382a3967..b8b8cd7394 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1167,5 +1167,13 @@
     "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Gli errori di Riot sono monitorati su GitHub: <a>segnala un problema su GitHub</a>.",
     "Log out and remove encryption keys?": "Disconnettere e rimuovere le chiavi di cifratura?",
     "Refresh": "Aggiorna",
-    "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente."
+    "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.",
+    "Send analytics data": "Invia dati statistici",
+    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra <PolicyLink>politica sui cookie e sulla privacy</PolicyLink>).",
+    "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.",
+    "Yes please": "Sì grazie",
+    "Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
+    "Send Logs": "Invia i log",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
+    "Collapse Reply Thread": "Riduci finestra di risposta"
 }

From 38f446a364f1be9def92e0ee6a1dd81ebf665c52 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 18 May 2018 12:27:59 +0000
Subject: [PATCH 081/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1173 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 24e9750698..87fb79108e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1175,5 +1175,9 @@
     "Unable to reply": "Не удается ответить",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ, либо оно не существует, либо у вас нет разрешения на его просмотр.",
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
-    "Collapse Reply Thread": "Ответить с цитированием"
+    "Collapse Reply Thread": "Ответить с цитированием",
+    "Send analytics data": "Отправить данные аналитики",
+    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
+    "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.",
+    "Yes please": "Да, пожалуйста"
 }

From e4f8c09c32d9a03567de9a1e9a1954928915e29b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 22 May 2018 10:43:16 +0100
Subject: [PATCH 082/702] Only include placeholder in DOM when necessary

---
 src/components/views/messages/MImageBody.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index f27124238e..e2316b2fcc 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -276,15 +276,16 @@ export default class extends React.Component {
                 { /* Calculate aspect ratio, using %padding will size _container correctly */ }
                 <div style={{ paddingBottom: (100 * content.info.h / content.info.w) + '%' }}></div>
 
-                <div className="mx_MImageBody_thumbnail" style={{
-                    "display": showPlaceholder ? undefined : 'none',
-                    // Constrain width here so that spinner appears central to the loaded thumbnail
-                    "max-width": content.info.w + "px",
-                }}>
-                    <div className="mx_MImageBody_thumbnail_spinner">
-                        { placeholder }
+                { showPlaceholder &&
+                    <div className="mx_MImageBody_thumbnail" style={{
+                        // Constrain width here so that spinner appears central to the loaded thumbnail
+                        "max-width": content.info.w + "px",
+                    }}>
+                        <div className="mx_MImageBody_thumbnail_spinner">
+                            { placeholder }
+                        </div>
                     </div>
-                </div>
+                }
 
                 <div style={{display: !showPlaceholder ? undefined : 'none'}}>
                     { img }

From fb5dd4a410e25e8ea145d9f6cd7ebae74e67f3d9 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 22 May 2018 10:46:10 +0100
Subject: [PATCH 083/702] Remove spurious fixupHeight

---
 src/components/views/messages/MImageBody.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index e2316b2fcc..083dc342db 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -211,7 +211,6 @@ export default class extends React.Component {
                 });
             }).done();
         }
-        this.fixupHeight();
         this._afterComponentDidMount();
     }
 

From c249bee9b53f4718319f7bcc9128059709e55260 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 22 May 2018 16:09:54 +0100
Subject: [PATCH 084/702] Grammar

---
 src/components/views/messages/MImageBody.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 083dc342db..c210c64318 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -240,7 +240,7 @@ export default class extends React.Component {
     _messageContent(contentUrl, thumbUrl, content) {
         // The maximum height of the thumbnail as it is rendered as an <img>
         const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h);
-        // The maximum width of the thumbnail, as dictated by it's natural
+        // The maximum width of the thumbnail, as dictated by its natural
         // maximum height.
         const maxWidth = content.info.w * maxHeight / content.info.h;
 

From 538979a4ee7b6f9e4d92e57749e35a2bcc5d8689 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 22 May 2018 17:13:45 +0100
Subject: [PATCH 085/702] Fix MVideoBody spinner

---
 src/components/views/messages/MVideoBody.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 5365daee03..37fc94d1ed 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -147,12 +147,7 @@ module.exports = React.createClass({
             // For now add an img tag with a spinner.
             return (
                 <span className="mx_MVideoBody" ref="body">
-                    <div className="mx_MImageBody_thumbnail" ref="image" style={{
-                        "display": "flex",
-                        "align-items": "center",
-                        "justify-items": "center",
-                        "width": "100%",
-                    }}>
+                    <div className="mx_MImageBody_thumbnail mx_MImageBody_thumbnail_spinner" ref="image">
                         <img src="img/spinner.gif" alt={content.body} width="16" height="16" />
                     </div>
                 </span>

From c9c3cf55dea03f97c00239821b50d899c7acdfb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 22 May 2018 17:08:52 +0000
Subject: [PATCH 086/702] Translated using Weblate (French)

Currently translated at 100.0% (1176 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 88c5e0ab07..048dcd9d81 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1174,5 +1174,6 @@
     "Send analytics data": "Envoyer les données analytiques",
     "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
     "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
-    "Yes please": "Oui, s'il vous plaît"
+    "Yes please": "Oui, s'il vous plaît",
+    "Muted Users": "Utilisateurs ignorés"
 }

From 6df3371c6c562fa006bb2cddbd6b3cdb4cb8e8cc Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 22 May 2018 19:14:54 +0100
Subject: [PATCH 087/702] Add a "reload widget" button.

---
 res/img/button-refresh.svg               | 12 ++++++++++++
 src/components/views/elements/AppTile.js | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 res/img/button-refresh.svg

diff --git a/res/img/button-refresh.svg b/res/img/button-refresh.svg
new file mode 100644
index 0000000000..b4990a2147
--- /dev/null
+++ b/res/img/button-refresh.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="612px" height="612px" viewBox="0 90 612 612" enable-background="new 0 90 612 612" xml:space="preserve">
+<path stroke="#76CFA6"  fill="#76CFA6" stroke-width="40" stroke-miterlimit="10" d="M517.593,435.2c-9.204,0-17.093,7.053-17.811,16.257
+	c-8.247,99.33-91.8,176.786-193.401,176.786c-106.98,0-194.119-86.54-194.119-192.923c0-104.71,84.389-190.294,189.098-192.924
+	c2.75-0.12,4.901,2.032,4.901,4.781v60.124c0,15.061,16.614,24.146,29.404,16.137l114.989-80.444
+	c11.953-7.53,11.953-24.862,0-32.393l-114.869-79.369c-12.79-8.009-29.405,1.076-29.405,16.137v54.626
+	c0,2.629-2.032,4.781-4.661,4.781C176.929,209.286,76.522,310.649,76.522,435.32c0,126.225,102.917,228.424,229.858,228.424
+	c120.487,0,219.221-91.681,229.022-209.299C536.359,444.046,527.992,435.2,517.593,435.2L517.593,435.2z"/>
+</svg>
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0895ede636..4f7a3e298d 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -55,6 +55,7 @@ export default class AppTile extends React.Component {
         this._grantWidgetPermission = this._grantWidgetPermission.bind(this);
         this._revokeWidgetPermission = this._revokeWidgetPermission.bind(this);
         this._onPopoutWidgetClick = this._onPopoutWidgetClick.bind(this);
+        this._onReloadWidgetClick = this._onReloadWidgetClick.bind(this);
     }
 
     /**
@@ -519,6 +520,11 @@ export default class AppTile extends React.Component {
             { target: '_blank', href: this._getSafeUrl(), rel: 'noopener noreferrer'}).click();
     }
 
+    _onReloadWidgetClick(e) {
+        // Reload iframe in this way to avoid cross-origin restrictions
+        this.refs.appFrame.src = this.refs.appFrame.src;
+    }
+
     render() {
         let appTileBody;
 
@@ -606,6 +612,7 @@ export default class AppTile extends React.Component {
         const showPictureSnapshotButton = this._hasCapability('m.capability.screenshot') && this.props.show;
         const showPictureSnapshotIcon = 'img/camera_green.svg';
         const popoutWidgetIcon = 'img/button-new-window.svg';
+        const reloadWidgetIcon = 'img/button-refresh.svg';
         const windowStateIcon = (this.props.show ? 'img/minimize.svg' : 'img/maximize.svg');
 
         return (
@@ -624,6 +631,16 @@ export default class AppTile extends React.Component {
                         { this.props.showTitle && this._getTileTitle() }
                     </span>
                     <span className="mx_AppTileMenuBarWidgets">
+                        { /* Reload widget */ }
+                        { this.props.showReload && <TintableSvgButton
+                            src={reloadWidgetIcon}
+                            className="mx_AppTileMenuBarWidget mx_AppTileMenuBarWidgetPadding"
+                            title={_t('Reload widget')}
+                            onClick={this._onReloadWidgetClick}
+                            width="10"
+                            height="10"
+                        /> }
+
                         { /* Popout widget */ }
                         { this.props.showPopout && <TintableSvgButton
                             src={popoutWidgetIcon}
@@ -707,6 +724,11 @@ AppTile.propTypes = {
     showDelete: PropTypes.bool,
     // Optionally hide the popout widget icon
     showPopout: PropTypes.bool,
+    // Optionally show the reload widget icon
+    // This is not currently intended for use with production widgets. However
+    // it can be useful when developing persistent widgets in order to avoid
+    // having to reload all of riot to get new widget content.
+    showReload: PropTypes.bool,
     // Widget capabilities to allow by default (without user confirmation)
     // NOTE -- Use with caution. This is intended to aid better integration / UX
     // basic widget capabilities, e.g. injecting sticker message events.
@@ -726,6 +748,7 @@ AppTile.defaultProps = {
     showMinimise: true,
     showDelete: true,
     showPopout: true,
+    showReload: false,
     handleMinimisePointerEvents: false,
     whitelistCapabilities: [],
     userWidget: false,

From 97f57edba7d2083611a368dd2ec5ce3b827505fd Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 18 May 2018 09:51:44 +0000
Subject: [PATCH 088/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1176 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 44324384af..6341b4468e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1174,5 +1174,6 @@
     "Send analytics data": "Analitikai adatok küldése",
     "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a <PolicyLink>sütikről és titoktartási irányelvekről</PolicyLink> szóló leírást).",
     "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
-    "Yes please": "Igen, kérlek"
+    "Yes please": "Igen, kérlek",
+    "Muted Users": "Elnémított felhasználók"
 }

From 975332633b1b4bec108f3a3535d8f4546e4bc098 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 23 May 2018 00:26:55 +0100
Subject: [PATCH 089/702] Translation.

---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 239b45c32e..ea2749b404 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -103,6 +103,7 @@
     "You need to be logged in.": "You need to be logged in.",
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "Unable to create widget.": "Unable to create widget.",
+    "Reload widget": "Reload widget",
     "Missing roomId.": "Missing roomId.",
     "Failed to send request.": "Failed to send request.",
     "This room is not recognised.": "This room is not recognised.",

From cace5e8bfcf4c83fd916798f176a9a45ed292f73 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 00:41:46 +0100
Subject: [PATCH 090/702] fix bug where selection breaks after inserting emoji

---
 src/components/views/rooms/MessageComposerInput.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 6919a304c2..b71aaa6a42 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -33,7 +33,6 @@ import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerial
 //     Entity} from 'draft-js';
 
 import classNames from 'classnames';
-import escape from 'lodash/escape';
 import Promise from 'bluebird';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -507,6 +506,15 @@ export default class MessageComposerInput extends React.Component {
             }
         });
 
+        // work around weird bug where inserting emoji via the macOS
+        // emoji picker can leave the selection stuck in the emoji's
+        // child text.  This seems to happen due to selection getting
+        // moved in the normalisation phase after calculating these changes
+        if (editorState.document.getParent(editorState.anchorKey).type === 'emoji') {
+            change = change.collapseToStartOfNextText();
+            editorState = change.value;
+        }
+
 /*
         const currentBlock = editorState.getSelection().getStartKey();
         const currentSelection = editorState.getSelection();

From e7a4ffaf4531ffec7399bf42508eee491ec69718 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 00:52:00 +0100
Subject: [PATCH 091/702] fix emojioneifying autoconverted emoji

---
 .../views/rooms/MessageComposerInput.js       | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index b71aaa6a42..cb015dd0ba 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -482,6 +482,32 @@ export default class MessageComposerInput extends React.Component {
         }
         */
 
+        if (editorState.startText !== null) {
+            const text = editorState.startText.text;
+            const currentStartOffset = editorState.startOffset;
+
+            // Automatic replacement of plaintext emoji to Unicode emoji
+            if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+                // The first matched group includes just the matched plaintext emoji
+                const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
+                if (emojiMatch) {
+                    // plaintext -> hex unicode
+                    const emojiUc = asciiList[emojiMatch[1]];
+                    // hex unicode -> shortname -> actual unicode
+                    const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
+
+                    const range = Range.create({
+                        anchorKey: editorState.selection.startKey,
+                        anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
+                        focusKey: editorState.selection.startKey,
+                        focusOffset: currentStartOffset - 1,
+                    });
+                    change = change.insertTextAtRange(range, unicodeEmoji);
+                    editorState = change.value;
+                }
+            }
+        }
+
         // emojioneify any emoji
 
         // XXX: is getTextsAsArray a private API?
@@ -544,31 +570,6 @@ export default class MessageComposerInput extends React.Component {
             editorState = EditorState.forceSelection(editorState, currentSelection);
         }
 */
-        if (editorState.startText !== null) {
-            const text = editorState.startText.text;
-            const currentStartOffset = editorState.startOffset;
-
-            // Automatic replacement of plaintext emoji to Unicode emoji
-            if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
-                // The first matched group includes just the matched plaintext emoji
-                const emojiMatch = REGEX_EMOJI_WHITESPACE.exec(text.slice(0, currentStartOffset));
-                if (emojiMatch) {
-                    // plaintext -> hex unicode
-                    const emojiUc = asciiList[emojiMatch[1]];
-                    // hex unicode -> shortname -> actual unicode
-                    const unicodeEmoji = shortnameToUnicode(EMOJI_UNICODE_TO_SHORTNAME[emojiUc]);
-
-                    const range = Range.create({
-                        anchorKey: editorState.selection.startKey,
-                        anchorOffset: currentStartOffset - emojiMatch[1].length - 1,
-                        focusKey: editorState.selection.startKey,
-                        focusOffset: currentStartOffset,
-                    });
-                    change = change.insertTextAtRange(range, unicodeEmoji);
-                    editorState = change.value;
-                }
-            }
-        }
 
         if (this.props.onInputStateChanged && editorState.blocks.size > 0) {
             let blockType = editorState.blocks.first().type;

From ab5a4f58a259e6d98b81c33130686b1a27926452 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 22 May 2018 23:56:17 +0000
Subject: [PATCH 092/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1176 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index a2e8d669c9..649caefd35 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1170,5 +1170,10 @@
     "We encountered an error trying to restore your previous session.": "我們在嘗試復原您先前的工作階段時遇到了一點錯誤。",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "清除您瀏覽器的儲存的東西也許可以修復問題，但會將您登出並造成任何已加密的聊天都無法讀取。",
     "Collapse Reply Thread": "摺疊回覆討論串",
-    "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照"
+    "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照",
+    "Send analytics data": "傳送分析資料",
+    "Muted Users": "已靜音的使用者",
+    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 <PolicyLink>cookie 與隱私政策</PolicyLink>）。",
+    "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
+    "Yes please": "好的，請"
 }

From 794a60b9f8976452add3885f5a07af7f6f5362e4 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 01:36:21 +0100
Subject: [PATCH 093/702] refocus editor immediately after executing commands

and persist selections correctly across blur/focus
---
 .../views/rooms/MessageComposerInput.js         | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index cb015dd0ba..3a0329c399 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1005,12 +1005,13 @@ export default class MessageComposerInput extends React.Component {
                 this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
                 this.setState({
                     editorState: this.createEditorState(),
+                }, ()=>{
+                    this.refs.editor.focus();
                 });
             }
             if (cmd.promise) {
                 cmd.promise.then(()=>{
                     console.log("Command success.");
-                    this.refs.editor.focus();
                 }, (err)=>{
                     console.error("Command failure: %s", err);
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -1499,6 +1500,18 @@ export default class MessageComposerInput extends React.Component {
         this.handleKeyCommand('toggle-mode');
     };
 
+    onBlur = (e) => {
+        this.selection = this.state.editorState.selection;
+    };
+
+    onFocus = (e) => {
+        if (this.selection) {
+            const change = this.state.editorState.change().select(this.selection);
+            this.onChange(change);
+            delete this.selection;
+        }
+    };
+
     render() {
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
@@ -1532,6 +1545,8 @@ export default class MessageComposerInput extends React.Component {
                             onChange={this.onChange}
                             onKeyDown={this.onKeyDown}
                             onPaste={this.onPaste}
+                            onBlur={this.onBlur}
+                            onFocus={this.onFocus}
                             renderNode={this.renderNode}
                             renderMark={this.renderMark}
                             spellCheck={true}

From 6ac23248745d9303f0cdc7ce62ca94c018a1c6ba Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 01:43:03 +0100
Subject: [PATCH 094/702] fix wordwrap and pre formatting

---
 res/css/views/rooms/_MessageComposer.scss | 27 ++---------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 72d31cfddd..3eb445d239 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -89,6 +89,7 @@ limitations under the License.
     max-height: 120px;
     min-height: 19px;
     overflow: auto;
+    word-break: break-word;
 }
 
 // FIXME: rather unpleasant hack to get rid of <p/> margins.
@@ -110,30 +111,6 @@ limitations under the License.
     animation: 0.2s visualbell;
 }
 
-.mx_MessageComposer_input_empty .public-DraftEditorPlaceholder-root {
-    display: none;
-}
-
-/*
-.mx_MessageComposer_input .DraftEditor-root {
-    width: 100%;
-    flex: 1;
-    word-break: break-word;
-    max-height: 120px;
-    min-height: 21px;
-    overflow: auto;
-}
-*/
-
-.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
-    /* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
-    padding-top: 2px;
-}
-
-.mx_MessageComposer .public-DraftStyleDefault-block {
-    overflow-x: hidden;
-}
-
 .mx_MessageComposer_input blockquote {
     color: $blockquote-fg-color;
     margin: 0 0 16px;
@@ -141,7 +118,7 @@ limitations under the License.
     border-left: 4px solid $blockquote-bar-color;
 }
 
-.mx_MessageComposer_input pre.public-DraftStyleDefault-pre pre {
+.mx_MessageComposer_input pre {
     background-color: $rte-code-bg-color;
     border-radius: 3px;
     padding: 10px;

From 6fba8311f9af31bee30eadd188d655a38f11478c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 02:09:30 +0100
Subject: [PATCH 095/702] escape blockquotes correctly

and fix NPE
---
 src/components/views/rooms/MessageComposerInput.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 3a0329c399..4b41c76076 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -184,7 +184,7 @@ export default class MessageComposerInput extends React.Component {
                             // TODO: this can probably be more robust - it doesn't consider
                             // indenting or lists for instance.
                             return children.replace(/([*_~`+])/g, '\\$1')
-                                           .replace(/^([>#\|])/g, '\\$1');
+                                           .replace(/^([>#\|])/mg, '\\$1');
                         }
                         else if (obj.object === 'inline') {
                             switch (obj.type) {
@@ -369,6 +369,7 @@ export default class MessageComposerInput extends React.Component {
                     let fragmentChange = fragment.change();
                     fragmentChange.moveToRangeOf(fragment.document)
                                   .wrapBlock(quote);
+                                  //.setBlocks('block-quote');
 
                     // FIXME: handle pills and use commonmark rather than md-serialize
                     const md = this.md.serialize(fragmentChange.value);
@@ -536,7 +537,9 @@ export default class MessageComposerInput extends React.Component {
         // emoji picker can leave the selection stuck in the emoji's
         // child text.  This seems to happen due to selection getting
         // moved in the normalisation phase after calculating these changes
-        if (editorState.document.getParent(editorState.anchorKey).type === 'emoji') {
+        if (editorState.anchorKey &&
+            editorState.document.getParent(editorState.anchorKey).type === 'emoji')
+        {
             change = change.collapseToStartOfNextText();
             editorState = change.value;
         }

From fc1c4996fc80bd841dc3dd14165d504bdcbd6707 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 02:15:34 +0100
Subject: [PATCH 096/702] slate-md-serializer 3.1.0 now escapes correctly

---
 package.json                                       |  2 +-
 src/components/views/rooms/MessageComposerInput.js | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index dfc02a7e26..eea7a6857f 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "^3.0.3",
+    "slate-md-serializer": "^3.1.0",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 4b41c76076..0b57e90184 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -178,15 +178,7 @@ export default class MessageComposerInput extends React.Component {
             rules: [
                 {
                     serialize: (obj, children) => {
-                        if (obj.object === 'string') {
-                            // escape any MD in it. i have no idea why the serializer doesn't
-                            // do this already.
-                            // TODO: this can probably be more robust - it doesn't consider
-                            // indenting or lists for instance.
-                            return children.replace(/([*_~`+])/g, '\\$1')
-                                           .replace(/^([>#\|])/mg, '\\$1');
-                        }
-                        else if (obj.object === 'inline') {
+                        if (obj.object === 'inline') {
                             switch (obj.type) {
                                 case 'pill':
                                     return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;

From edc8264cff0ee7110d786d76961b59a55830380c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 02:48:57 +0100
Subject: [PATCH 097/702] shift to custom slate-md-serializer

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eea7a6857f..542f6c7cc2 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "^3.1.0",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#50a133a8",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From 6f3634c33f9d0305d79770b08c0daa01edca0d13 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 03:08:55 +0100
Subject: [PATCH 098/702] bump slate-md-serializer

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 542f6c7cc2..63022f6c9d 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "matrix-org/slate-md-serializer#50a133a8",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#d6a7652",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From a822a1c9a07d7d83ebc7b39149e3d67188dbfea8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 03:19:33 +0100
Subject: [PATCH 099/702] bump dep

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 63022f6c9d..f45d3a4d95 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "flux": "2.1.1",
     "focus-trap-react": "^3.0.5",
     "fuse.js": "^2.2.0",
-    "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
+    "gemini-scrollbar": "matrix-org/gemini-scrollbar#926a4c7",
     "gfm.css": "^1.1.1",
     "glob": "^5.0.14",
     "highlight.js": "^9.0.0",

From 079b1238a1954fbf096627b10eb58bc378461e68 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 03:20:59 +0100
Subject: [PATCH 100/702] bump right dep

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f45d3a4d95..79a3bf80e1 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "flux": "2.1.1",
     "focus-trap-react": "^3.0.5",
     "fuse.js": "^2.2.0",
-    "gemini-scrollbar": "matrix-org/gemini-scrollbar#926a4c7",
+    "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.1",
     "glob": "^5.0.14",
     "highlight.js": "^9.0.0",
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "matrix-org/slate-md-serializer#d6a7652",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#926a4c7",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From 95bfface99a917aaa466873ab3b050f9990dae68 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 03:43:40 +0100
Subject: [PATCH 101/702] comment out broken logic for stripping p tags & bump
 dep

---
 package.json    |  2 +-
 src/Markdown.js | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 79a3bf80e1..33bc75eff8 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "matrix-org/slate-md-serializer#926a4c7",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#1635f37",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
diff --git a/src/Markdown.js b/src/Markdown.js
index e67f4df4fd..2b16800d85 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -102,6 +102,7 @@ export default class Markdown {
             // (https://github.com/vector-im/riot-web/issues/3154)
             softbreak: '<br />',
         });
+/*        
         const real_paragraph = renderer.paragraph;
 
         renderer.paragraph = function(node, entering) {
@@ -114,16 +115,21 @@ export default class Markdown {
                 real_paragraph.call(this, node, entering);
             }
         };
+*/        
 
         renderer.html_inline = html_if_tag_allowed;
+  
         renderer.html_block = function(node) {
+/*
             // as with `paragraph`, we only insert line breaks
             // if there are multiple lines in the markdown.
             const isMultiLine = is_multi_line(node);
-
             if (isMultiLine) this.cr();
+*/
             html_if_tag_allowed.call(this, node);
+/*
             if (isMultiLine) this.cr();
+*/        
         };
 
         return renderer.render(this.parsed);
@@ -150,6 +156,7 @@ export default class Markdown {
             this.lit(s);
         };
 
+/*
         renderer.paragraph = function(node, entering) {
             // as with toHTML, only append lines to paragraphs if there are
             // multiple paragraphs
@@ -159,10 +166,12 @@ export default class Markdown {
                 }
             }
         };
+
         renderer.html_block = function(node) {
             this.lit(node.literal);
             if (is_multi_line(node) && node.next) this.lit('\n\n');
         };
+*/        
 
         // convert MD links into console-friendly ' < http://foo >' style links
         // ...except given this function never gets called with links, it's useless.

From f40af434bcfeec7e37015192993adc639b54d79e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 03:46:53 +0100
Subject: [PATCH 102/702] unbreak Markdown.toPlaintext

---
 src/Markdown.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Markdown.js b/src/Markdown.js
index 2b16800d85..e02118397b 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -156,7 +156,6 @@ export default class Markdown {
             this.lit(s);
         };
 
-/*
         renderer.paragraph = function(node, entering) {
             // as with toHTML, only append lines to paragraphs if there are
             // multiple paragraphs
@@ -171,7 +170,6 @@ export default class Markdown {
             this.lit(node.literal);
             if (is_multi_line(node) && node.next) this.lit('\n\n');
         };
-*/        
 
         // convert MD links into console-friendly ' < http://foo >' style links
         // ...except given this function never gets called with links, it's useless.

From 5b4a036e8c7db150aae1f404cb952ecb49d5970f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 03:53:05 +0100
Subject: [PATCH 103/702] bump dep

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 33bc75eff8..fb0fd3ec90 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "matrix-org/slate-md-serializer#1635f37",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#f5deb3f",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From 424dea1d4aeafa6267d971050a87d880a77f9a53 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Wed, 23 May 2018 08:57:55 +0000
Subject: [PATCH 104/702] Translated using Weblate (Swedish)

Currently translated at 77.2% (909 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 97 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 93 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index f583dfd271..6a0bd10025 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -74,7 +74,7 @@
     "Continue": "Fortsätt",
     "Could not connect to the integration server": "Det gick inte att ansluta till integrationsservern",
     "Create an account": "Skapa ett konto",
-    "Create Room": "Skapa ett rum",
+    "Create Room": "Skapa rum",
     "Cryptography": "Kryptografi",
     "Current password": "Nuvarande lösenord",
     "Curve25519 identity key": "Curve25519 -identitetsnyckel",
@@ -107,7 +107,7 @@
     "Email address (optional)": "Epostadress (valfri)",
     "Email, name or matrix ID": "Epostadress, namn, eller Matrix-ID",
     "Emoji": "Emoji",
-    "Enable encryption": "Sätt på kryptering",
+    "Enable encryption": "Aktivera kryptering",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Krypterade meddelanden syns inte på klienter som inte ännu stöder kryptering",
     "Encrypted room": "Krypterat rum",
     "%(senderName)s ended the call.": "%(senderName)s avslutade samtalet.",
@@ -307,7 +307,7 @@
     "Room %(roomId)s not visible": "Rummet %(roomId)s är inte synligt",
     "Room Colour": "Rumsfärg",
     "Room contains unknown devices": "Det finns okända enheter i rummet",
-    "Room name (optional)": "Rummets namn (valfri)",
+    "Room name (optional)": "Rumsnamn (valfri)",
     "%(roomName)s does not exist.": "%(roomName)s finns inte.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s är inte tillgängligt för tillfället.",
     "Rooms": "Rum",
@@ -819,5 +819,94 @@
     "Unblacklist": "Ta bort svartlistning",
     "Failed to invite the following users to %(groupId)s:": "Det gick inte att bjuda in följande användare till %(groupId)s:",
     "Failed to invite users to %(groupId)s": "Det gick inte att bjuda in användare till %(groupId)s",
-    "This room is not public. You will not be able to rejoin without an invite.": "Detta rum är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan."
+    "This room is not public. You will not be able to rejoin without an invite.": "Detta rum är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan.",
+    "Ignores a user, hiding their messages from you": "Ignorerar en användare och döljer dess meddelanden för dig",
+    "Stops ignoring a user, showing their messages going forward": "Slutar ignorera en användare och visar dess meddelanden för framöver",
+    "Opens the Developer Tools dialog": "Öppna dialogrutan Utvecklarverktyg",
+    "Notify the whole room": "Meddela hela rummet",
+    "Room Notification": "Rumsavisering",
+    "Users": "Användare",
+    "unknown device": "okänd enhet",
+    "verified": "verifierad",
+    "Verification": "Verifiering",
+    "User ID": "Användar-ID",
+    "unencrypted": "okrypterad",
+    "Export room keys": "Exportera rumsnycklar",
+    "Import room keys": "Importera rumsnycklar",
+    "File to import": "Fil att importera",
+    "Which officially provided instance you are using, if any": "Vilken officiellt tillhandahållen instans du använder, om någon",
+    "(unknown failure: %(reason)s)": "(okänt fel: %(reason)s)",
+    "(could not connect media)": "(det gick inte ansluta media)",
+    " (unsupported)": " (stöds ej)",
+    "Drop file here to upload": "Släpp fil här för att ladda upp",
+    "Ongoing conference call%(supportedText)s.": "Pågående konferenssamtal%(supportedText)s.",
+    "%(senderName)s sent an image": "%(senderName)s skickade en bild",
+    "%(senderName)s sent a video": "%(senderName)s skickade en video",
+    "%(senderName)s uploaded a file": "%(senderName)s laddade upp en fil",
+    "Options": "Alternativ",
+    "Unencrypted message": "Okrypterat meddelande",
+    "Verified": "Verifierad",
+    "Unverified": "Overifierad",
+    "Replying": "Svarar",
+    "Drop here to favourite": "Släpp här för att favorisera",
+    "Drop here to tag direct chat": "Släpp här för att göra till direkt-chatt",
+    "Drop here to restore": "Släpp här för att återställa",
+    "Drop here to demote": "Släpp här för att göra till låg prioritet",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Du är inte i något rum ännu! Tryck <CreateRoomButton> för att skapa ett rum eller <RoomDirectoryButton> för att bläddra i katalogen",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Vill du <acceptText>acceptera</acceptText> eller <declineText>avböja</declineText> denna inbjudan?",
+    "You have been invited to join this room by %(inviterName)s": "Du har blivit inbjuden att gå med i rummet av %(inviterName)s",
+    "Kick this user?": "Kicka användaren?",
+    "To send messages, you must be a": "För att skicka meddelanden, måste du vara",
+    "To invite users into the room, you must be a": "För att bjuda in användare i rummet, måste du vara",
+    "To configure the room, you must be a": "För att konfigurera rummet, måste du vara",
+    "To kick users, you must be a": "För att kicka användare, måste du vara",
+    "To ban users, you must be a": "För att banna användare, måste du vara",
+    "To remove other users' messages, you must be a": "För att ta bort andra användares meddelanden, måste du vara",
+    "%(user)s is a %(userRole)s": "%(user)s är %(userRole)s",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Du har blivit kickad från %(roomName)s av %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "Du har blivit kickad från detta rum av %(userName)s.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Du har blivit bannad från %(roomName)s av %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Du har blivit bannad från detta rum av %(userName)s.",
+    "This room": "Detta rum",
+    "You are trying to access %(roomName)s.": "Du försöker komma åt %(roomName)s.",
+    "You are trying to access a room.": "Du försöker komma åt ett rum.",
+    "This is a preview of this room. Room interactions have been disabled": "Detta är en förhandsvisning av rummet. Rumsinteraktioner har inaktiverats",
+    "To change the room's avatar, you must be a": "För att ändra rummets avatar, måste du vara",
+    "To change the room's name, you must be a": "För att ändra rummets namn, måste du vara",
+    "To change the room's main address, you must be a": "För att ändra rummets huvudadress, måste du vara",
+    "To change the room's history visibility, you must be a": "För att ändra visning av rummets historik, måste du vara",
+    "To change the permissions in the room, you must be a": "För att ändra behörigheter i rummet, måste du vara",
+    "To change the topic, you must be a": "För att ändra ämnet, måste du vara",
+    "To modify widgets in the room, you must be a": "För att ändra widgets i rummet, måste du vara",
+    "Banned by %(displayName)s": "Bannad av %(displayName)s",
+    "The visibility of existing history will be unchanged": "Synlighet av befintlig historik förblir oförändrad",
+    "You should not yet trust it to secure data": "Du bör ännu inte lita på att den säkrar data",
+    "(warning: cannot be disabled again!)": "(varning: kan inte inaktiveras igen!)",
+    "Muted Users": "Dämpade användare",
+    "This room is not accessible by remote Matrix servers": "Detta rum är inte tillgängligt för externa Matrix-servrar",
+    "To send events of type <eventType/>, you must be a": "För att skicka händelser av typen <eventType/>, måste du vara",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Det gick inte att ladda händelsen som svarades på, antingen finns den inte eller så har du inte behörighet att se den.",
+    "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.": "Är du säker på att du vill ta bort den här händelsen? Observera att om du tar bort en rumsnamns- eller ämnesändring kan det ångra ändringen.",
+    "Send Custom Event": "Skicka anpassad händelse",
+    "You must specify an event type!": "Du måste ange en händelsetyp!",
+    "Event sent!": "Händelse skickad!",
+    "Failed to send custom event.": "Det gick inte att skicka anpassad händelse.",
+    "Event Type": "Händelsetyp",
+    "Event Content": "Händelseinnehåll",
+    "Example": "Exempel",
+    "example": "exempel",
+    "Create": "Skapa",
+    "Advanced options": "Avancerade alternativ",
+    "Block users on other matrix homeservers from joining this room": "Blockera användare på andra Matrix-hemservrar från att gå med i detta rum",
+    "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!",
+    "Unknown error": "Okänt fel",
+    "Incorrect password": "Felaktigt lösenord",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.",
+    "This action is irreversible.": "Denna åtgärd går inte att ångra.",
+    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:",
+    "Device name": "Enhetsnamn",
+    "Device key": "Enhetsnyckel",
+    "Verify device": "Verifiera enhet",
+    "I verify that the keys match": "Jag verifierar att nycklarna matchar",
+    "In future this verification process will be more sophisticated.": "I framtiden kommer denna verifieringsprocess att bli mer sofistikerad."
 }

From a6e7a8106c0b5bc94053de2640b2f9ff09808fdb Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Wed, 23 May 2018 09:42:21 +0000
Subject: [PATCH 105/702] Translated using Weblate (Swedish)

Currently translated at 78.2% (923 of 1179 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 6a0bd10025..0247b5c080 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -908,5 +908,19 @@
     "Device key": "Enhetsnyckel",
     "Verify device": "Verifiera enhet",
     "I verify that the keys match": "Jag verifierar att nycklarna matchar",
-    "In future this verification process will be more sophisticated.": "I framtiden kommer denna verifieringsprocess att bli mer sofistikerad."
+    "In future this verification process will be more sophisticated.": "I framtiden kommer denna verifieringsprocess att bli mer sofistikerad.",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Om det matchar, tryck på verifieringsknappen nedan. Om inte så är det risk att någon annan försöker avlyssna enheten och då vill du förmodligen trycka på svartlistsknappen istället.",
+    "State Key": "Lägesnyckel",
+    "Send Account Data": "Skicka kontodata",
+    "Explore Account Data": "Utforska kontodata",
+    "Toolbox": "Verktygslåda",
+    "Developer Tools": "Utvecklarverktyg",
+    "Unverify": "Ta bort verifiering",
+    "Verify...": "Verifiera...",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Du har lagt till en ny enhet '%(displayName)s', som begär krypteringsnycklar.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Din overifierade enhet '%(displayName)s' begär krypteringsnycklar.",
+    "Start verification": "Starta verifiering",
+    "Share without verifying": "Dela utan att verifiera",
+    "Ignore request": "Ignorera begäran",
+    "Loading device info...": "Laddar enhetsinfo..."
 }

From b9f597b75f1a816deece2e955bd68e0cda62f4be Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 23 May 2018 10:15:48 +0000
Subject: [PATCH 106/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 6341b4468e..27363baf0f 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1175,5 +1175,9 @@
     "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a <PolicyLink>sütikről és titoktartási irányelvekről</PolicyLink> szóló leírást).",
     "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
     "Yes please": "Igen, kérlek",
-    "Muted Users": "Elnémított felhasználók"
+    "Muted Users": "Elnémított felhasználók",
+    "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.",
+    "Terms and Conditions": "Általános Szerződési Feltételek",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
+    "Review terms and conditions": "Általános Szerződési Feltételek elolvasása"
 }

From 94f7d1b2246613412af71d0f0da182de6512584b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Wed, 23 May 2018 10:42:04 +0000
Subject: [PATCH 107/702] Translated using Weblate (French)

Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 048dcd9d81..a08e5ee250 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1175,5 +1175,9 @@
     "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
     "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
     "Yes please": "Oui, s'il vous plaît",
-    "Muted Users": "Utilisateurs ignorés"
+    "Muted Users": "Utilisateurs ignorés",
+    "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.",
+    "Terms and Conditions": "Conditions générales",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
+    "Review terms and conditions": "Voir les conditions générales"
 }

From 87c3e92014754ff454f07cd642cb456dc19dd43f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 13:32:48 +0100
Subject: [PATCH 108/702] bump dep

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fb0fd3ec90..5dc3e698f2 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "matrix-org/slate-md-serializer#f5deb3f",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#11fe1b6",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From fb5240aabd67a6a6f07d85b5f003c757e38b95dd Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 14:00:54 +0100
Subject: [PATCH 109/702] explain why we're now including <p/>s

---
 src/Markdown.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Markdown.js b/src/Markdown.js
index e02118397b..9d9a8621c9 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -102,6 +102,15 @@ export default class Markdown {
             // (https://github.com/vector-im/riot-web/issues/3154)
             softbreak: '<br />',
         });
+
+        // Trying to strip out the wrapping <p/> causes a lot more complication
+        // than it's worth, i think.  For instance, this code will go and strip
+        // out any <p/> tag (no matter where it is in the tree) which doesn't
+        // contain \n's.
+        // On the flip side, <p/>s are quite opionated and restricted on where
+        // you can nest them.
+        //
+        // Let's try sending with <p/>s anyway for now, though.
 /*        
         const real_paragraph = renderer.paragraph;
 

From b0ff61f7ef3757dee9f6dc9ee0881b7868d6c015 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 14:12:08 +0100
Subject: [PATCH 110/702] switch code schema to match slate-md-serializer

---
 .../views/rooms/MessageComposerInput.js       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 0b57e90184..94ef88d04b 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -95,7 +95,7 @@ const BLOCK_TAGS = {
     h6: 'heading6',
     li: 'list-item',
     ol: 'numbered-list',
-    pre: 'code-block',
+    pre: 'code',
 };
 
 const MARK_TAGS = {
@@ -103,7 +103,7 @@ const MARK_TAGS = {
     b: 'bold', // deprecated
     em: 'italic',
     i: 'italic', // deprecated
-    code: 'code',
+    code: 'inline-code',
     u: 'underlined',
     del: 'deleted',
     strike: 'deleted', // deprecated
@@ -710,7 +710,7 @@ export default class MessageComposerInput extends React.Component {
                 [KeyCode.KEY_B]: 'bold',
                 [KeyCode.KEY_I]: 'italic',
                 [KeyCode.KEY_U]: 'underlined',
-                [KeyCode.KEY_J]: 'code',
+                [KeyCode.KEY_J]: 'inline-code',
             }[ev.keyCode];
 
             if (ctrlCmdCommand) {
@@ -760,7 +760,7 @@ export default class MessageComposerInput extends React.Component {
                      this.hasBlock('heading4') ||
                      this.hasBlock('heading5') ||
                      this.hasBlock('heading6') ||
-                     this.hasBlock('code-block')))
+                     this.hasBlock('code')))
                 {
                     return change.setBlocks(DEFAULT_NODE);
                 }
@@ -832,7 +832,7 @@ export default class MessageComposerInput extends React.Component {
                 case 'heading5':
                 case 'heading6':
                 case 'list-item':
-                case 'code-block': {
+                case 'code': {
                     const isActive = this.hasBlock(type);
                     const isList = this.hasBlock('list-item');
 
@@ -850,7 +850,7 @@ export default class MessageComposerInput extends React.Component {
                 // marks:
                 case 'bold':
                 case 'italic':
-                case 'code':
+                case 'inline-code':
                 case 'underlined':
                 case 'deleted': {
                     change.toggleMark(type);
@@ -885,8 +885,8 @@ export default class MessageComposerInput extends React.Component {
                 'underline': (text) => `<u>${text}</u>`,
                 'strike': (text) => `<del>${text}</del>`,
                 // ("code" is triggered by ctrl+j by draft-js by default)
-                'code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
-                'code-block': textMdCodeBlock,
+                'inline-code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
+                'code': textMdCodeBlock,
                 'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n',
                 'unordered-list-item': (text) => text.split('\n').map((line) => `\n- ${line}`).join(''),
                 'ordered-list-item': (text) => text.split('\n').map((line, i) => `\n${i + 1}. ${line}`).join(''),
@@ -897,8 +897,8 @@ export default class MessageComposerInput extends React.Component {
                 'italic': -1,
                 'underline': -4,
                 'strike': -6,
-                'code': treatInlineCodeAsBlock ? -5 : -1,
-                'code-block': -5,
+                'inline-code': treatInlineCodeAsBlock ? -5 : -1,
+                'code': -5,
                 'blockquote': -2,
             }[command];
 
@@ -971,7 +971,7 @@ export default class MessageComposerInput extends React.Component {
         }
 
         if (this.state.editorState.blocks.some(
-            block => ['code-block', 'block-quote', 'list-item'].includes(block.type)
+            block => ['code', 'block-quote', 'list-item'].includes(block.type)
         )) {
             // allow the user to terminate blocks by hitting return rather than sending a msg
             return;
@@ -1369,7 +1369,7 @@ export default class MessageComposerInput extends React.Component {
                 return <li {...attributes}>{children}</li>;
             case 'numbered-list':
                 return <ol {...attributes}>{children}</ol>;
-            case 'code-block':
+            case 'code':
                 return <pre {...attributes}><code {...attributes}>{children}</code></pre>;
             case 'link':
                 return <a {...attributes} href={ node.data.get('href') }>{children}</a>;
@@ -1424,7 +1424,7 @@ export default class MessageComposerInput extends React.Component {
                 return <strong {...attributes}>{children}</strong>;
             case 'italic':
                 return <em {...attributes}>{children}</em>;
-            case 'code':
+            case 'inline-code':
                 return <code {...attributes}>{children}</code>;
             case 'underlined':
                 return <u {...attributes}>{children}</u>;

From 294565c47e67eb207900e45cd7355f069f8ae888 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 14:12:36 +0100
Subject: [PATCH 111/702] switch code schema to match slate-md-serializer

---
 .../{button-text-code-on.svg => button-text-inline-code-on.svg}   | 0
 res/img/{button-text-code.svg => button-text-inline-code.svg}     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename res/img/{button-text-code-on.svg => button-text-inline-code-on.svg} (100%)
 rename res/img/{button-text-code.svg => button-text-inline-code.svg} (100%)

diff --git a/res/img/button-text-code-on.svg b/res/img/button-text-inline-code-on.svg
similarity index 100%
rename from res/img/button-text-code-on.svg
rename to res/img/button-text-inline-code-on.svg
diff --git a/res/img/button-text-code.svg b/res/img/button-text-inline-code.svg
similarity index 100%
rename from res/img/button-text-code.svg
rename to res/img/button-text-inline-code.svg

From 9f9cde12cead6ca442a480a694417655c389e8ec Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 23 May 2018 17:18:33 +0100
Subject: [PATCH 112/702] Make devTools styling more consistent and easier to
 edit event data.

---
 res/css/views/dialogs/_DevtoolsDialog.scss     | 18 ++++++++++++++++--
 src/components/views/dialogs/DevtoolsDialog.js | 10 +++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 8918373ecf..a8e25bb08b 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -14,8 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_DevTools_content {
+    margin: 10px 0;
+}
+
 .mx_DevTools_RoomStateExplorer_button, .mx_DevTools_RoomStateExplorer_query {
     margin-bottom: 10px;
+    max-width: 684px;
+    width: 100%;
+}
+
+.mx_DevTools_LabalCell {
+    font-weight: bold;
 }
 
 .mx_DevTools_label_left {
@@ -38,7 +48,6 @@ limitations under the License.
 
 .mx_DevTools_inputLabelCell
 {
-    padding-bottom: 21px;
     display: table-cell;
     font-weight: bold;
     padding-right: 24px;
@@ -46,7 +55,6 @@ limitations under the License.
 
 .mx_DevTools_inputCell {
     display: table-cell;
-    padding-bottom: 21px;
     width: 240px;
 }
 
@@ -62,6 +70,12 @@ limitations under the License.
     font-size: 16px;
 }
 
+.mx_DevTools_textarea {
+    font-size: 12px;
+    min-height: 250px;
+    width: 100%;
+}
+
 .mx_DevTools_tgl {
     display: none;
 
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 1d3c8ecc09..f2a969ef41 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -132,17 +132,17 @@ class SendCustomEvent extends GenericEditor {
         }
 
         return <div>
-            <div className="mx_Dialog_content">
+            <div className="mx_DevTools_content">
                 { this.textInput('eventType', _t('Event Type')) }
                 { this.state.isStateEvent && this.textInput('stateKey', _t('State Key')) }
 
                 <br />
 
-                <div className="mx_UserSettings_profileLabelCell">
+                <div className="mx_DevTools_LabalCell">
                     <label htmlFor="evContent"> { _t('Event Content') } </label>
                 </div>
                 <div>
-                    <textarea id="evContent" onChange={this._onChange} value={this.state.evContent} className="mx_TextInputDialog_input" cols="63" rows="5" />
+                    <textarea id="evContent" onChange={this._onChange} value={this.state.evContent} className="mx_DevTools_textarea" />
                 </div>
             </div>
             <div className="mx_Dialog_buttons">
@@ -227,7 +227,7 @@ class SendAccountData extends GenericEditor {
                     <label htmlFor="evContent"> { _t('Event Content') } </label>
                 </div>
                 <div>
-                    <textarea id="evContent" onChange={this._onChange} value={this.state.evContent} className="mx_TextInputDialog_input" cols="63" rows="5" />
+                    <textarea id="evContent" onChange={this._onChange} value={this.state.evContent} className="mx_DevTools_textarea" />
                 </div>
             </div>
             <div className="mx_Dialog_buttons">
@@ -485,7 +485,7 @@ class AccountDataExplorer extends DevtoolsComponent {
             }
 
             return <div className="mx_ViewSource">
-                <div className="mx_Dialog_content">
+                <div className="mx_DevTools_content">
                     <SyntaxHighlight className="json">
                         { JSON.stringify(this.state.event.event, null, 2) }
                     </SyntaxHighlight>

From 2a9859c7b64dae3d3d345945757b76178aaf8ae7 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 23 May 2018 17:40:15 +0100
Subject: [PATCH 113/702] Styling for consistency.

---
 res/css/views/dialogs/_DevtoolsDialog.scss     | 2 ++
 src/components/views/dialogs/DevtoolsDialog.js | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index a8e25bb08b..4ae71eed5d 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -72,7 +72,9 @@ limitations under the License.
 
 .mx_DevTools_textarea {
     font-size: 12px;
+    max-width: 624px;
     min-height: 250px;
+    padding: 10px;
     width: 100%;
 }
 
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index f2a969ef41..1566302e42 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -138,7 +138,7 @@ class SendCustomEvent extends GenericEditor {
 
                 <br />
 
-                <div className="mx_DevTools_LabalCell">
+                <div className="mx_DevTools_inputLabelCell">
                     <label htmlFor="evContent"> { _t('Event Content') } </label>
                 </div>
                 <div>
@@ -219,11 +219,11 @@ class SendAccountData extends GenericEditor {
         }
 
         return <div>
-            <div className="mx_Dialog_content">
+            <div className="mx_DevTools_content">
                 { this.textInput('eventType', _t('Event Type')) }
                 <br />
 
-                <div className="mx_UserSettings_profileLabelCell">
+                <div className="mx_DevTools_inputLabelCell">
                     <label htmlFor="evContent"> { _t('Event Content') } </label>
                 </div>
                 <div>

From 7db31835b42f3a658518ad0bc9a311a4472f4a8a Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 23 May 2018 18:24:52 +0100
Subject: [PATCH 114/702] Remove unused / misspelt class.

---
 res/css/views/dialogs/_DevtoolsDialog.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 4ae71eed5d..084225397f 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -24,10 +24,6 @@ limitations under the License.
     width: 100%;
 }
 
-.mx_DevTools_LabalCell {
-    font-weight: bold;
-}
-
 .mx_DevTools_label_left {
     float: left;
 }

From 7da51f2bd4e400fba3259103950af895f7779380 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 23 May 2018 18:40:48 +0100
Subject: [PATCH 115/702] Remove max-width restriction (no longer makes sense).

---
 res/css/views/dialogs/_DevtoolsDialog.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 084225397f..a4a868bd11 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -20,7 +20,6 @@ limitations under the License.
 
 .mx_DevTools_RoomStateExplorer_button, .mx_DevTools_RoomStateExplorer_query {
     margin-bottom: 10px;
-    max-width: 684px;
     width: 100%;
 }
 

From 864a33f978dd313b23064f55eb13039ad3c1a5d3 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 23 May 2018 20:12:13 +0100
Subject: [PATCH 116/702] switch to using 'code' for both blocks & marks to
 match md-serializer

---
 package.json                                       |  2 +-
 src/components/views/rooms/MessageComposer.js      |  2 +-
 src/components/views/rooms/MessageComposerInput.js | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 5dc3e698f2..f3f184fb65 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "matrix-org/slate-md-serializer#11fe1b6",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#1580ed67",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 28502c348d..686ab3fcb6 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -356,7 +356,7 @@ export default class MessageComposer extends React.Component {
         let formatBar;
         if (this.state.showFormatting && this.state.inputState.isRichTextEnabled) {
             const {marks, blockType} = this.state.inputState;
-            const formatButtons = ["bold", "italic", "deleted", "underlined", "code", "block-quote", "bulleted-list", "numbered-list"].map(
+            const formatButtons = ["bold", "italic", "deleted", "underlined", "inline-code", "block-quote", "bulleted-list", "numbered-list"].map(
                 (name) => {
                     const active = marks.some(mark => mark.type === name) || blockType === name;
                     const suffix = active ? '-on' : '';
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 94ef88d04b..50b3422fee 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -103,7 +103,7 @@ const MARK_TAGS = {
     b: 'bold', // deprecated
     em: 'italic',
     i: 'italic', // deprecated
-    code: 'inline-code',
+    code: 'code',
     u: 'underlined',
     del: 'deleted',
     strike: 'deleted', // deprecated
@@ -853,7 +853,7 @@ export default class MessageComposerInput extends React.Component {
                 case 'inline-code':
                 case 'underlined':
                 case 'deleted': {
-                    change.toggleMark(type);
+                    change.toggleMark(type === 'inline-code' ? 'code' : type);
                 }
                 break;
 
@@ -885,7 +885,7 @@ export default class MessageComposerInput extends React.Component {
                 'underline': (text) => `<u>${text}</u>`,
                 'strike': (text) => `<del>${text}</del>`,
                 // ("code" is triggered by ctrl+j by draft-js by default)
-                'inline-code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
+                'code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
                 'code': textMdCodeBlock,
                 'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n',
                 'unordered-list-item': (text) => text.split('\n').map((line) => `\n- ${line}`).join(''),
@@ -897,7 +897,7 @@ export default class MessageComposerInput extends React.Component {
                 'italic': -1,
                 'underline': -4,
                 'strike': -6,
-                'inline-code': treatInlineCodeAsBlock ? -5 : -1,
+                'code': treatInlineCodeAsBlock ? -5 : -1,
                 'code': -5,
                 'blockquote': -2,
             }[command];
@@ -1424,7 +1424,7 @@ export default class MessageComposerInput extends React.Component {
                 return <strong {...attributes}>{children}</strong>;
             case 'italic':
                 return <em {...attributes}>{children}</em>;
-            case 'inline-code':
+            case 'code':
                 return <code {...attributes}>{children}</code>;
             case 'underlined':
                 return <u {...attributes}>{children}</u>;

From 7b00982a3533661959ebed82ca20eec18b5c3aa3 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Wed, 23 May 2018 20:29:15 +0000
Subject: [PATCH 117/702] Translated using Weblate (Swedish)

Currently translated at 81.1% (957 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 50 +++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0247b5c080..f2a26c2e90 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -40,7 +40,7 @@
     "Blacklisted": "Svartlistad",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
     "Banned users": "Bannade användare",
-    "Bans user with given id": "Bannar användaren med givet ID",
+    "Bans user with given id": "Bannar användaren med givet id",
     "Ban": "Banna",
     "Attachment": "Bilaga",
     "Call Timeout": "Samtalstimeout",
@@ -97,7 +97,7 @@
     "Direct chats": "Direkta chattar",
     "Disinvite": "Häv inbjudan",
     "Display name": "Namn",
-    "Displays action": "Visar handling",
+    "Displays action": "Visar åtgärd",
     "Don't send typing notifications": "Sänd inte \"skriver\"-status",
     "Download %(text)s": "Ladda ner %(text)s",
     "Drop here to tag %(section)s": "Dra hit för att tagga %(section)s",
@@ -227,10 +227,10 @@
     "Login as guest": "Logga in som gäst",
     "Logout": "Logga ut",
     "Low priority": "Lågprioritet",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt åt alla rumsmedlemmar fr.o.m att de bjöds in.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde framtida rumshistorik synligt åt alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtida rumshistorik synligt åt alla rumsmedlemmar.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde framtida rumshistorik synligt åt vem som helst.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde framtida rumshistorik synligt för alla.",
     "Manage Integrations": "Hantera integrationer",
     "Markdown is disabled": "Markdown är inaktiverat",
     "Markdown is enabled": "Markdown är aktiverat",
@@ -505,7 +505,7 @@
     "Direct Chat": "Direkt-chatt",
     "The server may be unavailable or overloaded": "Servern kan vara överbelastad eller inte tillgänglig",
     "Reject": "Avvisa",
-    "Failed to set Direct Message status of room": "Det gick inte att sätta Direkt meddelande-status på rummet",
+    "Failed to set Direct Message status of room": "Det gick inte att ställa in direktmeddelandestatus för rummet",
     "Monday": "måndag",
     "Remove from Directory": "Ta bort från katalogen",
     "Enable them now": "Sätt på nu",
@@ -922,5 +922,39 @@
     "Start verification": "Starta verifiering",
     "Share without verifying": "Dela utan att verifiera",
     "Ignore request": "Ignorera begäran",
-    "Loading device info...": "Laddar enhetsinfo..."
+    "Loading device info...": "Laddar enhetsinfo...",
+    "Encryption key request": "Begäran av krypteringsnyckel",
+    "Log out and remove encryption keys?": "Logga ut och ta bort krypteringsnycklar?",
+    "Clear Storage and Sign Out": "Rensa lagring och logga ut",
+    "Send Logs": "Skicka loggar",
+    "Refresh": "Uppdatera",
+    "Unable to restore session": "Det gick inte att återställa sessionen",
+    "We encountered an error trying to restore your previous session.": "Ett fel uppstod vid återställning av din tidigare session.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Om du nyligen har använt en senare version av Riot kan din session vara inkompatibel med den här versionen. Stäng det här fönstret och använd senare versionen istället.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Att rensa webbläsarens lagring kan lösa problemet, men då loggas du ut och krypterad chatthistorik blir oläslig.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "För tillfället svartlistar du overifierade enheter. För att skicka meddelanden till dessa enheter måste du verifiera dem.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Vi rekommenderar att du går igenom verifieringsprocessen för varje enhet för att bekräfta att de tillhör sina rätta ägare, men du kan skicka meddelandet utan att verifiera om du föredrar det.",
+    "Collapse Reply Thread": "Dölj svarstråd",
+    "Terms and Conditions": "Villkor",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "För att fortsätta använda hemservern %(homeserverDomain)s måste du granska och godkänna våra villkor.",
+    "Review terms and conditions": "Granska villkoren",
+    "Old cryptography data detected": "Gammal krypteringsdata upptäckt",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det finns okända enheter i rummet: om du fortsätter utan att verifiera dem, är det möjligt att någon kan avlyssna ditt samtal.",
+    "Unable to capture screen": "Det gick inte att ta skärmdump",
+    "Failed to add the following rooms to %(groupId)s:": "Det gick inte att lägga till följande rum till %(groupId)s:",
+    "Missing roomId.": "Rums-ID saknas.",
+    "This room is not recognised.": "Detta rum känns inte igen.",
+    "Usage": "Användning",
+    "Sets the room topic": "Ställer in rumsämne",
+    "Unrecognised room alias:": "Oigenkänt rumsalias:",
+    "Unknown (user, device) pair:": "Okänt (användare, enhet) par:",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "VARNING: Enhet redan verifierad, men nycklarna MATCHAR INTE!",
+    "Verified key": "Verifierad nyckel",
+    "Unrecognised command:": "Oigenkänt kommando:",
+    "Unbans user with given id": "Avbannar användare med givet id",
+    "Verifies a user, device, and pubkey tuple": "Verifierar en användare, enhet och nycklar",
+    "VoIP conference started.": "VoIP-konferens startad.",
+    "VoIP conference finished.": "VoIP-konferens avslutad.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern."
 }

From 3f229d5c55b08a8eb6f66186d1b083dcc0eba181 Mon Sep 17 00:00:00 2001
From: stuve20 <stuve20@gmail.com>
Date: Wed, 23 May 2018 20:33:08 +0000
Subject: [PATCH 118/702] Translated using Weblate (Swedish)

Currently translated at 81.1% (958 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index f2a26c2e90..cf7b4941a8 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -956,5 +956,6 @@
     "VoIP conference started.": "VoIP-konferens startad.",
     "VoIP conference finished.": "VoIP-konferens avslutad.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern."
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern.",
+    "The remote side failed to pick up": "Mottagaren misslyckades med att svara"
 }

From a0e3ec53070c4e256086e85d04def3ed197216de Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Wed, 23 May 2018 20:34:43 +0000
Subject: [PATCH 119/702] Translated using Weblate (Swedish)

Currently translated at 81.1% (958 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index cf7b4941a8..dbaba6037f 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -957,5 +957,5 @@
     "VoIP conference finished.": "VoIP-konferens avslutad.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern.",
-    "The remote side failed to pick up": "Mottagaren misslyckades med att svara"
+    "The remote side failed to pick up": "Mottagaren kunde inte svara"
 }

From 16987c3ef2f48031790b978a6859ccb65db82a06 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 24 May 2018 07:02:42 +0000
Subject: [PATCH 120/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index b2ffa480c3..c8fe678f87 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1170,5 +1170,14 @@
     "At this time it is not possible to reply with an emote.": "Une honetan ezin da irriabartxo batekin erantzun.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ezin izan da erantzundako gertaera kargatu, edo ez dago edo ez duzu ikusteko baimenik.",
     "Collapse Reply Thread": "Tolestu erantzun-haria",
-    "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan"
+    "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan",
+    "Send analytics data": "Bidali datu analitikoak",
+    "Muted Users": "Mutututako erabiltzaileak",
+    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure <PolicyLink>Cookie eta pribatutasun politikak</PolicyLink>).",
+    "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.",
+    "Yes please": "Bai mesedez",
+    "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.",
+    "Terms and Conditions": "Termino eta baldintzak",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.",
+    "Review terms and conditions": "Irakurri termino eta baldintzak"
 }

From 03684f272074a74d04fcfbf77d804a279d5da2b8 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 23 May 2018 14:56:48 +0000
Subject: [PATCH 121/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1178 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 304af044bd..b98996355d 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1172,5 +1172,10 @@
     "Send analytics data": "Отправить данные аналитики",
     "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
     "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.",
-    "Yes please": "Да, пожалуйста"
+    "Yes please": "Да, пожалуйста",
+    "Muted Users": "Приглушенные пользователи",
+    "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
+    "Terms and Conditions": "Условия и положения",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
+    "Review terms and conditions": "Просмотр условий и положений"
 }

From 8907469f06eb164c0fb2d08e39be649b6bf47868 Mon Sep 17 00:00:00 2001
From: stuve20 <stuve20@gmail.com>
Date: Wed, 23 May 2018 20:37:06 +0000
Subject: [PATCH 122/702] Translated using Weblate (Swedish)

Currently translated at 81.2% (959 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index dbaba6037f..0f898a3374 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -957,5 +957,6 @@
     "VoIP conference finished.": "VoIP-konferens avslutad.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern.",
-    "The remote side failed to pick up": "Mottagaren kunde inte svara"
+    "The remote side failed to pick up": "Mottagaren kunde inte svara",
+    "Room name or alias": "Rumsnamn eller alias"
 }

From a2946b0796e42ac8a0c82440cc1586d7294bf041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 24 May 2018 10:07:30 +0000
Subject: [PATCH 123/702] Translated using Weblate (French)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index a08e5ee250..635a3254cc 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1179,5 +1179,12 @@
     "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.",
     "Terms and Conditions": "Conditions générales",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
-    "Review terms and conditions": "Voir les conditions générales"
+    "Review terms and conditions": "Voir les conditions générales",
+    "Failed to indicate account erasure": "Échec de notification de la suppression du compte",
+    "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. <b>This action is irreversible.</b>": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. <b>Cette action est irréversible.</b>",
+    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "Désactiver votre compte <b>ne supprime pas les messages que vous avez envoyés par défaut.</b> Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.",
+    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.",
+    "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
+    "password": "mot de passe",
+    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience)."
 }

From 2e67eecf3d0c31bf1f579ec266de44647edac214 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 24 May 2018 10:21:06 +0000
Subject: [PATCH 124/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 27363baf0f..792e37a83d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1179,5 +1179,12 @@
     "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.",
     "Terms and Conditions": "Általános Szerződési Feltételek",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
-    "Review terms and conditions": "Általános Szerződési Feltételek elolvasása"
+    "Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
+    "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen",
+    "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. <b>This action is irreversible.</b>": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. <b>Ez a művelet visszafordíthatatlan.</b>",
+    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése <b>alapértelmezetten nem töröli semelyik általad küldött üzenetet.</b> Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.",
+    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.",
+    "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
+    "password": "jelszó",
+    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet)."
 }

From 4c38d7a5cd244be1f5b0abe51fddb033eee94af7 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 24 May 2018 10:40:44 +0000
Subject: [PATCH 125/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index c8fe678f87..67aad82e36 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1179,5 +1179,12 @@
     "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.",
     "Terms and Conditions": "Termino eta baldintzak",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.",
-    "Review terms and conditions": "Irakurri termino eta baldintzak"
+    "Review terms and conditions": "Irakurri termino eta baldintzak",
+    "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi",
+    "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. <b>This action is irreversible.</b>": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. <b>Ez dago ekintza hau desegiterik.</b>",
+    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean <b>ez dira lehenetsita zuk bidalitako mezuak ezabatuko.</b> Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.",
+    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
+    "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
+    "password": "pasahitza",
+    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz)."
 }

From cd91974fe8e3c76feface031f7a043cf0cb9d54a Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 24 May 2018 11:23:00 +0000
Subject: [PATCH 126/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 156a09f661..3154f1f3b9 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1183,5 +1183,9 @@
     "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.",
     "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
     "password": "jelszó",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet)."
+    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. <b>Ez a művelet visszafordíthatatlan.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése <b>nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek.</b> Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)"
 }

From 44a150aaabced1465b5e26bb3bde05727566419a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 24 May 2018 12:10:20 +0000
Subject: [PATCH 127/702] Translated using Weblate (French)

Currently translated at 99.7% (1182 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7c56712b70..16be476a29 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1183,5 +1183,6 @@
     "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.",
     "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
     "password": "mot de passe",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience)."
+    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).",
+    "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>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. <b>Cette action est irréversible.</b>"
 }

From e6aa204484a582f7924fc728858499c568bc2dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 24 May 2018 12:21:51 +0000
Subject: [PATCH 128/702] Translated using Weblate (French)

Currently translated at 100.0% (1186 of 1186 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 16be476a29..dc36520506 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1184,5 +1184,10 @@
     "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
     "password": "mot de passe",
     "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).",
-    "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>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. <b>Cette action est irréversible.</b>"
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. <b>Cette action est irréversible.</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.": "La désactivation du compte <b>ne nous fait pas oublier les messages que vous avez envoyés par défaut.</b> Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
+    "e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
+    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant <UsageDataLink>des données d'utilisation</UsageDataLink> ? Cela utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)"
 }

From f8415548d05b9d8ba9317e8e9844a73adb42ee5d Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 24 May 2018 13:03:13 +0000
Subject: [PATCH 129/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1186 of 1186 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 3154f1f3b9..f2aaac9a81 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1187,5 +1187,7 @@
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. <b>Ez a művelet visszafordíthatatlan.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése <b>nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek.</b> Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)"
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
+    "e.g. %(exampleValue)s": "pl. %(exampleValue)s",
+    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Segítesz jobbá tenni a Riotot <UsageDataLink>használati adat</UsageDataLink> küldésével? Ez sütit (cookie) fog használni. (Nézd meg az <PolicyLink>Általános Szerződési Feltételeket</PolicyLink>)."
 }

From a13d58f6c254aa8cd057edefdd54b229108b633b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 24 May 2018 14:58:59 +0100
Subject: [PATCH 130/702] More thorough check of IM URL validity.

---
 src/components/views/elements/AppTile.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0895ede636..e4d003b59b 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -122,23 +122,32 @@ export default class AppTile extends React.Component {
 
     /**
      * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
-     * @param  {[type]}  url URL to check
+     * @param  {[type]}  testUrlString URL to check
      * @return {Boolean} True if specified URL is a scalar URL
      */
-    isScalarUrl(url) {
-        if (!url) {
+    isScalarUrl(testUrlString) {
+        if (!testUrlString) {
             console.error('Scalar URL check failed. No URL specified');
             return false;
         }
 
+        const testUrl = url.parse(testUrlString);
+
         let scalarUrls = SdkConfig.get().integrations_widgets_urls;
         if (!scalarUrls || scalarUrls.length == 0) {
             scalarUrls = [SdkConfig.get().integrations_rest_url];
         }
 
         for (let i = 0; i < scalarUrls.length; i++) {
-            if (url.startsWith(scalarUrls[i])) {
-                return true;
+            const scalarUrl = url.parse(scalarUrls[i]);
+            if (testUrl && scalarUrl) {
+                if (
+                    testUrl.protocol === scalarUrl.protocol &&
+                    testUrl.host === scalarUrl.host &&
+                    testUrl.pathname.startsWith(scalarUrl.pathname)
+                ) {
+                    return true;
+                }
             }
         }
         return false;

From 9753ee8d825001e76e726d2173068ee5d144ac31 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 24 May 2018 16:14:18 +0100
Subject: [PATCH 131/702] Better check of jitsi widget message origin.

---
 src/components/views/elements/AppTile.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index e4d003b59b..018b6cb342 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -278,7 +278,12 @@ export default class AppTile extends React.Component {
             event.origin = event.originalEvent.origin;
         }
 
-        if (!this.state.widgetUrl.startsWith(event.origin)) {
+        const widgetUrlObj = url.parse(this.state.widgetUrl);
+        const eventOrigin = url.parse(event.origin);
+        if (
+            eventOrigin.protocol !== widgetUrlObj.protocol ||
+            eventOrigin.host !== widgetUrlObj.host
+        ) {
             return;
         }
 

From 24aeda2e05eed18d836df8d809abb75ff994edcc Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 24 May 2018 16:52:04 +0100
Subject: [PATCH 132/702] Fix bug where usage data link not visible when no
 cookie policy url

---
 src/components/views/globals/CookieBar.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/views/globals/CookieBar.js b/src/components/views/globals/CookieBar.js
index ad00884dd2..82ac598532 100644
--- a/src/components/views/globals/CookieBar.js
+++ b/src/components/views/globals/CookieBar.js
@@ -76,7 +76,20 @@ export default class CookieBar extends React.Component {
                                 </a>
                             ,
                         },
-                    ) : _t("Help improve Riot by sending usage data? This will use a cookie.") }
+                    ) : _t(
+                        "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? " +
+                        "This will use a cookie.",
+                        {},
+                        {
+                            'UsageDataLink': (sub) => <a
+                                className="mx_MatrixToolbar_link"
+                                href="javascript:;"
+                                onClick={this.onUsageDataClicked}
+                            >
+                                { sub }
+                            </a>,
+                        },
+                    ) }
                 </div>
                 <AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}>
                     { _t("Yes please") }

From 9d2f223773a3c73a7eec78d200266672033b93e8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 24 May 2018 16:54:48 +0100
Subject: [PATCH 133/702] Message for leaving server notices room

---
 src/components/structures/MatrixChat.js | 16 +++++++++++++---
 src/i18n/strings/en_EN.json             |  2 ++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 96e721f7ca..a3b243f8bc 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -996,10 +996,20 @@ export default React.createClass({
                     }, (err) => {
                         modal.close();
                         console.error("Failed to leave room " + roomId + " " + err);
+                        let title = _t("Failed to leave room");
+                        let message = _t("Server may be unavailable, overloaded, or you hit a bug.");
+                        if (err.errcode == 'M_CANNOT_LEAVE_SERVER_NOTICE_ROOM') {
+                            title = _t("Can't leave Server Notices room");
+                            message = _t(
+                                "This room is used for important messages from the Home Server, " +
+                                "so you cannot leave it.",
+                            );
+                        } else if (err && err.message) {
+                            message = err.message;
+                        }
                         Modal.createTrackedDialog('Failed to leave room', '', ErrorDialog, {
-                            title: _t("Failed to leave room"),
-                            description: (err && err.message ? err.message :
-                                _t("Server may be unavailable, overloaded, or you hit a bug.")),
+                            title: title,
+                            description: message,
                         });
                     });
                 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 41f1780425..f334a94d4e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -949,6 +949,8 @@
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
     "Failed to leave room": "Failed to leave room",
+    "Can't leave Server Notices room": "Can't leave Server Notices room",
+    "This room is used for important messages from the Home Server, so you cannot leave it.": "This room is used for important messages from the Home Server, so you cannot leave it.",
     "Signed Out": "Signed Out",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
     "Terms and Conditions": "Terms and Conditions",

From fd8d50173207696fda5e2f01726ec48f048ed91a Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 24 May 2018 16:58:14 +0100
Subject: [PATCH 134/702] Update cookie bar wording

---
 src/components/views/globals/CookieBar.js | 10 +++++-----
 src/i18n/strings/en_EN.json               |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/views/globals/CookieBar.js b/src/components/views/globals/CookieBar.js
index 82ac598532..a63a163dd1 100644
--- a/src/components/views/globals/CookieBar.js
+++ b/src/components/views/globals/CookieBar.js
@@ -54,9 +54,9 @@ export default class CookieBar extends React.Component {
                 <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="Warning" />
                 <div className="mx_MatrixToolbar_content">
                     { this.props.policyUrl ? _t(
-                        "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? " +
-                        "This will use a cookie. " +
-                        "(See our <PolicyLink>cookie and privacy policies</PolicyLink>).",
+                        "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. " +
+                        "This will use a cookie " +
+                        "(please see our <PolicyLink>Cookie Policy</PolicyLink>).",
                         {},
                         {
                             'UsageDataLink': (sub) => <a
@@ -77,7 +77,7 @@ export default class CookieBar extends React.Component {
                             ,
                         },
                     ) : _t(
-                        "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? " +
+                        "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. " +
                         "This will use a cookie.",
                         {},
                         {
@@ -92,7 +92,7 @@ export default class CookieBar extends React.Component {
                     ) }
                 </div>
                 <AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}>
-                    { _t("Yes please") }
+                    { _t("Yes, I want to help!") }
                 </AccessibleButton>
                 <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.onReject}>
                     <img src="img/cancel.svg" width="18" height="18" />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 41f1780425..e20b277ef2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -636,9 +636,9 @@
     "Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
     "Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
     "You're not currently a member of any communities.": "You're not currently a member of any communities.",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Help improve Riot by sending usage data? This will use a cookie.",
-    "Yes please": "Yes please",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.",
+    "Yes, I want to help!": "Yes, I want to help!",
     "You are not receiving desktop notifications": "You are not receiving desktop notifications",
     "Enable them now": "Enable them now",
     "What's New": "What's New",

From 168b956b3c8c9895c3f8b1e09bf29350b57eba7b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 24 May 2018 17:01:00 +0100
Subject: [PATCH 135/702] homeserver

---
 src/components/structures/MatrixChat.js | 2 +-
 src/i18n/strings/en_EN.json             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a3b243f8bc..46c1113a1d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1001,7 +1001,7 @@ export default React.createClass({
                         if (err.errcode == 'M_CANNOT_LEAVE_SERVER_NOTICE_ROOM') {
                             title = _t("Can't leave Server Notices room");
                             message = _t(
-                                "This room is used for important messages from the Home Server, " +
+                                "This room is used for important messages from the Homeserver, " +
                                 "so you cannot leave it.",
                             );
                         } else if (err && err.message) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f334a94d4e..07f9f6b8ec 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -950,7 +950,7 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
     "Failed to leave room": "Failed to leave room",
     "Can't leave Server Notices room": "Can't leave Server Notices room",
-    "This room is used for important messages from the Home Server, so you cannot leave it.": "This room is used for important messages from the Home Server, so you cannot leave it.",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "This room is used for important messages from the Homeserver, so you cannot leave it.",
     "Signed Out": "Signed Out",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
     "Terms and Conditions": "Terms and Conditions",

From 24ae804a80b1e5b71e790f6c043f946a8a385256 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 24 May 2018 13:49:43 +0000
Subject: [PATCH 136/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1184 of 1186 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ff362ab5bc..17c232b5a8 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1174,5 +1174,14 @@
     "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
     "Terms and Conditions": "Условия и положения",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
-    "Review terms and conditions": "Просмотр условий и положений"
+    "Review terms and conditions": "Просмотр условий и положений",
+    "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
+    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя <UsageDataLink>данные использования</UsageDataLink>? Будут использоваться файлы cookie. (Смотрите наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
+    "Failed to indicate account erasure": "Не удается удалить учетную запись",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. <b>Это действие необратимо.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи <b>не приведет к удалению всех ваших сообщений.</b> Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут видны новым или незарегистрированным пользователям, но зарегистрированные пользователи, у которых уже есть доступ к этим сообщениям, по-прежнему будут иметь доступ к своей копии.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Пожалуйста, удалите все сообщения, которые я отправил, после деактивации учетной записи. (<b>Внимание:</b> будущие пользователи увидят неполный вид разговоров)",
+    "To continue, please enter your password:": "Чтобы продолжить, введите пароль:",
+    "password": "пароль"
 }

From 33e5f32390e005db7d45f59a1838784b270b9b77 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 24 May 2018 16:28:20 +0000
Subject: [PATCH 137/702] Translated using Weblate (Russian)

Currently translated at 99.6% (1184 of 1188 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 17c232b5a8..e2529ed1bc 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1183,5 +1183,8 @@
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут видны новым или незарегистрированным пользователям, но зарегистрированные пользователи, у которых уже есть доступ к этим сообщениям, по-прежнему будут иметь доступ к своей копии.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Пожалуйста, удалите все сообщения, которые я отправил, после деактивации учетной записи. (<b>Внимание:</b> будущие пользователи увидят неполный вид разговоров)",
     "To continue, please enter your password:": "Чтобы продолжить, введите пароль:",
-    "password": "пароль"
+    "password": "пароль",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie (ознакомьтесь с нашей<PolicyLink>Политикой cookie</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie.",
+    "Yes, I want to help!": "Да, я хочу помочь!"
 }

From 3851fa80ff3fc694fdb4d43dd3c4fc8c914c2510 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 24 May 2018 18:19:11 +0100
Subject: [PATCH 138/702] js-sdk RC

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c34979c43..6595fb4216 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.2",
+    "matrix-js-sdk": "0.10.3-rc.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From dacb9dea262f4b6e1a4f88699a5943bba6ea67f7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 24 May 2018 18:22:56 +0100
Subject: [PATCH 139/702] Prepare changelog for v0.12.6-rc.1

---
 CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b161a9d908..b6a893bfc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,42 @@
+Changes in [0.12.6-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.6-rc.1) (2018-05-24)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.5...v0.12.6-rc.1)
+
+ * Add a "reload widget" button.
+   [\#1920](https://github.com/matrix-org/matrix-react-sdk/pull/1920)
+ * Make devTools styling more consistent and easier to edit event data.
+   [\#1923](https://github.com/matrix-org/matrix-react-sdk/pull/1923)
+ * Update from Weblate.
+   [\#1930](https://github.com/matrix-org/matrix-react-sdk/pull/1930)
+ * Cookie bar update
+   [\#1929](https://github.com/matrix-org/matrix-react-sdk/pull/1929)
+ * Message for leaving server notices room
+   [\#1928](https://github.com/matrix-org/matrix-react-sdk/pull/1928)
+ * More thorough check of IM URL validity.
+   [\#1927](https://github.com/matrix-org/matrix-react-sdk/pull/1927)
+ * Add usage data link to cookie bar
+   [\#1926](https://github.com/matrix-org/matrix-react-sdk/pull/1926)
+ * Change wording and appearance of Deactivate Account dialog
+   [\#1925](https://github.com/matrix-org/matrix-react-sdk/pull/1925)
+ * fix membership list ordering when presence is disabled.
+   [\#1924](https://github.com/matrix-org/matrix-react-sdk/pull/1924)
+ * Implement erasure option upon deactivation
+   [\#1922](https://github.com/matrix-org/matrix-react-sdk/pull/1922)
+ * Add cookie warning to widget warning (AppPermission)
+   [\#1921](https://github.com/matrix-org/matrix-react-sdk/pull/1921)
+ * Terms and Conditions dialog
+   [\#1919](https://github.com/matrix-org/matrix-react-sdk/pull/1919)
+ * improve privileged section users in room settings
+   [\#1902](https://github.com/matrix-org/matrix-react-sdk/pull/1902)
+ * Space between sentences in 'leave room' warning
+   [\#1918](https://github.com/matrix-org/matrix-react-sdk/pull/1918)
+ * Specify valid address types to "Start a chat" dialog
+   [\#1908](https://github.com/matrix-org/matrix-react-sdk/pull/1908)
+ * Implement opt-in analytics with cookie bar
+   [\#1906](https://github.com/matrix-org/matrix-react-sdk/pull/1906)
+ * Fix vector-im/riot-web#6523 Emoji rendering destroys paragraphs
+   [\#1910](https://github.com/matrix-org/matrix-react-sdk/pull/1910)
+
 Changes in [0.12.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.5) (2018-05-17)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4...v0.12.5)

From 02377b57c0d7fa1acb7c3db7d1fff86c86c8c444 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 24 May 2018 18:22:56 +0100
Subject: [PATCH 140/702] v0.12.6-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6595fb4216..e39b8d0f19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.5",
+  "version": "0.12.6-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From eb25b63a35fa0bb2088184ef07d38f66b452dbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 24 May 2018 18:11:51 +0000
Subject: [PATCH 141/702] Translated using Weblate (French)

Currently translated at 100.0% (1189 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index dc36520506..274d13fa45 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1189,5 +1189,11 @@
     "e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
     "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant <UsageDataLink>des données d'utilisation</UsageDataLink> ? Cela utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)"
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)",
+    "Reload widget": "Recharger le widget",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Veuillez aider Riot.im à s'améliorer en envoyant <UsageDataLink>des données d'utilisation anonymes</UsageDataLink>. Cela utilisear un cookie (veuillez voir notre <PolicyLink>politique de cookie</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Veuillez aider Riot.im à s'améliorer en envoyant <UsageDataLink>des données d'utilisation anonymes</UsageDataLink>. Cela utilisera un cookie.",
+    "Yes, I want to help!": "Oui, je veux aider !",
+    "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir."
 }

From 065e2a980212fef0897ecc7605d882122138762c Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 24 May 2018 23:49:56 +0000
Subject: [PATCH 142/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1189 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6ceda34507..f545df95d3 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1172,5 +1172,23 @@
     "Muted Users": "已靜音的使用者",
     "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 <PolicyLink>cookie 與隱私政策</PolicyLink>）。",
     "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
-    "Yes please": "好的，請"
+    "Yes please": "好的，請",
+    "e.g. %(exampleValue)s": "範例：%(exampleValue)s",
+    "Reload widget": "重新載入小工具",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "請透過傳送<UsageDataLink>匿名使用資料</UsageDataLink>來協助改善 Riot.im。這將會使用 cookie（請參見我們的 <PolicyLink>Cookie 政策</PolicyLink>）。",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "請透過傳送<UsageDataLink>匿名使用資料</UsageDataLink>來協助改善 Riot.im。這將會使用 cookie。",
+    "Yes, I want to help!": "是的，我想要協助！",
+    "Warning: This widget might use cookies.": "警告：此小工具可能會使用 cookies。",
+    "Failed to indicate account erasure": "指示帳號刪除失敗",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "這將會讓您的帳號永久無法使用。您將無法登入，且也沒有人可以重新註冊一個相同的使用者 ID。這將會造成您的帳號離開所有已參與的聊天室，並將會從識別伺服器上移除您帳號的所有詳細資訊。<b>此動作是不可逆的。</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "停用您的帳號<b>預設不會讓我們忘記您已經傳送過的訊息。</b>若您想要我們忘記您的訊息，請在下面的方框中打勾。",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "在 Matrix 中的訊息可見度類似於電子郵件。我們忘記您的訊息代表您傳送過的訊息不會有任何新的或未註冊的使用者看到，但已註冊且已經看過這些訊息的使用者還是看得到他們的副本。",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "請在我的帳號停用時忘記我傳送過的所有訊息（<b>警告：</b>這將會造成未來的使用者無法看見完整的對話紀錄）",
+    "To continue, please enter your password:": "要繼續，請輸入您的密碼：",
+    "password": "密碼",
+    "Can't leave Server Notices room": "無法離開伺服器通知聊天室",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "這個聊天室是用於發佈從家伺服器而來的重要訊息，所以您不能離開它。",
+    "Terms and Conditions": "條款與細則",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "要繼續使用 %(homeserverDomain)s 家伺服器，您必須審閱並同意我們的條款與細則。",
+    "Review terms and conditions": "審閱條款與細則"
 }

From f13672df39aa857ab0bb95fd704c52ba42a1486e Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 25 May 2018 06:49:55 +0000
Subject: [PATCH 143/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1189 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f2aaac9a81..f15c8893b8 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1189,5 +1189,11 @@
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
     "e.g. %(exampleValue)s": "pl. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Segítesz jobbá tenni a Riotot <UsageDataLink>használati adat</UsageDataLink> küldésével? Ez sütit (cookie) fog használni. (Nézd meg az <PolicyLink>Általános Szerződési Feltételeket</PolicyLink>)."
+    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Segítesz jobbá tenni a Riotot <UsageDataLink>használati adat</UsageDataLink> küldésével? Ez sütit (cookie) fog használni. (Nézd meg az <PolicyLink>Általános Szerződési Feltételeket</PolicyLink>).",
+    "Reload widget": "Kisalkalmazás újratöltése",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez szütit (cookie) fog használni (lásd a <PolicyLink>sütire vonatkozó szabályozásunkat</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez szütit (cookie) fog használni.",
+    "Yes, I want to help!": "Igen, segítek!",
+    "Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle."
 }

From 475e2d16d8c6379ef09a59dc26862d7086c13224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Fri, 25 May 2018 09:51:40 +0000
Subject: [PATCH 144/702] Translated using Weblate (Slovak)

Currently translated at 100.0% (1189 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index c7f38cff35..2cab64ca49 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1166,5 +1166,26 @@
     "Refresh": "Obnoviť",
     "We encountered an error trying to restore your previous session.": "Počas obnovovania vašej predchádzajúcej relácie sa vyskytla chyba.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Vymazaním úložiska prehliadača možno opravíte váš problém, no zároveň sa týmto odhlásite a história vašich šifrovaných konverzácií sa pre vás môže stať nečitateľná.",
-    "Collapse Reply Thread": "Zbaliť vlákno odpovedí"
+    "Collapse Reply Thread": "Zbaliť vlákno odpovedí",
+    "e.g. %(exampleValue)s": "príklad %(exampleValue)s",
+    "Reload widget": "Obnoviť widget",
+    "Send analytics data": "Odosielať analytické údaje",
+    "Enable widget screenshots on supported widgets": "Umožniť zachytiť snímku obrazovky pre podporované widgety",
+    "Muted Users": "Umlčaní používatelia",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Prosím pomôžte nám vylepšovať Riot.im odosielaním <UsageDataLink>anonymných údajov o používaní</UsageDataLink>. Na tento účel použijeme cookie (prečítajte si <PolicyLink>ako používame cookies</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Prosím pomôžte nám vylepšovať Riot.im odosielaním <UsageDataLink>anonymných údajov o používaní</UsageDataLink>. Na tento účel použijeme cookie.",
+    "Yes, I want to help!": "Áno, chcem pomôcť",
+    "Warning: This widget might use cookies.": "Pozor: tento widget môže používať cookies.",
+    "Failed to indicate account erasure": "Nie je možné odstrániť odoslané správy",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Toto spôsobí, že váš účet nebude viac použiteľný. Nebudete sa môcť opätovne prihlásiť a nikto sa nebude môcť znovu zaregistrovať s rovnakým používateľským ID. Deaktiváciou účtu opustíte všetky miestnosti, do ktorých ste kedy vstúpili a vaše kontaktné údaje budú odstránené zo servera totožností. <b>Túto akciu nie je možné vrátiť späť.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Pri deaktivácii účtu <b>predvolene neodstraňujeme vami odoslané správy.</b> Ak si želáte uplatniť právo zabudnutia, zaškrtnite prosím zodpovedajúce pole nižšie.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť správ elektronickej pošty. To, že zabudneme vaše správy v skutočnosti znamená, že správy ktoré ste už odoslali nebudú čitateľné pre nových alebo neregistrovaných používateľov, no registrovaní používatelia, ktorí už prístup k vašim správam majú, budú aj naďalej bez zmeny môcť pristupovať k ich vlastným kópiám vašich správ.",
+    "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)": "Spolu s deaktivovaním účtu si želám odstrániť všetky mnou odoslané správy (<b>Pozor:</b> Môže sa stať, že noví používatelia uvidia neúplnú históriu konverzácií)",
+    "To continue, please enter your password:": "Aby ste mohli pokračovať, prosím zadajte svoje heslo:",
+    "password": "heslo",
+    "Can't leave Server Notices room": "Nie je možné opustiť miestnosť Oznamy zo servera",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Táto miestnosť je určená na dôležité oznamy a správy od správcov domovského servera, preto ju nie je možné opustiť.",
+    "Terms and Conditions": "Zmluvné podmienky",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
+    "Review terms and conditions": "Prečítať zmluvné podmienky"
 }

From 35aeac1b252b6bd4ef830c6a92ffeaf64380795e Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Fri, 25 May 2018 14:06:14 +0000
Subject: [PATCH 145/702] Translated using Weblate (Swedish)

Currently translated at 80.4% (957 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0f898a3374..2afd9bc5a4 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -446,7 +446,7 @@
     "Add an email address above to configure email notifications": "Lägg till en epostadress här för att konfigurera epostaviseringar",
     "Expand panel": "Öppna panel",
     "On": "På",
-    "%(count)s Members|other": "%(count)s 1 Medlemmar",
+    "%(count)s Members|other": "%(count)s medlemmar",
     "Filter room names": "Filtrera rumsnamn",
     "Changelog": "Ändringslogg",
     "Waiting for response from server": "Väntar på svar från servern",
@@ -557,7 +557,7 @@
     "Login": "Logga in",
     "Download this file": "Ladda ner filen",
     "Failed to change settings": "Det gick inte att spara inställningarna",
-    "%(count)s Members|one": "%(count)s 1 Medlem",
+    "%(count)s Members|one": "%(count)s medlem",
     "View Source": "Visa källa",
     "Thank you!": "Tack!",
     "Quote": "Citera",

From 8a3ae1ed6349bd27cce677339eaa75537b5c201b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 25 May 2018 15:12:48 +0100
Subject: [PATCH 146/702] released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e39b8d0f19..9daf550ef3 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.3-rc.1",
+    "matrix-js-sdk": "0.10.3",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 294f9c63b391a5274c47298ab6083bf64eb1e4f2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 25 May 2018 15:16:00 +0100
Subject: [PATCH 147/702] Prepare changelog for v0.12.6

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6a893bfc5..b1951875ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.12.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.6) (2018-05-25)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6-rc.1...v0.12.6)
+
+ * No changes since v0.12.6-rc.1
+
 Changes in [0.12.6-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.6-rc.1) (2018-05-24)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.5...v0.12.6-rc.1)

From bbdc27019a9261eb74cc79656a7b70fb5468be34 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 25 May 2018 15:16:01 +0100
Subject: [PATCH 148/702] v0.12.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9daf550ef3..96c37a61c8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.6-rc.1",
+  "version": "0.12.6",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 806458dfc2deeaa1269176696faa7c64c141b5f6 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 24 May 2018 17:21:27 +0000
Subject: [PATCH 149/702] Translated using Weblate (Russian)

Currently translated at 99.6% (1185 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e2529ed1bc..e77cb76aff 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1186,5 +1186,6 @@
     "password": "пароль",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie (ознакомьтесь с нашей<PolicyLink>Политикой cookie</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie.",
-    "Yes, I want to help!": "Да, я хочу помочь!"
+    "Yes, I want to help!": "Да, я хочу помочь!",
+    "Reload widget": "Перезагрузить виджет"
 }

From e1fc7a56ff78fdf2840f1b46db7d297e601ec9e1 Mon Sep 17 00:00:00 2001
From: stuve20 <stuve20@gmail.com>
Date: Fri, 25 May 2018 14:14:08 +0000
Subject: [PATCH 150/702] Translated using Weblate (Swedish)

Currently translated at 80.4% (957 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 2afd9bc5a4..c4d072b723 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -375,7 +375,7 @@
     "The maximum permitted number of widgets have already been added to this room.": "Den största tillåtna mängden widgetar har redan tillsats till rummet.",
     "The phone number entered looks invalid": "Telefonnumret ser felaktigt ut",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnyckeln du angav matchar signeringsnyckeln som mottogs från enheten %(deviceId)s som tillhör %(userId)s. Enheten är markerad som verifierad.",
-    "This email address is already in use": "Den här epostadressen är redan i bruk",
+    "This email address is already in use": "Den här epostadressen används redan",
     "This email address was not found": "Den här epostadressen finns inte",
     "The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' överskrider serverns största tillåtna filstorlek",
@@ -385,7 +385,7 @@
     "World readable": "Alla kan läsa",
     "Guests can join": "Gäster kan bli medlem i rummet",
     "No rooms to show": "Inga fler rum att visa",
-    "This phone number is already in use": "Detta telefonnummer är redan i bruk",
+    "This phone number is already in use": "Detta telefonnummer används redan",
     "The version of Riot.im": "Versionen av Riot.im",
     "Call Failed": "Samtal misslyckades",
     "Call Anyway": "Ring ändå",
@@ -575,9 +575,9 @@
     "This room has no local addresses": "Det här rummet har inga lokala adresser",
     "Updates": "Uppdateringar",
     "Check for update": "Leta efter uppdatering",
-    "Your language of choice": "Ditt valda språk",
+    "Your language of choice": "Ditt språkval",
     "The platform you're on": "Plattformen du använder",
-    "Whether or not you're logged in (we don't record your user name)": "Om du är inloggad eller inte (vi sparar inte ditt användarnamn)",
+    "Whether or not you're logged in (we don't record your user name)": "Oavsett om du är inloggad (så registreras inte ditt användarnamn)",
     "Your homeserver's URL": "Din hemservers URL",
     "Your identity server's URL": "Din identitetsservers URL",
     "Every page you use in the app": "Varje sida du använder i appen",

From c116de441a1607c987f52fda136d7ae7d610dadd Mon Sep 17 00:00:00 2001
From: stuve20 <stuve20@gmail.com>
Date: Fri, 25 May 2018 14:18:51 +0000
Subject: [PATCH 151/702] Translated using Weblate (Swedish)

Currently translated at 80.4% (957 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index c4d072b723..b0b44e5052 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -368,7 +368,7 @@
     "PM": "p.m.",
     "NOTE: Apps are not end-to-end encrypted": "OBS: Apparna är inte end-to-end-krypterade",
     "Revoke widget access": "Upphäv widget-åtkomst",
-    "Submit": "Lämna",
+    "Submit": "Lämna in",
     "Tagged as: ": "Taggad som: ",
     "The default role for new room members is": "Standardrollen för nya medlemmar är",
     "The main address for this room is": "Huvudadressen för det här rummet är",

From ab1261321166224bff64322a8bcfb4b531ae85df Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Fri, 25 May 2018 14:20:55 +0000
Subject: [PATCH 152/702] Translated using Weblate (Swedish)

Currently translated at 80.6% (959 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index b0b44e5052..d49dfe3fb6 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -958,5 +958,7 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern.",
     "The remote side failed to pick up": "Mottagaren kunde inte svara",
-    "Room name or alias": "Rumsnamn eller alias"
+    "Room name or alias": "Rumsnamn eller alias",
+    "Jump to read receipt": "Hoppa till läskvitto",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Just nu är det inte möjligt att svara med en fil så den kommer att skickas utan att vara ett svar."
 }

From 296174998bbfeb188648ea3fd55f4df92cbb6957 Mon Sep 17 00:00:00 2001
From: stuve20 <stuve20@gmail.com>
Date: Fri, 25 May 2018 14:21:58 +0000
Subject: [PATCH 153/702] Translated using Weblate (Swedish)

Currently translated at 80.6% (959 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index d49dfe3fb6..21f38169dc 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -370,7 +370,7 @@
     "Revoke widget access": "Upphäv widget-åtkomst",
     "Submit": "Lämna in",
     "Tagged as: ": "Taggad som: ",
-    "The default role for new room members is": "Standardrollen för nya medlemmar är",
+    "The default role for new room members is": "Standardrollen för nya medlemmar i rummet är",
     "The main address for this room is": "Huvudadressen för det här rummet är",
     "The maximum permitted number of widgets have already been added to this room.": "Den största tillåtna mängden widgetar har redan tillsats till rummet.",
     "The phone number entered looks invalid": "Telefonnumret ser felaktigt ut",

From ab412122580456fc2ec9011f41d14bb7fcf402e1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 26 May 2018 00:37:21 +0100
Subject: [PATCH 154/702] fix double-nested code blocks & bump md-serializer

---
 package.json                                       | 2 +-
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f3f184fb65..a65b6e2640 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "slate": "^0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "matrix-org/slate-md-serializer#1580ed67",
+    "slate-md-serializer": "matrix-org/slate-md-serializer#f7c4ad3",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 50b3422fee..f1a4fd5140 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1370,7 +1370,7 @@ export default class MessageComposerInput extends React.Component {
             case 'numbered-list':
                 return <ol {...attributes}>{children}</ol>;
             case 'code':
-                return <pre {...attributes}><code {...attributes}>{children}</code></pre>;
+                return <pre {...attributes}>{children}</pre>;
             case 'link':
                 return <a {...attributes} href={ node.data.get('href') }>{children}</a>;
             case 'pill': {

From 6299e188a4bcd680087822b59dfa3d6ab9bb30e1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 26 May 2018 02:11:20 +0100
Subject: [PATCH 155/702] unbreak keyboard shortcuts & ctrl-backspace

---
 src/components/views/rooms/MessageComposerInput.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f1a4fd5140..d2730027d1 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -716,7 +716,7 @@ export default class MessageComposerInput extends React.Component {
             if (ctrlCmdCommand) {
                 return this.handleKeyCommand(ctrlCmdCommand);
             }
-            return false;
+            return;
         }
 
         switch (ev.keyCode) {
@@ -739,6 +739,10 @@ export default class MessageComposerInput extends React.Component {
     };
 
     onBackspace = (ev: Event, change: Change): Change => {
+        if (ev.ctrlKey || ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
+            return;
+        }
+
         if (this.state.isRichTextEnabled) {
             // let backspace exit lists
             const isList = this.hasBlock('list-item');

From 5147246c175a0b55d5b978e040248b82a3b71f7b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 26 May 2018 15:41:25 +0100
Subject: [PATCH 156/702] kill stream when using gUM for permission to device
 labels to kill camera

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index c8ce79905d..4ee4f1a427 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -284,7 +284,12 @@ module.exports = React.createClass({
         this.setState({ electron_settings: settings });
     },
 
-    _refreshMediaDevices: function() {
+    _refreshMediaDevices: function(stream) {
+        if (stream) {
+            // kill stream so that we don't leave it lingering around with webcam enabled etc
+            stream.getTracks().forEach((track) => track.stop());
+        }
+
         Promise.resolve().then(() => {
             return CallMediaHandler.getDevices();
         }).then((mediaDevices) => {

From 6636fa32f67a592eb18208e89b2ae2ce226c00ac Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 26 May 2018 17:22:23 +0100
Subject: [PATCH 157/702] Allow selecting audio output for WebRTC Audio/Video
 calls

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CallMediaHandler.js                   | 22 +++++++++++-----
 src/components/structures/UserSettings.js | 32 +++++++++++++++++++++--
 src/settings/Settings.js                  |  4 +++
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index cdc5c61921..2330f86b99 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -22,34 +22,44 @@ export default {
         // Only needed for Electron atm, though should work in modern browsers
         // once permission has been granted to the webapp
         return navigator.mediaDevices.enumerateDevices().then(function(devices) {
-            const audioIn = [];
-            const videoIn = [];
+            const audiooutput = [];
+            const audioinput = [];
+            const videoinput = [];
 
             if (devices.some((device) => !device.label)) return false;
 
             devices.forEach((device) => {
                 switch (device.kind) {
-                    case 'audioinput': audioIn.push(device); break;
-                    case 'videoinput': videoIn.push(device); break;
+                    case 'audiooutput': audiooutput.push(device); break;
+                    case 'audioinput': audioinput.push(device); break;
+                    case 'videoinput': videoinput.push(device); break;
                 }
             });
 
             // console.log("Loaded WebRTC Devices", mediaDevices);
             return {
-                audioinput: audioIn,
-                videoinput: videoIn,
+                audiooutput,
+                audioinput,
+                videoinput,
             };
         }, (error) => { console.log('Unable to refresh WebRTC Devices: ', error); });
     },
 
     loadDevices: function() {
+        const audioOutDeviceId = SettingsStore.getValue("webrtc_audiooutput");
         const audioDeviceId = SettingsStore.getValue("webrtc_audioinput");
         const videoDeviceId = SettingsStore.getValue("webrtc_videoinput");
 
+        Matrix.setMatrixCallAudioOutput(audioOutDeviceId);
         Matrix.setMatrixCallAudioInput(audioDeviceId);
         Matrix.setMatrixCallVideoInput(videoDeviceId);
     },
 
+    setAudioOutput: function(deviceId) {
+        SettingsStore.setValue("webrtc_audiooutput", null, SettingLevel.DEVICE, deviceId);
+        Matrix.setMatrixCallAudioOutput(deviceId);
+    },
+
     setAudioInput: function(deviceId) {
         SettingsStore.setValue("webrtc_audioinput", null, SettingLevel.DEVICE, deviceId);
         Matrix.setMatrixCallAudioInput(deviceId);
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index c8ce79905d..0561071fce 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -292,6 +292,7 @@ module.exports = React.createClass({
             if (this._unmounted) return;
             this.setState({
                 mediaDevices,
+                activeAudioOutput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_audiooutput'),
                 activeAudioInput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_audioinput'),
                 activeVideoInput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_videoinput'),
             });
@@ -970,6 +971,11 @@ module.exports = React.createClass({
         return devices.map((device) => <span key={device.deviceId}>{ device.label }</span>);
     },
 
+    _setAudioOutput: function(deviceId) {
+        this.setState({activeAudioOutput: deviceId});
+        CallMediaHandler.setAudioOutput(deviceId);
+    },
+
     _setAudioInput: function(deviceId) {
         this.setState({activeAudioInput: deviceId});
         CallMediaHandler.setAudioInput(deviceId);
@@ -1010,6 +1016,7 @@ module.exports = React.createClass({
 
         const Dropdown = sdk.getComponent('elements.Dropdown');
 
+        let speakerDropdown = <p>{ _t('No Audio Outputs detected') }</p>;
         let microphoneDropdown = <p>{ _t('No Microphones detected') }</p>;
         let webcamDropdown = <p>{ _t('No Webcams detected') }</p>;
 
@@ -1018,6 +1025,26 @@ module.exports = React.createClass({
             label: _t('Default Device'),
         };
 
+        const audioOutputs = this.state.mediaDevices.audiooutput.slice(0);
+        if (audioOutputs.length > 0) {
+            let defaultOutput = '';
+            if (!audioOutputs.some((input) => input.deviceId === 'default')) {
+                audioOutputs.unshift(defaultOption);
+            } else {
+                defaultOutput = 'default';
+            }
+
+            speakerDropdown = <div>
+                <h4>{ _t('Audio Output') }</h4>
+                <Dropdown
+                    className="mx_UserSettings_webRtcDevices_dropdown"
+                    value={this.state.activeAudioOutput || defaultOutput}
+                    onOptionChange={this._setAudioOutput}>
+                    { this._mapWebRtcDevicesToSpans(audioOutputs) }
+                </Dropdown>
+            </div>;
+        }
+
         const audioInputs = this.state.mediaDevices.audioinput.slice(0);
         if (audioInputs.length > 0) {
             let defaultInput = '';
@@ -1059,8 +1086,9 @@ module.exports = React.createClass({
         }
 
         return <div>
-                { microphoneDropdown }
-                { webcamDropdown }
+            { speakerDropdown }
+            { microphoneDropdown }
+            { webcamDropdown }
         </div>;
     },
 
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b1bc4161fd..a222c29dda 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -201,6 +201,10 @@ export const SETTINGS = {
         displayName: _td('Disable Peer-to-Peer for 1:1 calls'),
         default: false,
     },
+    "webrtc_audiooutput": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        default: null,
+    },
     "webrtc_audioinput": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: null,

From 689b00c6188802fd31de2cff4314a3a3d2df8372 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 26 May 2018 17:24:07 +0100
Subject: [PATCH 158/702] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/de_DE.json   |  5 +--
 src/i18n/strings/en_EN.json   | 64 ++++++++++++++++++-----------------
 src/i18n/strings/eu.json      |  9 +----
 src/i18n/strings/fr.json      |  8 -----
 src/i18n/strings/hu.json      | 10 +-----
 src/i18n/strings/it.json      |  3 --
 src/i18n/strings/ru.json      |  4 ---
 src/i18n/strings/sv.json      |  2 --
 src/i18n/strings/zh_Hant.json |  5 +--
 9 files changed, 37 insertions(+), 73 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4892b91b48..c2b1e56cc6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1168,8 +1168,5 @@
     "Collapse Reply Thread": "Antwort-Thread zusammenklappen",
     "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.",
     "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren",
-    "Send analytics data": "Analysedaten senden",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere <PolicyLink>Datenschutzerklärung</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
-    "Yes please": "Ja, bitte"
+    "Send analytics data": "Analysedaten senden"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bf9e395bee..bfe1b562bc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,6 +85,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -104,7 +109,6 @@
     "You need to be logged in.": "You need to be logged in.",
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "Unable to create widget.": "Unable to create widget.",
-    "Reload widget": "Reload widget",
     "Missing roomId.": "Missing roomId.",
     "Failed to send request.": "Failed to send request.",
     "This room is not recognised.": "This room is not recognised.",
@@ -180,11 +184,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -298,6 +297,29 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -394,11 +416,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -530,29 +552,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -663,6 +662,7 @@
     "Delete widget": "Delete widget",
     "Revoke widget access": "Revoke widget access",
     "Minimize apps": "Minimize apps",
+    "Reload widget": "Reload widget",
     "Popout widget": "Popout widget",
     "Picture": "Picture",
     "Edit": "Edit",
@@ -1076,9 +1076,11 @@
     "No media permissions": "No media permissions",
     "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
     "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
+    "No Audio Outputs detected": "No Audio Outputs detected",
     "No Microphones detected": "No Microphones detected",
     "No Webcams detected": "No Webcams detected",
     "Default Device": "Default Device",
+    "Audio Output": "Audio Output",
     "Microphone": "Microphone",
     "Camera": "Camera",
     "VoIP": "VoIP",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 04d2e86664..be67127955 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1170,18 +1170,11 @@
     "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan",
     "Send analytics data": "Bidali datu analitikoak",
     "Muted Users": "Mutututako erabiltzaileak",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure <PolicyLink>Cookie eta pribatutasun politikak</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.",
-    "Yes please": "Bai mesedez",
     "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.",
     "Terms and Conditions": "Termino eta baldintzak",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.",
     "Review terms and conditions": "Irakurri termino eta baldintzak",
     "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi",
-    "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. <b>This action is irreversible.</b>": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. <b>Ez dago ekintza hau desegiterik.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean <b>ez dira lehenetsita zuk bidalitako mezuak ezabatuko.</b> Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
     "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
-    "password": "pasahitza",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz)."
+    "password": "pasahitza"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index dc36520506..5c14373d7e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1169,25 +1169,17 @@
     "Collapse Reply Thread": "Dévoiler le fil de réponse",
     "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
     "Send analytics data": "Envoyer les données analytiques",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
-    "Yes please": "Oui, s'il vous plaît",
     "Muted Users": "Utilisateurs ignorés",
     "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.",
     "Terms and Conditions": "Conditions générales",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
     "Review terms and conditions": "Voir les conditions générales",
     "Failed to indicate account erasure": "Échec de notification de la suppression du compte",
-    "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. <b>This action is irreversible.</b>": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. <b>Cette action est irréversible.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "Désactiver votre compte <b>ne supprime pas les messages que vous avez envoyés par défaut.</b> Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.",
     "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
     "password": "mot de passe",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).",
     "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>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. <b>Cette action est irréversible.</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.": "La désactivation du compte <b>ne nous fait pas oublier les messages que vous avez envoyés par défaut.</b> Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
     "e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant <UsageDataLink>des données d'utilisation</UsageDataLink> ? Cela utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f2aaac9a81..b45cdd3311 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1169,25 +1169,17 @@
     "Collapse Reply Thread": "Beszélgetés szál becsukása",
     "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
     "Send analytics data": "Analitikai adatok küldése",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a <PolicyLink>sütikről és titoktartási irányelvekről</PolicyLink> szóló leírást).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
-    "Yes please": "Igen, kérlek",
     "Muted Users": "Elnémított felhasználók",
     "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.",
     "Terms and Conditions": "Általános Szerződési Feltételek",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
     "Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
     "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen",
-    "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. <b>This action is irreversible.</b>": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. <b>Ez a művelet visszafordíthatatlan.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése <b>alapértelmezetten nem töröli semelyik általad küldött üzenetet.</b> Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.",
     "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
     "password": "jelszó",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. <b>Ez a művelet visszafordíthatatlan.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése <b>nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek.</b> Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
-    "e.g. %(exampleValue)s": "pl. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Segítesz jobbá tenni a Riotot <UsageDataLink>használati adat</UsageDataLink> küldésével? Ez sütit (cookie) fog használni. (Nézd meg az <PolicyLink>Általános Szerződési Feltételeket</PolicyLink>)."
+    "e.g. %(exampleValue)s": "pl. %(exampleValue)s"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 068ad01ff1..ab251bdf6f 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1159,9 +1159,6 @@
     "Refresh": "Aggiorna",
     "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.",
     "Send analytics data": "Invia dati statistici",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra <PolicyLink>politica sui cookie e sulla privacy</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.",
-    "Yes please": "Sì grazie",
     "Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
     "Send Logs": "Invia i log",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e2529ed1bc..956f4fc41b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1167,16 +1167,12 @@
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
     "Collapse Reply Thread": "Ответить с цитированием",
     "Send analytics data": "Отправить данные аналитики",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.",
-    "Yes please": "Да, пожалуйста",
     "Muted Users": "Приглушенные пользователи",
     "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
     "Terms and Conditions": "Условия и положения",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
     "Review terms and conditions": "Просмотр условий и положений",
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя <UsageDataLink>данные использования</UsageDataLink>? Будут использоваться файлы cookie. (Смотрите наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
     "Failed to indicate account erasure": "Не удается удалить учетную запись",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. <b>Это действие необратимо.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи <b>не приведет к удалению всех ваших сообщений.</b> Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0f898a3374..791c6e3165 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -901,8 +901,6 @@
     "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!",
     "Unknown error": "Okänt fel",
     "Incorrect password": "Felaktigt lösenord",
-    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.",
-    "This action is irreversible.": "Denna åtgärd går inte att ångra.",
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:",
     "Device name": "Enhetsnamn",
     "Device key": "Enhetsnyckel",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6ceda34507..fd72511f8c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1169,8 +1169,5 @@
     "Collapse Reply Thread": "摺疊回覆討論串",
     "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照",
     "Send analytics data": "傳送分析資料",
-    "Muted Users": "已靜音的使用者",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 <PolicyLink>cookie 與隱私政策</PolicyLink>）。",
-    "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
-    "Yes please": "好的，請"
+    "Muted Users": "已靜音的使用者"
 }

From ed9e4d82c9d476ba7146379428357db35813b9d4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 18:16:05 -0600
Subject: [PATCH 159/702] Reduce the text size on the 'Jump to pinned message'
 button

Fixes https://github.com/vector-im/riot-web/issues/6329

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 res/css/views/rooms/_PinnedEventTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index ca790ef8f0..8354df0537 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -63,5 +63,5 @@ limitations under the License.
 
 .mx_PinnedEventTile_gotoButton {
     display: inline-block;
-    font-size: 0.8em;
+    font-size: 0.7em; // Smaller text to avoid conflicting with the layout
 }

From 62f4cfe734cc7a0f63bceb601a5c9f7d68677ba2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 18:21:24 -0600
Subject: [PATCH 160/702] Don't affect avatars in pinned message contents

This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 res/css/views/rooms/_PinnedEventTile.scss     | 2 +-
 src/components/views/rooms/PinnedEventTile.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index 8354df0537..be6acdf524 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -40,7 +40,7 @@ limitations under the License.
     left: 0;
 }
 
-.mx_PinnedEventTile .mx_BaseAvatar {
+.mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar {
     float: left;
     margin-right: 10px;
 }
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index b63fdde0a8..91d656d60b 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -80,7 +80,9 @@ module.exports = React.createClass({
                     { unpinButton }
                 </div>
 
-                <MemberAvatar member={sender} width={avatarSize} height={avatarSize} />
+                <span className="mx_PinnedEventTile_senderAvatar">
+                    <MemberAvatar member={sender} width={avatarSize} height={avatarSize} />
+                </span>
                 <span className="mx_PinnedEventTile_sender">
                     { sender.name }
                 </span>

From 033c41a2a81cf4436309024898abd6e796aaec12 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 18:40:48 -0600
Subject: [PATCH 161/702] Align pinned message contents and reduce image size

Fixes https://github.com/vector-im/riot-web/issues/5421

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 res/css/views/rooms/_PinnedEventTile.scss     | 14 +++++++-------
 src/components/views/messages/MImageBody.js   |  8 ++++++--
 src/components/views/messages/MessageEvent.js |  6 +++++-
 src/components/views/rooms/PinnedEventTile.js |  6 +++++-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index be6acdf524..fa76f4c679 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -33,13 +33,6 @@ limitations under the License.
     padding-bottom: 3px;
 }
 
-.mx_PinnedEventTile .mx_EventTile_content {
-    margin-left: 50px;
-    position: relative;
-    top: 0;
-    left: 0;
-}
-
 .mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar {
     float: left;
     margin-right: 10px;
@@ -65,3 +58,10 @@ limitations under the License.
     display: inline-block;
     font-size: 0.7em; // Smaller text to avoid conflicting with the layout
 }
+
+.mx_PinnedEventTile_message {
+    margin-left: 50px;
+    position: relative;
+    top: 0;
+    left: 0;
+}
\ No newline at end of file
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 8045d43104..4dfd89ec0a 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -40,6 +40,9 @@ export default class extends React.Component {
 
         /* called when the image has loaded */
         onWidgetLoad: PropTypes.func.isRequired,
+
+        /* the maximum image height to use */
+        maxImageHeight: PropTypes.number,
     }
 
     static contextTypes = {
@@ -249,8 +252,9 @@ export default class extends React.Component {
 
         const content = this.props.mxEvent.getContent();
         const timelineWidth = this.refs.body.offsetWidth;
-        const maxHeight = 600; // let images take up as much width as they can so long as the height doesn't exceed 600px.
-        // the alternative here would be 600*timelineWidth/800; to scale them down to fit inside a 4:3 bounding box
+        const maxHeight = this.props.maxImageHeight || 600; // let images take up as much width as they can so long
+        // as the height doesn't exceed 600px. The alternative here would be 600*timelineWidth/800; to scale them down
+        // to fit inside a 4:3 bounding box
 
         // FIXME: this will break on clientside generated thumbnails (as per e2e rooms)
         // which may well be much smaller than the 800x600 bounding box.
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 7358e297c7..38f55c9d70 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -39,8 +39,11 @@ module.exports = React.createClass({
         /* callback called when dynamic content in events are loaded */
         onWidgetLoad: PropTypes.func,
 
-        /* the shsape of the tile, used */
+        /* the shape of the tile, used */
         tileShape: PropTypes.string,
+
+        /* the maximum image height to use, if the event is an image */
+        maxImageHeight: PropTypes.number,
     },
 
     getEventTileOps: function() {
@@ -78,6 +81,7 @@ module.exports = React.createClass({
             highlightLink={this.props.highlightLink}
             showUrlPreview={this.props.showUrlPreview}
             tileShape={this.props.tileShape}
+            maxImageHeight={this.props.maxImageHeight}
             onWidgetLoad={this.props.onWidgetLoad} />;
     },
 });
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 91d656d60b..478454a3d8 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -86,7 +86,11 @@ module.exports = React.createClass({
                 <span className="mx_PinnedEventTile_sender">
                     { sender.name }
                 </span>
-                <MessageEvent mxEvent={this.props.mxEvent} className="mx_PinnedEventTile_body" />
+                <div className="mx_PinnedEventTile_message">
+                    <MessageEvent mxEvent={this.props.mxEvent} className="mx_PinnedEventTile_body" maxImageHeight={150}
+                                  onWidgetLoad={() => {}} // we need to give this, apparently
+                    />
+                </div>
             </div>
         );
     },

From 085271a86427ecfe0c0104d6c2ed1410881ece44 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 19:17:59 -0600
Subject: [PATCH 162/702] Update pinned messages in real time

Fixes https://github.com/vector-im/riot-web/issues/5358

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/PinnedEventsPanel.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/views/rooms/PinnedEventsPanel.js b/src/components/views/rooms/PinnedEventsPanel.js
index 4624b3c051..e75cbea817 100644
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@@ -39,6 +39,19 @@ module.exports = React.createClass({
 
     componentDidMount: function() {
         this._updatePinnedMessages();
+        MatrixClientPeg.get().on("RoomState.events", this._onEvent);
+    },
+
+    componentWillUnmount: function() {
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("RoomState.events", this._onEvent);
+        }
+    },
+
+    _onEvent: function(ev) {
+        if (ev.getRoomId() === this.props.room.roomId && ev.getType() === "m.room.pinned_events") {
+            this._updatePinnedMessages();
+        }
     },
 
     _updatePinnedMessages: function() {

From 53396ff38dcac527605d327f5b4123c4a8884727 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 19:42:09 -0600
Subject: [PATCH 163/702] Show timestamp of pinned messages on hover

Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 res/css/views/rooms/_PinnedEventTile.scss     | 14 ++++++++++++--
 src/components/views/rooms/PinnedEventTile.js |  4 ++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index fa76f4c679..f7417272b6 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -25,19 +25,29 @@ limitations under the License.
     background-color: $event-selected-color;
 }
 
-.mx_PinnedEventTile .mx_PinnedEventTile_sender {
+.mx_PinnedEventTile .mx_PinnedEventTile_sender,
+.mx_PinnedEventTile .mx_PinnedEventTile_timestamp {
     color: #868686;
     font-size: 0.8em;
     vertical-align: top;
-    display: block;
+    display: inline-block;
     padding-bottom: 3px;
 }
 
+.mx_PinnedEventTile .mx_PinnedEventTile_timestamp {
+    padding-left: 15px;
+    display: none;
+}
+
 .mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar {
     float: left;
     margin-right: 10px;
 }
 
+.mx_PinnedEventTile:hover .mx_PinnedEventTile_timestamp {
+    display: inline-block;
+}
+
 .mx_PinnedEventTile:hover .mx_PinnedEventTile_actions {
     display: block;
 }
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 478454a3d8..d0572e489a 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -22,6 +22,7 @@ import AccessibleButton from "../elements/AccessibleButton";
 import MessageEvent from "../messages/MessageEvent";
 import MemberAvatar from "../avatars/MemberAvatar";
 import { _t } from '../../../languageHandler';
+import {formatFullDate} from '../../../DateUtils';
 
 module.exports = React.createClass({
     displayName: 'PinnedEventTile',
@@ -86,6 +87,9 @@ module.exports = React.createClass({
                 <span className="mx_PinnedEventTile_sender">
                     { sender.name }
                 </span>
+                <span className="mx_PinnedEventTile_timestamp">
+                    { formatFullDate(new Date(this.props.mxEvent.getTs())) }
+                </span>
                 <div className="mx_PinnedEventTile_message">
                     <MessageEvent mxEvent={this.props.mxEvent} className="mx_PinnedEventTile_body" maxImageHeight={150}
                                   onWidgetLoad={() => {}} // we need to give this, apparently

From 752605429cd8072aa59ec145d31e3d33a2f4c596 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 19:32:23 -0600
Subject: [PATCH 164/702] Persist pinned message open-ness between room
 switches

Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomView.js | 9 +++++++--
 src/settings/Settings.js              | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c5f6a75cc5..eae621b722 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -44,7 +44,7 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 
 import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
-import SettingsStore from "../../settings/SettingsStore";
+import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -115,6 +115,7 @@ module.exports = React.createClass({
             showApps: false,
             isAlone: false,
             isPeeking: false,
+            showingPinned: false,
 
             // error object, as from the matrix client/server API
             // If we failed to load information about the room,
@@ -182,6 +183,7 @@ module.exports = React.createClass({
             isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
             forwardingEvent: RoomViewStore.getForwardingEvent(),
             shouldPeek: RoomViewStore.shouldPeek(),
+            showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", RoomViewStore.getRoomId()),
         };
 
         // Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307
@@ -1135,7 +1137,10 @@ module.exports = React.createClass({
     },
 
     onPinnedClick: function() {
-        this.setState({showingPinned: !this.state.showingPinned, searching: false});
+        const nowShowingPinned = !this.state.showingPinned;
+        const roomId = this.state.room.roomId;
+        this.setState({showingPinned: nowShowingPinned, searching: false});
+        SettingsStore.setValue("PinnedEvents.isOpen", roomId, SettingLevel.ROOM_DEVICE, nowShowingPinned);
     },
 
     onSettingsClick: function() {
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b1bc4161fd..456665aeb8 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -274,4 +274,8 @@ export const SETTINGS = {
         displayName: _td('Enable widget screenshots on supported widgets'),
         default: false,
     },
+    "PinnedEvents.isOpen": {
+        supportedLevels: ['room-device'],
+        default: false,
+    },
 };

From e690bcb6efd58ecb85f2373949d840794bc1ab48 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 20:54:19 -0600
Subject: [PATCH 165/702] Replace "Login as guest" with "Try the app first" on
 login page

Fixes vector-im/riot-web#5875

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/login/Login.js | 2 +-
 src/i18n/strings/bg.json                 | 1 -
 src/i18n/strings/ca.json                 | 1 -
 src/i18n/strings/cs.json                 | 1 -
 src/i18n/strings/da.json                 | 1 -
 src/i18n/strings/de_DE.json              | 1 -
 src/i18n/strings/el.json                 | 1 -
 src/i18n/strings/en_EN.json              | 2 +-
 src/i18n/strings/en_US.json              | 1 -
 src/i18n/strings/eo.json                 | 1 -
 src/i18n/strings/es.json                 | 1 -
 src/i18n/strings/eu.json                 | 1 -
 src/i18n/strings/fi.json                 | 1 -
 src/i18n/strings/fr.json                 | 1 -
 src/i18n/strings/gl.json                 | 1 -
 src/i18n/strings/hu.json                 | 1 -
 src/i18n/strings/id.json                 | 1 -
 src/i18n/strings/it.json                 | 1 -
 src/i18n/strings/ko.json                 | 1 -
 src/i18n/strings/lv.json                 | 1 -
 src/i18n/strings/nl.json                 | 1 -
 src/i18n/strings/pl.json                 | 1 -
 src/i18n/strings/pt.json                 | 1 -
 src/i18n/strings/pt_BR.json              | 1 -
 src/i18n/strings/ru.json                 | 1 -
 src/i18n/strings/sk.json                 | 1 -
 src/i18n/strings/sr.json                 | 1 -
 src/i18n/strings/sv.json                 | 1 -
 src/i18n/strings/th.json                 | 1 -
 src/i18n/strings/tr.json                 | 1 -
 src/i18n/strings/zh_Hans.json            | 1 -
 src/i18n/strings/zh_Hant.json            | 1 -
 32 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 7f4aa0325a..1332f52f97 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -399,7 +399,7 @@ module.exports = React.createClass({
         if (this.props.enableGuest) {
             loginAsGuestJsx =
                 <a className="mx_Login_create" onClick={this._onLoginAsGuestClick} href="#">
-                    { _t('Login as guest') }
+                    { _t('Try the app first') }
                 </a>;
         }
 
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4911ad970e..2a7696f872 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -888,7 +888,6 @@
     "This homeserver doesn't offer any login flows which are supported by this client.": "Този Home сървър не предлага методи за влизане, които се поддържат от този клиент.",
     "Error: Problem communicating with the given homeserver.": "Грешка: Проблем при комуникацията с дадения Home сървър.",
     "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>.": "Не е възможно свързване към Home сървъра чрез HTTP, когато има HTTPS адрес в лентата на браузъра Ви. Или използвайте HTTPS или <a>включете функция небезопасни скриптове</a>.",
-    "Login as guest": "Влез като гост",
     "Sign in to get started": "Влезте в профила си, за да започнете",
     "Set a display name:": "Задаване на име:",
     "Upload an avatar:": "Качване на профилна снимка:",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 407b9f61d4..ab4e803342 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -579,7 +579,6 @@
     "%(nameList)s %(transitionList)s": "%(transitionList)s%(nameList)s",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s han entrat",
     "Guest access is disabled on this Home Server.": "L'accés a usuaris d'altres xarxes no està permès en aquest servidor.",
-    "Login as guest": "Inicia sessió com a convidat",
     "Unblacklist": "Treure de la llista negre",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s s'ha unit",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s han sortit",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 33c7a3d5f1..441e16e2c3 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -239,7 +239,6 @@
     "Level:": "Úroveň:",
     "Local addresses for this room:": "Místní adresy této místnosti:",
     "Logged in as:": "Přihlášen/a jako:",
-    "Login as guest": "Přihlášen/a jako host",
     "matrix-react-sdk version:": "Verze matrix-react-sdk:",
     "Mobile phone number": "Číslo mobilního telefonu",
     "Mobile phone number (optional)": "Číslo mobilního telefonu (nepovinné)",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 2a59530d5a..e10534d7f1 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -39,7 +39,6 @@
     "Searches DuckDuckGo for results": "Søger DuckDuckGo for resultater",
     "Commands": "kommandoer",
     "Emoji": "Emoji",
-    "Login as guest": "Log ind som gæst",
     "Sign in": "Log ind",
     "Warning!": "Advarsel!",
     "Account": "Konto",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4892b91b48..16ca9462b3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -40,7 +40,6 @@
     "Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse",
     "Commands": "Kommandos",
     "Emoji": "Emoji",
-    "Login as guest": "Als Gast anmelden",
     "Sign in": "Anmelden",
     "Warning!": "Warnung!",
     "Error": "Fehler",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index fabd88c74a..929ca5e7df 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -142,7 +142,6 @@
     "%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
     "Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
     "Logged in as:": "Συνδεθήκατε ως:",
-    "Login as guest": "Σύνδεση ως επισκέπτης",
     "Logout": "Αποσύνδεση",
     "Low priority": "Χαμηλής προτεραιότητας",
     "matrix-react-sdk version:": "Έκδοση matrix-react-sdk:",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bf9e395bee..8e068d5651 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1120,7 +1120,7 @@
     "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
-    "Login as guest": "Login as guest",
+    "Try the app first": "Try the app first",
     "Sign in to get started": "Sign in to get started",
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Set a display name:": "Set a display name:",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 43e2041020..2a1b97b536 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -209,7 +209,6 @@
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "Local addresses for this room:": "Local addresses for this room:",
     "Logged in as:": "Logged in as:",
-    "Login as guest": "Login as guest",
     "Logout": "Logout",
     "Low priority": "Low priority",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 68645ffd9c..f48d10fa9f 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -862,7 +862,6 @@
     "Error: Problem communicating with the given homeserver.": "Eraro: Estas problemo en komunikado kun la hejmservilo.",
     "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>.": "Hejmservilo ne alkonekteblas per HTTP kun HTTPS URL en via adresbreto. Aŭ uzu HTTPS aŭ <a>ŝaltu malsekurajn skriptojn</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.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke <a>la SSL-atestilo de via hejmservilo</a> estas fidata, kaj ke neniu foliumila kromprogramo baras petojn.",
-    "Login as guest": "Saluti kiel gasto",
     "Sign in to get started": "Komencu per saluto",
     "Failed to fetch avatar URL": "Malsukcesis venigi adreson de profilbildo",
     "Set a display name:": "Agordi vidigan nomon:",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 8e7925ba36..5180461828 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -166,7 +166,6 @@
     "%(targetName)s left the room.": "%(targetName)s ha dejado la sala.",
     "Local addresses for this room:": "Direcciones locales para esta sala:",
     "Logged in as:": "Sesión iniciada como:",
-    "Login as guest": "Iniciar sesión como invitado",
     "Logout": "Cerrar Sesión",
     "Low priority": "Baja prioridad",
     "Accept": "Aceptar",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 04d2e86664..9c9e5a7589 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -298,7 +298,6 @@
     "Level:": "Maila:",
     "Local addresses for this room:": "Gela honen tokiko helbideak:",
     "Logged in as:": "Saioa hasteko erabiltzailea:",
-    "Login as guest": "Hasi saioa bisitari gisa",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index e5787ab561..b96dbafa14 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -198,7 +198,6 @@
     "Level:": "Taso:",
     "Local addresses for this room:": "Tämän huoneen paikalliset osoitteet:",
     "Logged in as:": "Kirjautunut käyttäjänä:",
-    "Login as guest": "Kirjaudu vieraana",
     "Logout": "Kirjaudu ulos",
     "Low priority": "Alhainen prioriteetti",
     "Manage Integrations": "Hallinoi integraatioita",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index dc36520506..5194dc21e7 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -166,7 +166,6 @@
     "%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
     "Local addresses for this room:": "Adresses locales pour ce salon :",
     "Logged in as:": "Identifié en tant que :",
-    "Login as guest": "Se connecter en tant que visiteur",
     "Logout": "Se déconnecter",
     "Low priority": "Priorité basse",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index fdab066031..fc1adfc478 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -879,7 +879,6 @@
     "Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.",
     "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>.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou <a>active scripts non seguros</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.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de o <a>certificado SSL do servidor</a> é de confianza, e que ningún engadido do navegador está bloqueando as peticións.",
-    "Login as guest": "Conexión como convidado",
     "Sign in to get started": "Conéctese para iniciar",
     "Failed to fetch avatar URL": "Fallo ao obter o URL do avatar",
     "Set a display name:": "Establecer nome público:",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f2aaac9a81..6012e857f5 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -238,7 +238,6 @@
     "Level:": "Szint:",
     "Local addresses for this room:": "A szoba helyi címe:",
     "Logged in as:": "Bejelentkezve mint:",
-    "Login as guest": "Belépés vendégként",
     "Logout": "Kilép",
     "Low priority": "Alacsony prioritás",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 9db1a4a99c..00d56e6074 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -62,7 +62,6 @@
     "Sign in with": "Masuk dengan",
     "Leave room": "Meninggalkan ruang",
     "Level:": "Tingkat:",
-    "Login as guest": "Masuk sebagai tamu",
     "Logout": "Keluar",
     "Low priority": "Prioritas rendah",
     "Markdown is disabled": "Markdown dinonaktifkan",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 068ad01ff1..5ba19d1622 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -909,7 +909,6 @@
     "Error: Problem communicating with the given homeserver.": "Errore: problema di comunicazione con l'homeserver dato.",
     "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>.": "Impossibile connettersi all'homeserver via HTTP quando c'è un URL HTTPS nella barra del tuo browser. Usa HTTPS o <a>attiva gli script non sicuri</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.": "Impossibile connettersi all'homeserver - controlla la tua connessione, assicurati che il <a>certificato SSL dell'homeserver</a> sia fidato e che un'estensione del browser non stia bloccando le richieste.",
-    "Login as guest": "Accedi come ospite",
     "Sign in to get started": "Accedi per iniziare",
     "Failed to fetch avatar URL": "Ricezione URL dell'avatar fallita",
     "Set a display name:": "Imposta un nome visualizzato:",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 4e0a988223..58333f23ad 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -240,7 +240,6 @@
     "Level:": "등급:",
     "Local addresses for this room:": "이 방의 로컬 주소:",
     "Logged in as:": "로그인:",
-    "Login as guest": "손님으로 로그인",
     "Logout": "로그아웃",
     "Low priority": "낮은 우선순위",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 01e3ae5c6d..37cb6ec324 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -224,7 +224,6 @@
     "Level:": "Līmenis:",
     "Local addresses for this room:": "Šīs istabas lokālās adreses:",
     "Logged in as:": "Pierakstījās kā:",
-    "Login as guest": "Pierakstīties kā viesim",
     "Logout": "Izrakstīties",
     "Low priority": "Zemas prioritātes",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 0df2cf1bd7..3e48fb9c3a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -305,7 +305,6 @@
     "Level:": "Niveau:",
     "Local addresses for this room:": "Lokale adressen voor deze ruimte:",
     "Logged in as:": "Ingelogd als:",
-    "Login as guest": "Als gast inloggen",
     "Logout": "Uitloggen",
     "Low priority": "Lage prioriteit",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle kamerleden, vanaf het moment dat ze uitgenodigt zijn.",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index d3dcb72f49..2ef30f7732 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -303,7 +303,6 @@
     "Publish this room to the public in %(domain)s's room directory?": "Czy opublikować ten pokój dla ogółu w spisie pokojów domeny %(domain)s?",
     "Local addresses for this room:": "Lokalne adresy dla tego pokoju:",
     "Logged in as:": "Zalogowany jako:",
-    "Login as guest": "Zaloguj jako gość",
     "Logout": "Wyloguj",
     "Low priority": "Niski priorytet",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index d165c6c057..9b1c599501 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -83,7 +83,6 @@
     "Kicks user with given id": "Remove usuário com o identificador informado",
     "Labs": "Laboratório",
     "Leave room": "Sair da sala",
-    "Login as guest": "Entrar como visitante",
     "Logout": "Sair",
     "Low priority": "Baixa prioridade",
     "Manage Integrations": "Gerenciar integrações",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 0a4d847805..55a503dbe7 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -83,7 +83,6 @@
     "Kicks user with given id": "Remove usuário com o identificador informado",
     "Labs": "Laboratório",
     "Leave room": "Sair da sala",
-    "Login as guest": "Entrar como visitante",
     "Logout": "Sair",
     "Low priority": "Baixa prioridade",
     "Manage Integrations": "Gerenciar integrações",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e2529ed1bc..c93b9a2e3b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -75,7 +75,6 @@
     "Kicks user with given id": "Выкидывает пользователя с заданным ID",
     "Labs": "Лаборатория",
     "Leave room": "Покинуть комнату",
-    "Login as guest": "Войти как гость",
     "Logout": "Выйти",
     "Low priority": "Неважные",
     "Manage Integrations": "Управление интеграциями",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index c7f38cff35..b40ba8f750 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -822,7 +822,6 @@
     "Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo <a>povolte nezabezpečené skripty</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vašeho pripojenia na internet, uistite sa že <a>certifikát  domovského servera</a> je dôverihodný, a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.",
-    "Login as guest": "Prihlásiť sa ako hosť",
     "Failed to fetch avatar URL": "Nepodarilo sa získať URL adresu obrázka",
     "Set a display name:": "Nastaviť zobrazované meno:",
     "Upload an avatar:": "Nahrať obrázok:",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index ebacd28a5c..e73107376b 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -903,7 +903,6 @@
     "Error: Problem communicating with the given homeserver.": "Грешка: проблем у комуницирању са датим кућним сервером.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не могу да се повежем на кућни сервер преко HTTP-а када се користи HTTPS адреса у траци вашег прегледача. Или користите HTTPS или <a>омогућите небезбедне скрипте</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на кућни сервер. Проверите вашу интернет везу, постарајте се да верујете <a>SSL сертификату кућног сервера</a> и да проширење прегледача не блокира захтеве.",
-    "Login as guest": "Пријави се као гост",
     "Sign in to get started": "Пријави се да почнеш",
     "Failed to fetch avatar URL": "Нисам успео да добавим адресу аватара",
     "Set a display name:": "Постави приказно име:",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0f898a3374..36c858247e 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -224,7 +224,6 @@
     "Level:": "Nivå:",
     "Local addresses for this room:": "Lokala adresser för rummet:",
     "Logged in as:": "Inloggad som:",
-    "Login as guest": "Logga in som gäst",
     "Logout": "Logga ut",
     "Low priority": "Lågprioritet",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 6fa7febabd..f59ae4b53b 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -178,7 +178,6 @@
     "Leave room": "ออกจากห้อง",
     "%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
     "Logged in as:": "เข้าสู่ระบบในชื่อ:",
-    "Login as guest": "เข้าสู่ระบบในฐานะแขก",
     "Logout": "ออกจากระบบ",
     "Markdown is disabled": "ปิดใช้งาน Markdown แล้ว",
     "Markdown is enabled": "เปิดใช้งาน Markdown แล้ว",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 797fed79ce..3fb790c0d6 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -224,7 +224,6 @@
     "Level:": "Seviye :",
     "Local addresses for this room:": "Bu oda için yerel adresler :",
     "Logged in as:": "Olarak giriş yaptı :",
-    "Login as guest": "Misafir olarak giriş yaptı",
     "Logout": "Çıkış Yap",
     "Low priority": "Düşük öncelikli",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 8e2dc6e0f8..cb39c1751b 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -153,7 +153,6 @@
     "Jump to first unread message.": "跳到第一条未读消息。",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "退出聊天室",
-    "Login as guest": "以游客的身份登录",
     "New password": "新密码",
     "Add a topic": "添加一个主题",
     "Admin": "管理员",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6ceda34507..bc5464d315 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -123,7 +123,6 @@
     "Jump to first unread message.": "跳到第一則未讀訊息。",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "離開聊天室",
-    "Login as guest": "以游客的身份登錄",
     "New password": "新密碼",
     "Resetting 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.": "重設密碼目前會把所有裝置上的端到端加密金鑰重設，讓已加密的聊天歷史不可讀，除非您先匯出您的聊天室金鑰並在稍後重新匯入。這會在未來改進。",
     "Return to login screen": "返回到登入畫面",

From ec53b5f5ab3d00593fca3da788ec1bf0c333cac2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 21:21:06 -0600
Subject: [PATCH 166/702] Expose at-room power level setting

Fixes https://github.com/vector-im/riot-web/issues/5835

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomSettings.js | 27 ++++++++++++++++++++--
 src/i18n/strings/en_EN.json                |  1 +
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 059e07ffdb..0ccfa23bf3 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -395,7 +395,17 @@ module.exports = React.createClass({
             powerLevels["events"] = Object.assign({}, this.state.powerLevels["events"] || {});
             powerLevels["events"][powerLevelKey.slice(eventsLevelPrefix.length)] = value;
         } else {
-            powerLevels[powerLevelKey] = value;
+            const keyPath = powerLevelKey.split('.');
+            let parentObj;
+            let currentObj = powerLevels;
+            for (const key of keyPath) {
+                if (!currentObj[key]) {
+                    currentObj[key] = {};
+                }
+                parentObj = currentObj;
+                currentObj = currentObj[key];
+            }
+            parentObj[keyPath[keyPath.length - 1]] = value;
         }
         this.setState({
             powerLevels,
@@ -664,6 +674,10 @@ module.exports = React.createClass({
                 desc: _t('To remove other users\' messages, you must be a'),
                 defaultValue: 50,
             },
+            "notifications.room": {
+                desc: _t('To notify everyone in the room, you must be a'),
+                defaultValue: 50,
+            },
         };
 
         const banLevel = parseIntWithDefault(powerLevels.ban, powerLevelDescriptors.ban.defaultValue);
@@ -865,7 +879,16 @@ module.exports = React.createClass({
         const powerSelectors = Object.keys(powerLevelDescriptors).map((key, index) => {
             const descriptor = powerLevelDescriptors[key];
 
-            const value = parseIntWithDefault(powerLevels[key], descriptor.defaultValue);
+            const keyPath = key.split('.');
+            let currentObj = powerLevels;
+            for (const prop of keyPath) {
+                if (currentObj === undefined) {
+                    break;
+                }
+                currentObj = currentObj[prop];
+            }
+
+            const value = parseIntWithDefault(currentObj, descriptor.defaultValue);
             return <div key={index} className="mx_RoomSettings_powerLevel">
                 <span className="mx_RoomSettings_powerLevelKey">
                     { descriptor.desc }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bf9e395bee..8698e6108f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -491,6 +491,7 @@
     "To kick users, you must be a": "To kick users, you must be a",
     "To ban users, you must be a": "To ban users, you must be a",
     "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
+    "To notify everyone in the room, you must be a": "To notify everyone in the room, you must be a",
     "No users have specific privileges in this room": "No users have specific privileges in this room",
     "%(user)s is a %(userRole)s": "%(user)s is a %(userRole)s",
     "Privileged Users": "Privileged Users",

From 929da30df8016926d1780ef0e04e42d366938eb6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 27 May 2018 10:28:47 -0600
Subject: [PATCH 167/702] onEvent -> onStateEvent

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/PinnedEventsPanel.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/PinnedEventsPanel.js b/src/components/views/rooms/PinnedEventsPanel.js
index e75cbea817..50c40142da 100644
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@@ -39,16 +39,16 @@ module.exports = React.createClass({
 
     componentDidMount: function() {
         this._updatePinnedMessages();
-        MatrixClientPeg.get().on("RoomState.events", this._onEvent);
+        MatrixClientPeg.get().on("RoomState.events", this._onStateEvent);
     },
 
     componentWillUnmount: function() {
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("RoomState.events", this._onEvent);
+            MatrixClientPeg.get().removeListener("RoomState.events", this._onStateEvent);
         }
     },
 
-    _onEvent: function(ev) {
+    _onStateEvent: function(ev) {
         if (ev.getRoomId() === this.props.room.roomId && ev.getType() === "m.room.pinned_events") {
             this._updatePinnedMessages();
         }

From 65a30572f3976621d0cf577461e50c60873e609d Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Fri, 25 May 2018 21:40:11 +0000
Subject: [PATCH 168/702] Translated using Weblate (Swedish)

Currently translated at 81.4% (968 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 21f38169dc..4ab1413e4f 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -589,7 +589,7 @@
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din epostadress verkar inte vara kopplad till något Matrix-ID på den här hemservern.",
     "Restricted": "Begränsad",
     "Who would you like to communicate with?": "Vem vill du kommunicera med?",
-    "Failed to invite the following users to the %(roomName)s room:": "Misslyckades med att bjuda in följande användare till %(roomName)s-rummet:",
+    "Failed to invite the following users to the %(roomName)s room:": "Det gick inte att bjuda in följande användare till %(roomName)s-rummet:",
     "Unable to create widget.": "Det går inte att skapa widget.",
     "Ignored user": "Ignorerad användare",
     "You are now ignoring %(userId)s": "Du ignorerar nu %(userId)s",
@@ -960,5 +960,14 @@
     "The remote side failed to pick up": "Mottagaren kunde inte svara",
     "Room name or alias": "Rumsnamn eller alias",
     "Jump to read receipt": "Hoppa till läskvitto",
-    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Just nu är det inte möjligt att svara med en fil så den kommer att skickas utan att vara ett svar."
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Just nu är det inte möjligt att svara med en fil så den kommer att skickas utan att vara ett svar.",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Denna process låter dig exportera nycklarna för meddelanden som du har fått i krypterade rum till en lokal fil. Du kommer sedan att kunna importera filen i en annan Matrix-klient i framtiden, så att den klienten också kan dekryptera meddelandena.",
+    "Unknown for %(duration)s": "Okänt i %(duration)s",
+    "Unknown": "Okänt",
+    "Reload widget": "Ladda om widget",
+    "e.g. %(exampleValue)s": "t.ex. %(exampleValue)s",
+    "Can't leave Server Notices room": "Kan inte lämna serveraviseringsrummet",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Detta rum används för viktiga meddelanden från hemservern, så du kan inte lämna det.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data från en äldre version av Riot has upptäckts. Detta ska ha orsakat att krypteringen inte fungerat i den äldre versionen. Krypterade meddelanden som nyligen har skickats medans den äldre versionen användes kanske inte kan dekrypteras i denna version. Detta kan även orsaka att meddelanden skickade med denna version inte fungerar. Om du upplever problem, logga ut och in igen. För att behålla meddelandehistoriken, exportera dina nycklar och importera dem igen.",
+    "Confirm Removal": "Bekräfta borttagning"
 }

From 23162c86253cc5aca18f2a9a954ab56736055991 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 9 Oct 2017 18:50:08 -0600
Subject: [PATCH 169/702] Support third party integration managers in
 AppPermission

Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL).

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 .../views/elements/AppPermission.js           | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index c45006be3a..0ce7c2a45e 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import url from 'url';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 
 export default class AppPermission extends React.Component {
     constructor(props) {
@@ -34,14 +35,21 @@ export default class AppPermission extends React.Component {
     }
 
     isScalarWurl(wurl) {
-        if (wurl && wurl.hostname && (
-            wurl.hostname === 'scalar.vector.im' ||
-            wurl.hostname === 'scalar-staging.riot.im' ||
-            wurl.hostname === 'scalar-develop.riot.im' ||
-            wurl.hostname === 'demo.riot.im' ||
-            wurl.hostname === 'localhost'
-        )) {
-            return true;
+        // Exit early if we've been given bad data
+        if (!wurl) {
+            return false;
+        }
+
+        let scalarUrls = SdkConfig.get().integrations_widgets_urls;
+        if (!scalarUrls || scalarUrls.length == 0) {
+            scalarUrls = [SdkConfig.get().integrations_rest_url];
+        }
+
+        const url = wurl.format();
+        for (const scalarUrl of scalarUrls) {
+            if (url.startsWith(scalarUrl)) {
+                return true;
+            }
         }
         return false;
     }

From 47ae19672fa76539854cab31d4dfff8da9267b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 24 May 2018 18:12:29 +0000
Subject: [PATCH 170/702] Translated using Weblate (French)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 274d13fa45..64093ebb0d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1195,5 +1195,6 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Veuillez aider Riot.im à s'améliorer en envoyant <UsageDataLink>des données d'utilisation anonymes</UsageDataLink>. Cela utilisera un cookie.",
     "Yes, I want to help!": "Oui, je veux aider !",
     "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir."
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
+    "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être"
 }

From 98613748b63a338d21b800d41004f070562a0ffb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 27 May 2018 11:12:55 -0600
Subject: [PATCH 171/702] Move Scalar Widget URL check to WidgetUtils

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/WidgetUtils.js                            | 35 +++++++++++++++++++
 .../views/elements/AppPermission.js           | 23 ++----------
 src/components/views/elements/AppTile.js      | 35 +------------------
 3 files changed, 38 insertions(+), 55 deletions(-)

diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 5f45a8c58c..10cd473904 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import MatrixClientPeg from './MatrixClientPeg';
+import SdkConfig from "./SdkConfig";
+import * as url from "url";
 
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
@@ -55,4 +57,37 @@ export default class WidgetUtils {
 
         return room.currentState.maySendStateEvent('im.vector.modular.widgets', me);
     }
+
+    /**
+     * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
+     * @param  {[type]}  testUrlString URL to check
+     * @return {Boolean} True if specified URL is a scalar URL
+     */
+    static isScalarUrl(testUrlString) {
+        if (!testUrlString) {
+            console.error('Scalar URL check failed. No URL specified');
+            return false;
+        }
+
+        const testUrl = url.parse(testUrlString);
+
+        let scalarUrls = SdkConfig.get().integrations_widgets_urls;
+        if (!scalarUrls || scalarUrls.length === 0) {
+            scalarUrls = [SdkConfig.get().integrations_rest_url];
+        }
+
+        for (let i = 0; i < scalarUrls.length; i++) {
+            const scalarUrl = url.parse(scalarUrls[i]);
+            if (testUrl && scalarUrl) {
+                if (
+                    testUrl.protocol === scalarUrl.protocol &&
+                    testUrl.host === scalarUrl.host &&
+                    testUrl.pathname.startsWith(scalarUrl.pathname)
+                ) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 0ce7c2a45e..6af3148e21 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import url from 'url';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
+import WidgetUtils from "../../../WidgetUtils";
 
 export default class AppPermission extends React.Component {
     constructor(props) {
@@ -20,7 +21,7 @@ export default class AppPermission extends React.Component {
 
         const searchParams = new URLSearchParams(wurl.search);
 
-        if (this.isScalarWurl(wurl) && searchParams && searchParams.get('url')) {
+        if (WidgetUtils.isScalarUrl(wurl) && searchParams && searchParams.get('url')) {
             curl = url.parse(searchParams.get('url'));
             if (curl) {
                 curl.search = curl.query = "";
@@ -34,26 +35,6 @@ export default class AppPermission extends React.Component {
         return curlString;
     }
 
-    isScalarWurl(wurl) {
-        // Exit early if we've been given bad data
-        if (!wurl) {
-            return false;
-        }
-
-        let scalarUrls = SdkConfig.get().integrations_widgets_urls;
-        if (!scalarUrls || scalarUrls.length == 0) {
-            scalarUrls = [SdkConfig.get().integrations_rest_url];
-        }
-
-        const url = wurl.format();
-        for (const scalarUrl of scalarUrls) {
-            if (url.startsWith(scalarUrl)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     render() {
         let e2eWarningText;
         if (this.props.isRoomEncrypted) {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 5f3ed6eba1..0ec754e0c0 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -121,39 +121,6 @@ export default class AppTile extends React.Component {
         return u.format();
     }
 
-    /**
-     * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
-     * @param  {[type]}  testUrlString URL to check
-     * @return {Boolean} True if specified URL is a scalar URL
-     */
-    isScalarUrl(testUrlString) {
-        if (!testUrlString) {
-            console.error('Scalar URL check failed. No URL specified');
-            return false;
-        }
-
-        const testUrl = url.parse(testUrlString);
-
-        let scalarUrls = SdkConfig.get().integrations_widgets_urls;
-        if (!scalarUrls || scalarUrls.length == 0) {
-            scalarUrls = [SdkConfig.get().integrations_rest_url];
-        }
-
-        for (let i = 0; i < scalarUrls.length; i++) {
-            const scalarUrl = url.parse(scalarUrls[i]);
-            if (testUrl && scalarUrl) {
-                if (
-                    testUrl.protocol === scalarUrl.protocol &&
-                    testUrl.host === scalarUrl.host &&
-                    testUrl.pathname.startsWith(scalarUrl.pathname)
-                ) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
     isMixedContent() {
         const parentContentProtocol = window.location.protocol;
         const u = url.parse(this.props.url);
@@ -209,7 +176,7 @@ export default class AppTile extends React.Component {
     setScalarToken() {
         this.setState({initialising: true});
 
-        if (!this.isScalarUrl(this.props.url)) {
+        if (!WidgetUtils.isScalarUrl(this.props.url)) {
             console.warn('Non-scalar widget, not setting scalar token!', url);
             this.setState({
                 error: null,

From 77bfce5f9af813ed0359568f5a011c5256b9e9ee Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 27 May 2018 23:46:28 +0000
Subject: [PATCH 172/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 04d2e86664..c293ec135d 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1183,5 +1183,17 @@
     "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
     "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
     "password": "pasahitza",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz)."
+    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).",
+    "e.g. %(exampleValue)s": "adib. %(exampleValue)s",
+    "Reload widget": "Birkargatu trepeta",
+    "To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Hobetu Riot.im <UsageDataLink>erabilera-datu anonimoak</UsageDataLink> bidaliz. Honek coockie bat erabiliko du (Ikusi gure <PolicyLink>Cookie politika</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Hobetu Riot.im <UsageDataLink>erabilera-datu anonimoak</UsageDataLink> bidaliz. Honek cookie bat erabiliko du.",
+    "Yes, I want to help!": "Bai, lagundu nahi dut!",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Honek kontua behin betirako erabilgaitza bihurtuko du. Ezin izango duzu saioa hasi, eta ezin izango du beste inork ID hori erabili. Kontua dagoen gela guztietatik aterako da, eta kontuaren xehetasunak identitate-zerbitzaritik ezabatuko dira. <b>Ekintza hau ezin da desegin.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Kontua desaktibatzean <b>ez dira zuk bidalitako mezuak ahaztuko.</b> Mezuak ahaztea nahi baduzu markatu beheko kutxa.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso diztuzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
+    "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)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)",
+    "Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera."
 }

From 5a9c32a5a72e33092fa75838400ca16e33b61afe Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Sun, 27 May 2018 18:17:29 +0000
Subject: [PATCH 173/702] Translated using Weblate (French)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 64093ebb0d..0d8cf10f8d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1196,5 +1196,5 @@
     "Yes, I want to help!": "Oui, je veux aider !",
     "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
-    "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être"
+    "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un"
 }

From 9b86040856591c12a8b50ea99442360e220668af Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 24 May 2018 23:50:05 +0000
Subject: [PATCH 174/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f545df95d3..80dce1cc2d 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1190,5 +1190,6 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "這個聊天室是用於發佈從家伺服器而來的重要訊息，所以您不能離開它。",
     "Terms and Conditions": "條款與細則",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "要繼續使用 %(homeserverDomain)s 家伺服器，您必須審閱並同意我們的條款與細則。",
-    "Review terms and conditions": "審閱條款與細則"
+    "Review terms and conditions": "審閱條款與細則",
+    "To notify everyone in the room, you must be a": "為了通知每個在聊天室裡的人，您必須為"
 }

From 779579dea4a4578d696e338e000d8ce5105c25f6 Mon Sep 17 00:00:00 2001
From: Nathan van Beelen <nathan@vanbeelen.org>
Date: Mon, 28 May 2018 07:40:11 +0000
Subject: [PATCH 175/702] Translated using Weblate (Dutch)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 44 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 0df2cf1bd7..e71463564a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1146,5 +1146,47 @@
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug logs bevatten applicatie-gebruik data inclusief je gebruikersnaam, de ID's of namen van de ruimtes en groepen die je hebt bezocht en de gebruikersnamen van andere gebruikers. Ze bevatten geen berichten.",
     "Failed to send logs: ": "Het is niet gelukt om de logs te versturen: ",
     "Notes:": "Constateringen:",
-    "Preparing to send logs": "Voorbereiden om logs te versturen"
+    "Preparing to send logs": "Voorbereiden om logs te versturen",
+    "e.g. %(exampleValue)s": "bijv. %(exampleValue)s",
+    "Every page you use in the app": "Elke pagina die je in de applicatie gebruikt",
+    "e.g. <CurrentPageURL>": "bijv. <CurrentPageURL>",
+    "Your User Agent": "Je gebruikersagent",
+    "Your device resolution": "De resolutie van je apparaat",
+    "Reload widget": "Widget herladen",
+    "Missing roomId.": "roomId mist.",
+    "Always show encryption icons": "Altijd versleutelingsiconen weergeven",
+    "Send analytics data": "Statistische gegevens (analytics) versturen",
+    "Enable widget screenshots on supported widgets": "Widget schermafbeeldingen op ondersteunde widgets aanzetten",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Op dit moment is het niet mogelijk om te reageren met een bestand het zal dus als een normaal bericht worden verstuurd.",
+    "Unable to reply": "Niet mogelijk om te reageren",
+    "At this time it is not possible to reply with an emote.": "Op dit moment is het niet mogelijk om met een emote te reageren.",
+    "To notify everyone in the room, you must be a": "Om iedereen in de ruimte te notificeren moet je het volgende zijn:",
+    "Muted Users": "Gedempte Gebruikers",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Help Riot.im te verbeteren door het versturen van <UsageDataLink>anonieme gebruiksgegevens</UsageDataLink>. Dit zal een cookie gebruiken (zie ons <PolicyLink>Cookiebeleid</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Help Riot.im te verbeteren door het versturen van <UsageDataLink>anonieme gebruiksgegevens</UsageDataLink>. Dit zal een cookie gebruiken.",
+    "Yes, I want to help!": "Ja, ik wil helpen!",
+    "Warning: This widget might use cookies.": "Waarschuwing: deze widget gebruikt misschien cookies.",
+    "Popout widget": "Opspringende widget",
+    "Picture": "Afbeelding",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Niet mogelijk om de gebeurtenis te laden waar op gereageerd was. Het kan zijn dat het niet bestaat of dat je niet toestemming hebt om het te bekijken.",
+    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot fouten worden bijgehouden op GitHub: <a>maak een GitHub melding</a>.",
+    "Failed to indicate account erasure": "Niet gelukt om de accountverwijdering aan te geven",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dit zal je account voorgoed onbruikbaar maken. Je zal niet meer in kunnen loggen en niemand anders zal met dezelfde gebruikers ID kunnen registreren. Dit zal er voor zorgen dat je account alle ruimtes verlaat waar het momenteel onderdeel van is en het verwijderd de accountgegevens van de identiteitsserver. <b>Deze actie is onomkeerbaar.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Het deactiveren van je account <b>zal er niet standaard voor zorgen dat de berichten die je verzonden hebt vergeten worden.</b> Als je wilt dat wij de berichten vergeten, klikt alsjeblieft op het vakje hieronder.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is hetzelfde als in e-mail. Het vergeten van je berichten betekent dat berichten die je hebt verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie van het bericht.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (<b>Waarschuwing:</b> dit zal er voor zorgen dat toekomstige gebruikers een incompleet beeld krijgen van gesprekken)",
+    "To continue, please enter your password:": "Om verder te gaan, vul alsjeblieft je wachtwoord in:",
+    "password": "wachtwoord",
+    "Log out and remove encryption keys?": "Uitloggen en versleutelingssleutels verwijderen?",
+    "Clear Storage and Sign Out": "Leeg Opslag en Log Uit",
+    "Send Logs": "Logboek Versturen",
+    "Refresh": "Herladen",
+    "We encountered an error trying to restore your previous session.": "Er is een fout opgetreden tijdens het herstellen van je vorige sessie.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Het opschonen van je browser's opslag zal het probleem misschien oplossen, maar zal je uitloggen en ervoor zorgen dat alle versleutelde chat geschiedenis onleesbaar wordt.",
+    "Collapse Reply Thread": "Reactieketting Inklappen",
+    "Can't leave Server Notices room": "Kan de Server Meldingen ruimte niet verlaten",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Deze ruimte wordt gebruikt voor belangrijke berichten van de thuisserver, dus je kan het niet verlaten.",
+    "Terms and Conditions": "Voorwaarden",
+    "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 zal je de voorwaarden moeten lezen en ermee akkoord moeten gaan.",
+    "Review terms and conditions": "Voorwaarden lezen"
 }

From cc241edb4b2fa4da8ab247c75534bd54eac418ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 28 May 2018 10:57:38 +0000
Subject: [PATCH 176/702] Added translation using Weblate (Icelandic)

---
 src/i18n/strings/is.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/is.json

diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/i18n/strings/is.json
@@ -0,0 +1 @@
+{}

From 181e5ee7d36c5c8c48179422fe9a4899cbd7b2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 28 May 2018 11:27:58 +0000
Subject: [PATCH 177/702] Translated using Weblate (Icelandic)

Currently translated at 42.5% (506 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
---
 src/i18n/strings/is.json | 509 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 508 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 0967ef424b..aa56456458 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -1 +1,508 @@
-{}
+{
+    "This email address is already in use": "Þetta tölvupóstfang er nú þegar í notkun",
+    "This phone number is already in use": "Þetta símanúmer er nú þegar í notkun",
+    "Failed to verify email address: make sure you clicked the link in the email": "Gat ekki sannprófað tölvupóstfang: gakktu úr skugga um að þú hafir smellt á tengilinn í tölvupóstinum",
+    "e.g. %(exampleValue)s": "t.d. %(exampleValue)s",
+    "e.g. <CurrentPageURL>": "t.d. <CurrentPageURL>",
+    "Your User Agent": "Kennisstrengur þinn",
+    "Your device resolution": "Skjáupplausn tækisins þíns",
+    "Analytics": "Greiningar",
+    "Call Anyway": "hringja samt",
+    "Answer Anyway": "Svara samt",
+    "Call": "Símtal",
+    "Answer": "Svara",
+    "The remote side failed to pick up": "Ekki var svarað á fjartengda endanum",
+    "VoIP is unsupported": "Enginn stuðningur við VoIP",
+    "Conference calls are not supported in encrypted rooms": "Símafundir eru ekki studdir í dulrituðum spjallrásum",
+    "Warning!": "Aðvörun!",
+    "Conference calling is in development and may not be reliable.": "Símafundir eru í þróun og gætu verið óáreiðanlegir.",
+    "Upload Failed": "Upphleðsla mistókst",
+    "Sun": "sun",
+    "Mon": "mán",
+    "Tue": "þri",
+    "Wed": "mið",
+    "Thu": "fim",
+    "Fri": "fös",
+    "Sat": "lau",
+    "Jan": "jan",
+    "Feb": "feb",
+    "Mar": "mar",
+    "Apr": "apr",
+    "May": "maí",
+    "Jun": "jún",
+    "Jul": "júl",
+    "Aug": "ágú",
+    "Sep": "sep",
+    "Oct": "okt",
+    "Nov": "nóv",
+    "Dec": "des",
+    "PM": "e.h.",
+    "AM": "f.h.",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Room name or alias": "Nafn eða samnefni spjallrásar",
+    "Default": "Sjálfgefið",
+    "Restricted": "Takmarkað",
+    "Moderator": "Umsjónarmaður",
+    "Admin": "Stjórnandi",
+    "Start a chat": "Hefja spjall",
+    "Email, name or matrix ID": "Tölvupóstfang, nafn eða Matrix-auðkenni",
+    "Start Chat": "Hefja spjall",
+    "Operation failed": "Aðgerð tókst ekki",
+    "You need to be logged in.": "Þú þarft að vera skráð/ur inn.",
+    "Unable to create widget.": "Gat ekki búið til viðmótshluta.",
+    "Failed to send request.": "Mistókst að senda beiðni.",
+    "This room is not recognised.": "Spjallrás er ekki þekkt.",
+    "Power level must be positive integer.": "Völd verða að vera jákvæð heiltala.",
+    "You are not in this room.": "Þú ert ekki á þessari spjallrás.",
+    "You do not have permission to do that in this room.": "Þú hefur ekki réttindi til þess að gera þetta á þessari spjallrás.",
+    "Missing room_id in request": "Vantar spjallrásarauðkenni í beiðni",
+    "Missing user_id in request": "Vantar notandaauðkenni í beiðni",
+    "Usage": "Notkun",
+    "Reason": "Ástæða",
+    "VoIP conference started.": "VoIP-símafundur hafinn.",
+    "VoIP conference finished.": "VoIP-símafundi lokið.",
+    "Someone": "Einhver",
+    "(not supported by this browser)": "(Ekki stutt af þessum vafra)",
+    "(no answer)": "(ekkert svar)",
+    "Send anyway": "Senda samt",
+    "Send": "Senda",
+    "Unnamed Room": "Nafnlaus spjallrás",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Fela taka-þátt/hætta skilaboð (hefur ekki áhrif á boð/spörk/bönn)",
+    "Hide read receipts": "Fela leskvittanir",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Birta tímamerki á 12 stunda sniði (t.d. 2:30 fh)",
+    "Always show message timestamps": "Alltaf birta tímamerki skilaboða",
+    "Send analytics data": "Senda greiningargögn",
+    "Never send encrypted messages to unverified devices from this device": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja",
+    "Never send encrypted messages to unverified devices in this room from this device": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja á þessari spjallrás",
+    "Enable inline URL previews by default": "Sjálfgefið virkja forskoðun innfelldra vefslóða",
+    "Room Colour": "Litur spjallrásar",
+    "Collecting app version information": "Safna upplýsingum um útgáfu forrits",
+    "Collecting logs": "Safna atvikaskrám",
+    "Uploading report": "Sendi inn skýrslu",
+    "Waiting for response from server": "Bíð eftir svari frá vefþjóni",
+    "Messages containing my display name": "Skilaboð sem innihalda birtingarnafn mitt",
+    "Messages containing my user name": "Skilaboð sem innihalda notandanafn mitt",
+    "Messages in one-to-one chats": "Skilaboð í maður-á-mann spjalli",
+    "Messages in group chats": "Skilaboð í hópaspjalli",
+    "When I'm invited to a room": "Þegar mér er boðið á spjallrás",
+    "Call invitation": "Boð um þátttöku",
+    "Messages sent by bot": "Skilaboð send af vélmennum",
+    "unknown caller": "Óþekktur símnotandi",
+    "Incoming voice call from %(name)s": "Innhringing raddsamtals frá %(name)s",
+    "Incoming video call from %(name)s": "Innhringing myndsamtals frá %(name)s",
+    "Decline": "Hafna",
+    "Accept": "Samþykkja",
+    "Error": "Villa",
+    "Enter Code": "Settu inn kóða",
+    "Submit": "Senda inn",
+    "Phone": "Sími",
+    "Add phone number": "Bæta við símanúmeri",
+    "Add": "Bæta við",
+    "Continue": "Halda áfram",
+    "Export E2E room keys": "Flytja út E2E dulritunarlykla spjallrásar",
+    "Current password": "Núverandi lykilorð",
+    "Password": "Lykilorð",
+    "New Password": "Nýtt lykilorð",
+    "Confirm password": "Staðfestu lykilorðið",
+    "Change Password": "Breyta lykilorði",
+    "Authentication": "Auðkenning",
+    "Delete %(count)s devices|other": "Eyða %(count)s tækjum",
+    "Delete %(count)s devices|one": "Eyða tæki",
+    "Device ID": "Auðkenni tækis",
+    "Device Name": "Heiti tækis",
+    "Last seen": "Sást síðast",
+    "Enable Notifications": "Virkja tilkynningar",
+    "Error saving email notification preferences": "Villa við að vista valkosti pósttilkynninga",
+    "An error occurred whilst saving your email notification preferences.": "Villa kom upp við að vista valkosti tilkynninga í tölvupósti.",
+    "Keywords": "Stikkorð",
+    "Enter keywords separated by a comma:": "Settu inn stikkorð aðskilin með kommu:",
+    "OK": "Í lagi",
+    "Failed to change settings": "Mistókst að breyta stillingum",
+    "Can't update user notification settings": "Gat ekki uppfært stillingar á tilkynningum notandans",
+    "Failed to update keywords": "Mistókst að uppfæra stikkorð",
+    "Messages containing <span>keywords</span>": "Skilaboð sem innihalda <span>kstikkorð</span>",
+    "Notify for all other messages/rooms": "Senda tilkynningar fyrir öll önnur skilaboð/spjallrásir",
+    "Notify me for anything else": "Senda mér tilkynningar fyrir allt annað",
+    "Enable notifications for this account": "Virkja tilkynningar fyrir þennan notandaaðgang",
+    "Add an email address above to configure email notifications": "Settu inn tölvupóstfang hér fyrir ofan til að stilla tilkynningar með tölvupósti",
+    "Enable email notifications": "Virkja tilkynningar í tölvupósti",
+    "Notification targets": "Markmið tilkynninga",
+    "Advanced notification settings": "Ítarlegar stillingar á tilkynningum",
+    "Enable desktop notifications": "Virkja tilkynningar á skjáborði",
+    "Show message in desktop notification": "Birta tilkynningu í innbyggðu kerfistilkynningakerfi",
+    "Enable audible notifications in web client": "Virkja hljóðtilkynningar í vefviðmóti",
+    "Off": "Slökkt",
+    "On": "Kveikt",
+    "Noisy": "Hávært",
+    "Add a widget": "Bæta við viðmótshluta",
+    "Drop File Here": "Slepptu skrá hérna",
+    "Drop file here to upload": "Slepptu hér skrá til að senda inn",
+    " (unsupported)": "[óstutt]",
+    "%(senderName)s sent an image": "%(senderName)s sendi mynd",
+    "%(senderName)s sent a video": "%(senderName)s sendi myndskeið",
+    "%(senderName)s uploaded a file": "%(senderName)s sendi inn skrá",
+    "Options": "Valkostir",
+    "Unencrypted message": "Ódulrituð skilaboð",
+    "Blacklisted": "Á bannlista",
+    "Verified": "Sannreynt",
+    "Unverified": "Óstaðfest",
+    "device id: ": "Auðkenni tækis: ",
+    "Kick": "Sparka",
+    "Unban": "Afbanna",
+    "Ban": "Banna",
+    "Unban this user?": "Taka þennan notanda úr banni?",
+    "Ban this user?": "Banna þennan notanda?",
+    "Are you sure?": "Ertu viss?",
+    "Devices": "Tæki",
+    "Unignore": "Byrja að fylgjast með á ný",
+    "Ignore": "Hunsa",
+    "Mention": "Minnst á",
+    "Invite": "Bjóða",
+    "User Options": "User Options",
+    "Direct chats": "Beint spjall",
+    "Unmute": "Kveikja á hljóði",
+    "Mute": "Þagga hljóð",
+    "Make Moderator": "Gera að umsjónarmanni",
+    "Admin Tools": "Kerfisstjóratól",
+    "Level:": "Stig:",
+    "Invited": "Boðið",
+    "Filter room members": "Sía meðlimi spjallrásar",
+    "Attachment": "Viðhengi",
+    "Upload Files": "Senda inn skrár",
+    "Hangup": "Leggja á",
+    "Voice call": "Raddsamtal",
+    "Video call": "_Myndsímtal",
+    "Upload file": "Hlaða inn skrá",
+    "Send an encrypted message…": "Senda dulrituð skilaboð…",
+    "Send a message (unencrypted)…": "Senda skilaboð (ódulrituð)…",
+    "You do not have permission to post to this room": "Þú hefur ekki heimild til að senda skilaboð á þessa spjallrás",
+    "Server error": "Villa á þjóni",
+    "Command error": "Skipanavilla",
+    "bold": "feitletrað",
+    "italic": "skáletrað",
+    "strike": "yfirstrikað",
+    "underline": "undirstrikað",
+    "code": "kóði",
+    "quote": "tilvitnun",
+    "bullet": "áherslumerki",
+    "Loading...": "Hleð inn...",
+    "Online": "Nettengt",
+    "Idle": "Iðjulaust",
+    "Offline": "Ótengt",
+    "Unknown": "Óþekkt",
+    "No rooms to show": "Engar spjallrásir sem hægt er að birta",
+    "Unnamed room": "Nafnlaus spjallrás",
+    "World readable": "Lesanlegt öllum",
+    "Guests can join": "Gestir geta tekið þátt",
+    "Save": "Vista",
+    "Join Room": "Taka þátt í spjallrás",
+    "Settings": "Stillingar",
+    "Forget room": "Gleyma spjallrás",
+    "Search": "Leita",
+    "Invites": "Boðsgestir",
+    "Favourites": "Eftirlæti",
+    "People": "Fólk",
+    "Rooms": "Spjallrásir",
+    "Low priority": "Lítill forgangur",
+    "Historical": "Ferilskráning",
+    "Rejoin": "Taka þátt aftur",
+    "This room": "Þessi spjallrás",
+    "This is a preview of this room. Room interactions have been disabled": "Þetta er forskoðun á spjallrásinni. Samskipti spjallrásarinnar hafa verið gerð óvirk",
+    "Privacy warning": "Aðvörun vegna gagnaleyndar",
+    "unknown error code": "óþekktur villukóði",
+    "Failed to forget room %(errCode)s": "Mistókst að gleyma spjallrásinni %(errCode)s",
+    "Encryption is enabled in this room": "Dulritun er virk í þessari spjallrás",
+    "Encryption is not enabled in this room": "Dulritun er ekki virk í þessari spjallrás",
+    "Banned users": "Bannaðir notendur",
+    "Leave room": "Fara af spjallrás",
+    "Favourite": "Eftirlæti",
+    "Tagged as: ": "Merkt sem:",
+    "To link to a room it must have <a>an address</a>.": "Til að tengja við spjallrás verður hún að vera með <a>vistfang</a>.",
+    "Who can access this room?": "Hver hefur aðgang að þessari spjallrás?",
+    "Only people who have been invited": "Aðeins fólk sem hefur verið boðið",
+    "Anyone who knows the room's link, apart from guests": "Hver sá sem þekkir slóðina á spjallrásina, fyrir utan gesti",
+    "Anyone who knows the room's link, including guests": "Hver sá sem þekkir slóðina á spjallrásina, að gestum meðtöldum",
+    "Who can read history?": "Hver getur lesið ferilskráningu?",
+    "Anyone": "Hver sem er",
+    "Members only (since the point in time of selecting this option)": "Einungis meðlimir (síðan þessi kostur var valinn)",
+    "Members only (since they were invited)": "Einungis meðlimir (síðan þeim var boðið)",
+    "Members only (since they joined)": "Einungis meðlimir (síðan þeir skráðu sig)",
+    "Permissions": "Heimildir",
+    "Advanced": "Nánar",
+    "Search…": "Leita…",
+    "This Room": "Þessi spjallrás",
+    "All Rooms": "Allar spjallrásir",
+    "Cancel": "Hætta við",
+    "Jump to first unread message.": "Fara í fyrstu ólesin skilaboð.",
+    "Close": "Loka",
+    "Invalid alias format": "Ógilt snið samnefnis",
+    "not specified": "ekki tilgreint",
+    "not set": "ekki stillt",
+    "Addresses": "Vistföng",
+    "Invalid community ID": "Ógilt auðkenni samfélags",
+    "Flair": "Hlutverksmerki",
+    "This room is not showing flair for any communities": " Þessi spjallrás sýnir ekki hlutverksmerki fyrir nein samfélög",
+    "Sunday": "Sunnudagur",
+    "Monday": "Mánudagur",
+    "Tuesday": "Þriðjudagur",
+    "Wednesday": "Miðvikudagur",
+    "Thursday": "Fimmtudagur",
+    "Friday": "Föstudagur",
+    "Saturday": "Laugardagur",
+    "Today": "Í dag",
+    "Yesterday": "Í gær",
+    "Error decrypting attachment": "Villa við afkóðun viðhengis",
+    "Copied!": "Afritað",
+    "This Home Server would like to make sure you are not a robot": "Þessi heimavefþjónn vill ganga úr skugga um að þú sért ekki vélmenni",
+    "Custom Server Options": "Sérsniðnir valkostir vefþjóns",
+    "Dismiss": "Hunsa",
+    "To continue, please enter your password.": "Til að halda áfram, settu inn lykilorðið þitt.",
+    "Password:": "Lykilorð:",
+    "Please check your email to continue registration.": "Skoðaðu tölvupóstinn þinn til að geta haldið áfram með skráningu.",
+    "Code": "Kóði",
+    "powered by Matrix": "keyrt með Matrix",
+    "User name": "Notandanafn",
+    "Forgot your password?": "Gleymdirðu lykilorðinu?",
+    "Email address": "Tölvupóstfang",
+    "Sign in": "Skrá inn",
+    "Email address (optional)": "Tölvupóstfang (valfrjálst)",
+    "Register": "Nýskrá",
+    "Home server URL": "Slóð á heimaþjón",
+    "Identity server URL": "Slóð á auðkennisþjón",
+    "What does this mean?": "Hvað þýðir þetta?",
+    "Filter community members": "Sía meðlimi samfélags",
+    "Remove": "Fjarlægja",
+    "Something went wrong!": "Eitthvað fór úrskeiðis!",
+    "Filter community rooms": "Sía spjallrásir samfélags",
+    "Yes, I want to help!": "Já, ég vil hjálpa til",
+    "You are not receiving desktop notifications": "Þú færð ekki tilkynningar á skjáborði",
+    "Enable them now": "Virkja þetta núna",
+    "What's New": "Nýtt á döfinni",
+    "Update": "Uppfæra",
+    "What's new?": "Hvað er nýtt á döfinni?",
+    "A new version of Riot is available.": "Ný útgáfa af Riot er tiltæk.",
+    "Set Password": "Setja lykilorð",
+    "Error encountered (%(errorDetail)s).": "Villa fannst (%(errorDetail)s).",
+    "Checking for an update...": "Athuga með uppfærslu...",
+    "No update available.": "Engin uppfærsla tiltæk.",
+    "Downloading update...": "Sæki uppfærslu...",
+    "Warning": "Aðvörun",
+    "Allow": "Leyfa",
+    "Picture": "Mynd",
+    "Edit": "Breyta",
+    "Unblacklist": "Taka af bannlista",
+    "Blacklist": "Bannlisti",
+    "Unverify": "Afturkalla sannvottun",
+    "Verify...": "Sannreyna...",
+    "No results": "Engar niðurstöður",
+    "Delete": "Eyða",
+    "Communities": "Samfélög",
+    "Home": "Heim",
+    "You cannot delete this image. (%(code)s)": "Þú getur ekki eytt þessari mynd. (%(code)s)",
+    "Uploaded on %(date)s by %(user)s": "Sent inn %(date)s af %(user)s",
+    "Download this file": "Sækja þessa skrá",
+    "collapse": "fella saman",
+    "expand": "fletta út",
+    "<a>In reply to</a> <pill>": "<a>Sem svar til</a> <pill>",
+    "Room directory": "Skrá yfir spjallrásir",
+    "Start chat": "Hefja spjall",
+    "Add User": "Bæta við notanda",
+    "email address": "tölvupóstfang",
+    "Preparing to send logs": "Undirbý sendingu atvikaskráa",
+    "Logs sent": "Sendi atvikaskrár",
+    "Thank you!": "Takk fyrir!",
+    "Failed to send logs: ": "Mistókst að senda atvikaskrár: ",
+    "Submit debug logs": "Senda inn aflúsunarannála",
+    "GitHub issue link:": "Slóð villutilkynningar á GitHub:",
+    "Notes:": "Athugasemdir:",
+    "Send logs": "Senda atvikaskrá",
+    "Unavailable": "Ekki tiltækt",
+    "Changelog": "Breytingaskrá",
+    "Start new chat": "Hefja nýtt spjall",
+    "Start Chatting": "Hefja spjall",
+    "Confirm Removal": "Staðfesta fjarlægingu",
+    "Create Community": "Búa til samfélag",
+    "Community Name": "Heiti samfélags",
+    "Example": "Dæmi",
+    "Community ID": "Auðkenni samfélags",
+    "example": "dæmi",
+    "Create": "Búa til",
+    "Create Room": "Búa til spjallrás",
+    "Room name (optional)": "Heiti spjallrásar (valkvætt)",
+    "Advanced options": "Ítarlegir valkostir",
+    "Unknown error": "Óþekkt villa",
+    "Incorrect password": "Rangt lykilorð",
+    "Deactivate Account": "Gera notandaaðgang óvirkann",
+    "To continue, please enter your password:": "Til að halda áfram, settu inn lykilorðið þitt:",
+    "password": "lykilorð",
+    "Device name": "Heiti tækis",
+    "Device key": "Dulritunarlykill tækis",
+    "Verify device": "Sannreyna tæki",
+    "I verify that the keys match": "Ég staðfesti hvort dulritunarlyklarnir samsvari",
+    "Back": "Til baka",
+    "Send Account Data": "Senda upplýsingar um notandaaðgang",
+    "Filter results": "Sía niðurstöður",
+    "Toolbox": "Verkfærakassi",
+    "Developer Tools": "Forritunartól",
+    "An error has occurred.": "Villa kom upp.",
+    "Start verification": "Hefja sannvottun",
+    "Share without verifying": "Deila án sannvottunar",
+    "Ignore request": "Hunsa beiðni",
+    "Encryption key request": "Beiðni um dulritunarlykil",
+    "Sign out": "Skrá út",
+    "Send Logs": "Senda atvikaskrár",
+    "Refresh": "Endurlesa",
+    "Invalid Email Address": "Ógilt tölvupóstfang",
+    "Verification Pending": "Sannvottun í bið",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram.",
+    "Skip": "Sleppa",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Notendanöfn mega einungis innihalda bókstafi, tölustafi, punkta, bandstrik eða undirstrik.",
+    "Username not available": "Notandanafnið er ekki tiltækt",
+    "Username available": "Notandanafnið er tiltækt",
+    "You have successfully set a password!": "Þér tókst að setja lykilorð!",
+    "You have successfully set a password and an email address!": "Þér tókst að setja lykilorð og tölvupóstfang!",
+    "Failed to change password. Is your password correct?": "Mistókst að breyta lykilorðinu. Er lykilorðið rétt?",
+    "(HTTP status %(httpStatus)s)": "(HTTP staða %(httpStatus)s)",
+    "Please set a password!": "Stilltu lykilorð!",
+    "Room contains unknown devices": "Spjallrás inniheldur óþekkt tæki",
+    "Unknown devices": "Óþekkt tæki",
+    "Custom": "Sérsniðið",
+    "Alias (optional)": "Samnefni (valfrjálst)",
+    "You cannot delete this message. (%(code)s)": "Þú getur ekki eytt þessum skilaboðum. (%(code)s)",
+    "Resend": "Endursenda",
+    "Cancel Sending": "Hætta við sendingu",
+    "Forward Message": "Áframsenda skeyti",
+    "Reply": "Svara",
+    "Pin Message": "Festa skeyti",
+    "View Source": "Skoða frumkóða",
+    "View Decrypted Source": "Skoða afkóðaða upprunaskrá",
+    "Unhide Preview": "Birta forskoðun",
+    "Permalink": "Varanlegur tengill",
+    "Quote": "Tilvitnun",
+    "Source URL": "Upprunaslóð",
+    "All messages (noisy)": "Öll skilaboð (hávært)",
+    "All messages": "Öll skilaboð",
+    "Mentions only": "Aðeins minnst á",
+    "Leave": "Fara út",
+    "Forget": "Gleyma",
+    "Reject": "Hafna",
+    "Low Priority": "Lítill forgangur",
+    "Direct Chat": "Beint spjall",
+    "View Community": "Skoða samfélag",
+    "Please install <chromeLink>Chrome</chromeLink> or <firefoxLink>Firefox</firefoxLink> for the best experience.": "Endilega settu upp <chromeLink>Chrome</chromeLink> eða <firefoxLink>Firefox</firefoxLink> til að þetta gangi sem best.",
+    "<safariLink>Safari</safariLink> and <operaLink>Opera</operaLink> work too.": "<safariLink>Safari</safariLink> og <operaLink>Opera</operaLink> virka líka ágætlega.",
+    "I understand the risks and wish to continue": "Ég skil áhættuna og vil halda áfram",
+    "Name": "Nafn",
+    "Topic": "Umfjöllunarefni",
+    "Failed to upload image": "Gat ekki sent inn mynd",
+    "Add rooms to this community": "Bæta spjallrásum í þetta samfélag",
+    "Featured Users:": "Notendur í sviðsljósinu:",
+    "Everyone": "Allir",
+    "Description": "Lýsing",
+    "Login": "Innskráning",
+    "Signed Out": "Skráð/ur út",
+    "Terms and Conditions": "Skilmálar og kvaðir",
+    "Logout": "Útskráning",
+    "Members": "Meðlimir",
+    "%(count)s Members|other": "%(count)s þátttakendur",
+    "%(count)s Members|one": "%(count)s þátttakandi",
+    "Invite to this room": "Bjóða inn á þessa spjallrás",
+    "Files": "Skrár",
+    "Notifications": "Tilkynningar",
+    "Hide panel": "Fela spjald",
+    "Invite to this community": "Bjóða í þetta samfélag",
+    "The server may be unavailable or overloaded": "Netþjónninn gæti verið undir miklu álagi eða ekki til taks",
+    "Room not found": "Spjallrás fannst ekki",
+    "Directory": "Efnisskrá",
+    "Search for a room": "Leita að spjallrás",
+    "#example": "#dæmi",
+    "Connectivity to the server has been lost.": "Tenging við vefþjón hefur rofnað.",
+    "Active call": "Virkt samtal",
+    "more": "meira",
+    "Failed to upload file": "Gat ekki sent inn skrá",
+    "Search failed": "Leit mistókst",
+    "Room": "Spjallrás",
+    "Fill screen": "Fylla skjáinn",
+    "Expand panel": "Fletta út spjaldi",
+    "Collapse panel": "Fella saman spjald",
+    "Filter room names": "Sía heiti spjallrása",
+    "Clear filter": "Hreinsa síu",
+    "Light theme": "Ljóst þema",
+    "Dark theme": "Dökkt þema",
+    "Success": "Tókst",
+    "Interface Language": "Tungumál notandaviðmóts",
+    "User Interface": "Notandaviðmót",
+    "Import E2E room keys": "Flytja inn E2E dulritunarlykla spjallrásar",
+    "Cryptography": "Dulritun",
+    "Device ID:": "Auðkenni tækis:",
+    "Device key:": "Dulritunarlykill tækis:",
+    "Ignored Users": "Hunsaðir notendur",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.",
+    "Labs": "Tilraunir",
+    "Deactivate my account": "Gera notandaaðganginn minn óvirkann",
+    "Clear Cache": "Hreinsa skyndiminni",
+    "Updates": "Uppfærslur",
+    "Check for update": "Athuga með uppfærslu",
+    "Default Device": "Sjálfgefið tæki",
+    "Microphone": "Hljóðnemi",
+    "Camera": "Myndavél",
+    "VoIP": "VoIP",
+    "Email": "Tölvupóstur",
+    "Add email address": "Bæta við tölvupóstfangi",
+    "Profile": "Notandasnið",
+    "Display name": "Birtingarnafn",
+    "Account": "Notandaaðgangur",
+    "Logged in as:": "Skráð inn sem:",
+    "Access Token:": "Aðgangsteikn:",
+    "click to reveal": "smelltu til að birta",
+    "Identity Server is": "Auðkennisþjónn er",
+    "matrix-react-sdk version:": "Útgáfa matrix-react-sdk:",
+    "riot-web version:": "Útgáfa riot-web:",
+    "olm version:": "Útgáfa olm:",
+    "Failed to send email": "Mistókst að senda tölvupóst",
+    "The email address linked to your account must be entered.": "Það þarf að setja inn tölvupóstfangið sem tengt er notandaaðgangnum þínum.",
+    "A new password must be entered.": "Það verður að setja inn nýtt lykilorð.",
+    "New passwords must match each other.": "Nýju lykilorðin verða að vera þau sömu.",
+    "I have verified my email address": "Ég hef staðfest tölvupóstfangið mitt",
+    "Return to login screen": "Fara aftur í innskráningargluggann",
+    "To reset your password, enter the email address linked to your account": "Til að endursetja lykilorðið þitt, settu þá inn tölvupóstfangið sem tengt er notandaaðgangnum þínum",
+    "New password": "Nýtt lykilorð",
+    "Confirm your new password": "Staðfestu nýtt lykilorð",
+    "Send Reset Email": "Senda endurstillingarpóst",
+    "Create an account": "Stofna notandaaðgang",
+    "Incorrect username and/or password.": "Rangt notandanafn og/eða lykilorð.",
+    "Upload an avatar:": "Hlaða inn auðkennismynd:",
+    "Missing password.": "Lykilorð vantar.",
+    "Passwords don't match.": "Lykilorðin samsvara ekki.",
+    "This doesn't look like a valid email address.": "Þetta lítur ekki út eins og gilt tölvupóstfang.",
+    "This doesn't look like a valid phone number.": "Þetta lítur ekki út eins og gilt símanúmer.",
+    "An unknown error occurred.": "Óþekkt villa kom upp.",
+    "Commands": "Skipanir",
+    "Users": "Notendur",
+    "unknown device": "óþekkt tæki",
+    "NOT verified": "EKKI sannreynt",
+    "verified": "sannreynt",
+    "Verification": "Sannvottun",
+    "Ed25519 fingerprint": "Ed25519 fingrafar",
+    "User ID": "Notandaauðkenni",
+    "Curve25519 identity key": "Curve25519 auðkennislykill",
+    "none": "ekkert",
+    "Claimed Ed25519 fingerprint key": "Tilkynnti Ed25519 fingrafarslykil",
+    "Algorithm": "Reiknirit",
+    "unencrypted": "ódulritað",
+    "Decryption error": "Afkóðunarvilla",
+    "Session ID": "Auðkenni setu",
+    "End-to-end encryption information": "Enda-í-enda dulritunarupplýsingar",
+    "Event information": "Upplýsingar um viðburð",
+    "Sender device information": "Upplýsingar um tæki sendanda",
+    "Export room keys": "Flytja út dulritunarlykla spjallrásar",
+    "Enter passphrase": "Settu inn lykilsetningu (passphrase)",
+    "Confirm passphrase": "Staðfestu lykilsetningu",
+    "Export": "Flytja út",
+    "Import room keys": "Flytja inn dulritunarlykla spjallrásar",
+    "File to import": "Skrá til að flytja inn",
+    "Import": "Flytja inn"
+}

From b6e2815f228ea47048f0f6074b900fbe40328431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 28 May 2018 11:43:18 +0000
Subject: [PATCH 178/702] Translated using Weblate (Icelandic)

Currently translated at 43.6% (520 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
---
 src/i18n/strings/is.json | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index aa56456458..3a8c98669d 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -9,7 +9,7 @@
     "Analytics": "Greiningar",
     "Call Anyway": "hringja samt",
     "Answer Anyway": "Svara samt",
-    "Call": "Símtal",
+    "Call": "Samtal",
     "Answer": "Svara",
     "The remote side failed to pick up": "Ekki var svarað á fjartengda endanum",
     "VoIP is unsupported": "Enginn stuðningur við VoIP",
@@ -140,7 +140,7 @@
     "Add a widget": "Bæta við viðmótshluta",
     "Drop File Here": "Slepptu skrá hérna",
     "Drop file here to upload": "Slepptu hér skrá til að senda inn",
-    " (unsupported)": "[óstutt]",
+    " (unsupported)": " (óstutt)",
     "%(senderName)s sent an image": "%(senderName)s sendi mynd",
     "%(senderName)s sent a video": "%(senderName)s sendi myndskeið",
     "%(senderName)s uploaded a file": "%(senderName)s sendi inn skrá",
@@ -191,7 +191,7 @@
     "Loading...": "Hleð inn...",
     "Online": "Nettengt",
     "Idle": "Iðjulaust",
-    "Offline": "Ótengt",
+    "Offline": "Ónettengt",
     "Unknown": "Óþekkt",
     "No rooms to show": "Engar spjallrásir sem hægt er að birta",
     "Unnamed room": "Nafnlaus spjallrás",
@@ -244,7 +244,7 @@
     "Addresses": "Vistföng",
     "Invalid community ID": "Ógilt auðkenni samfélags",
     "Flair": "Hlutverksmerki",
-    "This room is not showing flair for any communities": " Þessi spjallrás sýnir ekki hlutverksmerki fyrir nein samfélög",
+    "This room is not showing flair for any communities": "Þessi spjallrás sýnir ekki hlutverksmerki fyrir nein samfélög",
     "Sunday": "Sunnudagur",
     "Monday": "Mánudagur",
     "Tuesday": "Þriðjudagur",
@@ -450,7 +450,7 @@
     "Microphone": "Hljóðnemi",
     "Camera": "Myndavél",
     "VoIP": "VoIP",
-    "Email": "Tölvupóstur",
+    "Email": "Tölvupóstfang",
     "Add email address": "Bæta við tölvupóstfangi",
     "Profile": "Notandasnið",
     "Display name": "Birtingarnafn",
@@ -496,7 +496,7 @@
     "Decryption error": "Afkóðunarvilla",
     "Session ID": "Auðkenni setu",
     "End-to-end encryption information": "Enda-í-enda dulritunarupplýsingar",
-    "Event information": "Upplýsingar um viðburð",
+    "Event information": "Upplýsingar um atburð",
     "Sender device information": "Upplýsingar um tæki sendanda",
     "Export room keys": "Flytja út dulritunarlykla spjallrásar",
     "Enter passphrase": "Settu inn lykilsetningu (passphrase)",
@@ -504,5 +504,19 @@
     "Export": "Flytja út",
     "Import room keys": "Flytja inn dulritunarlykla spjallrásar",
     "File to import": "Skrá til að flytja inn",
-    "Import": "Flytja inn"
+    "Import": "Flytja inn",
+    "The platform you're on": "Stýrikerfið sem þú ert á",
+    "The version of Riot.im": "Útgáfan af Riot.im",
+    "Your language of choice": "Tungumálið þitt",
+    "Your homeserver's URL": "Vefslóð á heimaþjóninn þinn",
+    "Your identity server's URL": "Vefslóð á auðkenningarþjóninn þinn",
+    "Review Devices": "Yfirfara tæki",
+    "Call Timeout": "Tímamörk hringingar",
+    "Unable to capture screen": "Get ekki tekið skjámynd",
+    "Name or matrix ID": "Nafn eða Matrix-auðkenni",
+    "Invite to Community": "Bjóða í samfélag",
+    "Add rooms to the community": "Bæta spjallrásum í þetta samfélag",
+    "Add to community": "Bæta í samfélag",
+    "Unable to enable Notifications": "Tekst ekki að virkja tilkynningar",
+    "This email address was not found": "Tölvupóstfangið fannst ekki"
 }

From 4a3c7bc6e44dbff14935935e7270a53ec7a8504e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 28 May 2018 15:42:49 +0000
Subject: [PATCH 179/702] Translated using Weblate (Icelandic)

Currently translated at 54.2% (645 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
---
 src/i18n/strings/is.json | 131 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 128 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 3a8c98669d..4d48e32cf3 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -219,7 +219,7 @@
     "Banned users": "Bannaðir notendur",
     "Leave room": "Fara af spjallrás",
     "Favourite": "Eftirlæti",
-    "Tagged as: ": "Merkt sem:",
+    "Tagged as: ": "Merkt sem: ",
     "To link to a room it must have <a>an address</a>.": "Til að tengja við spjallrás verður hún að vera með <a>vistfang</a>.",
     "Who can access this room?": "Hver hefur aðgang að þessari spjallrás?",
     "Only people who have been invited": "Aðeins fólk sem hefur verið boðið",
@@ -341,7 +341,7 @@
     "Device name": "Heiti tækis",
     "Device key": "Dulritunarlykill tækis",
     "Verify device": "Sannreyna tæki",
-    "I verify that the keys match": "Ég staðfesti hvort dulritunarlyklarnir samsvari",
+    "I verify that the keys match": "Ég staðfesti að dulritunarlyklarnir samsvari",
     "Back": "Til baka",
     "Send Account Data": "Senda upplýsingar um notandaaðgang",
     "Filter results": "Sía niðurstöður",
@@ -518,5 +518,130 @@
     "Add rooms to the community": "Bæta spjallrásum í þetta samfélag",
     "Add to community": "Bæta í samfélag",
     "Unable to enable Notifications": "Tekst ekki að virkja tilkynningar",
-    "This email address was not found": "Tölvupóstfangið fannst ekki"
+    "This email address was not found": "Tölvupóstfangið fannst ekki",
+    "Existing Call": "Fyrirliggjandi samtal",
+    "You are already in a call.": "Þú ert nú þegar í samtali.",
+    "Failed to set up conference call": "Mistókst að setja upp símafund",
+    "Invite new community members": "Bjóða nýjum meðlimum í samfélag",
+    "Which rooms would you like to add to this community?": "Hvaða spjallrásum myndir þú vilja bæta í þetta samfélag?",
+    "Invite new room members": "Bjóða nýjum meðlimum á spjallrás",
+    "Who would you like to add to this room?": "Hverjum myndir þú vilja bæta á þessa spjallrás?",
+    "Send Invites": "Senda boðskort",
+    "Failed to invite user": "Mistókst að bjóða notanda",
+    "Failed to invite": "Mistókst að bjóða",
+    "Reload widget": "Endurlesa viðmótshluta",
+    "Missing roomId.": "Vantar spjallrásarauðkenni.",
+    "/ddg is not a command": "/ddg er ekki skipun",
+    "Ignored user": "Hunsaður notandi",
+    "Device already verified!": "Tæki er þegar sannreynt!",
+    "Verified key": "Staðfestur dulritunarlykill",
+    "Unrecognised command:": "Óþekkt skipun:",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s breytti umræðuefninu í \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjarlægði heiti spjallrásarinnar.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s breytti heiti spjallrásarinnar í %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendi mynd.",
+    "%(senderName)s answered the call.": "%(senderName)s svaraði símtalinu.",
+    "Disinvite": "Taka boð til baka",
+    "Unknown Address": "Óþekkt vistfang",
+    "Delete Widget": "Eyða viðmótshluta",
+    "Delete widget": "Eyða viðmótshluta",
+    "Create new room": "Búa til nýja spjallrás",
+    "were invited %(count)s times|one": "var boðið",
+    "was invited %(count)s times|one": "var boðið",
+    "And %(count)s more...|other": "Og %(count)s til viðbótar...",
+    "ex. @bob:example.com": "t.d. @jon:netfang.is",
+    "Matrix ID": "Matrix-auðkenni",
+    "Matrix Room ID": "Matrix-auðkenni spjallrásar",
+    "Start chatting": "Hefja spjall",
+    "This setting cannot be changed later!": "Ekki er hægt að breyta þessari stillingu síðar!",
+    "Send Custom Event": "Senda sérsniðið atvik",
+    "Event sent!": "Atvik sent!",
+    "State Key": "Stöðulykill",
+    "Explore Room State": "Skoða stöðu spjallrásar",
+    "Explore Account Data": "Skoða aðgangsgögn",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Þú bættir við nýju tæki '%(displayName)s', sem er að krefjast dulritunarlykla.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "ósannvottaða tækið þitt '%(displayName)s' er að krefjast dulritunarlykla.",
+    "Loading device info...": "Hleð inn upplýsingum um tæki...",
+    "Log out and remove encryption keys?": "Skrá út og fjarlægja dulritunarlykla?",
+    "Clear Storage and Sign Out": "Hreinsa gagnageymslu og skrá út",
+    "Unable to restore session": "Tókst ekki að endurheimta setu",
+    "This doesn't appear to be a valid email address": "Þetta lítur ekki út eins og gilt tölvupóstfang",
+    "Unable to add email address": "Get ekki bætt við tölvupóstfangi",
+    "Unable to verify email address.": "Get ekki sannreynt tölvupóstfang.",
+    "Username invalid: %(errMessage)s": "Notandanafn er ógilt: %(errMessage)s",
+    "An error occurred: %(error_string)s": "Villa kom upp: %(error_string)s",
+    "To get started, please pick a username!": "Til að komast í gang, veldu fyrst notandanafn!",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" inniheldur tæki sem þú hefur ekki séð áður.",
+    "Private Chat": "Einkaspjall",
+    "Public Chat": "Opinbert spjall",
+    "Collapse Reply Thread": "Fella saman svarþráð",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Því miður, vafrinn þinn getur <b>ekki</b> keyrt Riot.",
+    "Make this room private": "Gera þessa spjallrás einka",
+    "Encrypt room": "Dulrita spjallrás",
+    "Add a Room": "Bæta við spjallrás",
+    "Add a User": "Bæta við notanda",
+    "Unable to accept invite": "Mistókst að þiggja boð",
+    "Unable to reject invite": "Mistókst að hafna boði",
+    "Unable to join community": "Tókst ekki að ganga í samfélag",
+    "Leave Community": "Hætta í samfélagi",
+    "Leave %(groupName)s?": "Hætta í %(groupName)s?",
+    "Unable to leave community": "Tókst ekki að hætta í samfélagi",
+    "Community Settings": "Samfélagsstillingar",
+    "Featured Rooms:": "Spjallrásir í sviðsljósinu:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s hefur boðið þér að taka þátt í þessu samfélagi",
+    "Join this community": "Taka þátt í þessu samfélagi",
+    "Leave this community": "Hætta í þessu samfélagi",
+    "You are an administrator of this community": "Þú ert kerfisstjóri í þessu samfélagi",
+    "You are a member of this community": "Þú ert meðlimur í þessum hópi",
+    "Who can join this community?": "Hverjir geta tekið þátt í þessu samfélagi?",
+    "Long Description (HTML)": "Tæmandi lýsing (HTML)",
+    "Failed to load %(groupId)s": "Mistókst að hlaða inn %(groupId)s",
+    "Couldn't load home page": "Gat ekki hlaðið inn heimasíðu",
+    "Reject invitation": "Hafna boði",
+    "Are you sure you want to reject the invitation?": "Ertu viss um að þú viljir hafna þessu boði?",
+    "Failed to reject invitation": "Mistókst að hafna boði",
+    "Scroll to bottom of page": "Skruna neðst á síðu",
+    "No more results": "Ekki fleiri niðurstöður",
+    "Unknown room %(roomId)s": "Óþekkt spjallrás %(roomId)s",
+    "Failed to save settings": "Mistókst að vista stillingar",
+    "Failed to reject invite": "Mistókst að hafna boði",
+    "Click to unmute video": "Smelltu til að virkja hljóð í myndskeiði",
+    "Click to mute video": "Smelltu til að þagga niður í myndskeiði",
+    "Click to unmute audio": "Smelltu til að virkja hljóð",
+    "Click to mute audio": "Smelltu til að þagga niður hljóð",
+    "Failed to load timeline position": "Mistókst að hlaða inn staðsetningu á tímalínu",
+    "Uploading %(filename)s and %(count)s others|other": "Sendi inn %(filename)s og %(count)s til viðbótar",
+    "Uploading %(filename)s and %(count)s others|zero": "Sendi inn %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Sendi inn %(filename)s og %(count)s til viðbótar",
+    "Status.im theme": "Status.im þema",
+    "Can't load user settings": "Gat ekki hlaði inn notandastillingum",
+    "Server may be unavailable or overloaded": "Netþjónninn gæti verið undir miklu álagi eða ekki til taks",
+    "Remove Contact Information?": "Fjarlægja upplýsingar um tengilið?",
+    "Remove %(threePid)s?": "Fjarlægja %(threePid)s?",
+    "Unable to remove contact information": "Ekki tókst að fjarlægja upplýsingar um tengilið",
+    "Refer a friend to Riot:": "Mæla með Riot við vin:",
+    "Autocomplete Delay (ms):": "Töf við sjálfvirka klárun (msek):",
+    "<not supported>": "<ekki stutt>",
+    "These are experimental features that may break in unexpected ways": "Þetta eru eiginleikar á tilraunastigi sem gætu bilað á óvæntan hátt",
+    "Use with caution": "Notist með varúð",
+    "Clear Cache and Reload": "Hreinsa skyndiminni og endurhlaða",
+    "No Microphones detected": "Engir hljóðnemar fundust",
+    "No Webcams detected": "Engar vefmyndavélar fundust",
+    "Homeserver is": "Heimanetþjónn er",
+    "Login as guest": "Skrá inn sem gestur",
+    "Sign in to get started": "Skráðu þig inn til að komast í gang",
+    "Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd",
+    "Set a display name:": "Stilltu birtingarnafn",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Lykilorð er of stutt (lágmark %(MIN_PASSWORD_LENGTH)s).",
+    "You need to enter a user name.": "Þú þarft að setja inn notandanafn.",
+    "I already have an account": "Ég er nú þegar með notandaaðgang",
+    "Displays action": "Birtir aðgerð",
+    "Changes your display nickname": "Breytir birtu gælunafni þínu",
+    "Searches DuckDuckGo for results": "Leitar í DuckDuckGo að niðurstöðum",
+    "Results from DuckDuckGo": "Leitarniðurstöður frá DuckDuckGo",
+    "Emoji": "Tjáningartáknmynd",
+    "Notify the whole room": "Tilkynna öllum á spjallrásinni",
+    "Room Notification": "Tilkynning á spjallrás",
+    "Passphrases must match": "Lykilfrasar verða að stemma",
+    "Passphrase must not be empty": "Lykilfrasi má ekki vera auður"
 }

From 254e8c358aaf5cd7c20d7c005dccd805c1697ee8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 28 May 2018 11:38:09 -0600
Subject: [PATCH 180/702] Remove unused imports

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/elements/AppPermission.js | 1 -
 src/components/views/elements/AppTile.js       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 6af3148e21..231ed52364 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import url from 'url';
 import { _t } from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
 import WidgetUtils from "../../../WidgetUtils";
 
 export default class AppPermission extends React.Component {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0ec754e0c0..429b5941b9 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -25,7 +25,6 @@ import PlatformPeg from '../../../PlatformPeg';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import WidgetMessaging from '../../../WidgetMessaging';
 import TintableSvgButton from './TintableSvgButton';
-import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t, _td } from '../../../languageHandler';
 import sdk from '../../../index';

From f23f5614c104844f28771eb473288bfd7003dfc0 Mon Sep 17 00:00:00 2001
From: Nathan van Beelen <nathan@vanbeelen.org>
Date: Mon, 28 May 2018 17:35:26 +0000
Subject: [PATCH 181/702] Translated using Weblate (Dutch)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index e71463564a..a6df7d69b2 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1172,7 +1172,7 @@
     "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot fouten worden bijgehouden op GitHub: <a>maak een GitHub melding</a>.",
     "Failed to indicate account erasure": "Niet gelukt om de accountverwijdering aan te geven",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dit zal je account voorgoed onbruikbaar maken. Je zal niet meer in kunnen loggen en niemand anders zal met dezelfde gebruikers ID kunnen registreren. Dit zal er voor zorgen dat je account alle ruimtes verlaat waar het momenteel onderdeel van is en het verwijderd de accountgegevens van de identiteitsserver. <b>Deze actie is onomkeerbaar.</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Het deactiveren van je account <b>zal er niet standaard voor zorgen dat de berichten die je verzonden hebt vergeten worden.</b> Als je wilt dat wij de berichten vergeten, klikt alsjeblieft op het vakje hieronder.",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Het deactiveren van je account <b>zal er niet standaard voor zorgen dat de berichten die je verzonden hebt vergeten worden.</b> Als je wilt dat wij de berichten vergeten, klik alsjeblieft op het vakje hieronder.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is hetzelfde als in e-mail. Het vergeten van je berichten betekent dat berichten die je hebt verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie van het bericht.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (<b>Waarschuwing:</b> dit zal er voor zorgen dat toekomstige gebruikers een incompleet beeld krijgen van gesprekken)",
     "To continue, please enter your password:": "Om verder te gaan, vul alsjeblieft je wachtwoord in:",

From f885def74819a19061bf9c77336625ec83d232cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 28 May 2018 06:49:16 +0000
Subject: [PATCH 182/702] Translated using Weblate (French)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 0d8cf10f8d..8dd45192e6 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -714,17 +714,17 @@
     "To change the topic, you must be a": "Pour changer le sujet, vous devez être un",
     "To modify widgets in the room, you must be a": "Pour modifier les widgets, vous devez être un",
     "Banned by %(displayName)s": "Banni par %(displayName)s",
-    "To send messages, you must be a": "Pour envoyer des messages, vous devez être un",
+    "To send messages, you must be a": "Pour envoyer des messages, vous devez être un(e)",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s a changé les messages épinglés du salon.",
     "%(names)s and %(count)s others are typing|other": "%(names)s et %(count)s autres écrivent",
     "Jump to read receipt": "Aller à l'accusé de lecture",
     "World readable": "Lisible publiquement",
     "Guests can join": "Les invités peuvent rejoindre le salon",
-    "To invite users into the room, you must be a": "Pour inviter des utilisateurs dans le salon, vous devez être un",
-    "To configure the room, you must be a": "Pour configurer le salon, vous devez être un",
-    "To kick users, you must be a": "Pour exclure des utilisateurs, vous devez être un",
-    "To ban users, you must be a": "Pour bannir des utilisateurs, vous devez être un",
-    "To remove other users' messages, you must be a": "Pour supprimer les messages d'autres utilisateurs, vous devez être un",
+    "To invite users into the room, you must be a": "Pour inviter des utilisateurs dans le salon, vous devez être un(e)",
+    "To configure the room, you must be a": "Pour configurer le salon, vous devez être un(e)",
+    "To kick users, you must be a": "Pour exclure des utilisateurs, vous devez être un(e)",
+    "To ban users, you must be a": "Pour bannir des utilisateurs, vous devez être un(e)",
+    "To remove other users' messages, you must be a": "Pour supprimer les messages d'autres utilisateurs, vous devez être un(e)",
     "To send events of type <eventType/>, you must be a": "Pour envoyer des évènements du type <eventType/>, vous devez être un",
     "Invalid community ID": "Identifiant de communauté non valide",
     "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\" n'est pas un identifiant de communauté valide",
@@ -1196,5 +1196,5 @@
     "Yes, I want to help!": "Oui, je veux aider !",
     "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
-    "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un"
+    "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)"
 }

From 1bd8182b1a4fe4a3e33edd47b2b9956c76c5f23c Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sun, 27 May 2018 19:14:49 +0000
Subject: [PATCH 183/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f15c8893b8..6b52958ea6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1195,5 +1195,6 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez szütit (cookie) fog használni.",
     "Yes, I want to help!": "Igen, segítek!",
     "Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle."
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.",
+    "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:"
 }

From 6f6d28d4eecf32e2281cbed9cb60f8cf7938e68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 28 May 2018 15:45:16 +0000
Subject: [PATCH 184/702] Translated using Weblate (Icelandic)

Currently translated at 54.2% (645 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
---
 src/i18n/strings/is.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 4d48e32cf3..d901c52f60 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -631,7 +631,7 @@
     "Login as guest": "Skrá inn sem gestur",
     "Sign in to get started": "Skráðu þig inn til að komast í gang",
     "Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd",
-    "Set a display name:": "Stilltu birtingarnafn",
+    "Set a display name:": "Stilltu birtingarnafn:",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Lykilorð er of stutt (lágmark %(MIN_PASSWORD_LENGTH)s).",
     "You need to enter a user name.": "Þú þarft að setja inn notandanafn.",
     "I already have an account": "Ég er nú þegar með notandaaðgang",

From e968ccb24ce999c02a1210b2bfb0ed1dbb052cba Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 28 May 2018 09:45:04 +0000
Subject: [PATCH 185/702] Translated using Weblate (Italian)

Currently translated at 99.4% (1183 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 068ad01ff1..fa22725f78 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1165,5 +1165,24 @@
     "Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
     "Send Logs": "Invia i log",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
-    "Collapse Reply Thread": "Riduci finestra di risposta"
+    "Collapse Reply Thread": "Riduci finestra di risposta",
+    "e.g. %(exampleValue)s": "es. %(exampleValue)s",
+    "Reload widget": "Ricarica widget",
+    "To notify everyone in the room, you must be a": "Per notificare chiunque nella stanza, devi essere un",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Per favore aiuta a migliorare Riot.im inviando <UsageDataLink>dati di utilizzo anonimi</UsageDataLink>. Verrà usato un cookie (vedi la nostra <PolicyLink>politica sui cookie</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Per favore aiutaci a migliorare Riot.im inviando <UsageDataLink>dati di utilizzo anonimi</UsageDataLink>. Verrà usato un cookie.",
+    "Yes, I want to help!": "Sì, voglio aiutare!",
+    "Warning: This widget might use cookies.": "Attenzione: questo widget potrebbe usare cookie.",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Il tuo account sarà permanentemente inutilizzabile. Non potrai accedere e nessuno potrà ri-registrare lo stesso ID utente. Il tuo account abbandonerà tutte le stanze a cui partecipa e i dettagli del tuo account saranno rimossi dal server di identità. <b>Questa azione è irreversibile.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Disattivare il tuo account <b>non eliminerà in modo predefinito i messaggi che hai inviato</b>. Se vuoi che noi dimentichiamo i tuoi messaggi, seleziona la casella sotto.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilità dei messaggi in Matrix è simile alle email. Se dimentichiamo i messaggi significa che quelli che hai inviato non verranno condivisi con alcun utente nuovo o non registrato, ma gli utenti registrati che avevano già accesso ai messaggi avranno ancora accesso alla loro copia.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Per favore dimenticate tutti i messaggi che ho inviato quando il mio account viene disattivato (Attenzione: gli utenti futuri vedranno un elenco incompleto di conversazioni)",
+    "To continue, please enter your password:": "Per continuare, inserisci la tua password:",
+    "password": "password",
+    "Can't leave Server Notices room": "Impossibile abbandonare la stanza Notifiche Server",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Questa stanza viene usata per messaggi importanti dall'homeserver, quindi non puoi lasciarla.",
+    "Terms and Conditions": "Termini e condizioni",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
+    "Review terms and conditions": "Leggi i termini e condizioni",
+    "Muted Users": "Utenti silenziati"
 }

From 6467349921e98d8c5602156043c123c90e22e469 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Sun, 27 May 2018 17:14:29 +0000
Subject: [PATCH 186/702] Translated using Weblate (Russian)

Currently translated at 99.6% (1186 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e77cb76aff..0a254736b8 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1187,5 +1187,6 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie (ознакомьтесь с нашей<PolicyLink>Политикой cookie</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie.",
     "Yes, I want to help!": "Да, я хочу помочь!",
-    "Reload widget": "Перезагрузить виджет"
+    "Reload widget": "Перезагрузить виджет",
+    "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть"
 }

From 16ebef81f2fa234bc74fcc5c0ed20cfd25f6d9c5 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Mon, 28 May 2018 15:21:34 +0000
Subject: [PATCH 187/702] Translated using Weblate (Swedish)

Currently translated at 84.4% (1005 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 69 ++++++++++++++++++++++++++++++----------
 1 file changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 4ab1413e4f..a9c9bfade2 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -35,7 +35,7 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Vill du lämna rummet '%(roomName)s'?",
     "Are you sure you want to upload the following files?": "Vill du ladda upp följande filer?",
     "Autoplay GIFs and videos": "Spela automatiskt upp GIFar och videor",
-    "Are you sure you want to reject the invitation?": "Vill du avvisa inbjudan?",
+    "Are you sure you want to reject the invitation?": "Är du säker på att du vill avböja inbjudan?",
     "Bulk Options": "Volymhandlingar",
     "Blacklisted": "Svartlistad",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
@@ -150,7 +150,7 @@
     "Admin Tools": "Admin-verktyg",
     "Alias (optional)": "Alias (valfri)",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till servern - kontrollera anslutningen, försäkra att din <a>hemservers TLS-certifikat</a> är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade maktnivån av %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.",
     "<a>Click here</a> to join the discussion!": "<a>Klicka här</a> för att gå med i diskussionen!",
     "Close": "Stäng",
     "%(count)s new messages|one": "%(count)s nytt meddelande",
@@ -185,8 +185,8 @@
     "Hide Text Formatting Toolbar": "Göm textformatteringsverktygsfältet",
     "Historical": "Historiska",
     "Home": "Hem",
-    "Homeserver is": "Hemservern är",
-    "Identity Server is": "Identitetsservern är",
+    "Homeserver is": "Hemserver är",
+    "Identity Server is": "Identitetsserver är",
     "I have verified my email address": "Jag har verifierat min epostadress",
     "Import": "Importera",
     "Import E2E room keys": "Importera rumskrypteringsnycklar",
@@ -226,7 +226,7 @@
     "Logged in as:": "Inloggad som:",
     "Login as guest": "Logga in som gäst",
     "Logout": "Logga ut",
-    "Low priority": "Lågprioritet",
+    "Low priority": "Låg prioritet",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
@@ -289,7 +289,7 @@
     "Refer a friend to Riot:": "Hänvisa en vän till Riot:",
     "Register": "Registrera",
     "%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.",
-    "Reject invitation": "Avvisa inbjudan",
+    "Reject invitation": "Avböj inbjudan",
     "Rejoin": "Gå med tillbaka",
     "Remote addresses for this room:": "Fjärradresser för det här rummet:",
     "Remove Contact Information?": "Ta bort kontaktuppgifter?",
@@ -504,7 +504,7 @@
     "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta",
     "Direct Chat": "Direkt-chatt",
     "The server may be unavailable or overloaded": "Servern kan vara överbelastad eller inte tillgänglig",
-    "Reject": "Avvisa",
+    "Reject": "Avböj",
     "Failed to set Direct Message status of room": "Det gick inte att ställa in direktmeddelandestatus för rummet",
     "Monday": "måndag",
     "Remove from Directory": "Ta bort från katalogen",
@@ -653,18 +653,18 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nivå %(powerLevelNumber)s)",
     "Unknown Address": "Okänd adress",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s har gått med %(count)s gånger",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sgick med %(count)s gånger",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sgick med",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s har gått med %(count)s gånger",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sgick med %(count)s gånger",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sgick med",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)shar lämnat %(count)s gånger",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)slämnade %(count)s gånger",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)slämnade",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)shar lämnat %(count)s gånger",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)slämnade %(count)s gånger",
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)slämnade",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)shar gått med och lämnat %(count)s gånger",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)shar gått med och lämnat",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)shar gått med och lämnat %(count)s gånger",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)shar gått med och lämnat",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sgick med och lämnade %(count)s gånger",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sgick med och lämnade",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sgick med och lämnade %(count)s gånger",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sgick med och lämnade",
     "And %(count)s more...|other": "Och %(count)s till...",
     "ex. @bob:example.com": "t.ex. @kalle:exempel.com",
     "Add User": "Lägg till användare",
@@ -969,5 +969,42 @@
     "Can't leave Server Notices room": "Kan inte lämna serveraviseringsrummet",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Detta rum används för viktiga meddelanden från hemservern, så du kan inte lämna det.",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data från en äldre version av Riot has upptäckts. Detta ska ha orsakat att krypteringen inte fungerat i den äldre versionen. Krypterade meddelanden som nyligen har skickats medans den äldre versionen användes kanske inte kan dekrypteras i denna version. Detta kan även orsaka att meddelanden skickade med denna version inte fungerar. Om du upplever problem, logga ut och in igen. För att behålla meddelandehistoriken, exportera dina nycklar och importera dem igen.",
-    "Confirm Removal": "Bekräfta borttagning"
+    "Confirm Removal": "Bekräfta borttagning",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Det gick inte att kontrollera att adressen den här inbjudan skickades till matchar en som är kopplad till ditt konto.",
+    "You may wish to login with a different account, or add this email to this account.": "Du kanske vill logga in med ett annat konto, eller lägga till e-postadressen till detta konto.",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie (se vår <PolicyLink>Cookiepolicy</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie.",
+    "Yes, I want to help!": "Ja, jag vill hjälpa till!",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s aktiverade kryptering (algoritm %(algorithm)s).",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)slämnade och gick med igen %(count)s gånger",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)slämnade och gick med igen",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)slämnade och gick med igen %(count)s gånger",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)slämnade och gick med igen",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)savböjde sina inbjudningar %(count)s gånger",
+    "Unable to reject invite": "Det gick inte att avböja inbjudan",
+    "Reject all %(invitedRooms)s invites": "Avböj alla %(invitedRooms)s inbjudningar",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)savböjde sina inbjudningar",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)savböjde sin inbjudan %(count)s gånger",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)savböjde sin inbjudan",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sfick sina inbjudningar tillbakadragna %(count)s gånger",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sfick sina inbjudningar tillbakadragna",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sfick sin inbjudan tillbakadragen %(count)s gånger",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sfick sin inbjudan tillbakadragen",
+    "were invited %(count)s times|other": "blev inbjudna %(count)s gånger",
+    "were invited %(count)s times|one": "blev inbjudna",
+    "was invited %(count)s times|other": "blev inbjuden %(count)s gånger",
+    "was invited %(count)s times|one": "blev inbjuden",
+    "were banned %(count)s times|other": "blev bannade %(count)s gånger",
+    "were banned %(count)s times|one": "blev bannade",
+    "was banned %(count)s times|other": "blev bannad %(count)s gånger",
+    "was banned %(count)s times|one": "blev bannad",
+    "Ban this user?": "Banna användaren?",
+    "were kicked %(count)s times|other": "blev kickade %(count)s gånger",
+    "were kicked %(count)s times|one": "blev kickade",
+    "was kicked %(count)s times|other": "blev kickad %(count)s gånger",
+    "was kicked %(count)s times|one": "blev kickad",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sbytte namn %(count)s gånger",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sbytte namn",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sbytte namn %(count)s gånger",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbytte namn"
 }

From 05357b9f8cef27502ff7ad09f6f9461c7b7685f1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 29 May 2018 12:07:56 +0100
Subject: [PATCH 188/702] improve comment

---
 src/components/structures/UserSettings.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 4ee4f1a427..d88a477932 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -287,6 +287,7 @@ module.exports = React.createClass({
     _refreshMediaDevices: function(stream) {
         if (stream) {
             // kill stream so that we don't leave it lingering around with webcam enabled etc
+            // as here we called gUM to ask user for permission to their device names only
             stream.getTracks().forEach((track) => track.stop());
         }
 

From da9fe9917bfeff2f670296648c6a5b76fb71224b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 29 May 2018 13:16:39 +0100
Subject: [PATCH 189/702] Fix click on faded left/right/middle panel -> close
 settings

 - implement generic dispatch to close user/room/group settings
 - use dispatch to allow clicks on disabled left/right/middle panel to
   close settings

A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
---
 src/components/structures/GroupView.js    | 23 ++++++--
 src/components/structures/LoggedInView.js | 20 ++++++-
 src/components/structures/MatrixChat.js   | 69 ++++++++++++++---------
 src/components/structures/RoomView.js     | 20 ++-----
 src/stores/RoomViewStore.js               | 16 ++++++
 5 files changed, 100 insertions(+), 48 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index ce79ccadfa..c7610219f7 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -432,11 +432,14 @@ export default React.createClass({
 
         this._changeAvatarComponent = null;
         this._initGroupStore(this.props.groupId, true);
+
+        this._dispatcherRef = dis.register(this._onAction);
     },
 
     componentWillUnmount: function() {
         this._unmounted = true;
         this._matrixClient.removeListener("Group.myMembership", this._onGroupMyMembership);
+        dis.unregister(this._dispatcherRef);
     },
 
     componentWillReceiveProps: function(newProps) {
@@ -563,12 +566,22 @@ export default React.createClass({
         this._closeSettings();
     },
 
+    _onAction(payload) {
+        switch (payload.action) {
+            // NOTE: close_settings is an app-wide dispatch; as it is dispatched from MatrixChat
+            case 'close_settings':
+                this.setState({
+                    editing: false,
+                    profileForm: null,
+                });
+                break;
+            default:
+                break;
+        }
+    },
+
     _closeSettings() {
-        this.setState({
-            editing: false,
-            profileForm: null,
-        });
-        dis.dispatch({action: 'panel_disable'});
+        dis.dispatch({action: 'close_settings'});
     },
 
     _onNameChange: function(value) {
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 2dd5a75c47..5dca359f32 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -255,6 +255,22 @@ const LoggedInView = React.createClass({
         ), true);
     },
 
+    _onClick: function(ev) {
+        // When the panels are disabled, clicking on them results in a mouse event
+        // which bubbles to certain elements in the tree. When this happens, close
+        // any settings page that is currently open (user/room/group).
+        if (this.props.leftDisabled &&
+            this.props.rightDisabled &&
+            (
+                ev.target.className === 'mx_MatrixChat' ||
+                ev.target.className === 'mx_MatrixChat_middlePanel' ||
+                ev.target.className === 'mx_RoomView'
+            )
+        ) {
+            dis.dispatch({ action: 'close_settings' });
+        }
+    },
+
     render: function() {
         const LeftPanel = sdk.getComponent('structures.LeftPanel');
         const RightPanel = sdk.getComponent('structures.RightPanel');
@@ -295,7 +311,7 @@ const LoggedInView = React.createClass({
 
             case PageTypes.UserSettings:
                 page_element = <UserSettings
-                    onClose={this.props.onUserSettingsClose}
+                    onClose={this.props.onCloseAllSettings}
                     brand={this.props.config.brand}
                     referralBaseUrl={this.props.config.referralBaseUrl}
                     teamToken={this.props.teamToken}
@@ -380,7 +396,7 @@ const LoggedInView = React.createClass({
         }
 
         return (
-            <div className='mx_MatrixChat_wrapper' aria-hidden={this.props.hideToSRUsers}>
+            <div className='mx_MatrixChat_wrapper' aria-hidden={this.props.hideToSRUsers} onClick={this._onClick}>
                 { topBar }
                 <DragDropContext onDragEnd={this._onDragEnd}>
                     <div className={bodyClasses}>
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 46c1113a1d..c1c757a65a 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -560,6 +560,27 @@ export default React.createClass({
                 this._setPage(PageTypes.UserSettings);
                 this.notifyNewScreen('settings');
                 break;
+            case 'close_settings':
+                this.setState({
+                    leftDisabled: false,
+                    rightDisabled: false,
+                    middleDisabled: false,
+                });
+                if (this.state.page_type === PageTypes.UserSettings) {
+                    // We do this to get setPage and notifyNewScreen
+                    if (this.state.currentRoomId) {
+                        this._viewRoom({
+                            room_id: this.state.currentRoomId,
+                        });
+                    } else if (this.state.currentGroupId) {
+                        this._viewGroup({
+                            group_id: this.state.currentGroupId,
+                        });
+                    } else {
+                        this._viewHome();
+                    }
+                }
+                break;
             case 'view_create_room':
                 this._createRoom();
                 break;
@@ -577,19 +598,10 @@ export default React.createClass({
                 this.notifyNewScreen('groups');
                 break;
             case 'view_group':
-                {
-                    const groupId = payload.group_id;
-                    this.setState({
-                        currentGroupId: groupId,
-                        currentGroupIsNew: payload.group_is_new,
-                    });
-                    this._setPage(PageTypes.GroupView);
-                    this.notifyNewScreen('group/' + groupId);
-                }
+                this._viewGroup(payload);
                 break;
             case 'view_home_page':
-                this._setPage(PageTypes.HomePage);
-                this.notifyNewScreen('home');
+                this._viewHome();
                 break;
             case 'view_set_mxid':
                 this._setMxId(payload);
@@ -632,7 +644,8 @@ export default React.createClass({
                     middleDisabled: payload.middleDisabled || false,
                     rightDisabled: payload.rightDisabled || payload.sideDisabled || false,
                 });
-                break; }
+                break;
+            }
             case 'set_theme':
                 this._onSetTheme(payload.value);
                 break;
@@ -848,6 +861,21 @@ export default React.createClass({
         });
     },
 
+    _viewGroup: function(payload) {
+        const groupId = payload.group_id;
+        this.setState({
+            currentGroupId: groupId,
+            currentGroupIsNew: payload.group_is_new,
+        });
+        this._setPage(PageTypes.GroupView);
+        this.notifyNewScreen('group/' + groupId);
+    },
+
+    _viewHome: function() {
+        this._setPage(PageTypes.HomePage);
+        this.notifyNewScreen('home');
+    },
+
     _setMxId: function(payload) {
         const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
         const close = Modal.createTrackedDialog('Set MXID', '', SetMxIdDialog, {
@@ -1606,19 +1634,8 @@ export default React.createClass({
         this._setPageSubtitle(subtitle);
     },
 
-    onUserSettingsClose: function() {
-        // XXX: use browser history instead to find the previous room?
-        // or maintain a this.state.pageHistory in _setPage()?
-        if (this.state.currentRoomId) {
-            dis.dispatch({
-                action: 'view_room',
-                room_id: this.state.currentRoomId,
-            });
-        } else {
-            dis.dispatch({
-                action: 'view_home_page',
-            });
-        }
+    onCloseAllSettings() {
+        dis.dispatch({ action: 'close_settings' });
     },
 
     onServerConfigChange(config) {
@@ -1677,7 +1694,7 @@ export default React.createClass({
                 return (
                    <LoggedInView ref={this._collectLoggedInView} matrixClient={MatrixClientPeg.get()}
                         onRoomCreated={this.onRoomCreated}
-                        onUserSettingsClose={this.onUserSettingsClose}
+                        onCloseAllSettings={this.onCloseAllSettings}
                         onRegistered={this.onRegistered}
                         currentRoomId={this.state.currentRoomId}
                         teamToken={this._teamToken}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c5f6a75cc5..990f9bf8bc 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -182,6 +182,7 @@ module.exports = React.createClass({
             isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
             forwardingEvent: RoomViewStore.getForwardingEvent(),
             shouldPeek: RoomViewStore.shouldPeek(),
+            editingRoomSettings: RoomViewStore.isEditingSettings(),
         };
 
         // Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307
@@ -1139,7 +1140,7 @@ module.exports = React.createClass({
     },
 
     onSettingsClick: function() {
-        this.showSettings(true);
+        dis.dispatch({ action: 'open_room_settings' });
     },
 
     onSettingsSaveClick: function() {
@@ -1172,24 +1173,20 @@ module.exports = React.createClass({
                 });
                 // still editing room settings
             } else {
-                this.setState({
-                    editingRoomSettings: false,
-                });
+                dis.dispatch({ action: 'close_settings' });
             }
         }).finally(() => {
             this.setState({
                 uploadingRoomSettings: false,
-                editingRoomSettings: false,
             });
+            dis.dispatch({ action: 'close_settings' });
         }).done();
     },
 
     onCancelClick: function() {
         console.log("updateTint from onCancelClick");
         this.updateTint();
-        this.setState({
-            editingRoomSettings: false,
-        });
+        dis.dispatch({ action: 'close_settings' });
         if (this.state.forwardingEvent) {
             dis.dispatch({
                 action: 'forward_event',
@@ -1406,13 +1403,6 @@ module.exports = React.createClass({
         });*/
     },
 
-    showSettings: function(show) {
-        // XXX: this is a bit naughty; we should be doing this via props
-        if (show) {
-            this.setState({editingRoomSettings: true});
-        }
-    },
-
     /**
      * called by the parent component when PageUp/Down/etc is pressed.
      *
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 1e7e50eae0..923c073065 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -44,6 +44,8 @@ const INITIAL_STATE = {
     forwardingEvent: null,
 
     quotingEvent: null,
+
+    isEditingSettings: false,
 };
 
 /**
@@ -116,6 +118,16 @@ class RoomViewStore extends Store {
                     replyingToEvent: payload.event,
                 });
                 break;
+            case 'open_room_settings':
+                this._setState({
+                    isEditingSettings: true,
+                });
+                break;
+            case 'close_settings':
+                this._setState({
+                    isEditingSettings: false,
+                });
+                break;
         }
     }
 
@@ -301,6 +313,10 @@ class RoomViewStore extends Store {
         return this._state.replyingToEvent;
     }
 
+    isEditingSettings() {
+        return this._state.isEditingSettings;
+    }
+
     shouldPeek() {
         return this._state.shouldPeek;
     }

From 404c071f2aa94796098608d74df8dd7a787ff581 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 29 May 2018 13:19:56 +0100
Subject: [PATCH 190/702] Remove lie from docs

---
 src/components/structures/MatrixChat.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c1c757a65a..0b2396ddff 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -794,7 +794,6 @@ export default React.createClass({
     // @param {string=} roomInfo.room_id ID of the room to join. One of room_id or room_alias must be given.
     // @param {string=} roomInfo.room_alias Alias of the room to join. One of room_id or room_alias must be given.
     // @param {boolean=} roomInfo.auto_join If true, automatically attempt to join the room if not already a member.
-    // @param {boolean=} roomInfo.show_settings Makes RoomView show the room settings dialog.
     // @param {string=} roomInfo.event_id ID of the event in this room to show: this will cause a switch to the
     //                                    context of that particular event.
     // @param {boolean=} roomInfo.highlighted If true, add event_id to the hash of the URL

From 577b2564c0e36110d1516721e2b46665abb5a9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Fri, 25 May 2018 09:52:21 +0000
Subject: [PATCH 191/702] Translated using Weblate (Slovak)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 2cab64ca49..daa9cfc9b6 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1187,5 +1187,6 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Táto miestnosť je určená na dôležité oznamy a správy od správcov domovského servera, preto ju nie je možné opustiť.",
     "Terms and Conditions": "Zmluvné podmienky",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
-    "Review terms and conditions": "Prečítať zmluvné podmienky"
+    "Review terms and conditions": "Prečítať zmluvné podmienky",
+    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť"
 }

From 56541c7ea7c068244e18b021a1524d19658a4ede Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 29 May 2018 16:59:37 +0000
Subject: [PATCH 192/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4911ad970e..6295c7e934 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1167,5 +1167,26 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Изчистване на запазените данни в браузъра може да поправи проблема, но ще Ви изкара от профила и ще направи шифрованите съобщения нечетими.",
     "Collapse Reply Thread": "Свий отговорите",
     "Enable widget screenshots on supported widgets": "Включи скрийншоти за поддържащи ги приспособления",
-    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Бъговете по Riot се следят в GitHub: <a>създайте проблем в GitHub</a>."
+    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Бъговете по Riot се следят в GitHub: <a>създайте проблем в GitHub</a>.",
+    "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
+    "Reload widget": "Презареди приспособлението",
+    "Send analytics data": "Изпращане на статистически данни",
+    "To notify everyone in the room, you must be a": "За да уведомите всички в стаята, трябва да бъдете",
+    "Muted Users": "Заглушени потребители",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Моля, помогнете за подобряването на Riot.im като изпращате <UsageDataLink>анонимни данни за ползване</UsageDataLink>. Това ще използва бисквитка (моля, вижте нашата <PolicyLink>политика за бисквитки</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Моля, помогнете за подобряването на Riot.im като изпращате <UsageDataLink>анонимни данни за ползване</UsageDataLink>. Това ще използва бисквитка.",
+    "Yes, I want to help!": "Да, искам да помогна!",
+    "Warning: This widget might use cookies.": "Внимание: това приспособление може да използва бисквитки.",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Това ще направи акаунта Ви неизползваем завинаги. Няма да можете да влезете пак, а регистрирането повторно на същия потребителски идентификатор няма да е възможно. Акаунтът Ви да напусне всички стаи, в които участва. Ще бъдат премахнати и данните за акаунта Ви от сървъра за самоличност. <b>Действието е необратимо.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Деактивирането на акаунта Ви <b>по подразбиране не прави така, че изпратените съобщения да бъдат забравени.</b> Ако искате да забравим съобщенията Ви, моля отбележете с отметка по-долу.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видимостта на съобщенията в Matrix е подобно на имейл системата. Нашето забравяне означава, че: изпратените от Вас съобщения няма да бъдат споделяни с нови или нерегистрирани потребители, но регистрираните потребители имащи достъп до тях ще продължат да имат достъп до своето копие.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Моля, забравете всички изпратени съобщения от мен съобщения, когато акаунта ми се деактивира (<b>Внимание:</b> това ще направи бъдещите потребители да имат само частичен поглед върху кореспонденцията)",
+    "To continue, please enter your password:": "За да продължите, моля въведете паролата си:",
+    "password": "парола",
+    "Can't leave Server Notices room": "Не може да напуснете стая \"Server Notices\"",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Тази стая се използва за важни съобщения от сървъра, така че не можете да я напуснете.",
+    "Terms and Conditions": "Правила и условия",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.",
+    "Review terms and conditions": "Прегледай правилата и условията",
+    "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта"
 }

From 7053302f7799b66f93b512c991cd90224e67bcc9 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Thu, 31 May 2018 16:01:23 +0000
Subject: [PATCH 193/702] Translated using Weblate (German)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4892b91b48..d3787a15a3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1171,5 +1171,25 @@
     "Send analytics data": "Analysedaten senden",
     "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere <PolicyLink>Datenschutzerklärung</PolicyLink>).",
     "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
-    "Yes please": "Ja, bitte"
+    "Yes please": "Ja, bitte",
+    "e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
+    "Reload widget": "Widget neu laden",
+    "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:",
+    "Muted Users": "Stummgeschaltete Benutzer",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Bitte helfe uns Riot.im zu verbessern, in dem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein Cookie benutzen (bitte beachte auch unsere <PolicyLink>Cookie-Richtlinie</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Bitte helfe uns Riot.im zu verbessern, in dem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein Cookie benutzen.",
+    "Yes, I want to help!": "Ja, ich möchte helfen!",
+    "Warning: This widget might use cookies.": "Warnung: Diese Widget mag Cookies verwenden.",
+    "Failed to indicate account erasure": "Fehler beim Signalisieren der Account-Löschung",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dies wird deinen Account permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. <b>Diese Aktion ist irreversibel!</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Standardmäßig werden <b>die von dir gesendeten Nachrichten beim Deaktiveren nicht gelöscht</b>. Wenn du dies von uns möchtest, aktivere das Auswalfeld unten.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Sie Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen heißt das, dass diese nicht mit neuen oder nicht registrierten Nutzern teilen werden, aber registrierte Nutzer, die bereits zugriff haben, werden Zugriff auf ihre Kopie behalten.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Account deaktiviert wird. (<b>Warnung:</b> Zukünftige Nutzer werden eine unvollständige Konversation sehen)",
+    "To continue, please enter your password:": "Um fortzufahren, bitte Password eingeben:",
+    "password": "Passwort",
+    "Can't leave Server Notices room": "Du kannst den Raum für Server-Notizen nicht verlassen",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Nachrichten vom Heimserver verwendet wird.",
+    "Terms and Conditions": "Geschäftsbedingungen",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.",
+    "Review terms and conditions": "Geschäftsbedingungen anzeigen"
 }

From f5892b8c6174c018ee2e616e15c2437cbaf39987 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Sun, 3 Jun 2018 22:33:00 +0000
Subject: [PATCH 194/702] Translated using Weblate (Swedish)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 220 +++++++++++++++++++++++++++++++++++----
 1 file changed, 202 insertions(+), 18 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index a9c9bfade2..8e5d8e2f21 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -40,7 +40,7 @@
     "Blacklisted": "Svartlistad",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
     "Banned users": "Bannade användare",
-    "Bans user with given id": "Bannar användaren med givet id",
+    "Bans user with given id": "Bannar användare med givet id",
     "Ban": "Banna",
     "Attachment": "Bilaga",
     "Call Timeout": "Samtalstimeout",
@@ -78,14 +78,14 @@
     "Cryptography": "Kryptografi",
     "Current password": "Nuvarande lösenord",
     "Curve25519 identity key": "Curve25519 -identitetsnyckel",
-    "Custom level": "Egen nivå",
+    "Custom level": "Anpassad nivå",
     "/ddg is not a command": "/ddg är inte ett kommando",
-    "Deactivate Account": "Deaktivera konto",
+    "Deactivate Account": "Inaktivera konto",
     "Deactivate my account": "Deaktivera mitt konto",
     "Decrypt %(text)s": "Dekryptera %(text)s",
     "Decryption error": "Dekrypteringsfel",
     "Delete": "Radera",
-    "Deops user with given id": "Degraderar användaren med givet id",
+    "Deops user with given id": "Degraderar användare med givet id",
     "Default": "Standard",
     "Device already verified!": "Enheten är redan verifierad!",
     "Device ID": "Enhets-ID",
@@ -94,11 +94,11 @@
     "Device key:": "Enhetsnyckel:",
     "Devices": "Enheter",
     "Devices will not yet be able to decrypt history from before they joined the room": "Enheter kan inte ännu dekryptera meddelandehistorik från före de gick med i rummet",
-    "Direct chats": "Direkta chattar",
+    "Direct chats": "Direkt-chattar",
     "Disinvite": "Häv inbjudan",
     "Display name": "Namn",
     "Displays action": "Visar åtgärd",
-    "Don't send typing notifications": "Sänd inte \"skriver\"-status",
+    "Don't send typing notifications": "Skicka inte \"skriver\"-status",
     "Download %(text)s": "Ladda ner %(text)s",
     "Drop here to tag %(section)s": "Dra hit för att tagga %(section)s",
     "Ed25519 fingerprint": "Ed25519-fingeravtryck",
@@ -122,7 +122,7 @@
     "Export E2E room keys": "Exportera krypteringsrumsnycklar",
     "Failed to ban user": "Det gick inte att banna användaren",
     "Failed to change password. Is your password correct?": "Det gick inte att byta lösenord. Är lösenordet rätt?",
-    "Failed to change power level": "Det gick inte att ändra maktnivå",
+    "Failed to change power level": "Det gick inte att ändra behörighetsnivå",
     "Failed to forget room %(errCode)s": "Det gick inte att glömma bort rummet %(errCode)s",
     "Failed to join room": "Det gick inte att gå med i rummet",
     "Failed to kick": "Det gick inte att kicka",
@@ -165,7 +165,7 @@
     "Encrypted by an unverified device": "Krypterat av en overifierad enhet",
     "Encryption is enabled in this room": "Kryptering är aktiverat i det här rummet",
     "Encryption is not enabled in this room": "Kryptering är inte aktiverat i det här rummet",
-    "Enter passphrase": "Ge lösenfras",
+    "Enter passphrase": "Ange lösenfras",
     "Error: Problem communicating with the given homeserver.": "Fel: Det gick inte att kommunicera med den angivna hemservern.",
     "Failed to fetch avatar URL": "Det gick inte att hämta avatar-URL",
     "Failed to upload profile picture!": "Det gick inte att ladda upp profilbild!",
@@ -204,7 +204,7 @@
     "Invite new room members": "Bjud in nya rumsmedlemmar",
     "Invited": "Inbjuden",
     "Invites": "Inbjudningar",
-    "Invites user with given id to current room": "Bjuder in användaren med det givna ID:t till det nuvarande rummet",
+    "Invites user with given id to current room": "Bjuder in användare med givet id till nuvarande rum",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' är inte ett giltigt format för en adress",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' är inte ett giltigt format för ett alias",
     "%(displayName)s is typing": "%(displayName)s skriver",
@@ -216,7 +216,7 @@
     "Jump to first unread message.": "Hoppa till första olästa meddelande.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickade %(targetName)s.",
     "Kick": "Kicka",
-    "Kicks user with given id": "Kickar användaren med givet ID",
+    "Kicks user with given id": "Kickar användaren med givet id",
     "Labs": "Labb",
     "Last seen": "Senast sedd",
     "Leave room": "Lämna rummet",
@@ -276,7 +276,7 @@
     "Phone": "Telefon",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s startade ett %(callType)ssamtal.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Öppna meddelandet i din epost och klicka på länken i meddelandet. När du har gjort detta, klicka vidare.",
-    "Power level must be positive integer.": "Maktnivån måste vara ett positivt heltal.",
+    "Power level must be positive integer.": "Behörighetsnivå måste vara ett positivt heltal.",
     "Press <StartChatButton> to start a chat with someone": "Tryck på <StartChatButton> för att starta en chatt med någon",
     "Privacy warning": "Integritetsvarning",
     "Private Chat": "Privatchatt",
@@ -358,7 +358,7 @@
     "Cannot add any more widgets": "Det går inte att lägga till fler widgets",
     "Changes colour scheme of current room": "Ändrar färgschema för nuvarande rum",
     "Delete widget": "Ta bort widget",
-    "Define the power level of a user": "Definiera anseende för en användare",
+    "Define the power level of a user": "Definiera behörighetsnivå för en användare",
     "Do you want to load widget from URL:": "Vill du ladda widgeten från URL:",
     "Edit": "Ändra",
     "Enable automatic language detection for syntax highlighting": "Aktivera automatisk språkdetektering för syntaxmarkering",
@@ -415,7 +415,7 @@
     "Nov": "nov",
     "Dec": "dec",
     "Name or matrix ID": "Namn eller matrix ID",
-    "Invite to Community": "",
+    "Invite to Community": "Bjud in till community",
     "Unable to enable Notifications": "Det går inte att aktivera aviseringar",
     "Failed to invite user": "Det gick inte att bjuda in användaren",
     "The information being sent to us to help make Riot.im better includes:": "Informationen som skickas till oss för att hjälpa Riot.im att bli bättre inkluderar:",
@@ -436,7 +436,7 @@
     "Sunday": "söndag",
     "Messages sent by bot": "Meddelanden från bottar",
     "Notification targets": "Aviseringsmål",
-    "Failed to set direct chat tag": "Det gick inte att markera rummet som direkt chatt",
+    "Failed to set direct chat tag": "Det gick inte att markera rummet som direkt-chatt",
     "Today": "idag",
     "Failed to get protocol list from Home Server": "Det gick inte att hämta protokollistan från hemservern",
     "You are not receiving desktop notifications": "Du får inte skrivbordsaviseringar",
@@ -481,7 +481,7 @@
     "Filter results": "Filtrera resultaten",
     "Members": "Medlemmar",
     "No update available.": "Ingen uppdatering tillgänglig.",
-    "Resend": "Sänd igen",
+    "Resend": "Skicka igen",
     "Files": "Filer",
     "Collecting app version information": "Samlar in appversionsinformation",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Radera rumsadressen %(alias)s och ta bort %(name)s från katalogen?",
@@ -516,8 +516,8 @@
     "All Rooms": "Alla rum",
     "Wednesday": "onsdag",
     "You cannot delete this message. (%(code)s)": "Du kan inte radera det här meddelandet. (%(code)s)",
-    "Send": "Sänd",
-    "Send logs": "Sänd loggar",
+    "Send": "Skicka",
+    "Send logs": "Skicka loggar",
     "All messages": "Alla meddelanden",
     "Call invitation": "Inbjudan till samtal",
     "Downloading update...": "Laddar ned uppdatering...",
@@ -1006,5 +1006,189 @@
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sbytte namn %(count)s gånger",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sbytte namn",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sbytte namn %(count)s gånger",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbytte namn"
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbytte namn",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)sändrade sin avatar %(count)s gånger",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sändrade sin avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)ssändrade sin avatar %(count)s gånger",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)ssändrade sin avatar",
+    "%(items)s and %(count)s others|other": "%(items)s och %(count)s andra",
+    "%(items)s and %(count)s others|one": "%(items)s och en annan",
+    "collapse": "fäll ihop",
+    "expand": "fäll ut",
+    "Custom of %(powerLevel)s": "Anpassad på %(powerLevel)s",
+    "<a>In reply to</a> <pill>": "<a>Som svar på</a> <pill>",
+    "Who would you like to add to this community?": "Vem vill du lägga till i denna community?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varning: En person du lägger till i en community kommer att vara synlig för alla som känner till community-ID:t",
+    "Invite new community members": "Bjud in nya community-medlemmar",
+    "Which rooms would you like to add to this community?": "Vilka rum vill du lägga till i denna community?",
+    "Show these rooms to non-members on the community page and room list?": "Vissa dessa rum och icke-medlemmar på community-sidan och -rumslistan?",
+    "Add rooms to the community": "Lägg till rum i communityn",
+    "Add to community": "Lägg till i community",
+    "Failed to invite users to community": "Det gick inte att bjuda in användare till communityn",
+    "Message Replies": "Meddelandesvar",
+    "Mirror local video feed": "Spegelvänd lokal video",
+    "Disable Community Filter Panel": "Inaktivera community-filterpanel",
+    "Community Invites": "Community-inbjudningar",
+    "Invalid community ID": "Ogiltigt community-ID",
+    "'%(groupId)s' is not a valid community ID": "%(groupId)s är inte ett giltigt community-ID",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nytt community-ID (t.ex. +foo:%(localDomain)s)",
+    "Remove from community": "Ta bort från community",
+    "Disinvite this user from community?": "Ta bort användarens inbjudan till community?",
+    "Remove this user from community?": "Ta bort användaren från community?",
+    "Failed to remove user from community": "Det gick inte att ta bort användaren från community",
+    "Filter community members": "Filtrera community-medlemmar",
+    "Removing a room from the community will also remove it from the community page.": "Om du tar bort ett rum från communityn tas det även bort från communityns sida.",
+    "Failed to remove room from community": "Det gick inte att ta bort rum från community",
+    "Only visible to community members": "Endast synlig för community-medlemmar",
+    "Filter community rooms": "Filtrera community-rum",
+    "Community IDs cannot not be empty.": "Community-ID kan inte vara tomt.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-ID får endast innehålla tecknen a-z, 0-9 och '=_-./'",
+    "Something went wrong whilst creating your community": "Något gick fel när din community skapades",
+    "Create Community": "Skapa community",
+    "Community Name": "Community-namn",
+    "Community ID": "Community-ID",
+    "View Community": "Visa community",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML för din community-sida</h1>\n<p>\n    Använd den långa beskrivningen för att introducera nya medlemmar till communityn, eller dela\n    några viktiga <a href=\"foo\">länkar</a>\n</p>\n<p>\n    Du kan även använda 'img'-taggar\n</p>\n",
+    "Add rooms to the community summary": "Lägg till rum i community-översikten",
+    "Add users to the community summary": "Lägg till användare i community-översikten",
+    "Failed to update community": "Det gick inte att uppdatera community",
+    "Unable to join community": "Det gick inte att gå med i communityn",
+    "Leave Community": "Lämna community",
+    "Unable to leave community": "Det gick inte att lämna community",
+    "Community Settings": "Community-inställningar",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Ändringar på <bold1>namn</bold1> och <bold2>avatar</bold2> som gjorts i din community kommer eventuellt inte synas för andra användare i upp till 30 minuter.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Dessa rum visas för community-medlemmar på community-sidan. Community-medlemmar kan gå med i rummen genom att klicka på dem.",
+    "Add rooms to this community": "Lägg till rum i denna community",
+    "%(inviter)s has invited you to join this community": "%(inviter)s har bjudit in dig till denna community",
+    "Join this community": "Gå med i denna community",
+    "Leave this community": "Lämna denna community",
+    "You are an administrator of this community": "Du är administratör för denna community",
+    "You are a member of this community": "Du är medlem i denna community",
+    "Who can join this community?": "Vem kan gå med i denna community?",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Din community har ingen lång beskrivning eller HTML-sida att visa för medlemmar.<br />Klicka här för att öppna inställningar och lägga till det!",
+    "Community %(groupId)s not found": "Community %(groupId)s hittades inte",
+    "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.": "För att skapa ett filter, dra en community-avatar till filterpanelen längst till vänster på skärmen. Du kan när som helst klicka på en avatar i filterpanelen för att bara se rum och personer som är associerade med den communityn.",
+    "Create a new community": "Skapa en ny community",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Skapa en community för att gruppera användare och rum! Bygg en anpassad hemsida för att markera er plats i Matrix-universumet.",
+    "Join an existing community": "Gå med i en befintlig community",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "För att gå med i en befintlig gemenskap behöver du ha community-ID; det ser ut som något i stil med <i>+exempel:matrix.org</i>.",
+    "Invite to this community": "Bjud in till denna community",
+    "Something went wrong when trying to get your communities.": "Något gick fel vid hämtning av dina communityn.",
+    "You're not currently a member of any communities.": "Du är för närvarande inte medlem i någon community.",
+    "Communities": "Communityn",
+    "This Home server does not support communities": "Denna hemserver stöder inte communityn",
+    "Your Communities": "Dina communityn",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Visste du att: du kan använda communityn för att filtrera din Riot.im-upplevelse!",
+    "Error whilst fetching joined communities": "Fel vid hämtning av anslutna communityn",
+    "Featured Rooms:": "Utvalda rum:",
+    "Featured Users:": "Utvalda användare:",
+    "Everyone": "Alla",
+    "To notify everyone in the room, you must be a": "För att meddela alla i rummet, måste du vara",
+    "Long Description (HTML)": "Lång beskrivning (HTML)",
+    "Description": "Beskrivning",
+    "Failed to load %(groupId)s": "Det gick inte att ladda %(groupId)s",
+    "Failed to withdraw invitation": "Det gick inte att ta bort inbjudan",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Är du säker på att du vill ta bort %(roomName)s från %(groupId)s?",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Det gick inte att ta bort %(roomName)s från %(groupId)s",
+    "Something went wrong!": "Något gick fel!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Synligheten för '%(roomName)s' i %(groupId)s kunde inte uppdateras.",
+    "Visibility in Room List": "Synlighet i rumslistan",
+    "Visible to everyone": "Synlig för alla",
+    "Please select the destination room for this message": "Välj vilket rum meddelandet ska skickas till",
+    "Disinvite this user?": "Ta bort användarens inbjudan?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du kommer inte att kunna ångra den här ändringen eftersom du sänker din egen behörighetsnivå, om du är den sista privilegierade användaren i rummet blir det omöjligt att ändra behörigheter.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kommer inte att kunna ångra den här ändringen eftersom du höjer användaren till samma behörighetsnivå som dig själv.",
+    "User Options": "Användaralternativ",
+    "unknown caller": "okänd uppringare",
+    "At this time it is not possible to reply with an emote.": "Det är för närvarande inte möjligt att svara med en emoji.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "För att använda detta, vänta på att autokompletteringen laddas och tabba igenom resultatet.",
+    "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!": "VARNING: NYCKELVERIFIERINGEN MISSLYCKADES! Signeringsnyckeln för %(userId)s och enhet %(deviceId)s är \"%(fprint)s\" som inte matchar den angivna nyckeln \"%(fingerprint)s\". Detta kan betyda att dina kommunikationer avlyssnas!",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Dölj \"gå med\"/lämna-meddelanden (inbjudningar/kickningar/banningar opåverkat)",
+    "Disable Peer-to-Peer for 1:1 calls": "Inaktivera enhet-till-enhet-kommunikation för direktsamtal (mellan två personer)",
+    "Enable inline URL previews by default": "Aktivera URL-förhandsvisning som standard",
+    "Enable URL previews for this room (only affects you)": "Aktivera URL-förhandsvisning för detta rum (påverkar bara dig)",
+    "Enable URL previews by default for participants in this room": "Aktivera URL-förhandsvisning som standard för deltagare i detta rum",
+    "You have <a>enabled</a> URL previews by default.": "Du har <a>aktiverat</a> URL-förhandsvisning som standard.",
+    "You have <a>disabled</a> URL previews by default.": "Du har <a>inaktiverat</a> URL-förhandsvisning som standard.",
+    "URL previews are enabled by default for participants in this room.": "URL-förhandsvisning är aktiverat som standard för deltagare i detta rum.",
+    "URL previews are disabled by default for participants in this room.": "URL-förhandsvisning är inaktiverat som standard för deltagare i detta rum.",
+    "URL Previews": "URL-förhandsvisning",
+    "Which rooms would you like to add to this summary?": "Vilka rum vill du lägga till i översikten?",
+    "Add to summary": "Lägg till i översikt",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Det gick inte att lägga till följande rum i översikten för %(groupId)s:",
+    "Add a Room": "Lägg till ett rum",
+    "Failed to remove the room from the summary of %(groupId)s": "Det gick inte att ta bort rummet från översikten i %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "Rummet '%(roomName)s' kunde inte tas bort från översikten.",
+    "Who would you like to add to this summary?": "Vem vill du lägga till i översikten?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Det gick inte att lägga till följande användare i översikten för %(groupId)s:",
+    "Add a User": "Lägg till en användare",
+    "Failed to remove a user from the summary of %(groupId)s": "Det gick inte att ta bort en användare från översikten i %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "Användaren '%(displayName)s' kunde inte tas bort från översikten.",
+    "Unable to accept invite": "Det gick inte att acceptera inbjudan",
+    "Leave %(groupName)s?": "Lämna %(groupName)s?",
+    "Enable widget screenshots on supported widgets": "Aktivera widget-skärmdumpar för widgets som stöder det",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Din nyckeldelningsbegäran har skickats - kolla efter nyckeldelningsbegäran på dina andra enheter.",
+    "Undecryptable": "Odekrypterbar",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Nyckeldelningsbegäran skickas automatiskt till dina andra enheter. Om du avvisat nyckelbegäran på dina andra enheter, klicka här för att begära nycklarna till den här sessionen igen.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Om dina andra enheter inte har nyckeln till detta meddelande kommer du du att kunna dekryptera det.",
+    "Key request sent.": "Nyckelbegäran skickad.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Begär krypteringsnycklar igen</requestLink> från dina andra enheter.",
+    "Unban": "Avbanna",
+    "Unban this user?": "Avbanna användaren?",
+    "Unmute": "Ta bort dämpning",
+    "You don't currently have any stickerpacks enabled": "Du har för närvarande inga dekalpaket aktiverade",
+    "Add a stickerpack": "Lägg till dekalpaket",
+    "Stickerpack": "Dekalpaket",
+    "Hide Stickers": "Dölj dekaler",
+    "Show Stickers": "Visa dekaler",
+    "Error decrypting audio": "Det gick inte att dekryptera ljud",
+    "Error decrypting image": "Det gick inte att dekryptera bild",
+    "Error decrypting video": "Det gick inte att dekryptera video",
+    "Add an Integration": "Lägg till integration",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du skickas till en tredjepartswebbplats så att du kan autentisera ditt konto för användning med %(integrationsUrl)s. Vill du fortsätta?",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Du kan använda de anpassade serverinställningar för att logga in på andra Matrix-servrar genom att ange en annan hemserver-URL.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Det gör det möjligt att använda denna app med ett befintligt Matrix-konto på en annan hemserver.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Du kan även ange en anpassad identitetsserver men det förhindrar vanligtvis interaktion med användare baserat på e-postadress.",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Om du inte anger en epostadress, kan du inte återställa ditt lösenord. Är du säker?",
+    "You are registering with %(SelectedTeamName)s": "Du registrerar dig med %(SelectedTeamName)s",
+    "Warning: This widget might use cookies.": "Varning: Denna widget kan använda cookies.",
+    "Popout widget": "Poppa ut widget",
+    "were unbanned %(count)s times|other": "blev avbannade %(count)s gånger",
+    "were unbanned %(count)s times|one": "blev avbannade",
+    "was unbanned %(count)s times|other": "blev avbannad %(count)s gånger",
+    "was unbanned %(count)s times|one": "blev avbannad",
+    "Failed to indicate account erasure": "Det gick inte att ange kontoradering",
+    "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>": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna logga in, och ingen kommer att kunna registrera samma användar-ID. Ditt konto kommer att lämna alla rum som det deltar i, och dina kontouppgifter kommer att raderas från identitetsservern. <b>Denna åtgärd går inte att ångra.</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.": "Att du inaktiverar ditt konto <b>gör inte att meddelanden som du skickat glöms automatiskt.</b> Om du vill att vi ska glömma dina meddelanden, kryssa i rutan nedan.",
+    "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.": "Meddelandesynlighet i Matrix liknar email. Att vi glömmer dina meddelanden innebär att meddelanden som du skickat inte delas med några nya eller oregistrerade användare, men registrerade användare som redan har tillgång till meddelandena kommer fortfarande ha tillgång till sin kopia.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Glöm alla meddelanden som jag har skickat när mitt konto inaktiveras (<b>Varning:</b> detta kommer att göra så att framtida användare får se ofullständiga konversationer)",
+    "To continue, please enter your password:": "För att fortsätta, ange ditt lösenord:",
+    "password": "lösenord",
+    "Debug Logs Submission": "Inlämning av felsökningsloggar",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Om du har anmält en bugg via GitHub, kan felsökningsloggar hjälpa oss spåra problemet. Felsökningsloggarna innehåller användningsdata för applikationen inklusive ditt användarnamn, ID eller alias för rum och grupper du besökt och användarnamn för andra användare. De innehåller inte meddelanden.",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar in anonym analysdata för att vi ska kunna förbättra applikationen.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Integritet är viktig för oss, så vi samlar inte in några personliga eller identifierbara uppgifter för våra analyser.",
+    "Learn more about how we use analytics.": "Läs mer om hur vi använder analysdata.",
+    "Analytics": "Analysdata",
+    "Send analytics data": "Skicka analysdata",
+    "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": "Du har loggats ut från alla enheter och kommer inte längre att få push-meddelanden. För att återaktivera det, logga in på varje enhet igen",
+    "Passphrases must match": "Passfraser måste matcha",
+    "Passphrase must not be empty": "Lösenfras får inte vara tom",
+    "Confirm passphrase": "Bekräfta lösenfrasen",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ändrade fastnålade meddelanden för rummet.",
+    "Message Pinning": "Nåla fast meddelanden",
+    "Unpin Message": "Ta bort fastnålning",
+    "No pinned messages.": "Inga fastnålade meddelanden.",
+    "Pinned Messages": "Fastnålade meddelanden",
+    "Pin Message": "Nåla fast meddelande",
+    "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.": "Den exporterade filen kommer att låta någon som kan läsa den att dekryptera alla krypterade meddelanden som du kan se, så du bör vara noga med att hålla den säker. För att hjälpa till med detta, bör du ange en lösenfras nedan, som kommer att användas för att kryptera exporterad data. Det kommer bara vara möjligt att importera data genom att använda samma lösenfras.",
+    "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.": "Denna process möjliggör import av krypteringsnycklar som tidigare exporterats från en annan Matrix-klient. Du kommer då kunna dekryptera alla meddelanden som den andra klienten kunde dekryptera.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Den exporterade filen kommer vara skyddad med en lösenfras. Du måste ange lösenfrasen här, för att dekryptera filen.",
+    "Tag Panel": "Tagg-panel",
+    "Flair": "Emblem",
+    "Showing flair for these communities:": "Visar emblem för dessa communityn:",
+    "This room is not showing flair for any communities": "Detta rum visar inte emblem för några communityn",
+    "Flair will appear if enabled in room settings": "Emblem kommer visas om det är aktiverat i rumsinställningarna",
+    "Flair will not appear": "Emblem kommer inte att visas",
+    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det."
 }

From 6a317569d798a5d79e0cc2ef511864a15cb73c0c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 4 Jun 2018 09:38:21 +0100
Subject: [PATCH 195/702] Add null-guard to support browsers that don't support
 performance

Like Tor.

Fixes https://github.com/vector-im/riot-web/issues/6781
---
 src/components/structures/MatrixChat.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 46c1113a1d..e1c9e33055 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -398,6 +398,9 @@ export default React.createClass({
     },
 
     startPageChangeTimer() {
+        // Tor doesn't support performance
+        if (!performance || !performance.mark) return null;
+
         // This shouldn't happen because componentWillUpdate and componentDidUpdate
         // are used.
         if (this._pageChanging) {
@@ -409,6 +412,9 @@ export default React.createClass({
     },
 
     stopPageChangeTimer() {
+        // Tor doesn't support performance
+        if (!performance || !performance.mark) return null;
+
         if (!this._pageChanging) {
             console.warn('MatrixChat.stopPageChangeTimer: timer not started');
             return;

From 8f135c650e9894da580a9d3debc26fa8e73bbc63 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 2 Jun 2018 12:31:10 +0000
Subject: [PATCH 196/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index c293ec135d..909b466da3 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -893,7 +893,7 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Trepeta ezabatzean gelako kide guztientzat kentzen da. Ziur trepeta ezabatu nahi duzula?",
     "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s aldiz elkartu dira",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s elkartu da",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s elkartu dira",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s%(count)s aldiz elkartu da",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s elkartu da",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s aldiz atera dira",
@@ -904,7 +904,7 @@
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s elkartu eta atera da",
     "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s elkartu eta atera da %(count)s aldiz",
     "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s elkartu eta atera da",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s atera eta berriz elkartu da %(count)s aldiz",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s atera eta berriz elkartu dira %(count)s aldiz",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s atera eta berriz elkartu da",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s atera eta berriz elkartu da %(count)s aldiz",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s atera eta berriz elkartu da",
@@ -1192,7 +1192,7 @@
     "Yes, I want to help!": "Bai, lagundu nahi dut!",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Honek kontua behin betirako erabilgaitza bihurtuko du. Ezin izango duzu saioa hasi, eta ezin izango du beste inork ID hori erabili. Kontua dagoen gela guztietatik aterako da, eta kontuaren xehetasunak identitate-zerbitzaritik ezabatuko dira. <b>Ekintza hau ezin da desegin.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Kontua desaktibatzean <b>ez dira zuk bidalitako mezuak ahaztuko.</b> Mezuak ahaztea nahi baduzu markatu beheko kutxa.",
-    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso diztuzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso dituzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
     "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)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)",
     "Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera."

From 195d596c896fc6da1730300e4a594db00f74ba43 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 30 May 2018 12:53:39 +0000
Subject: [PATCH 197/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 6295c7e934..d157f4dff8 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -269,7 +269,7 @@
     "Enable Notifications": "Включване на известия",
     "Cannot add any more widgets": "Не могат да се добавят повече приспособления",
     "The maximum permitted number of widgets have already been added to this room.": "Максимално разрешеният брой приспособления е вече добавен към тази стая.",
-    "Add a widget": "Добавяне на приспособление",
+    "Add a widget": "Добави приспособление",
     "Drop File Here": "Пусни файла тук",
     "Drop file here to upload": "Пуснете файла тук, за да се качи",
     " (unsupported)": " (не се поддържа)",
@@ -1180,7 +1180,7 @@
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Това ще направи акаунта Ви неизползваем завинаги. Няма да можете да влезете пак, а регистрирането повторно на същия потребителски идентификатор няма да е възможно. Акаунтът Ви да напусне всички стаи, в които участва. Ще бъдат премахнати и данните за акаунта Ви от сървъра за самоличност. <b>Действието е необратимо.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Деактивирането на акаунта Ви <b>по подразбиране не прави така, че изпратените съобщения да бъдат забравени.</b> Ако искате да забравим съобщенията Ви, моля отбележете с отметка по-долу.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видимостта на съобщенията в Matrix е подобно на имейл системата. Нашето забравяне означава, че: изпратените от Вас съобщения няма да бъдат споделяни с нови или нерегистрирани потребители, но регистрираните потребители имащи достъп до тях ще продължат да имат достъп до своето копие.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Моля, забравете всички изпратени съобщения от мен съобщения, когато акаунта ми се деактивира (<b>Внимание:</b> това ще направи бъдещите потребители да имат само частичен поглед върху кореспонденцията)",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Моля, забравете всички изпратени от мен съобщения, когато акаунта ми се деактивира (<b>Внимание:</b> това ще направи бъдещите потребители да имат само частичен поглед върху кореспонденцията)",
     "To continue, please enter your password:": "За да продължите, моля въведете паролата си:",
     "password": "парола",
     "Can't leave Server Notices room": "Не може да напуснете стая \"Server Notices\"",

From 3c204f1eb8a827d62c932c9300f1d60139585778 Mon Sep 17 00:00:00 2001
From: Nathan van Beelen <nathan@vanbeelen.org>
Date: Sat, 2 Jun 2018 18:54:14 +0000
Subject: [PATCH 198/702] Translated using Weblate (Dutch)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 74 ++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index a6df7d69b2..f09c63118e 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -4,7 +4,7 @@
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s heeft de uitnodiging voor %(displayName)s geaccepteerd.",
     "Account": "Account",
     "Access Token:": "Toegangstoken:",
-    "Add email address": "Voeg een email address toe",
+    "Add email address": "Voeg een e-mailadres toe",
     "Add phone number": "Voeg een telefoonnummer toe",
     "Admin": "Beheerder",
     "Advanced": "Geavanceerd",
@@ -18,8 +18,8 @@
     "A new password must be entered.": "Er moet een nieuw wachtwoord worden ingevoerd.",
     "%(senderName)s answered the call.": "%(senderName)s heeft deelgenomen aan het audiogesprek.",
     "An error has occurred.": "Er is een fout opgetreden.",
-    "Anyone who knows the room's link, apart from guests": "Iedereen die de kamerlink weet, behalve gasten",
-    "Anyone who knows the room's link, including guests": "Iedereen die de kamerlink weet, inclusief gasten",
+    "Anyone who knows the room's link, apart from guests": "Iedereen die de link van de ruimte weet, behalve gasten",
+    "Anyone who knows the room's link, including guests": "Iedereen die link van de ruimte weet, inclusief gasten",
     "Are you sure?": "Weet je het zeker?",
     "Are you sure you want to reject the invitation?": "Weet je zeker dat je de uitnodiging wilt weigeren?",
     "Attachment": "Bijlage",
@@ -36,13 +36,13 @@
     "Change Password": "Wachtwoord veranderen",
     "%(senderName)s changed their profile picture.": "%(senderName)s heeft zijn of haar profielfoto veranderd.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de kamernaam van %(roomName)s gewijzigd.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de ruimtenaam van %(roomName)s gewijzigd.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s heeft het onderwerp gewijzigd naar \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Veranderingen aan wie de geschiedenis kan lezen worden alleen maar toegepast op toekomstige berichten in deze ruimte",
     "Changes your display nickname": "Verandert jouw weergavenaam",
     "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.": "Het veranderen van het wachtwoord zal op het moment alle eind-tot-eind encryptie sleutels resetten, wat alle versleutelde gespreksgeschiedenis onleesbaar zou maken, behalve als je eerst je ruimtesleutels exporteert en achteraf opnieuw importeert. Dit zal worden verbeterd in de toekomst.",
-    "Clear Cache and Reload": "Legen cache en herlaad",
-    "Clear Cache": "Legen cache",
+    "Clear Cache and Reload": "Cache Legen en Herladen",
+    "Clear Cache": "Cache Legen",
     "Click here to fix": "Klik hier om op te lossen",
     "Click to mute audio": "Klik om audio te dempen",
     "Click to mute video": "Klik om de video te dempen",
@@ -53,7 +53,7 @@
     "Commands": "Opdrachten",
     "Conference call failed.": "Conferentiegesprek mislukt.",
     "Conference calling is in development and may not be reliable.": "Conferentiegesprekken zijn nog in ontwikkelingen en kunnen onbetrouwbaar zijn.",
-    "Conference calls are not supported in encrypted rooms": "Conferentiegesprekken worden niet ondersteunt in versleutelde kamers",
+    "Conference calls are not supported in encrypted rooms": "Conferentiegesprekken worden niet ondersteunt in versleutelde ruimtes",
     "Conference calls are not supported in this client": "Conferentiegesprekken worden niet ondersteunt in deze client",
     "Confirm password": "Bevestigen wachtwoord",
     "Confirm your new password": "Bevestig je nieuwe wachtwoord",
@@ -93,7 +93,7 @@
     "Operation failed": "Actie mislukt",
     "powered by Matrix": "mogelijk gemaakt door Matrix",
     "Remove": "Verwijderen",
-    "Room directory": "Kamerlijst",
+    "Room directory": "Ruimtelijst",
     "Settings": "Instellingen",
     "Start chat": "Gesprek starten",
     "unknown error code": "onbekende foutcode",
@@ -267,7 +267,7 @@
     "Hangup": "Ophangen",
     "Hide read receipts": "Leesbewijzen verbergen",
     "Hide Text Formatting Toolbar": "Tekstopmaakgereedschapsbalk verbergen",
-    "Historical": "Historische",
+    "Historical": "Historisch",
     "Home": "Home",
     "Homeserver is": "Thuisserver is",
     "Identity Server is": "Identiteitsserver is",
@@ -295,7 +295,7 @@
     "Sign in with": "Inloggen met",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Toetreden als <voiceText>spraak</voiceText> of <videoText>video</videoText>.",
     "Join Room": "Ruimte toetreden",
-    "%(targetName)s joined the room.": "%(targetName)s is aan de ruimte toegevoegd.",
+    "%(targetName)s joined the room.": "%(targetName)s is tot de ruimte toegetreden.",
     "Joins room with given alias": "Treed de ruimte toe met een gegeven naam",
     "Jump to first unread message.": "Spring naar het eerste ongelezen bericht.",
     "Labs": "Labs",
@@ -308,9 +308,9 @@
     "Login as guest": "Als gast inloggen",
     "Logout": "Uitloggen",
     "Low priority": "Lage prioriteit",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle kamerleden, vanaf het moment dat ze uitgenodigt zijn.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle kamerleden, vanaf het moment dat ze toegetreden zijn.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle kamerleden.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze uitgenodigd zijn.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze toegetreden zijn.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor iedereen.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
     "Manage Integrations": "Integraties beheren",
@@ -349,7 +349,7 @@
     "Room name (optional)": "Ruimtenaam (optioneel)",
     "%(roomName)s does not exist.": "%(roomName)s bestaat niet.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is niet toegankelijk op dit moment.",
-    "Rooms": "Kamers",
+    "Rooms": "Ruimtes",
     "Save": "Opslaan",
     "Scroll to bottom of page": "Scroll naar de onderkant van de pagina",
     "Scroll to unread messages": "Scroll naar ongelezen berichten",
@@ -562,8 +562,8 @@
     "Device name": "Apparaat naam",
     "Device Name": "Apparaat Naam",
     "Device key": "Apparaat sleutel",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Als het overeenkomt, druk op de verifiëren knop hieronder. Als het niet overeenkomt, dan is er iemand anders die dit apparaat onderschept en dan zal je waarschijnlijk in plaats daarvan op de 'buitensluiten' knop willen drukken.",
-    "Blacklist": "Buitensluiten",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Als het overeenkomt, druk op de verifiëren knop hieronder. Als het niet overeenkomt, dan is er iemand anders die dit apparaat onderschept en dan zal je waarschijnlijk in plaats daarvan op de 'blokkeren' knop willen drukken.",
+    "Blacklist": "Blokkeren",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Je bent momenteel geverifieerde apparaten aan het buitensluiten; om berichten naar deze apparaten te versturen moet je ze verifiëren.",
     "Unblacklist": "Niet buitensluiten",
     "In future this verification process will be more sophisticated.": "In de toekomst zal dit verificatie proces meer geraffineerd zijn.",
@@ -674,17 +674,17 @@
     "Copied!": "Gekopieerd!",
     "Failed to copy": "Kopiëren mislukt",
     "Unpin Message": "Maak pin los",
-    "Add rooms to this community": "Voeg kamers toe aan deze community",
+    "Add rooms to this community": "Voeg ruimtes toe aan deze gemeenschap",
     "Call Failed": "Oproep mislukt",
     "Call": "Bel",
     "Answer": "Antwoord",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Opgepast: elke persoon die je toevoegt aan een community zal publiek zichtbaar zijn voor iedereen die het community ID kent",
     "Invite new community members": "Nodig nieuwe community leden uit",
     "Name or matrix ID": "Naam of Matrix ID",
-    "Which rooms would you like to add to this community?": "Welke kamers wil je toevoegen aan deze community?",
+    "Which rooms would you like to add to this community?": "Welke ruimtes wil je toevoegen aan deze community?",
     "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 deze ruimte. Ben je zeker dat je het widget wil 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 toestellen in deze kamer: als je verder gaat zonder ze te verifieren zal het mogelijk zijn dat iemand je 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.": "Er zijn onbekende toestellen in deze ruimte: als je verder gaat zonder ze te verifiëren zal het mogelijk zijn dat iemand je oproep afluistert.",
     "Review Devices": "Toestellen nakijken",
     "Call Anyway": "Bel toch",
     "Answer Anyway": "Antwoord toch",
@@ -1014,7 +1014,7 @@
     "Expand panel": "Paneel uitklappen",
     "On": "Aan",
     "%(count)s Members|other": "%(count)s Deelnemers",
-    "Filter room names": "Filter kamernamen",
+    "Filter room names": "Filter ruimtenamen",
     "Changelog": "Logboek van wijzigingen",
     "Waiting for response from server": "Wachten op antwoord van de server",
     "Send Custom Event": "Verzend aangepast evenement",
@@ -1026,7 +1026,7 @@
     "Hide panel": "Paneel verbergen",
     "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. (%(code)s)",
     "Cancel Sending": "Versturen annuleren",
-    "This Room": "Deze kamer",
+    "This Room": "Deze Ruimte",
     "The Home Server may be too old to support third party networks": "De thuisserver is misschien te oud om netwerken van derde partijen te ondersteunen",
     "Resend": "Opnieuw verzenden",
     "Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
@@ -1035,7 +1035,7 @@
     "Unavailable": "Niet beschikbaar",
     "View Decrypted Source": "Bekijk ontsleutelde bron",
     "Failed to update keywords": "Trefwoorden bijwerken mislukt",
-    "remove %(name)s from the directory.": "verwijder %(name)s uit de kamerlijst.",
+    "remove %(name)s from the directory.": "verwijder %(name)s uit de ruimtelijst.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Meldingen op de volgende trefwoorden volgen regels die hier niet kunnen worden getoond:",
     "<safariLink>Safari</safariLink> and <operaLink>Opera</operaLink> work too.": "<safariLink>Safari</safariLink> en <operaLink>Opera</operaLink> werken ook.",
     "Please set a password!": "Stel een wachtwoord in!",
@@ -1050,31 +1050,31 @@
     "Noisy": "Luidruchtig",
     "Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt",
     "Collecting app version information": "App-versieinformatie verzamelen",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De alias %(alias)s verwijderen en %(name)s uit de kamerlijst verwijderen?",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De alias %(alias)s verwijderen en %(name)s uit de ruimtelijst verwijderen?",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee kunt u naar uw account terugkeren nadat u zich heeft afgemeld, en u aanmelden op andere apparaten.",
     "Keywords": "Trefwoorden",
     "Enable notifications for this account": "Meldingen voor dit account aanzetten",
-    "Directory": "Kamerlijst",
+    "Directory": "Ruimtelijst",
     "Invite to this community": "Nodig uit in deze community",
-    "Search for a room": "Een kamer opzoeken",
+    "Search for a room": "Een ruimte opzoeken",
     "Messages containing <span>keywords</span>": "Berichten die <span>trefwoorden</span> bevatten",
-    "Room not found": "De kamer is niet gevonden",
+    "Room not found": "De ruimte is niet gevonden",
     "Tuesday": "Dinsdag",
     "Enter keywords separated by a comma:": "Voeg trefwoorden toe, gescheiden door een komma:",
     "Search…": "Zoeken…",
     "You have successfully set a password and an email address!": "Het instellen van een wachtwoord en e-mailadres is geslaagd!",
-    "Remove %(name)s from the directory?": "%(name)s uit de kamerlijst verwijderen?",
+    "Remove %(name)s from the directory?": "%(name)s uit de ruimtelijst verwijderen?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebrukt veel geavanceerde browserfuncties, waarvan enkele niet (of experimenteel) in uw webbrowser beschikbaar zijn.",
     "Developer Tools": "Ontwikkelaarsgereedschap",
     "Enable desktop notifications": "Desktopmeldingen aanzetten",
     "Explore Account Data": "Bekijk account informatie",
-    "Remove from Directory": "Uit de kamerlijst verwijderen",
+    "Remove from Directory": "Uit de ruimtelijst verwijderen",
     "Saturday": "Zaterdag",
     "Remember, you can always set an email address in user settings if you change your mind.": "Onthoud dat u altijd een e-mailadres in kan stellen in de gebruikersinstellingen als u zich bedenkt.",
     "Direct Chat": "Privégesprek",
     "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbelast",
     "Reject": "Afwijzen",
-    "Failed to set Direct Message status of room": "Het is mislukt om de directe-berichtenstatus van de kamer in te stellen",
+    "Failed to set Direct Message status of room": "Het is niet gelukt om de privéchat status van de ruimte in te stellen",
     "Monday": "Maandag",
     "All messages (noisy)": "Alle berichten (luid)",
     "Enable them now": "Deze nu aanzetten",
@@ -1084,9 +1084,9 @@
     "more": "meer",
     "You must specify an event type!": "Je moet een event-type specificeren!",
     "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
-    "Invite to this room": "Uitnodigen voor deze kamer",
+    "Invite to this room": "Uitnodigen voor deze ruimte",
     "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 mislukt",
+    "Failed to get public room list": "Lijst met publieke ruimtes ophalen mislukt",
     "Send logs": "Logboeken versturen",
     "All messages": "Alle berichten",
     "Call invitation": "Oproep-uitnodiging",
@@ -1095,12 +1095,12 @@
     "Failed to send custom event.": "Aangepast Event verzenden mislukt.",
     "What's new?": "Wat is er nieuw?",
     "Notify me for anything else": "Stuur een melding voor al het andere",
-    "When I'm invited to a room": "Wanneer ik uitgenodigd word voor een kamer",
+    "When I'm invited to a room": "Wanneer ik uitgenodigd word voor een ruimte",
     "Can't update user notification settings": "Het is niet gelukt om de meldingsinstellingen van de gebruiker bij te werken",
-    "Notify for all other messages/rooms": "Stuur een melding voor alle andere berichten/kamers",
-    "Unable to look up room ID from server": "Het is mislukt om de kamer-ID op te halen van de server",
-    "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix-kamer te vinden",
-    "All Rooms": "Alle kamers",
+    "Notify for all other messages/rooms": "Stuur een melding voor alle andere berichten/ruimtes",
+    "Unable to look up room ID from server": "Het is mislukt om het ruimte-ID op te halen van de server",
+    "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix-ruimte te vinden",
+    "All Rooms": "Alle Ruimtes",
     "You cannot delete this message. (%(code)s)": "Je kunt dit bericht niet verwijderen. (%(code)s)",
     "Thursday": "Donderdag",
     "Forward Message": "Bericht doorsturen",
@@ -1122,7 +1122,7 @@
     "Enable audible notifications in web client": "Geluidsmeldingen in de webclient aanzetten",
     "Permalink": "Permanente link",
     "Off": "Uit",
-    "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een kamer op dit netwerk",
+    "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een ruimte op dit netwerk",
     "Mentions only": "Alleen vermeldingen",
     "Wednesday": "Woensdag",
     "You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u bent afgemeld, en u aanmelden op andere apparaten.",

From c792ae1c6fba7bf93ee079ba06d630da8d2f74c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 29 May 2018 15:48:56 +0000
Subject: [PATCH 199/702] Translated using Weblate (Slovak)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index daa9cfc9b6..ed07ff5c09 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -735,7 +735,7 @@
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
     "Automatically replace plain text Emoji": "Automaticky nahrádzať textové Emoji",
     "Disable Emoji suggestions while typing": "Zakázať návrhy Emoji počas písania",
-    "Hide avatars in user and room mentions": "Skryť avatarov pri zmienkach miestností a používateľov",
+    "Hide avatars in user and room mentions": "Skryť profilové obrázky pri zmienkach miestností a používateľov",
     "Disable big emoji in chat": "Zakázať veľké Emoji v konverzácii",
     "Mirror local video feed": "Zrkadliť lokálne video",
     "Disable Peer-to-Peer for 1:1 calls": "Zakázať P2P počas priamych volaní",

From bf0d03bce364521e760e37ec8ccdf2b0b16a114e Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Wed, 6 Jun 2018 16:30:24 +0900
Subject: [PATCH 200/702] Import react as React in
 src/components/views/elements/DNDTagTile.js

Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
---
 src/components/views/elements/DNDTagTile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 9d8ecc1da6..7aa642986b 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 import TagTile from './TagTile';
 
+import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 
 export default function DNDTagTile(props) {

From 03d67988e86a9100a1463e3464fa5a35408bb1f0 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Wed, 6 Jun 2018 13:40:48 +0000
Subject: [PATCH 201/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1188 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 0a254736b8..9d7f8901ab 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1188,5 +1188,7 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie.",
     "Yes, I want to help!": "Да, я хочу помочь!",
     "Reload widget": "Перезагрузить виджет",
-    "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть"
+    "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть",
+    "Can't leave Server Notices room": "Невозможно покинуть комнату для сервера по заметкам",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната для важных сообщений от сервера, потому ее не возможно покинуть."
 }

From 881e9a8070ea368482a59895619cb0bc23f7b8d4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 6 Jun 2018 16:00:16 +0100
Subject: [PATCH 202/702] js-sdk rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 96c37a61c8..6722cfc3c3 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.3",
+    "matrix-js-sdk": "0.10.4-rc.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From c8bf74350677f1b21e94dc1310437baa960b4eec Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 6 Jun 2018 16:06:44 +0100
Subject: [PATCH 203/702] Prepare changelog for v0.12.7-rc.1

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1951875ee..ae8f535cb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+Changes in [0.12.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7-rc.1) (2018-06-06)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6...v0.12.7-rc.1)
+
+ * Update from Weblate.
+   [\#1944](https://github.com/matrix-org/matrix-react-sdk/pull/1944)
+ * Import react as React in src/components/views/elements/DNDTagTile.js
+   [\#1943](https://github.com/matrix-org/matrix-react-sdk/pull/1943)
+ * Fix click on faded left/right/middle panel -> close settings
+   [\#1940](https://github.com/matrix-org/matrix-react-sdk/pull/1940)
+ * Add null-guard to support browsers that don't support performance
+   [\#1942](https://github.com/matrix-org/matrix-react-sdk/pull/1942)
+ * Support third party integration managers in AppPermission
+   [\#1455](https://github.com/matrix-org/matrix-react-sdk/pull/1455)
+ * Update pinned messages in real time
+   [\#1934](https://github.com/matrix-org/matrix-react-sdk/pull/1934)
+ * Expose at-room power level setting
+   [\#1938](https://github.com/matrix-org/matrix-react-sdk/pull/1938)
+
 Changes in [0.12.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.6) (2018-05-25)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6-rc.1...v0.12.6)

From 4834816a0625e0215e5f6a2bf8ba660e5f261cf1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 6 Jun 2018 16:06:45 +0100
Subject: [PATCH 204/702] v0.12.7-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6722cfc3c3..6add75f972 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.6",
+  "version": "0.12.7-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From c91e6cb530b3e1050b2248b831da23a0dc548060 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 7 Jun 2018 01:02:34 +0100
Subject: [PATCH 205/702] make click to insert nick work on join/parts, /me's
 etc

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                  |   1 +
 res/css/views/elements/_TextForEvent.scss |  19 +++
 src/TextForEvent.js                       | 158 +++++++++++++---------
 3 files changed, 113 insertions(+), 65 deletions(-)
 create mode 100644 res/css/views/elements/_TextForEvent.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 2734939ae3..3f36b6bbdf 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -59,6 +59,7 @@
 @import "./views/elements/_RoleButton.scss";
 @import "./views/elements/_Spinner.scss";
 @import "./views/elements/_SyntaxHighlight.scss";
+@import "./views/elements/_TextForEvent.scss";
 @import "./views/elements/_ToolTipButton.scss";
 @import "./views/globals/_MatrixToolbar.scss";
 @import "./views/groups/_GroupPublicityToggle.scss";
diff --git a/res/css/views/elements/_TextForEvent.scss b/res/css/views/elements/_TextForEvent.scss
new file mode 100644
index 0000000000..8d46cbf84c
--- /dev/null
+++ b/res/css/views/elements/_TextForEvent.scss
@@ -0,0 +1,19 @@
+/*
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_TextForEvent_username {
+    cursor: pointer;
+}
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 712150af4d..0cdaaac4ab 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -17,11 +17,28 @@ import MatrixClientPeg from './MatrixClientPeg';
 import CallHandler from './CallHandler';
 import { _t } from './languageHandler';
 import * as Roles from './Roles';
+import dis from "./dispatcher";
+import React from 'react';
+
+function onUsernameClick(e) {
+    dis.dispatch({
+        action: 'insert_mention',
+        user_id: e.target.id,
+    });
+}
+
+function makeUsernameSpan(mxid, text) {
+    return <span className="mx_TextForEvent_username" dir="auto" onClick={onUsernameClick} id={mxid}>{ text }</span>;
+}
 
 function textForMemberEvent(ev) {
     // XXX: SYJS-16 "sender is sometimes null for join messages"
     const senderName = ev.sender ? ev.sender.name : ev.getSender();
     const targetName = ev.target ? ev.target.name : ev.getStateKey();
+
+    const sender = makeUsernameSpan(ev.getSender(), senderName);
+    const target = makeUsernameSpan(ev.getStateKey(), targetName);
+
     const prevContent = ev.getPrevContent();
     const content = ev.getContent();
 
@@ -32,47 +49,48 @@ function textForMemberEvent(ev) {
             const threePidContent = content.third_party_invite;
             if (threePidContent) {
                 if (threePidContent.display_name) {
-                    return _t('%(targetName)s accepted the invitation for %(displayName)s.', {
-                        targetName,
+                    return _t('<target> accepted the invitation for %(displayName)s.', {
                         displayName: threePidContent.display_name,
+                    }, {
+                        target,
                     });
                 } else {
-                    return _t('%(targetName)s accepted an invitation.', {targetName});
+                    return _t('<target> accepted an invitation.', {}, {target});
                 }
             } else {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
-                    return _t('%(senderName)s requested a VoIP conference.', {senderName});
+                    return _t('<sender> requested a VoIP conference.', {}, {sender});
                 } else {
-                    return _t('%(senderName)s invited %(targetName)s.', {senderName, targetName});
+                    return _t('<sender> invited <target>.', {}, {sender, target});
                 }
             }
         }
         case 'ban':
-            return _t('%(senderName)s banned %(targetName)s.', {senderName, targetName}) + ' ' + reason;
+            return _t('<sender> banned <target>.', {}, {sender, target}) + ' ' + reason;
         case 'join':
             if (prevContent && prevContent.membership === 'join') {
                 if (prevContent.displayname && content.displayname && prevContent.displayname !== content.displayname) {
-                    return _t('%(oldDisplayName)s changed their display name to %(displayName)s.', {
-                        oldDisplayName: prevContent.displayname,
-                        displayName: content.displayname,
+                    return _t('<oldDisplayName> changed their display name to <displayName>.', {}, {
+                        oldDisplayName: makeUsernameSpan(ev.getStateKey(), prevContent.displayname),
+                        displayName: makeUsernameSpan(ev.getStateKey(), content.displayname),
                     });
                 } else if (!prevContent.displayname && content.displayname) {
-                    return _t('%(senderName)s set their display name to %(displayName)s.', {
-                        senderName: ev.getSender(),
-                        displayName: content.displayname,
+                    return _t('<sender> set their display name to <displayName>.', {}, {
+                        sender,
+                        displayName: makeUsernameSpan(ev.getSender(), content.displayname),
                     });
                 } else if (prevContent.displayname && !content.displayname) {
-                    return _t('%(senderName)s removed their display name (%(oldDisplayName)s).', {
-                        senderName,
-                        oldDisplayName: prevContent.displayname,
+                    return _t('<sender> removed their display name (<oldDisplayName>).', {
+                        sender,
+                        oldDisplayName: makeUsernameSpan(ev.getSender(), prevContent.displayname),
                     });
                 } else if (prevContent.avatar_url && !content.avatar_url) {
-                    return _t('%(senderName)s removed their profile picture.', {senderName});
+                    return _t('<sender> removed their profile picture.', {}, {sender});
                 } else if (prevContent.avatar_url && content.avatar_url &&
                     prevContent.avatar_url !== content.avatar_url) {
-                    return _t('%(senderName)s changed their profile picture.', {senderName});
+                    return _t('<sender> changed their profile picture.', {}, {sender});
                 } else if (!prevContent.avatar_url && content.avatar_url) {
-                    return _t('%(senderName)s set a profile picture.', {senderName});
+                    return _t('<sender> set a profile picture.', {}, {sender});
                 } else {
                     // suppress null rejoins
                     return '';
@@ -82,7 +100,7 @@ function textForMemberEvent(ev) {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
                     return _t('VoIP conference started.');
                 } else {
-                    return _t('%(targetName)s joined the room.', {targetName});
+                    return _t('<target> joined the room.', {}, {target});
                 }
             }
         case 'leave':
@@ -90,42 +108,42 @@ function textForMemberEvent(ev) {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
                     return _t('VoIP conference finished.');
                 } else if (prevContent.membership === "invite") {
-                    return _t('%(targetName)s rejected the invitation.', {targetName});
+                    return _t('<target> rejected the invitation.', {}, {target});
                 } else {
-                    return _t('%(targetName)s left the room.', {targetName});
+                    return _t('<target> left the room.', {}, {target});
                 }
             } else if (prevContent.membership === "ban") {
-                return _t('%(senderName)s unbanned %(targetName)s.', {senderName, targetName});
+                return _t('<sender> unbanned <target>.', {}, {sender, target});
             } else if (prevContent.membership === "join") {
-                return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason;
+                return _t('<sender> kicked <target>.', {}, {sender, target}) + ' ' + reason;
             } else if (prevContent.membership === "invite") {
-                return _t('%(senderName)s withdrew %(targetName)s\'s invitation.', {
-                    senderName,
-                    targetName,
-                }) + ' ' + reason;
+                return _t('<sender> withdrew <target>\'s invitation.', {}, {sender, target}) + ' ' + reason;
             } else {
-                return _t('%(targetName)s left the room.', {targetName});
+                return _t('<target> left the room.', {}, {target});
             }
     }
 }
 
 function textForTopicEvent(ev) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    return _t('%(senderDisplayName)s changed the topic to "%(topic)s".', {
-        senderDisplayName,
+    return _t('<sender> changed the topic to "%(topic)s".', {
         topic: ev.getContent().topic,
+    }, {
+        sender: makeUsernameSpan(ev.getSender(), senderDisplayName),
     });
 }
 
 function textForRoomNameEvent(ev) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    const sender = makeUsernameSpan(ev.getSender(), senderDisplayName);
 
     if (!ev.getContent().name || ev.getContent().name.trim().length === 0) {
-        return _t('%(senderDisplayName)s removed the room name.', {senderDisplayName});
+        return _t('<sender> removed the room name.', {}, {sender});
     }
-    return _t('%(senderDisplayName)s changed the room name to %(roomName)s.', {
-        senderDisplayName,
+    return _t('<sender> changed the room name to %(roomName)s.', {
         roomName: ev.getContent().name,
+    }, {
+        sender,
     });
 }
 
@@ -135,7 +153,9 @@ function textForMessageEvent(ev) {
     if (ev.getContent().msgtype === "m.emote") {
         message = "* " + senderDisplayName + " " + message;
     } else if (ev.getContent().msgtype === "m.image") {
-        message = _t('%(senderDisplayName)s sent an image.', {senderDisplayName});
+        message = _t('<sender> sent an image.', {}, {
+            sender: makeUsernameSpan(ev.getSender(), senderDisplayName),
+        });
     }
     return message;
 }
@@ -143,7 +163,9 @@ function textForMessageEvent(ev) {
 function textForCallAnswerEvent(event) {
     const senderName = event.sender ? event.sender.name : _t('Someone');
     const supported = MatrixClientPeg.get().supportsVoip() ? '' : _t('(not supported by this browser)');
-    return _t('%(senderName)s answered the call.', {senderName}) + ' ' + supported;
+    return _t('<sender> answered the call.', {}, {
+        sender: makeUsernameSpan(event.getSender(), senderName),
+    }) + ' ' + supported;
 }
 
 function textForCallHangupEvent(event) {
@@ -161,11 +183,14 @@ function textForCallHangupEvent(event) {
             reason = _t('(unknown failure: %(reason)s)', {reason: eventContent.reason});
         }
     }
-    return _t('%(senderName)s ended the call.', {senderName}) + ' ' + reason;
+    return _t('<sender> ended the call.', {}, {
+        sender: makeUsernameSpan(event.getSender(), senderName),
+    }) + ' ' + reason;
 }
 
 function textForCallInviteEvent(event) {
     const senderName = event.sender ? event.sender.name : _t('Someone');
+    const sender = makeUsernameSpan(event.getSender(), senderName);
     // FIXME: Find a better way to determine this from the event?
     let callType = "voice";
     if (event.getContent().offer && event.getContent().offer.sdp &&
@@ -173,43 +198,47 @@ function textForCallInviteEvent(event) {
         callType = "video";
     }
     const supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
-    return _t('%(senderName)s placed a %(callType)s call.', {senderName, callType}) + ' ' + supported;
+    return _t('<sender> placed a %(callType)s call.', {callType}, {sender}) + ' ' + supported;
 }
 
 function textForThreePidInviteEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    return _t('%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.', {
-        senderName,
+    return _t('<sender> sent an invitation to %(targetDisplayName)s to join the room.', {
         targetDisplayName: event.getContent().display_name,
+    }, {
+        sender: makeUsernameSpan(event.getSender(), senderName),
     });
 }
 
 function textForHistoryVisibilityEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
+    const sender = makeUsernameSpan(event.getSender(), senderName);
     switch (event.getContent().history_visibility) {
         case 'invited':
-            return _t('%(senderName)s made future room history visible to all room members, '
-                + 'from the point they are invited.', {senderName});
+            return _t('<sender> made future room history visible to all room members, '
+                + 'from the point they are invited.', {}, {sender});
         case 'joined':
-            return _t('%(senderName)s made future room history visible to all room members, '
-                + 'from the point they joined.', {senderName});
+            return _t('<sender> made future room history visible to all room members, '
+                + 'from the point they joined.', {}, {sender});
         case 'shared':
-            return _t('%(senderName)s made future room history visible to all room members.', {senderName});
+            return _t('<sender> made future room history visible to all room members.', {}, {sender});
         case 'world_readable':
-            return _t('%(senderName)s made future room history visible to anyone.', {senderName});
+            return _t('<sender> made future room history visible to anyone.', {}, {sender});
         default:
-            return _t('%(senderName)s made future room history visible to unknown (%(visibility)s).', {
-                senderName,
+            return _t('<sender> made future room history visible to unknown (%(visibility)s).', {
                 visibility: event.getContent().history_visibility,
+            }, {
+                sender,
             });
     }
 }
 
 function textForEncryptionEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).', {
-        senderName,
+    return _t('<sender> turned on end-to-end encryption (algorithm %(algorithm)s).', {
         algorithm: event.getContent().algorithm,
+    }, {
+        sender: makeUsernameSpan(event.getSender(), senderName),
     });
 }
 
@@ -241,10 +270,11 @@ function textForPowerEvent(event) {
         const to = event.getContent().users[userId];
         if (to !== from) {
             diff.push(
-                _t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {
-                    userId,
+                _t('<user> from %(fromPowerLevel)s to %(toPowerLevel)s', {
                     fromPowerLevel: Roles.textualPowerLevel(from, userDefault),
                     toPowerLevel: Roles.textualPowerLevel(to, userDefault),
+                }, {
+                    user: makeUsernameSpan(userId, userId),
                 }),
             );
         }
@@ -252,19 +282,23 @@ function textForPowerEvent(event) {
     if (!diff.length) {
         return '';
     }
-    return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
-        senderName,
+    return _t('<sender> changed the power level of %(powerLevelDiffText)s.', {
         powerLevelDiffText: diff.join(", "),
+    }, {
+        sender: makeUsernameSpan(event.getSender(), senderName),
     });
 }
 
 function textForPinnedEvent(event) {
-    const senderName = event.getSender();
-    return _t("%(senderName)s changed the pinned messages for the room.", {senderName});
+    const senderName = event.sender ? event.sender.name : event.getSender();
+    const sender = makeUsernameSpan(event.getSender(), senderName);
+    return _t("<sender> changed the pinned messages for the room.", {}, {sender});
 }
 
 function textForWidgetEvent(event) {
-    const senderName = event.getSender();
+    const senderName = event.sender ? event.sender.name : event.getSender();
+    const sender = makeUsernameSpan(event.getSender(), senderName);
+
     const {name: prevName, type: prevType, url: prevUrl} = event.getPrevContent();
     const {name, type, url} = event.getContent() || {};
 
@@ -278,18 +312,12 @@ function textForWidgetEvent(event) {
     // equivalent to that condition.
     if (url) {
         if (prevUrl) {
-            return _t('%(widgetName)s widget modified by %(senderName)s', {
-                widgetName, senderName,
-            });
+            return _t('%(widgetName)s widget modified by <sender>', {widgetName}, {sender});
         } else {
-            return _t('%(widgetName)s widget added by %(senderName)s', {
-                widgetName, senderName,
-            });
+            return _t('%(widgetName)s widget added by <sender>', {widgetName}, {sender});
         }
     } else {
-        return _t('%(widgetName)s widget removed by %(senderName)s', {
-            widgetName, senderName,
-        });
+        return _t('%(widgetName)s widget removed by <sender>', {widgetName}, {sender});
     }
 }
 

From 89b927e2784e592dcc022e0454a3a7cf22021143 Mon Sep 17 00:00:00 2001
From: Silvano <silvano87@yahoo.it>
Date: Thu, 7 Jun 2018 15:27:19 +0000
Subject: [PATCH 206/702] Translated using Weblate (Italian)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index fa22725f78..bb931e17ea 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1184,5 +1184,12 @@
     "Terms and Conditions": "Termini e condizioni",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
     "Review terms and conditions": "Leggi i termini e condizioni",
-    "Muted Users": "Utenti silenziati"
+    "Muted Users": "Utenti silenziati",
+    "Message Replies": "Risposte",
+    "Message Pinning": "Messaggi appuntati",
+    "Mirror local video feed": "Feed video dai ripetitori locali",
+    "Replying": "Rispondere",
+    "Popout widget": "Oggetto a comparsa",
+    "Failed to indicate account erasure": "Impossibile indicare la cancellazione dell'account",
+    "Bulk Options": "Opzioni applicate in massa"
 }

From 0b9b03c9ee4a357b4756dfe55d9343e131641e4a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 7 Jun 2018 22:01:27 +0100
Subject: [PATCH 207/702] re-run checkIfAlone if a member change occurred in
 the active room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c5f6a75cc5..0c62f5a874 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -672,6 +672,7 @@ module.exports = React.createClass({
         }
 
         this._updateRoomMembers();
+        this._checkIfAlone(this.state.room);
     },
 
     onRoomMemberMembership: function(ev, member, oldMembership) {

From 92c146bcacb578b2ee73c9e633d5d819c4208d25 Mon Sep 17 00:00:00 2001
From: Yao Wei <mwei@lxde.org>
Date: Thu, 7 Jun 2018 08:29:20 +0000
Subject: [PATCH 208/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 80dce1cc2d..3677b78ec9 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -152,7 +152,7 @@
     "Server unavailable, overloaded, or something else went wrong.": "伺服器可能不可用、超載，或者其他東西出錯了.",
     "Session ID": "會話 ID",
     "%(senderName)s set a profile picture.": "%(senderName)s 設置了頭像。.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將暱稱改為了 %(displayName)s。.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將他的暱稱改成 %(displayName)s。.",
     "Settings": "設定",
     "Show panel": "顯示側邊欄",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小時制顯示時間戳 （如：下午 2:30）",
@@ -193,11 +193,11 @@
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 更改了聊天室 %(roomName)s　圖像",
     "Cancel": "取消",
     "Custom Server Options": "自訂伺服器選項",
-    "Dismiss": "無視",
+    "Dismiss": "關閉",
     "Mute": "靜音",
     "Notifications": "通知",
     "Operation failed": "操作失敗",
-    "powered by Matrix": "由 Matrix 架設",
+    "powered by Matrix": "由 Matrix 提供",
     "Remove": "移除",
     "unknown error code": "未知的錯誤代碼",
     "OK": "確定",
@@ -250,7 +250,7 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "您確定您要想要離開房間 '%(roomName)s' 嗎？",
     "Bans user with given id": "禁止有指定 ID 的使用者",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "無法連線到家伺服器 - 請檢查您的連線，確保您的<a>家伺服器的 SSL 憑證</a>可被信任，而瀏覽器擴充套件也沒有阻擋請求。",
-    "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他們的基本資料圖片。",
+    "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他的基本資料圖片。",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 變更了 %(powerLevelDiffText)s 權限等級。",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 將房間名稱變更為 %(roomName)s。",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 已經移除了房間名稱。",
@@ -381,8 +381,8 @@
     "Rejoin": "重新加入",
     "Remote addresses for this room:": "此房間的遠端地址：",
     "Remove Contact Information?": "移除聯絡人資訊？",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他們的顯示名稱 (%(oldDisplayName)s)。",
-    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他們的基本資寮圖片。",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他的顯示名稱 (%(oldDisplayName)s)。",
+    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他的基本資料圖片。",
     "Remove %(threePid)s?": "移除 %(threePid)s？",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s 請求了一次 VoIP 會議。",
     "Results from DuckDuckGo": "DuckDuckGo 的結果",
@@ -962,7 +962,7 @@
     "Community IDs cannot not be empty.": "社群 ID 不能為空。",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
     "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他們的顯示名稱為 %(displayName)s 。",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。",
     "Failed to set direct chat tag": "設定直接聊天標籤失敗",
     "Failed to remove tag %(tagName)s from room": "從聊天室移除標籤 %(tagName)s 失敗",
     "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗",

From b8cc438cb363c74e646efbeb1df2037de66e03ce Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 6 Jun 2018 15:35:30 +0000
Subject: [PATCH 209/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1188 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9d7f8901ab..dcde72d23a 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1189,6 +1189,6 @@
     "Yes, I want to help!": "Да, я хочу помочь!",
     "Reload widget": "Перезагрузить виджет",
     "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть",
-    "Can't leave Server Notices room": "Невозможно покинуть комнату для сервера по заметкам",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната для важных сообщений от сервера, потому ее не возможно покинуть."
+    "Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть."
 }

From 62978b7a2b49747999927d52e5123d8dee5a432a Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Thu, 7 Jun 2018 13:57:55 +0000
Subject: [PATCH 210/702] Translated using Weblate (Swedish)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 8e5d8e2f21..14940ed1c3 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -149,7 +149,7 @@
     "Add": "Lägg till",
     "Admin Tools": "Admin-verktyg",
     "Alias (optional)": "Alias (valfri)",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till servern - kontrollera anslutningen, försäkra att din <a>hemservers TLS-certifikat</a> är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till hemservern - kontrollera anslutningen, se till att <a>hemserverns SSL-certifikat</a> är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.",
     "<a>Click here</a> to join the discussion!": "<a>Klicka här</a> för att gå med i diskussionen!",
     "Close": "Stäng",
@@ -290,7 +290,7 @@
     "Register": "Registrera",
     "%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.",
     "Reject invitation": "Avböj inbjudan",
-    "Rejoin": "Gå med tillbaka",
+    "Rejoin": "Gå med igen",
     "Remote addresses for this room:": "Fjärradresser för det här rummet:",
     "Remove Contact Information?": "Ta bort kontaktuppgifter?",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s tog bort sitt visningsnamn (%(oldDisplayName)s).",
@@ -326,7 +326,7 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s bjöd in %(targetDisplayName)s med i rummet.",
     "Server error": "Serverfel",
     "Server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad",
-    "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så timade sökningen ut :(",
+    "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så tog sökningen för lång tid :(",
     "Server may be unavailable, overloaded, or the file too big": "Servern kan vara otillgänglig, överbelastad, eller så är filen för stor",
     "Server may be unavailable, overloaded, or you hit a bug.": "Servern kan vara otillgänglig, överbelastad, eller så stötte du på en bugg.",
     "Server unavailable, overloaded, or something else went wrong.": "Servern är otillgänglig, överbelastad, eller så gick något annat fel.",
@@ -347,7 +347,7 @@
     "Start Chat": "Starta en chatt",
     "Cancel": "Avbryt",
     "Create new room": "Skapa nytt rum",
-    "Custom Server Options": "Egna serverinställningar",
+    "Custom Server Options": "Anpassade serverinställningar",
     "Dismiss": "Avvisa",
     "powered by Matrix": "drivs av Matrix",
     "Room directory": "Rumskatalog",
@@ -380,7 +380,7 @@
     "The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' överskrider serverns största tillåtna filstorlek",
     "The file '%(fileName)s' failed to upload": "Filen '%(fileName)s' kunde inte laddas upp",
-    "Online": "Aktiv",
+    "Online": "Online",
     "Unnamed room": "Namnlöst rum",
     "World readable": "Alla kan läsa",
     "Guests can join": "Gäster kan bli medlem i rummet",
@@ -467,7 +467,7 @@
     "Room not found": "Rummet hittades inte",
     "Messages containing my display name": "Meddelanden som innehåller mitt namn",
     "Messages in one-to-one chats": "Meddelanden i privata chattar",
-    "Unavailable": "Inte tillgänglig",
+    "Unavailable": "Otillgänglig",
     "View Decrypted Source": "Visa dekrypterad källa",
     "Failed to update keywords": "Det gick inte att uppdatera nyckelorden",
     "remove %(name)s from the directory.": "ta bort %(name)s från katalogen.",
@@ -503,7 +503,7 @@
     "Saturday": "lördag",
     "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta",
     "Direct Chat": "Direkt-chatt",
-    "The server may be unavailable or overloaded": "Servern kan vara överbelastad eller inte tillgänglig",
+    "The server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad",
     "Reject": "Avböj",
     "Failed to set Direct Message status of room": "Det gick inte att ställa in direktmeddelandestatus för rummet",
     "Monday": "måndag",
@@ -561,7 +561,7 @@
     "View Source": "Visa källa",
     "Thank you!": "Tack!",
     "Quote": "Citera",
-    "Collapse panel": "Kollapsa panel",
+    "Collapse panel": "Dölj panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Med din nuvarande webbläsare kan appens utseende vara helt fel, och vissa eller alla egenskaper kommer nödvändigtvis inte att fungera. Om du ändå vill försöka så kan du fortsätta, men gör det på egen risk!",
     "Checking for an update...": "Letar efter uppdateringar...",
     "There are advanced notifications which are not shown here": "Det finns avancerade aviseringar som inte visas här",
@@ -638,7 +638,7 @@
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
     "%(duration)sd": "%(duration)sd",
-    "Online for %(duration)s": "Aktiv i %(duration)s",
+    "Online for %(duration)s": "Online i %(duration)s",
     "Idle for %(duration)s": "Inaktiv i %(duration)s",
     "Offline for %(duration)s": "Offline i %(duration)s",
     "Idle": "Inaktiv",
@@ -854,7 +854,7 @@
     "Drop here to demote": "Släpp här för att göra till låg prioritet",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Du är inte i något rum ännu! Tryck <CreateRoomButton> för att skapa ett rum eller <RoomDirectoryButton> för att bläddra i katalogen",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Vill du <acceptText>acceptera</acceptText> eller <declineText>avböja</declineText> denna inbjudan?",
-    "You have been invited to join this room by %(inviterName)s": "Du har blivit inbjuden att gå med i rummet av %(inviterName)s",
+    "You have been invited to join this room by %(inviterName)s": "Du har blivit inbjuden till rummet av %(inviterName)s",
     "Kick this user?": "Kicka användaren?",
     "To send messages, you must be a": "För att skicka meddelanden, måste du vara",
     "To invite users into the room, you must be a": "För att bjuda in användare i rummet, måste du vara",
@@ -1056,7 +1056,7 @@
     "Leave Community": "Lämna community",
     "Unable to leave community": "Det gick inte att lämna community",
     "Community Settings": "Community-inställningar",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Ändringar på <bold1>namn</bold1> och <bold2>avatar</bold2> som gjorts i din community kommer eventuellt inte synas för andra användare i upp till 30 minuter.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Det kan dröja upp till 30 minuter innan ändringar på communityns <bold1>namn</bold1> och <bold2>avatar</bold2> blir synliga för andra användare.",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Dessa rum visas för community-medlemmar på community-sidan. Community-medlemmar kan gå med i rummen genom att klicka på dem.",
     "Add rooms to this community": "Lägg till rum i denna community",
     "%(inviter)s has invited you to join this community": "%(inviter)s har bjudit in dig till denna community",

From 074051297aece72b773f6945f45dafb62997b430 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:11:43 +0100
Subject: [PATCH 211/702] add a ShareDialog for sharing users,groups and rooms

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                |   1 +
 res/img/icons-share.svg                     |   6 +
 res/img/matrix-m.svg                        |  15 ++
 res/img/social/email-1.png                  | Bin 0 -> 2510 bytes
 res/img/social/facebook.png                 | Bin 0 -> 1201 bytes
 res/img/social/linkedin.png                 | Bin 0 -> 1366 bytes
 res/img/social/reddit.png                   | Bin 0 -> 2279 bytes
 res/img/social/twitter-2.png                | Bin 0 -> 1519 bytes
 src/components/views/dialogs/ShareDialog.js | 211 ++++++++++++++++++++
 9 files changed, 233 insertions(+)
 create mode 100644 res/img/icons-share.svg
 create mode 100644 res/img/matrix-m.svg
 create mode 100644 res/img/social/email-1.png
 create mode 100644 res/img/social/facebook.png
 create mode 100644 res/img/social/linkedin.png
 create mode 100644 res/img/social/reddit.png
 create mode 100644 res/img/social/twitter-2.png
 create mode 100644 src/components/views/dialogs/ShareDialog.js

diff --git a/package.json b/package.json
index 96c37a61c8..15080456fe 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",
+    "qrcode-react": "^0.1.16",
     "querystring": "^0.2.0",
     "react": "^15.6.0",
     "react-addons-css-transition-group": "15.3.2",
diff --git a/res/img/icons-share.svg b/res/img/icons-share.svg
new file mode 100644
index 0000000000..b27616d5d5
--- /dev/null
+++ b/res/img/icons-share.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 481.6 481.6" style="enable-background:new 0 0 481.6 481.6;" xml:space="preserve" width="16px" height="16px">
+<g>
+	<path stroke="#76CFA6" stroke-width="5" d="M381.6,309.4c-27.7,0-52.4,13.2-68.2,33.6l-132.3-73.9c3.1-8.9,4.8-18.5,4.8-28.4c0-10-1.7-19.5-4.9-28.5l132.2-73.8   c15.7,20.5,40.5,33.8,68.3,33.8c47.4,0,86.1-38.6,86.1-86.1S429,0,381.5,0s-86.1,38.6-86.1,86.1c0,10,1.7,19.6,4.9,28.5   l-132.1,73.8c-15.7-20.6-40.5-33.8-68.3-33.8c-47.4,0-86.1,38.6-86.1,86.1s38.7,86.1,86.2,86.1c27.8,0,52.6-13.3,68.4-33.9   l132.2,73.9c-3.2,9-5,18.7-5,28.7c0,47.4,38.6,86.1,86.1,86.1s86.1-38.6,86.1-86.1S429.1,309.4,381.6,309.4z M381.6,27.1   c32.6,0,59.1,26.5,59.1,59.1s-26.5,59.1-59.1,59.1s-59.1-26.5-59.1-59.1S349.1,27.1,381.6,27.1z M100,299.8   c-32.6,0-59.1-26.5-59.1-59.1s26.5-59.1,59.1-59.1s59.1,26.5,59.1,59.1S132.5,299.8,100,299.8z M381.6,454.5   c-32.6,0-59.1-26.5-59.1-59.1c0-32.6,26.5-59.1,59.1-59.1s59.1,26.5,59.1,59.1C440.7,428,414.2,454.5,381.6,454.5z" fill="#76cfa6"/>
+</g>
+</svg>
diff --git a/res/img/matrix-m.svg b/res/img/matrix-m.svg
new file mode 100644
index 0000000000..ccb1df0fc5
--- /dev/null
+++ b/res/img/matrix-m.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 520 520" style="enable-background:new 0 0 520 520;" xml:space="preserve">
+<rect width="100%" height="100%" fill="#FFFFFF"/>
+<path d="M13.7,11.9v496.2h35.7V520H0V0h49.4v11.9H13.7z"/>
+<path d="M166.3,169.2v25.1h0.7c6.7-9.6,14.8-17,24.2-22.2c9.4-5.3,20.3-7.9,32.5-7.9c11.7,0,22.4,2.3,32.1,6.8
+	c9.7,4.5,17,12.6,22.1,24c5.5-8.1,13-15.3,22.4-21.5c9.4-6.2,20.6-9.3,33.5-9.3c9.8,0,18.9,1.2,27.3,3.6c8.4,2.4,15.5,6.2,21.5,11.5
+	c6,5.3,10.6,12.1,14,20.6c3.3,8.5,5,18.7,5,30.7v124.1h-50.9V249.6c0-6.2-0.2-12.1-0.7-17.6c-0.5-5.5-1.8-10.3-3.9-14.3
+	c-2.2-4.1-5.3-7.3-9.5-9.7c-4.2-2.4-9.9-3.6-17-3.6c-7.2,0-13,1.4-17.4,4.1c-4.4,2.8-7.9,6.3-10.4,10.8c-2.5,4.4-4.2,9.4-5,15.1
+	c-0.8,5.6-1.3,11.3-1.3,17v103.3h-50.9v-104c0-5.5-0.1-10.9-0.4-16.3c-0.2-5.4-1.3-10.3-3.1-14.9c-1.8-4.5-4.8-8.2-9-10.9
+	c-4.2-2.7-10.3-4.1-18.5-4.1c-2.4,0-5.6,0.5-9.5,1.6c-3.9,1.1-7.8,3.1-11.5,6.1c-3.7,3-6.9,7.3-9.5,12.9c-2.6,5.6-3.9,13-3.9,22.1
+	v107.6h-50.9V169.2H166.3z"/>
+<path d="M506.3,508.1V11.9h-35.7V0H520v520h-49.4v-11.9H506.3z"/>
+</svg>
diff --git a/res/img/social/email-1.png b/res/img/social/email-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..193cb659da5d4adff51376f3fc75cc8609c803fd
GIT binary patch
literal 2510
zcmV;<2{HDGP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU*U`a$lRCwCd
zTWM@m*A+gV&BJ)W!NlND9E-Bp0g+}a5lPclX`@t01Vvq9MO8@zLRpGP@~akfQ;VXs
z1%=X(3SptBDoU4>HtMRhk?0buDKu#&buo5IY}eF4AYO)9Jd1n2=li0!+-J|d^Tv3N
zbTszZ@4j=+J<E5_eXr)jT^Fgs)X4lX=2qsF%<IJW_>733CzuoBXMFZC_b?x4zEDZw
zLKRx~X6DZ_-)m8LI*N#E$nr@RgZ!HLXUr%47PQ7k4~R2wXWq)Zrb348X6|G@#GLeF
z!GI5I)HCm5?q}XxLFGxTy;t08m$>&8HNb<+z0BWYZlKwt264|`A;YX2U^(-v%tu6$
zyHeCBWO!91*jX_ElG~fi8))tjWO-f4R#5{W{(dSF-dv-&knNdD7yxDJN6b&s+^3yF
z)`(v?Ajtf4QPZo19uO5`6LX<l57=8}%A0hrkiD!B*eYDAT4|@yK`R74!hFzAX;#+-
z>DKx%wM2u)&yA4)EecQV!F#z$IyX_ET#>PFGEaXW&C%=Qc}f)~%f0PE(O3LM1qxrw
ze8P_!-!d;q8yjosp2o=g%9ct+*8Oj6h{Ho^O0Y4?AT(6BFb|Y!fIkZl(53~U8hWHT
zMw=JcQlO@M@A=1Ao(>G8=wC@~L%;*>D8&GXnZvqw3A3`FYl_mgW%DQ=lxu!ATcq<7
zMLLtVC+OwuEzQw@r>DRpzQ;y5`oD~>c-urX<!OKhfv>f2eT)@;dUf20b0?j?T%bQ*
znxI#h`_qLPbHxT;<MV7t<OwHXov-#LDW{$uE-|kXpVB0_Q&)Kiy1#8ct&9b2-w$RA
zbZ{VT2wf_{Sl}0iv$Tmr=;3C&H+`ZZLirVO`bwX2N8BKE{F=-I;-bw|Hb66H^=Ge}
zPffM<-Fj{?P0ycA8?IXpVf}rraU-Ex>F|Hkbck8Q3tG&1f>q+}I?5y2J<}GqDW7GH
zJ5DF*$WZypn_jf#tua>uM4q{6K}g37w#$IfRvqEKu`+J#kX89d|2?kc@}&^)z>_`W
zbP+(oLLJNNbgIl&XAZboXOe>wcl%ZLgtx2ra!EBCLSG*b8JR!KzpUWgG0fFrgcTgj
z6zT1B-T+5d!teXuNztBFaU0IKYf*%L|E`k3*9e_Yng+OE$Mqk(HfH<ohi5bNr}w58
z<c9eny8oJ}Q7OF2q)C0L0{!;gEFC+SrKCWF@T_fIMV4Fg!REzLRRfp}(@8S~KBZhx
zIsRY-li-@2L+NP|;kUU&9$LG=$l^084?;!R!A4#h4cM>%3~eRk0cQd(f$lOx07+q;
z%9Riv@YYJt4`n=YJ9ZoRAQn^)Rw#TXWycNhvfN~y0lG~35PQ~eR>=#Xa|6tFr>amJ
zIrgo}Twql9;yF1wLwxRIe4wK|Xee870iLn^B;y2oo>>>yI^wt!SG6kp&LaD;<(KEP
zQdG8%cjfC`CBilG(sqQsrfVc;gwI0$r+uySX{|$%Gajh%G<${hf31~Bfm)RffLL=1
z`HH0ELFsRLD31<r7eiU>q&34Yl=J}o>7u;7n<%=HvIeaQsg^&)nzJ<ZrQEx;c}bL(
z*2-}_ly?Fogh-PF_rINzdqCE)K&@WO*@`<hDP<1F?kAEt>F#e?8g+dSSAXh1m!;@%
z8E1N#4*eOq0YWuC^w`|O1W56C$%)5hF1ntxzO0M;2{$)Zx3{h95yM_Nz*$B|@<km3
z!~>)_<9E8XGZu|m+Cuq6`VSYq%hWQ70kF1LX<h6v@c9XS11OO*QKcmQyf*Gu2DxG|
z<2?tst}ZA=f?m|-`2X%?K`RCVq<G96a|CKuVt^$Pw=x)bdJz)XddU#Q%V4NP&a(H$
zcuq(EBn&XBaz#NRyp!q`OHzANtrRE?WaMsrH{%fNZIN83^Ol(mFsyP#+7Xj7Wed{W
z5tL?mB+G|BFi(1~QAuKhp)e}5(u>?IY0e!kzyLieS2+7|DCVT$Y(d&R-g9-W%awny
z#v3MwC8cg>OUzbbfI!hLYEmDHdbjFy#@dRuNs<>5k_?*e{$QOk@I-Tia(W*(R3?H$
zE^&qvTIXL~$i6>6c)Vq5%<deEIX6Xt5+PL&z_8<^mNK`xE@bSWwOqZ-<?imQBhn#A
zds9@p?swiv(PPaqqbIO7T`&q}0UNFgyGrnhv79k;EQ5Nm;&GKL{^^+ZK;AnRhF$II
z8ww{mh~byGq3RlS;{+J;GfQfv%0F=`S?<j7I9A26QKHl<-c06=(UpBP=H6A{{psqy
z+3P<$kfNv0TsD3`(4TgV!MqFx<+J5!pD>f4(a@<3C@`jSPGoLyG)X{lTM}b*jCa<F
z=Ah$mc#Q|&8e<pE*b?l+-DAe?%77FU|3YHaFj%(yakHVbc`mRXU23UU;^^uZH`d#d
z7BKr4Sz(!A2$L1DDFfvvCrhf?NRDQO8RK$zHd`d0=~m{~tOp~fRAvJhh&nqyw7NJC
zr~*RbZ!@8=Nu4Sy92!iy&iF9wM5(F*>a_L(COxMDixI~iz3xQxz%^0&Zfjh71~>~e
zDs*)j0KU6l2}W@&fBCfglomMQ==Jpm(9wN10Qp5@)Ljbgw>E&j9FGH}VE!kY%OQCk
zJC`xQ(M*X9Lynskgz0w16&So?cIb0XaUGA#9*}s1G@cE@ZauXs?i!dnOBveYAvT0{
zGK5(mps^F|AiO?#V#JS<XVRlq_xCaYNb3<9l)HA$0b7>N)1A_~=!sL~^w*J`A4`?|
zhzyBxc!D$^iA4hZG~;;Sew{eRh67FmM0NS2JmTmUS>H3=3llgneWBbtqbvM)L)eJz
zMeHJVY#irtIzSZQHBN=Q8EPZ;lZ8n?W51pG$Fe`n^v1{m<}Xoo)AyNoOg9spjvi+|
zTE)sA6*`cv0RZ(LV*XtfD*v*Oz3hjj(WGzkilI45ko7(xJC$ny(+KS%o~j|{+e=Yi
z#Q-Ml5R1>nmM<w}+o5t%K-0Z$WbT?n%6AEwl*3fF+rX=>x6#zIx0kM<;+KRBw+WeO
zwhUnHtI=HSA;l9WA6nWy;@+L*EEMo*7k1Os<EI^@IA+(F<aCI8?e@d_YAW>hIA)A^
zhi@ZkJcA@r`X!ordHOZK1+AHd*XNr=XNkwsRtkee$o*(uLX@r^5zh(H!3|eZxc>_<
Y02w!UWX_nGYybcN07*qoM6N<$f{u#A1poj5

literal 0
HcmV?d00001

diff --git a/res/img/social/facebook.png b/res/img/social/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a29e3820aa997e5bc06d42995891ce570defd25
GIT binary patch
literal 1201
zcmV;i1Wx;jP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$LrFwIRCwCt
zTW?5HQ4~ME&6#DHLqjW+Kr=Ky$ihg3Kne;YKNJ+!hhk!VP!xkm@?-xH6a_H~q)!TB
z^dX1@OBjfPP(cG}sF8vp8OzzoG=<J_XYktQ+V<Xkd-MI^#~b?Iz32Siz31L@?|n&i
z4_<>{WFb!?3z7NA68<|~E&O{8>Ez#ZokqHl4&<Up<IIA}wIMGet7Hy`gN2^~*%f4h
zyh1)lzSFY+X~;UH9a*Gexh2dy$Vp@`@+s1*M&XhQWuznTB4?59Dmx#DBCcbW>r9Wg
z0N0RH$a_dDXa_6TImI?;F2Et=81fkhxp*OqZ5ZPKtBC*<+&&^tfPO%>d|=yz3PAmD
zkOQ9HkjA!kiV%Q?sXk;g=pT)2t3|D0(1d)!V|t>XhDV5M<c87~(4Jt<`%%TVE9wGv
zZc>SgM)o15E>MB&5i<WaNpSq=ey|<M2J4<3kdwJ}Oug}NNNIIFoL7uSBS0?qdyCr6
zAIRDbH!qaJzKoq(wE_$Katt{aX&2}dF~OlXed|h@md?v3Ons5Y06RB-)p7M~G3-iB
zj#oUW2o(>c5OeG{5w+(Z%-Cd{(H5AqNFk!8kff%pI7bhof;DhdlLDra^`dG%oNEQ0
zpk6+emkUrQGNsMjo2nN9tn6#hFlZN5qm+~c$!1g7d;Y9%z~EaKIH$jXd-=C$5y;mL
zc?+<Cz?Ga7i|N1j3=Dq)$NM=goCo&RCKupRyxXO7W>M=ZYvcl)iMIf&YwKE9dD<@k
z1%(nY9>`}a2~Y{fMJ0^_g(6DsY(534Ddwo|55&sqIy7~>5h*~SBuW4^@a3yV_-G)3
z*o_QDn3?|}x{A#fkS(I*WV7;3r@4h?;b}5inJ%JaTJ=$i&+|*71xS-XpKJW^eQ5=L
z{#p|*fT->9ptZawE#c={6zwVMYYl1vUNA1aB!I{00xTF<fJG9(WnclONq|WM3*a<*
z3viJD4g(9|AOUD8#%aXn?+=265d#V^;-3f+`VA;Rzg&O`g9Squ`~1(wNUwne=#}RJ
zempkFwAjPG1_?k(QI`P(=#nRZQiy-Lx3Tl?z?UqAxS@3$3(y+)f<vuaQU4g-hR%=5
z`+hh92(_@i7D~MA6GSS2YpVwm6t!E;bHc3&4uJ1qkt(M~R5<S!E4tYih^7Vj(UjoR
z<bL)6VikZ68ec~aC7|=eY`fya(zG~V9j+Pa5M=8)wjGoT;1}UC_b0uhn{AC~S0&p0
zs|GGyk3*!FZEJ|;At}b@Rf-(fk@MqhQ`Frw)*Vdxw6&ba*Lda*ZnmMEZ33+XkmuC}
z$om?n(jKm}K<PS$q|#fUBqI;m0%BK|TwF(9sKh1~m{oo&kC<iP`-bm4C_jQjPQL`-
z$I}yPD=KPxe1dr!d?!$7N=?Vo@>viI1Ru?F^3dht{_NxoPUzm{UjYUHqC(z?^D_)0
P00000NkvXXu0mjf5Z)l0

literal 0
HcmV?d00001

diff --git a/res/img/social/linkedin.png b/res/img/social/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b868a585ba59ca2f716f0a21254ccbdb3c95438
GIT binary patch
literal 1366
zcmV-c1*!UpP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$=t)FDRCwCt
zTU}@rR}?-wu9GHivvKX#h&3^(5=>b&2Be0RqO@45R0W~Mz9=g~i=y;FTI@p~6pB_*
z2nv=^U$UiG`cT>;6hc$dSOQVWmXsx_t+iFtXzH3pV-nMzGdUyU?##OLx4E<P!N*Q!
za_^k;&AIoUd*@DIYoZHWMilunvH`ga8RPTxEA#OLGRepEJA_Oj$+!_WjSIR|Z!>Z`
za+Aj4e2}>eXnsK>$hXKZk$oZy5JK)j#*vK<)*EBKj~qa@BhMf+PE;;AP)8Vf2zeEG
z++pXl(a86>%J&S<wg5YkgUG|k2ow(yzULs@P;>$6kUhxHxRaYLMA?QO?qG`|0CjHt
z$aNqN$d*fNo2vp)`#Z-So@fZMZ719ifQG3K<a;1K_Oq?BQ^VjK<X1eVdj&gqgxG?7
zXg30md(3$io7i?+O(4!8<yGuwA1n#biaZ70$0_#3lmIo{?&T5?KxSWR%yfbsg(Nr&
z%FAHqntE6ftyKR0b>uFby?6y~-+v&Q2vPRwr9vVgo-brnEUqkv6R$TzYfV%Uf=I`7
zZb`U8#7Jn>>klNI9Q$ZN<IKuB2+6qtMCW#_Tq<gFIGR0Yk#u^^f+jVqtE=){n=h&W
zk?c`T%1R~oLg{0#HkH>3u*b}lwtx7J;kC;*{}ow)2>Y5NK-^3%iT*zzGclEOp3c!V
z!4c0EpczcA<XlVNg9G37LC>{YaA$l%Asy2>x+XXp+2==jz?)WTq4EA$_kdUX0-7-O
zsS)rR_z$nDO@KOum=6UYpCcr|2JkO7P#@4>rDVtU7O0qOyq>b{^B+zBzZ3{4>2z#i
z71YfSK~M@nZPh$wWEswk<L@N=@=qFm`f~(sjNNxafCkF~IE|{OWcX-(OmSE*y$(fY
za+g(@WxkE6cITC0__S{b#-|?I8Vw|H_eDnGN&3bnUFQvBw|*gfvT+Smmd&*l0VF`R
z5cAcFGSg*fMtZQ-*7J*!0AcVjUU)VPFFyB-)#9Nb2(-q3e(<`IO;RQ~H9ZZBo-T*A
zix<Gw6-$&3(Fm_RUkyM1b<45<LZJQPZ}3g(@5jy!-X2pphNHl)rh3D&>WY*VP!q_A
zAixj54_mrMpy5@XW9c<#hDxPH5McU0<7;;xOg^!EP_iz-O)qqI_a>*@sCI+|NclJw
z9wGq-d@MlH?-7t90lIuFKo<!>`|y%}41cu~By{>vfKD|LA|!k$Ktd}(ug^Ne6#M+x
zdx3Tz3DB;c3#d3PN?PnP((G%F05mB&=>q{yYA1k_&c)FZc78PbAqRB67kCFsV{eci
z-qnV`UIeIpL3ar{-<|EekpP6<Ajm?AL&&gCP^bVYqXHhqZlgRW-!jS<$hH!2zKwkW
zvjPwfcsxx`un%BW0DAAV3whpy&VSFg+ukfqpR{es7e)etY~9SZgIxhs5#I7hpU}p(
zP89ObX4jJUapfWokr}papP53E#qerEUJ%In3v83=W@`1TG5WN%g~!*~oI8xN4J~XF
z6iWc@ym~qENRg+~X};%jyXzQ|Lr>vDWG(UoaCc=X#rLS?d)kh^pu<n)W9C|z`G)Te
zu)hU|oc<bSKA!G%T2Z%NkM}YU!psg7+N)37(w4CxGURT}OY+c_;`W^68Jw%{F8>!`
Y0BLR|kwK3)O8@`>07*qoM6N<$f)AK>P5=M^

literal 0
HcmV?d00001

diff --git a/res/img/social/reddit.png b/res/img/social/reddit.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd6131186f990ad2902c6d76165f5bf7e6457244
GIT binary patch
literal 2279
zcmV<D2pIQ?P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU)c}YY;RCwCl
zTX}30WfXtiVg&*S#d641j?!|<WjTc)DpU|qE28lawGGBdgGWROjYfliAR$_<m>AGR
zp+O)Z${7Muj+U!jg-U75B}dC?p+c=td_Ued?6jTT&au1Q?Mq%}I-U8x_uluu-#cbD
z>~7kt<Y$Uv9>pBX+>N=9x{hOnI<H{PRp&SsGUqdAGGFqia1H!4?m*^5=J7g(y-|dE
zhIB{L8DuT<3g#SN3mWD_4`{+XjX8<Ar=JX)$GnL7d*(7<4CwN~7!NVeW<Je4-;c_Z
z8hgH)YqpxZP7UxHa{==l=12-0MXEUqlnenkKxgJG<{uTv)fGi48L||>2E+gWx5Las
zDR>C798j|P)d1Lk%N5`S8#Pg~edP}WAWSV`evg8mW++)Be3b`;Gp|%JJyhrw6(J@u
z-*M^z^FvH|jm9h49c_Um<x-(aGn5Xt3^0Ou0fjy-P`X$$Ku5LjBkF+xB9ty2t$^T?
zI!<tEQm4LLCh@jz&)M+JQlbl-1a8kDx^Ajij8Zy1ZpHvf-dx6S^hkH2IG(l{%X;fN
z7r|#(Nv?=5aAn+!tLZVxa$ngsUegDOx(?zs?M<|L9?|*ZW@Z?nbX(-D8jMu=b!0%5
zAI<4}pE1V&`@4jwX-lHY+guc<5uG_A*W;ff8uGmS|L2)RcPq`zbd@<q9SuETM!=Pa
z;@~^1;GvB~Mf>D>>#ju6{bZFvIlsG=2kluU+oCO(0ByR6r<g0EpyMY-Ac$0QdO($L
z!1y%e1v%gN9np@Zq6qjP8{^lxas-tc?DZR$<=D8nm073jQ+d4srUiWU0ceeyvO}ID
zD%|72Y0t?qCcf(RhO9&T9`0>ot(2Z-WPqeP0Y1>FgP!jx+)GqmCfi}cy8?ba7|at>
zdF46VEh!?p@|V?_ld5CDKtFeKJk)Q>;Vyeo0LpLpmgt!jqAml3HM({|wvN5d5_Hbd
z4DeFm)04&$^6n}5kN0~4ev3aM>Nl3CRcE4#a-w2|6Spgz6ihi<7(|1kk6#oGa|v1l
zsUiHsop|M2)VvSzy|hGD_2Nl6o;&8xB|x{iFAM-bykZN%u^-#T$=}Gx^0rBq25Q-X
zhv)DXGgtttI^q8EGWS@K?F>+!#X7W!=uaN^)(yD^uj$-R#s{6}WT_~J=)ZD1Mra8G
zB&tq|c|z=cl7X~E+p5>$j{DYd;@MG*qtT_)L?`$2%AR7^Epi*lXj`<37Eg)pD^UW3
z9HC%08|@-d{{*538diM{<E>A(<1sJ70BA4IF&{*DrKWx+s|NJVSu58&^b&N|2twy>
zCOVpF2c;EA@>c0Fl9e7;)r&AD3<_`PJz8X{xJi_eYPL4eC>0<WYe^`ipHTj6p5)<B
zG@OU&ri;_ZcM<JeDlY7VfD3z9%QlFgD60=lLGEz+u*?l09QQU+_aQ_h8PC>yX(<}G
zEQdb;8ffP-xAKV32v7KX^Fj$*PL<aaRu@^~s=0y%m@6Sg<_7IvskUZ})sbUifHszZ
zPuqVQ=nPF1qhS9db%lHSi{N$3KXn^n_*6IcfZ!R{D5?QjdA)>*u%Cgz$jo4n0jgcN
z<p*OBLX;Sx1jQ=W22{1(kF<B)*F=*)l)Ru|mlRGQa|KZqlyQ;O9zReXG<*ut*tg^y
zar@X#<NFh)i-6z+6SbC^`(YGqK13tU6ArAmWdLiGpGCB5rGSwZ1~sD?QDvp^xzqbm
z9)lnQumIlTsi3N*DQf*SGiq_TJP3^lZ^aBi5pf!f^V-Pl{n!dxrMPV|(f+lz;tVjL
zl<d6f(trnm<SidZxLRnT&0ytzL>lA(_Oifx27m_?J3?kxc-=Kh!ySL%atQ{=xAkag
ziMug@o?Ts#Ru7cg{*0&)2FSB#yEBrYfRL^Rnve$|?qmBE7up>q*S-f};{0qmfAlFS
zWQ+)18>G+LYMCJ*`>-kA6Pw2-s;HFhq$iLM1K3a9kf*~7An4O?N@%Q6ImSo}8wC`U
zY8K_)rE$;8T$>Gg)^lnLgCb7=_(2Byl<B-7f{bwD`*Mz=1tCe_qlZzTO#I}kpoI|j
z?=8N@Alj%|O&mcbx%H=-{eDz`PrM=L>%OrS`}GYGO`<Kf4S*aVYniMZwnFpP(x=m!
z9Z&$PbaX419>ZksqF-Rt06`ZB`F`GZX?9jed{led3lxlLUwKXE`)`I&%kFjrO6Ub(
zWgsY&&tAcbWJ-nTsrdn8X}tq)Jp*_d>H`=J28EZw+nmv0q;&dMW5+D_2C5U<+%ST+
zx=2*e&O+X9t#>cD0*{FsE*&Cm+hALq&2y?efIm*}0iX|<zwk*D6#Eo!eDo*|;n5O9
z;RIt;Z;M4V5|4ngT3bvb&7+R|VfGzhZ8Vd4UUdT?9X?Aw`1<m`A<(?+IZBRUE_?U_
zJV5))(^j&P!ZEkkY9M_si3@4WANyn)tkjA9!oY>rU5MJms8x=38_DHzD~IF?KnMUV
zIpHL}d!sac0T>*w#{)+-UXQyBZb+s2OR0M0jSK+7%eEc$Q28B7H>%A5pk(sV_xM3V
zWlAS9Yk+)D4}>Tsdn)?8#in1F)9Zoq=}H%}Y5>qX%o!o9e1_72>>2<c8o$oGAq17*
zq-1yeu{5%gN#5Kj2nn)IP_mO#187E=8X}mGu4FZpMp{kKQ`F$W7$VD*Y$;YAa@lmR
z{><4yq<prL$?`U}`>QduVTY;sdbN&o`(!1Ht=6#9-wiHO#l`2U%nTHjsySn*+Q-j<
zHh{i>>cl*Y?6%p>cXDQ_xl(=MePMq3^*DNr`1lIV`&b_+{Ts=Tr}y|;(69jfd>&t*
z;9Grkox3T6L{QBxbgl|r`D#DsstT^ypThkwzyNr(v=B#;25kTU002ovPDHLkV1ko1
BJN^Iw

literal 0
HcmV?d00001

diff --git a/res/img/social/twitter-2.png b/res/img/social/twitter-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..84f8033a30c5cef33bb14ee59b5b8d5398b9162f
GIT binary patch
literal 1519
zcmV<L1rYj)P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%fk{L`RCwCt
zTYqRAMHGIwxo&=VP11|0u}Wgn)JRDD(W+nx3KdaoZJ|_J1krL55LzM%Vrc%;f>eqY
zO9dhH4@opc3o1&nPzZ!p18Iw=v9U2GwXM;_%UyaVX?jU~@A5XDm+fVDXLfJbe(-U}
z-QMhb-@ci7Z)VQ7qiYasMk(?!WDT+!S<j!-tIF?ZkYRpLuLH<_WEXPOPUHMGwYvei
z1GzcH;Y?8ZH<0oQDS~{3{1n;iW&r}oMq~(CE3w^r<{QX9WGnJRWL!q$ii9?bko%Cs
z$b*udPe(1^W0>z*lx+cCL|#C?g$#mo2=YBIunmq2P>DQ+Jj#PywouA8oZ<o25dmm$
z`yTlSxCdm*S+>nq0jU3V@_^?y1lYFs>=1yasW#-R;C?i*t*WePFb8>z=X9^&Ii4Z5
zA!kJ+;GoBx*RYvw7wQ5b4k@pqiG8rt1sae?jNYkwWiC8hQJj1w3|zei9}kVgP<$ra
zA{^nmqT7rB<=pQL4J1$BQ3x+om4M>=_p|lE0=RcoJ{<ie0^eMj$ff`)`|=?2qR}qU
zW;DT}C!X&7qPjjGgw~coRUkLpQBcZ085#pZ9R7wtVXx=>;tlY-$ID!iHZ<ss2Z~OP
zeZWks_Y~$We@#&yxC95%YZgUk)HGGp6!;Y>*Em>2HQh)6iqk#t|Hq!xR6bRJMu$t<
zY(_z&o&X`Zc@Rn$U<25@lH)eivd@c&&`vw=c5AL5Iv=eRZf7zv2j?fIp>sHz%rqqw
zOubqJJmrPQMzaZJnEUTv16%GCUJiUh>jE?=)O#s@DY<&SG6;7U3T2q&bC3ks<i$=*
zBJ8YKCECm;5}?MbBbiot3ZTZ*0{Al(AqHmy#mm#*p!iIXjDRw)3ebVmp=g;*0u*`C
z`C}KO@I!P;w3&b(+_}cDi#R4i6!s^6zY5=u{Vk)(fZqwj$F3#d<?nuT=X45^wwXPO
zI0+ED*##I8X<=q=e)$|eM{%nFqhwjXNDI@mbB2nT!WB7g6kvb^=o4vSWGZ3ky7j?)
zHwq9Ij({su*9~3w43@9rnX7d4lK@>JE&OOO87aR-l~KLPMi&V{=kUT-TR1m91qQ~!
zB(|3q!|t^uZi$4jHV6_<T5TmdGixd(rG3OV?^}~x*~zjHNuRY$upI=p!9T;ioHjy@
zf>v^x>u$3&<^DV|4WD0%!MTWV9nh|2f`lHC!LTnjEu%157Al5JU2#6_t1C-(C6U38
zeg4nBK&wcLZNH8~Vt(GS_@%DYu-bAR*P2=jX!t-REv9Aaj|L--cH$>*UuorMG4^$d
z08|tm5;5rO%M-H7R70q;wkCKewE$Ffz7%?l@1GxaOoYUo=`I&Zf5?i?1ude*(YrtW
z3CA5c7Bd((y(ZX_{($w$H0mGSB8Jg}X&v|r-s$@TYlZ8!3Gn45QzCb#_Weu(5MGk8
zP|`Ct39t2DP7aQ=DkKXeFwHt=B9n&ee)eezd>Q^SLmQ@_$b4e7k?~MT0o)Z(p;*m<
z)p;u*VB+)$tqD>h)G-t_8~(eH9eQ76S`(xn(7_^Ur$%V1l(4I77Kd--e5Nj-;T0`q
z^eEcd2e2vt9W>sJJnli~Pq6L6ho$MP>$Xf`<U)|GTiA9G6+jbV7xyQ(<1pK5=#aA6
z<=Va6xEuEp;%wVqGe1%+hSvkg(=KxUG}~mln_6A4r@yvt<m4ifMaLs-!$!6VoDv|l
zu3m@S56<o|#rU4<MAtDCNl$@_j0$8k2rjc5SjlPTd$q`jKELFr@;38fSoja$RuDge
zLr#AI3xA&Ok*%m*+v7dV*J0rV3Z>L^EUlUaQDN!Pyf9B){oJ3!T)~al*_ZwiU;t$x
VVe!_=*FFFM002ovPDHLkV1goAzuW)-

literal 0
HcmV?d00001

diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
new file mode 100644
index 0000000000..8bfa0ad931
--- /dev/null
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -0,0 +1,211 @@
+/*
+Copyright 2018 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {Room, User, Group, RoomMember} from 'matrix-js-sdk';
+import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+import QRCode from 'qrcode-react';
+import {makeEventPermalink, makeGroupPermalink, makeRoomPermalink, makeUserPermalink} from "../../../matrix-to";
+import * as ContextualMenu from "../../structures/ContextualMenu";
+
+const socials = [
+    {
+        name: 'Facebook',
+        img: 'img/social/facebook.png',
+        url: (url) => `https://www.facebook.com/sharer/sharer.php?u=${url}`,
+    }, {
+        name: 'Twitter',
+        img: 'img/social/twitter-2.png',
+        url: (url) => `https://twitter.com/home?status=${url}`,
+    }, /* // icon missing
+        name: 'Google Plus',
+        img: 'img/social/',
+        url: (url) => `https://plus.google.com/share?url=${url}`,
+    },*/ {
+        name: 'Linked In',
+        img: 'img/social/linkedin.png',
+        url: (url) => `https://www.linkedin.com/shareArticle?mini=true&url=${url}`,
+    }, {
+        name: 'Reddit',
+        img: 'img/social/reddit.png',
+        url: (url) => `http://www.reddit.com/submit?url=${url}`,
+    }, {
+        name: 'email',
+        img: 'img/social/email-1.png',
+        url: (url) => `mailto:?body=${url}`,
+    },
+];
+
+export default class ShareDialog extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+        target: PropTypes.oneOfType([
+            PropTypes.instanceOf(Room),
+            PropTypes.instanceOf(User),
+            PropTypes.instanceOf(Group),
+            PropTypes.instanceOf(RoomMember),
+            // PropTypes.instanceOf(MatrixEvent),
+        ]).isRequired,
+    };
+
+    constructor(props) {
+        super(props);
+
+        this.onCopyClick = this.onCopyClick.bind(this);
+        this.onCheckboxClick = this.onCheckboxClick.bind(this);
+
+        this.state = {
+            ticked: false,
+        };
+    }
+
+    static _selectText(target) {
+        const range = document.createRange();
+        range.selectNodeContents(target);
+
+        const selection = window.getSelection();
+        selection.removeAllRanges();
+        selection.addRange(range);
+    }
+
+    static onLinkClick(e) {
+        e.preventDefault();
+        const {target} = e;
+        ShareDialog._selectText(target);
+    }
+
+    onCopyClick(e) {
+        e.preventDefault();
+
+        ShareDialog._selectText(this.refs.link);
+
+        let successful;
+        try {
+            successful = document.execCommand('copy');
+        } catch (err) {
+            console.error('Failed to copy: ', err);
+        }
+
+        const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
+        const buttonRect = e.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 {close} = ContextualMenu.createMenu(GenericTextContextMenu, {
+            chevronOffset: 10,
+            left: x,
+            top: y,
+            message: successful ? _t('Copied!') : _t('Failed to copy'),
+        }, false);
+        e.target.onmouseleave = close;
+    }
+
+    onCheckboxClick() {
+        this.setState({
+            ticked: !this.state.ticked,
+        });
+    }
+
+    render() {
+        let title;
+        let matrixToUrl;
+
+        let checkbox;
+
+        if (this.props.target instanceof Room) {
+            title = _t('Share Room');
+
+            const events = this.props.target.getLiveTimeline().getEvents();
+            if (events.length > 0) {
+                checkbox = <div>
+                    <input type="checkbox"
+                           value={this.state.ticked}
+                           id="mx_ShareDialog_checkbox"
+                           onClick={this.onCheckboxClick} />
+                    <label htmlFor="mx_ShareDialog_checkbox">
+                        { _t('Link to most recent message') }
+                    </label>
+                </div>;
+            }
+
+            if (this.state.ticked) {
+                matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId());
+            } else {
+                matrixToUrl = makeRoomPermalink(this.props.target.roomId);
+            }
+        } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
+            title = _t('Share User');
+            matrixToUrl = makeUserPermalink(this.props.target.userId);
+        } else if (this.props.target instanceof Group) {
+            title = _t('Share Community');
+            matrixToUrl = makeGroupPermalink(this.props.target.groupId);
+        }
+
+        const encodedUrl = encodeURIComponent(matrixToUrl);
+
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        return <BaseDialog title={title}
+                           className='mx_ShareDialog'
+                           contentId='mx_Dialog_content'
+                           onFinished={this.props.onFinished}
+        >
+            <div className="mx_ShareDialog_content">
+                <div className="mx_ShareDialog_matrixto">
+                    <a ref="link"
+                       href={matrixToUrl}
+                       onClick={ShareDialog.onLinkClick}
+                       className="mx_ShareDialog_matrixto_link"
+                    >
+                        { matrixToUrl }
+                    </a>
+                    <a href={matrixToUrl} className="mx_ShareDialog_matrixto_copy" onClick={this.onCopyClick}>
+                        { _t('COPY') }
+                        <div>&nbsp;</div>
+                    </a>
+                </div>
+                { checkbox }
+                <hr />
+
+                <div className="mx_ShareDialog_split">
+                    <div className="mx_ShareDialog_left">
+                        <h3>QR Code</h3>
+                        <div className="mx_ShareDialog_qrcode_container">
+                            <QRCode value={matrixToUrl} size={256} logo="img/matrix-m.svg" />
+                        </div>
+                    </div>
+                    <div className="mx_ShareDialog_right">
+                        <h3>Social</h3>
+                        <div className="mx_ShareDialog_social_container">
+                            {
+                                socials.map((social) => <a target="_blank"
+                                                           key={social.name}
+                                                           name={social.name}
+                                                           href={social.url(encodedUrl)}
+                                                           className="mx_ShareDialog_social_icon"
+                                >
+                                    <img src={social.img} height={64} width={64} />
+                                </a>)
+                            }
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </BaseDialog>;
+    }
+}

From e7a4a0b2e0f78138f0bc91e98420a720783b3aef Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:12:12 +0100
Subject: [PATCH 212/702] allow context-menus/tooltips to work over modals

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_ContextualMenu.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index a0191b92cf..7474c3d107 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_ContextualMenu_wrapper {
     position: fixed;
-    z-index: 2000;
+    z-index: 5000;
 }
 
 .mx_ContextualMenu_background {
@@ -26,7 +26,7 @@ limitations under the License.
     width: 100%;
     height: 100%;
     opacity: 1.0;
-    z-index: 2000;
+    z-index: 5000;
 }
 
 .mx_ContextualMenu {
@@ -37,7 +37,7 @@ limitations under the License.
     position: absolute;
     padding: 6px;
 	font-size: 14px;
-    z-index: 2001;
+    z-index: 5001;
 }
 
 .mx_ContextualMenu.mx_ContextualMenu_right {

From e3c455e5997fe5874d98b833ad4317735e876d1f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:12:26 +0100
Subject: [PATCH 213/702] Style the ShareDialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                |  1 +
 res/css/views/dialogs/_ShareDialog.scss | 89 +++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 res/css/views/dialogs/_ShareDialog.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 2734939ae3..173939e143 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -42,6 +42,7 @@
 @import "./views/dialogs/_SetEmailDialog.scss";
 @import "./views/dialogs/_SetMxIdDialog.scss";
 @import "./views/dialogs/_SetPasswordDialog.scss";
+@import "./views/dialogs/_ShareDialog.scss";
 @import "./views/dialogs/_UnknownDeviceDialog.scss";
 @import "./views/directory/_NetworkDropdown.scss";
 @import "./views/elements/_AccessibleButton.scss";
diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
new file mode 100644
index 0000000000..ab340ad758
--- /dev/null
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -0,0 +1,89 @@
+/*
+Copyright 2018 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_ShareDialog {
+    // this is to center the content
+    padding-right: 58px;
+}
+
+.mx_ShareDialog hr {
+    margin-top: 25px;
+    margin-bottom: 10px;
+    border-color: $light-fg-color;
+}
+
+.mx_ShareDialog_content {
+    margin: 10px 0;
+}
+
+.mx_ShareDialog_matrixto {
+    display: flex;
+    justify-content: space-between;
+    border-radius: 5px;
+    border: solid 1px $light-fg-color;
+    margin-bottom: 10px;
+    margin-top: 30px;
+    padding: 10px;
+}
+
+.mx_ShareDialog_matrixto a {
+    text-decoration: none;
+}
+
+.mx_ShareDialog_matrixto_link {
+    flex-shrink: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.mx_ShareDialog_matrixto_copy {
+    flex-shrink: 0;
+    cursor: pointer;
+    margin-left: 20px;
+    display: inherit;
+}
+.mx_ShareDialog_matrixto_copy > div {
+    background-image: url($copy-button-url);
+    margin-left: 5px;
+    width: 20px;
+    height: 20px;
+}
+
+.mx_ShareDialog_split {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.mx_ShareDialog_qrcode_container {
+    float: left;
+    background-color: #ffffff;
+    padding: 5px; // makes qr code more readable in dark theme
+    border-radius: 5px;
+    height: 256px;
+    width: 256px;
+    margin-right: 64px;
+}
+
+.mx_ShareDialog_social_container {
+    display: flex;
+    flex-wrap: wrap;
+    width: 299px;
+}
+
+.mx_ShareDialog_social_icon {
+    margin-right: 10px;
+    margin-bottom: 10px;
+}

From 64bcf6fd7e20f562a6553742a8e9c0489fabea91 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:13:04 +0100
Subject: [PATCH 214/702] allow ContextualMenu to run without background, for
 tooltips & fix copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ContextualMenu.js  | 24 ++++++++++++--------
 src/components/views/messages/TextualBody.js |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index daac294d12..d6a11ca974 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,12 +16,10 @@ limitations under the License.
 */
 
 
-'use strict';
-
-const classNames = require('classnames');
-const React = require('react');
-const ReactDOM = require('react-dom');
+import React from 'react';
+import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
@@ -61,7 +60,12 @@ export default class ContextualMenu extends React.Component {
         // If true, insert an invisible screen-sized element behind the
         // menu that when clicked will close it.
         hasBackground: PropTypes.bool,
-    }
+
+        // The component to render as the context menu
+        elementClass: PropTypes.element.isRequired,
+        // on resize callback
+        windowResize: PropTypes.func
+    };
 
     render() {
         const position = {};
@@ -112,7 +116,7 @@ export default class ContextualMenu extends React.Component {
             `;
         }
 
-        const chevron = <div style={chevronOffset} className={"mx_ContextualMenu_chevron_" + chevronFace}></div>;
+        const chevron = <div style={chevronOffset} className={"mx_ContextualMenu_chevron_" + chevronFace} />;
         const className = 'mx_ContextualMenu_wrapper';
 
         const menuClasses = classNames({
@@ -158,13 +162,13 @@ export default class ContextualMenu extends React.Component {
                 { chevron }
                 <ElementClass {...props} onFinished={props.closeMenu} onResize={props.windowResize} />
             </div>
-            { props.hasBackground && <div className="mx_ContextualMenu_background" onClick={props.closeMenu}></div> }
+            { props.hasBackground && <div className="mx_ContextualMenu_background" onClick={props.closeMenu} /> }
             <style>{ chevronCSS }</style>
         </div>;
     }
 }
 
-export function createMenu(ElementClass, props) {
+export function createMenu(ElementClass, props, hasBackground=true) {
     const closeMenu = function(...args) {
         ReactDOM.unmountComponentAtNode(getOrCreateContainer());
 
@@ -175,8 +179,8 @@ export function createMenu(ElementClass, props) {
 
     // We only reference closeMenu once per call to createMenu
     const menu = <ContextualMenu
+        hasBackground={hasBackground}
         {...props}
-        hasBackground={true}
         elementClass={ElementClass}
         closeMenu={closeMenu} // eslint-disable-line react/jsx-no-bind
         windowResize={closeMenu} // eslint-disable-line react/jsx-no-bind
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index bc2a715d31..018754411c 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -336,8 +336,8 @@ module.exports = React.createClass({
                     left: x,
                     top: y,
                     message: successful ? _t('Copied!') : _t('Failed to copy'),
-                });
-                e.target.onmouseout = close;
+                }, false);
+                e.target.onmouseleave = close;
             };
             p.appendChild(button);
         });

From 7f1ce52dd3e49669261b2fb2eb5b43183a04cbc9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:15:00 +0100
Subject: [PATCH 215/702] link to ShareDialog from GroupView, RoomView,
 UserSettings & MemberInfo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/GroupView.js    | 13 +++++++++++++
 src/components/structures/UserSettings.js | 15 +++++++++++++--
 src/components/views/rooms/MemberInfo.js  | 14 +++++++++++++-
 src/components/views/rooms/RoomHeader.js  | 16 ++++++++++++++++
 4 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index c7610219f7..a343d1c971 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -562,6 +562,13 @@ export default React.createClass({
         });
     },
 
+    _onShareClick: function() {
+        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+        Modal.createTrackedDialog('share community dialog', '', ShareDialog, {
+            target: this._matrixClient.getGroup(this.props.groupId),
+        });
+    },
+
     _onCancelClick: function() {
         this._closeSettings();
     },
@@ -1207,6 +1214,7 @@ export default React.createClass({
                     shortDescNode = <span onClick={onGroupHeaderItemClick}>{ summary.profile.short_description }</span>;
                 }
             }
+
             if (this.state.editing) {
                 rightButtons.push(
                     <AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton"
@@ -1231,6 +1239,11 @@ export default React.createClass({
                         </AccessibleButton>,
                     );
                 }
+                rightButtons.push(
+                    <AccessibleButton className="mx_GroupHeader_button" onClick={this._onShareClick} title={_t('Share Community')} key="_shareButton">
+                        <TintableSvg src="img/icons-share.svg" width="16" height="16" />
+                    </AccessibleButton>,
+                );
                 if (this.props.collapsedRhs) {
                     rightButtons.push(
                         <AccessibleButton className="mx_GroupHeader_button"
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index c8ce79905d..8511010ed6 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -1074,6 +1074,14 @@ module.exports = React.createClass({
         </div>;
     },
 
+    onSelfShareClick: function() {
+        const cli = MatrixClientPeg.get();
+        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+        Modal.createTrackedDialog('share self dialog', '', ShareDialog, {
+            target: cli.getUser(this._me),
+        });
+    },
+
     _showSpoiler: function(event) {
         const target = event.target;
         target.innerHTML = target.getAttribute('data-spoiler');
@@ -1295,10 +1303,13 @@ module.exports = React.createClass({
 
                 <div className="mx_UserSettings_section">
                     <div className="mx_UserSettings_advanced">
-                        { _t("Logged in as:") } { this._me }
+                        { _t("Logged in as:") + ' ' }
+                        <span onClick={this.onSelfShareClick} className="mx_UserSettings_link">
+                            { this._me }
+                        </span>
                     </div>
                     <div className="mx_UserSettings_advanced">
-                        { _t('Access Token:') }
+                        { _t('Access Token:') + ' ' }
                         <span className="mx_UserSettings_advanced_spoiler"
                                 onClick={this._showSpoiler}
                                 data-spoiler={MatrixClientPeg.get().getAccessToken()}>
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2789c0e4cd..20c0fb8414 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -632,6 +632,13 @@ module.exports = withMatrixClient(React.createClass({
         );
     },
 
+    onShareUserClick: function() {
+        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+        Modal.createTrackedDialog('share room member dialog', '', ShareDialog, {
+            target: this.props.member,
+        });
+    },
+
     _renderUserOptions: function() {
         const cli = this.props.matrixClient;
         const member = this.props.member;
@@ -705,13 +712,18 @@ module.exports = withMatrixClient(React.createClass({
             }
         }
 
-        if (!ignoreButton && !readReceiptButton && !insertPillButton && !inviteUserButton) return null;
+        const shareUserButton = (
+            <AccessibleButton onClick={this.onShareUserClick} className="mx_MemberInfo_field">
+                { _t('Share Link to User') }
+            </AccessibleButton>
+        );
 
         return (
             <div>
                 <h3>{ _t("User Options") }</h3>
                 <div className="mx_MemberInfo_buttons">
                     { readReceiptButton }
+                    { shareUserButton }
                     { insertPillButton }
                     { ignoreButton }
                     { inviteUserButton }
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 1851e03383..e40c715052 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -149,6 +149,13 @@ module.exports = React.createClass({
         dis.dispatch({ action: 'show_right_panel' });
     },
 
+    onShareRoomClick: function(ev) {
+        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+        Modal.createTrackedDialog('share room dialog', '', ShareDialog, {
+            target: this.props.room,
+        });
+    },
+
     _hasUnreadPins: function() {
         const currentPinEvent = this.props.room.currentState.getStateEvents("m.room.pinned_events", '');
         if (!currentPinEvent) return false;
@@ -379,6 +386,14 @@ module.exports = React.createClass({
                 </AccessibleButton>;
         }
 
+        let shareRoomButton;
+        if (this.props.inRoom) {
+            shareRoomButton =
+                <AccessibleButton className="mx_RoomHeader_button" onClick={this.onShareRoomClick} title={_t('Share room')}>
+                    <TintableSvg src="img/icons-share.svg" width="16" height="16" />
+                </AccessibleButton>;
+        }
+
         let rightPanelButtons;
         if (this.props.collapsedRhs) {
             rightPanelButtons =
@@ -400,6 +415,7 @@ module.exports = React.createClass({
                 <div className="mx_RoomHeader_rightRow">
                     { settingsButton }
                     { pinnedEventsButton }
+                    { shareRoomButton }
                     { manageIntegsButton }
                     { forgetButton }
                     { searchButton }

From d8a1feb501ad10102da8d4fee0e7a553de8dfde5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:15:30 +0100
Subject: [PATCH 216/702] fix Modal typo and refactor BaseDialog to fix "
 undefined" className

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/BaseDialog.js    | 23 ++++++++++++-------
 .../views/dialogs/ChatCreateOrReuseDialog.js  |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 71a5da224c..8ec417a59b 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -18,6 +18,7 @@ limitations under the License.
 import React from 'react';
 import FocusTrap from 'focus-trap-react';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 
 import { MatrixClient } from 'matrix-js-sdk';
 
@@ -64,7 +65,10 @@ export default React.createClass({
 
         // Id of content element
         // If provided, this is used to add a aria-describedby attribute
-        contentId: React.PropTypes.string,
+        contentId: PropTypes.string,
+
+        // optional additional class for the title element
+        titleClass: PropTypes.string,
     },
 
     getDefaultProps: function() {
@@ -105,25 +109,28 @@ export default React.createClass({
     render: function() {
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
+        let cancelButton;
+        if (this.props.hasCancel) {
+            cancelButton = <AccessibleButton onClick={this._onCancelClick} className="mx_Dialog_cancelButton">
+                <TintableSvg src="img/icons-close-button.svg" width="35" height="35" />
+            </AccessibleButton>;
+        }
+
         return (
             <FocusTrap onKeyDown={this._onKeyDown}
                 className={this.props.className}
                 role="dialog"
                 aria-labelledby='mx_BaseDialog_title'
                 // This should point to a node describing the dialog.
-                // If we were about to completelly follow this recommendation we'd need to
+                // If we were about to completely follow this recommendation we'd need to
                 // make all the components relying on BaseDialog to be aware of it.
                 // So instead we will use the whole content as the description.
                 // Description comes first and if the content contains more text,
                 // AT users can skip its presentation.
                 aria-describedby={this.props.contentId}
             >
-                { this.props.hasCancel ? <AccessibleButton onClick={this._onCancelClick}
-                    className="mx_Dialog_cancelButton"
-                >
-                    <TintableSvg src="img/icons-close-button.svg" width="35" height="35" />
-                </AccessibleButton> : null }
-                <div className={'mx_Dialog_title ' + this.props.titleClass} id='mx_BaseDialog_title'>
+                { cancelButton }
+                <div className={classNames('mx_Dialog_title', this.props.titleClass)} id='mx_BaseDialog_title'>
                     { this.props.title }
                 </div>
                 { this.props.children }
diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index e2387064cf..95fd8848ba 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -187,7 +187,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
     }
 }
 
-ChatCreateOrReuseDialog.propTyps = {
+ChatCreateOrReuseDialog.propTypes = {
     userId: PropTypes.string.isRequired,
     // Called when clicking outside of the dialog
     onFinished: PropTypes.func.isRequired,

From f9b3f0f9d1ff039fc608181138c6a771e94a7709 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:15:52 +0100
Subject: [PATCH 217/702] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/de_DE.json   |  3 --
 src/i18n/strings/en_EN.json   | 69 +++++++++++++++++++----------------
 src/i18n/strings/eu.json      |  7 ----
 src/i18n/strings/fr.json      |  8 ----
 src/i18n/strings/hu.json      |  8 ----
 src/i18n/strings/it.json      |  3 --
 src/i18n/strings/ru.json      |  4 --
 src/i18n/strings/sv.json      |  2 -
 src/i18n/strings/zh_Hant.json |  3 --
 9 files changed, 38 insertions(+), 69 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d3787a15a3..8f75b71689 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1169,9 +1169,6 @@
     "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.",
     "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren",
     "Send analytics data": "Analysedaten senden",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere <PolicyLink>Datenschutzerklärung</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
-    "Yes please": "Ja, bitte",
     "e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
     "Reload widget": "Widget neu laden",
     "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8698e6108f..76d0cb6f33 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,6 +85,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -104,7 +109,6 @@
     "You need to be logged in.": "You need to be logged in.",
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "Unable to create widget.": "Unable to create widget.",
-    "Reload widget": "Reload widget",
     "Missing roomId.": "Missing roomId.",
     "Failed to send request.": "Failed to send request.",
     "This room is not recognised.": "This room is not recognised.",
@@ -180,11 +184,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -298,6 +297,29 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -347,6 +369,7 @@
     "Jump to read receipt": "Jump to read receipt",
     "Mention": "Mention",
     "Invite": "Invite",
+    "Share Link to User": "Share Link to User",
     "User Options": "User Options",
     "Direct chats": "Direct chats",
     "Unmute": "Unmute",
@@ -394,11 +417,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -428,6 +451,7 @@
     "Settings": "Settings",
     "Forget room": "Forget room",
     "Search": "Search",
+    "Share room": "Share room",
     "Show panel": "Show panel",
     "Drop here to favourite": "Drop here to favourite",
     "Drop here to tag direct chat": "Drop here to tag direct chat",
@@ -531,29 +555,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -664,6 +665,7 @@
     "Delete widget": "Delete widget",
     "Revoke widget access": "Revoke widget access",
     "Minimize apps": "Minimize apps",
+    "Reload widget": "Reload widget",
     "Popout widget": "Popout widget",
     "Picture": "Picture",
     "Edit": "Edit",
@@ -856,6 +858,11 @@
     "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "Please set a password!": "Please set a password!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+    "Share Room": "Share Room",
+    "Link to most recent message": "Link to most recent message",
+    "Share User": "Share User",
+    "Share Community": "Share Community",
+    "COPY": "COPY",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
     "Room contains unknown devices": "Room contains unknown devices",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 909b466da3..fe9d3db424 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1170,20 +1170,13 @@
     "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan",
     "Send analytics data": "Bidali datu analitikoak",
     "Muted Users": "Mutututako erabiltzaileak",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure <PolicyLink>Cookie eta pribatutasun politikak</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.",
-    "Yes please": "Bai mesedez",
     "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.",
     "Terms and Conditions": "Termino eta baldintzak",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.",
     "Review terms and conditions": "Irakurri termino eta baldintzak",
     "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi",
-    "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. <b>This action is irreversible.</b>": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. <b>Ez dago ekintza hau desegiterik.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean <b>ez dira lehenetsita zuk bidalitako mezuak ezabatuko.</b> Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
     "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
     "password": "pasahitza",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).",
     "e.g. %(exampleValue)s": "adib. %(exampleValue)s",
     "Reload widget": "Birkargatu trepeta",
     "To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8dd45192e6..367e89d2b6 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1169,25 +1169,17 @@
     "Collapse Reply Thread": "Dévoiler le fil de réponse",
     "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
     "Send analytics data": "Envoyer les données analytiques",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
-    "Yes please": "Oui, s'il vous plaît",
     "Muted Users": "Utilisateurs ignorés",
     "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.",
     "Terms and Conditions": "Conditions générales",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
     "Review terms and conditions": "Voir les conditions générales",
     "Failed to indicate account erasure": "Échec de notification de la suppression du compte",
-    "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. <b>This action is irreversible.</b>": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. <b>Cette action est irréversible.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "Désactiver votre compte <b>ne supprime pas les messages que vous avez envoyés par défaut.</b> Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.",
     "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
     "password": "mot de passe",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).",
     "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>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. <b>Cette action est irréversible.</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.": "La désactivation du compte <b>ne nous fait pas oublier les messages que vous avez envoyés par défaut.</b> Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
     "e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant <UsageDataLink>des données d'utilisation</UsageDataLink> ? Cela utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)",
     "Reload widget": "Recharger le widget",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 6b52958ea6..3d8100d8f1 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1169,27 +1169,19 @@
     "Collapse Reply Thread": "Beszélgetés szál becsukása",
     "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
     "Send analytics data": "Analitikai adatok küldése",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a <PolicyLink>sütikről és titoktartási irányelvekről</PolicyLink> szóló leírást).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
-    "Yes please": "Igen, kérlek",
     "Muted Users": "Elnémított felhasználók",
     "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.",
     "Terms and Conditions": "Általános Szerződési Feltételek",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
     "Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
     "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen",
-    "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. <b>This action is irreversible.</b>": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. <b>Ez a művelet visszafordíthatatlan.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése <b>alapértelmezetten nem töröli semelyik általad küldött üzenetet.</b> Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.",
     "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
     "password": "jelszó",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. <b>Ez a művelet visszafordíthatatlan.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése <b>nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek.</b> Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
     "e.g. %(exampleValue)s": "pl. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Segítesz jobbá tenni a Riotot <UsageDataLink>használati adat</UsageDataLink> küldésével? Ez sütit (cookie) fog használni. (Nézd meg az <PolicyLink>Általános Szerződési Feltételeket</PolicyLink>).",
     "Reload widget": "Kisalkalmazás újratöltése",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez szütit (cookie) fog használni (lásd a <PolicyLink>sütire vonatkozó szabályozásunkat</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez szütit (cookie) fog használni.",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index fa22725f78..c73dc8b60d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1159,9 +1159,6 @@
     "Refresh": "Aggiorna",
     "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.",
     "Send analytics data": "Invia dati statistici",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra <PolicyLink>politica sui cookie e sulla privacy</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.",
-    "Yes please": "Sì grazie",
     "Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
     "Send Logs": "Invia i log",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9d7f8901ab..2bdce2fe4f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1167,16 +1167,12 @@
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
     "Collapse Reply Thread": "Ответить с цитированием",
     "Send analytics data": "Отправить данные аналитики",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.",
-    "Yes please": "Да, пожалуйста",
     "Muted Users": "Приглушенные пользователи",
     "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
     "Terms and Conditions": "Условия и положения",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
     "Review terms and conditions": "Просмотр условий и положений",
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя <UsageDataLink>данные использования</UsageDataLink>? Будут использоваться файлы cookie. (Смотрите наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
     "Failed to indicate account erasure": "Не удается удалить учетную запись",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. <b>Это действие необратимо.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи <b>не приведет к удалению всех ваших сообщений.</b> Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 8e5d8e2f21..ff64f1a8e6 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -901,8 +901,6 @@
     "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!",
     "Unknown error": "Okänt fel",
     "Incorrect password": "Felaktigt lösenord",
-    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.",
-    "This action is irreversible.": "Denna åtgärd går inte att ångra.",
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:",
     "Device name": "Enhetsnamn",
     "Device key": "Enhetsnyckel",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 80dce1cc2d..95424eaefb 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1170,9 +1170,6 @@
     "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照",
     "Send analytics data": "傳送分析資料",
     "Muted Users": "已靜音的使用者",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 <PolicyLink>cookie 與隱私政策</PolicyLink>）。",
-    "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
-    "Yes please": "好的，請",
     "e.g. %(exampleValue)s": "範例：%(exampleValue)s",
     "Reload widget": "重新載入小工具",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "請透過傳送<UsageDataLink>匿名使用資料</UsageDataLink>來協助改善 Riot.im。這將會使用 cookie（請參見我們的 <PolicyLink>Cookie 政策</PolicyLink>）。",

From 18546dbe06b86955b89a27dca5b29a3d3621bf11 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 11:33:38 +0100
Subject: [PATCH 218/702] QR Code align [m] logo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/ShareDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 8bfa0ad931..a88052ee6d 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -186,7 +186,7 @@ export default class ShareDialog extends React.Component {
                     <div className="mx_ShareDialog_left">
                         <h3>QR Code</h3>
                         <div className="mx_ShareDialog_qrcode_container">
-                            <QRCode value={matrixToUrl} size={256} logo="img/matrix-m.svg" />
+                            <QRCode value={matrixToUrl} size={256} logoWidth={48} logo="img/matrix-m.svg" />
                         </div>
                     </div>
                     <div className="mx_ShareDialog_right">

From 093400681700c7c441cde55f3a22900a5ebb5635 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 12 Jun 2018 14:13:09 +0100
Subject: [PATCH 219/702] Track decryption success/failure rate with piwik

Emit a piwik event when a decryption occurs in the category "E2E" with
the action "Decryption result" and the name either "failure" or
"success".

NB: This will cause Riot to a lot of networking when decrypting many
events. One HTTP request per decrypted event should be expected.
---
 src/components/structures/MatrixChat.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index bd8f66163f..d4969a8bf9 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1308,6 +1308,15 @@ export default React.createClass({
             }
         });
 
+        // XXX: This will do a HTTP request for each Event.decrypted event
+        cli.on("Event.decrypted", (e) => {
+            if (e.isDecryptionFailure()) {
+                Analytics.trackEvent('E2E', 'Decryption result', 'failure');
+            } else {
+                Analytics.trackEvent('E2E', 'Decryption result', 'success');
+            }
+        });
+
         const krh = new KeyRequestHandler(cli);
         cli.on("crypto.roomKeyRequest", (req) => {
             krh.handleKeyRequest(req);

From 334dccbdc78597aa071762267a55447a61686dcd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 Jun 2018 14:14:14 +0100
Subject: [PATCH 220/702] Released js-sdk

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f183f1635d..bb77fcb92b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.2",
+  "version": "0.12.7-rc.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6add75f972..581d25688a 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.4-rc.1",
+    "matrix-js-sdk": "0.10.4",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 0ad738d51044d9c92e73777d0dd79ded32118a23 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 Jun 2018 14:21:30 +0100
Subject: [PATCH 221/702] Prepare changelog for v0.12.7

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae8f535cb6..3b97251604 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.12.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7) (2018-06-12)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7-rc.1...v0.12.7)
+
+ * No changes since rc.1
+
 Changes in [0.12.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7-rc.1) (2018-06-06)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6...v0.12.7-rc.1)

From ef1f580abbdb96446cf112f8206d776bdeb3e9c6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 Jun 2018 14:21:30 +0100
Subject: [PATCH 222/702] v0.12.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 581d25688a..2984679bed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.7-rc.1",
+  "version": "0.12.7",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 9b6c3f44ec03974665e4af77085f1a6b287237a1 Mon Sep 17 00:00:00 2001
From: Silke <silke@slxh.nl>
Date: Mon, 11 Jun 2018 20:27:41 +0000
Subject: [PATCH 223/702] Translated using Weblate (Dutch)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f09c63118e..130be0d344 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -64,7 +64,7 @@
     "Active call (%(roomName)s)": "Actief gesprek (%(roomName)s)",
     "Add": "Toevoegen",
     "Add a topic": "Een onderwerp toevoegen",
-    "Admin Tools": "Beheerhulpmiddelen",
+    "Admin Tools": "Beheerdershulpmiddelen",
     "VoIP": "VoiP",
     "Missing Media Permissions, click here to request.": "Ontbrekende mediatoestemmingen, klik hier om aan te vragen.",
     "No Microphones detected": "Geen microfoons gevonden",
@@ -410,7 +410,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Het is niet gelukt om een specifiek punt in de tijdlijn van deze ruimte te laden.",
     "Turn Markdown off": "Zet Markdown uit",
     "Turn Markdown on": "Zet Markdown aan",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft eind-tot-eind versleuteling aangezet (algoritme %(algorithm)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft end-to-endbeveiliging aangezet (algoritme %(algorithm)s).",
     "Unable to add email address": "Niet mogelijk om e-mailadres toe te voegen",
     "Unable to remove contact information": "Niet mogelijk om contactinformatie te verwijderen",
     "Unable to verify email address.": "Niet mogelijk om het e-mailadres te verifiëren.",
@@ -581,7 +581,7 @@
     "Add User": "Gebruiker Toevoegen",
     "This Home Server would like to make sure you are not a robot": "Deze thuisserver wil er zeker van zijn dat je geen robot bent",
     "Sign in with CAS": "Inloggen met CAS",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Je kan de aangepaste server opties gebruiken om bij andere Matrix-servers in te loggen door een andere thuisserver-URL te specificeren.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Je kan de alternatieve-serverinstellingen gebruiken om bij andere Matrix-servers in te loggen door een andere thuisserver-URL te specificeren.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Dit maakt het mogelijk om deze applicatie te gebruiken met een bestaand Matrix-account op een andere thuisserver.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Je kan ook een aangepaste identiteitsserver instellen maar dit zal waarschijnlijk interactie met gebruikers gebaseerd op een e-mailadres voorkomen.",
     "Please check your email to continue registration.": "Bekijk je e-mail om door te gaan met de registratie.",
@@ -590,7 +590,7 @@
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Als je geen e-mailadres specificeert zal je niet je wachtwoord kunnen resetten. Weet je het zeker?",
     "You are registering with %(SelectedTeamName)s": "Je registreert je met %(SelectedTeamName)s",
     "Default server": "Standaardserver",
-    "Custom server": "Aangepaste server",
+    "Custom server": "Alternatieve server",
     "Home server URL": "Thuisserver-URL",
     "Identity server URL": "Identiteitsserver-URL",
     "What does this mean?": "Wat betekent dit?",
@@ -603,7 +603,7 @@
     "URL Previews": "URL-Voorvertoningen",
     "Drop file here to upload": "Bestand hier laten vallen om te uploaden",
     " (unsupported)": " (niet ondersteund)",
-    "Ongoing conference call%(supportedText)s.": "Lopend vergaderingsgesprek %(supportedText)s.",
+    "Ongoing conference call%(supportedText)s.": "Lopend groepsgesprek%(supportedText)s.",
     "Online": "Online",
     "Idle": "Afwezig",
     "Offline": "Offline",
@@ -759,7 +759,7 @@
     "World readable": "Leesbaar voor iedereen",
     "Guests can join": "Gasten kunnen toetreden",
     "Remove avatar": "Avatar verwijderen",
-    "To change the room's avatar, you must be a": "Om de avatar van de ruimte te verwijderen, moet het volgende zijn:",
+    "To change the room's avatar, you must be a": "Om de avatar van de ruimte te verwijderen, moet je het volgende zijn:",
     "Drop here to favourite": "Hier laten vallen om aan favorieten toe te voegen",
     "Drop here to tag direct chat": "Hier laten vallen om als privégesprek te markeren",
     "Drop here to restore": "Hier laten vallen om te herstellen",
@@ -923,7 +923,7 @@
     "This Home server does not support communities": "Deze Thuisserver ondersteunt geen gemeenschappen",
     "Failed to load %(groupId)s": "Het is niet gelukt om %(groupId)s te laden",
     "Old cryptography data detected": "Oude cryptografie gegevens gedetecteerd",
-    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Er zijn gegevens van een oudere versie van Riot gedetecteerd. Dit zal eind-tot-eind versleuteling laten storen in de oudere versie. Eind-tot-eind berichten dat recent zijn uitgewisseld zal misschien niet ontsleutelbaar zijn in deze versie. Dit zou er misschien ook voor kunnen zorgen dat berichten die zijn uitgewisseld in deze versie falen. Indien je problemen ervaart, log opnieuw in. Om de berichtgeschiedenis te behouden, exporteer de sleutels en importeer ze achteraf weer.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Er zijn gegevens van een oudere versie van Riot gedetecteerd. Dit verstoorde end-to-endbeveiliging in de oude versie. End-to-endbeveiligde berichten die recent uitgewisseld zijn met de oude versie zijn wellicht niet te ontsleutelen in deze versie. Dit zou er ook voor kunnen zorgen dat berichten die zijn uitgewisseld in deze versie falen. Log opnieuw in als je problemen ervaart. Exporteer de sleutels en importeer ze achteraf weer om de berichtgeschiedenis te behouden.",
     "Your Communities": "Jouw Gemeenschappen",
     "Error whilst fetching joined communities": "Er is een fout opgetreden tijdens het ophalen van de gemeenschappen waar je lid van bent",
     "Create a new community": "Maak een nieuwe gemeenschap aan",
@@ -1166,7 +1166,7 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Help Riot.im te verbeteren door het versturen van <UsageDataLink>anonieme gebruiksgegevens</UsageDataLink>. Dit zal een cookie gebruiken.",
     "Yes, I want to help!": "Ja, ik wil helpen!",
     "Warning: This widget might use cookies.": "Waarschuwing: deze widget gebruikt misschien cookies.",
-    "Popout widget": "Opspringende widget",
+    "Popout widget": "Widget in nieuw venster openen",
     "Picture": "Afbeelding",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Niet mogelijk om de gebeurtenis te laden waar op gereageerd was. Het kan zijn dat het niet bestaat of dat je niet toestemming hebt om het te bekijken.",
     "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot fouten worden bijgehouden op GitHub: <a>maak een GitHub melding</a>.",

From 848052bb808d82885ec7993e5b351f39c6af4de8 Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Sun, 10 Jun 2018 02:40:40 +0000
Subject: [PATCH 224/702] Translated using Weblate (Ukrainian)

Currently translated at 23.6% (281 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 74bf855d22..b454c02884 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -94,7 +94,7 @@
     "Register": "Зарегіструватись",
     "Rooms": "Кімнати",
     "Add rooms to this community": "Добавити кімнати в це суспільство",
-    "This email address is already in use": "Ця адреса елект. почти вже використовується",
+    "This email address is already in use": "Ця е-пошта вже використовується",
     "This phone number is already in use": "Цей телефонний номер вже використовується",
     "Fetching third party location failed": "Не вдалось отримати стороннє місцеперебування",
     "Messages in one-to-one chats": "Повідомлення у чатах \"сам на сам\"",
@@ -270,5 +270,15 @@
     "Your language of choice": "Обрана мова",
     "Which officially provided instance you are using, if any": "Яким офіційно наданим примірником ви користуєтесь (якщо користуєтесь)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Чи використовуєте ви режим Richtext у редакторі Rich Text Editor",
-    "Your homeserver's URL": "URL адреса вашого домашнього серверу"
+    "Your homeserver's URL": "URL адреса вашого домашнього серверу",
+    "Failed to verify email address: make sure you clicked the link in the email": "Не вдалось перевірити адресу е-пошти: переконайтесь, що ви перейшли за посиланням у листі",
+    "The platform you're on": "Використовувана платформа",
+    "Your identity server's URL": "URL адреса серверу ідентифікації",
+    "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
+    "Every page you use in the app": "Кожна використовувана у застосунку сторінка",
+    "e.g. <CurrentPageURL>": "напр. <CurrentPageURL>",
+    "Your User Agent": "Ваш користувацький агент",
+    "Your device resolution": "Роздільність вашого пристрою",
+    "Analytics": "Аналітика",
+    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:"
 }

From c820836bcc1c95d0fb292f47ecb377e602f5b9ee Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 15:22:45 +0100
Subject: [PATCH 225/702] make RoomTooltip generic and add ContextMenu&Tooltip
 to GroupInviteTile

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../GroupInviteTileContextMenu.js             | 87 ++++++++++++++++
 .../views/groups/GroupInviteTile.js           | 98 +++++++++++++++++--
 src/components/views/rooms/RoomList.js        |  3 +-
 src/components/views/rooms/RoomTile.js        |  4 +-
 src/components/views/rooms/RoomTooltip.js     | 25 ++---
 5 files changed, 189 insertions(+), 28 deletions(-)
 create mode 100644 src/components/views/context_menus/GroupInviteTileContextMenu.js

diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
new file mode 100644
index 0000000000..844845ea82
--- /dev/null
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -0,0 +1,87 @@
+/*
+Copyright 2018 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+import { _t, _td } from '../../../languageHandler';
+import Modal from '../../../Modal';
+import {Group} from 'matrix-js-sdk';
+import GroupStore from "../../../stores/GroupStore";
+
+export default class GroupInviteTileContextMenu extends React.Component {
+    static propTypes = {
+        group: PropTypes.instanceOf(Group).isRequired,
+        /* callback called when the menu is dismissed */
+        onFinished: PropTypes.func,
+    };
+
+    constructor(props, context) {
+        super(props, context);
+
+        this._onClickReject = this._onClickReject.bind(this);
+    }
+
+    componentWillMount() {
+        this._unmounted = false;
+    }
+
+    componentWillUnmount() {
+        this._unmounted = true;
+    }
+
+    _onClickReject() {
+        const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+        Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, {
+            title: _t('Reject invitation'),
+            description: _t('Are you sure you want to reject the invitation?'),
+            onFinished: async (shouldLeave) => {
+                if (!shouldLeave) return;
+
+                // FIXME: controller shouldn't be loading a view :(
+                const Loader = sdk.getComponent("elements.Spinner");
+                const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
+
+                try {
+                    await GroupStore.leaveGroup(this.props.group.groupId);
+                } catch (e) {
+                    console.error(e);
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    Modal.createTrackedDialog('Error rejecting invite', '', ErrorDialog, {
+                        title: _t("Error"),
+                        description: _t("Unable to reject invite"),
+                    });
+                }
+                modal.close();
+            },
+        });
+
+        // Close the context menu
+        if (this.props.onFinished) {
+            this.props.onFinished();
+        }
+    }
+
+    render() {
+        return <div>
+            <div className="mx_RoomTileContextMenu_leave" onClick={this._onClickReject} >
+                <img className="mx_RoomTileContextMenu_tag_icon" src="img/icon_context_delete.svg" width="15" height="15" />
+                { _t('Reject') }
+            </div>
+        </div>;
+    }
+}
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index d97464e8ca..65e8a07d5a 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@ import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
+import * as ContextualMenu from "../../structures/ContextualMenu";
+import classNames from 'classnames';
 
 export default React.createClass({
     displayName: 'GroupInviteTile',
@@ -32,6 +34,15 @@ export default React.createClass({
         matrixClient: PropTypes.instanceOf(MatrixClient),
     },
 
+    getInitialState: function() {
+        return ({
+            hover: false,
+            badgeHover: false,
+            menuDisplayed: false,
+            selected: this.props.group.groupId === null, // XXX: this needs linking to LoggedInView/GroupView state
+        });
+    },
+
     onClick: function(e) {
         dis.dispatch({
             action: 'view_group',
@@ -39,6 +50,56 @@ export default React.createClass({
         });
     },
 
+    onMouseEnter: function() {
+        const state = {hover: true};
+        // Only allow non-guests to access the context menu
+        if (!this.context.matrixClient.isGuest()) {
+            state.badgeHover = true;
+        }
+        this.setState(state);
+    },
+
+    onMouseLeave: function() {
+        this.setState({
+            badgeHover: false,
+            hover: false,
+        });
+    },
+
+    onBadgeClicked: function(e) {
+        // Prevent the RoomTile onClick event firing as well
+        e.stopPropagation();
+
+        // Only allow none guests to access the context menu
+        if (this.context.matrixClient.isGuest()) return;
+
+        // If the badge is clicked, then no longer show tooltip
+        if (this.props.collapsed) {
+            this.setState({ hover: false });
+        }
+
+        const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
+        const elementRect = e.target.getBoundingClientRect();
+
+        // The window X and Y offsets are to adjust position when zoomed in to page
+        const x = elementRect.right + window.pageXOffset + 3;
+        const chevronOffset = 12;
+        let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
+        y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
+
+        ContextualMenu.createMenu(RoomTileContextMenu, {
+            chevronOffset: chevronOffset,
+            left: x,
+            top: y,
+            group: this.props.group,
+            onFinished: () => {
+                this.setState({ menuDisplayed: false });
+                // this.props.refreshSubList();
+            },
+        });
+        this.setState({ menuDisplayed: true });
+    },
+
     render: function() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const EmojiText = sdk.getComponent('elements.EmojiText');
@@ -49,19 +110,37 @@ export default React.createClass({
 
         const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;
 
-        const label = <EmojiText
-            element="div"
-            title={this.props.group.groupId}
-            className="mx_RoomTile_name mx_RoomTile_badgeShown"
-            dir="auto"
-        >
+        const nameClasses = classNames({
+            'mx_RoomTile_name': true,
+            'mx_RoomTile_invite': this.props.isInvite,
+            'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed,
+        });
+
+        const label = <EmojiText element="div" title={this.props.group.groupId} className={nameClasses} dir="auto">
             { groupName }
         </EmojiText>;
 
-        const badge = <div className="mx_RoomSubList_badge mx_RoomSubList_badgeHighlight">!</div>;
+        const badgeEllipsis = this.state.badgeHover || this.state.menuDisplayed;
+        const badgeClasses = classNames('mx_RoomSubList_badge mx_RoomSubList_badgeHighlight', {
+            'mx_RoomTile_badgeButton': badgeEllipsis,
+        });
+
+        const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
+        const badge = <div className={badgeClasses} onClick={this.onBadgeClicked}>{ badgeContent }</div>;
+
+        let tooltip;
+        if (this.props.collapsed && this.state.hover) {
+            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" label={groupName} dir="auto" />;
+        }
+
+        const classes = classNames('mx_RoomTile mx_RoomTile_highlight', {
+            'mx_RoomTile_menuDisplayed': this.state.menuDisplayed,
+            'mx_RoomTile_selected': this.state.selected,
+        });
 
         return (
-            <AccessibleButton className="mx_RoomTile mx_RoomTile_highlight" onClick={this.onClick}>
+            <AccessibleButton className={classes} onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
                 <div className="mx_RoomTile_avatar">
                     { av }
                 </div>
@@ -69,6 +148,7 @@ export default React.createClass({
                     { label }
                     { badge }
                 </div>
+                { tooltip }
             </AccessibleButton>
         );
     },
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index fc1872249f..2722bad88b 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -589,8 +589,7 @@ module.exports = React.createClass({
         const GroupInviteTile = sdk.getComponent('groups.GroupInviteTile');
         for (const group of MatrixClientPeg.get().getGroups()) {
             if (group.myMembership !== 'invite') continue;
-
-            ret.push(<GroupInviteTile key={group.groupId} group={group} />);
+            ret.push(<GroupInviteTile key={group.groupId} group={group} collapsed={this.props.collapsed} />);
         }
 
         return ret;
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 05aaf79e0b..11eb2090f2 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -301,7 +301,7 @@ module.exports = React.createClass({
             }
         } else if (this.state.hover) {
             const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} dir="auto" />;
+            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" label={this.props.room.name} dir="auto" />;
         }
 
         //var incomingCallBox;
@@ -314,7 +314,7 @@ module.exports = React.createClass({
 
         let directMessageIndicator;
         if (this._isDirectMessageRoom(this.props.room.roomId)) {
-         directMessageIndicator = <img src="img/icon_person.svg" className="mx_RoomTile_dm" width="11" height="13" alt="dm" />;
+            directMessageIndicator = <img src="img/icon_person.svg" className="mx_RoomTile_dm" width="11" height="13" alt="dm" />;
         }
 
         return <AccessibleButton className={classes} tabIndex="0" onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
diff --git a/src/components/views/rooms/RoomTooltip.js b/src/components/views/rooms/RoomTooltip.js
index b17f54ef3c..bce0922637 100644
--- a/src/components/views/rooms/RoomTooltip.js
+++ b/src/components/views/rooms/RoomTooltip.js
@@ -14,11 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
 
-var React = require('react');
-var ReactDOM = require('react-dom');
-var dis = require('../../../dispatcher');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import dis from '../../../dispatcher';
 import classNames from 'classnames';
 
 const MIN_TOOLTIP_HEIGHT = 25;
@@ -77,25 +76,21 @@ module.exports = React.createClass({
     },
 
     _renderTooltip: function() {
-        var label = this.props.room ? this.props.room.name : this.props.label;
-
         // Add the parent's position to the tooltips, so it's correctly
         // positioned, also taking into account any window zoom
         // NOTE: The additional 6 pixels for the left position, is to take account of the
         // tooltips chevron
-        var parent = ReactDOM.findDOMNode(this).parentNode;
-        var style = {};
+        const parent = ReactDOM.findDOMNode(this).parentNode;
+        let style = {};
         style = this._updatePosition(style);
         style.display = "block";
 
-        const tooltipClasses = classNames(
-            "mx_RoomTooltip", this.props.tooltipClassName,
-        );
+        const tooltipClasses = classNames("mx_RoomTooltip", this.props.tooltipClassName);
 
-        var tooltip = (
-            <div className={tooltipClasses} style={style} >
-                <div className="mx_RoomTooltip_chevron"></div>
-                { label }
+        const tooltip = (
+            <div className={tooltipClasses} style={style}>
+                <div className="mx_RoomTooltip_chevron" />
+                { this.props.label }
             </div>
         );
 

From 9dd2184b33720b44c34b29f8039652df02eb66ce Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 15:29:05 +0100
Subject: [PATCH 226/702] remove unused imports

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/context_menus/GroupInviteTileContextMenu.js          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index 844845ea82..bbdc3a4244 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -15,10 +15,9 @@ limitations under the License.
 */
 
 import React from 'react';
-import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import sdk from '../../../index';
-import { _t, _td } from '../../../languageHandler';
+import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import {Group} from 'matrix-js-sdk';
 import GroupStore from "../../../stores/GroupStore";

From ed779cabc403145107110def3e3d5b29d432ebbb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 15:34:35 +0100
Subject: [PATCH 227/702] add mx_filterFlipColor to mx_MemberInfo_cancel img

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/groups/GroupMemberInfo.js | 2 +-
 src/components/views/rooms/MemberInfo.js       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 4fed293bec..ca59075912 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -187,7 +187,7 @@ module.exports = React.createClass({
         return (
             <div className="mx_MemberInfo">
                 <GeminiScrollbarWrapper autoshow={true}>
-                    <AccessibleButton className="mx_MemberInfo_cancel"onClick={this._onCancel}>
+                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this._onCancel}>
                         <img src="img/cancel.svg" width="18" height="18" className="mx_filterFlipColor" />
                     </AccessibleButton>
                     <div className="mx_MemberInfo_avatar">
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2789c0e4cd..75e6990120 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -902,7 +902,9 @@ module.exports = withMatrixClient(React.createClass({
         return (
             <div className="mx_MemberInfo">
                 <GeminiScrollbarWrapper autoshow={true}>
-                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}> <img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
+                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}>
+                        <img src="img/cancel.svg" width="18" height="18" className="mx_filterFlipColor" />
+                    </AccessibleButton>
                     <div className="mx_MemberInfo_avatar">
                         <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
                     </div>

From ffcba9498ec4281c4d308476764f5fdde64ea51e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 12 Jun 2018 16:14:24 +0100
Subject: [PATCH 228/702] Keep context menus that extend downwards vertically
 on screen

This fixes https://github.com/vector-im/riot-web/issues/3429 in the case
of RoomList context menus *and* EventTile context menus.

This was mostly stolen from #1903 and it would be good to factor things
out at a later date such that #1903 is replaced with similar logic
within ContextualMenu.
---
 src/components/structures/ContextualMenu.js | 37 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index daac294d12..3e867ad384 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -63,6 +63,24 @@ export default class ContextualMenu extends React.Component {
         hasBackground: PropTypes.bool,
     }
 
+    constructor() {
+        super();
+        this.state = {
+            contextMenuRect: null,
+        };
+
+        this.collectContextMenuRect = this.collectContextMenuRect.bind(this);
+    }
+
+    collectContextMenuRect(element) {
+        // We don't need to clean up when unmounting, so ignore
+        if (!element) return;
+
+        this.setState({
+            contextMenuRect: element.getBoundingClientRect(),
+        });
+    }
+
     render() {
         const position = {};
         let chevronFace = null;
@@ -83,6 +101,9 @@ export default class ContextualMenu extends React.Component {
             chevronFace = 'right';
         }
 
+        const contextMenuRect = this.state.contextMenuRect || null;
+        const padding = 10;
+
         const chevronOffset = {};
         if (props.chevronFace) {
             chevronFace = props.chevronFace;
@@ -90,7 +111,19 @@ export default class ContextualMenu extends React.Component {
         if (chevronFace === 'top' || chevronFace === 'bottom') {
             chevronOffset.left = props.chevronOffset;
         } else {
-            chevronOffset.top = props.chevronOffset;
+            const target = position.top;
+
+            // By default, no adjustment is made
+            let adjusted = target;
+
+            // If we know the dimensions of the context menu, adjust its position
+            // such that it does not leave the (padded) window.
+            if (contextMenuRect) {
+                adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding);
+            }
+
+            position.top = adjusted;
+            chevronOffset.top = Math.max(props.chevronOffset, props.chevronOffset + target - adjusted);
         }
 
         // To override the default chevron colour, if it's been set
@@ -154,7 +187,7 @@ export default class ContextualMenu extends React.Component {
         // FIXME: If a menu uses getDefaultProps it clobbers the onFinished
         // property set here so you can't close the menu from a button click!
         return <div className={className} style={position}>
-            <div className={menuClasses} style={menuStyle}>
+            <div className={menuClasses} style={menuStyle} ref={this.collectContextMenuRect}>
                 { chevron }
                 <ElementClass {...props} onFinished={props.closeMenu} onResize={props.windowResize} />
             </div>

From 6a382aa57c10bc8ef8817f054beac45ca34b72a1 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Tue, 12 Jun 2018 13:44:07 +0000
Subject: [PATCH 229/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1188 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index bc6b51a269..bed1cb3a21 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1189,5 +1189,6 @@
     "Reload widget": "Перезагрузить виджет",
     "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть",
     "Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть."
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.",
+    "Try the app first": "Сначала попробуйте приложение"
 }

From 175f1aa15cc51f28d376d550cc76520830535806 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Jun 2018 16:43:54 +0100
Subject: [PATCH 230/702] don't set the displayname on registration as Synapse
 now does it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index bd8f66163f..50a1f70496 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1143,11 +1143,6 @@ export default React.createClass({
         } else if (this._is_registered) {
             this._is_registered = false;
 
-            // Set the display name = user ID localpart
-            MatrixClientPeg.get().setDisplayName(
-                MatrixClientPeg.get().getUserIdLocalpart(),
-            );
-
             if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
                 createRoom({
                     dmUserId: this.props.config.welcomeUserId,

From c1d375c3fd76b252b0e12a0e9636dde96d15d8b4 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 2 Jun 2018 12:31:10 +0000
Subject: [PATCH 231/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index ac2187456e..b8ebdde7e4 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1194,5 +1194,6 @@
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso dituzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
     "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)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)",
     "Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera."
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera.",
+    "Try the app first": "Probatu aplikazioa aurretik"
 }

From 18d542965de969331c527e6543a2fa60b91e5f6f Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 30 May 2018 12:53:39 +0000
Subject: [PATCH 232/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index e1709f1e0a..e9482f9b59 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1187,5 +1187,6 @@
     "Terms and Conditions": "Правила и условия",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.",
     "Review terms and conditions": "Прегледай правилата и условията",
-    "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта"
+    "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта",
+    "Try the app first": "Първо пробвайте приложението"
 }

From b477d1d976a84d8a93090d7ed7ed6847b6c1bcd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 28 May 2018 06:49:16 +0000
Subject: [PATCH 233/702] Translated using Weblate (French)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c3cfdef5fc..4518b92c61 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1195,5 +1195,6 @@
     "Yes, I want to help!": "Oui, je veux aider !",
     "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
-    "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)"
+    "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)",
+    "Try the app first": "Essayer d'abord l'application"
 }

From 22bec0d67d6928afedeaca9be43b45c924d3f639 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 09:13:32 +0100
Subject: [PATCH 234/702] allow CreateRoom to scale properly horizontally

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_CreateRoomDialog.scss     | 5 +++++
 src/components/views/dialogs/CreateRoomDialog.js | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index 888f147d21..05d5bfcebf 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -23,6 +23,10 @@ limitations under the License.
     padding-bottom: 12px;
 }
 
+.mx_CreateRoomDialog_input_container {
+    padding-right: 20px;
+}
+
 .mx_CreateRoomDialog_input {
     font-size: 15px;
     border-radius: 3px;
@@ -30,4 +34,5 @@ limitations under the License.
     padding: 9px;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
+    width: 100%;
 }
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 51693a19c9..3b5369e8f6 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -52,8 +52,8 @@ export default React.createClass({
                         <div className="mx_CreateRoomDialog_label">
                             <label htmlFor="textinput"> { _t('Room name (optional)') } </label>
                         </div>
-                        <div>
-                            <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" />
+                        <div className="mx_CreateRoomDialog_input_container">
+                            <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} />
                         </div>
                         <br />
 

From 846c14062a424544d1aa9345c85778c17c6ba92f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 09:28:35 +0100
Subject: [PATCH 235/702] show redacted stickers like other redacted messages

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/MessageEvent.js |  3 ++-
 src/components/views/rooms/EventTile.js       | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 38f55c9d70..babe1bbf29 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -69,7 +69,8 @@ module.exports = React.createClass({
         if (msgtype && bodyTypes[msgtype]) {
             BodyType = bodyTypes[msgtype];
         } else if (this.props.mxEvent.getType() === 'm.sticker') {
-            BodyType = sdk.getComponent('messages.MStickerBody');
+            // if sticker is redacted, show UnknownBody otherwise it'll fall through to elif
+            BodyType = this.props.mxEvent.isRedacted() ? UnknownBody : sdk.getComponent('messages.MStickerBody');
         } else if (content.url) {
             // Fallback to MFileBody if there's a content URL
             BodyType = bodyTypes['m.file'];
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 589524bb9e..c43ddaad11 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -490,7 +490,7 @@ module.exports = withMatrixClient(React.createClass({
         }
 
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
-        const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted;
+        const isRedacted = isMessageEvent(this.props.mxEvent) && this.props.isRedacted;
         const isEncryptionFailure = this.props.mxEvent.isDecryptionFailure();
 
         const classes = classNames({
@@ -715,9 +715,15 @@ module.exports = withMatrixClient(React.createClass({
     },
 }));
 
+// XXX this'll eventually be dynamic based on the fields once we have extensible event types
+const messageTypes = ['m.room.message', 'm.sticker'];
+function isMessageEvent(ev) {
+    return (messageTypes.includes(ev.getType()));
+}
+
 module.exports.haveTileForEvent = function(e) {
     // Only messages have a tile (black-rectangle) if redacted
-    if (e.isRedacted() && e.getType() !== 'm.room.message') return false;
+    if (e.isRedacted() && !isMessageEvent(e)) return false;
 
     const handler = getHandlerTile(e);
     if (handler === undefined) return false;

From 20caea47f81aaa46ae04d9408b15da5b28374aa8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 09:32:21 +0100
Subject: [PATCH 236/702] make more generic

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/MessageEvent.js | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index babe1bbf29..c4d29257ff 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -62,18 +62,24 @@ module.exports = React.createClass({
             'm.audio': sdk.getComponent('messages.MAudioBody'),
             'm.video': sdk.getComponent('messages.MVideoBody'),
         };
+        const evTypes = {
+            'm.sticker': sdk.getComponent('messages.MStickerBody'),
+        };
 
         const content = this.props.mxEvent.getContent();
+        const type = this.props.mxEvent.getType();
         const msgtype = content.msgtype;
         let BodyType = UnknownBody;
-        if (msgtype && bodyTypes[msgtype]) {
-            BodyType = bodyTypes[msgtype];
-        } else if (this.props.mxEvent.getType() === 'm.sticker') {
-            // if sticker is redacted, show UnknownBody otherwise it'll fall through to elif
-            BodyType = this.props.mxEvent.isRedacted() ? UnknownBody : sdk.getComponent('messages.MStickerBody');
-        } else if (content.url) {
-            // Fallback to MFileBody if there's a content URL
-            BodyType = bodyTypes['m.file'];
+        if (!this.props.mxEvent.isRedacted()) {
+            // only resolve BodyType if event is not redacted
+            if (msgtype && bodyTypes[msgtype]) {
+                BodyType = bodyTypes[msgtype];
+            } else if (type && evTypes[type]) {
+                BodyType = evTypes[type];
+            } else if (content.url) {
+                // Fallback to MFileBody if there's a content URL
+                BodyType = bodyTypes['m.file'];
+            }
         }
 
         return <BodyType

From 64b86108d06ceab1d24e46c5045e8fcd50aa88c8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 13 Jun 2018 09:38:23 +0100
Subject: [PATCH 237/702] Only track decryption failures

---
 src/components/structures/MatrixChat.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index d4969a8bf9..b5c5efa230 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1311,9 +1311,7 @@ export default React.createClass({
         // XXX: This will do a HTTP request for each Event.decrypted event
         cli.on("Event.decrypted", (e) => {
             if (e.isDecryptionFailure()) {
-                Analytics.trackEvent('E2E', 'Decryption result', 'failure');
-            } else {
-                Analytics.trackEvent('E2E', 'Decryption result', 'success');
+                Analytics.trackEvent('E2E', 'Decryption failure');
             }
         });
 

From 230de44071196151fbc247f0a90a9b9954286d38 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 13 Jun 2018 09:38:57 +0100
Subject: [PATCH 238/702] Adjust comment

---
 src/components/structures/MatrixChat.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b5c5efa230..c94baa63ef 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1309,6 +1309,7 @@ export default React.createClass({
         });
 
         // XXX: This will do a HTTP request for each Event.decrypted event
+        // if the decryption was a failure
         cli.on("Event.decrypted", (e) => {
             if (e.isDecryptionFailure()) {
                 Analytics.trackEvent('E2E', 'Decryption failure');

From 8136069046db911f231d41f56b8d657a6cde94d2 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Tue, 12 Jun 2018 21:55:54 +0000
Subject: [PATCH 239/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index b8ebdde7e4..1be59bdbd5 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -844,8 +844,8 @@
     "were unbanned %(count)s times|one": "debekua kendu zaie",
     "was unbanned %(count)s times|other": "%(count)s aldiz kendu zaio debekua",
     "was unbanned %(count)s times|one": "debekua kendu zaio",
-    "were kicked %(count)s times|other": "%(count)s kanporatu zaie",
-    "were kicked %(count)s times|one": "kanporatu zaie",
+    "were kicked %(count)s times|other": "%(count)s aldiz kanporatu zaie",
+    "were kicked %(count)s times|one": "(r) kanporatu zaie",
     "was kicked %(count)s times|other": "%(count)s aldiz kanporatu zaio",
     "was kicked %(count)s times|one": "kanporatu zaio",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s erabiltzaileek bere izena aldatu dute %(count)s aldiz",

From 41be46a7120075b5792194bcdf2c56f6e9b240fa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 09:51:35 +0100
Subject: [PATCH 240/702] apply roomlist searchFilter to aliases if it begins
 with a `#`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index fb82ee067b..17daa8553b 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -105,8 +105,15 @@ var RoomSubList = React.createClass({
 
     applySearchFilter: function(list, filter) {
         if (filter === "") return list;
+        const lcFilter = filter.toLowerCase();
         return list.filter((room) => {
-            return room.name && room.name.toLowerCase().indexOf(filter.toLowerCase()) >= 0
+            if (room.name && room.name.toLowerCase().includes(lcFilter)) return true;
+            // only apply search filter to aliases if it looks like an alias (starts with `#`)
+            // to prevent loads of false positives with server names, e.g `matrix`
+            if (filter[0] === '#' && room.getAliases().some((alias) => {
+                return alias.toLowerCase().startsWith(lcFilter);
+            })) return true;
+            return false;
         });
     },
 

From 1cb794753e4114c86132de7058d13a920fafe448 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 13 Jun 2018 10:39:52 +0100
Subject: [PATCH 241/702] Simplify & refactor some widget stuff

 * ScalarMessaging onMessage was getting the current room ID by listening
  for view_and remembering the room id or alias, and so having to look up
  the alias if it was alias. We have RoomViewStore for this.
 * Move waitForUserWidget into WidgetUtils
 * s/require/import/
---
 src/ScalarMessaging.js | 193 +++++++++++++----------------------------
 src/WidgetUtils.js     |  46 ++++++++++
 2 files changed, 106 insertions(+), 133 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 9457e6ccfb..dd3975dfe5 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -231,11 +232,12 @@ Example:
 }
 */
 
-const SdkConfig = require('./SdkConfig');
-const MatrixClientPeg = require("./MatrixClientPeg");
-const MatrixEvent = require("matrix-js-sdk").MatrixEvent;
-const dis = require("./dispatcher");
-const Widgets = require('./utils/widgets');
+import SdkConfig from './SdkConfig';
+import MatrixClientPeg from './MatrixClientPeg';
+import { MatrixEvent } from 'matrix-js-sdk';
+import dis from './dispatcher';
+import Widgets from './utils/widgets';
+import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
 
 function sendResponse(event, res) {
@@ -286,51 +288,6 @@ function inviteUser(event, roomId, userId) {
     });
 }
 
-/**
- * Returns a promise that resolves when a widget with the given
- * ID has been added as a user widget (ie. the accountData event
- * arrives) or rejects after a timeout
- *
- * @param {string} widgetId The ID of the widget to wait for
- * @param {boolean} add True to wait for the widget to be added,
- *     false to wait for it to be deleted.
- * @returns {Promise} that resolves when the widget is available
- */
-function waitForUserWidget(widgetId, add) {
-    return new Promise((resolve, reject) => {
-        const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
-
-        // Tests an account data event, returning true if it's in the state
-        // we're waiting for it to be in
-        function eventInIntendedState(ev) {
-            if (!ev || !currentAccountDataEvent.getContent()) return false;
-            if (add) {
-                return ev.getContent()[widgetId] !== undefined;
-            } else {
-                return ev.getContent()[widgetId] === undefined;
-            }
-        }
-
-        if (eventInIntendedState(currentAccountDataEvent)) {
-            resolve();
-            return;
-        }
-
-        function onAccountData(ev) {
-            if (eventInIntendedState(currentAccountDataEvent)) {
-                MatrixClientPeg.get().removeListener('accountData', onAccountData);
-                clearTimeout(timerId);
-                resolve();
-            }
-        }
-        const timerId = setTimeout(() => {
-            MatrixClientPeg.get().removeListener('accountData', onAccountData);
-            reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
-        }, 10000);
-        MatrixClientPeg.get().on('accountData', onAccountData);
-    });
-}
-
 function setWidget(event, roomId) {
     const widgetId = event.data.widget_id;
     const widgetType = event.data.type;
@@ -637,19 +594,6 @@ function returnStateEvent(event, roomId, eventType, stateKey) {
     sendResponse(event, stateEvent.getContent());
 }
 
-let currentRoomId = null;
-let currentRoomAlias = null;
-
-// Listen for when a room is viewed
-dis.register(onAction);
-function onAction(payload) {
-    if (payload.action !== "view_room") {
-        return;
-    }
-    currentRoomId = payload.room_id;
-    currentRoomAlias = payload.room_alias;
-}
-
 const onMessage = function(event) {
     if (!event.origin) { // stupid chrome
         event.origin = event.originalEvent.origin;
@@ -700,80 +644,63 @@ const onMessage = function(event) {
             return;
         }
     }
-    let promise = Promise.resolve(currentRoomId);
-    if (!currentRoomId) {
-        if (!currentRoomAlias) {
-            sendError(event, _t('Must be viewing a room'));
-            return;
-        }
-        // no room ID but there is an alias, look it up.
-        console.log("Looking up alias " + currentRoomAlias);
-        promise = MatrixClientPeg.get().getRoomIdForAlias(currentRoomAlias).then((res) => {
-            return res.room_id;
-        });
+
+    if (roomId !== RoomViewStore.getRoomId()) {
+        sendError(event, _t('Room %(roomId)s not visible', {roomId: roomId}));
+        return;
     }
 
-    promise.then((viewingRoomId) => {
-        if (roomId !== viewingRoomId) {
-            sendError(event, _t('Room %(roomId)s not visible', {roomId: roomId}));
-            return;
-        }
+    // Get and set room-based widgets
+    if (event.data.action === "get_widgets") {
+        getWidgets(event, roomId);
+        return;
+    } else if (event.data.action === "set_widget") {
+        setWidget(event, roomId);
+        return;
+    }
 
-        // Get and set room-based widgets
-        if (event.data.action === "get_widgets") {
-            getWidgets(event, roomId);
-            return;
-        } else if (event.data.action === "set_widget") {
-            setWidget(event, roomId);
-            return;
-        }
+    // These APIs don't require userId
+    if (event.data.action === "join_rules_state") {
+        getJoinRules(event, roomId);
+        return;
+    } else if (event.data.action === "set_plumbing_state") {
+        setPlumbingState(event, roomId, event.data.status);
+        return;
+    } else if (event.data.action === "get_membership_count") {
+        getMembershipCount(event, roomId);
+        return;
+    } else if (event.data.action === "get_room_enc_state") {
+        getRoomEncState(event, roomId);
+        return;
+    } else if (event.data.action === "can_send_event") {
+        canSendEvent(event, roomId);
+        return;
+    }
 
-        // These APIs don't require userId
-        if (event.data.action === "join_rules_state") {
-            getJoinRules(event, roomId);
-            return;
-        } else if (event.data.action === "set_plumbing_state") {
-            setPlumbingState(event, roomId, event.data.status);
-            return;
-        } else if (event.data.action === "get_membership_count") {
-            getMembershipCount(event, roomId);
-            return;
-        } else if (event.data.action === "get_room_enc_state") {
-            getRoomEncState(event, roomId);
-            return;
-        } else if (event.data.action === "can_send_event") {
-            canSendEvent(event, roomId);
-            return;
-        }
-
-        if (!userId) {
-            sendError(event, _t('Missing user_id in request'));
-            return;
-        }
-        switch (event.data.action) {
-            case "membership_state":
-                getMembershipState(event, roomId, userId);
-                break;
-            case "invite":
-                inviteUser(event, roomId, userId);
-                break;
-            case "bot_options":
-                botOptions(event, roomId, userId);
-                break;
-            case "set_bot_options":
-                setBotOptions(event, roomId, userId);
-                break;
-            case "set_bot_power":
-                setBotPower(event, roomId, userId, event.data.level);
-                break;
-            default:
-                console.warn("Unhandled postMessage event with action '" + event.data.action +"'");
-                break;
-        }
-    }, (err) => {
-        console.error(err);
-        sendError(event, _t('Failed to lookup current room') + '.');
-    });
+    if (!userId) {
+        sendError(event, _t('Missing user_id in request'));
+        return;
+    }
+    switch (event.data.action) {
+        case "membership_state":
+            getMembershipState(event, roomId, userId);
+            break;
+        case "invite":
+            inviteUser(event, roomId, userId);
+            break;
+        case "bot_options":
+            botOptions(event, roomId, userId);
+            break;
+        case "set_bot_options":
+            setBotOptions(event, roomId, userId);
+            break;
+        case "set_bot_power":
+            setBotPower(event, roomId, userId, event.data.level);
+            break;
+        default:
+            console.warn("Unhandled postMessage event with action '" + event.data.action +"'");
+            break;
+    }
 };
 
 let listenerCount = 0;
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 10cd473904..c6816d28b6 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -90,4 +91,49 @@ export default class WidgetUtils {
         }
         return false;
     }
+
+    /**
+     * Returns a promise that resolves when a widget with the given
+     * ID has been added as a user widget (ie. the accountData event
+     * arrives) or rejects after a timeout
+     *
+     * @param {string} widgetId The ID of the widget to wait for
+     * @param {boolean} add True to wait for the widget to be added,
+     *     false to wait for it to be deleted.
+     * @returns {Promise} that resolves when the widget is available
+     */
+    static waitForUserWidget(widgetId, add) {
+        return new Promise((resolve, reject) => {
+            const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
+
+            // Tests an account data event, returning true if it's in the state
+            // we're waiting for it to be in
+            function eventInIntendedState(ev) {
+                if (!ev || !currentAccountDataEvent.getContent()) return false;
+                if (add) {
+                    return ev.getContent()[widgetId] !== undefined;
+                } else {
+                    return ev.getContent()[widgetId] === undefined;
+                }
+            }
+
+            if (eventInIntendedState(currentAccountDataEvent)) {
+                resolve();
+                return;
+            }
+
+            function onAccountData(ev) {
+                if (eventInIntendedState(currentAccountDataEvent)) {
+                    MatrixClientPeg.get().removeListener('accountData', onAccountData);
+                    clearTimeout(timerId);
+                    resolve();
+                }
+            }
+            const timerId = setTimeout(() => {
+                MatrixClientPeg.get().removeListener('accountData', onAccountData);
+                reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
+            }, 10000);
+            MatrixClientPeg.get().on('accountData', onAccountData);
+        });
+    }
 }

From e98112254d7061e3ab913a3c7e2d0edbf078cec2 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Mon, 21 May 2018 19:37:07 +0900
Subject: [PATCH 242/702] Update lolex to 2.7.0

Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
---
 package-lock.json | 379 +++++-----------------------------------------
 package.json      |   2 +-
 2 files changed, 41 insertions(+), 340 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97ed7b5dea..433ed3ea4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.4",
+  "version": "0.12.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -52,17 +52,6 @@
       "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
       "dev": true
     },
-    "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "requires": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
-      }
-    },
     "ajv-keywords": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
@@ -86,11 +75,6 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
-    "another-json": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz",
-      "integrity": "sha1-tfQBnJc7bdXGUGotk0acttMq7tw="
-    },
     "ansi-escapes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
@@ -205,11 +189,6 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
     "assert": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
@@ -219,11 +198,6 @@
         "util": "0.10.3"
       }
     },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
     "async": {
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
@@ -236,21 +210,6 @@
       "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
       "dev": true
     },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
-    },
     "babel-cli": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
@@ -1145,15 +1104,6 @@
       "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
       "dev": true
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "better-assert": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
@@ -1321,11 +1271,6 @@
       "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
       "dev": true
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
     "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
@@ -1420,7 +1365,8 @@
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
     },
     "code-point-at": {
       "version": "1.1.0",
@@ -1443,14 +1389,6 @@
         "lodash": "^4.5.0"
       }
     },
-    "combined-stream": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
     "commander": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
@@ -1538,7 +1476,8 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
     },
     "convert-source-map": {
       "version": "1.5.0",
@@ -1611,14 +1550,6 @@
         "es5-ext": "^0.10.9"
       }
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "date-names": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/date-names/-/date-names-0.1.10.tgz",
@@ -1676,11 +1607,6 @@
         "rimraf": "^2.2.8"
       }
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
     "depd": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
@@ -1805,15 +1731,6 @@
       "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.2.0.tgz",
       "integrity": "sha1-9csj6xZzJf/tPXmIL9wxdyHS/RI="
     },
-    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
-      "requires": {
-        "jsbn": "~0.1.0"
-      }
-    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -2382,21 +2299,6 @@
         "is-extglob": "^1.0.0"
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-    },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -2610,21 +2512,6 @@
       "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=",
       "dev": true
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
     "fs-access": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
@@ -2669,8 +2556,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "co": "^4.6.0",
+            "json-stable-stringify": "^1.0.1"
           }
         },
         "ansi-regex": {
@@ -2750,7 +2637,6 @@
           "version": "2.10.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "hoek": "2.x.x"
           }
@@ -2988,8 +2874,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
+            "ajv": "^4.9.1",
+            "har-schema": "^1.0.5"
           }
         },
         "has-unicode": {
@@ -3004,17 +2890,16 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
+            "boom": "2.x.x",
+            "cryptiles": "2.x.x",
+            "hoek": "2.x.x",
+            "sntp": "1.x.x"
           }
         },
         "hoek": {
           "version": "2.16.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "http-signature": {
           "version": "1.1.1",
@@ -3197,8 +3082,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
         },
         "npmlog": {
@@ -3294,10 +3179,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
+            "deep-extend": "~0.4.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -3389,7 +3274,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "hoek": "2.16.3"
+            "hoek": "2.x.x"
           }
         },
         "sshpk": {
@@ -3422,9 +3307,9 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
         "string_decoder": {
@@ -3432,7 +3317,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "5.0.1"
+            "safe-buffer": "^5.0.1"
           }
         },
         "stringstream": {
@@ -3446,7 +3331,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
@@ -3487,7 +3372,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "punycode": "1.4.1"
+            "punycode": "^1.4.1"
           }
         },
         "tunnel-agent": {
@@ -3496,7 +3381,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.0.1"
+            "safe-buffer": "^5.0.1"
           }
         },
         "tweetnacl": {
@@ -3558,10 +3443,6 @@
       "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-2.7.4.tgz",
       "integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk="
     },
-    "gemini-scrollbar": {
-      "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
-      "from": "gemini-scrollbar@github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
-    },
     "generate-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
@@ -3577,14 +3458,6 @@
         "is-property": "^1.0.0"
       }
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "gfm.css": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/gfm.css/-/gfm.css-1.1.2.tgz",
@@ -3663,20 +3536,6 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-      "requires": {
-        "ajv": "^5.1.0",
-        "har-schema": "^2.0.0"
-      }
-    },
     "has": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
@@ -3785,16 +3644,6 @@
         "requires-port": "1.x.x"
       }
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
     "https-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
@@ -4108,11 +3957,6 @@
       "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
       "dev": true
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -4148,15 +3992,11 @@
         "whatwg-fetch": ">=0.10.0"
       }
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
     "jquery": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
+      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=",
+      "optional": true
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -4173,12 +4013,6 @@
         "esprima": "^4.0.0"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -4191,16 +4025,6 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-    },
     "json-stable-stringify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
@@ -4210,11 +4034,6 @@
         "jsonify": "~0.0.0"
       }
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
     "json3": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
@@ -4239,17 +4058,6 @@
       "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
       "dev": true
     },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
     "jsx-ast-utils": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
@@ -4532,9 +4340,9 @@
       }
     },
     "lolex": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
-      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz",
+      "integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg=="
     },
     "longest": {
       "version": "1.0.1",
@@ -4556,19 +4364,6 @@
       "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
       "dev": true
     },
-    "matrix-js-sdk": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.2.tgz",
-      "integrity": "sha512-7o9a+4wWmxoW4cfdGVLGjZgTFLpWf/I0UqyicIzdV73qotYIO/q6k1bLf1+G0hgwZ/umwke4CB7GemxvvvxMcA==",
-      "requires": {
-        "another-json": "^0.2.0",
-        "babel-runtime": "^6.26.0",
-        "bluebird": "^3.5.0",
-        "browser-request": "^0.3.3",
-        "content-type": "^1.0.2",
-        "request": "^2.53.0"
-      }
-    },
     "matrix-mock-request": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/matrix-mock-request/-/matrix-mock-request-1.2.1.tgz",
@@ -4645,12 +4440,14 @@
     "mime-db": {
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+      "dev": true
     },
     "mime-types": {
       "version": "2.1.17",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "dev": true,
       "requires": {
         "mime-db": "~1.30.0"
       }
@@ -4877,11 +4674,6 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true
     },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5242,7 +5034,8 @@
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
     },
     "qjobs": {
       "version": "1.1.5",
@@ -5253,7 +5046,8 @@
     "qs": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+      "dev": true
     },
     "querystring": {
       "version": "0.2.0",
@@ -5389,13 +5183,6 @@
         "prop-types": "^15.5.10"
       }
     },
-    "react-gemini-scrollbar": {
-      "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
-      "from": "react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
-      "requires": {
-        "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
-      }
-    },
     "react-motion": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
@@ -5592,33 +5379,6 @@
         "is-finite": "^1.0.0"
       }
     },
-    "request": {
-      "version": "2.87.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
-      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "tough-cookie": "~2.3.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
-      }
-    },
     "require-json": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/require-json/-/require-json-0.0.1.tgz",
@@ -6049,21 +5809,6 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
       "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
     },
-    "sshpk": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
-      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "tweetnacl": "~0.14.0"
-      }
-    },
     "statuses": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -6288,14 +6033,6 @@
       "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
       "dev": true
     },
-    "tough-cookie": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-      "requires": {
-        "punycode": "^1.4.1"
-      }
-    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -6314,20 +6051,6 @@
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -6462,11 +6185,6 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
       "dev": true
     },
-    "uuid": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
-    },
     "v8flags": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
@@ -6476,23 +6194,6 @@
         "user-home": "^1.1.1"
       }
     },
-    "velocity-vector": {
-      "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
-      "from": "velocity-vector@github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
-      "requires": {
-        "jquery": ">= 1.4.3"
-      }
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "vm-browserify": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
diff --git a/package.json b/package.json
index 1fed55748c..885d37d754 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "lolex": "2.3.2",
+    "lolex": "^2.7.0",
     "matrix-js-sdk": "0.10.4",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",

From 3cadbd3974a4ccc7aae395c96f63332dced9ff72 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 13 Jun 2018 11:21:26 +0100
Subject: [PATCH 243/702] Include decryption error in decryption failure
 metrics

---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c94baa63ef..da729a1a2d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1312,7 +1312,7 @@ export default React.createClass({
         // if the decryption was a failure
         cli.on("Event.decrypted", (e) => {
             if (e.isDecryptionFailure()) {
-                Analytics.trackEvent('E2E', 'Decryption failure');
+                Analytics.trackEvent('E2E', 'Decryption failure', 'ev.content.body: ' + e.getContent().body);
             }
         });
 

From d4b2f06a63a65e4897d6cbbb6a46df22be933b83 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 13:51:04 +0100
Subject: [PATCH 244/702] fix message appears unencrypted while in flight

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/img/e2e-pending.svg                 | 12 ++++++++++++
 src/components/views/rooms/EventTile.js | 24 ++++++++++++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 res/img/e2e-pending.svg

diff --git a/res/img/e2e-pending.svg b/res/img/e2e-pending.svg
new file mode 100644
index 0000000000..469611cc8d
--- /dev/null
+++ b/res/img/e2e-pending.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="10px" height="12px" viewBox="0 0 10 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+<title>48BF5D32-306C-4B20-88EB-24B1F743CAC9</title>
+<desc>Created with sketchtool.</desc>
+<defs></defs>
+<g id="Typing-Indicator" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.4">
+    <g id="typing-indicator" transform="translate(-301.000000, -172.000000)" fill="#76CFA6">
+        <path d="M309.666667,175.666667 C309.666667,173.633333 308.033333,172 306,172 C303.966667,172 302.333333,173.633333 302.333333,175.666667 L302.333333,176.666667 L301,176.666667 L301,184 L306,184 L311,184 L311,176.666667 L309.666667,176.666667 L309.666667,175.666667 Z M306,176.666667 L303.666667,176.666667 L303.666667,175.666667 C303.666667,174.366667 304.7,173.333333 306,173.333333 C307.3,173.333333 308.333333,174.366667 308.333333,175.666667 L308.333333,176.666667 L306,176.666667 L306,176.666667 Z" id="verified_icon"></path>
+    </g>
+</g>
+</svg>
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 589524bb9e..50fe0928b0 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -34,6 +34,7 @@ const ContextualMenu = require('../../structures/ContextualMenu');
 import dis from '../../../dispatcher';
 import {makeEventPermalink} from "../../../matrix-to";
 import SettingsStore from "../../../settings/SettingsStore";
+import {EventStatus} from 'matrix-js-sdk';
 
 const ObjectUtils = require('../../../ObjectUtils');
 
@@ -442,7 +443,6 @@ module.exports = withMatrixClient(React.createClass({
         const ev = this.props.mxEvent;
         const props = {onClick: this.onCryptoClicked};
 
-
         if (ev.getContent().msgtype === 'm.bad.encrypted') {
             return <E2ePadlockUndecryptable {...props} />;
         } else if (ev.isEncrypted()) {
@@ -451,15 +451,15 @@ module.exports = withMatrixClient(React.createClass({
             } else {
                 return <E2ePadlockUnverified {...props} />;
             }
-        } else {
-            // XXX: if the event is being encrypted (ie eventSendStatus ===
-            // encrypting), it might be nice to show something other than the
-            // open padlock?
-
-            // if the event is not encrypted, but it's an e2e room, show the
-            // open padlock
-            const e2eEnabled = this.props.matrixClient.isRoomEncrypted(ev.getRoomId());
-            if (e2eEnabled) {
+        } else if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) {
+            // else if room is encrypted
+            // and event is being encrypted or is not_sent (Unknown Devices/Network Error)
+            if (ev.status === EventStatus.ENCRYPTING || ev.status === EventStatus.NOT_SENT) {
+                // XXX: if the event is being encrypted (ie eventSendStatus === encrypting),
+                // it might be nice to show something other than the open padlock?
+                return <E2ePadlockPending {...props} />;
+            } else {
+                // if the event is not encrypted, but it's an e2e room, show the open padlock
                 return <E2ePadlockUnencrypted {...props} />;
             }
         }
@@ -736,6 +736,10 @@ function E2ePadlockUndecryptable(props) {
     );
 }
 
+function E2ePadlockPending(props) {
+    return <E2ePadlock alt={_t('Encrypting')} src="img/e2e-pending.svg" width="10" height="12" {...props} />;
+}
+
 function E2ePadlockVerified(props) {
     return (
         <E2ePadlock alt={_t("Encrypted by a verified device")}

From 94125fb5668150a64c173356ee94a30798e6ecc8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 13 Jun 2018 15:50:19 +0100
Subject: [PATCH 245/702] Fix widgets re-appearing after being deleted

Widgets would sometimes briefly re-appear after having been deleted.
This was because of the following race:
 * User presses delete, send POST req, we set `deleting`. Widget hides.
 * POST request completes, we unset `deleting` so widget unhides.
 * State event comes down sync so widget hides again.

This fixes this by introducing `waitForRoomWidget` and using it to
wait until the state event comes down the sync until clearing the
`deleting` flag.

Since we now have `waitForRoomWidget`, this also uses it when adding
a widget so the 'widget saved' appears at the same time the widget
does.
---
 src/ScalarMessaging.js                   |  9 ++--
 src/WidgetUtils.js                       | 60 ++++++++++++++++++++++--
 src/components/views/elements/AppTile.js |  4 +-
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index dd3975dfe5..f80162e635 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -237,6 +237,7 @@ import MatrixClientPeg from './MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
 import dis from './dispatcher';
 import Widgets from './utils/widgets';
+import WidgetUtils from './WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
 
@@ -362,7 +363,7 @@ function setWidget(event, roomId) {
         // wait for this, the action will complete but if the user is fast enough,
         // the widget still won't actually be there.
         client.setAccountData('m.widgets', userWidgets).then(() => {
-            return waitForUserWidget(widgetId, widgetUrl !== null);
+            return WidgetUtils.waitForUserWidget(widgetId, widgetUrl !== null);
         }).then(() => {
             sendResponse(event, {
                 success: true,
@@ -382,9 +383,9 @@ function setWidget(event, roomId) {
         }
         // TODO - Room widgets need to be moved to 'm.widget' state events
         // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
-        client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).done(() => {
-            // XXX: We should probably wait for the echo of the state event to come back from the server,
-            // as we do with user widgets.
+        client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
+            return WidgetUtils.waitForRoomWidget(widgetId, roomId, widgetUrl !== null);
+        }).then(() => {
             sendResponse(event, {
                 success: true,
             });
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index c6816d28b6..14fe3f59bd 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -104,12 +104,10 @@ export default class WidgetUtils {
      */
     static waitForUserWidget(widgetId, add) {
         return new Promise((resolve, reject) => {
-            const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
-
             // Tests an account data event, returning true if it's in the state
             // we're waiting for it to be in
             function eventInIntendedState(ev) {
-                if (!ev || !currentAccountDataEvent.getContent()) return false;
+                if (!ev || !ev.getContent()) return false;
                 if (add) {
                     return ev.getContent()[widgetId] !== undefined;
                 } else {
@@ -117,12 +115,14 @@ export default class WidgetUtils {
                 }
             }
 
-            if (eventInIntendedState(currentAccountDataEvent)) {
+            const startingAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
+            if (eventInIntendedState(startingAccountDataEvent)) {
                 resolve();
                 return;
             }
 
             function onAccountData(ev) {
+                const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
                 if (eventInIntendedState(currentAccountDataEvent)) {
                     MatrixClientPeg.get().removeListener('accountData', onAccountData);
                     clearTimeout(timerId);
@@ -136,4 +136,56 @@ export default class WidgetUtils {
             MatrixClientPeg.get().on('accountData', onAccountData);
         });
     }
+
+    /**
+     * Returns a promise that resolves when a widget with the given
+     * ID has been added as a room widget in the given room (ie. the
+     * room state event arrives) or rejects after a timeout
+     *
+     * @param {string} widgetId The ID of the widget to wait for
+     * @param {string} roomId The ID of the room to wait for the widget in
+     * @param {boolean} add True to wait for the widget to be added,
+     *     false to wait for it to be deleted.
+     * @returns {Promise} that resolves when the widget is available
+     */
+    static waitForRoomWidget(widgetId, roomId, add) {
+        return new Promise((resolve, reject) => {
+            // Tests a list of state events, returning true if it's in the state
+            // we're waiting for it to be in
+            function eventsInIntendedState(evList) {
+                const widgetPresent = evList.some((ev) => {
+                    return ev.getContent() && ev.getContent()['id'] === widgetId;
+                });
+                if (add) {
+                    return widgetPresent;
+                } else {
+                    return !widgetPresent;
+                }
+            }
+
+            const room = MatrixClientPeg.get().getRoom(roomId);
+            const startingWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+            if (eventsInIntendedState(startingWidgetEvents)) {
+                resolve();
+                return;
+            }
+
+            function onRoomStateEvents(ev) {
+                if (ev.getRoomId() !== roomId) return;
+
+                const currentWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+
+                if (eventsInIntendedState(currentWidgetEvents)) {
+                    MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
+                    clearTimeout(timerId);
+                    resolve();
+                }
+            }
+            const timerId = setTimeout(() => {
+                MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
+                reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
+            }, 10000);
+            MatrixClientPeg.get().on('RoomState.events', onRoomStateEvents);
+        });
+    }
 }
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 429b5941b9..70b5bd651e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -324,7 +324,9 @@ export default class AppTile extends React.Component {
                             'im.vector.modular.widgets',
                             {}, // empty content
                             this.props.id,
-                        ).catch((e) => {
+                        ).then(() => {
+                            return WidgetUtils.waitForRoomWidget(this.props.id, this.props.room.roomId, false);
+                        }).catch((e) => {
                             console.error('Failed to delete widget', e);
                         }).finally(() => {
                             this.setState({deleting: false});

From 5cc2361737608ec7875b46151ea84c5989e6e8d3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 15:52:50 +0100
Subject: [PATCH 246/702] change not_sent e2e lock to match colour of text

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../{e2e-pending.svg => e2e-encrypting.svg}   |  0
 res/img/e2e-not_sent.svg                      | 12 ++++++
 src/components/views/rooms/EventTile.js       | 38 +++++++++++--------
 3 files changed, 34 insertions(+), 16 deletions(-)
 rename res/img/{e2e-pending.svg => e2e-encrypting.svg} (100%)
 create mode 100644 res/img/e2e-not_sent.svg

diff --git a/res/img/e2e-pending.svg b/res/img/e2e-encrypting.svg
similarity index 100%
rename from res/img/e2e-pending.svg
rename to res/img/e2e-encrypting.svg
diff --git a/res/img/e2e-not_sent.svg b/res/img/e2e-not_sent.svg
new file mode 100644
index 0000000000..fca79ae547
--- /dev/null
+++ b/res/img/e2e-not_sent.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="10px" height="12px" viewBox="0 0 10 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+<title>48BF5D32-306C-4B20-88EB-24B1F743CAC9</title>
+<desc>Created with sketchtool.</desc>
+<defs></defs>
+<g id="Typing-Indicator" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="typing-indicator" transform="translate(-301.000000, -172.000000)" fill="#f44">
+        <path d="M309.666667,175.666667 C309.666667,173.633333 308.033333,172 306,172 C303.966667,172 302.333333,173.633333 302.333333,175.666667 L302.333333,176.666667 L301,176.666667 L301,184 L306,184 L311,184 L311,176.666667 L309.666667,176.666667 L309.666667,175.666667 Z M306,176.666667 L303.666667,176.666667 L303.666667,175.666667 C303.666667,174.366667 304.7,173.333333 306,173.333333 C307.3,173.333333 308.333333,174.366667 308.333333,175.666667 L308.333333,176.666667 L306,176.666667 L306,176.666667 Z" id="verified_icon"></path>
+    </g>
+</g>
+</svg>
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 50fe0928b0..9863a1c60a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -443,25 +443,27 @@ module.exports = withMatrixClient(React.createClass({
         const ev = this.props.mxEvent;
         const props = {onClick: this.onCryptoClicked};
 
+        // event could not be decrypted
         if (ev.getContent().msgtype === 'm.bad.encrypted') {
             return <E2ePadlockUndecryptable {...props} />;
-        } else if (ev.isEncrypted()) {
-            if (this.state.verified) {
-                return <E2ePadlockVerified {...props} />;
-            } else {
-                return <E2ePadlockUnverified {...props} />;
-            }
-        } else if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) {
+        }
+
+        // event is encrypted, display padlock corresponding to whether or not it is verified
+        if (ev.isEncrypted()) {
+            return this.state.verified ? <E2ePadlockVerified {...props} /> : <E2ePadlockUnverified {...props} />;
+        }
+
+        if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) {
             // else if room is encrypted
             // and event is being encrypted or is not_sent (Unknown Devices/Network Error)
-            if (ev.status === EventStatus.ENCRYPTING || ev.status === EventStatus.NOT_SENT) {
-                // XXX: if the event is being encrypted (ie eventSendStatus === encrypting),
-                // it might be nice to show something other than the open padlock?
-                return <E2ePadlockPending {...props} />;
-            } else {
-                // if the event is not encrypted, but it's an e2e room, show the open padlock
-                return <E2ePadlockUnencrypted {...props} />;
+            if (ev.status === EventStatus.ENCRYPTING) {
+                return <E2ePadlockEncrypting {...props} />;
             }
+            if (ev.status === EventStatus.NOT_SENT) {
+                return <E2ePadlockNotSent {...props} />;
+            }
+            // if the event is not encrypted, but it's an e2e room, show the open padlock
+            return <E2ePadlockUnencrypted {...props} />;
         }
 
         // no padlock needed
@@ -736,8 +738,12 @@ function E2ePadlockUndecryptable(props) {
     );
 }
 
-function E2ePadlockPending(props) {
-    return <E2ePadlock alt={_t('Encrypting')} src="img/e2e-pending.svg" width="10" height="12" {...props} />;
+function E2ePadlockEncrypting(props) {
+    return <E2ePadlock alt={_t("Encrypting")} src="img/e2e-encrypting.svg" width="10" height="12" {...props} />;
+}
+
+function E2ePadlockNotSent(props) {
+    return <E2ePadlock alt={_t("Encrypted, not sent")} src="img/e2e-not_sent.svg" width="10" height="12" {...props} />;
 }
 
 function E2ePadlockVerified(props) {

From ac77b2d9ec1106427f0e887f416deb3b7eed04bc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 16:00:57 +0100
Subject: [PATCH 247/702] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/de_DE.json   |  3 --
 src/i18n/strings/en_EN.json   | 64 ++++++++++++++++++-----------------
 src/i18n/strings/eu.json      |  7 ----
 src/i18n/strings/fr.json      |  8 -----
 src/i18n/strings/hu.json      |  8 -----
 src/i18n/strings/is.json      |  1 -
 src/i18n/strings/it.json      |  3 --
 src/i18n/strings/ru.json      |  4 ---
 src/i18n/strings/sv.json      |  2 --
 src/i18n/strings/zh_Hant.json |  3 --
 10 files changed, 33 insertions(+), 70 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index aaf51f0d9e..c3ff855020 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1168,9 +1168,6 @@
     "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.",
     "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren",
     "Send analytics data": "Analysedaten senden",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere <PolicyLink>Datenschutzerklärung</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.",
-    "Yes please": "Ja, bitte",
     "e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
     "Reload widget": "Widget neu laden",
     "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f182ecdbad..1a761c2c5c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,6 +85,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -104,7 +109,6 @@
     "You need to be logged in.": "You need to be logged in.",
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "Unable to create widget.": "Unable to create widget.",
-    "Reload widget": "Reload widget",
     "Missing roomId.": "Missing roomId.",
     "Failed to send request.": "Failed to send request.",
     "This room is not recognised.": "This room is not recognised.",
@@ -180,11 +184,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -298,6 +297,29 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -316,6 +338,8 @@
     "Key request sent.": "Key request sent.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-request encryption keys</requestLink> from your other devices.",
     "Undecryptable": "Undecryptable",
+    "Encrypting": "Encrypting",
+    "Encrypted, not sent": "Encrypted, not sent",
     "Encrypted by a verified device": "Encrypted by a verified device",
     "Encrypted by an unverified device": "Encrypted by an unverified device",
     "Unencrypted message": "Unencrypted message",
@@ -394,11 +418,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -531,29 +555,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -664,6 +665,7 @@
     "Delete widget": "Delete widget",
     "Revoke widget access": "Revoke widget access",
     "Minimize apps": "Minimize apps",
+    "Reload widget": "Reload widget",
     "Popout widget": "Popout widget",
     "Picture": "Picture",
     "Edit": "Edit",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index ac2187456e..af04f66fa6 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1169,20 +1169,13 @@
     "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan",
     "Send analytics data": "Bidali datu analitikoak",
     "Muted Users": "Mutututako erabiltzaileak",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure <PolicyLink>Cookie eta pribatutasun politikak</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.",
-    "Yes please": "Bai mesedez",
     "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.",
     "Terms and Conditions": "Termino eta baldintzak",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.",
     "Review terms and conditions": "Irakurri termino eta baldintzak",
     "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi",
-    "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. <b>This action is irreversible.</b>": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. <b>Ez dago ekintza hau desegiterik.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean <b>ez dira lehenetsita zuk bidalitako mezuak ezabatuko.</b> Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.",
     "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
     "password": "pasahitza",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).",
     "e.g. %(exampleValue)s": "adib. %(exampleValue)s",
     "Reload widget": "Birkargatu trepeta",
     "To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c3cfdef5fc..9f276f4699 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1168,25 +1168,17 @@
     "Collapse Reply Thread": "Dévoiler le fil de réponse",
     "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
     "Send analytics data": "Envoyer les données analytiques",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.",
-    "Yes please": "Oui, s'il vous plaît",
     "Muted Users": "Utilisateurs ignorés",
     "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.",
     "Terms and Conditions": "Conditions générales",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
     "Review terms and conditions": "Voir les conditions générales",
     "Failed to indicate account erasure": "Échec de notification de la suppression du compte",
-    "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. <b>This action is irreversible.</b>": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. <b>Cette action est irréversible.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "Désactiver votre compte <b>ne supprime pas les messages que vous avez envoyés par défaut.</b> Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.",
     "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
     "password": "mot de passe",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).",
     "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>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. <b>Cette action est irréversible.</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.": "La désactivation du compte <b>ne nous fait pas oublier les messages que vous avez envoyés par défaut.</b> Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
     "e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aider Riot à s'améliorer en envoyant <UsageDataLink>des données d'utilisation</UsageDataLink> ? Cela utilisera un cookie. (Voir nos <PolicyLink>politiques de cookie et de confidentialité</PolicyLink>).",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)",
     "Reload widget": "Recharger le widget",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index aa1904d0bf..0be5087d55 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1168,27 +1168,19 @@
     "Collapse Reply Thread": "Beszélgetés szál becsukása",
     "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
     "Send analytics data": "Analitikai adatok küldése",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a <PolicyLink>sütikről és titoktartási irányelvekről</PolicyLink> szóló leírást).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.",
-    "Yes please": "Igen, kérlek",
     "Muted Users": "Elnémított felhasználók",
     "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.",
     "Terms and Conditions": "Általános Szerződési Feltételek",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
     "Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
     "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen",
-    "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. <b>This action is irreversible.</b>": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. <b>Ez a művelet visszafordíthatatlan.</b>",
-    "Deactivating your account <b>does not by default erase messages you have sent.</b> If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése <b>alapértelmezetten nem töröli semelyik általad küldött üzenetet.</b> Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.",
-    "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.",
     "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
     "password": "jelszó",
-    "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. <b>Ez a művelet visszafordíthatatlan.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése <b>nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek.</b> Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
     "e.g. %(exampleValue)s": "pl. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Segítesz jobbá tenni a Riotot <UsageDataLink>használati adat</UsageDataLink> küldésével? Ez sütit (cookie) fog használni. (Nézd meg az <PolicyLink>Általános Szerződési Feltételeket</PolicyLink>).",
     "Reload widget": "Kisalkalmazás újratöltése",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez szütit (cookie) fog használni (lásd a <PolicyLink>sütire vonatkozó szabályozásunkat</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez szütit (cookie) fog használni.",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index d901c52f60..234def7dba 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -628,7 +628,6 @@
     "No Microphones detected": "Engir hljóðnemar fundust",
     "No Webcams detected": "Engar vefmyndavélar fundust",
     "Homeserver is": "Heimanetþjónn er",
-    "Login as guest": "Skrá inn sem gestur",
     "Sign in to get started": "Skráðu þig inn til að komast í gang",
     "Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd",
     "Set a display name:": "Stilltu birtingarnafn:",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 884dac4269..61c80b6789 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1158,9 +1158,6 @@
     "Refresh": "Aggiorna",
     "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.",
     "Send analytics data": "Invia dati statistici",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra <PolicyLink>politica sui cookie e sulla privacy</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.",
-    "Yes please": "Sì grazie",
     "Clear Storage and Sign Out": "Elimina lo storage e disconnetti",
     "Send Logs": "Invia i log",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index a7e590c7ed..55840f752e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1166,16 +1166,12 @@
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
     "Collapse Reply Thread": "Ответить с цитированием",
     "Send analytics data": "Отправить данные аналитики",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
-    "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.",
-    "Yes please": "Да, пожалуйста",
     "Muted Users": "Приглушенные пользователи",
     "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
     "Terms and Conditions": "Условия и положения",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
     "Review terms and conditions": "Просмотр условий и положений",
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
-    "Help improve Riot by sending <UsageDataLink>usage data</UsageDataLink>? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "Помогите улучшить Riot, отправляя <UsageDataLink>данные использования</UsageDataLink>? Будут использоваться файлы cookie. (Смотрите наши <PolicyLink>политики cookie и конфиденциальности</PolicyLink>).",
     "Failed to indicate account erasure": "Не удается удалить учетную запись",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. <b>Это действие необратимо.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи <b>не приведет к удалению всех ваших сообщений.</b> Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 5e27d5713d..9dcc74d790 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -900,8 +900,6 @@
     "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!",
     "Unknown error": "Okänt fel",
     "Incorrect password": "Felaktigt lösenord",
-    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.",
-    "This action is irreversible.": "Denna åtgärd går inte att ångra.",
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:",
     "Device name": "Enhetsnamn",
     "Device key": "Enhetsnyckel",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index e8217e0277..88cc5b6ad2 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1169,9 +1169,6 @@
     "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照",
     "Send analytics data": "傳送分析資料",
     "Muted Users": "已靜音的使用者",
-    "Help improve Riot by sending usage data? This will use a cookie. (See our <PolicyLink>cookie and privacy policies</PolicyLink>).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 <PolicyLink>cookie 與隱私政策</PolicyLink>）。",
-    "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。",
-    "Yes please": "好的，請",
     "e.g. %(exampleValue)s": "範例：%(exampleValue)s",
     "Reload widget": "重新載入小工具",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "請透過傳送<UsageDataLink>匿名使用資料</UsageDataLink>來協助改善 Riot.im。這將會使用 cookie（請參見我們的 <PolicyLink>Cookie 政策</PolicyLink>）。",

From 75abb415d437d337382dc57717277fae67f57580 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 16:17:26 +0100
Subject: [PATCH 248/702] improve tag panel accessibility and remove a no-op
 dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/TagPanel.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 0b6dc9fc75..77259c863d 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -84,7 +84,10 @@ const TagPanel = React.createClass({
     },
 
     onMouseDown(e) {
-        dis.dispatch({action: 'deselect_tags'});
+        // only dispatch if its not a no-op
+        if (this.state.selectedTags.length > 0) {
+            dis.dispatch({action: 'deselect_tags'});
+        }
     },
 
     onCreateGroupClick(ev) {
@@ -113,17 +116,18 @@ const TagPanel = React.createClass({
             />;
         });
 
-        const clearButton = this.state.selectedTags.length > 0 ?
-            <TintableSvg src="img/icons-close.svg" width="24" height="24"
-                alt={_t("Clear filter")}
-                title={_t("Clear filter")}
-            /> :
-            <div />;
+        let clearButton;
+        if (this.state.selectedTags.length > 0) {
+            clearButton = <AccessibleButton className="mx_TagPanel_clearButton" onClick={this.onClearFilterClick}>
+                <TintableSvg src="img/icons-close.svg" width="24" height="24"
+                             alt={_t("Clear filter")}
+                             title={_t("Clear filter")}
+                />
+            </AccessibleButton>;
+        }
 
         return <div className="mx_TagPanel">
-            <AccessibleButton className="mx_TagPanel_clearButton" onClick={this.onClearFilterClick}>
-                { clearButton }
-            </AccessibleButton>
+            { clearButton }
             <div className="mx_TagPanel_divider" />
             <GeminiScrollbarWrapper
                 className="mx_TagPanel_scroller"

From b81e12e4ccf098a04df9876eb8db02357cc0bf96 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 13 Jun 2018 16:55:16 +0100
Subject: [PATCH 249/702] Fix exception when opening dev tools

Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.

This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.

Fixes https://github.com/vector-im/riot-web/issues/6436
---
 src/components/views/rooms/MessageComposerInput.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 97e8780f0f..66bae869ff 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -244,12 +244,14 @@ export default class MessageComposerInput extends React.Component {
 
         let editorState = null;
         if (contentState) {
-            editorState = EditorState.createWithContent(contentState, compositeDecorator);
+            editorState = EditorState.moveFocusToEnd(
+                EditorState.createWithContent(contentState, compositeDecorator)
+            );
         } else {
             editorState = EditorState.createEmpty(compositeDecorator);
         }
 
-        return EditorState.moveFocusToEnd(editorState);
+        return editorState;
     }
 
     componentDidMount() {

From 77708d5b659f498e3b4279014c887f1f4bdbe04f Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 13 Jun 2018 09:20:33 +0000
Subject: [PATCH 250/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1be59bdbd5..caeca8daf9 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -586,7 +586,7 @@
     "Please enter the code it contains:": "Sartu dakarren kodea:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ez baduzu e-mail helbide bat zehazten, ezin izango duzu zure pasahitza berrezarri. Ziur zaude?",
     "You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s erabiliz erregistratzen ari zara",
-    "Default server": "Zerbitzari lenetetsia",
+    "Default server": "Zerbitzari lehenetsia",
     "Custom server": "Zerbitzari aukeratua",
     "Home server URL": "Hasiera zerbitzariaren URLa",
     "Identity server URL": "Identitate zerbitzariaren URLa",

From d4578783ef3b3ae6a788b2059f57d4b23381fea2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 18:46:02 +0100
Subject: [PATCH 251/702] apply pr review feedback fix copyright headers fix
 user settings link accessibility fix typo and add noopener

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ContextualMenu.js | 2 +-
 src/components/structures/UserSettings.js   | 4 ++--
 src/components/views/dialogs/ShareDialog.js | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index d6a11ca974..12603c1b45 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 8511010ed6..25ca70056b 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -1304,9 +1304,9 @@ module.exports = React.createClass({
                 <div className="mx_UserSettings_section">
                     <div className="mx_UserSettings_advanced">
                         { _t("Logged in as:") + ' ' }
-                        <span onClick={this.onSelfShareClick} className="mx_UserSettings_link">
+                        <a onClick={this.onSelfShareClick} className="mx_UserSettings_link">
                             { this._me }
-                        </span>
+                        </a>
                     </div>
                     <div className="mx_UserSettings_advanced">
                         { _t('Access Token:') + ' ' }
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index a88052ee6d..e68922d35a 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ const socials = [
         img: 'img/social/',
         url: (url) => `https://plus.google.com/share?url=${url}`,
     },*/ {
-        name: 'Linked In',
+        name: 'LinkedIn',
         img: 'img/social/linkedin.png',
         url: (url) => `https://www.linkedin.com/shareArticle?mini=true&url=${url}`,
     }, {
@@ -193,13 +193,14 @@ export default class ShareDialog extends React.Component {
                         <h3>Social</h3>
                         <div className="mx_ShareDialog_social_container">
                             {
-                                socials.map((social) => <a target="_blank"
+                                socials.map((social) => <a rel="noopener"
+                                                           target="_blank"
                                                            key={social.name}
                                                            name={social.name}
                                                            href={social.url(encodedUrl)}
                                                            className="mx_ShareDialog_social_icon"
                                 >
-                                    <img src={social.img} height={64} width={64} />
+                                    <img src={social.img} alt={social.name} height={64} width={64} />
                                 </a>)
                             }
                         </div>

From a257dc27c5c7af9ad4af3847ea1b91d49db5ae3c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Jun 2018 19:08:24 +0100
Subject: [PATCH 252/702] move css rule to be more generic; remove overriden
 rule

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/messages/_MTextBody.scss | 5 -----
 res/css/views/rooms/_EventTile.scss    | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/res/css/views/messages/_MTextBody.scss b/res/css/views/messages/_MTextBody.scss
index fcf397fd2d..93a89ad1b7 100644
--- a/res/css/views/messages/_MTextBody.scss
+++ b/res/css/views/messages/_MTextBody.scss
@@ -17,8 +17,3 @@ limitations under the License.
 .mx_MTextBody {
     white-space: pre-wrap;
 }
-
-.mx_MTextBody pre{
-  overflow-y: auto;
-  max-height: 30vh;
-}
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index ce2bf9c8a4..80d2cd3418 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -391,6 +391,7 @@ limitations under the License.
 .mx_EventTile_content .markdown-body pre {
     overflow-x: overlay;
     overflow-y: visible;
+    max-height: 30vh;
 }
 
 .mx_EventTile_content .markdown-body code {

From 3c4d62ddf85924777b7b883f5c71096b83fef5c1 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sun, 27 May 2018 19:14:49 +0000
Subject: [PATCH 253/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index aa1904d0bf..ce0e859a22 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1195,5 +1195,6 @@
     "Yes, I want to help!": "Igen, segítek!",
     "Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.",
-    "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:"
+    "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:",
+    "Try the app first": "Először próbáld ki az alkalmazást"
 }

From 5dced2f699777fad937115fc0e072c0d1c27fdfb Mon Sep 17 00:00:00 2001
From: Sotiris Papatheodorou <sotirisp@protonmail.com>
Date: Wed, 13 Jun 2018 22:21:32 +0000
Subject: [PATCH 254/702] Translated using Weblate (Greek)

Currently translated at 71.8% (855 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
---
 src/i18n/strings/el.json | 88 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 929ca5e7df..1b22679520 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -107,7 +107,7 @@
     "Failed to reject invitation": "Δεν ήταν δυνατή η απόρριψη της πρόσκλησης",
     "Failed to save settings": "Δεν ήταν δυνατή η αποθήκευση των ρυθμίσεων",
     "Failed to send email": "Δεν ήταν δυνατή η αποστολή ηλ. αλληλογραφίας",
-    "Failed to verify email address: make sure you clicked the link in the email": "Δεν ήταν δυνατή η επιβεβαίωση του μηνύματος ηλεκτρονικής αλληλογραφίας βεβαιωθείτε οτι κάνατε κλικ στον σύνδεσμο που σας στάλθηκε",
+    "Failed to verify email address: make sure you clicked the link in the email": "Δεν ήταν δυνατή η επιβεβαίωση της διεύθυνσης ηλεκτρονικής αλληλογραφίας: βεβαιωθείτε οτι κάνατε κλικ στον σύνδεσμο που σας στάλθηκε",
     "Favourite": "Αγαπημένο",
     "Favourites": "Αγαπημένα",
     "Fill screen": "Γέμισε την οθόνη",
@@ -264,7 +264,7 @@
     "Room %(roomId)s not visible": "Το δωμάτιο %(roomId)s δεν είναι ορατό",
     "%(roomName)s does not exist.": "Το %(roomName)s δεν υπάρχει.",
     "Searches DuckDuckGo for results": "Γίνεται αναζήτηση στο DuckDuckGo για αποτελέσματα",
-    "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από %(userName)s στις %(dateTime)s",
+    "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από τον/την %(userName)s στις %(dateTime)s",
     "Send anyway": "Αποστολή ούτως ή άλλως",
     "Send Invites": "Αποστολή προσκλήσεων",
     "Send Reset Email": "Αποστολή μηνύματος επαναφοράς",
@@ -465,7 +465,7 @@
     "%(senderName)s removed their profile picture.": "Ο %(senderName)s αφαίρεσε τη φωτογραφία του προφίλ του.",
     "%(senderName)s requested a VoIP conference.": "Ο %(senderName)s αιτήθηκε μια συνδιάσκεψη VoIP.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Το Riot δεν έχει δικαιώματα για αποστολή ειδοποιήσεων - παρακαλούμε ελέγξτε τις ρυθμίσεις του περιηγητή σας",
-    "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα στο Riot να αποστείλει ειδοποιήσεις - παρακαλούμε προσπαθήστε ξανά",
+    "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα αποστολής ειδοποιήσεων στο Riot - παρακαλούμε προσπαθήστε ξανά",
     "Room contains unknown devices": "Το δωμάτιο περιέχει άγνωστες συσκευές",
     "%(roomName)s is not accessible at this time.": "Το %(roomName)s δεν είναι προσβάσιμο αυτή τη στιγμή.",
     "Scroll to bottom of page": "Μετάβαση στο τέλος της σελίδας",
@@ -773,5 +773,85 @@
     "e.g. <CurrentPageURL>": "π.χ. <CurrentPageURL>",
     "Your device resolution": "Η ανάλυση της συσκευής σας",
     "The information being sent to us to help make Riot.im better includes:": "Οι πληροφορίες που στέλνονται σε εμάς με σκοπό την βελτίωση του Riot.im περιλαμβάνουν:",
-    "Call Failed": "Η κλήση απέτυχε"
+    "Call Failed": "Η κλήση απέτυχε",
+    "Whether or not you're logged in (we don't record your user name)": "Εάν είστε συνδεδεμένος/η ή όχι (δεν καταγράφουμε το όνομα χρήστη σας)",
+    "e.g. %(exampleValue)s": "π.χ. %(exampleValue)s",
+    "Review Devices": "Ανασκόπηση συσκευών",
+    "Call Anyway": "Κλήση όπως και να 'χει",
+    "Answer Anyway": "Απάντηση όπως και να 'χει",
+    "Call": "Κλήση",
+    "Answer": "Απάντηση",
+    "AM": "ΠΜ",
+    "PM": "ΜΜ",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "Who would you like to add to this community?": "Ποιον/α θα θέλατε να προσθέσετε σε αυτή την κοινότητα;",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Προσοχή: κάθε άτομο που προσθέτετε στην κοινότητα θε είναι δημοσίως ορατό σε οποιονδήποτε γνωρίζει το αναγνωριστικό της κοινότητας",
+    "Invite new community members": "Προσκαλέστε νέα μέλη στην κοινότητα",
+    "Name or matrix ID": "Όνομα ή αναγνωριστικό του matrix",
+    "Invite to Community": "Πρόσκληση στην κοινότητα",
+    "Which rooms would you like to add to this community?": "Ποια δωμάτια θα θέλατε να προσθέσετε σε αυτή την κοινότητα;",
+    "Add rooms to the community": "Προσθήκη δωματίων στην κοινότητα",
+    "Add to community": "Προσθήκη στην κοινότητα",
+    "Failed to invite the following users to %(groupId)s:": "Αποτυχία πρόσκλησης των ακόλουθων χρηστών στο %(groupId)s :",
+    "Failed to invite users to community": "Αποτυχία πρόσκλησης χρηστών στην κοινότητα",
+    "Failed to invite users to %(groupId)s": "Αποτυχία πρόσκλησης χρηστών στο %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Αποτυχία προσθήκης των ακόλουθων δωματίων στο %(groupId)s:",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Υπάρχουν άγνωστες συσκευές στο δωμάτιο: εάν συνεχίσετε χωρίς να τις επιβεβαιώσετε, θα μπορούσε κάποιος να κρυφακούει την κλήση σας.",
+    "Show these rooms to non-members on the community page and room list?": "Εμφάνιση αυτών των δωματίων σε μη-μέλη στην σελίδα της κοινότητας και στη λίστα δωματίων;",
+    "Room name or alias": "Όνομα η ψευδώνυμο δωματίου",
+    "Restricted": "Περιορισμένο",
+    "Unable to create widget.": "Αδυναμία δημιουργίας widget.",
+    "Reload widget": "Ανανέωση widget",
+    "You are not in this room.": "Δεν είστε μέλος αυτού του δωματίου.",
+    "You do not have permission to do that in this room.": "Δεν έχετε την άδεια να το κάνετε αυτό σε αυτό το δωμάτιο.",
+    "You are now ignoring %(userId)s": "Τώρα αγνοείτε τον/την %(userId)s",
+    "You are no longer ignoring %(userId)s": "Δεν αγνοείτε πια τον/την %(userId)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "Ο/Η %(oldDisplayName)s άλλαξε το εμφανιζόμενο όνομά του/της σε %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "Ο/Η %(senderName)s άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.",
+    "%(widgetName)s widget modified by %(senderName)s": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Προστέθηκε το widget %(widgetName)s από τον/την %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
+    "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
+    "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
+    "Message Replies": "Απαντήσεις",
+    "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
+    "Hide avatar changes": "Απόκρυψη αλλαγών εικονιδίων χρηστών",
+    "Hide display name changes": "Απόκρυψη αλλαγών εμφανιζόμενων ονομάτων",
+    "Hide avatars in user and room mentions": "Απόκρυψη εικονιδίων στις αναφορές χρηστών και δωματίων",
+    "Enable URL previews for this room (only affects you)": "Ενεργοποίηση προεπισκόπισης URL για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)",
+    "Delete %(count)s devices|other": "Διαγραφή %(count)s συσκευών",
+    "Delete %(count)s devices|one": "Διαγραφή συσκευής",
+    "Select devices": "Επιλογή συσκευών",
+    "Cannot add any more widgets": "Δεν είναι δυνατή η προσθήκη άλλων widget",
+    "The maximum permitted number of widgets have already been added to this room.": "Ο μέγιστος επιτρεπτός αριθμός widget έχει ήδη προστεθεί σε αυτό το δωμάτιο.",
+    "Add a widget": "Προσθήκη widget",
+    "%(senderName)s sent an image": "Ο/Η %(senderName)s έστειλε μία εικόνα",
+    "%(senderName)s sent a video": "Ο/Η %(senderName)s έστειλε ένα βίντεο",
+    "%(senderName)s uploaded a file": "Ο/Η %(senderName)s αναφόρτωσε ένα αρχείο",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Εάν οι άλλες συσκευές σας δεν έχουν το κλειδί για αυτό το μήνυμα, τότε δεν θα μπορείτε να το αποκρυπτογραφήσετε.",
+    "Disinvite this user?": "Ακύρωση πρόσκλησης αυτού του χρήστη;",
+    "Mention": "Αναφορά",
+    "Invite": "Πρόσκληση",
+    "User Options": "Επιλογές Χρήστη",
+    "Send an encrypted reply…": "Αποστολή κρυπτογραφημένης απάντησης…",
+    "Send a reply (unencrypted)…": "Αποστολή απάντησης (μη κρυπτογραφημένης)…",
+    "Send an encrypted message…": "Αποστολή κρυπτογραφημένου μηνύματος…",
+    "Send a message (unencrypted)…": "Αποστολή μηνύματος (μη κρυπτογραφημένου)…",
+    "Unable to reply": "Αδυναμία απάντησης",
+    "Unpin Message": "Ξεκαρφίτσωμα μηνύματος",
+    "Jump to message": "Πηγαίντε στο μήνυμα",
+    "No pinned messages.": "Κανένα καρφιτσωμένο μήνυμα.",
+    "Loading...": "Φόρτωση...",
+    "Pinned Messages": "Καρφιτσωμένα Μηνύματα",
+    "%(duration)ss": "%(duration)sδ",
+    "%(duration)sm": "%(duration)sλ",
+    "%(duration)sh": "%(duration)sω",
+    "%(duration)sd": "%(duration)sμ",
+    "Online for %(duration)s": "Σε σύνδεση για %(duration)s",
+    "Idle for %(duration)s": "Αδρανής για %(duration)s",
+    "Offline for %(duration)s": "Εκτός σύνδεσης για %(duration)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Διαβάστηκε από τον/την %(displayName)s (%(userName)s) στις %(dateTime)s",
+    "Room Notification": "Ειδοποίηση Δωματίου",
+    "Notify the whole room": "Ειδοποιήστε όλο το δωμάτιο",
+    "Sets the room topic": "Ορίζει το θέμα του δωματίου"
 }

From 05e1dd55f0890eb11d354e2e35cefa75402b3ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Wed, 13 Jun 2018 17:55:34 +0000
Subject: [PATCH 255/702] Translated using Weblate (Serbian)

Currently translated at 99.6% (1186 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
---
 src/i18n/strings/sr.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index e73107376b..b2eee28b37 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1160,5 +1160,29 @@
     "Clear Storage and Sign Out": "Очисти складиште и одјави ме",
     "Refresh": "Освежи",
     "We encountered an error trying to restore your previous session.": "Наишли смо на грешку приликом повраћаја ваше претходне сесије.",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Чишћење складишта вашег прегледача може решити проблем али ће вас то одјавити и учинити шифровани историјат ћаскања нечитљивим."
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Чишћење складишта вашег прегледача може решити проблем али ће вас то одјавити и учинити шифровани историјат ћаскања нечитљивим.",
+    "e.g. %(exampleValue)s": "нпр.: %(exampleValue)s",
+    "Reload widget": "Поново учитај виџет",
+    "Send analytics data": "Пошаљи аналитичке податке",
+    "Enable widget screenshots on supported widgets": "Омогући снимке екрана виџета у подржаним виџетима",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "У овом тренутку није могуће одговорити са датотеком тако да ово неће бити послато у облику одговора.",
+    "Unable to reply": "Не могу да одговорим",
+    "At this time it is not possible to reply with an emote.": "У овом тренутку није могуће одговорити са емотиконом.",
+    "To notify everyone in the room, you must be a": "Да бисте обавестили све у соби, морате бити",
+    "Muted Users": "Утишани корисници",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Помозите побољшавање Riot.im програма тако што ћете послати <UsageDataLink>анонимне податке о коришћењу</UsageDataLink>. Ово ће захтевати коришћење колачића (погледајте нашу <PolicyLink>политику о колачићима</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Помозите побољшавање Riot.im програма тако што ћете послати <UsageDataLink>анонимне податке о коришћењу</UsageDataLink>. Ово ће захтевати коришћење колачића.",
+    "Yes, I want to help!": "Да, желим помоћи!",
+    "Warning: This widget might use cookies.": "Упозорење: овај виџет ће можда користити колачиће.",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не могу да учитам догађај на који је послат одговор, или не постоји или немате овлашћење да га погледате.",
+    "Failed to indicate account erasure": "Неуспех при наговештавању да је налог обрисан",
+    "To continue, please enter your password:": "Да бисте наставили, унесите вашу лозинку:",
+    "password": "лозинка",
+    "Collapse Reply Thread": "Скупи нит са одговорима",
+    "Can't leave Server Notices room": "Не могу да напустим собу са напоменама сервера",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ова соба се користи за важне поруке са Кућног сервера, не можете изаћи из ове собе.",
+    "Terms and Conditions": "Услови коришћења",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да бисте наставили са коришћењем Кућног сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.",
+    "Review terms and conditions": "Погледај услове коришћења",
+    "Try the app first": "Пробајте прво апликацију"
 }

From 666d46922266974004f8662ca654c932e865b58c Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 14 Jun 2018 10:52:39 +0100
Subject: [PATCH 256/702] Revert "Fix exception when opening dev tools"

---
 src/components/views/rooms/MessageComposerInput.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 66bae869ff..97e8780f0f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -244,14 +244,12 @@ export default class MessageComposerInput extends React.Component {
 
         let editorState = null;
         if (contentState) {
-            editorState = EditorState.moveFocusToEnd(
-                EditorState.createWithContent(contentState, compositeDecorator)
-            );
+            editorState = EditorState.createWithContent(contentState, compositeDecorator);
         } else {
             editorState = EditorState.createEmpty(compositeDecorator);
         }
 
-        return editorState;
+        return EditorState.moveFocusToEnd(editorState);
     }
 
     componentDidMount() {

From ebee8a8b5d3d801235a6a75b3ec1e17f7ff8545c Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 14 Jun 2018 09:58:17 +0000
Subject: [PATCH 257/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1192 of 1192 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f878ca7b7d..d0b204bed6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1188,5 +1188,7 @@
     "Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.",
     "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:",
-    "Try the app first": "Először próbáld ki az alkalmazást"
+    "Try the app first": "Először próbáld ki az alkalmazást",
+    "Encrypting": "Titkosít",
+    "Encrypted, not sent": "Titkosítva, de nincs elküldve"
 }

From f6d75f865464d864fe5f31e2363711eae3391b13 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 14 Jun 2018 10:04:20 +0000
Subject: [PATCH 258/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1190 of 1192 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 859b1f2b3c..794a36e91f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1186,5 +1186,7 @@
     "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть",
     "Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.",
-    "Try the app first": "Сначала попробуйте приложение"
+    "Try the app first": "Сначала попробуйте приложение",
+    "Encrypting": "Шифрование",
+    "Encrypted, not sent": "Зашифровано, не отправлено"
 }

From 384c9745896fa79311a3e4be474eb200d64656f9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 11:16:57 +0100
Subject: [PATCH 259/702] tidy up if statements and fix up comments

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 17daa8553b..33ff17caa4 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -106,15 +106,10 @@ var RoomSubList = React.createClass({
     applySearchFilter: function(list, filter) {
         if (filter === "") return list;
         const lcFilter = filter.toLowerCase();
-        return list.filter((room) => {
-            if (room.name && room.name.toLowerCase().includes(lcFilter)) return true;
-            // only apply search filter to aliases if it looks like an alias (starts with `#`)
-            // to prevent loads of false positives with server names, e.g `matrix`
-            if (filter[0] === '#' && room.getAliases().some((alias) => {
-                return alias.toLowerCase().startsWith(lcFilter);
-            })) return true;
-            return false;
-        });
+        // case insensitive if room name includes filter,
+        // or if starts with `#` and one of room's aliases starts with filter
+        return list.filter((room) => (room.name && room.name.toLowerCase().includes(lcFilter)) ||
+            (filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))));
     },
 
     // The header is collapsable if it is hidden or not stuck

From c811c30c0dd525aafa91409a19c3d3982535f200 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 11:36:04 +0100
Subject: [PATCH 260/702] fix styling of clearButton when its not there

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_TagPanel.scss     | 2 +-
 src/components/structures/TagPanel.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index ab1d4feac3..a76c04805d 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -25,7 +25,7 @@ limitations under the License.
     justify-content: space-between;
 }
 
-.mx_TagPanel .mx_TagPanel_clearButton {
+.mx_TagPanel .mx_TagPanel_clearButton_container {
     /* Constant height within flex mx_TagPanel */
     height: 70px;
     width: 60px;
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 77259c863d..6b6b09c5dc 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -127,7 +127,9 @@ const TagPanel = React.createClass({
         }
 
         return <div className="mx_TagPanel">
-            { clearButton }
+            <div className="mx_TagPanel_clearButton_container">
+                { clearButton }
+            </div>
             <div className="mx_TagPanel_divider" />
             <GeminiScrollbarWrapper
                 className="mx_TagPanel_scroller"

From 3b501137a58f5f08a5c3e08c0249a114d7a87026 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 11:42:21 +0100
Subject: [PATCH 261/702] change cursor:pointer iff clicking TagPanel
 background does something

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_TagPanel.scss     |  5 ++++-
 src/components/structures/TagPanel.js | 13 ++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index a76c04805d..415aafd924 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -17,7 +17,6 @@ limitations under the License.
 .mx_TagPanel {
     flex: 0 0 60px;
     background-color: $tertiary-accent-color;
-    cursor: pointer;
 
     display: flex;
     flex-direction: column;
@@ -25,6 +24,10 @@ limitations under the License.
     justify-content: space-between;
 }
 
+.mx_TagPanel_items_selected {
+    cursor: pointer;
+}
+
 .mx_TagPanel .mx_TagPanel_clearButton_container {
     /* Constant height within flex mx_TagPanel */
     height: 70px;
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 6b6b09c5dc..652211595b 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd.
+Copyright 2017, 2018 New Vector Ltd.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import dis from '../../dispatcher';
 import { _t } from '../../languageHandler';
 
 import { Droppable } from 'react-beautiful-dnd';
+import classNames from 'classnames';
 
 const TagPanel = React.createClass({
     displayName: 'TagPanel',
@@ -116,8 +117,10 @@ const TagPanel = React.createClass({
             />;
         });
 
+        const itemsSelected = this.state.selectedTags.length > 0;
+
         let clearButton;
-        if (this.state.selectedTags.length > 0) {
+        if (itemsSelected) {
             clearButton = <AccessibleButton className="mx_TagPanel_clearButton" onClick={this.onClearFilterClick}>
                 <TintableSvg src="img/icons-close.svg" width="24" height="24"
                              alt={_t("Clear filter")}
@@ -126,7 +129,11 @@ const TagPanel = React.createClass({
             </AccessibleButton>;
         }
 
-        return <div className="mx_TagPanel">
+        const classes = classNames('mx_TagPanel', {
+            mx_TagPanel_items_selected: itemsSelected,
+        });
+
+        return <div className={classes}>
             <div className="mx_TagPanel_clearButton_container">
                 { clearButton }
             </div>

From 68e2ee4e51784a7de27bd9765b47b95262b66bb8 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 14 Jun 2018 10:45:23 +0000
Subject: [PATCH 262/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1194 of 1194 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d0b204bed6..427d6b89ea 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1190,5 +1190,7 @@
     "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:",
     "Try the app first": "Először próbáld ki az alkalmazást",
     "Encrypting": "Titkosít",
-    "Encrypted, not sent": "Titkosítva, de nincs elküldve"
+    "Encrypted, not sent": "Titkosítva, de nincs elküldve",
+    "No Audio Outputs detected": "Nem található hang kimenet",
+    "Audio Output": "Hang kimenet"
 }

From 63e9c0aa1e02d066544e52691f5280570349e0b3 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 14 Jun 2018 10:21:15 +0000
Subject: [PATCH 263/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1192 of 1194 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 794a36e91f..9853c8a173 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1188,5 +1188,7 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.",
     "Try the app first": "Сначала попробуйте приложение",
     "Encrypting": "Шифрование",
-    "Encrypted, not sent": "Зашифровано, не отправлено"
+    "Encrypted, not sent": "Зашифровано, не отправлено",
+    "No Audio Outputs detected": "Аудиовыход не обнаружен",
+    "Audio Output": "Аудиовыход"
 }

From 9a225840ce6a43f5e62a03a18cbe28ba6a1ecc7b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 12:00:53 +0100
Subject: [PATCH 264/702] check type before msgtype in the case of `m.sticker`
 with msgtype (undef)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/MessageEvent.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index c4d29257ff..fd51e6074b 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -72,10 +72,10 @@ module.exports = React.createClass({
         let BodyType = UnknownBody;
         if (!this.props.mxEvent.isRedacted()) {
             // only resolve BodyType if event is not redacted
-            if (msgtype && bodyTypes[msgtype]) {
-                BodyType = bodyTypes[msgtype];
-            } else if (type && evTypes[type]) {
+            if (type && evTypes[type]) {
                 BodyType = evTypes[type];
+            } else if (msgtype && bodyTypes[msgtype]) {
+                BodyType = bodyTypes[msgtype];
             } else if (content.url) {
                 // Fallback to MFileBody if there's a content URL
                 BodyType = bodyTypes['m.file'];

From d5fdfdaf8a1ee7ad219012e2ccefddb6d0351ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 14 Jun 2018 11:25:26 +0000
Subject: [PATCH 265/702] Translated using Weblate (French)

Currently translated at 100.0% (1194 of 1194 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 50f801e94c..0b7abd6af5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1188,5 +1188,9 @@
     "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
     "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)",
-    "Try the app first": "Essayer d'abord l'application"
+    "Try the app first": "Essayer d'abord l'application",
+    "Encrypting": "Chiffrement en cours",
+    "Encrypted, not sent": "Chiffré, pas envoyé",
+    "No Audio Outputs detected": "Aucune sortie audio détectée",
+    "Audio Output": "Sortie audio"
 }

From 36574ca0fb1b0a14a5886a953b3d6dbaad2ea7d2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 14 Jun 2018 13:03:42 +0100
Subject: [PATCH 266/702] Fix doc

---
 src/WidgetUtils.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 14fe3f59bd..98ee935f35 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -100,7 +100,8 @@ export default class WidgetUtils {
      * @param {string} widgetId The ID of the widget to wait for
      * @param {boolean} add True to wait for the widget to be added,
      *     false to wait for it to be deleted.
-     * @returns {Promise} that resolves when the widget is available
+     * @returns {Promise} that resolves when the widget is the the
+     *     requested state according to the `add` param
      */
     static waitForUserWidget(widgetId, add) {
         return new Promise((resolve, reject) => {
@@ -146,7 +147,8 @@ export default class WidgetUtils {
      * @param {string} roomId The ID of the room to wait for the widget in
      * @param {boolean} add True to wait for the widget to be added,
      *     false to wait for it to be deleted.
-     * @returns {Promise} that resolves when the widget is available
+     * @returns {Promise} that resolves when the widget is the the
+     *     requested state according to the `add` param
      */
     static waitForRoomWidget(widgetId, roomId, add) {
         return new Promise((resolve, reject) => {

From aa7d62b7402499297853fad02950679f8a279ce8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:20:16 +0100
Subject: [PATCH 267/702] fix naming of methods and fields

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/ShareDialog.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index e68922d35a..97d496adbc 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -67,10 +67,10 @@ export default class ShareDialog extends React.Component {
         super(props);
 
         this.onCopyClick = this.onCopyClick.bind(this);
-        this.onCheckboxClick = this.onCheckboxClick.bind(this);
+        this.onLinkRecentCheckboxClick = this.onLinkRecentCheckboxClick.bind(this);
 
         this.state = {
-            ticked: false,
+            linkRecentTicked: false,
         };
     }
 
@@ -116,9 +116,9 @@ export default class ShareDialog extends React.Component {
         e.target.onmouseleave = close;
     }
 
-    onCheckboxClick() {
+    onLinkRecentCheckboxClick() {
         this.setState({
-            ticked: !this.state.ticked,
+            linkRecentTicked: !this.state.linkRecentTicked,
         });
     }
 
@@ -135,16 +135,16 @@ export default class ShareDialog extends React.Component {
             if (events.length > 0) {
                 checkbox = <div>
                     <input type="checkbox"
-                           value={this.state.ticked}
+                           value={this.state.linkRecentTicked}
                            id="mx_ShareDialog_checkbox"
-                           onClick={this.onCheckboxClick} />
+                           onClick={this.onLinkRecentCheckboxClick} />
                     <label htmlFor="mx_ShareDialog_checkbox">
                         { _t('Link to most recent message') }
                     </label>
                 </div>;
             }
 
-            if (this.state.ticked) {
+            if (this.state.linkRecentTicked) {
                 matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId());
             } else {
                 matrixToUrl = makeRoomPermalink(this.props.target.roomId);

From 7d7a6f3d9c904874c352470d658b981196b3c8c9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:35:35 +0100
Subject: [PATCH 268/702] ShareDialog share Message, link to timestamp and
 permalink in ctx menu

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/context_menus/MessageContextMenu.js     | 11 ++++++++++-
 src/components/views/dialogs/ShareDialog.js       |  7 +++++--
 src/components/views/rooms/EventTile.js           | 15 +++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 99ec493ced..bdd267c4ee 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -184,6 +184,15 @@ module.exports = React.createClass({
         this.closeMenu();
     },
 
+    onPermalinkClick: function(e: Event) {
+        e.preventDefault();
+        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+        Modal.createTrackedDialog('share room message dialog', '', ShareDialog, {
+            target: this.props.mxEvent,
+        });
+        this.closeMenu();
+    },
+
     onReplyClick: function() {
         dis.dispatch({
             action: 'reply_to_event',
@@ -290,7 +299,7 @@ module.exports = React.createClass({
         const permalinkButton = (
             <div className="mx_MessageContextMenu_field">
                 <a href={makeEventPermalink(this.props.mxEvent.getRoomId(), this.props.mxEvent.getId())}
-                  target="_blank" rel="noopener" onClick={this.closeMenu}>{ _t('Permalink') }</a>
+                  target="_blank" rel="noopener" onClick={this.onPermalinkClick}>{ _t('Share Message') }</a>
             </div>
         );
 
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 97d496adbc..12efc8b919 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {Room, User, Group, RoomMember} from 'matrix-js-sdk';
+import {Room, User, Group, RoomMember, MatrixEvent} from 'matrix-js-sdk';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import QRCode from 'qrcode-react';
@@ -59,7 +59,7 @@ export default class ShareDialog extends React.Component {
             PropTypes.instanceOf(User),
             PropTypes.instanceOf(Group),
             PropTypes.instanceOf(RoomMember),
-            // PropTypes.instanceOf(MatrixEvent),
+            PropTypes.instanceOf(MatrixEvent),
         ]).isRequired,
     };
 
@@ -155,6 +155,9 @@ export default class ShareDialog extends React.Component {
         } else if (this.props.target instanceof Group) {
             title = _t('Share Community');
             matrixToUrl = makeGroupPermalink(this.props.target.groupId);
+        } else if (this.props.target instanceof MatrixEvent) {
+            title = _t('Share Room Message');
+            matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId);
         }
 
         const encodedUrl = encodeURIComponent(matrixToUrl);
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 589524bb9e..1160c7c886 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -438,6 +438,17 @@ module.exports = withMatrixClient(React.createClass({
         });
     },
 
+    onPermalinkShareClicked: function(e) {
+        // These permalinks are like above, can be opened in new tab/window to matrix.to
+        // but otherwise fire the ShareDialog as it makes little sense to click permalink
+        // whilst it is in the current room
+        e.preventDefault();
+        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
+        Modal.createTrackedDialog('share room event dialog', '', ShareDialog, {
+            target: this.props.mxEvent,
+        });
+    },
+
     _renderE2EPadlock: function() {
         const ev = this.props.mxEvent;
         const props = {onClick: this.onCryptoClicked};
@@ -667,7 +678,7 @@ module.exports = withMatrixClient(React.createClass({
                         { avatar }
                         { sender }
                         <div className="mx_EventTile_reply">
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
+                            <a href={permalink} onClick={this.onPermalinkShareClicked}>
                                 { timestamp }
                             </a>
                             { this._renderE2EPadlock() }
@@ -694,7 +705,7 @@ module.exports = withMatrixClient(React.createClass({
                         { avatar }
                         { sender }
                         <div className="mx_EventTile_line">
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
+                            <a href={permalink} onClick={this.onPermalinkShareClicked}>
                                 { timestamp }
                             </a>
                             { this._renderE2EPadlock() }

From e1d3c2e4c73536f1f755edeb6aa18e7533b7b3fb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:36:39 +0100
Subject: [PATCH 269/702] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/be.json      | 1 -
 src/i18n/strings/bg.json      | 1 -
 src/i18n/strings/ca.json      | 1 -
 src/i18n/strings/cs.json      | 1 -
 src/i18n/strings/da.json      | 1 -
 src/i18n/strings/de_DE.json   | 1 -
 src/i18n/strings/el.json      | 1 -
 src/i18n/strings/en_EN.json   | 3 ++-
 src/i18n/strings/en_US.json   | 1 -
 src/i18n/strings/eo.json      | 1 -
 src/i18n/strings/es.json      | 1 -
 src/i18n/strings/eu.json      | 1 -
 src/i18n/strings/fa.json      | 1 -
 src/i18n/strings/fi.json      | 1 -
 src/i18n/strings/fr.json      | 1 -
 src/i18n/strings/gl.json      | 1 -
 src/i18n/strings/he.json      | 1 -
 src/i18n/strings/hu.json      | 1 -
 src/i18n/strings/id.json      | 1 -
 src/i18n/strings/is.json      | 1 -
 src/i18n/strings/it.json      | 1 -
 src/i18n/strings/ja.json      | 1 -
 src/i18n/strings/ko.json      | 1 -
 src/i18n/strings/lt.json      | 1 -
 src/i18n/strings/lv.json      | 1 -
 src/i18n/strings/ml.json      | 1 -
 src/i18n/strings/nb_NO.json   | 1 -
 src/i18n/strings/nl.json      | 1 -
 src/i18n/strings/pl.json      | 1 -
 src/i18n/strings/pt.json      | 1 -
 src/i18n/strings/pt_BR.json   | 1 -
 src/i18n/strings/ru.json      | 1 -
 src/i18n/strings/sk.json      | 1 -
 src/i18n/strings/sq.json      | 1 -
 src/i18n/strings/sr.json      | 1 -
 src/i18n/strings/sv.json      | 1 -
 src/i18n/strings/ta.json      | 1 -
 src/i18n/strings/th.json      | 1 -
 src/i18n/strings/tr.json      | 1 -
 src/i18n/strings/uk.json      | 1 -
 src/i18n/strings/zh_Hans.json | 1 -
 src/i18n/strings/zh_Hant.json | 1 -
 42 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json
index 7e79f5d355..31360c87f4 100644
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.json
@@ -31,7 +31,6 @@
     "Noisy": "Шумна",
     "Resend": "Паўторна",
     "On": "Уключыць",
-    "Permalink": "Пастаянная спасылка",
     "remove %(name)s from the directory.": "выдаліць %(name)s з каталога.",
     "Off": "Выключыць",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Выдаліць псеўданім пакоя %(alias)s і выдаліць %(name)s з каталога?",
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index d157f4dff8..b86941b3b7 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1125,7 +1125,6 @@
     "Set Password": "Задаване на парола",
     "An error occurred whilst saving your email notification preferences.": "Възникна грешка при запазване на настройките за имейл известяване.",
     "Enable audible notifications in web client": "Включване на звукови известия в уеб клиент",
-    "Permalink": "Permalink",
     "Off": "Изключено",
     "Riot does not know how to join a room on this network": "Riot не знае как да се присъедини към стая от тази мрежа",
     "Mentions only": "Само при споменаване",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 407b9f61d4..f7212619b2 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -1004,7 +1004,6 @@
     "Unable to fetch notification target list": "No s'ha pogut obtenir la llista d'objectius de les notificacions",
     "Set Password": "Establiu una contrasenya",
     "Enable audible notifications in web client": "Habilita les notificacions d'àudio al client web",
-    "Permalink": "Enllaç permanent",
     "Off": "Apagat",
     "Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa",
     "Mentions only": "Només mencions",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 33c7a3d5f1..99424d6043 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1062,7 +1062,6 @@
     "Set Password": "Nastavit heslo",
     "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových upozornění nastala chyba.",
     "Enable audible notifications in web client": "Povolit zvuková upozornění ve webové aplikaci",
-    "Permalink": "Trvalý odkaz",
     "Off": "Vypnout",
     "#example": "#příklad",
     "Mentions only": "Pouze zmínky",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 2a59530d5a..02497a7934 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -371,7 +371,6 @@
     "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste",
     "Set Password": "Indstil Password",
     "Enable audible notifications in web client": "Aktivér hørbare underretninger i webklienten",
-    "Permalink": "Permanent link",
     "Resend": "Send igen",
     "Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk",
     "Mentions only": "Kun nævninger",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 8f75b71689..9688f4da8f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1126,7 +1126,6 @@
     "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden",
     "Set Password": "Passwort einrichten",
     "Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren",
-    "Permalink": "Permanenter Link",
     "Off": "Aus",
     "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
     "Mentions only": "Nur, wenn du erwähnt wirst",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index fabd88c74a..e12f9223a2 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -746,7 +746,6 @@
     "What's New": "Τι νέο υπάρχει",
     "Set Password": "Ορισμός κωδικού πρόσβασης",
     "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων",
-    "Permalink": "Μόνιμος σύνδεσμος",
     "Off": "Ανενεργό",
     "#example": "#παράδειγμα",
     "Mentions only": "Μόνο αναφορές",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 76d0cb6f33..bb5ad5405b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -862,6 +862,7 @@
     "Link to most recent message": "Link to most recent message",
     "Share User": "Share User",
     "Share Community": "Share Community",
+    "Share Room Message": "Share Room Message",
     "COPY": "COPY",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
@@ -881,7 +882,7 @@
     "View Source": "View Source",
     "View Decrypted Source": "View Decrypted Source",
     "Unhide Preview": "Unhide Preview",
-    "Permalink": "Permalink",
+    "Share Message": "Share Message",
     "Quote": "Quote",
     "Source URL": "Source URL",
     "Collapse Reply Thread": "Collapse Reply Thread",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 43e2041020..be71d0ae1d 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -816,7 +816,6 @@
     "Unable to fetch notification target list": "Unable to fetch notification target list",
     "Set Password": "Set Password",
     "Enable audible notifications in web client": "Enable audible notifications in web client",
-    "Permalink": "Permalink",
     "Off": "Off",
     "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
     "Mentions only": "Mentions only",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 68645ffd9c..3c20baef9e 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1077,7 +1077,6 @@
     "Unable to fetch notification target list": "Malsukcesis akiri la liston de celoj por sciigoj",
     "Set Password": "Agordi pasvorton",
     "Enable audible notifications in web client": "Ŝalti aŭdeblajn sciigojn en la retkliento",
-    "Permalink": "Konstanta ligilo",
     "Off": "For",
     "Riot does not know how to join a room on this network": "Riot ne scias aliĝi al ĉambroj en tiu ĉi reto",
     "Mentions only": "Nur mencioj",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 8e7925ba36..b377e97e74 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -717,7 +717,6 @@
     "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red",
     "Set Password": "Establecer contraseña",
     "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web",
-    "Permalink": "Enlace permanente",
     "Off": "Apagado",
     "#example": "#ejemplo",
     "Mentions only": "Sólo menciones",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index fe9d3db424..229c9d648e 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1127,7 +1127,6 @@
     "Unable to fetch notification target list": "Ezin izan da jakinarazpen helburuen zerrenda eskuratu",
     "Set Password": "Ezarri pasahitza",
     "Enable audible notifications in web client": "Gaitu jakinarazpen entzungarriak web bezeroan",
-    "Permalink": "Esteka iraunkorra",
     "Off": "Ez",
     "Riot does not know how to join a room on this network": "Riotek ez daki nola elkartu gela batetara sare honetan",
     "Mentions only": "Aipamenak besterik ez",
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 0e532d9483..2b18ba7693 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -124,7 +124,6 @@
     "Set Password": "پسوردتان را انتخاب کنید",
     "An error occurred whilst saving your email notification preferences.": "خطایی در حین ذخیره‌ی ترجیجات شما درباره‌ی رایانامه رخ داد.",
     "Enable audible notifications in web client": "آگاه‌سازی صدادار را در کارگزار وب فعال کن",
-    "Permalink": "پایاپیوند",
     "Off": "خاموش",
     "Riot does not know how to join a room on this network": "رایوت از چگونگی ورود به یک گپ در این شبکه اطلاعی ندارد",
     "Mentions only": "فقط نام‌بردن‌ها",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index e5787ab561..204ed4ba87 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1050,7 +1050,6 @@
     "Set Password": "Aseta salasana",
     "An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.",
     "Enable audible notifications in web client": "Ota käyttöön äänelliset ilmoitukset",
-    "Permalink": "Pysyvä linkki",
     "remove %(name)s from the directory.": "poista %(name)s hakemistosta.",
     "Off": "Pois päältä",
     "Riot does not know how to join a room on this network": "Riot ei tiedä miten liittya huoneeseen tässä verkossa",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 367e89d2b6..fa33d58846 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1121,7 +1121,6 @@
     "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications",
     "Set Password": "Définir un mot de passe",
     "Enable audible notifications in web client": "Activer les notifications sonores pour le client web",
-    "Permalink": "Permalien",
     "Off": "Désactivé",
     "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau",
     "Mentions only": "Seulement les mentions",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index fdab066031..70d0889ae0 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1127,7 +1127,6 @@
     "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións",
     "Set Password": "Establecer contrasinal",
     "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web",
-    "Permalink": "Ligazón permanente",
     "Off": "Off",
     "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede",
     "Mentions only": "Só mencións",
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index dbae2858a9..7d96dfa089 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -221,7 +221,6 @@
     "Unable to fetch notification target list": "לא ניתן לאחזר רשימת יעדי התראה",
     "Set Password": "הגדר סיסמא",
     "Enable audible notifications in web client": "אפשר התראות קוליות בדפדפן",
-    "Permalink": "קישור קבוע",
     "Off": "סגור",
     "Riot does not know how to join a room on this network": "Riot אינו יודע כיצד להצטרף לחדר ברשת זו",
     "Mentions only": "מאזכר בלבד",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 3d8100d8f1..e142e7506a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1126,7 +1126,6 @@
     "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját",
     "Set Password": "Jelszó beállítása",
     "Enable audible notifications in web client": "Hangértesítések engedélyezése a webkliensben",
-    "Permalink": "Állandó hivatkozás",
     "Off": "Ki",
     "Riot does not know how to join a room on this network": "A Riot nem tud csatlakozni szobához ezen a hálózaton",
     "Mentions only": "Csak ha megemlítenek",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 9db1a4a99c..f0506d873e 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -324,7 +324,6 @@
     "Unable to fetch notification target list": "Tidak dapat mengambil daftar notifikasi target",
     "Set Password": "Ubah Password",
     "Enable audible notifications in web client": "Aktifkan notifikasi suara di klien web",
-    "Permalink": "Permalink",
     "Off": "Mati",
     "Riot does not know how to join a room on this network": "Riot tidak tau bagaimana gabung ruang di jaringan ini",
     "Mentions only": "Hanya jika disinggung",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index d901c52f60..39f03156f5 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -380,7 +380,6 @@
     "View Source": "Skoða frumkóða",
     "View Decrypted Source": "Skoða afkóðaða upprunaskrá",
     "Unhide Preview": "Birta forskoðun",
-    "Permalink": "Varanlegur tengill",
     "Quote": "Tilvitnun",
     "Source URL": "Upprunaslóð",
     "All messages (noisy)": "Öll skilaboð (hávært)",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index c73dc8b60d..d96c315363 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1122,7 +1122,6 @@
     "What's New": "Novità",
     "Set Password": "Imposta Password",
     "Enable audible notifications in web client": "Abilita notifiche audio nel client web",
-    "Permalink": "Link permanente",
     "Off": "Spento",
     "#example": "#esempio",
     "Mentions only": "Solo le citazioni",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 80bd4f1ff5..741de4b551 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -223,7 +223,6 @@
     "Event Type": "イベントの形式",
     "What's New": "新着",
     "Enable audible notifications in web client": "ウェブクライアントで音による通知を有効化",
-    "Permalink": "パーマリンク",
     "remove %(name)s from the directory.": "ディレクトリから %(name)s を消去する。",
     "Riot does not know how to join a room on this network": "Riotはこのネットワークで部屋に参加する方法を知りません",
     "You can now return to your account after signing out, and sign in on other devices.": "サインアウト後にあなたの\nアカウントに戻る、また、他の端末でサインインすることができます。",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 4e0a988223..7e58b9a253 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -754,7 +754,6 @@
     "Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요",
     "Set Password": "비밀번호 설정",
     "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기",
-    "Permalink": "고유주소",
     "Off": "끄기",
     "#example": "#예",
     "Mentions only": "답만 하기",
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index bd46c25ed8..e1525f7af1 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -161,7 +161,6 @@
     "Set Password": "Nustatyti slaptažodį",
     "An error occurred whilst saving your email notification preferences.": "Įrašant pranešimų el. paštu nuostatas, įvyko klaida.",
     "Unable to join network": "Nepavyko prisijungti prie tinklo",
-    "Permalink": "Pastovioji nuoroda",
     "Register": "Registruotis",
     "Off": "Išjungta",
     "Edit": "Koreguoti",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 01e3ae5c6d..5622dcb408 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1115,7 +1115,6 @@
     "Unable to fetch notification target list": "Neizdevās iegūt paziņojumu mērķu sarakstu",
     "Set Password": "Iestatīt paroli",
     "Enable audible notifications in web client": "Iespējot skaņus paziņojumus web klientā",
-    "Permalink": "Pastāvīgā saite",
     "Off": "izslēgts",
     "Riot does not know how to join a room on this network": "Riot nezin kā pievienoties šajā tīklā esošajai istabai",
     "Mentions only": "Vienīgi atsauces",
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index 6de7e92df7..a4bf0b421a 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -137,7 +137,6 @@
     "Unable to fetch notification target list": "നോട്ടിഫിക്കേഷന്‍ ടാര്‍ഗെറ്റ് ലിസ്റ്റ് നേടാനായില്ല",
     "Set Password": "രഹസ്യവാക്ക് സജ്ജീകരിക്കുക",
     "Enable audible notifications in web client": "വെബ് പതിപ്പിലെ അറിയിപ്പുകള്‍ കേള്‍ക്കാവുന്നതാക്കുക",
-    "Permalink": "പെര്‍മാലിങ്ക്",
     "remove %(name)s from the directory.": "%(name)s ഡയറക്റ്ററിയില്‍ നിന്ന് നീക്കം ചെയ്യുക.",
     "Off": "ഓഫ്",
     "Riot does not know how to join a room on this network": "ഈ നെറ്റ്‍വര്‍ക്കിലെ ഒരു റൂമില്‍ എങ്ങനെ അംഗമാകാമെന്ന് റയട്ടിന് അറിയില്ല",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 47da50122c..9a2b859854 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -98,7 +98,6 @@
     "Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket",
     "An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av epost varsel innstillinger.",
     "Enable audible notifications in web client": "Aktiver lyd-varsel i webklient",
-    "Permalink": "Permanent lenke",
     "remove %(name)s from the directory.": "fjern %(name)s fra katalogen.",
     "Off": "Av",
     "#example": "#eksempel",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f09c63118e..bda64146cc 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1120,7 +1120,6 @@
     "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatiedoelen op te halen",
     "Set Password": "Wachtwoord instellen",
     "Enable audible notifications in web client": "Geluidsmeldingen in de webclient aanzetten",
-    "Permalink": "Permanente link",
     "Off": "Uit",
     "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een ruimte op dit netwerk",
     "Mentions only": "Alleen vermeldingen",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index d3dcb72f49..30afa07202 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -901,7 +901,6 @@
     "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień",
     "Set Password": "Ustaw hasło",
     "Enable audible notifications in web client": "Włącz dźwiękowe powiadomienia w kliencie internetowym",
-    "Permalink": "Odnośnik bezpośredni",
     "Off": "Wyłącz",
     "Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci",
     "Mentions only": "Tylko, gdy wymienieni",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index d165c6c057..c8f7a45dcf 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -826,7 +826,6 @@
     "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
     "Set Password": "Definir palavra-passe",
     "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
-    "Permalink": "Link permanente",
     "Off": "Desativado",
     "Riot does not know how to join a room on this network": "O Riot não sabe como entrar numa sala nesta rede",
     "Mentions only": "Apenas menções",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 0a4d847805..a5c4e06922 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -1101,7 +1101,6 @@
     "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
     "Set Password": "Definir senha",
     "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
-    "Permalink": "Link permanente",
     "Off": "Desativado",
     "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede",
     "Mentions only": "Apenas menções",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 2bdce2fe4f..599847ab84 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1125,7 +1125,6 @@
     "Unable to fetch notification target list": "Не удалось получить список устройств для уведомлений",
     "Set Password": "Задать пароль",
     "Enable audible notifications in web client": "Включить звуковые уведомления в веб-клиенте",
-    "Permalink": "Постоянная ссылка",
     "Off": "Выключить",
     "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети",
     "Mentions only": "Только при упоминаниях",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index ed07ff5c09..fb49973550 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1126,7 +1126,6 @@
     "Set Password": "Nastaviť Heslo",
     "An error occurred whilst saving your email notification preferences.": "Počas ukladania vašich nastavení oznamovania emailom sa vyskytla chyba.",
     "Enable audible notifications in web client": "Povoliť zvukové oznámenia vo webovom klientovi",
-    "Permalink": "Trvalý odkaz",
     "Off": "Zakázané",
     "Riot does not know how to join a room on this network": "Riot nedokáže vstúpiť do miestnosti na tejto sieti",
     "Mentions only": "Len zmienky",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 2936695a6d..66f6f032b7 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -269,7 +269,6 @@
     "Set Password": "Caktoni Fjalëkalim",
     "An error occurred whilst saving your email notification preferences.": "Ndodhi një gabim teksa ruheshin parapëlqimet tuaja për njoftime me email.",
     "Enable audible notifications in web client": "Aktivizoni njoftime audio te klienti web",
-    "Permalink": "Permalidhje",
     "Register": "Regjistrohuni",
     "Off": "Off",
     "Edit": "Përpunoni",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index ebacd28a5c..e24fa93c09 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1101,7 +1101,6 @@
     "Set Password": "Постави лозинку",
     "An error occurred whilst saving your email notification preferences.": "Догодила се грешка при чувању ваших поставки мејл обавештења.",
     "Enable audible notifications in web client": "Омогући звучна обавештења у веб клијенту",
-    "Permalink": "Трајна веза",
     "Resend": "Поново пошаљи",
     "Riot does not know how to join a room on this network": "Riot не зна како да приступи соби на овој мрежи",
     "Mentions only": "Само спомињања",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index ff64f1a8e6..91d1477190 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -547,7 +547,6 @@
     "Unable to fetch notification target list": "Det gick inte att hämta aviseringsmållistan",
     "Set Password": "Välj lösenord",
     "Enable audible notifications in web client": "Sätt på högljudda aviseringar i webbklienten",
-    "Permalink": "Permanent länk",
     "Off": "Av",
     "Riot does not know how to join a room on this network": "Riot kan inte gå med i ett rum på det här nätverket",
     "Mentions only": "Endast omnämnande",
diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
index 6aecb54bfd..b8fe318b46 100644
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -78,7 +78,6 @@
     "Off": "அமை",
     "On": "மீது",
     "Operation failed": "செயல்பாடு தோல்வியுற்றது",
-    "Permalink": "நிரந்தரத் தொடுப்பு",
     "powered by Matrix": "Matrix-ஆல் ஆனது",
     "Quote": "மேற்கோள்",
     "Reject": "நிராகரி",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 6fa7febabd..dac3656631 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -544,7 +544,6 @@
     "Riot does not know how to join a room on this network": "Riot ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้",
     "Set Password": "ตั้งรหัสผ่าน",
     "Enable audible notifications in web client": "เปิดใช้งานเสียงแจ้งเตือนบนเว็บไคลเอนต์",
-    "Permalink": "ลิงก์ถาวร",
     "Off": "ปิด",
     "#example": "#example",
     "Mentions only": "เมื่อถูกกล่าวถึงเท่านั้น",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 797fed79ce..43ba89c968 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -741,7 +741,6 @@
     "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi",
     "An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.",
     "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir",
-    "Permalink": "Kalıcı Bağlantı(permalink)",
     "Off": "Kapalı",
     "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor",
     "Mentions only": "Sadece Mention'lar",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 74bf855d22..b07a5dadab 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -232,7 +232,6 @@
     "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення",
     "Set Password": "Задати пароль",
     "Enable audible notifications in web client": "Увімкнути звукові сповіщення у мережевому застосунку",
-    "Permalink": "Постійне посилання",
     "Off": "Вимкнено",
     "Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі",
     "Mentions only": "Тільки згадки",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 8e2dc6e0f8..b1547170b0 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1099,7 +1099,6 @@
     "Unable to fetch notification target list": "无法获取通知目标列表",
     "Set Password": "设置密码",
     "Enable audible notifications in web client": "在网页客户端启用音频通知",
-    "Permalink": "永久链接",
     "Off": "关闭",
     "Riot does not know how to join a room on this network": "Riot 不知道如何在此网络中加入聊天室",
     "Mentions only": "只限提及",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 95424eaefb..1e43f27a59 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1126,7 +1126,6 @@
     "Riot does not know how to join a room on this network": "Riot 不知道如何在此網路中加入聊天室",
     "Set Password": "設定密碼",
     "Enable audible notifications in web client": "在網頁客戶端啟用音訊通知",
-    "Permalink": "永久連結",
     "Off": "關閉",
     "#example": "#範例",
     "Mentions only": "僅提及",

From bef435e15af87ebd622d88647f98df086e06be2f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:41:12 +0100
Subject: [PATCH 270/702] allow ShareEvent to devolve into ShareRoom using
 checkbox + i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/ShareDialog.js | 31 +++++++++++++++------
 src/i18n/strings/en_EN.json                 |  1 +
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 12efc8b919..873fcc4dee 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -67,10 +67,11 @@ export default class ShareDialog extends React.Component {
         super(props);
 
         this.onCopyClick = this.onCopyClick.bind(this);
-        this.onLinkRecentCheckboxClick = this.onLinkRecentCheckboxClick.bind(this);
+        this.onLinkSpecificEventCheckboxClick = this.onLinkSpecificEventCheckboxClick.bind(this);
 
         this.state = {
-            linkRecentTicked: false,
+            // MatrixEvent defaults to share linkSpecificEvent
+            linkSpecificEvent: this.props.target instanceof MatrixEvent,
         };
     }
 
@@ -116,9 +117,9 @@ export default class ShareDialog extends React.Component {
         e.target.onmouseleave = close;
     }
 
-    onLinkRecentCheckboxClick() {
+    onLinkSpecificEventCheckboxClick() {
         this.setState({
-            linkRecentTicked: !this.state.linkRecentTicked,
+            linkSpecificEvent: !this.state.linkSpecificEvent,
         });
     }
 
@@ -135,16 +136,16 @@ export default class ShareDialog extends React.Component {
             if (events.length > 0) {
                 checkbox = <div>
                     <input type="checkbox"
-                           value={this.state.linkRecentTicked}
+                           value={this.state.linkSpecificEvent}
                            id="mx_ShareDialog_checkbox"
-                           onClick={this.onLinkRecentCheckboxClick} />
+                           onClick={this.onLinkSpecificEventCheckboxClick} />
                     <label htmlFor="mx_ShareDialog_checkbox">
                         { _t('Link to most recent message') }
                     </label>
                 </div>;
             }
 
-            if (this.state.linkRecentTicked) {
+            if (this.state.linkSpecificEvent) {
                 matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId());
             } else {
                 matrixToUrl = makeRoomPermalink(this.props.target.roomId);
@@ -157,7 +158,21 @@ export default class ShareDialog extends React.Component {
             matrixToUrl = makeGroupPermalink(this.props.target.groupId);
         } else if (this.props.target instanceof MatrixEvent) {
             title = _t('Share Room Message');
-            matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId);
+            checkbox = <div>
+                <input type="checkbox"
+                       value={this.state.linkSpecificEvent}
+                       id="mx_ShareDialog_checkbox"
+                       onClick={this.onLinkSpecificEventCheckboxClick} />
+                <label htmlFor="mx_ShareDialog_checkbox">
+                    { _t('Link to selected message') }
+                </label>
+            </div>;
+
+            if (this.state.linkSpecificEvent) {
+                matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId);
+            } else {
+                matrixToUrl = makeRoomPermalink(this.props.target.roomId);
+            }
         }
 
         const encodedUrl = encodeURIComponent(matrixToUrl);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bb5ad5405b..3802c73431 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -863,6 +863,7 @@
     "Share User": "Share User",
     "Share Community": "Share Community",
     "Share Room Message": "Share Room Message",
+    "Link to selected message": "Link to selected message",
     "COPY": "COPY",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",

From e870399084ec9163f3fb655dbe586f9464c32287 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 14 Jun 2018 12:41:44 +0000
Subject: [PATCH 271/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1194 of 1194 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 87886ec652..3f2e2d9dd5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1187,5 +1187,10 @@
     "Terms and Conditions": "條款與細則",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "要繼續使用 %(homeserverDomain)s 家伺服器，您必須審閱並同意我們的條款與細則。",
     "Review terms and conditions": "審閱條款與細則",
-    "To notify everyone in the room, you must be a": "為了通知每個在聊天室裡的人，您必須為"
+    "To notify everyone in the room, you must be a": "為了通知每個在聊天室裡的人，您必須為",
+    "Encrypting": "正在加密",
+    "Encrypted, not sent": "已加密，未傳送",
+    "No Audio Outputs detected": "未偵測到音訊輸出",
+    "Audio Output": "音訊輸出",
+    "Try the app first": "先試試看應用程式"
 }

From ef178b282c2f82181584a284b14b3d3e56a22f87 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:44:05 +0100
Subject: [PATCH 272/702] use getters on MatrixEvent for roomId and eventId

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/ShareDialog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 873fcc4dee..bbd381ad29 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -169,9 +169,9 @@ export default class ShareDialog extends React.Component {
             </div>;
 
             if (this.state.linkSpecificEvent) {
-                matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId);
+                matrixToUrl = makeEventPermalink(this.props.target.getRoomId(), this.props.target.getId());
             } else {
-                matrixToUrl = makeRoomPermalink(this.props.target.roomId);
+                matrixToUrl = makeRoomPermalink(this.props.target.getRoomId());
             }
         }
 

From 33a3cfead6e2766d9a0b7211f074290c92ae0257 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:47:33 +0100
Subject: [PATCH 273/702] controlled checkboxes use `checked` not `value`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/ShareDialog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index bbd381ad29..a1a8598fdb 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -136,8 +136,8 @@ export default class ShareDialog extends React.Component {
             if (events.length > 0) {
                 checkbox = <div>
                     <input type="checkbox"
-                           value={this.state.linkSpecificEvent}
                            id="mx_ShareDialog_checkbox"
+                           checked={this.state.linkSpecificEvent}
                            onClick={this.onLinkSpecificEventCheckboxClick} />
                     <label htmlFor="mx_ShareDialog_checkbox">
                         { _t('Link to most recent message') }
@@ -160,8 +160,8 @@ export default class ShareDialog extends React.Component {
             title = _t('Share Room Message');
             checkbox = <div>
                 <input type="checkbox"
-                       value={this.state.linkSpecificEvent}
                        id="mx_ShareDialog_checkbox"
+                       checked={this.state.linkSpecificEvent}
                        onClick={this.onLinkSpecificEventCheckboxClick} />
                 <label htmlFor="mx_ShareDialog_checkbox">
                     { _t('Link to selected message') }

From 3e6b3215cfe15532e19fd48288caf9fe23fd465e Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 14 Jun 2018 13:49:23 +0100
Subject: [PATCH 274/702] Update WidgetUtils.js

Fix fixed comment
---
 src/WidgetUtils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 98ee935f35..2e2dcf30cd 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -100,7 +100,7 @@ export default class WidgetUtils {
      * @param {string} widgetId The ID of the widget to wait for
      * @param {boolean} add True to wait for the widget to be added,
      *     false to wait for it to be deleted.
-     * @returns {Promise} that resolves when the widget is the the
+     * @returns {Promise} that resolves when the widget is in the
      *     requested state according to the `add` param
      */
     static waitForUserWidget(widgetId, add) {
@@ -147,7 +147,7 @@ export default class WidgetUtils {
      * @param {string} roomId The ID of the room to wait for the widget in
      * @param {boolean} add True to wait for the widget to be added,
      *     false to wait for it to be deleted.
-     * @returns {Promise} that resolves when the widget is the the
+     * @returns {Promise} that resolves when the widget is in the
      *     requested state according to the `add` param
      */
     static waitForRoomWidget(widgetId, roomId, add) {

From 4e216714b533722e4c0b4bef3f0068a0d0bccb91 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 13:53:02 +0100
Subject: [PATCH 275/702] remove commented code and move modal.close into a
 finally block

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/context_menus/GroupInviteTileContextMenu.js        | 5 +++--
 src/components/views/groups/GroupInviteTile.js               | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index bbdc3a4244..e30acca16d 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -58,14 +58,15 @@ export default class GroupInviteTileContextMenu extends React.Component {
                 try {
                     await GroupStore.leaveGroup(this.props.group.groupId);
                 } catch (e) {
-                    console.error(e);
+                    console.error("Error rejecting community invite: ", e);
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createTrackedDialog('Error rejecting invite', '', ErrorDialog, {
                         title: _t("Error"),
                         description: _t("Unable to reject invite"),
                     });
+                } finally {
+                    modal.close();
                 }
-                modal.close();
             },
         });
 
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 65e8a07d5a..4d5f3c6f3a 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -94,7 +94,6 @@ export default React.createClass({
             group: this.props.group,
             onFinished: () => {
                 this.setState({ menuDisplayed: false });
-                // this.props.refreshSubList();
             },
         });
         this.setState({ menuDisplayed: true });

From 1346f47a12a2850b64e9555e999c8f3faab480d4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 14:18:39 +0100
Subject: [PATCH 276/702] allow filtering Group Invite Tiles with the same
 search filter

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 2722bad88b..c329e3f2a0 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -583,13 +583,18 @@ module.exports = React.createClass({
         }
     },
 
-    _makeGroupInviteTiles() {
+    _makeGroupInviteTiles(filter) {
         const ret = [];
+        const lcFilter = filter && filter.toLowerCase();
 
         const GroupInviteTile = sdk.getComponent('groups.GroupInviteTile');
         for (const group of MatrixClientPeg.get().getGroups()) {
-            if (group.myMembership !== 'invite') continue;
-            ret.push(<GroupInviteTile key={group.groupId} group={group} collapsed={this.props.collapsed} />);
+            const {groupId: id, name, myMembership: membership} = group;
+            // filter to only groups in invite state and group_id starts with filter or group name includes it
+            if (membership !== 'invite') continue;
+            if (lcFilter && !id.toLowerCase().startsWith(lcFilter) &&
+                !(name && name.toLowerCase().includes(lcFilter))) continue;
+            ret.push(<GroupInviteTile key={id} group={group} collapsed={this.props.collapsed} />);
         }
 
         return ret;
@@ -609,7 +614,7 @@ module.exports = React.createClass({
                 autoshow={true} onScroll={self._whenScrolling} wrappedRef={this._collectGemini}>
             <div className="mx_RoomList">
                 <RoomSubList list={[]}
-                             extraTiles={this._makeGroupInviteTiles()}
+                             extraTiles={this._makeGroupInviteTiles(self.props.searchFilter)}
                              label={_t('Community Invites')}
                              editable={false}
                              order="recent"

From c8d233c0a6178020d6fc77c4dbcb9a6240b45eac Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 14 Jun 2018 14:19:30 +0100
Subject: [PATCH 277/702] If unspecified, don't crash if missing thumbnail info

applies to stickers/images.

We might want to consider to do that is better than assuming a aspect
ratio of 600 x 800 (4:3).
---
 src/components/views/messages/MImageBody.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index c42840b03a..8ab3705766 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -185,7 +185,7 @@ export default class extends React.Component {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined && this.state.decryptedUrl === null) {
             let thumbnailPromise = Promise.resolve(null);
-            if (content.info.thumbnail_file) {
+            if (content.info && content.info.thumbnail_file) {
                 thumbnailPromise = decryptFile(
                     content.info.thumbnail_file,
                 ).then(function(blob) {
@@ -239,11 +239,20 @@ export default class extends React.Component {
     }
 
     _messageContent(contentUrl, thumbUrl, content) {
+        // If unspecifide in the thumbnail info, assume width x height to be 800 x 600.
+        let infoHeight = 600;
+        let infoWidth = 800;
+
+        if (content.info && content.info.h && content.info.w) {
+            infoHeight = content.info.h;
+            infoWidth = content.info.w;
+        }
+
         // The maximum height of the thumbnail as it is rendered as an <img>
-        const maxHeight = Math.min(this.props.maxImageHeight || 600, content.info.h);
+        const maxHeight = Math.min(this.props.maxImageHeight || 600, infoHeight);
         // The maximum width of the thumbnail, as dictated by its natural
         // maximum height.
-        const maxWidth = content.info.w * maxHeight / content.info.h;
+        const maxWidth = infoWidth * maxHeight / infoHeight;
 
         let img = null;
         let placeholder = null;
@@ -274,12 +283,12 @@ export default class extends React.Component {
         const thumbnail = (
             <div className="mx_MImageBody_thumbnail_container" style={{ "max-height": maxHeight + "px" }} >
                 { /* Calculate aspect ratio, using %padding will size _container correctly */ }
-                <div style={{ paddingBottom: (100 * content.info.h / content.info.w) + '%' }}></div>
+                <div style={{ paddingBottom: (100 * infoHeight / infoWidth) + '%' }}></div>
 
                 { showPlaceholder &&
                     <div className="mx_MImageBody_thumbnail" style={{
                         // Constrain width here so that spinner appears central to the loaded thumbnail
-                        "max-width": content.info.w + "px",
+                        "max-width": infoWidth + "px",
                     }}>
                         <div className="mx_MImageBody_thumbnail_spinner">
                             { placeholder }

From 2d14d51ecb6bbe9f5922f4144054457f456151c5 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 14 Jun 2018 15:44:55 +0100
Subject: [PATCH 278/702] Handle images without width/height info correctly

Prior to #1912, height fix up of image events without an `info` in their
content would fail, setting `style.height = null + "px"`.

Now that all thumbnail sizing is done through one path, we can fix the
same problem for all cases (images, stickers, e2e/non-e2e) by handling
images without `info` correctly.

At the bare minimum, we use a null-guard that will make sure an image
without an `info` does not appear in the timeline (as a spinner or
otherwise until loaded). When loaded, we size it like any other image
by using the natural dimensions of the loaded image in place of `info`.

Note that we do not apply the same logic to images that *do* specify an
`info` with `w` and `h` keys. If the aspect ratio of the image does not
match that of the event, we use the one in `info` even when the image
has loaded.
---
 src/components/views/messages/MImageBody.js | 38 +++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 8ab3705766..c13f963545 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -147,7 +147,16 @@ export default class extends React.Component {
 
     onImageLoad() {
         this.props.onWidgetLoad();
-        this.setState({ imgLoaded: true });
+
+        let loadedImageDimensions;
+
+        if (this.refs.image) {
+            const { naturalWidth, naturalHeight } = this.refs.image;
+
+            loadedImageDimensions = { naturalWidth, naturalHeight };
+        }
+
+        this.setState({ imgLoaded: true, loadedImageDimensions });
     }
 
     _getContentUrl() {
@@ -239,13 +248,30 @@ export default class extends React.Component {
     }
 
     _messageContent(contentUrl, thumbUrl, content) {
-        // If unspecifide in the thumbnail info, assume width x height to be 800 x 600.
-        let infoHeight = 600;
-        let infoWidth = 800;
+        let infoWidth;
+        let infoHeight;
 
-        if (content.info && content.info.h && content.info.w) {
-            infoHeight = content.info.h;
+        if (content && content.info && content.info.w && content.info.h) {
             infoWidth = content.info.w;
+            infoHeight = content.info.h;
+        } else {
+            // Whilst the image loads, display nothing.
+            //
+            // Once loaded, use the loaded image dimensions stored in `loadedImageDimensions`.
+            //
+            // By doing this, the image "pops" into the timeline, but is still restricted
+            // by the same width and height logic below.
+            if (!this.state.loadedImageDimensions) {
+                return this.wrapImage(contentUrl,
+                    <img style={{display: 'none'}} src={thumbUrl} ref="image"
+                        alt={content.body}
+                        onError={this.onImageError}
+                        onLoad={this.onImageLoad}
+                    />,
+                );
+            }
+            infoWidth = this.state.loadedImageDimensions.naturalWidth;
+            infoHeight = this.state.loadedImageDimensions.naturalHeight;
         }
 
         // The maximum height of the thumbnail as it is rendered as an <img>

From 2eb23ed234c6114658dc5fe6829884db3a6beea1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 14 Jun 2018 15:53:49 +0100
Subject: [PATCH 279/702] Add loadedImageDimensions to initial state

---
 src/components/views/messages/MImageBody.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index c13f963545..1b6bdeb588 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -65,6 +65,7 @@ export default class extends React.Component {
             error: null,
             imgError: false,
             imgLoaded: false,
+            loadedImageDimensions: null,
             hover: false,
         };
     }

From 3b141d7a84dada258067b57d33f0f67cea52b161 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 16:48:00 +0100
Subject: [PATCH 280/702] change variable names for clarity

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index c329e3f2a0..167603ecfb 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -589,12 +589,12 @@ module.exports = React.createClass({
 
         const GroupInviteTile = sdk.getComponent('groups.GroupInviteTile');
         for (const group of MatrixClientPeg.get().getGroups()) {
-            const {groupId: id, name, myMembership: membership} = group;
+            const {groupId, name, myMembership} = group;
             // filter to only groups in invite state and group_id starts with filter or group name includes it
-            if (membership !== 'invite') continue;
-            if (lcFilter && !id.toLowerCase().startsWith(lcFilter) &&
+            if (myMembership !== 'invite') continue;
+            if (lcFilter && !groupId.toLowerCase().startsWith(lcFilter) &&
                 !(name && name.toLowerCase().includes(lcFilter))) continue;
-            ret.push(<GroupInviteTile key={id} group={group} collapsed={this.props.collapsed} />);
+            ret.push(<GroupInviteTile key={groupId} group={group} collapsed={this.props.collapsed} />);
         }
 
         return ret;

From 7de7275c6d526f5ab5214cc4f488d5aae587e6cf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 18:56:46 +0100
Subject: [PATCH 281/702] remove subheadings in ShareDialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_ShareDialog.scss     |  6 ++--
 src/components/views/dialogs/ShareDialog.js | 34 +++++++++------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
index ab340ad758..116bef8dfd 100644
--- a/res/css/views/dialogs/_ShareDialog.scss
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -21,7 +21,7 @@ limitations under the License.
 
 .mx_ShareDialog hr {
     margin-top: 25px;
-    margin-bottom: 10px;
+    margin-bottom: 25px;
     border-color: $light-fg-color;
 }
 
@@ -78,12 +78,12 @@ limitations under the License.
 }
 
 .mx_ShareDialog_social_container {
-    display: flex;
-    flex-wrap: wrap;
+    display: inline-block;
     width: 299px;
 }
 
 .mx_ShareDialog_social_icon {
+    display: inline-grid;
     margin-right: 10px;
     margin-bottom: 10px;
 }
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index a1a8598fdb..f074d9b1fa 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -201,27 +201,21 @@ export default class ShareDialog extends React.Component {
                 <hr />
 
                 <div className="mx_ShareDialog_split">
-                    <div className="mx_ShareDialog_left">
-                        <h3>QR Code</h3>
-                        <div className="mx_ShareDialog_qrcode_container">
-                            <QRCode value={matrixToUrl} size={256} logoWidth={48} logo="img/matrix-m.svg" />
-                        </div>
+                    <div className="mx_ShareDialog_qrcode_container">
+                        <QRCode value={matrixToUrl} size={256} logoWidth={48} logo="img/matrix-m.svg" />
                     </div>
-                    <div className="mx_ShareDialog_right">
-                        <h3>Social</h3>
-                        <div className="mx_ShareDialog_social_container">
-                            {
-                                socials.map((social) => <a rel="noopener"
-                                                           target="_blank"
-                                                           key={social.name}
-                                                           name={social.name}
-                                                           href={social.url(encodedUrl)}
-                                                           className="mx_ShareDialog_social_icon"
-                                >
-                                    <img src={social.img} alt={social.name} height={64} width={64} />
-                                </a>)
-                            }
-                        </div>
+                    <div className="mx_ShareDialog_social_container">
+                        {
+                            socials.map((social) => <a rel="noopener"
+                                                       target="_blank"
+                                                       key={social.name}
+                                                       name={social.name}
+                                                       href={social.url(encodedUrl)}
+                                                       className="mx_ShareDialog_social_icon"
+                            >
+                                <img src={social.img} alt={social.name} height={64} width={64} />
+                            </a>)
+                        }
                     </div>
                 </div>
             </div>

From 7adbff69dc1febb1b58c36cc67ade338f06e9641 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 Jun 2018 18:58:38 +0100
Subject: [PATCH 282/702] QuestionDialog pass hasCancelButton to DialogButtons
 otherwise E2E Q Dialog has OK and Cancel which makes 0 sense as its just an
 info dialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/QuestionDialog.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 21d3a54bc2..ed73bdcbdf 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -67,9 +67,10 @@ export default React.createClass({
                     { this.props.description }
                 </div>
                 <DialogButtons primaryButton={this.props.button || _t('OK')}
-                    cancelButton={this.props.cancelButton}
-                    onPrimaryButtonClick={this.onOk}
                     primaryButtonClass={primaryButtonClass}
+                    cancelButton={this.props.cancelButton}
+                    hasCancel={this.props.hasCancelButton}
+                    onPrimaryButtonClick={this.onOk}
                     focus={this.props.focus}
                     onCancel={this.onCancel}
                 >

From 826df5765caf9a38d82999b40457ef8b79372f34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 10:27:21 +0100
Subject: [PATCH 283/702] add rel noopener to cross origin loader (currently
 rel="undefined")

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/MFileBody.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 246ea6891f..292ac25d42 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -327,6 +327,7 @@ module.exports = React.createClass({
                     // will have the correct name when the user tries to download it.
                     // We can't provide a Content-Disposition header like we would for HTTP.
                     download: fileName,
+                    rel: "noopener",
                     target: "_blank",
                     textContent: _t("Download %(text)s", { text: text }),
                 }, "*");

From da93c6d04076e01fbbfe3a692c5e5a3705f5a9e0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 10:27:39 +0100
Subject: [PATCH 284/702] pass omitFilename to stop sending filename=undefined

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/ContentMessages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 7fe625f8b9..1d61b6de6a 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -243,6 +243,7 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
             const blob = new Blob([encryptResult.data]);
             return matrixClient.uploadContent(blob, {
                 progressHandler: progressHandler,
+                omitFilename: true,
             }).then(function(url) {
                 // If the attachment is encrypted then bundle the URL along
                 // with the information needed to decrypt the attachment and

From 9567ffcb9f30843971d1deda2c06888c5075e8c6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 15 Jun 2018 11:56:44 +0100
Subject: [PATCH 285/702] Remove tag panel feature flag

We forgot to remove this when taking tagpanel out of labs, so now
this flag just does nothing.
---
 src/settings/Settings.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index d1d0cf19aa..039bd78d79 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -88,12 +88,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_tag_panel": {
-        isFeature: true,
-        displayName: _td("Tag Panel"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),

From 7bda6d3623fc0ecef804e2ab6ffce631902b589b Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 15 Jun 2018 11:03:40 +0000
Subject: [PATCH 286/702] Translated using Weblate (Russian)

Currently translated at 99.6% (1199 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 2dc8118b2e..e402f45233 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1189,5 +1189,13 @@
     "Encrypting": "Шифрование",
     "Encrypted, not sent": "Зашифровано, не отправлено",
     "No Audio Outputs detected": "Аудиовыход не обнаружен",
-    "Audio Output": "Аудиовыход"
+    "Audio Output": "Аудиовыход",
+    "Share Link to User": "Поделиться ссылкой с пользователем",
+    "Share room": "Поделиться комнатой",
+    "Share Room": "Поделиться комнатой",
+    "Link to most recent message": "Ссылка на последнее сообщение",
+    "Share User": "Поделиться пользователем",
+    "Share Community": "Поделиться сообществом",
+    "Link to selected message": "Ссылка на выбранное сообщение",
+    "COPY": "КОПИРОВАТЬ"
 }

From bed9b9851d69b35cff8dde8b8cd9f6731d0447f7 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 15 Jun 2018 11:48:39 +0000
Subject: [PATCH 287/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 9eb8842033..8c7f3d1f16 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1191,5 +1191,15 @@
     "Encrypting": "Titkosít",
     "Encrypted, not sent": "Titkosítva, de nincs elküldve",
     "No Audio Outputs detected": "Nem található hang kimenet",
-    "Audio Output": "Hang kimenet"
+    "Audio Output": "Hang kimenet",
+    "Share Link to User": "Hivatkozás megosztása felhasználóval",
+    "Share room": "Szoba megosztása",
+    "Share Room": "Szoba megosztása",
+    "Link to most recent message": "A legfrissebb üzenetre hivatkozás",
+    "Share User": "Felhasználó megosztás",
+    "Share Community": "Közösség megosztás",
+    "Share Room Message": "Szoba üzenet megosztás",
+    "Link to selected message": "Hivatkozás a kijelölt üzenetre",
+    "COPY": "Másol",
+    "Share Message": "Üzenet megosztása"
 }

From 62601d657da3afa34a392e3b02ba8800785f0000 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 13:33:07 +0100
Subject: [PATCH 288/702] Implement DecryptionFailureTracker for less agressive
 tracking

Instead of pinging Analytics once per failed decryption, add the failure
to a list of failures and after a grace period, add it to a FIFO for
tracking. On an interval, track a single failure from the FIFO.
---
 src/DecryptionFailureTracker.js         | 124 +++++++++++++++++++++++
 src/components/structures/MatrixChat.js |  16 +--
 test/DecryptionFailureTracker-test.js   | 128 ++++++++++++++++++++++++
 3 files changed, 262 insertions(+), 6 deletions(-)
 create mode 100644 src/DecryptionFailureTracker.js
 create mode 100644 test/DecryptionFailureTracker-test.js

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
new file mode 100644
index 0000000000..0f86093209
--- /dev/null
+++ b/src/DecryptionFailureTracker.js
@@ -0,0 +1,124 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+class DecryptionFailure {
+    constructor(failedEventId) {
+        this.failedEventId = failedEventId;
+        this.ts = Date.now();
+    }
+}
+
+export default class DecryptionFailureTracker {
+    // Array of items of type DecryptionFailure. Every `CHECK_INTERVAL_MS`, this list
+    // is checked for failures that happened > `GRACE_PERIOD_MS` ago. Those that did
+    // are added to `failuresToTrack`.
+    failures = [];
+
+    // Every TRACK_INTERVAL_MS (so as to spread the number of hits done on Analytics),
+    // one DecryptionFailure of this FIFO is removed and tracked.
+    failuresToTrack = [];
+
+    // Spread the load on `Analytics` by sending at most 1 event per
+    // `TRACK_INTERVAL_MS`.
+    static TRACK_INTERVAL_MS = 1000;
+
+    // Call `checkFailures` every `CHECK_INTERVAL_MS`.
+    static CHECK_INTERVAL_MS = 5000;
+
+    // Give events a chance to be decrypted by waiting `GRACE_PERIOD_MS` before moving
+    // the failure to `failuresToTrack`.
+    static GRACE_PERIOD_MS = 5000;
+
+    constructor(fn) {
+        if (!fn || typeof fn !== 'function') {
+            throw new Error('DecryptionFailureTracker requires tracking function');
+        }
+
+        this.trackDecryptionFailure = fn;
+    }
+
+    eventDecrypted(e) {
+        if (e.isDecryptionFailure()) {
+            this.addDecryptionFailureForEvent(e);
+        } else {
+            // Could be an event in the failures, remove it
+            this.removeDecryptionFailuresForEvent(e);
+        }
+    }
+
+    addDecryptionFailureForEvent(e) {
+        this.failures.push(new DecryptionFailure(e.getId()));
+    }
+
+    removeDecryptionFailuresForEvent(e) {
+        this.failures = this.failures.filter((f) => f.failedEventId !== e.getId());
+    }
+
+    /**
+     * Start checking for and tracking failures.
+     * @return {function} a function that clears state and causes DFT to stop checking for
+     * and tracking failures.
+     */
+    start() {
+        const checkInterval = setInterval(
+            () => this.checkFailures(Date.now()),
+            DecryptionFailureTracker.CHECK_INTERVAL_MS,
+        );
+
+        const trackInterval = setInterval(
+            () => this.trackFailure(),
+            DecryptionFailureTracker.TRACK_INTERVAL_MS,
+        );
+
+        return () => {
+            clearInterval(checkInterval);
+            clearInterval(trackInterval);
+
+            this.failures = [];
+            this.failuresToTrack = [];
+        };
+    }
+
+    /**
+     * Mark failures that occured before nowTs - GRACE_PERIOD_MS as failures that should be
+     * tracked. Only mark one failure per event ID.
+     * @param {number} nowTs the timestamp that represents the time now.
+     */
+    checkFailures(nowTs) {
+        const failuresGivenGrace = this.failures.filter(
+            (f) => nowTs > f.ts + DecryptionFailureTracker.GRACE_PERIOD_MS,
+        );
+
+        // Only track one failure per event
+        const dedupedFailuresMap = failuresGivenGrace.reduce(
+            (result, failure) => ({...result, [failure.failedEventId]: failure}),
+            {},
+        );
+        const dedupedFailures = Object.keys(dedupedFailuresMap).map((k) => dedupedFailuresMap[k]);
+
+        this.failuresToTrack = [...this.failuresToTrack, ...dedupedFailures];
+    }
+
+    /**
+     * If there is a failure that should be tracked, call the given trackDecryptionFailure
+     * function with the first failure in the FIFO of failures that should be tracked.
+     */
+    trackFailure() {
+        if (this.failuresToTrack.length > 0) {
+            this.trackDecryptionFailure(this.failuresToTrack.shift());
+        }
+    }
+}
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index da729a1a2d..7884829a76 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -23,6 +23,7 @@ import PropTypes from 'prop-types';
 import Matrix from "matrix-js-sdk";
 
 import Analytics from "../../Analytics";
+import DecryptionFailureTracker from "../../DecryptionFailureTracker";
 import MatrixClientPeg from "../../MatrixClientPeg";
 import PlatformPeg from "../../PlatformPeg";
 import SdkConfig from "../../SdkConfig";
@@ -1308,14 +1309,17 @@ export default React.createClass({
             }
         });
 
-        // XXX: This will do a HTTP request for each Event.decrypted event
-        // if the decryption was a failure
-        cli.on("Event.decrypted", (e) => {
-            if (e.isDecryptionFailure()) {
-                Analytics.trackEvent('E2E', 'Decryption failure', 'ev.content.body: ' + e.getContent().body);
-            }
+        const dft = new DecryptionFailureTracker((failure) => {
+            // TODO: Pass reason for failure as third argument to trackEvent
+            Analytics.trackEvent('E2E', 'Decryption failure');
         });
 
+        const stopDft = dft.start();
+
+        // When logging out, stop tracking failures and destroy state
+        cli.on("Session.logged_out", stopDft);
+        cli.on("Event.decrypted", dft.eventDecrypted);
+
         const krh = new KeyRequestHandler(cli);
         cli.on("crypto.roomKeyRequest", (req) => {
             krh.handleKeyRequest(req);
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
new file mode 100644
index 0000000000..9d3b035bf5
--- /dev/null
+++ b/test/DecryptionFailureTracker-test.js
@@ -0,0 +1,128 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import expect from 'expect';
+
+import DecryptionFailureTracker from '../src/DecryptionFailureTracker';
+
+import { MatrixEvent } from 'matrix-js-sdk';
+
+function createFailedDecryptionEvent() {
+    const event = new MatrixEvent({
+        event_id: "event-id-" + Math.random().toString(16).slice(2),
+    });
+    event._setClearData(
+        event._badEncryptedMessage(":("),
+    );
+    return event;
+}
+
+describe.only('DecryptionFailureTracker', function() {
+    it('tracks a failed decryption', function(done) {
+        const failedDecryptionEvent = createFailedDecryptionEvent();
+        let trackedFailure = null;
+        const tracker = new DecryptionFailureTracker((failure) => {
+            trackedFailure = failure;
+        });
+
+        tracker.eventDecrypted(failedDecryptionEvent);
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        // Immediately track the newest failure, if there is one
+        tracker.trackFailure();
+
+        expect(trackedFailure).toNotBe(null, 'should track a failure for an event that failed decryption');
+
+        done();
+    });
+
+    it('does not track a failed decryption where the event is subsequently successfully decrypted', (done) => {
+        const decryptedEvent = createFailedDecryptionEvent();
+        const tracker = new DecryptionFailureTracker((failure) => {
+            expect(true).toBe(false, 'should not track an event that has since been decrypted correctly');
+        });
+
+        tracker.eventDecrypted(decryptedEvent);
+
+        // Indicate successful decryption: clear data can be anything where the msgtype is not m.bad.encrypted
+        decryptedEvent._setClearData({});
+        tracker.eventDecrypted(decryptedEvent);
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        // Immediately track the newest failure, if there is one
+        tracker.trackFailure();
+        done();
+    });
+
+    it('only tracks a single failure per event, despite multiple failed decryptions for multiple events', (done) => {
+        const decryptedEvent = createFailedDecryptionEvent();
+        const decryptedEvent2 = createFailedDecryptionEvent();
+
+        let count = 0;
+        const tracker = new DecryptionFailureTracker((failure) => count++);
+
+        // Arbitrary number of failed decryptions for both events
+        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent2);
+        tracker.eventDecrypted(decryptedEvent2);
+        tracker.eventDecrypted(decryptedEvent2);
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        // Simulated polling of `trackFailure`, an arbitrary number ( > 2 ) times
+        tracker.trackFailure();
+        tracker.trackFailure();
+        tracker.trackFailure();
+        tracker.trackFailure();
+
+        expect(count).toBe(2, count + ' failures tracked, should only track a single failure per event');
+
+        done();
+    });
+
+    it('track failures in the order they occured', (done) => {
+        const decryptedEvent = createFailedDecryptionEvent();
+        const decryptedEvent2 = createFailedDecryptionEvent();
+
+        const failures = [];
+        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+
+        // Indicate decryption
+        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent2);
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        // Simulated polling of `trackFailure`, an arbitrary number ( > 2 ) times
+        tracker.trackFailure();
+        tracker.trackFailure();
+
+        expect(failures[0].failedEventId).toBe(decryptedEvent.getId(), 'the first failure should be tracked first');
+        expect(failures[1].failedEventId).toBe(decryptedEvent2.getId(), 'the second failure should be tracked second');
+
+        done();
+    });
+});

From 9e73c2e253ac7200e52a0c0303650b12b0963a03 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 15 Jun 2018 13:36:21 +0000
Subject: [PATCH 289/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index a1eeaa951a..8de7676f57 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1191,5 +1191,15 @@
     "Encrypted, not sent": "已加密，未傳送",
     "No Audio Outputs detected": "未偵測到音訊輸出",
     "Audio Output": "音訊輸出",
-    "Try the app first": "先試試看應用程式"
+    "Try the app first": "先試試看應用程式",
+    "Share Link to User": "分享連結給使用者",
+    "Share room": "分享聊天室",
+    "Share Room": "分享聊天室",
+    "Link to most recent message": "連結到最近的訊息",
+    "Share User": "分享使用者",
+    "Share Community": "分享社群",
+    "Share Room Message": "分享聊天室訊息",
+    "Link to selected message": "連結到選定的訊息",
+    "COPY": "複製",
+    "Share Message": "分享訊息"
 }

From 4a8442901d30e2721b7f581c1ab45db97a0ddd26 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 14:45:11 +0100
Subject: [PATCH 290/702] Remove failures when marking them for tracking

---
 src/DecryptionFailureTracker.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 0f86093209..9eadb332a8 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -98,9 +98,17 @@ export default class DecryptionFailureTracker {
      * @param {number} nowTs the timestamp that represents the time now.
      */
     checkFailures(nowTs) {
-        const failuresGivenGrace = this.failures.filter(
-            (f) => nowTs > f.ts + DecryptionFailureTracker.GRACE_PERIOD_MS,
-        );
+        const failuresGivenGrace = [];
+        const failuresNotReady = [];
+        while (this.failures.length > 0) {
+            const f = this.failures.shift();
+            if (nowTs > f.ts + DecryptionFailureTracker.GRACE_PERIOD_MS) {
+                failuresGivenGrace.push(f);
+            } else {
+                failuresNotReady.push(f);
+            }
+        }
+        this.failures = failuresNotReady;
 
         // Only track one failure per event
         const dedupedFailuresMap = failuresGivenGrace.reduce(

From ac0416af960da4f5c160314ea69d03b36e72a785 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 14:48:20 +0100
Subject: [PATCH 291/702] Do not track previously tracked failures

---
 src/DecryptionFailureTracker.js       | 27 +++++++++++++++++++++++++--
 test/DecryptionFailureTracker-test.js | 24 ++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 9eadb332a8..7bdfd6bfd0 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -21,6 +21,10 @@ class DecryptionFailure {
     }
 }
 
+function eventIdHash(eventId) {
+    return crypto.subtle.digest('SHA-256', eventId);
+}
+
 export default class DecryptionFailureTracker {
     // Array of items of type DecryptionFailure. Every `CHECK_INTERVAL_MS`, this list
     // is checked for failures that happened > `GRACE_PERIOD_MS` ago. Those that did
@@ -31,6 +35,11 @@ export default class DecryptionFailureTracker {
     // one DecryptionFailure of this FIFO is removed and tracked.
     failuresToTrack = [];
 
+    // Event IDs of failures that were tracked previously
+    eventTrackedPreviously = {
+        // [eventIdHash(eventId)]: true
+    };
+
     // Spread the load on `Analytics` by sending at most 1 event per
     // `TRACK_INTERVAL_MS`.
     static TRACK_INTERVAL_MS = 1000;
@@ -112,10 +121,24 @@ export default class DecryptionFailureTracker {
 
         // Only track one failure per event
         const dedupedFailuresMap = failuresGivenGrace.reduce(
-            (result, failure) => ({...result, [failure.failedEventId]: failure}),
+            (result, failure) => {
+                if (!this.eventTrackedPreviously[eventIdHash(failure.failedEventId)]) {
+                    return {...result, [failure.failedEventId]: failure};
+                } else {
+                    return result;
+                }
+            },
             {},
         );
-        const dedupedFailures = Object.keys(dedupedFailuresMap).map((k) => dedupedFailuresMap[k]);
+
+        const trackedEventIds = Object.keys(dedupedFailuresMap);
+
+        this.eventTrackedPreviously = trackedEventIds.reduce(
+            (result, eventId) => ({...result, [eventIdHash(eventId)]: true}),
+            this.eventTrackedPreviously,
+        );
+
+        const dedupedFailures = trackedEventIds.map((k) => dedupedFailuresMap[k]);
 
         this.failuresToTrack = [...this.failuresToTrack, ...dedupedFailures];
     }
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index 9d3b035bf5..34e2df2b6e 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -125,4 +125,28 @@ describe.only('DecryptionFailureTracker', function() {
 
         done();
     });
+
+    it('should not track a failure for an event that was tracked previously', (done) => {
+        const decryptedEvent = createFailedDecryptionEvent();
+
+        const failures = [];
+        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+
+        // Indicate decryption
+        tracker.eventDecrypted(decryptedEvent);
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        tracker.trackFailure();
+
+        // Indicate a second decryption, after having tracked the failure
+        tracker.eventDecrypted(decryptedEvent);
+
+        tracker.trackFailure();
+
+        expect(failures.length).toBe(1, 'should only track a single failure per event');
+
+        done();
+    });
 });

From 8cf17a66e5b409b68fd122491a5ad833e0e0d9aa Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 15 Jun 2018 15:12:32 +0100
Subject: [PATCH 292/702] Very basic Jitsi integration

Replaces the conference calling by adding a Jitsi widget. No support
for continuing the call on room change currently, so hidden behind
a feature flag. Existing behaviour is preserved by default.
---
 src/CallHandler.js                            | 139 +++++++++++++-----
 src/components/views/rooms/AppsDrawer.js      |   8 -
 src/components/views/rooms/MessageComposer.js |  34 -----
 src/i18n/strings/en_EN.json                   |  74 +++++-----
 src/settings/Settings.js                      |   7 +
 5 files changed, 149 insertions(+), 113 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index fd56d7f1b1..da764ec4b6 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -60,6 +60,7 @@ import { _t } from './languageHandler';
 import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
+import SettingsStore from "./settings/SettingsStore";
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -294,18 +295,8 @@ function _onAction(payload) {
             break;
         case 'place_conference_call':
             console.log("Place conference call in %s", payload.room_id);
-            if (!ConferenceHandler) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Call Handler', 'Conference call unsupported client', ErrorDialog, {
-                    description: _t('Conference calls are not supported in this client'),
-                });
-            } else if (!MatrixClientPeg.get().supportsVoip()) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
-                    title: _t('VoIP is unsupported'),
-                    description: _t('You cannot place VoIP calls in this browser.'),
-                });
-            } else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
+
+            if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
                 // Conference calls are implemented by sending the media to central
                 // server which combines the audio from all the participants together
                 // into a single stream. This is incompatible with end-to-end encryption
@@ -316,28 +307,46 @@ function _onAction(payload) {
                 Modal.createTrackedDialog('Call Handler', 'Conference calls unsupported e2e', ErrorDialog, {
                     description: _t('Conference calls are not supported in encrypted rooms'),
                 });
+                return;
+            }
+
+            if (SettingsStore.isFeatureEnabled('feature_jitsi')) {
+                _startCallApp(payload.room_id, payload.type);
             } else {
-                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                Modal.createTrackedDialog('Call Handler', 'Conference calling in development', QuestionDialog, {
-                    title: _t('Warning!'),
-                    description: _t('Conference calling is in development and may not be reliable.'),
-                    onFinished: (confirm)=>{
-                        if (confirm) {
-                            ConferenceHandler.createNewMatrixCall(
-                                MatrixClientPeg.get(), payload.room_id,
-                            ).done(function(call) {
-                                placeCall(call);
-                            }, function(err) {
-                                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                                console.error("Conference call failed: " + err);
-                                Modal.createTrackedDialog('Call Handler', 'Failed to set up conference call', ErrorDialog, {
-                                    title: _t('Failed to set up conference call'),
-                                    description: _t('Conference call failed.') + ' ' + ((err && err.message) ? err.message : ''),
+                if (!ConferenceHandler) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    Modal.createTrackedDialog('Call Handler', 'Conference call unsupported client', ErrorDialog, {
+                        description: _t('Conference calls are not supported in this client'),
+                    });
+                } else if (!MatrixClientPeg.get().supportsVoip()) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
+                        title: _t('VoIP is unsupported'),
+                        description: _t('You cannot place VoIP calls in this browser.'),
+                    });
+                } else {
+                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                    Modal.createTrackedDialog('Call Handler', 'Conference calling in development', QuestionDialog, {
+                        title: _t('Warning!'),
+                        description: _t('Conference calling is in development and may not be reliable.'),
+                        onFinished: (confirm)=>{
+                            if (confirm) {
+                                ConferenceHandler.createNewMatrixCall(
+                                    MatrixClientPeg.get(), payload.room_id,
+                                ).done(function(call) {
+                                    placeCall(call);
+                                }, function(err) {
+                                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                                    console.error("Conference call failed: " + err);
+                                    Modal.createTrackedDialog('Call Handler', 'Failed to set up conference call', ErrorDialog, {
+                                        title: _t('Failed to set up conference call'),
+                                        description: _t('Conference call failed.') + ' ' + ((err && err.message) ? err.message : ''),
+                                    });
                                 });
-                            });
-                        }
-                    },
-                });
+                            }
+                        },
+                    });
+                }
             }
             break;
         case 'incoming_call':
@@ -378,6 +387,70 @@ function _onAction(payload) {
             break;
     }
 }
+
+function _startCallApp(roomId, type) {
+    dis.dispatch({
+        action: 'appsDrawer',
+        show: true,
+    });
+
+    const room = MatrixClientPeg.get().getRoom(roomId);
+    if (!room) {
+        console.error("Attempted to start conference call widget in unknown room: " + roomId);
+        return;
+    }
+
+    const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+    const currentJitsiWidgets = appsStateEvents.filter((ev) => {
+        ev.getContent().type == 'jitsi';
+    });
+    if (currentJitsiWidgets.length > 0) {
+        console.warn(
+            "Refusing to start conference call widget in " + roomId +
+            " a conference call widget is already present",
+        );
+        return;
+    }
+
+    // This inherits its poor naming from the field of the same name that goes into
+    // the event. It's just a random string to make the Jitsi URLs unique.
+    const widgetSessionId = Math.random().toString(36).substring(2);
+    const confId = room.roomId.replace(/[^A-Za-z0-9]/g, '') + widgetSessionId;
+    // NB. we can't just encodeURICompoent all of these because the $ signs need to be there
+    const queryString = [
+        'confId='+encodeURIComponent(confId),
+        'isAudioConf='+(type === 'voice' ? 'true' : 'false'),
+        'displayName=$matrix_display_name',
+        'avatarUrl=$matrix_avatar_url',
+        'email=$matrix_user_id',
+    ].join('&');
+    const widgetUrl = (
+        'https://scalar.vector.im/api/widgets' +
+        '/jitsi.html?' +
+        queryString
+    );
+
+    const jitsiEvent = {
+        type: 'jitsi',
+        url: widgetUrl,
+        data: {
+            widgetSessionId: widgetSessionId,
+        },
+    };
+    const widgetId = (
+        'jitsi_' +
+        MatrixClientPeg.get().credentials.userId +
+        '_' +
+        Date.now()
+    );
+    MatrixClientPeg.get().sendStateEvent(
+        roomId,
+        'im.vector.modular.widgets',
+        jitsiEvent,
+        widgetId,
+    ).then(() => console.log('Sent state'), (e) => console.error(e));
+}
+
 // FIXME: Nasty way of making sure we only register
 // with the dispatcher once
 if (!global.mxCallHandler) {
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 8763ea3d7f..f0b7eaa1d7 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -94,15 +94,7 @@ module.exports = React.createClass({
         const hideWidgetKey = this.props.room.roomId + '_hide_widget_drawer';
         switch (action.action) {
             case 'appsDrawer':
-                // When opening the app drawer when there aren't any apps,
-                // auto-launch the integrations manager to skip the awkward
-                // click on "Add widget"
                 if (action.show) {
-                    const apps = this._getApps();
-                    if (apps.length === 0) {
-                        this._launchManageIntegrations();
-                    }
-
                     localStorage.removeItem(hideWidgetKey);
                 } else {
                     // Store hidden state of widget
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 28a90b375a..bac996e65c 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -159,54 +159,20 @@ export default class MessageComposer extends React.Component {
         });
     }
 
-    // _startCallApp(isAudioConf) {
-        // dis.dispatch({
-        //     action: 'appsDrawer',
-        //     show: true,
-        // });
-
-        // const appsStateEvents = this.props.room.currentState.getStateEvents('im.vector.modular.widgets', '');
-        // let appsStateEvent = {};
-        // if (appsStateEvents) {
-        //     appsStateEvent = appsStateEvents.getContent();
-        // }
-        // if (!appsStateEvent.videoConf) {
-        //     appsStateEvent.videoConf = {
-        //         type: 'jitsi',
-        //         // FIXME -- This should not be localhost
-        //         url: 'http://localhost:8000/jitsi.html',
-        //         data: {
-        //             confId: this.props.room.roomId.replace(/[^A-Za-z0-9]/g, '_') + Date.now(),
-        //             isAudioConf: isAudioConf,
-        //         },
-        //     };
-        //     MatrixClientPeg.get().sendStateEvent(
-        //         this.props.room.roomId,
-        //         'im.vector.modular.widgets',
-        //         appsStateEvent,
-        //         '',
-        //     ).then(() => console.log('Sent state'), (e) => console.error(e));
-        // }
-    // }
-
     onCallClick(ev) {
-        // NOTE -- Will be replaced by Jitsi code (currently commented)
         dis.dispatch({
             action: 'place_call',
             type: ev.shiftKey ? "screensharing" : "video",
             room_id: this.props.room.roomId,
         });
-        // this._startCallApp(false);
     }
 
     onVoiceCallClick(ev) {
-        // NOTE -- Will be replaced by Jitsi code (currently commented)
         dis.dispatch({
             action: 'place_call',
             type: "voice",
             room_id: this.props.room.roomId,
         });
-        // this._startCallApp(true);
     }
 
     onInputContentChanged(content: string, selection: {start: number, end: number}) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 41f67ad9d9..9af90d39d4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -33,8 +33,8 @@
     "VoIP is unsupported": "VoIP is unsupported",
     "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
-    "Conference calls are not supported in this client": "Conference calls are not supported in this client",
     "Conference calls are not supported in encrypted rooms": "Conference calls are not supported in encrypted rooms",
+    "Conference calls are not supported in this client": "Conference calls are not supported in this client",
     "Warning!": "Warning!",
     "Conference calling is in development and may not be reliable.": "Conference calling is in development and may not be reliable.",
     "Failed to set up conference call": "Failed to set up conference call",
@@ -42,10 +42,6 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -85,7 +81,6 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -116,10 +111,8 @@
     "You are not in this room.": "You are not in this room.",
     "You do not have permission to do that in this room.": "You do not have permission to do that in this room.",
     "Missing room_id in request": "Missing room_id in request",
-    "Must be viewing a room": "Must be viewing a room",
     "Room %(roomId)s not visible": "Room %(roomId)s not visible",
     "Missing user_id in request": "Missing user_id in request",
-    "Failed to lookup current room": "Failed to lookup current room",
     "Usage": "Usage",
     "/ddg is not a command": "/ddg is not a command",
     "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
@@ -184,13 +177,18 @@
     "%(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",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Failed to join room": "Failed to join room",
     "Message Replies": "Message Replies",
     "Message Pinning": "Message Pinning",
-    "Tag Panel": "Tag Panel",
+    "Jitsi Conference Calling": "Jitsi Conference Calling",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Hide removed messages": "Hide removed messages",
@@ -297,29 +295,6 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -419,11 +394,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -557,6 +532,29 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -876,6 +874,10 @@
     "Public Chat": "Public Chat",
     "Custom": "Custom",
     "Alias (optional)": "Alias (optional)",
+    "Reject invitation": "Reject invitation",
+    "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
+    "Unable to reject invite": "Unable to reject invite",
+    "Reject": "Reject",
     "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "Resend": "Resend",
     "Cancel Sending": "Cancel Sending",
@@ -895,7 +897,6 @@
     "Mentions only": "Mentions only",
     "Leave": "Leave",
     "Forget": "Forget",
-    "Reject": "Reject",
     "Low Priority": "Low Priority",
     "Direct Chat": "Direct Chat",
     "View Community": "View Community",
@@ -930,7 +931,6 @@
     "Failed to upload image": "Failed to upload image",
     "Failed to update community": "Failed to update community",
     "Unable to accept invite": "Unable to accept invite",
-    "Unable to reject invite": "Unable to reject invite",
     "Unable to join community": "Unable to join community",
     "Leave Community": "Leave Community",
     "Leave %(groupName)s?": "Leave %(groupName)s?",
@@ -956,8 +956,6 @@
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
     "Couldn't load home page": "Couldn't load home page",
     "Login": "Login",
-    "Reject invitation": "Reject invitation",
-    "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Failed to reject invitation": "Failed to reject invitation",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 039bd78d79..1eb30f5cc1 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -88,6 +89,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_jitsi": {
+        isFeature: true,
+        displayName: _td("Jitsi Conference Calling"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),

From cfe52a2888b1231f687e4d09420263eab7a96725 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 15:13:59 +0100
Subject: [PATCH 293/702] Instead of passing dft.eventDecrypted, call it
 instead

So that `this` has the correct reference.
---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 7884829a76..2a2fee1a21 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1318,7 +1318,7 @@ export default React.createClass({
 
         // When logging out, stop tracking failures and destroy state
         cli.on("Session.logged_out", stopDft);
-        cli.on("Event.decrypted", dft.eventDecrypted);
+        cli.on("Event.decrypted", (e) => dft.eventDecrypted(e));
 
         const krh = new KeyRequestHandler(cli);
         cli.on("crypto.roomKeyRequest", (req) => {

From 011154396ce3f86a96f7070d4190be1bf821a73b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 15:15:48 +0100
Subject: [PATCH 294/702] Add extra, useful expectation to test

---
 test/DecryptionFailureTracker-test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index 34e2df2b6e..66bc6daf4b 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -120,6 +120,7 @@ describe.only('DecryptionFailureTracker', function() {
         tracker.trackFailure();
         tracker.trackFailure();
 
+        expect(failures.length).toBe(2, 'expected 2 failures to be tracked, got ' + failures.length);
         expect(failures[0].failedEventId).toBe(decryptedEvent.getId(), 'the first failure should be tracked first');
         expect(failures[1].failedEventId).toBe(decryptedEvent2.getId(), 'the second failure should be tracked second');
 

From f08274585e873607963de9822f27458c51423d61 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 15:26:53 +0100
Subject: [PATCH 295/702] Persist tracked event ID hash using localStorage

---
 src/DecryptionFailureTracker.js         | 18 +++++++++++----
 src/components/structures/MatrixChat.js |  1 +
 test/DecryptionFailureTracker-test.js   | 30 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 7bdfd6bfd0..2f3d286d55 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -36,7 +36,7 @@ export default class DecryptionFailureTracker {
     failuresToTrack = [];
 
     // Event IDs of failures that were tracked previously
-    eventTrackedPreviously = {
+    trackedEventHashMap = {
         // [eventIdHash(eventId)]: true
     };
 
@@ -59,6 +59,14 @@ export default class DecryptionFailureTracker {
         this.trackDecryptionFailure = fn;
     }
 
+    loadTrackedEventHashMap() {
+        this.trackedEventHashMap = JSON.parse(localStorage.getItem('mx-decryption-failure-event-id-hashes'));
+    }
+
+    saveTrackedEventHashMap() {
+        localStorage.setItem('mx-decryption-failure-event-id-hashes', JSON.stringify(this.trackedEventHashMap));
+    }
+
     eventDecrypted(e) {
         if (e.isDecryptionFailure()) {
             this.addDecryptionFailureForEvent(e);
@@ -122,7 +130,7 @@ export default class DecryptionFailureTracker {
         // Only track one failure per event
         const dedupedFailuresMap = failuresGivenGrace.reduce(
             (result, failure) => {
-                if (!this.eventTrackedPreviously[eventIdHash(failure.failedEventId)]) {
+                if (!this.trackedEventHashMap[eventIdHash(failure.failedEventId)]) {
                     return {...result, [failure.failedEventId]: failure};
                 } else {
                     return result;
@@ -133,11 +141,13 @@ export default class DecryptionFailureTracker {
 
         const trackedEventIds = Object.keys(dedupedFailuresMap);
 
-        this.eventTrackedPreviously = trackedEventIds.reduce(
+        this.trackedEventHashMap = trackedEventIds.reduce(
             (result, eventId) => ({...result, [eventIdHash(eventId)]: true}),
-            this.eventTrackedPreviously,
+            this.trackedEventHashMap,
         );
 
+        this.saveTrackedEventHashMap();
+
         const dedupedFailures = trackedEventIds.map((k) => dedupedFailuresMap[k]);
 
         this.failuresToTrack = [...this.failuresToTrack, ...dedupedFailures];
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 2a2fee1a21..19c0c17d1d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1313,6 +1313,7 @@ export default React.createClass({
             // TODO: Pass reason for failure as third argument to trackEvent
             Analytics.trackEvent('E2E', 'Decryption failure');
         });
+        dft.loadEventTrackedPreviously();
 
         const stopDft = dft.start();
 
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index 66bc6daf4b..0ea710e5c7 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -150,4 +150,34 @@ describe.only('DecryptionFailureTracker', function() {
 
         done();
     });
+
+    it('should not track a failure for an event that was tracked in a previous session', (done) => {
+        // This test uses localStorage, clear it beforehand
+        localStorage.clear();
+
+        const decryptedEvent = createFailedDecryptionEvent();
+
+        const failures = [];
+        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+
+        // Indicate decryption
+        tracker.eventDecrypted(decryptedEvent);
+
+        // Pretend "now" is Infinity
+        // NB: This saves to localStorage specific to DFT
+        tracker.checkFailures(Infinity);
+
+        tracker.trackFailure();
+
+        // Simulate the browser refreshing by destroying tracker and creating a new tracker
+        const secondTracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+        secondTracker.loadTrackedEventHashMap();
+        secondTracker.eventDecrypted(decryptedEvent);
+        secondTracker.checkFailures(Infinity);
+        secondTracker.trackFailure();
+
+        expect(failures.length).toBe(1, 'should track a single failure per event per session, got ' + failures.length);
+
+        done();
+    });
 });

From f22f2d7bd68b88d8b9ca200b0cdc2cff8481151a Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 15:49:33 +0100
Subject: [PATCH 296/702] Use a Map instead of Object to preserve failure
 ordering

---
 src/DecryptionFailureTracker.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 2f3d286d55..e668884f64 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -129,17 +129,18 @@ export default class DecryptionFailureTracker {
 
         // Only track one failure per event
         const dedupedFailuresMap = failuresGivenGrace.reduce(
-            (result, failure) => {
+            (map, failure) => {
                 if (!this.trackedEventHashMap[eventIdHash(failure.failedEventId)]) {
-                    return {...result, [failure.failedEventId]: failure};
+                    return map.set(failure.failedEventId, failure);
                 } else {
-                    return result;
+                    return map;
                 }
             },
-            {},
+            // Use a map to preseve key ordering
+            new Map(),
         );
 
-        const trackedEventIds = Object.keys(dedupedFailuresMap);
+        const trackedEventIds = [...dedupedFailuresMap.keys()];
 
         this.trackedEventHashMap = trackedEventIds.reduce(
             (result, eventId) => ({...result, [eventIdHash(eventId)]: true}),
@@ -148,7 +149,7 @@ export default class DecryptionFailureTracker {
 
         this.saveTrackedEventHashMap();
 
-        const dedupedFailures = trackedEventIds.map((k) => dedupedFailuresMap[k]);
+        const dedupedFailures = dedupedFailuresMap.values();
 
         this.failuresToTrack = [...this.failuresToTrack, ...dedupedFailures];
     }

From 7489d7d5313b2f1aa59efd6a0332382a404a7f57 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 16:50:52 +0100
Subject: [PATCH 297/702] Fix incorrect call to DFT

---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 19c0c17d1d..818d058271 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1313,7 +1313,7 @@ export default React.createClass({
             // TODO: Pass reason for failure as third argument to trackEvent
             Analytics.trackEvent('E2E', 'Decryption failure');
         });
-        dft.loadEventTrackedPreviously();
+        dft.loadTrackedEventHashMap();
 
         const stopDft = dft.start();
 

From c5252be4a86b52ef15074f45ab2accbc763aeefb Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 16:51:11 +0100
Subject: [PATCH 298/702] Test everything, not just DFT

---
 test/DecryptionFailureTracker-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index 0ea710e5c7..dc77b4f1d8 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -30,7 +30,7 @@ function createFailedDecryptionEvent() {
     return event;
 }
 
-describe.only('DecryptionFailureTracker', function() {
+describe('DecryptionFailureTracker', function() {
     it('tracks a failed decryption', function(done) {
         const failedDecryptionEvent = createFailedDecryptionEvent();
         let trackedFailure = null;

From 98ed93ee5bd9da1bd937e5c1c714f76f74a144bf Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 16:59:42 +0100
Subject: [PATCH 299/702] Don't hash the eventId (it's uneccessary)

---
 src/DecryptionFailureTracker.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index e668884f64..2a7f2a4e26 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -21,10 +21,6 @@ class DecryptionFailure {
     }
 }
 
-function eventIdHash(eventId) {
-    return crypto.subtle.digest('SHA-256', eventId);
-}
-
 export default class DecryptionFailureTracker {
     // Array of items of type DecryptionFailure. Every `CHECK_INTERVAL_MS`, this list
     // is checked for failures that happened > `GRACE_PERIOD_MS` ago. Those that did
@@ -37,7 +33,7 @@ export default class DecryptionFailureTracker {
 
     // Event IDs of failures that were tracked previously
     trackedEventHashMap = {
-        // [eventIdHash(eventId)]: true
+        // [eventId]: true
     };
 
     // Spread the load on `Analytics` by sending at most 1 event per
@@ -130,7 +126,7 @@ export default class DecryptionFailureTracker {
         // Only track one failure per event
         const dedupedFailuresMap = failuresGivenGrace.reduce(
             (map, failure) => {
-                if (!this.trackedEventHashMap[eventIdHash(failure.failedEventId)]) {
+                if (!this.trackedEventHashMap[failure.failedEventId]) {
                     return map.set(failure.failedEventId, failure);
                 } else {
                     return map;
@@ -143,7 +139,7 @@ export default class DecryptionFailureTracker {
         const trackedEventIds = [...dedupedFailuresMap.keys()];
 
         this.trackedEventHashMap = trackedEventIds.reduce(
-            (result, eventId) => ({...result, [eventIdHash(eventId)]: true}),
+            (result, eventId) => ({...result, [eventId]: true}),
             this.trackedEventHashMap,
         );
 

From edfc9a0841f8b23d3bb99744be692e99d9431364 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 17:00:12 +0100
Subject: [PATCH 300/702] Fix bug with localStorage loading

---
 src/DecryptionFailureTracker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 2a7f2a4e26..337f4b08c3 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -56,7 +56,7 @@ export default class DecryptionFailureTracker {
     }
 
     loadTrackedEventHashMap() {
-        this.trackedEventHashMap = JSON.parse(localStorage.getItem('mx-decryption-failure-event-id-hashes'));
+        this.trackedEventHashMap = JSON.parse(localStorage.getItem('mx-decryption-failure-event-id-hashes')) || {};
     }
 
     saveTrackedEventHashMap() {

From 488cc416cf33fea9016fbb7dfa68130f7a0b91af Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 17:08:11 +0100
Subject: [PATCH 301/702] For now, shelve persistance across sessions

---
 src/DecryptionFailureTracker.js         | 16 +++++++++-------
 src/components/structures/MatrixChat.js |  5 ++++-
 test/DecryptionFailureTracker-test.js   |  6 ++++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 337f4b08c3..069d06bbd1 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -55,13 +55,13 @@ export default class DecryptionFailureTracker {
         this.trackDecryptionFailure = fn;
     }
 
-    loadTrackedEventHashMap() {
-        this.trackedEventHashMap = JSON.parse(localStorage.getItem('mx-decryption-failure-event-id-hashes')) || {};
-    }
+    // loadTrackedEventHashMap() {
+    //     this.trackedEventHashMap = JSON.parse(localStorage.getItem('mx-decryption-failure-event-id-hashes')) || {};
+    // }
 
-    saveTrackedEventHashMap() {
-        localStorage.setItem('mx-decryption-failure-event-id-hashes', JSON.stringify(this.trackedEventHashMap));
-    }
+    // saveTrackedEventHashMap() {
+    //     localStorage.setItem('mx-decryption-failure-event-id-hashes', JSON.stringify(this.trackedEventHashMap));
+    // }
 
     eventDecrypted(e) {
         if (e.isDecryptionFailure()) {
@@ -143,7 +143,9 @@ export default class DecryptionFailureTracker {
             this.trackedEventHashMap,
         );
 
-        this.saveTrackedEventHashMap();
+        // Commented out for now for expediency, we need to consider unbound nature of storing
+        // this in localStorage
+        // this.saveTrackedEventHashMap();
 
         const dedupedFailures = dedupedFailuresMap.values();
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 818d058271..8b36658de4 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1313,7 +1313,10 @@ export default React.createClass({
             // TODO: Pass reason for failure as third argument to trackEvent
             Analytics.trackEvent('E2E', 'Decryption failure');
         });
-        dft.loadTrackedEventHashMap();
+
+        // Shelved for later date when we have time to think about persisting history of
+        // tracked events across sessions.
+        // dft.loadTrackedEventHashMap();
 
         const stopDft = dft.start();
 
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index dc77b4f1d8..c4f3116cba 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -151,7 +151,7 @@ describe('DecryptionFailureTracker', function() {
         done();
     });
 
-    it('should not track a failure for an event that was tracked in a previous session', (done) => {
+    xit('should not track a failure for an event that was tracked in a previous session', (done) => {
         // This test uses localStorage, clear it beforehand
         localStorage.clear();
 
@@ -171,7 +171,9 @@ describe('DecryptionFailureTracker', function() {
 
         // Simulate the browser refreshing by destroying tracker and creating a new tracker
         const secondTracker = new DecryptionFailureTracker((failure) => failures.push(failure));
-        secondTracker.loadTrackedEventHashMap();
+
+        //secondTracker.loadTrackedEventHashMap();
+
         secondTracker.eventDecrypted(decryptedEvent);
         secondTracker.checkFailures(Infinity);
         secondTracker.trackFailure();

From 949daf6efd65f67ba06ca97979019b2b7e775a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Fri, 15 Jun 2018 16:08:40 +0000
Subject: [PATCH 302/702] Translated using Weblate (French)

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 97414b7e72..7291e8b6fb 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1191,5 +1191,15 @@
     "Encrypting": "Chiffrement en cours",
     "Encrypted, not sent": "Chiffré, pas envoyé",
     "No Audio Outputs detected": "Aucune sortie audio détectée",
-    "Audio Output": "Sortie audio"
+    "Audio Output": "Sortie audio",
+    "Share Link to User": "Partager le lien à l'utilisateur",
+    "Share room": "Partager le salon",
+    "Share Room": "Partager le salon",
+    "Link to most recent message": "Lien vers le message le plus récent",
+    "Share User": "Partager l'utilisateur",
+    "Share Community": "Partager la communauté",
+    "Share Room Message": "Partager le message du salon",
+    "Link to selected message": "Lien vers le message sélectionné",
+    "COPY": "COPIER",
+    "Share Message": "Partager le message"
 }

From b0a277288927597dad8c7c6522e8b04a68377481 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Jun 2018 17:58:43 +0100
Subject: [PATCH 303/702] Use more consistent start/stop pattern

---
 src/DecryptionFailureTracker.js         | 25 +++++++++++++++----------
 src/components/structures/MatrixChat.js |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 069d06bbd1..b1c6a71289 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -36,6 +36,10 @@ export default class DecryptionFailureTracker {
         // [eventId]: true
     };
 
+    // Set to an interval ID when `start` is called
+    checkInterval = null;
+    trackInterval = null;
+
     // Spread the load on `Analytics` by sending at most 1 event per
     // `TRACK_INTERVAL_MS`.
     static TRACK_INTERVAL_MS = 1000;
@@ -82,27 +86,28 @@ export default class DecryptionFailureTracker {
 
     /**
      * Start checking for and tracking failures.
-     * @return {function} a function that clears state and causes DFT to stop checking for
-     * and tracking failures.
      */
     start() {
-        const checkInterval = setInterval(
+        this.checkInterval = setInterval(
             () => this.checkFailures(Date.now()),
             DecryptionFailureTracker.CHECK_INTERVAL_MS,
         );
 
-        const trackInterval = setInterval(
+        this.trackInterval = setInterval(
             () => this.trackFailure(),
             DecryptionFailureTracker.TRACK_INTERVAL_MS,
         );
+    }
 
-        return () => {
-            clearInterval(checkInterval);
-            clearInterval(trackInterval);
+    /**
+     * Clear state and stop checking for and tracking failures.
+     */
+    stop() {
+        clearInterval(this.checkInterval);
+        clearInterval(this.trackInterval);
 
-            this.failures = [];
-            this.failuresToTrack = [];
-        };
+        this.failures = [];
+        this.failuresToTrack = [];
     }
 
     /**
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 8b36658de4..2794e81788 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1318,10 +1318,10 @@ export default React.createClass({
         // tracked events across sessions.
         // dft.loadTrackedEventHashMap();
 
-        const stopDft = dft.start();
+        dft.start();
 
         // When logging out, stop tracking failures and destroy state
-        cli.on("Session.logged_out", stopDft);
+        cli.on("Session.logged_out", () => dft.stop());
         cli.on("Event.decrypted", (e) => dft.eventDecrypted(e));
 
         const krh = new KeyRequestHandler(cli);

From 856d1ee5f997e1558c7d01c8a01537ebb9066bc2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 18:39:12 +0100
Subject: [PATCH 304/702] fix: Invalid prop `focus` of type `string` supplied
 to `DialogButtons`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/ChatCreateOrReuseDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index e2387064cf..80c6b8502c 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -170,7 +170,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                     { profile }
                 </div>
                 <DialogButtons primaryButton={_t('Start Chatting')}
-                    onPrimaryButtonClick={this.props.onNewDMClick} focus="true" />
+                    onPrimaryButtonClick={this.props.onNewDMClick} focus={true} />
             </div>;
         }
 

From 5fbadbc44f415589bb70d79bcafc607403819ebb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 18:42:51 +0100
Subject: [PATCH 305/702] comment out `visibility:hidden` div as it seems
 unfinished and refers to undefined method `this._onJoinGroupClick`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MyGroups.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 7a93cfb886..0bfb30674e 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -124,7 +124,7 @@ export default withMatrixClient(React.createClass({
                         ) }
                     </div>
                 </div>
-                <div className="mx_MyGroups_joinBox mx_MyGroups_headerCard">
+                {/*<div className="mx_MyGroups_joinBox mx_MyGroups_headerCard">
                     <AccessibleButton className='mx_MyGroups_headerCard_button' onClick={this._onJoinGroupClick}>
                         <TintableSvg src="img/icons-create-room.svg" width="50" height="50" />
                     </AccessibleButton>
@@ -140,7 +140,7 @@ export default withMatrixClient(React.createClass({
                             { 'i': (sub) => <i>{ sub }</i> })
                         }
                     </div>
-                </div>
+                </div>*/}
             </div>
             <div className="mx_MyGroups_content">
                 { contentHeader }

From a2219472f6a115897ba23c6dcdfea64722d568b0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 18:47:15 +0100
Subject: [PATCH 306/702] inline redundant `bodyNodes`, fixes react no unique
 key warning too

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/GroupView.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index c7610219f7..365aadffa5 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1127,10 +1127,6 @@ export default React.createClass({
             let avatarNode;
             let nameNode;
             let shortDescNode;
-            const bodyNodes = [
-                this._getMembershipSection(),
-                this._getGroupSection(),
-            ];
             const rightButtons = [];
             if (this.state.editing && this.state.isUserPrivileged) {
                 let avatarImage;
@@ -1269,7 +1265,8 @@ export default React.createClass({
                         </div>
                     </div>
                     <GeminiScrollbarWrapper className="mx_GroupView_body">
-                        { bodyNodes }
+                        { this._getMembershipSection() }
+                        { this._getGroupSection() }
                     </GeminiScrollbarWrapper>
                 </div>
             );

From a7f5059aca1b6e61ade8ce5512ea782a22b20d08 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 18:55:21 +0100
Subject: [PATCH 307/702] add nop to fix `onClick` being required warning

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/groups/GroupTile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index c1554cd9ed..509c209baa 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -22,6 +22,7 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import FlairStore from '../../../stores/FlairStore';
 
+function nop() {}
 
 const GroupTile = React.createClass({
     displayName: 'GroupTile',
@@ -81,7 +82,7 @@ const GroupTile = React.createClass({
         ) : null;
         // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
         // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6156
-        return <AccessibleButton className="mx_GroupTile" onMouseDown={this.onMouseDown}>
+        return <AccessibleButton className="mx_GroupTile" onMouseDown={this.onMouseDown} onClick={nop}>
             <Droppable droppableId="my-groups-droppable" type="draggable-TagTile">
                 { (droppableProvided, droppableSnapshot) => (
                     <div ref={droppableProvided.innerRef}>

From a899871d52f6c296285064ff9a08ec38cab24fdd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 18:55:37 +0100
Subject: [PATCH 308/702] specify unique key to make react happy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MyGroups.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 0bfb30674e..edb50fcedb 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -70,7 +70,7 @@ export default withMatrixClient(React.createClass({
         if (this.state.groups) {
             const groupNodes = [];
             this.state.groups.forEach((g) => {
-                groupNodes.push(<GroupTile groupId={g} />);
+                groupNodes.push(<GroupTile key={g} groupId={g} />);
             });
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?

From 43681026b8f93f14bb5fbd7f97b52e36f506866f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 19:01:12 +0100
Subject: [PATCH 309/702] s/onClick/onChange because react cries about it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/GroupView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 365aadffa5..96dea14c1f 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1052,7 +1052,7 @@ export default React.createClass({
                     <input type="radio"
                         value={GROUP_JOINPOLICY_INVITE}
                         checked={this.state.joinableForm.policyType === GROUP_JOINPOLICY_INVITE}
-                        onClick={this._onJoinableChange}
+                        onChange={this._onJoinableChange}
                     />
                     <div className="mx_GroupView_label_text">
                         { _t('Only people who have been invited') }
@@ -1064,7 +1064,7 @@ export default React.createClass({
                     <input type="radio"
                         value={GROUP_JOINPOLICY_OPEN}
                         checked={this.state.joinableForm.policyType === GROUP_JOINPOLICY_OPEN}
-                        onClick={this._onJoinableChange}
+                        onChange={this._onJoinableChange}
                     />
                     <div className="mx_GroupView_label_text">
                         { _t('Everyone') }

From b97aa77acac821a429e727edce3ce46365e88819 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 19:27:23 +0100
Subject: [PATCH 310/702] factor out warn self demote and apply to muting
 yourself

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MemberInfo.js | 53 +++++++++++++++++-------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2789c0e4cd..4a163b6a00 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -332,13 +332,42 @@ module.exports = withMatrixClient(React.createClass({
         });
     },
 
-    onMuteToggle: function() {
+    _warnSelfDemote: function() {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        return new Promise((resolve) => {
+            Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
+                title: _t("Warning!"),
+                description:
+                    <div>
+                        { _t("You will not be able to undo this change as you are demoting yourself, " +
+                            "if you are the last privileged user in the room it will be impossible " +
+                            "to regain privileges.") }
+                        <br />
+                        { _t("Are you sure?") }
+                    </div>,
+                button: _t("Continue"),
+                onFinished: resolve,
+            });
+        });
+    },
+
+    onMuteToggle: async function() {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const roomId = this.props.member.roomId;
         const target = this.props.member.userId;
         const room = this.props.matrixClient.getRoom(roomId);
         if (!room) return;
 
+        // if muting self, warn as it may be irreversible
+        if (target === this.props.matrixClient.getUserId()) {
+            try {
+                if (!await this._warnSelfDemote()) return;
+            } catch (e) {
+                console.error("Failed to warn about self demotion: ", e);
+                return;
+            }
+        }
+
         const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
         if (!powerLevelEvent) return;
 
@@ -436,7 +465,7 @@ module.exports = withMatrixClient(React.createClass({
         }).done();
     },
 
-    onPowerChange: function(powerLevel) {
+    onPowerChange: async function(powerLevel) {
         const roomId = this.props.member.roomId;
         const target = this.props.member.userId;
         const room = this.props.matrixClient.getRoom(roomId);
@@ -455,20 +484,12 @@ module.exports = withMatrixClient(React.createClass({
 
         // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
         if (myUserId === target) {
-            Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
-                title: _t("Warning!"),
-                description:
-                    <div>
-                        { _t("You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.") }<br />
-                        { _t("Are you sure?") }
-                    </div>,
-                button: _t("Continue"),
-                onFinished: (confirmed) => {
-                    if (confirmed) {
-                        this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-                    }
-                },
-            });
+            try {
+                if (!await this._warnSelfDemote()) return;
+                this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+            } catch (e) {
+                console.error("Failed to warn about self demotion: ", e);
+            }
             return;
         }
 

From df1584148334646e0e278617b6041f7520989b82 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Jun 2018 19:28:23 +0100
Subject: [PATCH 311/702] split too long line

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MemberInfo.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 4a163b6a00..6680e7d02c 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -499,7 +499,8 @@ module.exports = withMatrixClient(React.createClass({
                 title: _t("Warning!"),
                 description:
                     <div>
-                        { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself.") }<br />
+                        { _t("You will not be able to undo this change as you are promoting the user " +
+                            "to have the same power level as yourself.") }<br />
                         { _t("Are you sure?") }
                     </div>,
                 button: _t("Continue"),

From 4f693a1ff5f51e876ed94d717d4903e89f782ccd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:27:17 +0100
Subject: [PATCH 312/702] implement group links in matrixLinkify:MATRIXTO.
 Simplify if/else w/ map

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 6bbea77733..328cb98888 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -169,11 +169,18 @@ matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:"
     + "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/"
     + ")(#.*)";
 
-matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!).*)";
+matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+].*)";
 matrixLinkify.MATRIXTO_MD_LINK_PATTERN =
-    '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!)[^\\)]*)\\)';
+    '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+][^\\)]*)\\)';
 matrixLinkify.MATRIXTO_BASE_URL= baseUrl;
 
+const matrixToEntityMap = {
+    '@': '#/user/',
+    '#': '#/room/',
+    '!': '#/room/',
+    '+': '#/group/',
+};
+
 matrixLinkify.options = {
     events: function(href, type) {
         switch (type) {
@@ -204,24 +211,20 @@ matrixLinkify.options = {
             case 'userid':
             case 'groupid':
                 return matrixLinkify.MATRIXTO_BASE_URL + '/#/' + href;
-            default:
-                var m;
+            default: {
                 // FIXME: horrible duplication with HtmlUtils' transform tags
-                m = href.match(matrixLinkify.VECTOR_URL_PATTERN);
+                let m = href.match(matrixLinkify.VECTOR_URL_PATTERN);
                 if (m) {
                     return m[1];
                 }
                 m = href.match(matrixLinkify.MATRIXTO_URL_PATTERN);
                 if (m) {
                     const entity = m[1];
-                    if (entity[0] === '@') {
-                        return '#/user/' + entity;
-                    } else if (entity[0] === '#' || entity[0] === '!') {
-                        return '#/room/' + entity;
-                    }
+                    if (matrixToEntityMap[entity[0]]) return matrixToEntityMap[entity[0]] + entity;
                 }
 
                 return href;
+            }
         }
     },
 

From 3ebec92ac592e0c10f37f1f47fa09989536319d8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:27:47 +0100
Subject: [PATCH 313/702] replace hardcoded `matrix.to` with reference to const
 in matrix-to for easier changing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/TextualBody.js | 3 ++-
 src/matrix-to.js                             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 018754411c..60377a47d7 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -36,6 +36,7 @@ import * as ContextualMenu from '../../structures/ContextualMenu';
 import SettingsStore from "../../../settings/SettingsStore";
 import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
 import ReplyThread from "../elements/ReplyThread";
+import {host as matrixtoHost} from '../../../matrix-to';
 
 linkifyMatrix(linkify);
 
@@ -304,7 +305,7 @@ module.exports = React.createClass({
             // never preview matrix.to links (if anything we should give a smart
             // preview of the room/user they point to: nobody needs to be reminded
             // what the matrix.to site looks like).
-            if (host == 'matrix.to') return false;
+            if (host === matrixtoHost) return false;
 
             if (node.textContent.toLowerCase().trim().startsWith(host.toLowerCase())) {
                 // it's a "foo.pl" style link
diff --git a/src/matrix-to.js b/src/matrix-to.js
index 72fb3c38fc..90b0a66090 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export const baseUrl = "https://matrix.to";
+export const host = "matrix.to";
+export const baseUrl = `https://${host}`;
 
 export function makeEventPermalink(roomId, eventId) {
     return `${baseUrl}/#/${roomId}/${eventId}`;

From efaccf734478cc01d0bb67208d26d0ffbf34d074 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:42:28 +0100
Subject: [PATCH 314/702] implement `hitting enter after Ctrl-K should switch
 to the first result`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LeftPanel.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 5acceb1009..f3ca005f55 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -93,6 +93,11 @@ var LeftPanel = React.createClass({
                 this._onMoveFocus(false);
                 handled = true;
                 break;
+            case KeyCode.ENTER:
+                this._onMoveFocus(false);
+                this.focusedElement.click();
+                handled = true;
+                break;
         }
 
         if (handled) {

From 897121163917e9576c92e66eed067121e3665217 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:42:40 +0100
Subject: [PATCH 315/702] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LeftPanel.js | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index f3ca005f55..416012c5f1 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -107,37 +107,33 @@ var LeftPanel = React.createClass({
     },
 
     _onMoveFocus: function(up) {
-        var element = this.focusedElement;
+        let element = this.focusedElement;
 
         // unclear why this isn't needed
         // var descending = (up == this.focusDirection) ? this.focusDescending : !this.focusDescending;
         // this.focusDirection = up;
 
-        var descending = false; // are we currently descending or ascending through the DOM tree?
-        var classes;
+        let descending = false; // are we currently descending or ascending through the DOM tree?
+        let classes;
 
         do {
-            var child = up ? element.lastElementChild : element.firstElementChild;
-            var sibling = up ? element.previousElementSibling : element.nextElementSibling;
+            const child = up ? element.lastElementChild : element.firstElementChild;
+            const sibling = up ? element.previousElementSibling : element.nextElementSibling;
 
             if (descending) {
                 if (child) {
                     element = child;
-                }
-                else if (sibling) {
+                } else if (sibling) {
                     element = sibling;
-                }
-                else {
+                } else {
                     descending = false;
                     element = element.parentElement;
                 }
-            }
-            else {
+            } else {
                 if (sibling) {
                     element = sibling;
                     descending = true;
-                }
-                else {
+                } else {
                     element = element.parentElement;
                 }
             }
@@ -149,8 +145,7 @@ var LeftPanel = React.createClass({
                     descending = true;
                 }
             }
-
-        } while(element && !(
+        } while (element && !(
             classes.contains("mx_RoomTile") ||
             classes.contains("mx_SearchBox_search") ||
             classes.contains("mx_RoomSubList_ellipsis")));

From 1afdb0e3c053dd45dd25fe8742c44449c2552269 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:44:57 +0100
Subject: [PATCH 316/702] add null-guard

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LeftPanel.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 416012c5f1..7517103d88 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -95,7 +95,9 @@ var LeftPanel = React.createClass({
                 break;
             case KeyCode.ENTER:
                 this._onMoveFocus(false);
-                this.focusedElement.click();
+                if (this.focusedElement) {
+                    this.focusedElement.click();
+                }
                 handled = true;
                 break;
         }

From ff33ef4b5150439f97e9bb21bee9e42e5efa4338 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:50:53 +0100
Subject: [PATCH 317/702] allow using tab to navigate room list smarter

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LeftPanel.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 5acceb1009..7a930fa233 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -85,6 +85,10 @@ var LeftPanel = React.createClass({
         let handled = false;
 
         switch (ev.keyCode) {
+            case KeyCode.TAB:
+                this._onMoveFocus(ev.shiftKey);
+                handled = true;
+                break;
             case KeyCode.UP:
                 this._onMoveFocus(true);
                 handled = true;

From 423b8939e7c015eadbbe9e778031773b99614ff4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 08:52:14 +0100
Subject: [PATCH 318/702] simplify handled logic by inverting it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LeftPanel.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 7a930fa233..7b115a6c4b 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -82,21 +82,20 @@ var LeftPanel = React.createClass({
 
     _onKeyDown: function(ev) {
         if (!this.focusedElement) return;
-        let handled = false;
+        let handled = true;
 
         switch (ev.keyCode) {
             case KeyCode.TAB:
                 this._onMoveFocus(ev.shiftKey);
-                handled = true;
                 break;
             case KeyCode.UP:
                 this._onMoveFocus(true);
-                handled = true;
                 break;
             case KeyCode.DOWN:
                 this._onMoveFocus(false);
-                handled = true;
                 break;
+            default:
+                handled = false;
         }
 
         if (handled) {

From 8fa96e19d562666410786ee7cfa506463693ea88 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 09:07:16 +0100
Subject: [PATCH 319/702] allow rightclicking for exposing room tile context
 menus

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/groups/GroupInviteTile.js | 16 +++++++++++++---
 src/components/views/rooms/RoomTile.js         | 17 ++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 4d5f3c6f3a..fff9aafac1 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -66,6 +66,11 @@ export default React.createClass({
         });
     },
 
+    onContextMenu: function(e) {
+        this.onBadgeClicked(e);
+        e.preventDefault();
+    },
+
     onBadgeClicked: function(e) {
         // Prevent the RoomTile onClick event firing as well
         e.stopPropagation();
@@ -79,7 +84,7 @@ export default React.createClass({
         }
 
         const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
-        const elementRect = e.target.getBoundingClientRect();
+        const elementRect = this.refs.badge.getBoundingClientRect();
 
         // The window X and Y offsets are to adjust position when zoomed in to page
         const x = elementRect.right + window.pageXOffset + 3;
@@ -125,7 +130,7 @@ export default React.createClass({
         });
 
         const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
-        const badge = <div className={badgeClasses} onClick={this.onBadgeClicked}>{ badgeContent }</div>;
+        const badge = <div className={badgeClasses} ref="badge" onClick={this.onBadgeClicked}>{ badgeContent }</div>;
 
         let tooltip;
         if (this.props.collapsed && this.state.hover) {
@@ -139,7 +144,12 @@ export default React.createClass({
         });
 
         return (
-            <AccessibleButton className={classes} onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
+            <AccessibleButton className={classes}
+                              onClick={this.onClick}
+                              onMouseEnter={this.onMouseEnter}
+                              onMouseLeave={this.onMouseLeave}
+                              onContextMenu={this.onContextMenu}
+            >
                 <div className="mx_RoomTile_avatar">
                     { av }
                 </div>
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 11eb2090f2..1a9e404012 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -187,6 +187,11 @@ module.exports = React.createClass({
         this.badgeOnMouseLeave();
     },
 
+    onContextMenu: function(e) {
+        this.onBadgeClicked(e);
+        e.preventDefault();
+    },
+
     badgeOnMouseEnter: function() {
         // Only allow non-guests to access the context menu
         // and only change it if it needs to change
@@ -208,7 +213,7 @@ module.exports = React.createClass({
             }
 
             const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
-            const elementRect = e.target.getBoundingClientRect();
+            const elementRect = this.refs.badge.getBoundingClientRect();
 
             // The window X and Y offsets are to adjust position when zoomed in to page
             const x = elementRect.right + window.pageXOffset + 3;
@@ -280,7 +285,7 @@ module.exports = React.createClass({
             badgeContent = '\u200B';
         }
 
-        badge = <div className={badgeClasses} onClick={this.onBadgeClicked}>{ badgeContent }</div>;
+        badge = <div className={badgeClasses} ref="badge" onClick={this.onBadgeClicked}>{ badgeContent }</div>;
 
         const EmojiText = sdk.getComponent('elements.EmojiText');
         let label;
@@ -317,7 +322,13 @@ module.exports = React.createClass({
             directMessageIndicator = <img src="img/icon_person.svg" className="mx_RoomTile_dm" width="11" height="13" alt="dm" />;
         }
 
-        return <AccessibleButton className={classes} tabIndex="0" onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
+        return <AccessibleButton tabIndex="0"
+                                 className={classes}
+                                 onClick={this.onClick}
+                                 onMouseEnter={this.onMouseEnter}
+                                 onMouseLeave={this.onMouseLeave}
+                                 onContextMenu={this.onContextMenu}
+        >
             <div className={avatarClasses}>
                 <div className="mx_RoomTile_avatar_container">
                     <RoomAvatar room={this.props.room} width={24} height={24} />

From 4fdb64a04957309d691d8f80aeaf6971ab5a17f3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 09:10:13 +0100
Subject: [PATCH 320/702] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomTile.js | 38 +++++++++++---------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 1a9e404012..bb9e0a8d3b 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,19 +16,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
 
-const React = require('react');
-const ReactDOM = require("react-dom");
+import React from 'react';
 import PropTypes from 'prop-types';
-const classNames = require('classnames');
+import classNames from 'classnames';
 import dis from '../../../dispatcher';
-const MatrixClientPeg = require('../../../MatrixClientPeg');
+import MatrixClientPeg from '../../../MatrixClientPeg';
 import DMRoomMap from '../../../utils/DMRoomMap';
-const sdk = require('../../../index');
-const ContextualMenu = require('../../structures/ContextualMenu');
-const RoomNotifs = require('../../../RoomNotifs');
-const FormattingUtils = require('../../../utils/FormattingUtils');
+import sdk from '../../../index';
+import ContextualMenu from '../../structures/ContextualMenu';
+import * as RoomNotifs from '../../../RoomNotifs';
+import * as FormattingUtils from '../../../utils/FormattingUtils';
 import AccessibleButton from '../elements/AccessibleButton';
 import ActiveRoomObserver from '../../../ActiveRoomObserver';
 import RoomViewStore from '../../../stores/RoomViewStore';
@@ -72,16 +71,12 @@ module.exports = React.createClass({
     },
 
     _shouldShowMentionBadge: function() {
-        return this.state.notifState != RoomNotifs.MUTE;
+        return this.state.notifState !== RoomNotifs.MUTE;
     },
 
     _isDirectMessageRoom: function(roomId) {
         const dmRooms = DMRoomMap.shared().getUserIdForRoomId(roomId);
-        if (dmRooms) {
-            return true;
-        } else {
-            return false;
-        }
+        return Boolean(dmRooms);
     },
 
     onRoomTimeline: function(ev, room) {
@@ -99,7 +94,7 @@ module.exports = React.createClass({
     },
 
     onAccountData: function(accountDataEvent) {
-        if (accountDataEvent.getType() == 'm.push_rules') {
+        if (accountDataEvent.getType() === 'm.push_rules') {
             this.setState({
                 notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
             });
@@ -255,7 +250,7 @@ module.exports = React.createClass({
             'mx_RoomTile_unread': this.props.unread,
             'mx_RoomTile_unreadNotify': notifBadges,
             'mx_RoomTile_highlight': mentionBadges,
-            'mx_RoomTile_invited': (me && me.membership == 'invite'),
+            'mx_RoomTile_invited': (me && me.membership === 'invite'),
             'mx_RoomTile_menuDisplayed': this.state.menuDisplayed,
             'mx_RoomTile_noBadges': !badges,
             'mx_RoomTile_transparent': this.props.transparent,
@@ -273,7 +268,6 @@ module.exports = React.createClass({
         let name = this.state.roomName;
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
-        let badge;
         let badgeContent;
 
         if (this.state.badgeHover || this.state.menuDisplayed) {
@@ -285,7 +279,7 @@ module.exports = React.createClass({
             badgeContent = '\u200B';
         }
 
-        badge = <div className={badgeClasses} ref="badge" onClick={this.onBadgeClicked}>{ badgeContent }</div>;
+        const badge = <div className={badgeClasses} ref="badge" onClick={this.onBadgeClicked}>{ badgeContent }</div>;
 
         const EmojiText = sdk.getComponent('elements.EmojiText');
         let label;
@@ -317,9 +311,9 @@ module.exports = React.createClass({
 
         const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
 
-        let directMessageIndicator;
+        let dmIndicator;
         if (this._isDirectMessageRoom(this.props.room.roomId)) {
-            directMessageIndicator = <img src="img/icon_person.svg" className="mx_RoomTile_dm" width="11" height="13" alt="dm" />;
+            dmIndicator = <img src="img/icon_person.svg" className="mx_RoomTile_dm" width="11" height="13" alt="dm" />;
         }
 
         return <AccessibleButton tabIndex="0"
@@ -332,7 +326,7 @@ module.exports = React.createClass({
             <div className={avatarClasses}>
                 <div className="mx_RoomTile_avatar_container">
                     <RoomAvatar room={this.props.room} width={24} height={24} />
-                    { directMessageIndicator }
+                    { dmIndicator }
                 </div>
             </div>
             <div className="mx_RoomTile_nameContainer">

From 61e09395d0c49981663a3f6bbc110498127e9709 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 09:45:06 +0100
Subject: [PATCH 321/702] split continuations if longer than N

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 50bdb37734..6e4697a8f0 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,6 +26,9 @@ import sdk from '../../index';
 
 import MatrixClientPeg from '../../MatrixClientPeg';
 
+const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
+const continuedTypes = ['m.sticker', 'm.room.message'];
+
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
  */
 module.exports = React.createClass({
@@ -449,16 +453,17 @@ module.exports = React.createClass({
 
         // Some events should appear as continuations from previous events of
         // different types.
-        const continuedTypes = ['m.sticker', 'm.room.message'];
+
         const eventTypeContinues =
             prevEvent !== null &&
             continuedTypes.includes(mxEv.getType()) &&
             continuedTypes.includes(prevEvent.getType());
 
-        if (prevEvent !== null
-                && prevEvent.sender && mxEv.sender
-                && mxEv.sender.userId === prevEvent.sender.userId
-                && (mxEv.getType() == prevEvent.getType() || eventTypeContinues)) {
+        // if there is a previous event and it has the same sender as this event
+        // and the types are the same/is in continuedTypes and the time between them is <= CONTINUATION_MAX_INTERVAL
+        if (prevEvent !== null && prevEvent.sender && mxEv.sender && mxEv.sender.userId === prevEvent.sender.userId &&
+            (mxEv.getType() === prevEvent.getType() || eventTypeContinues) &&
+            (mxEv.getTs() - prevEvent.getTs() <= CONTINUATION_MAX_INTERVAL)) {
             continuation = true;
         }
 

From 7d19841e6860c4a0de465398180cba85f314b8b6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 09:48:57 +0100
Subject: [PATCH 322/702] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6e4697a8f0..f5fa2ceabf 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -193,7 +193,7 @@ module.exports = React.createClass({
     /**
      * Page up/down.
      *
-     * mult: -1 to page up, +1 to page down
+     * @param {number} mult: -1 to page up, +1 to page down
      */
     scrollRelative: function(mult) {
         if (this.refs.scrollPanel) {
@@ -203,6 +203,8 @@ module.exports = React.createClass({
 
     /**
      * Scroll up/down in response to a scroll key
+     *
+     * @param {KeyboardEvent} ev: the keyboard event to handle
      */
     handleScrollKey: function(ev) {
         if (this.refs.scrollPanel) {
@@ -261,6 +263,7 @@ module.exports = React.createClass({
 
         this.eventNodes = {};
 
+        let visible = false;
         let i;
 
         // first figure out which is the last event in the list which we're
@@ -301,7 +304,7 @@ module.exports = React.createClass({
         // if the readmarker has moved, cancel any active ghost.
         if (this.currentReadMarkerEventId && this.props.readMarkerEventId &&
                 this.props.readMarkerVisible &&
-                this.currentReadMarkerEventId != this.props.readMarkerEventId) {
+                this.currentReadMarkerEventId !== this.props.readMarkerEventId) {
             this.currentGhostEventId = null;
         }
 
@@ -408,8 +411,8 @@ module.exports = React.createClass({
 
             let isVisibleReadMarker = false;
 
-            if (eventId == this.props.readMarkerEventId) {
-                var visible = this.props.readMarkerVisible;
+            if (eventId === this.props.readMarkerEventId) {
+                visible = this.props.readMarkerVisible;
 
                 // if the read marker comes at the end of the timeline (except
                 // for local echoes, which are excluded from RMs, because they
@@ -427,11 +430,11 @@ module.exports = React.createClass({
 
             // XXX: there should be no need for a ghost tile - we should just use a
             // a dispatch (user_activity_end) to start the RM animation.
-            if (eventId == this.currentGhostEventId) {
+            if (eventId === this.currentGhostEventId) {
                 // if we're showing an animation, continue to show it.
                 ret.push(this._getReadMarkerGhostTile());
             } else if (!isVisibleReadMarker &&
-                       eventId == this.currentReadMarkerEventId) {
+                       eventId === this.currentReadMarkerEventId) {
                 // there is currently a read-up-to marker at this point, but no
                 // more. Show an animation of it disappearing.
                 ret.push(this._getReadMarkerGhostTile());
@@ -498,7 +501,7 @@ module.exports = React.createClass({
         }
 
         const eventId = mxEv.getId();
-        const highlight = (eventId == this.props.highlightedEventId);
+        const highlight = (eventId === this.props.highlightedEventId);
 
         // we can't use local echoes as scroll tokens, because their event IDs change.
         // Local echos have a send "status".
@@ -637,7 +640,8 @@ module.exports = React.createClass({
     render: function() {
         const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
         const Spinner = sdk.getComponent("elements.Spinner");
-        let topSpinner, bottomSpinner;
+        let topSpinner;
+        let bottomSpinner;
         if (this.props.backPaginating) {
             topSpinner = <li key="_topSpinner"><Spinner /></li>;
         }

From 01a6b7f77fe25514a2a93b4224e5434e34da0c29 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 10:27:42 +0100
Subject: [PATCH 323/702] affix copyButton so that it doesn't get scrolled
 horizontally

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/rooms/_EventTile.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 80d2cd3418..525855f3ed 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -392,6 +392,7 @@ limitations under the License.
     overflow-x: overlay;
     overflow-y: visible;
     max-height: 30vh;
+    position: static;
 }
 
 .mx_EventTile_content .markdown-body code {
@@ -406,7 +407,7 @@ limitations under the License.
     visibility: hidden;
     cursor: pointer;
     top: 6px;
-    right: 6px;
+    right: 36px;
     width: 19px;
     height: 19px;
     background-image: url($copy-button-url);

From fd90992294c62464e1755731e242cc7fc67bd6da Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 15:58:16 +0100
Subject: [PATCH 324/702] s/onClick/onChange on checkbox to make React happy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/groups/GroupPublicityToggle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js
index 78522c2f55..ff0fc553b8 100644
--- a/src/components/views/groups/GroupPublicityToggle.js
+++ b/src/components/views/groups/GroupPublicityToggle.js
@@ -69,7 +69,7 @@ export default React.createClass({
     render() {
         const GroupTile = sdk.getComponent('groups.GroupTile');
         const input = <input type="checkbox"
-            onClick={this._onPublicityToggle}
+            onChange={this._onPublicityToggle}
             checked={this.state.isGroupPublicised}
         />;
         const labelText = !this.state.ready ? _t("Loading...") :

From f152ad84b88c4f943a73e596a94b42b8a42f35eb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 16:40:44 +0100
Subject: [PATCH 325/702] Improve CommandProvider for Autocomplete improve
 Regexp so it leaves autocomplete up whilst typing arguments improve
 completion so it doesn't discard your arguments on-hover add a way to list
 all commands by using `/<TAB>`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 38 +++++++++++++++--------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index e33fa7861f..2618b41c7d 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -2,6 +2,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@ import { _t, _td } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import FuzzyMatcher from './FuzzyMatcher';
 import {TextualCompletion} from './Components';
+import type {SelectionRange} from "./Autocompleter";
 
 // TODO merge this with the factory mechanics of SlashCommands?
 // Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file
@@ -110,10 +112,9 @@ const COMMANDS = [
         args: '',
         description: _td('Opens the Developer Tools dialog'),
     },
-    // Omitting `/markdown` as it only seems to apply to OldComposer
 ];
 
-const COMMAND_RE = /(^\/\w*)/g;
+const COMMAND_RE = /(^\/\w*)(?: .*)?/g;
 
 export default class CommandProvider extends AutocompleteProvider {
     constructor() {
@@ -123,23 +124,24 @@ export default class CommandProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}) {
-        let completions = [];
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean) {
         const {command, range} = this.getCurrentCommand(query, selection);
-        if (command) {
-            completions = this.matcher.match(command[0]).map((result) => {
-                return {
-                    completion: result.command + ' ',
-                    component: (<TextualCompletion
-                        title={result.command}
-                        subtitle={result.args}
-                        description={_t(result.description)}
-                        />),
-                    range,
-                };
-            });
-        }
-        return completions;
+        if (!command) return [];
+
+        // if the query is just `/` and the user hit TAB, show them all COMMANDS otherwise FuzzyMatch them
+        const matches = query === '/' && force ? COMMANDS : this.matcher.match(command[1]);
+        return matches.map((result) => {
+            return {
+                // If the command is the same as the one they entered, we don't want to discard their arguments
+                completion: result.command === command[1] ? command[0] : (result.command + ' '),
+                component: (<TextualCompletion
+                    title={result.command}
+                    subtitle={result.args}
+                    description={_t(result.description)}
+                />),
+                range,
+            };
+        });
     }
 
     getName() {

From a50f6094cce296f8a4017a1e45116f2b95a79cae Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 16:44:13 +0100
Subject: [PATCH 326/702] allow `/` + wait to also show all commands

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 2618b41c7d..b162f2f92a 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -128,8 +128,8 @@ export default class CommandProvider extends AutocompleteProvider {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!command) return [];
 
-        // if the query is just `/` and the user hit TAB, show them all COMMANDS otherwise FuzzyMatch them
-        const matches = query === '/' && force ? COMMANDS : this.matcher.match(command[1]);
+        // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them
+        const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]);
         return matches.map((result) => {
             return {
                 // If the command is the same as the one they entered, we don't want to discard their arguments

From 6d978e018530208d55305cbf32d840bbd24c522f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Fri, 15 Jun 2018 16:09:24 +0000
Subject: [PATCH 327/702] Translated using Weblate (French)

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7291e8b6fb..71a6f27c0e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1192,7 +1192,7 @@
     "Encrypted, not sent": "Chiffré, pas envoyé",
     "No Audio Outputs detected": "Aucune sortie audio détectée",
     "Audio Output": "Sortie audio",
-    "Share Link to User": "Partager le lien à l'utilisateur",
+    "Share Link to User": "Partager le lien vers l'utilisateur",
     "Share room": "Partager le salon",
     "Share Room": "Partager le salon",
     "Link to most recent message": "Lien vers le message le plus récent",

From b87824ba929334a567935dbe11ba14bb3a391c72 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 19:49:53 +0100
Subject: [PATCH 328/702] hide `m.room.avatar` from FilePanel via sync filter

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/FilePanel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 3249cae22c..7d1d23839e 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -69,6 +69,7 @@ const FilePanel = React.createClass({
                         "timeline": {
                             "contains_url": true,
                             "not_types": [
+                                "m.room.avatar",
                                 "m.sticker",
                             ],
                         },

From eb32dda260bb421865c987dccb4f0f9c9d6b8898 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 16 Jun 2018 19:52:15 +0100
Subject: [PATCH 329/702] given we also want to hide widget events, hide all
 except m.room.message

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/FilePanel.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 7d1d23839e..927449750c 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -68,9 +68,8 @@ const FilePanel = React.createClass({
                     "room": {
                         "timeline": {
                             "contains_url": true,
-                            "not_types": [
-                                "m.room.avatar",
-                                "m.sticker",
+                            "types": [
+                                "m.room.message",
                             ],
                         },
                     },

From 9251c80783a553f09262409a09fa1be166cc280c Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 17 Jun 2018 08:34:39 +0000
Subject: [PATCH 330/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 720f6a3235..594d826a6c 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1187,5 +1187,19 @@
     "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)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)",
     "Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera.",
-    "Try the app first": "Probatu aplikazioa aurretik"
+    "Try the app first": "Probatu aplikazioa aurretik",
+    "Encrypting": "Zifratzen",
+    "Encrypted, not sent": "Zifratua, bidali gabe",
+    "Share Link to User": "Partekatu esteka erabiltzailearekin",
+    "Share room": "Partekatu gela",
+    "Share Room": "Partekatu gela",
+    "Link to most recent message": "Esteka azken mezura",
+    "Share User": "Partekatu erabiltzailea",
+    "Share Community": "Partekatu komunitatea",
+    "Share Room Message": "Partekatu gelako mezua",
+    "Link to selected message": "Esteka hautatutako mezura",
+    "COPY": "KOPIATU",
+    "Share Message": "Partekatu mezua",
+    "No Audio Outputs detected": "Ez da audio irteerarik antzeman",
+    "Audio Output": "Audio irteera"
 }

From 21bbf5dd9b888ec8ba23fe3c270de35c1776dd70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Kozio=C5=82?=
 <translate.riot.im@www.koziolek.biz>
Date: Sun, 17 Jun 2018 12:22:35 +0000
Subject: [PATCH 331/702] Translated using Weblate (Polish)

Currently translated at 79.7% (959 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index d0b71cdb8d..63e4cd3529 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -920,5 +920,42 @@
     "Collapse panel": "Ukryj panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Z Twoją obecną przeglądarką, wygląd oraz wrażenia z używania aplikacji mogą być niepoprawne, a niektóre funkcje wcale nie działać. Kontynuuj jeśli chcesz spróbować, jednak trudno będzie pomóc w przypadku błędów, które mogą nastąpić!",
     "Checking for an update...": "Sprawdzanie aktualizacji...",
-    "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj"
+    "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj",
+    "e.g. %(exampleValue)s": "np. %(exampleValue)s",
+    "Always show encryption icons": "Zawsze wyświetlaj ikony szyfrowania",
+    "Send analytics data": "Wysyłaj dane analityczne",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sg",
+    "%(duration)sd": "%(duration)sd",
+    "%(user)s is a %(userRole)s": "%(user)s ma rolę %(userRole)s",
+    "Members only (since the point in time of selecting this option)": "Tylko członkowie (od momentu włączenia tej opcji)",
+    "Members only (since they were invited)": "Tylko członkowie (od kiedy zostali zaproszeni)",
+    "Members only (since they joined)": "Tylko członkowie (od kiedy dołączyli)",
+    "Copied!": "Skopiowano!",
+    "Failed to copy": "Kopiowanie nieudane",
+    "Message removed by %(userId)s": "Wiadomość usunięta przez %(userId)s",
+    "Message removed": "Wiadomość usunięta",
+    "An email has been sent to %(emailAddress)s": "Email został wysłany do %(emailAddress)s",
+    "A text message has been sent to %(msisdn)s": "Wysłano wiadomość tekstową do %(msisdn)s",
+    "Code": "Kod",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</ UsageDataLink>. Spowoduje to użycie pliku cookie (zobacz naszą <PolicyLink>Politykę plików cookie</ PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</ UsageDataLink>. Spowoduje to użycie pliku cookie.",
+    "Yes, I want to help!": "Tak, chcę pomóc!",
+    "Warning: This widget might use cookies.": "Uwaga: Ten widżet może używać ciasteczek.",
+    "Delete Widget": "Usuń widżet",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Usunięcie widżetu usuwa go dla wszystkich użytkowników w tym pokoju. Czy na pewno chcesz usunąć ten widżet?",
+    "Communities": "Społeczności",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "collapse": "Zwiń",
+    "expand": "Rozwiń",
+    "Custom of %(powerLevel)s": "Poziom niestandardowy %(powerLevel)s",
+    "<a>In reply to</a> <pill>": "<a>W odpowiedzi do</a> <pill>",
+    "Matrix ID": "Matrix ID",
+    "email address": "adres e-mail",
+    "example": "przykład",
+    "Advanced options": "Opcje zaawansowane",
+    "To continue, please enter your password:": "Aby kontynuować, proszę wprowadzić swoje hasło:",
+    "password": "hasło",
+    "Refresh": "Odśwież"
 }

From a7f82365a85fc0b4ef64e1e7afef11b92286c07b Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Mon, 18 Jun 2018 10:50:41 +0000
Subject: [PATCH 332/702] Translated using Weblate (German)

Currently translated at 99.1% (1193 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ba31308e3a..a4ecc140a0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1186,5 +1186,10 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Nachrichten vom Heimserver verwendet wird.",
     "Terms and Conditions": "Geschäftsbedingungen",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.",
-    "Review terms and conditions": "Geschäftsbedingungen anzeigen"
+    "Review terms and conditions": "Geschäftsbedingungen anzeigen",
+    "Encrypting": "Verschlüssele",
+    "Encrypted, not sent": "Verschlüsselt, nicht gesendet",
+    "Share Link to User": "Sende Link an Benutzer",
+    "Share room": "Teile Raum",
+    "Share Room": "Teile Raum"
 }

From 1a236499b1f33df966635b3bb6f4bfd8ee41f5a7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 11:54:06 +0100
Subject: [PATCH 333/702] fix import

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomTile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index bb9e0a8d3b..776bd5cd70 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -24,7 +24,7 @@ import dis from '../../../dispatcher';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import sdk from '../../../index';
-import ContextualMenu from '../../structures/ContextualMenu';
+import {createMenu} from '../../structures/ContextualMenu';
 import * as RoomNotifs from '../../../RoomNotifs';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -217,7 +217,7 @@ module.exports = React.createClass({
             y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
 
             const self = this;
-            ContextualMenu.createMenu(RoomTileContextMenu, {
+            createMenu(RoomTileContextMenu, {
                 chevronOffset: chevronOffset,
                 left: x,
                 top: y,

From 15892a8c6a46a5d01fad9f80ef07a1db8d26755d Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Mon, 18 Jun 2018 10:54:30 +0000
Subject: [PATCH 334/702] Translated using Weblate (German)

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a4ecc140a0..ef34cb78fe 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1191,5 +1191,15 @@
     "Encrypted, not sent": "Verschlüsselt, nicht gesendet",
     "Share Link to User": "Sende Link an Benutzer",
     "Share room": "Teile Raum",
-    "Share Room": "Teile Raum"
+    "Share Room": "Teile Raum",
+    "Link to most recent message": "Link zur aktuellsten Nachricht",
+    "Share User": "Teile Benutzer",
+    "Share Community": "Teile Community",
+    "Share Room Message": "Teile Raumnachricht",
+    "Link to selected message": "Link zur ausgewählten Nachricht",
+    "COPY": "KOPIEREN",
+    "Share Message": "Teile Nachricht",
+    "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt",
+    "Audio Output": "Ton-Ausgabe",
+    "Try the app first": "App erst ausprobieren"
 }

From e0d36b18c92ec42f8827dbae88bbdc5baf0c144d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 12:05:57 +0100
Subject: [PATCH 335/702] make RoomTile context menu appear where you right
 clicked instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomTile.js | 71 +++++++++++++++-----------
 1 file changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 776bd5cd70..ee7f8a76c7 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -182,9 +182,30 @@ module.exports = React.createClass({
         this.badgeOnMouseLeave();
     },
 
+    _showContextMenu: function(x, y, chevronOffset) {
+        const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
+
+        createMenu(RoomTileContextMenu, {
+            chevronOffset,
+            left: x,
+            top: y,
+            room: this.props.room,
+            onFinished: () => {
+                this.setState({ menuDisplayed: false });
+                this.props.refreshSubList();
+            },
+        });
+        this.setState({ menuDisplayed: true });
+    },
+
     onContextMenu: function(e) {
-        this.onBadgeClicked(e);
+        // Prevent the RoomTile onClick event firing as well
         e.preventDefault();
+        // Only allow non-guests to access the context menu
+        if (MatrixClientPeg.get().isGuest()) return;
+
+        const chevronOffset = 12;
+        this._showContextMenu(e.clientX, e.clientY - (chevronOffset + 8), chevronOffset);
     },
 
     badgeOnMouseEnter: function() {
@@ -200,37 +221,25 @@ module.exports = React.createClass({
     },
 
     onBadgeClicked: function(e) {
-        // Only allow none guests to access the context menu
-        if (!MatrixClientPeg.get().isGuest()) {
-            // If the badge is clicked, then no longer show tooltip
-            if (this.props.collapsed) {
-                this.setState({ hover: false });
-            }
-
-            const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
-            const elementRect = this.refs.badge.getBoundingClientRect();
-
-            // The window X and Y offsets are to adjust position when zoomed in to page
-            const x = elementRect.right + window.pageXOffset + 3;
-            const chevronOffset = 12;
-            let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
-            y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
-
-            const self = this;
-            createMenu(RoomTileContextMenu, {
-                chevronOffset: chevronOffset,
-                left: x,
-                top: y,
-                room: this.props.room,
-                onFinished: function() {
-                    self.setState({ menuDisplayed: false });
-                    self.props.refreshSubList();
-                },
-            });
-            this.setState({ menuDisplayed: true });
-        }
         // Prevent the RoomTile onClick event firing as well
         e.stopPropagation();
+        // Only allow non-guests to access the context menu
+        if (MatrixClientPeg.get().isGuest()) return;
+
+        // If the badge is clicked, then no longer show tooltip
+        if (this.props.collapsed) {
+            this.setState({ hover: false });
+        }
+
+        const elementRect = e.target.getBoundingClientRect();
+
+        // The window X and Y offsets are to adjust position when zoomed in to page
+        const x = elementRect.right + window.pageXOffset + 3;
+        const chevronOffset = 12;
+        let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
+        y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
+
+        this._showContextMenu(x, y, chevronOffset);
     },
 
     render: function() {
@@ -279,7 +288,7 @@ module.exports = React.createClass({
             badgeContent = '\u200B';
         }
 
-        const badge = <div className={badgeClasses} ref="badge" onClick={this.onBadgeClicked}>{ badgeContent }</div>;
+        const badge = <div className={badgeClasses} onClick={this.onBadgeClicked}>{ badgeContent }</div>;
 
         const EmojiText = sdk.getComponent('elements.EmojiText');
         let label;

From f88a2fd8fcffbe6bf2d8fdf954591c97113dd4b4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 12:16:33 +0100
Subject: [PATCH 336/702] make GroupInviteTile context menu appear where you
 right clicked instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/groups/GroupInviteTile.js           | 69 +++++++++++--------
 1 file changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index fff9aafac1..25dba130f9 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +21,9 @@ import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
-import * as ContextualMenu from "../../structures/ContextualMenu";
 import classNames from 'classnames';
+import MatrixClientPeg from "../../../MatrixClientPeg";
+import {createMenu} from "../../structures/ContextualMenu";
 
 export default React.createClass({
     displayName: 'GroupInviteTile',
@@ -66,34 +68,11 @@ export default React.createClass({
         });
     },
 
-    onContextMenu: function(e) {
-        this.onBadgeClicked(e);
-        e.preventDefault();
-    },
+    _showContextMenu: function(x, y, chevronOffset) {
+        const GroupInviteTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
 
-    onBadgeClicked: function(e) {
-        // Prevent the RoomTile onClick event firing as well
-        e.stopPropagation();
-
-        // Only allow none guests to access the context menu
-        if (this.context.matrixClient.isGuest()) return;
-
-        // If the badge is clicked, then no longer show tooltip
-        if (this.props.collapsed) {
-            this.setState({ hover: false });
-        }
-
-        const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
-        const elementRect = this.refs.badge.getBoundingClientRect();
-
-        // The window X and Y offsets are to adjust position when zoomed in to page
-        const x = elementRect.right + window.pageXOffset + 3;
-        const chevronOffset = 12;
-        let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
-        y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
-
-        ContextualMenu.createMenu(RoomTileContextMenu, {
-            chevronOffset: chevronOffset,
+        createMenu(GroupInviteTileContextMenu, {
+            chevronOffset,
             left: x,
             top: y,
             group: this.props.group,
@@ -104,6 +83,38 @@ export default React.createClass({
         this.setState({ menuDisplayed: true });
     },
 
+    onContextMenu: function(e) {
+        // Prevent the RoomTile onClick event firing as well
+        e.preventDefault();
+        // Only allow non-guests to access the context menu
+        if (MatrixClientPeg.get().isGuest()) return;
+
+        const chevronOffset = 12;
+        this._showContextMenu(e.clientX, e.clientY - (chevronOffset + 8), chevronOffset);
+    },
+
+    onBadgeClicked: function(e) {
+        // Prevent the RoomTile onClick event firing as well
+        e.stopPropagation();
+        // Only allow non-guests to access the context menu
+        if (MatrixClientPeg.get().isGuest()) return;
+
+        // If the badge is clicked, then no longer show tooltip
+        if (this.props.collapsed) {
+            this.setState({ hover: false });
+        }
+
+        const elementRect = e.target.getBoundingClientRect();
+
+        // The window X and Y offsets are to adjust position when zoomed in to page
+        const x = elementRect.right + window.pageXOffset + 3;
+        const chevronOffset = 12;
+        let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
+        y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
+
+        this._showContextMenu(x, y, chevronOffset);
+    },
+
     render: function() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const EmojiText = sdk.getComponent('elements.EmojiText');
@@ -130,7 +141,7 @@ export default React.createClass({
         });
 
         const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
-        const badge = <div className={badgeClasses} ref="badge" onClick={this.onBadgeClicked}>{ badgeContent }</div>;
+        const badge = <div className={badgeClasses} onClick={this.onBadgeClicked}>{ badgeContent }</div>;
 
         let tooltip;
         if (this.props.collapsed && this.state.hover) {

From 1ae51a83328362581d2df74b10469d7ebba60866 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 13:48:23 +0100
Subject: [PATCH 337/702] use changed argument in js-sdk

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/ContentMessages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 1d61b6de6a..fd21977108 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -243,7 +243,7 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
             const blob = new Blob([encryptResult.data]);
             return matrixClient.uploadContent(blob, {
                 progressHandler: progressHandler,
-                omitFilename: true,
+                includeFilename: false,
             }).then(function(url) {
                 // If the attachment is encrypted then bundle the URL along
                 // with the information needed to decrypt the attachment and

From 276c7a9c4d3ab43c2c443d6b7e5b2c3b46ad37d7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 18 Jun 2018 15:24:34 +0100
Subject: [PATCH 338/702] Fix blank sticker picker

Let the battle of z-indexes commence

https://github.com/matrix-org/matrix-react-sdk/pull/1948/files#diff-8bc8827809a72c7548846c443d19f00aR29
---
 src/components/views/elements/PersistedElement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index c4bac27b4e..8115a36eeb 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -36,7 +36,7 @@ function getOrCreateContainer() {
 }
 
 // Greater than that of the ContextualMenu
-const PE_Z_INDEX = 3000;
+const PE_Z_INDEX = 5000;
 
 /*
  * Class of component that renders its children in a separate ReactDOM virtual tree

From e1e60cb1474a519846eb417f6f379d4edf9f9d62 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 18 Jun 2018 16:00:42 +0100
Subject: [PATCH 339/702] delint CallHandler

---
 .eslintignore.errorfiles |   1 -
 src/CallHandler.js       | 132 +++++++++++++++++++++------------------
 2 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 42818244b3..e5eb9d70c8 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -4,7 +4,6 @@ src/autocomplete/AutocompleteProvider.js
 src/autocomplete/Autocompleter.js
 src/autocomplete/EmojiProvider.js
 src/autocomplete/UserProvider.js
-src/CallHandler.js
 src/component-index.js
 src/components/structures/BottomLeftMenu.js
 src/components/structures/CompatibilityPage.js
diff --git a/src/CallHandler.js b/src/CallHandler.js
index da764ec4b6..55a05798af 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -124,7 +124,7 @@ function _setCallListeners(call) {
                 description: _t(
                     "There are unknown devices in this room: "+
                     "if you proceed without verifying them, it will be "+
-                    "possible for someone to eavesdrop on your call."
+                    "possible for someone to eavesdrop on your call.",
                 ),
                 button: _t('Review Devices'),
                 onFinished: function(confirmed) {
@@ -247,50 +247,52 @@ function _onAction(payload) {
 
     switch (payload.action) {
         case 'place_call':
-            if (module.exports.getAnyActiveCall()) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
-                    title: _t('Existing Call'),
-                    description: _t('You are already in a call.'),
-                });
-                return; // don't allow >1 call to be placed.
-            }
+            {
+                if (module.exports.getAnyActiveCall()) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
+                        title: _t('Existing Call'),
+                        description: _t('You are already in a call.'),
+                    });
+                    return; // don't allow >1 call to be placed.
+                }
 
-            // if the runtime env doesn't do VoIP, whine.
-            if (!MatrixClientPeg.get().supportsVoip()) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
-                    title: _t('VoIP is unsupported'),
-                    description: _t('You cannot place VoIP calls in this browser.'),
-                });
-                return;
-            }
+                // if the runtime env doesn't do VoIP, whine.
+                if (!MatrixClientPeg.get().supportsVoip()) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
+                        title: _t('VoIP is unsupported'),
+                        description: _t('You cannot place VoIP calls in this browser.'),
+                    });
+                    return;
+                }
 
-            var room = MatrixClientPeg.get().getRoom(payload.room_id);
-            if (!room) {
-                console.error("Room %s does not exist.", payload.room_id);
-                return;
-            }
+                const room = MatrixClientPeg.get().getRoom(payload.room_id);
+                if (!room) {
+                    console.error("Room %s does not exist.", payload.room_id);
+                    return;
+                }
 
-            var members = room.getJoinedMembers();
-            if (members.length <= 1) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, {
-                    description: _t('You cannot place a call with yourself.'),
-                });
-                return;
-            } else if (members.length === 2) {
-                console.log("Place %s call in %s", payload.type, payload.room_id);
-                const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id);
-                placeCall(call);
-            } else { // > 2
-                dis.dispatch({
-                    action: "place_conference_call",
-                    room_id: payload.room_id,
-                    type: payload.type,
-                    remote_element: payload.remote_element,
-                    local_element: payload.local_element,
-                });
+                const members = room.getJoinedMembers();
+                if (members.length <= 1) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, {
+                        description: _t('You cannot place a call with yourself.'),
+                    });
+                    return;
+                } else if (members.length === 2) {
+                    console.log("Place %s call in %s", payload.type, payload.room_id);
+                    const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id);
+                    placeCall(call);
+                } else { // > 2
+                    dis.dispatch({
+                        action: "place_conference_call",
+                        room_id: payload.room_id,
+                        type: payload.type,
+                        remote_element: payload.remote_element,
+                        local_element: payload.local_element,
+                    });
+                }
             }
             break;
         case 'place_conference_call':
@@ -338,10 +340,18 @@ function _onAction(payload) {
                                 }, function(err) {
                                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                                     console.error("Conference call failed: " + err);
-                                    Modal.createTrackedDialog('Call Handler', 'Failed to set up conference call', ErrorDialog, {
-                                        title: _t('Failed to set up conference call'),
-                                        description: _t('Conference call failed.') + ' ' + ((err && err.message) ? err.message : ''),
-                                    });
+                                    Modal.createTrackedDialog(
+                                        'Call Handler',
+                                        'Failed to set up conference call',
+                                        ErrorDialog,
+                                        {
+                                            title: _t('Failed to set up conference call'),
+                                            description: (
+                                                _t('Conference call failed.') +
+                                                ' ' + ((err && err.message) ? err.message : '')
+                                            ),
+                                        },
+                                    );
                                 });
                             }
                         },
@@ -350,22 +360,24 @@ function _onAction(payload) {
             }
             break;
         case 'incoming_call':
-            if (module.exports.getAnyActiveCall()) {
-                // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup.
-                // we avoid rejecting with "busy" in case the user wants to answer it on a different device.
-                // in future we could signal a "local busy" as a warning to the caller.
-                // see https://github.com/vector-im/vector-web/issues/1964
-                return;
-            }
+            {
+                if (module.exports.getAnyActiveCall()) {
+                    // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup.
+                    // we avoid rejecting with "busy" in case the user wants to answer it on a different device.
+                    // in future we could signal a "local busy" as a warning to the caller.
+                    // see https://github.com/vector-im/vector-web/issues/1964
+                    return;
+                }
 
-            // if the runtime env doesn't do VoIP, stop here.
-            if (!MatrixClientPeg.get().supportsVoip()) {
-                return;
-            }
+                // if the runtime env doesn't do VoIP, stop here.
+                if (!MatrixClientPeg.get().supportsVoip()) {
+                    return;
+                }
 
-            var call = payload.call;
-            _setCallListeners(call);
-            _setCallState(call, call.roomId, "ringing");
+                const call = payload.call;
+                _setCallListeners(call);
+                _setCallState(call, call.roomId, "ringing");
+            }
             break;
         case 'hangup':
             if (!calls[payload.room_id]) {

From 03bec1b51519956b3e72d495ad6740e900a0f133 Mon Sep 17 00:00:00 2001
From: Miguel Branco <mgl.branco@gmail.com>
Date: Mon, 18 Jun 2018 13:59:04 +0000
Subject: [PATCH 340/702] Translated using Weblate (Galician)

Currently translated at 98.5% (1185 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index aaf84f717d..665ed03cba 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1164,5 +1164,24 @@
     "Refresh": "Actualizar",
     "We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarao e non poderá ler o historial cifrado da conversa.",
-    "Collapse Reply Thread": "Comprimir o fío de respostas"
+    "Collapse Reply Thread": "Comprimir o fío de respostas",
+    "e.g. %(exampleValue)s": "p.ex.%(exampleValue)s",
+    "Send analytics data": "Enviar datos de análises",
+    "Enable widget screenshots on supported widgets": "Activar as capturas de widgets para aqueles que as permiten",
+    "Encrypting": "Cifrando",
+    "Encrypted, not sent": "Cifrado, sen enviar",
+    "Share Link to User": "Compartir a ligazón co usuario",
+    "Share room": "Compartir sala",
+    "To notify everyone in the room, you must be a": "Para avisar a todos os da sala ten que ser",
+    "Muted Users": "Usuarios silenciados",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Mellore Riot.im enviando <UsageDataLink>os datos anónimos de uso</UsageDataLink>. Iso suporá o emprego dunha cookie (véxase a nosa <PolicyLink>Política de Cookies</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Mellore Riot.im enviando <UsageDataLink>o uso de datos anónimo</UsageDataLink>. Iso usará unha cookie.",
+    "Yes, I want to help!": "Si, quero axuda",
+    "Warning: This widget might use cookies.": "Aviso: este widget podería usar algunha cookie.",
+    "Reload widget": "Volver a cargar o widget",
+    "Failed to indicate account erasure": "Non se deu indicado a eliminación de conta",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Iso fará que a súa deixe de ter uso de xeito permanente. Non poderá acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuario. Suporá que saía de todas as salas de conversas nas que estaba e eliminará os detalles da súa conta do servidores de identificación.<b>Isto non se poderá desfacer</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Desactivando a súa conta <b>non supón que por defecto esquezamos as súas mensaxes enviadas.</b> Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.",
+    "To continue, please enter your password:": "Para continuar introduza o seu contrasinal:",
+    "password": "contrasinal"
 }

From 55a6a4dd8fcaadc2e0fab0b42c389bcab4328ba4 Mon Sep 17 00:00:00 2001
From: Miguel Branco <mgl.branco@gmail.com>
Date: Mon, 18 Jun 2018 15:28:27 +0000
Subject: [PATCH 341/702] Translated using Weblate (Galician)

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 548 ++++++++++++++++++++-------------------
 1 file changed, 283 insertions(+), 265 deletions(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 665ed03cba..41f98676b6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1,31 +1,31 @@
 {
-    "This email address is already in use": "Este enderezo de correo xa está a ser utilizado",
-    "This phone number is already in use": "Este número de teléfono xa está a ser utilizado",
+    "This email address is already in use": "Xa se está a usar este correo",
+    "This phone number is already in use": "Xa se está a usar este teléfono",
     "Failed to verify email address: make sure you clicked the link in the email": "Fallo na verificación do enderezo de correo: asegúrese de ter picado na ligazón do correo",
     "The remote side failed to pick up": "O interlocutor non respondeu",
-    "Unable to capture screen": "Non se puido pillar a pantalla",
-    "Existing Call": "Chamada existente",
+    "Unable to capture screen": "Non se puido capturar a pantalla",
+    "Existing Call": "Rexistro de chamadas",
     "You are already in a call.": "Xa está nunha chamada.",
-    "VoIP is unsupported": "VoIP non admitida",
-    "You cannot place VoIP calls in this browser.": "Non pode establecer chamadas VoIP en este navegador.",
-    "You cannot place a call with yourself.": "Non pode chamarse a vostede mesma.",
-    "Conference calls are not supported in this client": "Non pode establecer chamadas de Reunión en este cliente",
-    "Conference calls are not supported in encrypted rooms": "Nas salas cifradas non se pode establecer Chamadas de Reunión",
+    "VoIP is unsupported": "Sen soporte para VoIP",
+    "You cannot place VoIP calls in this browser.": "Non pode establecer chamadas VoIP neste navegador.",
+    "You cannot place a call with yourself.": "Non pode facer unha chamada a si mesmo.",
+    "Conference calls are not supported in this client": "Non pode establecer chamadas de reunión neste cliente",
+    "Conference calls are not supported in encrypted rooms": "Nas salas cifradas non se pode establecer chamadas de reunión",
     "Warning!": "Aviso!",
-    "Conference calling is in development and may not be reliable.": "As chamadas de Reunión poderían non ser totalmente estables xa que están en desenvolvemento.",
+    "Conference calling is in development and may not be reliable.": "As chamadas de reunión poderían non ser totalmente estables xa que están en desenvolvemento.",
     "Failed to set up conference call": "Fallo ao establecer a chamada de reunión",
     "Conference call failed.": "Fallo na chamada de reunión.",
     "Call Failed": "Fallou a chamada",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai dispositivos descoñecidos en esta sala: si sigue adiante sen verificalos, pode ser posible que alguén bote un ollo a súa chamada.",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai dispositivos descoñecidos en esta sala: se segue adiante sen verificalos, pode ser posible que alguén bote un ollo a súa chamada.",
     "Review Devices": "Revisar dispositivos",
     "Call Anyway": "Chamar igualmente",
-    "Answer Anyway": "Respostar igualmente",
+    "Answer Anyway": "Responder igualmente",
     "Call": "Chamar",
-    "Answer": "Respostar",
-    "Call Timeout": "Finou a chamada",
-    "The file '%(fileName)s' failed to upload": "O ficheiro '%(fileName)s' non se puido subir",
-    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O ficheiro '%(fileName)s' excede o límite establecido polo servidor para subidas",
-    "Upload Failed": "Fallou a subida",
+    "Answer": "Resposta",
+    "Call Timeout": "Tempo de resposta de chamada",
+    "The file '%(fileName)s' failed to upload": "Non se puido subir o ficheiro '%(fileName)s'",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O ficheiro '%(fileName)s' excede o límite de tamaño establecido para este servidor",
+    "Upload Failed": "Fallou o envío",
     "Sun": "Dom",
     "Mon": "Lun",
     "Tue": "Mar",
@@ -50,66 +50,66 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
-    "Who would you like to add to this community?": "A quén lle gustaría engadir a esta comunidade?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquer persoa que vostede engada a unha comunidade será públicamente visible para calquera que coñeza o ID da comunidade",
-    "Invite new community members": "Convidar a novos membros da comunidade",
+    "Who would you like to add to this community?": "A quen quere engadir a esta comunidade?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquera persoa que engada a unha comunidade estará publicamente visible para calquera que coñeza a ID da comunidade",
+    "Invite new community members": "Convidará comunidade a novos participantes ",
     "Name or matrix ID": "Nome ou ID matrix",
-    "Invite to Community": "Convide a comunidade",
-    "Which rooms would you like to add to this community?": "Qué salas desexaría engadir a esta comunidade?",
-    "Show these rooms to non-members on the community page and room list?": "Mostrar estas salas a non-membros na páxina da comunidade e lista de salas?",
-    "Add rooms to the community": "Engadir salas a comunidade",
+    "Invite to Community": "Convidar á comunidade",
+    "Which rooms would you like to add to this community?": "Que salas desexaría engadir a esta comunidade?",
+    "Show these rooms to non-members on the community page and room list?": "Quere que estas salas se lle mostren a outros membros de fóra da comunidade na lista de salas?",
+    "Add rooms to the community": "Engadir salas á comunidade",
     "Room name or alias": "Nome da sala ou alcume",
-    "Add to community": "Engadir a comunidade",
-    "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar as seguintes usuarias a %(groupId)s:",
-    "Failed to invite users to community": "Fallou o convite de usuarias a comunidade",
-    "Failed to invite users to %(groupId)s": "Fallou o convite de usuarias a %(groupId)s",
+    "Add to community": "Engadir á comunidade",
+    "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar os seguintes usuarios a %(groupId)s:",
+    "Failed to invite users to community": "Houbo un fallo convidando usuarios á comunidade",
+    "Failed to invite users to %(groupId)s": "Houbo un fallo convidando usuarios a %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Fallo ao engadir as seguintes salas a %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ten permiso para enviarlle notificacións - por favor comprobe os axustes do navegador",
-    "Riot was not given permission to send notifications - please try again": "Riot non ten permiso para enviar notificacións - inténteo de novo",
-    "Unable to enable Notifications": "Non se puideron habilitar as notificacións",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ten permiso para enviarlle notificacións: comprobe os axustes do navegador",
+    "Riot was not given permission to send notifications - please try again": "Riot non ten permiso para enviar notificacións: inténteo de novo",
+    "Unable to enable Notifications": "Non se puideron activar as notificacións",
     "This email address was not found": "Non se atopou este enderezo de correo",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu enderezo de correo semella non estar asociado a un ID Matrix en este servidor.",
-    "Default": "Por omisión",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu enderezo de correo semella non estar asociado a un ID Matrix neste servidor.",
+    "Default": "Por defecto",
     "Restricted": "Restrinxido",
     "Moderator": "Moderador",
     "Admin": "Administrador",
     "Start a chat": "Iniciar unha conversa",
-    "Who would you like to communicate with?": "Con quén desexa comunicarse?",
+    "Who would you like to communicate with?": "Con quen desexa comunicarse?",
     "Email, name or matrix ID": "Correo, nome ou ID matrix",
     "Start Chat": "Iniciar conversa",
-    "Invite new room members": "Convidar a sala a novos membros",
-    "Who would you like to add to this room?": "A quén desexaría engadir a esta sala?",
+    "Invite new room members": "Convidar a novos participantes",
+    "Who would you like to add to this room?": "A quen desexaría engadir a esta sala?",
     "Send Invites": "Enviar convites",
     "Failed to invite user": "Fallo ao convidar usuaria",
     "Operation failed": "Fallou a operación",
     "Failed to invite": "Fallou o convite",
-    "Failed to invite the following users to the %(roomName)s room:": "Non se puideron convidar as seguintes usuarias a sala %(roomName)s:",
+    "Failed to invite the following users to the %(roomName)s room:": "Houbo un fallo convidando os seguintes usuarios á sala %(roomName)s:",
     "You need to be logged in.": "Precisa estar conectada.",
-    "You need to be able to invite users to do that.": "Vostede precisa estar autorizada a convidar usuarias para facer iso.",
-    "Unable to create widget.": "Non se puido crear o widget.",
+    "You need to be able to invite users to do that.": "Precisa autorización para convidar a outros usuarias para poder facer iso.",
+    "Unable to create widget.": "Non se puido crear o trebello.",
     "Failed to send request.": "Fallo ao enviar a petición.",
     "This room is not recognised.": "Non se recoñece esta sala.",
     "Power level must be positive integer.": "O nivel de poder ten que ser un enteiro positivo.",
-    "You are not in this room.": "Vostede non está en esta sala.",
-    "You do not have permission to do that in this room.": "Non ten permiso para facer eso en esta sala.",
+    "You are not in this room.": "Non está nesta sala.",
+    "You do not have permission to do that in this room.": "Non ten permiso para facer iso nesta sala.",
     "Missing room_id in request": "Falta o room_id na petición",
     "Must be viewing a room": "Debería estar vendo unha sala",
     "Room %(roomId)s not visible": "A sala %(roomId)s non é visible",
-    "Missing user_id in request": "Falata o user_id na petición",
+    "Missing user_id in request": "Falta o user_id na petición",
     "Usage": "Uso",
     "/ddg is not a command": "/ddg non é unha orde",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para  utilizala, agarde que carguen os resultados de autocompletado e escolla entre eles.",
     "Unrecognised room alias:": "Alcumes de sala non recoñecidos:",
     "Ignored user": "Usuaria ignorada",
     "You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s",
-    "Unignored user": "Usuarias non ignorada",
+    "Unignored user": "Usuarios non ignorados",
     "You are no longer ignoring %(userId)s": "Xa non está a ignorar a %(userId)s",
     "Unknown (user, device) pair:": "Parella descoñecida (dispositivo, usuaria):",
     "Device already verified!": "Dispositivo xa verificado!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "AVISO: o dispositivo xa está verificado, que as chaves NON CONCORDAN!",
-    "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!": "AVISO: FALLOU A VERIFICACIÓN DE CHAVES! A chave de firma para %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\" que non concorda coa chave proporcionada \"%(fingerprint)s\". Esto podería significar que as súas comunicacións están a ser interceptadas!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "Aviso: o dispositivo xa está verificado só que as chaves NON CONCORDAN!",
+    "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!": "AVISO: FALLOU A VERIFICACIÓN DE CHAVES! A chave de firma para o %(userId)s e  dispositivo %(deviceId)s é \"%(fprint)s\" que non concorda coa chave proporcionada \"%(fingerprint)s\". Isto podería significar que as súas  comunicacións están a ser interceptadas!",
     "Verified key": "Chave verificada",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibeu do dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibiu do  dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.",
     "Unrecognised command:": "Orde non recoñecida:",
     "Reason": "Razón",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptou o convite para %(displayName)s.",
@@ -123,7 +123,7 @@
     "%(senderName)s changed their profile picture.": "%(senderName)s cambiou a súa imaxe de perfil.",
     "%(senderName)s set a profile picture.": "%(senderName)s estableceu a imaxe de perfil.",
     "VoIP conference started.": "Comezou a conferencia VoIP.",
-    "%(targetName)s joined the room.": "%(targetName)s uneuse a sala.",
+    "%(targetName)s joined the room.": "%(targetName)s uniuse a sala.",
     "VoIP conference finished.": "Rematou a conferencia VoIP.",
     "%(targetName)s rejected the invitation.": "%(targetName)s rexeitou a invitación.",
     "%(targetName)s left the room.": "%(targetName)s deixou a sala.",
@@ -143,25 +143,25 @@
     "%(senderName)s ended the call.": "%(senderName)s rematou a chamada.",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s estableceu unha chamada %(callType)s.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou un convite a %(targetDisplayName)s para unirse a sala.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para toda a membresía, desde o punto en que foron convidadas.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a toda a membresía, desde o punto en que se uniron.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para toda a membresía o historial futuro da sala.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para todos os participantes, desde o punto en que foron convidadas.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a todos os participantes, desde o punto en que se uniron.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para todos participantes o historial futuro da sala.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s fixo visible para calquera o historial futuro da sala.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado extremo-a-extremo (algoritmo %(algorithm)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado de par-a-par (algoritmo %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s desde %(fromPowerLevel)s a %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s cambiou o nivel de autoridade a %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambiou as mensaxes fixadas para a sala.",
-    "%(widgetName)s widget modified by %(senderName)s": "O engadido %(widgetName)s modificado por %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "O %(widgetName)s engadido por %(senderName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "O trebello %(widgetName)s modificado por %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "O trebello %(widgetName)s engadido por %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s eliminado por %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s está a escribir",
     "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras están a escribir",
     "%(names)s and %(count)s others are typing|one": "%(names)s e outra está a escribir",
     "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s están a escribir",
-    "Failure to create room": "Fallo ao crear a sala",
+    "Failure to create room": "Fallou a creación da sala",
     "Server may be unavailable, overloaded, or you hit a bug.": "O servidor podería non estar dispoñible, con sobrecarga ou ter un fallo.",
-    "Send anyway": "Enviar de todos xeitos",
+    "Send anyway": "Enviar de todos os xeitos",
     "Send": "Enviar",
     "Unnamed Room": "Sala sen nome",
     "Your browser does not support the required cryptography extensions": "O seu navegador non soporta as extensións de criptografía necesarias",
@@ -170,7 +170,7 @@
     "Failed to join room": "Non se puido unir a sala",
     "Message Pinning": "Fixando mensaxe",
     "Tag Panel": "Panel de etiquetas",
-    "Disable Emoji suggestions while typing": "Deshabilitar a suxestión de Emoji mentras escribe",
+    "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe",
     "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
     "Hide removed messages": "Ocultar mensaxes eliminadas",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensaxes de unión/saída (convites/expulsións/bloqueos non afectados)",
@@ -178,19 +178,19 @@
     "Hide display name changes": "Ocultar cambios no nome público",
     "Hide read receipts": "Ocultar avisos de recepción",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas  de tempo con formato 12 horas (ex. 2:30pm)",
-    "Always show message timestamps": "Mostar sempre marcas de tempo",
+    "Always show message timestamps": "Mostrar sempre marcas de tempo",
     "Autoplay GIFs and videos": "Reprodución automática de GIFs e vídeos",
-    "Enable automatic language detection for syntax highlighting": "Habilitar a detección automática de idioma para o resalte da sintaxe",
+    "Enable automatic language detection for syntax highlighting": "Activar a detección automática de idioma para o resalte da sintaxe",
     "Hide avatars in user and room mentions": "Ocultar avatares nas mencións de usuarios e salas",
-    "Disable big emoji in chat": "Deshabilitar emojis grandes nas conversas",
+    "Disable big emoji in chat": "Desactivar emojis grandes nas conversas",
     "Don't send typing notifications": "Non enviar notificacións de escritura",
     "Automatically replace plain text Emoji": "Substituír automaticamente Emoji en texto plano",
-    "Disable Peer-to-Peer for 1:1 calls": "Deshabilitar Peer-to-Peer  para chamadas 1:1",
-    "Never send encrypted messages to unverified devices from this device": "Non enviar mensaxes cifradas a dispositivos non verificados desde este dispositivo",
-    "Never send encrypted messages to unverified devices in this room from this device": "Non enviar mensaxes cifradas a dispositivos non verificados en esta sala desde este dispositivo",
-    "Enable inline URL previews by default": "Habilitar por omisión vistas previas en liña de URL",
-    "Enable URL previews for this room (only affects you)": "Habilitar vista previa de URL en esta sala (só lle afecta a vostede)",
-    "Enable URL previews by default for participants in this room": "Habilitar vista previa de URL por omisión para as participantes en esta sala",
+    "Disable Peer-to-Peer for 1:1 calls": "Desactivar Peer-to-Peer  para chamadas 1:1",
+    "Never send encrypted messages to unverified devices from this device": "Nunca enviar mensaxes cifradas aos dispositivos que non estean verificados neste dispositivo",
+    "Never send encrypted messages to unverified devices in this room from this device": "Nunca enviar mensaxes cifradas aos dispositivos que non estean verificados nesta sala desde este dispositivo",
+    "Enable inline URL previews by default": "Activar por defecto as vistas previas en liña de URL",
+    "Enable URL previews for this room (only affects you)": "Activar avista previa de URL nesta sala (só lle afecta a vostede)",
+    "Enable URL previews by default for participants in this room": "Activar a vista previa de URL por defecto para as participantes nesta sala",
     "Room Colour": "Cor da sala",
     "Active call (%(roomName)s)": "Chamada activa (%(roomName)s)",
     "unknown caller": "interlocutora descoñecida",
@@ -211,8 +211,8 @@
     "Upload new:": "Subir nova:",
     "No display name": "Sen nome público",
     "New passwords don't match": "Os contrasinais novos non coinciden",
-    "Passwords can't be empty": "Os contranais non poden estar baldeiros",
-    "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.": "Ao cambiar o contrasinal restablecerá todas as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo ilexible o historial da conversa a menos que primeiro exporte as chaves da sala e posteriormente as importe. No futuro melloraremos esto.",
+    "Passwords can't be empty": "Os contrasinais non poden estar baleiros",
+    "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.": "Ao cambiar o contrasinal restablecerá todas as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo ilexible o historial da conversa a menos que primeiro exporte as chaves da sala e posteriormente as importe. No futuro melloraremos isto.",
     "Continue": "Continuar",
     "Export E2E room keys": "Exportar chaves E2E da sala",
     "Do you want to set an email address?": "Quere establecer un enderezo de correo electrónico?",
@@ -231,14 +231,14 @@
     "Last seen": "Visto por última vez",
     "Select devices": "Escolla dispositivos",
     "Failed to set display name": "Fallo ao establecer o nome público",
-    "Disable Notifications": "Deshabilitar notificacións",
-    "Enable Notifications": "Habilitar notificacións",
+    "Disable Notifications": "Desactivar notificacións",
+    "Enable Notifications": "Activar ass notificacións",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s",
     "Message Replies": "Respostas a mensaxe",
     "Mirror local video feed": "Copiar fonte de vídeo local",
-    "Cannot add any more widgets": "Non pode engadir máis widgets",
-    "The maximum permitted number of widgets have already been added to this room.": "Xa se engadeu o número máximo de widgets a esta sala.",
-    "Add a widget": "Engadir widget",
+    "Cannot add any more widgets": "Non pode engadir máis trebellos",
+    "The maximum permitted number of widgets have already been added to this room.": "Xa se lle engadiron o número máximo de trebellos a esta sala.",
+    "Add a widget": "Engadir un trebello",
     "Drop File Here": "Solte aquí o ficheiro",
     "Drop file here to upload": "Solte aquí o ficheiro para subilo",
     " (unsupported)": " (non soportado)",
@@ -246,7 +246,7 @@
     "Ongoing conference call%(supportedText)s.": "Chamada de conferencia en curso%(supportedText)s.",
     "%(senderName)s sent an image": "%(senderName)s enviou unha imaxe",
     "%(senderName)s sent a video": "%(senderName)s enviou un vídeo",
-    "%(senderName)s uploaded a file": "%(senderName)s subeu un ficheiro",
+    "%(senderName)s uploaded a file": "%(senderName)s subiu un ficheiro",
     "Options": "Axustes",
     "Undecryptable": "Non descifrable",
     "Encrypted by a verified device": "Cifrado por un dispositivo verificado",
@@ -271,7 +271,7 @@
     "Failed to toggle moderator status": "Fallo ao mudar a estado de moderador",
     "Failed to change power level": "Fallo ao cambiar o nivel de permisos",
     "Are you sure?": "Está segura?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que está promovendo a usaria a ter o mesmo nivel de permisos que vostede.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que lle estará promocionando e outorgándolle a outra persoa os mesmos permisos que os seus.",
     "No devices with registered encryption keys": "Sen dispositivos con chaves de cifrado rexistradas",
     "Devices": "Dispositivos",
     "Unignore": "Non ignorar",
@@ -290,7 +290,7 @@
     "and %(count)s others...|other": "e %(count)s outras...",
     "and %(count)s others...|one": "e outra máis...",
     "Invited": "Convidada",
-    "Filter room members": "Filtrar membros da conversa",
+    "Filter room members": "Filtrar os participantes da conversa",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (permiso %(powerLevelNumber)s)",
     "Attachment": "Anexo",
     "Upload Files": "Subir ficheiros",
@@ -306,9 +306,9 @@
     "Send a reply (unencrypted)…": "Enviar unha resposta (non cifrada)…",
     "Send an encrypted message…": "Enviar unha mensaxe cifrada…",
     "Send a message (unencrypted)…": "Enviar unha mensaxe (non cifrada)…",
-    "You do not have permission to post to this room": "Non ten permiso para comentar en esta sala",
-    "Turn Markdown on": "Habilitar Markdown",
-    "Turn Markdown off": "Deshabilitar Markdown",
+    "You do not have permission to post to this room": "Non ten permiso para comentar nesta sala",
+    "Turn Markdown on": "Activar Markdown",
+    "Turn Markdown off": "Desactivar Markdown",
     "Hide Text Formatting Toolbar": "Agochar barra de formato de texto",
     "Server error": "Fallo no servidor",
     "Server unavailable, overloaded, or something else went wrong.": "Servidor non dispoñible, sobrecargado, ou outra cousa puido fallar.",
@@ -321,8 +321,8 @@
     "quote": "cita",
     "bullet": "lista",
     "numbullet": "lista numerada",
-    "Markdown is disabled": "Markdown deshabilitado",
-    "Markdown is enabled": "Markdown habilitado",
+    "Markdown is disabled": "Markdown desactivado",
+    "Markdown is enabled": "Markdown activado",
     "Unpin Message": "Desfixar mensaxe",
     "Jump to message": "Ir a mensaxe",
     "No pinned messages.": "Sen mensaxes fixadas.",
@@ -340,7 +340,7 @@
     "Idle": "En pausa",
     "Offline": "Fóra de liña",
     "Unknown": "Descoñecido",
-    "Replying": "Respostando",
+    "Replying": "Respondendo",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s as %(dateTime)s",
     "No rooms to show": "Sen salas que mostrar",
     "Unnamed room": "Sala sen nome",
@@ -357,11 +357,11 @@
     "Forget room": "Esquecer sala",
     "Search": "Busca",
     "Show panel": "Mostra panel",
-    "Drop here to favourite": "Solte aqui para favorito",
+    "Drop here to favourite": "Solte aquí para favorito",
     "Drop here to tag direct chat": "Solte aquí para etiquetar chat directo",
     "Drop here to restore": "Solte aquí para restablecer",
     "Drop here to tag %(section)s": "Solte aquí para etiquetar %(section)s",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non poderá desfacer este cambio xa que está a diminuír a súa autoridade, si vostede é a única usuaria con autorización na sala será imposible voltar a obter privilexios.",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non poderá desfacer este cambio xa que está a diminuír a súa autoridade, se é a única persoa con autorización na sala será imposible volver a obter privilexios.",
     "Drop here to demote": "Arrastre aquí para degradar",
     "Press <StartChatButton> to start a chat with someone": "Pulse <StartChatButton> para iniciar a conversa con alguén",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Aínda non está en ningunha sala! Pulse <CreateRoomButton> para crear unha sala ou <RoomDirectoryButton> para buscar no directorio",
@@ -377,75 +377,75 @@
     "You have been invited to join this room by %(inviterName)s": "Foi convidada por %(inviterName)s a unirse a esta sala",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Quere <acceptText>aceptar</acceptText> ou <declineText>rexeitar</declineText> este convite?",
     "Reason: %(reasonText)s": "Razón: %(reasonText)s",
-    "Rejoin": "Voltar a unirse",
+    "Rejoin": "Volver a unirse",
     "You have been kicked from %(roomName)s by %(userName)s.": "Foi expulsada de %(roomName)s por %(userName)s.",
-    "You have been kicked from this room by %(userName)s.": "Foi expulsada de esta sala por %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "Foi expulsada desta sala por %(userName)s.",
     "You have been banned from %(roomName)s by %(userName)s.": "Non se lle permite acceder a %(roomName)s por %(userName)s.",
     "You have been banned from this room by %(userName)s.": "Non se lle permite o acceso a esta sala por %(userName)s.",
     "This room": "Esta sala",
     "%(roomName)s does not exist.": "%(roomName)s non existe.",
-    "%(roomName)s is not accessible at this time.": "%(roomName)s non está accesible en este momento.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s non está accesible neste momento.",
     "You are trying to access %(roomName)s.": "Está intentando acceder a %(roomName)s.",
     "You are trying to access a room.": "Está intentando acceder a unha sala.",
     "<a>Click here</a> to join the discussion!": "<a>Pulse aquí</a> para unirse a conversa!",
-    "This is a preview of this room. Room interactions have been disabled": "Esta é unha vista previa de esta sala. Desactiváronse as interaccións coa sala",
+    "This is a preview of this room. Room interactions have been disabled": "Esta é unha vista previa desta sala. Desactiváronse as interaccións coa sala",
     "To change the room's avatar, you must be a": "Para cambiar o avatar da sala, debe ser",
     "To change the room's name, you must be a": "Para cambiar o nome da sala, debe ser",
     "To change the room's main address, you must be a": "Para cambiar o enderezo principal da sala, debe ser",
     "To change the room's history visibility, you must be a": "Para cambiar a visibilidade do histórico da sala, debe ser",
     "To change the permissions in the room, you must be a": "Para cambiar os permisos na sala, debe ser",
     "To change the topic, you must be a": "Para cambiar o asunto, debe ser",
-    "To modify widgets in the room, you must be a": "Para modificar os widgets da sala, debe ser",
+    "To modify widgets in the room, you must be a": "Para modificar os trebellos da sala, debe ser",
     "Failed to unban": "Fallou eliminar a prohibición",
     "Banned by %(displayName)s": "Non aceptado por %(displayName)s",
     "Privacy warning": "Aviso de intimidade",
-    "Changes to who can read history will only apply to future messages in this room": "Os cambios sobre quen pode ler o histórico serán de aplicación a futuras mensaxes en esta sala",
+    "Changes to who can read history will only apply to future messages in this room": "Os cambios sobre quen pode ler o histórico serán de aplicación para as futuras mensaxes nesta sala",
     "The visibility of existing history will be unchanged": "A visibilidade do histórico existente non cambiará",
     "unknown error code": "código de fallo descoñecido",
     "Failed to forget room %(errCode)s": "Fallo ao esquecer sala %(errCode)s",
-    "End-to-end encryption is in beta and may not be reliable": "O cifrado de extremo-a-extremo está en beta e podería non ser fiable",
+    "End-to-end encryption is in beta and may not be reliable": "O cifrado de par-a-par está en beta e podería non ser fiable",
     "You should not yet trust it to secure data": "Polo de agora non debería confiarlle datos seguros",
     "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos non poderán descifrar o histórico anterior a que se uniron a sala",
-    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Unha vez habilitado o cifrado para unha sala non se poderá desactivar (por agora)",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Unha vez activou o cifrado para unha sala non se poderá desactivar (por agora)",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "As mensaxes cifradas non será visibles en clientes que non aínda non teñan implementado o cifrado",
-    "Enable encryption": "Habilitar cifrado",
-    "(warning: cannot be disabled again!)": "(aviso: non se pode deshabilitar!)",
-    "Encryption is enabled in this room": "O cifrado está habilitado en esta sala",
-    "Encryption is not enabled in this room": "O cifrado non se habilitou para esta sala",
+    "Enable encryption": "Activar o cifrado",
+    "(warning: cannot be disabled again!)": "(aviso: non se pode desactivar!)",
+    "Encryption is enabled in this room": "O cifrado está activado nesta sala",
+    "Encryption is not enabled in this room": "Non se activou o  cifrado nesta sala",
     "Privileged Users": "Usuarios con privilexios",
-    "No users have specific privileges in this room": "Non hai usuarias con privilexios específicos en esta sala",
-    "Banned users": "Usuarias non permitidas",
+    "No users have specific privileges in this room": "Non hai usuarios con privilexios específicos nesta sala",
+    "Banned users": "Usuarios excluídos",
     "This room is not accessible by remote Matrix servers": "Esta sala non é accesible por servidores Matrix remotos",
     "Leave room": "Deixar a sala",
     "Favourite": "Favorita",
     "Tagged as: ": "Etiquetada como: ",
     "To link to a room it must have <a>an address</a>.": "Para ligar a unha sala deberá ter <a>un enderezo</a>.",
-    "Guests cannot join this room even if explicitly invited.": "As convidadas non se poden unir a esta sala incluso se foro explicitamente convidadas.",
+    "Guests cannot join this room even if explicitly invited.": "Os convidados non se poden unir a esta sala inda que fosen convidados explicitamente.",
     "Click here to fix": "Pulse aquí para solución",
-    "Who can access this room?": "Quén pode acceder a esta sala?",
+    "Who can access this room?": "Quen pode acceder a esta sala?",
     "Only people who have been invited": "Só persoas que foron convidadas",
     "Anyone who knows the room's link, apart from guests": "Calquera que coñeza o enderezo da sala, aparte das convidadas",
     "Anyone who knows the room's link, including guests": "Calquera que coñeza a ligazón a sala, incluíndo as convidadas",
     "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala no directorio público de salas de %(domain)s?",
-    "Who can read history?": "Quén pode ler o histórico?",
+    "Who can read history?": "Quen pode ler o histórico?",
     "Anyone": "Calquera",
     "Members only (since the point in time of selecting this option)": "Só membros (desde o momento en que se selecciona esta opción)",
     "Members only (since they were invited)": "Só membros (desde que foron convidados)",
     "Members only (since they joined)": "Só membros (desde que se uniron)",
     "Permissions": "Permisos",
-    "The default role for new room members is": "Por omisión o rol na sala para novos membros é",
+    "The default role for new room members is": "O rol por defecto na sala para novos participantes é",
     "To send messages, you must be a": "Para enviar mensaxes, deberá ser",
-    "To invite users into the room, you must be a": "Para convidar a usuarias a esta sala, debe ser",
+    "To invite users into the room, you must be a": "Para convidar a usuarios a esta sala, debe ser",
     "To configure the room, you must be a": "Para configurar a sala, debe ser",
-    "To kick users, you must be a": "Para expulsar usuarias, debe ser",
-    "To ban users, you must be a": "Para prohibir usuarias, debe ser",
-    "To remove other users' messages, you must be a": "Para eliminar mensaxes de outras usuarias, debe ser",
+    "To kick users, you must be a": "Para expulsar usuarios, debe ser",
+    "To ban users, you must be a": "Para prohibir usuarios, debe ser",
+    "To remove other users' messages, you must be a": "Para eliminar mensaxes doutras usuarios, debe ser",
     "To send events of type <eventType/>, you must be a": "Para enviar eventos de tipo <eventType/>, debe ser",
     "Advanced": "Avanzado",
-    "This room's internal ID is": "O ID interno de esta sala é",
+    "This room's internal ID is": "O ID interno desta sala é",
     "Add a topic": "Engadir asunto",
     "Cancel": "Cancelar",
-    "Scroll to unread messages": "Desplace ate mensaxes non lidas",
+    "Scroll to unread messages": "Desprazarse ate mensaxes non lidas",
     "Jump to first unread message.": "Ir a primeira mensaxe non lida.",
     "Close": "Pechar",
     "Invalid alias format": "Formato de alias non válido",
@@ -463,10 +463,10 @@
     "Invalid community ID": "ID da comunidade non válido",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' non é un ID de comunidade válido",
     "New community ID (e.g. +foo:%(localDomain)s)": "Novo ID da comunidade (ex. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "Vostede <a>habilitou</a> a vista previa de URL por omisión.",
-    "You have <a>disabled</a> URL previews by default.": "Vostede <a>desactivou</a> a vista previa de URL por omisión.",
-    "URL previews are enabled by default for participants in this room.": "As vistas previas de URL están habilitadas por omisión para os participantes de esta sala.",
-    "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por omisión para os participantes de esta sala.",
+    "You have <a>enabled</a> URL previews by default.": "<a>Activou</a> a vista previa de URL por defecto.",
+    "You have <a>disabled</a> URL previews by default.": "<a>Desactivou</a> a vista previa de URL por defecto.",
+    "URL previews are enabled by default for participants in this room.": "As vistas previas de URL están activas por defecto para os participantes desta sala.",
+    "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por defecto para os  participantes desta sala.",
     "URL Previews": "Vista previa de URL",
     "Error decrypting audio": "Fallo ao descifrar audio",
     "Error decrypting attachment": "Fallo descifrando o anexo",
@@ -486,17 +486,17 @@
     "Message removed by %(userId)s": "Mensaxe eliminada por %(userId)s",
     "Message removed": "Mensaxe eliminada",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Comprobación por Robot non está dispoñible en escritorio - por favor utilice un <a>navegador web</a>",
-    "This Home Server would like to make sure you are not a robot": "Este Servidor quere asegurarse de que vostede non é un robot",
+    "This Home Server would like to make sure you are not a robot": "Este servidor quere asegurarse de que vostede non é un robot",
     "Sign in with CAS": "Conectarse con CAS",
     "Custom Server Options": "Opcións personalizadas do servidor",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Pode utilizar as opcións personalizadas do servidor para conectarse a outros servidores Matrix indicando un URL de servidor de inicio diferente.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "Así pode utilizar este aplicativo con unha conta Matrix existente en un servidor de incio diferente.",
-    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Tamén pode establecer un servidor de identidade personalizado pero esto normalmente dificulta a interacción con usuarias basándose non enderezo de correo.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Así pode utilizar este aplicativo con unha conta Matrix existente en un servidor de inicio diferente.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Tamén pode establecer un servidor de identidade personalizado pero isto normalmente dificulta a interacción con usuarios baseándose non enderezo de correo.",
     "Dismiss": "Rexeitar",
     "To continue, please enter your password.": "Para continuar, por favor introduza o seu contrasinal.",
     "Password:": "Contrasinal:",
     "An email has been sent to %(emailAddress)s": "Enviouse un correo a %(emailAddress)s",
-    "Please check your email to continue registration.": "Por favor comprobe o seu correo para continuar co rexistro.",
+    "Please check your email to continue registration.": "Comprobe o seu correo para continuar co rexistro.",
     "Token incorrect": "Testemuño incorrecto",
     "A text message has been sent to %(msisdn)s": "Enviouse unha mensaxe de texto a %(msisdn)s",
     "Please enter the code it contains:": "Por favor introduza o código que contén:",
@@ -510,22 +510,22 @@
     "Sign in with": "Conectarse con",
     "Email address": "Enderezo de correo",
     "Sign in": "Conectar",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si non indica un enderezo de correo non poderá restablecer o contrasinal, está segura?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se non indica un enderezo de correo non poderá restablecer o contrasinal, está seguro?",
     "Email address (optional)": "Enderezo de correo (opcional)",
     "You are registering with %(SelectedTeamName)s": "Estase a rexistrar con %(SelectedTeamName)s",
     "Mobile phone number (optional)": "Número de teléfono móbil (opcional)",
-    "Register": "Rexistar",
-    "Default server": "Servidor por omisión",
+    "Register": "Rexistrar",
+    "Default server": "Servidor por defecto",
     "Custom server": "Servidor personalizado",
     "Home server URL": "URL do servidor de inicio",
     "Identity server URL": "URL do servidor de identidade",
-    "What does this mean?": "Qué significa esto?",
+    "What does this mean?": "Que significa isto?",
     "Remove from community": "Eliminar da comunidade",
     "Disinvite this user from community?": "Retirar o convite a comunidade a esta usuaria?",
     "Remove this user from community?": "Quitar a esta usuaria da comunidade?",
     "Failed to withdraw invitation": "Fallo ao retirar o convite",
     "Failed to remove user from community": "Fallo ao quitar a usuaria da comunidade",
-    "Filter community members": "Filtrar membros da comunidade",
+    "Filter community members": "Filtrar participantes na comunidade",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Está segura de que quere eliminar '%(roomName)s' de %(groupId)s?",
     "Removing a room from the community will also remove it from the community page.": "Eliminar unha sala da comunidade tamén a quitará da páxina da comunidade.",
     "Remove": "Eliminar",
@@ -535,18 +535,18 @@
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "A visibilidade de '%(roomName)s' en %(groupId)s non se puido actualizar.",
     "Visibility in Room List": "Visibilidade na Lista de Salas",
     "Visible to everyone": "Visible para todo o mundo",
-    "Only visible to community members": "Só visible para membros da comunidade",
+    "Only visible to community members": "Só visible para os participantes da comunidade",
     "Filter community rooms": "Filtrar salas da comunidade",
     "Something went wrong when trying to get your communities.": "Algo fallou ao intentar obter as súas comunidades.",
     "You're not currently a member of any communities.": "Ate o momento non é membro de ningunha comunidade.",
     "Unknown Address": "Enderezo descoñecido",
-    "NOTE: Apps are not end-to-end encrypted": "NOTA: As Apps non están cifradas de extremo-a-extremo",
-    "Do you want to load widget from URL:": "Quere cargar o widget da URL:",
+    "NOTE: Apps are not end-to-end encrypted": "NOTA: As Apps non están cifradas de par-a-par",
+    "Do you want to load widget from URL:": "Quere cargar o trebello da URL:",
     "Allow": "Permitir",
-    "Delete Widget": "Eliminar Widget",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Quitando un widget eliminao para todas as usuarias de esta sala. Está segura de querer eliminar este widget?",
-    "Delete widget": "Eliminar widget",
-    "Revoke widget access": "Retirar acceso ao widget",
+    "Delete Widget": "Eliminar trebello",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Quitando un trebello elimínao para todas os usuarios desta sala. Está seguro de querer eliminar este trebello?",
+    "Delete widget": "Eliminar trebello",
+    "Revoke widget access": "Retirar acceso ao trebello",
     "Minimize apps": "Minimizar apps",
     "Edit": "Editar",
     "Create new room": "Crear unha nova sala",
@@ -565,25 +565,25 @@
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s uníronse %(count)s veces",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s uníronse",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s uniuse %(count)s veces",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s uníuse",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s uniuse",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s saíron %(count)s veces",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s saíron",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s saiu %(count)s veces",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s saiu",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s saíu %(count)s veces",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s saio",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s uníronse e saíron %(count)s veces",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s uníronse e saíron",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s uniuse e saiu %(count)s veces",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s uníuse e saiu",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s saíron e voltaron %(count)s veces",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíron e voltaron",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saiu e voltou %(count)s veces",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saiu e voltou",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s uniuse e saio %(count)s veces",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s uniuse e saíu",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s saíron e volveron %(count)s veces",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíron e votaron",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saíu e volveu %(count)s veces",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saíu e volveu",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s rexeitaron convites %(count)s veces",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s rexeitaron os seus convites",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s rexeitou o seu convite %(count)s veces",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s rexeitou o seu convite",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "retiróuselle o convite a %(severalUsers)s %(count)s veces",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "retirouselle o convite a %(severalUsers)s",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "retiróuselle o convite a %(severalUsers)s",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "retiróuselle o convite a %(oneUser)s %(count)s veces",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "retiróuselle o convite a %(oneUser)s",
     "were invited %(count)s times|other": "foron convidados %(count)s veces",
@@ -594,9 +594,9 @@
     "were banned %(count)s times|one": "foron prohibidas",
     "was banned %(count)s times|other": "foi prohibida  %(count)s veces",
     "was banned %(count)s times|one": "foi prohibida",
-    "were unbanned %(count)s times|other": "retirouselle a prohibición %(count)s veces",
-    "were unbanned %(count)s times|one": "retirouselle a prohibición",
-    "was unbanned %(count)s times|other": "retirouselle a prohibición  %(count)s veces",
+    "were unbanned %(count)s times|other": "retiróuselle a prohibición %(count)s veces",
+    "were unbanned %(count)s times|one": "retrouseille a prohibición",
+    "was unbanned %(count)s times|other": "retrouseille a prohibición  %(count)s veces",
     "was unbanned %(count)s times|one": "retiróuselle a prohibición",
     "were kicked %(count)s times|other": "foron expulsadas  %(count)s veces",
     "were kicked %(count)s times|one": "foron expulsadas",
@@ -626,7 +626,7 @@
     "Matrix Room ID": "ID sala Matrix",
     "email address": "enderezo de correo",
     "Try using one of the following valid address types: %(validTypesList)s.": "Intentar utilizar algún dos seguintes tipos de enderezo válidos: %(validTypesList)s.",
-    "You have entered an invalid address.": "Introduxo un enderezo non válido.",
+    "You have entered an invalid address.": "Introduciu un enderezo non válido.",
     "Create a new chat or reuse an existing one": "Crear un novo chat ou reutilizar un xa existente",
     "Start new chat": "Iniciar un novo chat",
     "You already have existing direct chats with this user:": "Xa ten unha conversa directa con esta usuaria:",
@@ -634,10 +634,10 @@
     "Click on the button below to start chatting!": "Pulse non botón inferior para iniciar a conversar!",
     "Start Chatting": "Iniciar a conversa",
     "Confirm Removal": "Confirme a retirada",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Está certa de que quere quitar (eliminar) este evento? Sepa que si elimina un nome de sala ou cambia o asunto, podería desfacer o cambio.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Está certa de que quere quitar (eliminar) este evento? Saiba que si elimina un nome de sala ou cambia o asunto, podería desfacer o cambio.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Os ID de comunidade só poden conter caracteres a-z, 0-9, or '=_-./'",
     "Community IDs cannot not be empty.": "O ID de comunidade non pode quedar baldeiro.",
-    "Something went wrong whilst creating your community": "Algo fallou mentras se creaba a súa comunidade",
+    "Something went wrong whilst creating your community": "Algo fallou mentres se creaba a súa comunidade",
     "Create Community": "Crear comunidade",
     "Community Name": "Nome da comunidade",
     "Example": "Exemplo",
@@ -647,37 +647,37 @@
     "Create Room": "Crear sala",
     "Room name (optional)": "Nome da sala (opcional)",
     "Advanced options": "Axustes avanzados",
-    "Block users on other matrix homeservers from joining this room": "Evitar que usuarias de outros servidores matrix se unan a esta sala",
+    "Block users on other matrix homeservers from joining this room": "Evitar que usuarios doutros servidores matrix se unan a esta sala",
     "This setting cannot be changed later!": "Esta preferencia non se pode cambiar máis tarde!",
     "Unknown error": "Fallo descoñecido",
     "Incorrect password": "Contrasinal incorrecto",
     "Deactivate Account": "Desactivar conta",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Non se pode determinar si o enderezo ao que foi enviado este convite coincide con un dos asociados a súa conta.",
-    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Para verificar que se pode confiar en este dispositivo, contacte co seu dono utilizando algún outro medio (ex. en persoa ou chamada de teléfono) e pregúntelle si a chave que ven nos Axustes de Usuaria do se dispositivo coincide coa chave inferior:",
+    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Para verificar que se pode confiar neste dispositivo, contacte co seu dono utilizando algún outro medio (ex. en persoa ou chamada de teléfono) e pregúntelle se a clave que ven nos axustes de usuario do se dispositivo coincide coa clave inferior:",
     "Device name": "Nome do dispositivo",
     "Device key": "Chave do dispositivo",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si concorda, pulse o botón verificar. Si non, entón alguén está interceptando este dispositivo e probablemente vostede desexe pulsar o botón lista negra.",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Se concorda, pulse o botón verificar. Si non, entón alguén está interceptando este dispositivo e probablemente vostede desexe pulsar o botón lista negra.",
     "In future this verification process will be more sophisticated.": "No futuro este proceso de verificación será máis sofisticado.",
     "Verify device": "Verificar dispositivo",
     "I verify that the keys match": "Certifico que coinciden as chaves",
     "An error has occurred.": "Algo fallou.",
     "OK": "OK",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Engadeu un novo dispositivo '%(displayName)s', que está a solicitar as chaves de cifrado.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Engadiu un novo dispositivo '%(displayName)s', que está a solicitar as chaves de cifrado.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "O seu dispositivo non verificado '%(displayName)s' está solicitando chaves de cifrado.",
     "Start verification": "Iniciar verificación",
-    "Share without verifying": "Compartir sin verificar",
+    "Share without verifying": "Compartir sen verificar",
     "Ignore request": "Ignorar petición",
     "Loading device info...": "Cargando información do dispositivo...",
     "Encryption key request": "Petición de chave de cifrado",
     "Unable to restore session": "Non se puido restaurar a sesión",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriormente utilizou unha versión máis recente de Riot, a súa sesión podería non ser compatible con esta versión. Peche esta ventá e volte a versión máis recente.",
-    "Invalid Email Address": "Enderezo de email non válido",
-    "This doesn't appear to be a valid email address": "Este non semella ser un enderezo de email válido",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriormente utilizou unha versión máis recente de Riot, a súa sesión podería non ser compatible con esta versión. Peche esta ventá e volva a versión máis recente.",
+    "Invalid Email Address": "Enderezo de correo non válido",
+    "This doesn't appear to be a valid email address": "Este non semella ser un enderezo de correo válido",
     "Verification Pending": "Verificación pendente",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor comprobe o seu email e pulse na ligazón que contén. Unha vez feito, pulse continuar.",
-    "Unable to add email address": "Non se puido engadir enderezo de email",
-    "Unable to verify email address.": "Non se puido verificar enderezo de email.",
-    "This will allow you to reset your password and receive notifications.": "Esto permitiralle restablecer o seu contrasinal e recibir notificacións.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Comprobe o seu correo electrónico e pulse na ligazón que contén. Unha vez feito iso prema continuar.",
+    "Unable to add email address": "Non se puido engadir enderezo de correo",
+    "Unable to verify email address.": "Non se puido verificar enderezo de correo electrónico.",
+    "This will allow you to reset your password and receive notifications.": "Isto permitiralle restablecer o seu contrasinal e recibir notificacións.",
     "Skip": "Saltar",
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Os nomes de usuaria só poden conter letras, números, puntos e guión alto e baixo.",
     "Username not available": "Nome de usuaria non dispoñible",
@@ -686,8 +686,8 @@
     "Username available": "Nome de usuaria dispoñible",
     "To get started, please pick a username!": "Para comezar, escolla un nome de usuaria!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será o nome da súa conta no <span></span> servidor, ou pode escoller un <a>servidor diferente</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Si xa ten unha conta Matrix entón pode <a>conectarse</a>.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "En este momento está por na lista negra os dispositivos non verificados; para enviar mensaxes a eses dispositivos debe verificalos.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Se xa ten unha conta Matrix entón pode <a>conectarse</a>.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Neste momento está por na lista negra os dispositivos non verificados; para enviar mensaxes a eses dispositivos debe verificalos.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Recomendámoslle que vaia ao proceso de verificación para cada dispositivo para confirmar que pertencen ao seu dono lexítimos, pero se o prefire pode enviar a mensaxe sen ter verificado.",
     "Room contains unknown devices": "A sala contén dispositivos descoñecidos",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contén dispositivos que vostede non vira antes.",
@@ -699,22 +699,22 @@
     "Name": "Nome",
     "Topic": "Asunto",
     "Make this room private": "Facer que esta sala sexa privada",
-    "Share message history with new users": "Compartir o histórico de mensaxes coas novas usuarias",
-    "Encrypt room": "Cifrar sala",
+    "Share message history with new users": "Compartir o histórico de mensaxes cos novos usuarios",
+    "Encrypt room": "Cifrar a sala",
     "You must <a>register</a> to use this functionality": "Debe <a>rexistrarse</a> para utilizar esta función",
     "You must join the room to see its files": "Debe unirse a sala para ver os seus ficheiros",
-    "There are no visible files in this room": "Non hai ficheiros visibles en esta sala",
+    "There are no visible files in this room": "Non hai ficheiros visibles nesta sala",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML para a páxina da súa comunidade</h1>\n<p>\n    Utilice a descrición longa para presentar novos membros a comunidade, ou publicar algunha  <a href=\"foo\">ligazón</a> importante\n   \n</p>\n<p>\n    Tamén pode utilizar etiquetas 'img'\n</p>\n",
     "Add rooms to the community summary": "Engadir salas ao resumo da comunidade",
-    "Which rooms would you like to add to this summary?": "Qué salas desexa engadir a este resumo?",
+    "Which rooms would you like to add to this summary?": "Que salas desexa engadir a este resumo?",
     "Add to summary": "Engadir ao resumo",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Algo fallou ao engadir estas salas ao resumo de %(groupId)s:",
     "Add a Room": "Engadir unha sala",
     "Failed to remove the room from the summary of %(groupId)s": "Algo fallou ao quitar a sala do resumo de %(groupId)s",
     "The room '%(roomName)s' could not be removed from the summary.": "A sala '%(roomName)s' non se puido eliminar do resumo.",
-    "Add users to the community summary": "Engadir usuarias ao resumo da comunidade",
-    "Who would you like to add to this summary?": "A quén desexa engadir a este resumo?",
-    "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ao engadir as seguintes usuarias ao resumo de %(groupId)s:",
+    "Add users to the community summary": "Engadir usuarios ao resumo da comunidade",
+    "Who would you like to add to this summary?": "A quen desexa engadir a este resumo?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ao engadir aos seguintes usuarios ao resumo de %(groupId)s:",
     "Add a User": "Engadir unha usuaria",
     "Failed to remove a user from the summary of %(groupId)s": "Algo fallou ao eliminar a usuaria do resumo de %(groupId)s",
     "The user '%(displayName)s' could not be removed from the summary.": "A usuaria '%(displayName)s' non se puido eliminar do resumo.",
@@ -726,14 +726,14 @@
     "Leave %(groupName)s?": "Deixar %(groupName)s?",
     "Leave": "Saír",
     "Community Settings": "Axustes da comunidade",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas son mostradas aos membros da comunidade na páxina da comunidade. Os membros da comunidade poden unirse as salas pulsando en elas.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas móstranselle aos membros da comunidade na páxina da comunidade.Os participantes da comunidade poden unirse ás salas premendo nelas.",
     "Add rooms to this community": "Engadir salas a esta comunidade",
     "Featured Rooms:": "Salas destacadas:",
-    "Featured Users:": "Usuarias destacadas:",
+    "Featured Users:": "Usuarios destacados:",
     "%(inviter)s has invited you to join this community": "%(inviter)s convidouna a unirse a esta comunidade",
     "You are an administrator of this community": "Vostede administra esta comunidade",
-    "You are a member of this community": "Vostede é membro de esta comunidade",
-    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "A súa comunidade non ten unha Descrición Longa, unha páxina HTML para mostrar aos membros.<br />Pulse aquí para abrir os axustes e publicar unha!",
+    "You are a member of this community": "É membro desta comunidade",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "A súa comunidade non ten unha descrición longa, ou unha páxina HTML que lle mostrar aos seus participantes.<br />Pulse aquí para abrir os axustes e publicar unha!",
     "Long Description (HTML)": "Descrición longa (HTML)",
     "Description": "Descrición",
     "Community %(groupId)s not found": "Non se atopou a comunidade %(groupId)s",
@@ -749,13 +749,13 @@
     "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos",
     "Logout": "Desconectar",
     "Your Communities": "As súas Comunidades",
-    "Error whilst fetching joined communities": "Fallo mentras se obtiñas as comunidades unidas",
+    "Error whilst fetching joined communities": "Fallo mentres se obtiñas as comunidades unidas",
     "Create a new community": "Crear unha nova comunidade",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuaria/os e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.",
     "Join an existing community": "Unirse a unha comunidade existente",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como <i>+exemplo:matrix.org</i>.",
     "You have no visible notifications": "Non ten notificacións visibles",
-    "Scroll to bottom of page": "Desplácese ate o final da páxina",
+    "Scroll to bottom of page": "Desprácese ate o final da páxina",
     "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostrar dispositivos</showDevicesText>, <sendAnywayText>enviar igualmente</sendAnywayText> ou <cancelText>cancelar</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Algunha das súas mensaxes non foron enviadas.",
@@ -764,7 +764,7 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensaxe</resendText> ou <cancelText>cancelar mensaxe</cancelText> agora.",
     "Warning": "Aviso",
     "Connectivity to the server has been lost.": "Perdeuse a conexión ao servidor.",
-    "Sent messages will be stored until your connection has returned.": "As mensaxes enviadas gardaránse ate que retome a conexión.",
+    "Sent messages will be stored until your connection has returned.": "As mensaxes enviadas gardaranse ate que retome a conexión.",
     "%(count)s new messages|other": "%(count)s novas mensaxes",
     "%(count)s new messages|one": "%(count)s nova mensaxe",
     "Active call": "Chamada activa",
@@ -785,19 +785,19 @@
     "Click to mute video": "Pulse para acalar video",
     "Click to unmute audio": "Pulse para escoitar audio",
     "Click to mute audio": "Pulse para acalar audio",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial de esta sala, pero vostede non ten permiso para ver a mensaxe en cuestión.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial de esta sala, pero non se puido atopar.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial desta sala, pero non ten permiso para ver a mensaxe en cuestión.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial desta sala, pero non se puido atopar.",
     "Failed to load timeline position": "Fallo ao cargar posición da liña temporal",
     "Uploading %(filename)s and %(count)s others|other": "Subindo %(filename)s e %(count)s máis",
     "Uploading %(filename)s and %(count)s others|zero": "Subindo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Subindo %(filename)s e %(count)s máis",
     "Light theme": "Decorado claro",
-    "Dark theme": "Decorado oscuro",
+    "Dark theme": "Decorado escuro",
     "Status.im theme": "Decorado Status.im",
     "Can't load user settings": "Non se puideron cargar os axustes de usuaria",
     "Server may be unavailable or overloaded": "O servidor podería non está dispoñible ou sobrecargado",
     "Sign out": "Desconectar",
-    "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.": "Por seguridade, ao desconectarse borrará todas as chaves de cifrado extremo-a-extremo en este navegador. Si quere poder descifrar o historial da conversa en futuras sesións en Riot, por favor exporte as chaves da sala e gárdeas en lugar seguro.",
+    "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.": "Por seguridade, ao desconectarse borrará todas as chaves de cifrado par-a-par ste navegador. Se quere poder descifrar o historial da conversa en futuras sesións en Riot, por favor exporte as chaves da sala e gárdeas en lugar seguro.",
     "Failed to change password. Is your password correct?": "Fallo ao cambiar o contrasinal. É correcto o contrasinal?",
     "Success": "Parabéns",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "O seu contrasinal cambiouse correctamente. Non recibirá notificacións tipo push en outros dispositivos ate que se conecte novamente en eles",
@@ -807,17 +807,17 @@
     "Refer a friend to Riot:": "Convide a un amigo a Riot:",
     "Interface Language": "Idioma da Interface",
     "User Interface": "Interface de usuaria",
-    "Autocomplete Delay (ms):": "Retraso no autocompletado (ms):",
+    "Autocomplete Delay (ms):": "Atraso no autocompletado (ms):",
     "<not supported>": "<non soportado>",
     "Import E2E room keys": "Importar chaves E2E da sala",
     "Cryptography": "Criptografía",
     "Device ID:": "ID de dispositivo:",
     "Device key:": "Chave do dispositivo:",
-    "Ignored Users": "Usuarias ignoradas",
+    "Ignored Users": "Usuarios ignorados",
     "Analytics": "Analytics",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot recolle información analítica anónima para permitirnos mellorar o aplicativo.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A intimidade impórtanos, así que non recollemos información personal ou identificable nos datos dos nosos análises.",
-    "Learn more about how we use analytics.": "Saber máis sobre cómo utilizamos analytics.",
+    "Learn more about how we use analytics.": "Saber máis sobre como utilizamos analytics.",
     "Labs": "Labs",
     "These are experimental features that may break in unexpected ways": "Estas son características experimentais que poderían dar lugar a fallos non agardados",
     "Use with caution": "Utilice con precaución",
@@ -828,24 +828,24 @@
     "Check for update": "Comprobar actualización",
     "Reject all %(invitedRooms)s invites": "Rexeitar todos os %(invitedRooms)s convites",
     "Bulk Options": "Opcións en bloque",
-    "Desktop specific": "Específicas de escritorio",
-    "Start automatically after system login": "Iniciar automáticamente  despóis de iniciar sesión",
+    "Desktop specific": "Configuracións de escritorio",
+    "Start automatically after system login": "Iniciar automaticamente  despois de iniciar sesión",
     "No media permissions": "Sen permisos de medios",
     "You may need to manually permit Riot to access your microphone/webcam": "Igual ten que permitir manualmente a Riot acceder ao seus micrófono e cámara",
     "Missing Media Permissions, click here to request.": "Faltan permisos de medios, pulse aquí para solicitalos.",
     "No Microphones detected": "Non se detectaron micrófonos",
     "No Webcams detected": "Non se detectaron cámaras",
-    "Default Device": "Dispositivo por omisión",
+    "Default Device": "Dispositivo por defecto",
     "Microphone": "Micrófono",
     "Camera": "Cámara",
     "VoIP": "VoIP",
-    "Email": "Correo-e",
-    "Add email address": "Engadir enderezo correo-e",
+    "Email": "Correo electrónico",
+    "Add email address": "Engadir enderezo correo electrónico",
     "Notifications": "Notificacións",
     "Profile": "Perfil",
     "Display name": "Nome mostrado",
     "Account": "Conta",
-    "To return to your account in future you need to set a password": "Estableza un contrasinal para voltar a súa conta con posterioridade",
+    "To return to your account in future you need to set a password": "Estableza un contrasinal para volver a súa conta con posterioridade",
     "Logged in as:": "Conectada como:",
     "Access Token:": "Testemuño de acceso:",
     "click to reveal": "pulse para revelar",
@@ -854,31 +854,31 @@
     "matrix-react-sdk version:": "versión matrix-react-sdk:",
     "riot-web version:": "versión riot-web:",
     "olm version:": "versión olm:",
-    "Failed to send email": "Fallo ao enviar correo-e",
-    "The email address linked to your account must be entered.": "Debe introducir o correo-e ligado a súa conta.",
+    "Failed to send email": "Fallo ao enviar correo electrónico",
+    "The email address linked to your account must be entered.": "Debe introducir o correo electrónico ligado a súa conta.",
     "A new password must be entered.": "Debe introducir un novo contrasinal.",
     "New passwords must match each other.": "Os novos contrasinais deben ser coincidentes.",
-    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Detectáronse datos de una versión anterior de Riot. Esto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentras utilizaba a versión anterior poderían non ser descifrables en esta versión. Esto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Si ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.",
-    "Resetting 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.": "O restablecemento do contrasinal restablecerá tamén as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo o historial de chat cifrado non lexible, a menos que primeiro exporte as chaves da sala e as reimporte posteriormente. No futuro melloraremos esto.",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un email a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.",
-    "I have verified my email address": "Validei o meu enderezo de correo-e",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Detectáronse datos de una versión anterior de Riot. Isto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentres utilizaba a versión anterior poderían non ser descifrables en esta versión. Isto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Se ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.",
+    "Resetting 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.": "O restablecemento do contrasinal restablecerá tamén as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo o historial de chat cifrado non lexible, a menos que primeiro exporte as chaves da sala e as reimporte posteriormente. No futuro melloraremos isto.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un correo a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.",
+    "I have verified my email address": "Validei o meu enderezo de correo electrónico",
     "Your password has been reset": "Restableceuse o seu contrasinal",
     "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": "Foi desconectado de todos os seus dispositivos e xa non recibirá notificacións push. Para reactivar as notificacións, conéctese de novo en cada dispositivo",
-    "Return to login screen": "Voltar a pantalla de conexión",
+    "Return to login screen": "Volver a pantalla de conexión",
     "To reset your password, enter the email address linked to your account": "Para restablecer o seu contrasinal, introduza o enderezo de correo electrónico ligado a súa conta",
     "New password": "Novo contrasinal",
     "Confirm your new password": "Confirme o seu novo contrasinal",
-    "Send Reset Email": "Enviar correo-e de restablecemento",
+    "Send Reset Email": "Enviar correo electrónico de restablecemento",
     "Create an account": "Crear unha conta",
-    "This Home Server does not support login using email address.": "Este servidor non soporta a conexión utilizando un enderezo de correo-e.",
+    "This Home Server does not support login using email address.": "Este servidor non soporta a conexión utilizando un enderezo de correo electrónico.",
     "Incorrect username and/or password.": "Nome de usuaria ou contrasinal non válidos.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Teña en conta que se está a conectar ao servidor %(hs)s, non a matrix.org.",
-    "Guest access is disabled on this Home Server.": "O acceso de convidados está deshabilitado en este servidor de inicio.",
+    "Guest access is disabled on this Home Server.": "O acceso de convidados está desactivado neste servidor de inicio.",
     "The phone number entered looks invalid": "O número de teléfono introducido non semella ser válido",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor non ofrece ningún sistema de conexión que soporte este cliente.",
     "Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.",
     "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>.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou <a>active scripts non seguros</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.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de o <a>certificado SSL do servidor</a> é de confianza, e que ningún engadido do navegador está bloqueando as peticións.",
+    "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.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de que o<a>certificado SSL do servidor</a> sexa de confianza, e que ningún engadido do navegador estea bloqueando as peticións.",
     "Sign in to get started": "Conéctese para iniciar",
     "Failed to fetch avatar URL": "Fallo ao obter o URL do avatar",
     "Set a display name:": "Establecer nome público:",
@@ -887,7 +887,7 @@
     "Missing password.": "Falta contrasinal.",
     "Passwords don't match.": "Non coinciden os contrasinais.",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Contrasinal demasiado curto (min %(MIN_PASSWORD_LENGTH)s).",
-    "This doesn't look like a valid email address.": "Non semella ser un enderezo de correo-e válido.",
+    "This doesn't look like a valid email address.": "Non semella ser un enderezo de correo electrónico válido.",
     "This doesn't look like a valid phone number.": "Non semella ser un número de teléfono válido.",
     "You need to enter a user name.": "É preciso que introduza un nome de usuaria.",
     "An unknown error occurred.": "Aconteceu un erro descoñecido.",
@@ -910,8 +910,8 @@
     "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
     "Emoji": "Emoji",
     "Notify the whole room": "Notificar a toda a sala",
-    "Room Notification": "Notificación da Sala",
-    "Users": "Usuarias",
+    "Room Notification": "Notificación da sala",
+    "Users": "Usuarios",
     "unknown device": "dispositivo descoñecido",
     "NOT verified": "Non validado",
     "verified": "validado",
@@ -931,28 +931,28 @@
     "Passphrases must match": "As frases de paso deben coincidir",
     "Passphrase must not be empty": "A frase de paso non pode quedar baldeira",
     "Export room keys": "Exportar chaves da sala",
-    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Este proceso permítelle exportar a un ficheiro local as chaves para as mensaxes que recibeu en salas cifradas. Posteriormente permitiralle importar as chaves en outro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle,  debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a misma frase de paso.",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Este proceso permítelle exportar a un ficheiro local as chaves para as mensaxes que recibiu en salas cifradas. Posteriormente permitiralle importar as chaves en outro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle, debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a mesma frase de paso.",
     "Enter passphrase": "Introduza a frase de paso",
     "Confirm passphrase": "Confirme a frase de paso",
     "Export": "Exportar",
     "Import room keys": "Importar chaves de sala",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este proceso permítelle importar chaves de cifrado que vostede exportou de outro cliente Matrix. Así poderá descifrar calquer mensaxe que o outro cliente puidese cifrar.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este proceso permítelle importar chaves de cifrado que vostede exportou de outro cliente Matrix. Así poderá descifrar calquera mensaxe que o outro cliente puidese cifrar.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "O ficheiro exportado estará protexido con unha frase de paso. Debe introducir aquí esa frase de paso para descifrar o ficheiro.",
     "File to import": "Ficheiro a importar",
     "Import": "Importar",
     "The information being sent to us to help make Riot.im better includes:": "A información enviada a Riot.im para axudarnos a mellorar inclúe:",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Si esta páxina inclúe información identificable como ID de grupo, usuario ou sala, estes datos son eliminados antes de ser enviados ao servidor.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se esta páxina inclúe información identificable como ID de grupo, usuario ou sala, estes datos son eliminados antes de ser enviados ao servidor.",
     "The platform you're on": "A plataforma na que está",
     "The version of Riot.im": "A versión de Riot.im",
-    "Whether or not you're logged in (we don't record your user name)": "Si está ou non conectada (non gardamos o nome de usuaria)",
+    "Whether or not you're logged in (we don't record your user name)": "Se está ou non conectado/a (non gardamos os nomes de usuarios)",
     "Your language of choice": "A súa preferencia de idioma",
-    "Which officially provided instance you are using, if any": "Qué instancia oficial está a utilizar, si algunha",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si utiliza o modo Richtext ou non do Editor Rich Text",
+    "Which officially provided instance you are using, if any": "Se a houbese, que instancia oficial está a utilizar",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se utiliza o modo Richtext ou non do editor de texto enriquecido",
     "Your homeserver's URL": "O URL do seu servidor de inicio",
     "Your identity server's URL": "O URL da súa identidade no servidor",
     "<a>In reply to</a> <pill>": "<a>En resposta a</a> <pill>",
-    "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá voltar a ela sin un convite.",
+    "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá volver a ela sen un convite.",
     "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambiou o seu nome mostrado a %(displayName)s.",
     "Clear filter": "Quitar filtro",
@@ -960,57 +960,57 @@
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
     "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
     "Failed to lookup current room": "Fallo ao bloquear a sala actual",
-    "Disable Community Filter Panel": "Deshabilitar o panel de filtro de comunidades",
+    "Disable Community Filter Panel": "Desactivar o panel de filtro de comunidades",
     "Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave -  por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.",
-    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Si rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si os seus outros dispositivos non teñen as chaves para est mensaxe non poderán descifrala.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Se rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se os seus outros dispositivos non teñen as chaves para este mensaxe non poderán descifrala.",
     "Key request sent.": "Petición de chave enviada.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Voltar a pedir chaves de cifrado</requestLink> desde os outros dispositivos.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Volver a pedir chaves de cifrado</requestLink> desde os outros dispositivos.",
     "%(user)s is a %(userRole)s": "%(user)s é  %(userRole)s",
     "Flair": "Aura",
     "Showing flair for these communities:": "Mostrar o aura para estas comunidades:",
-    "Flair will appear if enabled in room settings": "O Aura aparecerá si está habilitada nas preferencias da sala",
+    "Flair will appear if enabled in room settings": "O Aura aparecerá si está activado nas preferencias da sala",
     "Flair will not appear": "O Aura non aparecerá",
     "Display your community flair in rooms configured to show it.": "Mostrar o aura da súa comunidade en salas configuradas para mostralo.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con Riot.im!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquer moemento para ver só salas e xente asociada a esa comunidade.",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
     "Deops user with given id": "Degradar usuaria co id dado",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s",
     "Code": "Código",
     "Unable to join community": "Non se puido unir a comunidade",
     "Unable to leave community": "Non se puido deixar a comunidade",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade <bold1>name</bold1> e <bold2>avatar</bold2) poderían non ser vistos por outras usuarias ate dentro de 30 minutos.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade <bold1>name</bold1> e <bold2>avatar</bold2> poida que non os vexan outros usuarios ate dentro de 30 minutos.",
     "Join this community": "Únase a esta comunidade",
     "Leave this community": "Deixar esta comunidade",
     "Debug Logs Submission": "Envío de rexistro de depuración",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras personas. Non conteñen mensaxes.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras persoas. Non conteñen mensaxes.",
     "Submit debug logs": "Enviar informes de depuración",
-    "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de Desenvolvedoras",
-    "Stickerpack": "Peganitas",
-    "You don't currently have any stickerpacks enabled": "Non ten paquetes de pegatinas habilitados",
-    "Add a stickerpack": "Engadir un paquete de pegatinas",
-    "Hide Stickers": "Agochar pegatinas",
-    "Show Stickers": "Mostrar pegatinas",
-    "Who can join this community?": "Quén pode unirse a esta comunidade?",
+    "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de desenvolvemento",
+    "Stickerpack": "Iconas",
+    "You don't currently have any stickerpacks enabled": "Non ten paquetes de iconas activados",
+    "Add a stickerpack": "Engadir un paquete de iconas",
+    "Hide Stickers": "Agochar iconas",
+    "Show Stickers": "Mostrar iconas",
+    "Who can join this community?": "Quen pode unirse a esta comunidade?",
     "Everyone": "Todo o mundo",
     "Fetching third party location failed": "Fallo ao obter a localización de terceiros",
     "A new version of Riot is available.": "Está dispoñible unha nova versión de Riot.",
     "Couldn't load home page": "Non se cargou a páxina de inicio",
     "Send Account Data": "Enviar datos da conta",
-    "All notifications are currently disabled for all targets.": "Todas as notificacións están deshabilitadas para todos os destinos.",
+    "All notifications are currently disabled for all targets.": "Todas as notificacións están desactivadas para todos os destinos.",
     "Uploading report": "Informe da subida",
     "Sunday": "Domingo",
-    "Notification targets": "Obxetivos das notificacións",
+    "Notification targets": "Obxectivos das notificacións",
     "Today": "Hoxe",
     "Failed to get protocol list from Home Server": "Fallo ao obter a lista de protocolo desde o servidor",
     "You are not receiving desktop notifications": "Non está a recibir notificacións de escritorio",
     "Friday": "Venres",
     "Update": "Actualizar",
-    "What's New": "Qué hai de novo",
+    "What's New": "Que hai de novo",
     "Add an email address above to configure email notifications": "Engada un enderezo de correo electrónico para configurar as notificacións",
     "Expand panel": "Expandir panel",
     "On": "On",
-    "%(count)s Members|other": "%(count)s Membros",
+    "%(count)s Members|other": "%(count)s participantes",
     "Filter room names": "Filtrar nomes de sala",
     "Changelog": "Rexistro de cambios",
     "Waiting for response from server": "Agardando pola resposta do servidor",
@@ -1018,14 +1018,14 @@
     "Advanced notification settings": "Axustes avanzados de notificación",
     "Failed to send logs: ": "Fallo ao enviar os informes: ",
     "delete the alias.": "borrar alcume.",
-    "To return to your account in future you need to <u>set a password</u>": "Para voltar a súa conta no futuro debe <u>establecer un contrasinal>/u>",
+    "To return to your account in future you need to <u>set a password</u>": "Para volver a súa conta no futuro debe <u>establecer un contrasinal>/u>",
     "Forget": "Esquecer",
     "#example": "#exemplo",
     "Hide panel": "Agochar panel",
     "You cannot delete this image. (%(code)s)": "Non pode eliminar esta imaxe. (%(code)s)",
     "Cancel Sending": "Cancelar o envío",
     "This Room": "Esta sala",
-    "The Home Server may be too old to support third party networks": "O servidor de inicio podería ser demasiando antigo como para aceptar redes de terceiros",
+    "The Home Server may be too old to support third party networks": "O servidor de inicio podería ser demasiado antigo como para aceptar redes de terceiros",
     "Noisy": "Ruidoso",
     "Error saving email notification preferences": "Fallo ao cargar os axustes de notificacións",
     "Messages containing my display name": "Mensaxes que conteñen o meu nome público",
@@ -1035,25 +1035,25 @@
     "Failed to update keywords": "Fallo ao actualizar as palabras chave",
     "Notes:": "Notas:",
     "remove %(name)s from the directory.": "eliminar %(name)s do directorio.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificacións das reglas de seguimento das seguintes palabras que non se mostrarán aquí:",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificacións das regras de seguimento das seguintes palabras que non se mostrarán aquí:",
     "<safariLink>Safari</safariLink> and <operaLink>Opera</operaLink> work too.": "<safariLink>Safari</safariLink> e <operaLink>Opera</operaLink> tamén funcionan.",
     "Please set a password!": "Por favor estableza un contrasinal!",
     "You have successfully set a password!": "Mudou con éxito o seu contrasinal!",
-    "An error occurred whilst saving your email notification preferences.": "Algo fallou mentras se gardaban as súas preferencias de notificaicón.",
+    "An error occurred whilst saving your email notification preferences.": "Algo fallou mentres se gardaban as súas preferencias de notificación.",
     "Explore Room State": "Explorar estado da sala",
     "Search for a room": "Buscar unha sala",
     "Source URL": "URL fonte",
     "Messages sent by bot": "Mensaxes enviadas por bot",
     "Filter results": "Filtrar resultados",
-    "Members": "Membresía",
+    "Members": "Participantes",
     "No update available.": "Sen actualizacións.",
-    "Resend": "Voltar a enviar",
+    "Resend": "Volver a enviar",
     "Files": "Ficheiros",
     "Collecting app version information": "Obtendo información sobre a versión da app",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminar o alcume da sala %(alias)s e borrar %(name)s do directorio?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto permitiralle voltar a súa conta tras desconectarse, e conectarse en outros dispositivos.",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Isto permitiralle volver a súa conta tras desconectarse, e conectarse en outros dispositivos.",
     "Keywords": "Palabras chave",
-    "Enable notifications for this account": "Habilitar notificacións para esta conta",
+    "Enable notifications for this account": "Activar notificacións para esta conta",
     "Directory": "Directorio",
     "Invite to this community": "Convidar a esta comunidade",
     "Failed to get public room list": "Fallo ao obter a lista de salas públicas",
@@ -1063,22 +1063,22 @@
     "Enter keywords separated by a comma:": "Introduza palabras chave separadas por vírgulas:",
     "Search…": "Buscar…",
     "Remove %(name)s from the directory?": "Eliminar %(name)s do directorio?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentales no seu navegador actual.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentais no seu navegador actual.",
     "Developer Tools": "Ferramentas para desenvolver",
     "Preparing to send logs": "Preparándose para enviar informe",
-    "Enable desktop notifications": "Habilitar notificacións de escritorio",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre, sempre poderá poñer un enderezo de correo nos axustes de usuario si cambia de idea.",
+    "Enable desktop notifications": "Activar as notificacións de escritorio",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre que sempre poderá poñer un enderezo de correo nos axustes de usuario se cambiase de idea.",
     "Explore Account Data": "Explorar datos da conta",
     "All messages (noisy)": "Todas as mensaxes (alto)",
     "Saturday": "Sábado",
-    "I understand the risks and wish to continue": "Entendos os riscos e desexo continuar",
+    "I understand the risks and wish to continue": "Entendo os riscos e desexo continuar",
     "Direct Chat": "Chat directo",
     "The server may be unavailable or overloaded": "O servidor podería non estar dispoñible ou sobrecargado",
     "Reject": "Rexeitar",
     "Failed to set Direct Message status of room": "Fallo ao establecer o estado Mensaxe Directa da sala",
     "Monday": "Luns",
     "Remove from Directory": "Eliminar do directorio",
-    "Enable them now": "Habilitalas agora",
+    "Enable them now": "Activalos agora",
     "Messages containing my user name": "Mensaxes que conteñen o meu nome de usuaria",
     "Toolbox": "Ferramentas",
     "Collecting logs": "Obtendo rexistros",
@@ -1097,10 +1097,10 @@
     "Downloading update...": "Descargando actualización...",
     "You have successfully set a password and an email address!": "Estableceu correctamente un contrasinal e enderezo de correo!",
     "Failed to send custom event.": "Fallo ao enviar evento personalizado.",
-    "What's new?": "Qué hai de novo?",
-    "Notify me for anything else": "Notificarme todo o demáis",
+    "What's new?": "Que hai de novo?",
+    "Notify me for anything else": "Notificarme todo o demais",
     "When I'm invited to a room": "Cando son convidado a unha sala",
-    "Can't update user notification settings": "Non se poden actualizar os axutes de notificación",
+    "Can't update user notification settings": "Non se poden actualizar os axustes de notificación",
     "Notify for all other messages/rooms": "Notificar para todas as outras mensaxes/salas",
     "Unable to look up room ID from server": "Non se puido atopar o ID da sala do servidor",
     "Couldn't find a matching Matrix room": "Non coincide con ningunha sala de Matrix",
@@ -1112,8 +1112,8 @@
     "Back": "Atrás",
     "Reply": "Resposta",
     "Show message in desktop notification": "Mostrar mensaxe nas notificacións de escritorio",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Os informes de depuración conteñen datos de utilización do aplicativo como o seu nome de usuaria, os IDs ou alcumes de salas e grupos que vostede visitou e os nomes de usuaria de outras usuarias. Non conteñen mensaxes.",
-    "Unhide Preview": "Desagochar a vista previsa",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Os informes de depuración conteñen datos de utilización do aplicativo como o seu nome de usuario, os IDs ou alcumes de salas e grupos que vostede visitou e os nomes de usuarios doutras usuarias. Non conteñen mensaxes.",
+    "Unhide Preview": "Desagochar a vista previa",
     "Unable to join network": "Non se puido conectar a rede",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurase nun cliente diferente de Riot. Non pode establecelos desde Riot pero aínda así aplicaranse",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Desculpe, o seu navegador <b>non pode</b> executar Riot.",
@@ -1123,40 +1123,40 @@
     "Error encountered (%(errorDetail)s).": "Houbo un erro (%(errorDetail)s).",
     "Login": "Conectar",
     "Low Priority": "Baixa prioridade",
-    "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións",
+    "Unable to fetch notification target list": "Non se puido procesar a lista de obxectivo de notificacións",
     "Set Password": "Establecer contrasinal",
-    "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web",
+    "Enable audible notifications in web client": "Activar as notificacións audibles no cliente web",
     "Off": "Off",
-    "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede",
+    "Riot does not know how to join a room on this network": "Riot non sabe como conectar cunha sala nesta rede",
     "Mentions only": "Só mencións",
-    "You can now return to your account after signing out, and sign in on other devices.": "Pode voltar a súa contra tras desconectarse, e conectarse en outros dispositivos.",
-    "Enable email notifications": "Habilitar notificacións de correo",
+    "You can now return to your account after signing out, and sign in on other devices.": "Pode volver a súa contra tras desconectarse, e conectarse en outros dispositivos.",
+    "Enable email notifications": "Activar notificacións de correo",
     "Event Type": "Tipo de evento",
     "Download this file": "Descargue este ficheiro",
     "Pin Message": "Fixar mensaxe",
     "Failed to change settings": "Fallo ao cambiar os axustes",
     "View Community": "Ver Comunidade",
-    "%(count)s Members|one": "%(count)s Membro",
+    "%(count)s Members|one": "%(count)s participante",
     "Event sent!": "Evento enviado!",
     "View Source": "Ver fonte",
     "Event Content": "Contido do evento",
     "Thank you!": "Grazas!",
     "Collapse panel": "Agochar panel",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Co seu navegador actual a apareciencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Co seu navegador actual a aparencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!",
     "Checking for an update...": "Comprobando as actualizacións...",
     "There are advanced notifications which are not shown here": "Existen notificacións avanzadas que non se mostran aquí",
-    "Every page you use in the app": "Cada páxina que vostede utiliza no aplicativo",
-    "e.g. <CurrentPageURL>": "ex. <CurrentPageURL>",
-    "Your User Agent": "User Agent",
+    "Every page you use in the app": "Cada páxina que use na aplicación",
+    "e.g. <CurrentPageURL>": "p.ex. <CurrentPageURL>",
+    "Your User Agent": "Axente de usuario",
     "Your device resolution": "Resolución do dispositivo",
-    "Missing roomId.": "Falta o id da sala.",
+    "Missing roomId.": "Falta o ID da sala.",
     "Always show encryption icons": "Mostra sempre iconas de cifrado",
-    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "En este intre non é posible respostar con un ficheiro así que este será enviado sin ser considerado resposta.",
-    "Unable to reply": "Non puido respostar",
-    "At this time it is not possible to reply with an emote.": "En este intre non é posible respostar con un emote.",
-    "Popout widget": "Widget emerxente",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Neste intre non é posible responder con un ficheiro así que este será enviado sen ser considerado resposta.",
+    "Unable to reply": "Non puido responder",
+    "At this time it is not possible to reply with an emote.": "Neste intre non é posible responder con un emote.",
+    "Popout widget": "trebello emerxente",
     "Picture": "Imaxe",
-    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Non se cargou o evento ao que respostaba, ou non existe ou non ten permiso para velo.",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Non se cargou o evento ao que respondía, ou non existe ou non ten permiso para velo.",
     "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Os fallos de Riot séguense en GitHub: <a>crear un informe en GitHub</a>.",
     "Log out and remove encryption keys?": "Desconectar e eliminar as chaves de cifrado?",
     "Send Logs": "Enviar informes",
@@ -1165,9 +1165,9 @@
     "We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarao e non poderá ler o historial cifrado da conversa.",
     "Collapse Reply Thread": "Comprimir o fío de respostas",
-    "e.g. %(exampleValue)s": "p.ex.%(exampleValue)s",
+    "e.g. %(exampleValue)s": "p.ex. %(exampleValue)s",
     "Send analytics data": "Enviar datos de análises",
-    "Enable widget screenshots on supported widgets": "Activar as capturas de widgets para aqueles que as permiten",
+    "Enable widget screenshots on supported widgets": "Activar as capturas de trebellos para aqueles que as permiten",
     "Encrypting": "Cifrando",
     "Encrypted, not sent": "Cifrado, sen enviar",
     "Share Link to User": "Compartir a ligazón co usuario",
@@ -1177,11 +1177,29 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Mellore Riot.im enviando <UsageDataLink>os datos anónimos de uso</UsageDataLink>. Iso suporá o emprego dunha cookie (véxase a nosa <PolicyLink>Política de Cookies</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Mellore Riot.im enviando <UsageDataLink>o uso de datos anónimo</UsageDataLink>. Iso usará unha cookie.",
     "Yes, I want to help!": "Si, quero axuda",
-    "Warning: This widget might use cookies.": "Aviso: este widget podería usar algunha cookie.",
-    "Reload widget": "Volver a cargar o widget",
+    "Warning: This widget might use cookies.": "Aviso: este trebello podería usar algunha cookie.",
+    "Reload widget": "Volver a cargar o trebello",
     "Failed to indicate account erasure": "Non se deu indicado a eliminación de conta",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Iso fará que a súa deixe de ter uso de xeito permanente. Non poderá acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuario. Suporá que saía de todas as salas de conversas nas que estaba e eliminará os detalles da súa conta do servidores de identificación.<b>Isto non se poderá desfacer</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Desactivando a súa conta <b>non supón que por defecto esquezamos as súas mensaxes enviadas.</b> Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.",
     "To continue, please enter your password:": "Para continuar introduza o seu contrasinal:",
-    "password": "contrasinal"
+    "password": "contrasinal",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "A visibilidade das mensaxes en Matrix é parecida ás dos correos electrónicos. Que esquezamos as súas mensaxes significa que as súas mensaxes non se van a compartir con ningún novo membro ou usuario que non estea rexistrado. Mais aqueles usuarios que xa tiveron acceso a estas mensaxes si que seguirán tendo acceso as súas propias copias desas mensaxes.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Esquezan  todas as mensaxes que eu enviara no momento en que elimine a miña conta. (<b>Aviso</b>: iso suporá que os seguintes participantes só verán unha versión incompleta das conversas.)",
+    "Share Room": "Compartir sala",
+    "Link to most recent message": "Ligazón ás mensaxes máis recentes",
+    "Share User": "Compartir usuario",
+    "Share Community": "Compartir comunidade",
+    "Share Room Message": "Compartir unha mensaxe da sala",
+    "Link to selected message": "Ligazón á mensaxe escollida",
+    "COPY": "Copiar",
+    "Share Message": "Compartir mensaxe",
+    "Can't leave Server Notices room": "Non se pode saír da sala de información do servidor",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Esta sala emprégase para mensaxes importantes do servidor da sala, as que non pode saír dela.",
+    "Terms and Conditions": "Termos e condicións",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Para continuar usando o servidor %(homeserverDomain)s ten que revisar primeiro os seus termos e condicións e logo aceptalos.",
+    "Review terms and conditions": "Revise os termos e condicións",
+    "No Audio Outputs detected": "Non se detectou unha saída de audio",
+    "Audio Output": "Saída de audio",
+    "Try the app first": "Probe a aplicación primeiro"
 }

From a8520335ef8d79b6e60c4f149765dcd70d5dd818 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 17:37:55 +0100
Subject: [PATCH 342/702] once command has a space, strict match instead of
 fuzzy match

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index b162f2f92a..38ad5efeb9 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -128,8 +128,26 @@ export default class CommandProvider extends AutocompleteProvider {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!command) return [];
 
-        // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them
-        const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]);
+        let matches;
+        if (command[0] !== command[1]) {
+            // The input looks like a command with arguments, perform exact match
+            const match = COMMANDS.find((o) => o.command === command[1]);
+            if (match) {
+                matches = [match];
+            }
+        }
+
+        // If we don't yet have matches
+        if (!matches) {
+            if (query === '/') {
+                // If they have just entered `/` show everything
+                matches = COMMANDS;
+            } else {
+                // otherwise fuzzy match against all of the fields
+                matches = this.matcher.match(command[1]);
+            }
+        }
+
         return matches.map((result) => {
             return {
                 // If the command is the same as the one they entered, we don't want to discard their arguments

From bea52eccf836ce8e31413e66dcb18bece316122f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 18 Jun 2018 17:40:48 +0100
Subject: [PATCH 343/702] Remove unused import, constant

---
 src/components/views/rooms/MessageComposerInput.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 97e8780f0f..57d433e55c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -45,8 +45,7 @@ import Markdown from '../../../Markdown';
 import ComposerHistoryManager from '../../../ComposerHistoryManager';
 import MessageComposerStore from '../../../stores/MessageComposerStore';
 
-import {MATRIXTO_URL_PATTERN, MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-matrix';
-const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
+import {MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-matrix';
 const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g');
 
 import {asciiRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort} from 'emojione';

From d6f0f775611209d5c06a6558e8e0f70a9c624424 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 18 Jun 2018 17:45:47 +0100
Subject: [PATCH 344/702] Fix MATRIXTO_URL_PATTERN RegExp groups

Fixes https://github.com/vector-im/riot-web/issues/6900
Fixes https://github.com/vector-im/riot-web/issues/6899
---
 src/linkify-matrix.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 328cb98888..d72319948a 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -169,7 +169,7 @@ matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:"
     + "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/"
     + ")(#.*)";
 
-matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+].*)";
+matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/(([#@!+]).*)";
 matrixLinkify.MATRIXTO_MD_LINK_PATTERN =
     '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+][^\\)]*)\\)';
 matrixLinkify.MATRIXTO_BASE_URL= baseUrl;

From 0383937e0dfb3185cfe5dd1e480a9b36ca48e937 Mon Sep 17 00:00:00 2001
From: Miguel Branco <mgl.branco@gmail.com>
Date: Mon, 18 Jun 2018 15:32:05 +0000
Subject: [PATCH 345/702] Translated using Weblate (Galician)

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 41f98676b6..572da43dcf 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -52,7 +52,7 @@
     "%(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?": "A quen quere engadir a esta comunidade?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquera persoa que engada a unha comunidade estará publicamente visible para calquera que coñeza a ID da comunidade",
-    "Invite new community members": "Convidará comunidade a novos participantes ",
+    "Invite new community members": "Convidará comunidade a novos participantes",
     "Name or matrix ID": "Nome ou ID matrix",
     "Invite to Community": "Convidar á comunidade",
     "Which rooms would you like to add to this community?": "Que salas desexaría engadir a esta comunidade?",

From 015d4332351bc543e7f08676425968c48b96c26f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 18:14:48 +0100
Subject: [PATCH 346/702] fix a way to get stuck in set password/email flow

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js        |  1 -
 .../views/dialogs/SetPasswordDialog.js           |  7 ++-----
 src/components/views/globals/PasswordNagBar.js   | 16 ++--------------
 src/components/views/settings/ChangePassword.js  |  7 +++++--
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 2622d7bd89..6397e73434 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -429,7 +429,6 @@ module.exports = React.createClass({
                 "push notifications on other devices until you log back in to them",
             ) + ".",
         });
-        dis.dispatch({action: 'password_changed'});
     },
 
     _onAddEmailEditFinished: function(value, shouldSubmit) {
diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index 31c4ad7a3f..42c35ad187 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -79,15 +80,11 @@ export default React.createClass({
         Modal.createDialog(WarmFuzzy, {
             didSetEmail: res.didSetEmail,
             onFinished: () => {
-                this._onContinueClicked();
+                this.props.onFinished();
             },
         });
     },
 
-    _onContinueClicked: function() {
-        this.props.onFinished(true);
-    },
-
     _onPasswordChangeError: function(err) {
         let errMsg = err.error || "";
         if (err.httpStatus === 403) {
diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
index 93f4fe06e5..4233363b95 100644
--- a/src/components/views/globals/PasswordNagBar.js
+++ b/src/components/views/globals/PasswordNagBar.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,28 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import sdk from '../../../index';
 import Modal from '../../../Modal';
-import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 
 export default React.createClass({
     onUpdateClicked: function() {
         const SetPasswordDialog = sdk.getComponent('dialogs.SetPasswordDialog');
-        Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog, {
-            onFinished: (passwordChanged) => {
-                if (!passwordChanged) {
-                    return;
-                }
-                // Notify SessionStore that the user's password was changed
-                dis.dispatch({
-                    action: 'password_changed',
-                });
-            },
-        });
+        Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog);
     },
 
     render: function() {
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 9cac25e6cc..b2ffe531b5 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,14 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 const React = require('react');
 import PropTypes from 'prop-types';
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const Modal = require("../../../Modal");
 const sdk = require("../../../index");
 
+import dis from "../../../dispatcher";
 import Promise from 'bluebird';
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
@@ -143,6 +143,9 @@ module.exports = React.createClass({
         });
 
         cli.setPassword(authDict, newPassword).then(() => {
+            // Notify SessionStore that the user's password was changed
+            dis.dispatch({action: 'password_changed'});
+
             if (this.props.shouldAskForEmail) {
                 return this._optionallySetEmail().then((confirmed) => {
                     this.props.onFinished({

From 3449a60d3272a736b809d45f318ecb6d0f49cbdb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 18:17:10 +0100
Subject: [PATCH 347/702] fix onBlur breaking the SetEmail field (setting it
 back empty :()

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/SetEmailDialog.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index d80574804f..e643ddbc34 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -36,7 +37,7 @@ export default React.createClass({
 
     getInitialState: function() {
         return {
-            emailAddress: null,
+            emailAddress: '',
             emailBusy: false,
         };
     },
@@ -127,6 +128,7 @@ export default React.createClass({
         const EditableText = sdk.getComponent('elements.EditableText');
 
         const emailInput = this.state.emailBusy ? <Spinner /> : <EditableText
+            initialValue={this.state.emailAddress}
             className="mx_SetEmailDialog_email_input"
             autoFocus="true"
             placeholder={_t("Email address")}

From f2e4e515c14e2ef39cd4a9fd510a9c8c2dd134ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 18:21:16 +0100
Subject: [PATCH 348/702] delint EditableText

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/EditableText.js | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index ce1817c272..1f49bcddae 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,15 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
-const React = require('react');
+import React from 'react';
 import PropTypes from 'prop-types';
 
-const KEY_TAB = 9;
-const KEY_SHIFT = 16;
-const KEY_WINDOWS = 91;
-
 module.exports = React.createClass({
     displayName: 'EditableText',
 
@@ -66,9 +61,7 @@ module.exports = React.createClass({
     },
 
     componentWillReceiveProps: function(nextProps) {
-        if (nextProps.initialValue !== this.props.initialValue ||
-            nextProps.initialValue !== this.value
-        ) {
+        if (nextProps.initialValue !== this.props.initialValue || nextProps.initialValue !== this.value) {
             this.value = nextProps.initialValue;
             if (this.refs.editable_div) {
                 this.showPlaceholder(!this.value);
@@ -139,7 +132,7 @@ module.exports = React.createClass({
             this.showPlaceholder(false);
         }
 
-        if (ev.key == "Enter") {
+        if (ev.key === "Enter") {
             ev.stopPropagation();
             ev.preventDefault();
         }
@@ -156,9 +149,9 @@ module.exports = React.createClass({
             this.value = ev.target.textContent;
         }
 
-        if (ev.key == "Enter") {
+        if (ev.key === "Enter") {
             this.onFinish(ev);
-        } else if (ev.key == "Escape") {
+        } else if (ev.key === "Escape") {
             this.cancelEdit();
         }
 
@@ -193,7 +186,7 @@ module.exports = React.createClass({
         const submit = (ev.key === "Enter") || shouldSubmit;
         this.setState({
             phase: this.Phases.Display,
-        }, function() {
+        }, () => {
             if (this.value !== this.props.initialValue) {
                 self.onValueChanged(submit);
             }
@@ -204,23 +197,35 @@ module.exports = React.createClass({
         const sel = window.getSelection();
         sel.removeAllRanges();
 
-        if (this.props.blurToCancel) {this.cancelEdit();} else {this.onFinish(ev, this.props.blurToSubmit);}
+        if (this.props.blurToCancel) {
+            this.cancelEdit();
+        } else {
+            this.onFinish(ev, this.props.blurToSubmit);
+        }
 
         this.showPlaceholder(!this.value);
     },
 
     render: function() {
-        let editable_el;
+        const {className, editable, initialValue, label, labelClassName} = this.props;
+        let editableEl;
 
-        if (!this.props.editable || (this.state.phase == this.Phases.Display && (this.props.label || this.props.labelClassName) && !this.value)) {
+        if (!editable || (this.state.phase === this.Phases.Display && (label || labelClassName) && !this.value)) {
             // show the label
-            editable_el = <div className={this.props.className + " " + this.props.labelClassName} onClick={this.onClickDiv}>{ this.props.label || this.props.initialValue }</div>;
+            editableEl = <div className={className + " " + labelClassName} onClick={this.onClickDiv}>
+                { label || initialValue }
+            </div>;
         } else {
             // show the content editable div, but manually manage its contents as react and contentEditable don't play nice together
-            editable_el = <div ref="editable_div" contentEditable="true" className={this.props.className}
-                               onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} onFocus={this.onFocus} onBlur={this.onBlur}></div>;
+            editableEl = <div ref="editable_div"
+                              contentEditable={true}
+                              className={className}
+                              onKeyDown={this.onKeyDown}
+                              onKeyUp={this.onKeyUp}
+                              onFocus={this.onFocus}
+                              onBlur={this.onBlur} />;
         }
 
-        return editable_el;
+        return editableEl;
     },
 });

From 5bf3e5b00a5ce2c0bec94c4d0b396aa6463464ba Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 19:31:40 +0100
Subject: [PATCH 349/702] consolidate the two locations commands are defined,
 as it was a MESS

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.js                          | 768 +++++++++---------
 src/autocomplete/CommandProvider.js           |  98 +--
 .../views/rooms/MessageComposerInput.js       |   4 +-
 3 files changed, 413 insertions(+), 457 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index d45e45e84c..3743fbb98c 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -14,28 +14,31 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from "./MatrixClientPeg";
-import dis from "./dispatcher";
-import Tinter from "./Tinter";
+
+import React from 'react';
+import MatrixClientPeg from './MatrixClientPeg';
+import dis from './dispatcher';
+import Tinter from './Tinter';
 import sdk from './index';
-import { _t } from './languageHandler';
+import {_t, _td} from './languageHandler';
 import Modal from './Modal';
-import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 
 class Command {
-    constructor(name, paramArgs, runFn) {
-        this.name = name;
-        this.paramArgs = paramArgs;
+    constructor({name, args='', description, runFn}) {
+        this.command = name;
+        this.args = args;
+        this.description = description;
         this.runFn = runFn;
     }
 
     getCommand() {
-        return "/" + this.name;
+        return "/" + this.command;
     }
 
     getCommandWithArgs() {
-        return this.getCommand() + " " + this.paramArgs;
+        return this.getCommand() + " " + this.args;
     }
 
     run(roomId, args) {
@@ -47,16 +50,12 @@ class Command {
     }
 }
 
-function reject(msg) {
-    return {
-        error: msg,
-    };
+function reject(error) {
+    return {error};
 }
 
 function success(promise) {
-    return {
-        promise: promise,
-    };
+    return {promise};
 }
 
 /* Disable the "unexpected this" error for these commands - all of the run
@@ -65,352 +64,408 @@ function success(promise) {
 
 /* eslint-disable babel/no-invalid-this */
 
-const commands = {
-    ddg: new Command("ddg", "<query>", function(roomId, args) {
-        const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
-        // TODO Don't explain this away, actually show a search UI here.
-        Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
-            title: _t('/ddg is not a command'),
-            description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
-        });
-        return success();
+export const CommandMap = {
+    ddg: new Command({
+        name: 'ddg',
+        args: '<query>',
+        description: _td('Searches DuckDuckGo for results'),
+        runFn: function(roomId, args) {
+            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+            // TODO Don't explain this away, actually show a search UI here.
+            Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
+                title: _t('/ddg is not a command'),
+                description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
+            });
+            return success();
+        },
     }),
 
-    // Change your nickname
-    nick: new Command("nick", "<display_name>", function(roomId, args) {
-        if (args) {
-            return success(
-                MatrixClientPeg.get().setDisplayName(args),
-            );
-        }
-        return reject(this.getUsage());
-    }),
-
-    // Changes the colorscheme of your current room
-    tint: new Command("tint", "<color1> [<color2>]", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}))( +(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})))?$/);
-            if (matches) {
-                Tinter.tint(matches[1], matches[4]);
-                const colorScheme = {};
-                colorScheme.primary_color = matches[1];
-                if (matches[4]) {
-                    colorScheme.secondary_color = matches[4];
-                } else {
-                    colorScheme.secondary_color = colorScheme.primary_color;
-                }
-                return success(
-                    SettingsStore.setValue("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, colorScheme),
-                );
+    nick: new Command({
+        name: 'nick',
+        args: '<display_name>',
+        description: _td('Changes your display nickname'),
+        runFn: function(roomId, args) {
+            if (args) {
+                return success(MatrixClientPeg.get().setDisplayName(args));
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    // Change the room topic
-    topic: new Command("topic", "<topic>", function(roomId, args) {
-        if (args) {
-            return success(
-                MatrixClientPeg.get().setRoomTopic(roomId, args),
-            );
-        }
-        return reject(this.getUsage());
-    }),
-
-    // Invite a user
-    invite: new Command("invite", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                return success(
-                    MatrixClientPeg.get().invite(roomId, matches[1]),
-                );
-            }
-        }
-        return reject(this.getUsage());
-    }),
-
-    // Join a room
-    join: new Command("join", "#alias:domain", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                let roomAlias = matches[1];
-                if (roomAlias[0] !== '#') {
-                    return reject(this.getUsage());
-                }
-                if (!roomAlias.match(/:/)) {
-                    roomAlias += ':' + MatrixClientPeg.get().getDomain();
-                }
-
-                dis.dispatch({
-                    action: 'view_room',
-                    room_alias: roomAlias,
-                    auto_join: true,
-                });
-
-                return success();
-            }
-        }
-        return reject(this.getUsage());
-    }),
-
-    part: new Command("part", "[#alias:domain]", function(roomId, args) {
-        let targetRoomId;
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                let roomAlias = matches[1];
-                if (roomAlias[0] !== '#') {
-                    return reject(this.getUsage());
-                }
-                if (!roomAlias.match(/:/)) {
-                    roomAlias += ':' + MatrixClientPeg.get().getDomain();
-                }
-
-                // Try to find a room with this alias
-                const rooms = MatrixClientPeg.get().getRooms();
-                for (let i = 0; i < rooms.length; i++) {
-                    const aliasEvents = rooms[i].currentState.getStateEvents(
-                        "m.room.aliases",
-                    );
-                    for (let j = 0; j < aliasEvents.length; j++) {
-                        const aliases = aliasEvents[j].getContent().aliases || [];
-                        for (let k = 0; k < aliases.length; k++) {
-                            if (aliases[k] === roomAlias) {
-                                targetRoomId = rooms[i].roomId;
-                                break;
-                            }
-                        }
-                        if (targetRoomId) { break; }
+    tint: new Command({
+        name: 'tint',
+        args: '<color1> [<color2>]',
+        description: _td('Changes colour scheme of current room'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(#([\da-fA-F]{3}|[\da-fA-F]{6}))( +(#([\da-fA-F]{3}|[\da-fA-F]{6})))?$/);
+                if (matches) {
+                    Tinter.tint(matches[1], matches[4]);
+                    const colorScheme = {};
+                    colorScheme.primary_color = matches[1];
+                    if (matches[4]) {
+                        colorScheme.secondary_color = matches[4];
+                    } else {
+                        colorScheme.secondary_color = colorScheme.primary_color;
                     }
-                    if (targetRoomId) { break; }
-                }
-                if (!targetRoomId) {
-                    return reject(_t("Unrecognised room alias:") + ' ' + roomAlias);
+                    return success(
+                        SettingsStore.setValue('roomColor', roomId, SettingLevel.ROOM_ACCOUNT, colorScheme),
+                    );
                 }
             }
-        }
-        if (!targetRoomId) targetRoomId = roomId;
-        return success(
-            MatrixClientPeg.get().leave(targetRoomId).then(
-                function() {
-                    dis.dispatch({action: 'view_next_room'});
-                },
-            ),
-        );
+            return reject(this.getUsage());
+        },
     }),
 
-    // Kick a user from the room with an optional reason
-    kick: new Command("kick", "<userId> [<reason>]", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+?)( +(.*))?$/);
-            if (matches) {
-                return success(
-                    MatrixClientPeg.get().kick(roomId, matches[1], matches[3]),
-                );
+    topic: new Command({
+        name: 'topic',
+        args: '<topic>',
+        description: _td('Sets the room topic'),
+        runFn: function(roomId, args) {
+            if (args) {
+                return success(MatrixClientPeg.get().setRoomTopic(roomId, args));
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
+    }),
+
+    invite: new Command({
+        name: 'invite',
+        args: '<user-id>',
+        description: _td('Invites user with given id to current room'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    return success(MatrixClientPeg.get().invite(roomId, matches[1]));
+                }
+            }
+            return reject(this.getUsage());
+        },
+    }),
+
+    join: new Command({
+        name: 'join',
+        args: '<room-alias>',
+        description: _td('Joins room with given alias'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    let roomAlias = matches[1];
+                    if (roomAlias[0] !== '#') return reject(this.getUsage());
+
+                    if (!roomAlias.includes(':')) {
+                        roomAlias += ':' + MatrixClientPeg.get().getDomain();
+                    }
+
+                    dis.dispatch({
+                        action: 'view_room',
+                        room_alias: roomAlias,
+                        auto_join: true,
+                    });
+
+                    return success();
+                }
+            }
+            return reject(this.getUsage());
+        },
+    }),
+
+    part: new Command({
+        name: 'part',
+        args: '[<room-alias>]',
+        description: _td('Leave room'),
+        runFn: function(roomId, args) {
+            const cli = MatrixClientPeg.get();
+
+            let targetRoomId;
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    let roomAlias = matches[1];
+                    if (roomAlias[0] !== '#') return reject(this.getUsage());
+
+                    if (!roomAlias.includes(':')) {
+                        roomAlias += ':' + cli.getDomain();
+                    }
+
+                    // Try to find a room with this alias
+                    const rooms = cli.getRooms();
+                    for (let i = 0; i < rooms.length; i++) {
+                        const aliasEvents = rooms[i].currentState.getStateEvents('m.room.aliases');
+                        for (let j = 0; j < aliasEvents.length; j++) {
+                            const aliases = aliasEvents[j].getContent().aliases || [];
+                            for (let k = 0; k < aliases.length; k++) {
+                                if (aliases[k] === roomAlias) {
+                                    targetRoomId = rooms[i].roomId;
+                                    break;
+                                }
+                            }
+                            if (targetRoomId) break;
+                        }
+                        if (targetRoomId) break;
+                    }
+                    if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias);
+                }
+            }
+
+            if (!targetRoomId) targetRoomId = roomId;
+            return success(
+                cli.leave(targetRoomId).then(function() {
+                    dis.dispatch({action: 'view_next_room'});
+                }),
+            );
+        },
+    }),
+
+    kick: new Command({
+        name: 'kick',
+        args: '<user-id> [reason]',
+        description: _td('Kicks user with given id'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+?)( +(.*))?$/);
+                if (matches) {
+                    return success(MatrixClientPeg.get().kick(roomId, matches[1], matches[3]));
+                }
+            }
+            return reject(this.getUsage());
+        },
     }),
 
     // Ban a user from the room with an optional reason
-    ban: new Command("ban", "<userId> [<reason>]", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+?)( +(.*))?$/);
-            if (matches) {
-                return success(
-                    MatrixClientPeg.get().ban(roomId, matches[1], matches[3]),
-                );
+    ban: new Command({
+        name: 'ban',
+        args: '<user-id> [reason]',
+        description: _td('Bans user with given id'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+?)( +(.*))?$/);
+                if (matches) {
+                    return success(MatrixClientPeg.get().ban(roomId, matches[1], matches[3]));
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    // Unban a user from the room
-    unban: new Command("unban", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                // Reset the user membership to "leave" to unban him
-                return success(
-                    MatrixClientPeg.get().unban(roomId, matches[1]),
-                );
+    // Unban a user from ythe room
+    unban: new Command({
+        name: 'unban',
+        args: '<user-id>',
+        description: _td('Unbans user with given id'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    // Reset the user membership to "leave" to unban him
+                    return success(MatrixClientPeg.get().unban(roomId, matches[1]));
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    ignore: new Command("ignore", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                const userId = matches[1];
-                const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
-                ignoredUsers.push(userId); // de-duped internally in the js-sdk
-                return success(
-                    MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => {
-                        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                        Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, {
-                            title: _t("Ignored user"),
-                            description: (
-                                <div>
-                                    <p>{ _t("You are now ignoring %(userId)s", {userId: userId}) }</p>
-                                </div>
-                            ),
-                            hasCancelButton: false,
-                        });
-                    }),
-                );
+    ignore: new Command({
+        name: 'ignore',
+        args: '<user-id>',
+        description: _td('Ignores a user, hiding their messages from you'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const cli = MatrixClientPeg.get();
+
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    const userId = matches[1];
+                    const ignoredUsers = cli.getIgnoredUsers();
+                    ignoredUsers.push(userId); // de-duped internally in the js-sdk
+                    return success(
+                        cli.setIgnoredUsers(ignoredUsers).then(() => {
+                            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+                            Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, {
+                                title: _t('Ignored user'),
+                                description: <div>
+                                    <p>{ _t('You are now ignoring %(userId)s', {userId}) }</p>
+                                </div>,
+                                hasCancelButton: false,
+                            });
+                        }),
+                    );
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    unignore: new Command("unignore", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                const userId = matches[1];
-                const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
-                const index = ignoredUsers.indexOf(userId);
-                if (index !== -1) ignoredUsers.splice(index, 1);
-                return success(
-                    MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => {
-                        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                        Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, {
-                            title: _t("Unignored user"),
-                            description: (
-                                <div>
-                                    <p>{ _t("You are no longer ignoring %(userId)s", {userId: userId}) }</p>
-                                </div>
-                            ),
-                            hasCancelButton: false,
-                        });
-                    }),
-                );
+    unignore: new Command({
+        name: 'unignore',
+        args: '<user-id>',
+        description: _td('Stops ignoring a user, showing their messages going forward'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const cli = MatrixClientPeg.get();
+
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    const userId = matches[1];
+                    const ignoredUsers = cli.getIgnoredUsers();
+                    const index = ignoredUsers.indexOf(userId);
+                    if (index !== -1) ignoredUsers.splice(index, 1);
+                    return success(
+                        cli.setIgnoredUsers(ignoredUsers).then(() => {
+                            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+                            Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, {
+                                title: _t('Unignored user'),
+                                description: <div>
+                                    <p>{ _t('You are no longer ignoring %(userId)s', {userId}) }</p>
+                                </div>,
+                                hasCancelButton: false,
+                            });
+                        }),
+                    );
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
     // Define the power level of a user
-    op: new Command("op", "<userId> [<power level>]", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+?)( +(-?\d+))?$/);
-            let powerLevel = 50; // default power level for op
-            if (matches) {
-                const userId = matches[1];
-                if (matches.length === 4 && undefined !== matches[3]) {
-                    powerLevel = parseInt(matches[3]);
-                }
-                if (!isNaN(powerLevel)) {
-                    const room = MatrixClientPeg.get().getRoom(roomId);
-                    if (!room) {
-                        return reject("Bad room ID: " + roomId);
+    op: new Command({
+        name: 'op',
+        args: '<user-id> [<power-level>]',
+        description: _td('Define the power level of a user'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+?)( +(-?\d+))?$/);
+                let powerLevel = 50; // default power level for op
+                if (matches) {
+                    const userId = matches[1];
+                    if (matches.length === 4 && undefined !== matches[3]) {
+                        powerLevel = parseInt(matches[3]);
+                    }
+                    if (!isNaN(powerLevel)) {
+                        const cli = MatrixClientPeg.get();
+                        const room = cli.getRoom(roomId);
+                        if (!room) return reject('Bad room ID: ' + roomId);
+
+                        const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+                        return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent));
                     }
-                    const powerLevelEvent = room.currentState.getStateEvents(
-                        "m.room.power_levels", "",
-                    );
-                    return success(
-                        MatrixClientPeg.get().setPowerLevel(
-                            roomId, userId, powerLevel, powerLevelEvent,
-                        ),
-                    );
                 }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
     // Reset the power level of a user
-    deop: new Command("deop", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                const room = MatrixClientPeg.get().getRoom(roomId);
-                if (!room) {
-                    return reject("Bad room ID: " + roomId);
-                }
+    deop: new Command({
+        name: 'deop',
+        args: '<user-id>',
+        description: _td('Deops user with given id'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    const cli = MatrixClientPeg.get();
+                    const room = cli.getRoom(roomId);
+                    if (!room) return reject('Bad room ID: ' + roomId);
 
-                const powerLevelEvent = room.currentState.getStateEvents(
-                    "m.room.power_levels", "",
-                );
-                return success(
-                    MatrixClientPeg.get().setPowerLevel(
-                        roomId, args, undefined, powerLevelEvent,
-                    ),
-                );
+                    const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+                    return success(cli.setPowerLevel(roomId, args, undefined, powerLevelEvent));
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    // Open developer tools
-    devtools: new Command("devtools", "", function(roomId) {
-        const DevtoolsDialog = sdk.getComponent("dialogs.DevtoolsDialog");
-        Modal.createDialog(DevtoolsDialog, { roomId });
-        return success();
+    devtools: new Command({
+        name: 'devtools',
+        description: _td('Opens the Developer Tools dialog'),
+        runFn: function(roomId) {
+            const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
+            Modal.createDialog(DevtoolsDialog, {roomId});
+            return success();
+        },
     }),
 
     // Verify a user, device, and pubkey tuple
-    verify: new Command("verify", "<userId> <deviceId> <deviceSigningKey>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
-            if (matches) {
-                const userId = matches[1];
-                const deviceId = matches[2];
-                const fingerprint = matches[3];
+    verify: new Command({
+        name: 'verify',
+        args: '<user-id> <device-id> <device-signing-key>',
+        description: _td('Verifies a user, device, and pubkey tuple'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
+                if (matches) {
+                    const cli = MatrixClientPeg.get();
 
-                return success(
-                    // Promise.resolve to handle transition from static result to promise; can be removed
-                    // in future
-                    Promise.resolve(MatrixClientPeg.get().getStoredDevice(userId, deviceId)).then((device) => {
-                        if (!device) {
-                            throw new Error(_t(`Unknown (user, device) pair:`) + ` (${userId}, ${deviceId})`);
-                        }
+                    const userId = matches[1];
+                    const deviceId = matches[2];
+                    const fingerprint = matches[3];
 
-                        if (device.isVerified()) {
-                            if (device.getFingerprint() === fingerprint) {
-                                throw new Error(_t(`Device already verified!`));
-                            } else {
-                                throw new Error(_t(`WARNING: Device already verified, but keys do NOT MATCH!`));
+                    return success(
+                        // Promise.resolve to handle transition from static result to promise; can be removed
+                        // in future
+                        Promise.resolve(cli.getStoredDevice(userId, deviceId)).then((device) => {
+                            if (!device) {
+                                throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`);
                             }
-                        }
 
-                        if (device.getFingerprint() !== fingerprint) {
-                            const fprint = device.getFingerprint();
-                            throw new Error(
-                                _t('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!',
-                                   {deviceId: deviceId, fprint: fprint, userId: userId, fingerprint: fingerprint}));
-                        }
+                            if (device.isVerified()) {
+                                if (device.getFingerprint() === fingerprint) {
+                                    throw new Error(_t('Device already verified!'));
+                                } else {
+                                    throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!'));
+                                }
+                            }
 
-                        return MatrixClientPeg.get().setDeviceVerified(userId, deviceId, true);
-                    }).then(() => {
-                        // Tell the user we verified everything
-                        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                        Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, {
-                            title: _t("Verified key"),
-                            description: (
-                                <div>
-                                  <p>
-                                    {
-                                        _t("The signing key you provided matches the signing key you received " +
-                                           "from %(userId)s's device %(deviceId)s. Device marked as verified.",
-                                           {userId: userId, deviceId: deviceId})
-                                    }
-                                  </p>
-                                </div>
-                            ),
-                            hasCancelButton: false,
-                        });
-                    }),
-                );
+                            if (device.getFingerprint() !== fingerprint) {
+                                const fprint = device.getFingerprint();
+                                throw new Error(
+                                    _t('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!',
+                                        {
+                                            fprint,
+                                            userId,
+                                            deviceId,
+                                            fingerprint,
+                                        }));
+                            }
+
+                            return cli.setDeviceVerified(userId, deviceId, true);
+                        }).then(() => {
+                            // Tell the user we verified everything
+                            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+                            Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, {
+                                title: _t('Verified key'),
+                                description: <div>
+                                    <p>
+                                        {
+                                            _t('The signing key you provided matches the signing key you received ' +
+                                                'from %(userId)s\'s device %(deviceId)s. Device marked as verified.',
+                                                {userId, deviceId})
+                                        }
+                                    </p>
+                                </div>,
+                                hasCancelButton: false,
+                            });
+                        }),
+                    );
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
+    }),
+
+    // Command definitions for autocompletion ONLY:
+
+    // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
+    me: new Command({
+        name: 'me',
+        args: '<message>',
+        description: _td('Displays action'),
     }),
 };
 /* eslint-enable babel/no-invalid-this */
@@ -421,50 +476,39 @@ const aliases = {
     j: "join",
 };
 
-module.exports = {
-    /**
-     * Process the given text for /commands and perform them.
-     * @param {string} roomId The room in which the command was performed.
-     * @param {string} input The raw text input by the user.
-     * @return {Object|null} An object with the property 'error' if there was an error
-     * processing the command, or 'promise' if a request was sent out.
-     * Returns null if the input didn't match a command.
-     */
-    processInput: function(roomId, input) {
-        // trim any trailing whitespace, as it can confuse the parser for
-        // IRC-style commands
-        input = input.replace(/\s+$/, "");
-        if (input[0] === "/" && input[1] !== "/") {
-            const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
-            let cmd;
-            let args;
-            if (bits) {
-                cmd = bits[1].substring(1).toLowerCase();
-                args = bits[3];
-            } else {
-                cmd = input;
-            }
-            if (cmd === "me") return null;
-            if (aliases[cmd]) {
-                cmd = aliases[cmd];
-            }
-            if (commands[cmd]) {
-                return commands[cmd].run(roomId, args);
-            } else {
-                return reject(_t("Unrecognised command:") + ' ' + input);
-            }
-        }
-        return null; // not a command
-    },
+/**
+ * Process the given text for /commands and perform them.
+ * @param {string} roomId The room in which the command was performed.
+ * @param {string} input The raw text input by the user.
+ * @return {Object|null} An object with the property 'error' if there was an error
+ * processing the command, or 'promise' if a request was sent out.
+ * Returns null if the input didn't match a command.
+ */
+export function processCommandInput(roomId, input) {
+    // trim any trailing whitespace, as it can confuse the parser for
+    // IRC-style commands
+    input = input.replace(/\s+$/, '');
+    if (input[0] !== '/' || input[1] === '/') return null; // not a command
 
-    getCommandList: function() {
-        // Return all the commands plus /me and /markdown which aren't handled like normal commands
-        const cmds = Object.keys(commands).sort().map(function(cmdKey) {
-            return commands[cmdKey];
-        });
-        cmds.push(new Command("me", "<action>", function() {}));
-        cmds.push(new Command("markdown", "<on|off>", function() {}));
+    const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
+    let cmd;
+    let args;
+    if (bits) {
+        cmd = bits[1].substring(1).toLowerCase();
+        args = bits[3];
+    } else {
+        cmd = input;
+    }
 
-        return cmds;
-    },
-};
+    if (aliases[cmd]) {
+        cmd = aliases[cmd];
+    }
+    if (CommandMap[cmd]) {
+        // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
+        if (!CommandMap[cmd].runFn) return null;
+
+        return CommandMap[cmd].run(roomId, args);
+    } else {
+        return reject(_t('Unrecognised command:') + ' ' + input);
+    }
+}
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index b162f2f92a..01a40be40c 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -18,101 +18,14 @@ limitations under the License.
 */
 
 import React from 'react';
-import { _t, _td } from '../languageHandler';
+import {_t} from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import FuzzyMatcher from './FuzzyMatcher';
 import {TextualCompletion} from './Components';
+import {CommandMap} from '../SlashCommands';
 import type {SelectionRange} from "./Autocompleter";
 
-// TODO merge this with the factory mechanics of SlashCommands?
-// Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file
-const COMMANDS = [
-    {
-        command: '/me',
-        args: '<message>',
-        description: _td('Displays action'),
-    },
-    {
-        command: '/ban',
-        args: '<user-id> [reason]',
-        description: _td('Bans user with given id'),
-    },
-    {
-        command: '/unban',
-        args: '<user-id>',
-        description: _td('Unbans user with given id'),
-    },
-    {
-        command: '/op',
-        args: '<user-id> [<power-level>]',
-        description: _td('Define the power level of a user'),
-    },
-    {
-        command: '/deop',
-        args: '<user-id>',
-        description: _td('Deops user with given id'),
-    },
-    {
-        command: '/invite',
-        args: '<user-id>',
-        description: _td('Invites user with given id to current room'),
-    },
-    {
-        command: '/join',
-        args: '<room-alias>',
-        description: _td('Joins room with given alias'),
-    },
-    {
-        command: '/part',
-        args: '[<room-alias>]',
-        description: _td('Leave room'),
-    },
-    {
-        command: '/topic',
-        args: '<topic>',
-        description: _td('Sets the room topic'),
-    },
-    {
-        command: '/kick',
-        args: '<user-id> [reason]',
-        description: _td('Kicks user with given id'),
-    },
-    {
-        command: '/nick',
-        args: '<display-name>',
-        description: _td('Changes your display nickname'),
-    },
-    {
-        command: '/ddg',
-        args: '<query>',
-        description: _td('Searches DuckDuckGo for results'),
-    },
-    {
-        command: '/tint',
-        args: '<color1> [<color2>]',
-        description: _td('Changes colour scheme of current room'),
-    },
-    {
-        command: '/verify',
-        args: '<user-id> <device-id> <device-signing-key>',
-        description: _td('Verifies a user, device, and pubkey tuple'),
-    },
-    {
-        command: '/ignore',
-        args: '<user-id>',
-        description: _td('Ignores a user, hiding their messages from you'),
-    },
-    {
-        command: '/unignore',
-        args: '<user-id>',
-        description: _td('Stops ignoring a user, showing their messages going forward'),
-    },
-    {
-        command: '/devtools',
-        args: '',
-        description: _td('Opens the Developer Tools dialog'),
-    },
-];
+const COMMANDS = Object.values(CommandMap);
 
 const COMMAND_RE = /(^\/\w*)(?: .*)?/g;
 
@@ -134,11 +47,10 @@ export default class CommandProvider extends AutocompleteProvider {
             return {
                 // If the command is the same as the one they entered, we don't want to discard their arguments
                 completion: result.command === command[1] ? command[0] : (result.command + ' '),
-                component: (<TextualCompletion
+                component: <TextualCompletion
                     title={result.command}
                     subtitle={result.args}
-                    description={_t(result.description)}
-                />),
+                    description={_t(result.description)} />,
                 range,
             };
         });
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 57d433e55c..81c4ff2b16 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -28,7 +28,7 @@ import Promise from 'bluebird';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import type {MatrixClient} from 'matrix-js-sdk/lib/matrix';
-import SlashCommands from '../../../SlashCommands';
+import {processCommandInput} from '../../../SlashCommands';
 import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
@@ -721,7 +721,7 @@ export default class MessageComposerInput extends React.Component {
 
         // Some commands (/join) require pills to be replaced with their text content
         const commandText = this.removeMDLinks(contentState, ['#']);
-        const cmd = SlashCommands.processInput(this.props.room.roomId, commandText);
+        const cmd = processCommandInput(this.props.room.roomId, commandText);
         if (cmd) {
             if (!cmd.error) {
                 this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'html' : 'markdown');

From 9107744da73d16037f31c9203a290086e45e5c3d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 19:32:12 +0100
Subject: [PATCH 350/702] simplify arrow func

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 01a40be40c..0e780bddd3 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -43,17 +43,15 @@ export default class CommandProvider extends AutocompleteProvider {
 
         // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them
         const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]);
-        return matches.map((result) => {
-            return {
-                // If the command is the same as the one they entered, we don't want to discard their arguments
-                completion: result.command === command[1] ? command[0] : (result.command + ' '),
-                component: <TextualCompletion
-                    title={result.command}
-                    subtitle={result.args}
-                    description={_t(result.description)} />,
-                range,
-            };
-        });
+        return matches.map((result) => ({
+            // If the command is the same as the one they entered, we don't want to discard their arguments
+            completion: result.command === command[1] ? command[0] : (result.command + ' '),
+            component: <TextualCompletion
+                title={result.command}
+                subtitle={result.args}
+                description={_t(result.description)} />,
+            range,
+        }));
     }
 
     getName() {

From 85ddc0651b3dc3317c2c95dd804ca26fed2806ad Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 19:31:40 +0100
Subject: [PATCH 351/702] consolidate the two locations commands are defined,
 as it was a MESS

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.js                          | 768 +++++++++---------
 src/autocomplete/CommandProvider.js           |  98 +--
 .../views/rooms/MessageComposerInput.js       |   4 +-
 3 files changed, 413 insertions(+), 457 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index d45e45e84c..3743fbb98c 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -14,28 +14,31 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from "./MatrixClientPeg";
-import dis from "./dispatcher";
-import Tinter from "./Tinter";
+
+import React from 'react';
+import MatrixClientPeg from './MatrixClientPeg';
+import dis from './dispatcher';
+import Tinter from './Tinter';
 import sdk from './index';
-import { _t } from './languageHandler';
+import {_t, _td} from './languageHandler';
 import Modal from './Modal';
-import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 
 class Command {
-    constructor(name, paramArgs, runFn) {
-        this.name = name;
-        this.paramArgs = paramArgs;
+    constructor({name, args='', description, runFn}) {
+        this.command = name;
+        this.args = args;
+        this.description = description;
         this.runFn = runFn;
     }
 
     getCommand() {
-        return "/" + this.name;
+        return "/" + this.command;
     }
 
     getCommandWithArgs() {
-        return this.getCommand() + " " + this.paramArgs;
+        return this.getCommand() + " " + this.args;
     }
 
     run(roomId, args) {
@@ -47,16 +50,12 @@ class Command {
     }
 }
 
-function reject(msg) {
-    return {
-        error: msg,
-    };
+function reject(error) {
+    return {error};
 }
 
 function success(promise) {
-    return {
-        promise: promise,
-    };
+    return {promise};
 }
 
 /* Disable the "unexpected this" error for these commands - all of the run
@@ -65,352 +64,408 @@ function success(promise) {
 
 /* eslint-disable babel/no-invalid-this */
 
-const commands = {
-    ddg: new Command("ddg", "<query>", function(roomId, args) {
-        const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
-        // TODO Don't explain this away, actually show a search UI here.
-        Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
-            title: _t('/ddg is not a command'),
-            description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
-        });
-        return success();
+export const CommandMap = {
+    ddg: new Command({
+        name: 'ddg',
+        args: '<query>',
+        description: _td('Searches DuckDuckGo for results'),
+        runFn: function(roomId, args) {
+            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+            // TODO Don't explain this away, actually show a search UI here.
+            Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
+                title: _t('/ddg is not a command'),
+                description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
+            });
+            return success();
+        },
     }),
 
-    // Change your nickname
-    nick: new Command("nick", "<display_name>", function(roomId, args) {
-        if (args) {
-            return success(
-                MatrixClientPeg.get().setDisplayName(args),
-            );
-        }
-        return reject(this.getUsage());
-    }),
-
-    // Changes the colorscheme of your current room
-    tint: new Command("tint", "<color1> [<color2>]", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}))( +(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})))?$/);
-            if (matches) {
-                Tinter.tint(matches[1], matches[4]);
-                const colorScheme = {};
-                colorScheme.primary_color = matches[1];
-                if (matches[4]) {
-                    colorScheme.secondary_color = matches[4];
-                } else {
-                    colorScheme.secondary_color = colorScheme.primary_color;
-                }
-                return success(
-                    SettingsStore.setValue("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, colorScheme),
-                );
+    nick: new Command({
+        name: 'nick',
+        args: '<display_name>',
+        description: _td('Changes your display nickname'),
+        runFn: function(roomId, args) {
+            if (args) {
+                return success(MatrixClientPeg.get().setDisplayName(args));
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    // Change the room topic
-    topic: new Command("topic", "<topic>", function(roomId, args) {
-        if (args) {
-            return success(
-                MatrixClientPeg.get().setRoomTopic(roomId, args),
-            );
-        }
-        return reject(this.getUsage());
-    }),
-
-    // Invite a user
-    invite: new Command("invite", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                return success(
-                    MatrixClientPeg.get().invite(roomId, matches[1]),
-                );
-            }
-        }
-        return reject(this.getUsage());
-    }),
-
-    // Join a room
-    join: new Command("join", "#alias:domain", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                let roomAlias = matches[1];
-                if (roomAlias[0] !== '#') {
-                    return reject(this.getUsage());
-                }
-                if (!roomAlias.match(/:/)) {
-                    roomAlias += ':' + MatrixClientPeg.get().getDomain();
-                }
-
-                dis.dispatch({
-                    action: 'view_room',
-                    room_alias: roomAlias,
-                    auto_join: true,
-                });
-
-                return success();
-            }
-        }
-        return reject(this.getUsage());
-    }),
-
-    part: new Command("part", "[#alias:domain]", function(roomId, args) {
-        let targetRoomId;
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                let roomAlias = matches[1];
-                if (roomAlias[0] !== '#') {
-                    return reject(this.getUsage());
-                }
-                if (!roomAlias.match(/:/)) {
-                    roomAlias += ':' + MatrixClientPeg.get().getDomain();
-                }
-
-                // Try to find a room with this alias
-                const rooms = MatrixClientPeg.get().getRooms();
-                for (let i = 0; i < rooms.length; i++) {
-                    const aliasEvents = rooms[i].currentState.getStateEvents(
-                        "m.room.aliases",
-                    );
-                    for (let j = 0; j < aliasEvents.length; j++) {
-                        const aliases = aliasEvents[j].getContent().aliases || [];
-                        for (let k = 0; k < aliases.length; k++) {
-                            if (aliases[k] === roomAlias) {
-                                targetRoomId = rooms[i].roomId;
-                                break;
-                            }
-                        }
-                        if (targetRoomId) { break; }
+    tint: new Command({
+        name: 'tint',
+        args: '<color1> [<color2>]',
+        description: _td('Changes colour scheme of current room'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(#([\da-fA-F]{3}|[\da-fA-F]{6}))( +(#([\da-fA-F]{3}|[\da-fA-F]{6})))?$/);
+                if (matches) {
+                    Tinter.tint(matches[1], matches[4]);
+                    const colorScheme = {};
+                    colorScheme.primary_color = matches[1];
+                    if (matches[4]) {
+                        colorScheme.secondary_color = matches[4];
+                    } else {
+                        colorScheme.secondary_color = colorScheme.primary_color;
                     }
-                    if (targetRoomId) { break; }
-                }
-                if (!targetRoomId) {
-                    return reject(_t("Unrecognised room alias:") + ' ' + roomAlias);
+                    return success(
+                        SettingsStore.setValue('roomColor', roomId, SettingLevel.ROOM_ACCOUNT, colorScheme),
+                    );
                 }
             }
-        }
-        if (!targetRoomId) targetRoomId = roomId;
-        return success(
-            MatrixClientPeg.get().leave(targetRoomId).then(
-                function() {
-                    dis.dispatch({action: 'view_next_room'});
-                },
-            ),
-        );
+            return reject(this.getUsage());
+        },
     }),
 
-    // Kick a user from the room with an optional reason
-    kick: new Command("kick", "<userId> [<reason>]", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+?)( +(.*))?$/);
-            if (matches) {
-                return success(
-                    MatrixClientPeg.get().kick(roomId, matches[1], matches[3]),
-                );
+    topic: new Command({
+        name: 'topic',
+        args: '<topic>',
+        description: _td('Sets the room topic'),
+        runFn: function(roomId, args) {
+            if (args) {
+                return success(MatrixClientPeg.get().setRoomTopic(roomId, args));
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
+    }),
+
+    invite: new Command({
+        name: 'invite',
+        args: '<user-id>',
+        description: _td('Invites user with given id to current room'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    return success(MatrixClientPeg.get().invite(roomId, matches[1]));
+                }
+            }
+            return reject(this.getUsage());
+        },
+    }),
+
+    join: new Command({
+        name: 'join',
+        args: '<room-alias>',
+        description: _td('Joins room with given alias'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    let roomAlias = matches[1];
+                    if (roomAlias[0] !== '#') return reject(this.getUsage());
+
+                    if (!roomAlias.includes(':')) {
+                        roomAlias += ':' + MatrixClientPeg.get().getDomain();
+                    }
+
+                    dis.dispatch({
+                        action: 'view_room',
+                        room_alias: roomAlias,
+                        auto_join: true,
+                    });
+
+                    return success();
+                }
+            }
+            return reject(this.getUsage());
+        },
+    }),
+
+    part: new Command({
+        name: 'part',
+        args: '[<room-alias>]',
+        description: _td('Leave room'),
+        runFn: function(roomId, args) {
+            const cli = MatrixClientPeg.get();
+
+            let targetRoomId;
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    let roomAlias = matches[1];
+                    if (roomAlias[0] !== '#') return reject(this.getUsage());
+
+                    if (!roomAlias.includes(':')) {
+                        roomAlias += ':' + cli.getDomain();
+                    }
+
+                    // Try to find a room with this alias
+                    const rooms = cli.getRooms();
+                    for (let i = 0; i < rooms.length; i++) {
+                        const aliasEvents = rooms[i].currentState.getStateEvents('m.room.aliases');
+                        for (let j = 0; j < aliasEvents.length; j++) {
+                            const aliases = aliasEvents[j].getContent().aliases || [];
+                            for (let k = 0; k < aliases.length; k++) {
+                                if (aliases[k] === roomAlias) {
+                                    targetRoomId = rooms[i].roomId;
+                                    break;
+                                }
+                            }
+                            if (targetRoomId) break;
+                        }
+                        if (targetRoomId) break;
+                    }
+                    if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias);
+                }
+            }
+
+            if (!targetRoomId) targetRoomId = roomId;
+            return success(
+                cli.leave(targetRoomId).then(function() {
+                    dis.dispatch({action: 'view_next_room'});
+                }),
+            );
+        },
+    }),
+
+    kick: new Command({
+        name: 'kick',
+        args: '<user-id> [reason]',
+        description: _td('Kicks user with given id'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+?)( +(.*))?$/);
+                if (matches) {
+                    return success(MatrixClientPeg.get().kick(roomId, matches[1], matches[3]));
+                }
+            }
+            return reject(this.getUsage());
+        },
     }),
 
     // Ban a user from the room with an optional reason
-    ban: new Command("ban", "<userId> [<reason>]", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+?)( +(.*))?$/);
-            if (matches) {
-                return success(
-                    MatrixClientPeg.get().ban(roomId, matches[1], matches[3]),
-                );
+    ban: new Command({
+        name: 'ban',
+        args: '<user-id> [reason]',
+        description: _td('Bans user with given id'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+?)( +(.*))?$/);
+                if (matches) {
+                    return success(MatrixClientPeg.get().ban(roomId, matches[1], matches[3]));
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    // Unban a user from the room
-    unban: new Command("unban", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                // Reset the user membership to "leave" to unban him
-                return success(
-                    MatrixClientPeg.get().unban(roomId, matches[1]),
-                );
+    // Unban a user from ythe room
+    unban: new Command({
+        name: 'unban',
+        args: '<user-id>',
+        description: _td('Unbans user with given id'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    // Reset the user membership to "leave" to unban him
+                    return success(MatrixClientPeg.get().unban(roomId, matches[1]));
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    ignore: new Command("ignore", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                const userId = matches[1];
-                const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
-                ignoredUsers.push(userId); // de-duped internally in the js-sdk
-                return success(
-                    MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => {
-                        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                        Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, {
-                            title: _t("Ignored user"),
-                            description: (
-                                <div>
-                                    <p>{ _t("You are now ignoring %(userId)s", {userId: userId}) }</p>
-                                </div>
-                            ),
-                            hasCancelButton: false,
-                        });
-                    }),
-                );
+    ignore: new Command({
+        name: 'ignore',
+        args: '<user-id>',
+        description: _td('Ignores a user, hiding their messages from you'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const cli = MatrixClientPeg.get();
+
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    const userId = matches[1];
+                    const ignoredUsers = cli.getIgnoredUsers();
+                    ignoredUsers.push(userId); // de-duped internally in the js-sdk
+                    return success(
+                        cli.setIgnoredUsers(ignoredUsers).then(() => {
+                            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+                            Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, {
+                                title: _t('Ignored user'),
+                                description: <div>
+                                    <p>{ _t('You are now ignoring %(userId)s', {userId}) }</p>
+                                </div>,
+                                hasCancelButton: false,
+                            });
+                        }),
+                    );
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    unignore: new Command("unignore", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                const userId = matches[1];
-                const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
-                const index = ignoredUsers.indexOf(userId);
-                if (index !== -1) ignoredUsers.splice(index, 1);
-                return success(
-                    MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => {
-                        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                        Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, {
-                            title: _t("Unignored user"),
-                            description: (
-                                <div>
-                                    <p>{ _t("You are no longer ignoring %(userId)s", {userId: userId}) }</p>
-                                </div>
-                            ),
-                            hasCancelButton: false,
-                        });
-                    }),
-                );
+    unignore: new Command({
+        name: 'unignore',
+        args: '<user-id>',
+        description: _td('Stops ignoring a user, showing their messages going forward'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const cli = MatrixClientPeg.get();
+
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    const userId = matches[1];
+                    const ignoredUsers = cli.getIgnoredUsers();
+                    const index = ignoredUsers.indexOf(userId);
+                    if (index !== -1) ignoredUsers.splice(index, 1);
+                    return success(
+                        cli.setIgnoredUsers(ignoredUsers).then(() => {
+                            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+                            Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, {
+                                title: _t('Unignored user'),
+                                description: <div>
+                                    <p>{ _t('You are no longer ignoring %(userId)s', {userId}) }</p>
+                                </div>,
+                                hasCancelButton: false,
+                            });
+                        }),
+                    );
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
     // Define the power level of a user
-    op: new Command("op", "<userId> [<power level>]", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+?)( +(-?\d+))?$/);
-            let powerLevel = 50; // default power level for op
-            if (matches) {
-                const userId = matches[1];
-                if (matches.length === 4 && undefined !== matches[3]) {
-                    powerLevel = parseInt(matches[3]);
-                }
-                if (!isNaN(powerLevel)) {
-                    const room = MatrixClientPeg.get().getRoom(roomId);
-                    if (!room) {
-                        return reject("Bad room ID: " + roomId);
+    op: new Command({
+        name: 'op',
+        args: '<user-id> [<power-level>]',
+        description: _td('Define the power level of a user'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+?)( +(-?\d+))?$/);
+                let powerLevel = 50; // default power level for op
+                if (matches) {
+                    const userId = matches[1];
+                    if (matches.length === 4 && undefined !== matches[3]) {
+                        powerLevel = parseInt(matches[3]);
+                    }
+                    if (!isNaN(powerLevel)) {
+                        const cli = MatrixClientPeg.get();
+                        const room = cli.getRoom(roomId);
+                        if (!room) return reject('Bad room ID: ' + roomId);
+
+                        const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+                        return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent));
                     }
-                    const powerLevelEvent = room.currentState.getStateEvents(
-                        "m.room.power_levels", "",
-                    );
-                    return success(
-                        MatrixClientPeg.get().setPowerLevel(
-                            roomId, userId, powerLevel, powerLevelEvent,
-                        ),
-                    );
                 }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
     // Reset the power level of a user
-    deop: new Command("deop", "<userId>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+)$/);
-            if (matches) {
-                const room = MatrixClientPeg.get().getRoom(roomId);
-                if (!room) {
-                    return reject("Bad room ID: " + roomId);
-                }
+    deop: new Command({
+        name: 'deop',
+        args: '<user-id>',
+        description: _td('Deops user with given id'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+)$/);
+                if (matches) {
+                    const cli = MatrixClientPeg.get();
+                    const room = cli.getRoom(roomId);
+                    if (!room) return reject('Bad room ID: ' + roomId);
 
-                const powerLevelEvent = room.currentState.getStateEvents(
-                    "m.room.power_levels", "",
-                );
-                return success(
-                    MatrixClientPeg.get().setPowerLevel(
-                        roomId, args, undefined, powerLevelEvent,
-                    ),
-                );
+                    const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+                    return success(cli.setPowerLevel(roomId, args, undefined, powerLevelEvent));
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
     }),
 
-    // Open developer tools
-    devtools: new Command("devtools", "", function(roomId) {
-        const DevtoolsDialog = sdk.getComponent("dialogs.DevtoolsDialog");
-        Modal.createDialog(DevtoolsDialog, { roomId });
-        return success();
+    devtools: new Command({
+        name: 'devtools',
+        description: _td('Opens the Developer Tools dialog'),
+        runFn: function(roomId) {
+            const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
+            Modal.createDialog(DevtoolsDialog, {roomId});
+            return success();
+        },
     }),
 
     // Verify a user, device, and pubkey tuple
-    verify: new Command("verify", "<userId> <deviceId> <deviceSigningKey>", function(roomId, args) {
-        if (args) {
-            const matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
-            if (matches) {
-                const userId = matches[1];
-                const deviceId = matches[2];
-                const fingerprint = matches[3];
+    verify: new Command({
+        name: 'verify',
+        args: '<user-id> <device-id> <device-signing-key>',
+        description: _td('Verifies a user, device, and pubkey tuple'),
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
+                if (matches) {
+                    const cli = MatrixClientPeg.get();
 
-                return success(
-                    // Promise.resolve to handle transition from static result to promise; can be removed
-                    // in future
-                    Promise.resolve(MatrixClientPeg.get().getStoredDevice(userId, deviceId)).then((device) => {
-                        if (!device) {
-                            throw new Error(_t(`Unknown (user, device) pair:`) + ` (${userId}, ${deviceId})`);
-                        }
+                    const userId = matches[1];
+                    const deviceId = matches[2];
+                    const fingerprint = matches[3];
 
-                        if (device.isVerified()) {
-                            if (device.getFingerprint() === fingerprint) {
-                                throw new Error(_t(`Device already verified!`));
-                            } else {
-                                throw new Error(_t(`WARNING: Device already verified, but keys do NOT MATCH!`));
+                    return success(
+                        // Promise.resolve to handle transition from static result to promise; can be removed
+                        // in future
+                        Promise.resolve(cli.getStoredDevice(userId, deviceId)).then((device) => {
+                            if (!device) {
+                                throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`);
                             }
-                        }
 
-                        if (device.getFingerprint() !== fingerprint) {
-                            const fprint = device.getFingerprint();
-                            throw new Error(
-                                _t('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!',
-                                   {deviceId: deviceId, fprint: fprint, userId: userId, fingerprint: fingerprint}));
-                        }
+                            if (device.isVerified()) {
+                                if (device.getFingerprint() === fingerprint) {
+                                    throw new Error(_t('Device already verified!'));
+                                } else {
+                                    throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!'));
+                                }
+                            }
 
-                        return MatrixClientPeg.get().setDeviceVerified(userId, deviceId, true);
-                    }).then(() => {
-                        // Tell the user we verified everything
-                        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                        Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, {
-                            title: _t("Verified key"),
-                            description: (
-                                <div>
-                                  <p>
-                                    {
-                                        _t("The signing key you provided matches the signing key you received " +
-                                           "from %(userId)s's device %(deviceId)s. Device marked as verified.",
-                                           {userId: userId, deviceId: deviceId})
-                                    }
-                                  </p>
-                                </div>
-                            ),
-                            hasCancelButton: false,
-                        });
-                    }),
-                );
+                            if (device.getFingerprint() !== fingerprint) {
+                                const fprint = device.getFingerprint();
+                                throw new Error(
+                                    _t('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!',
+                                        {
+                                            fprint,
+                                            userId,
+                                            deviceId,
+                                            fingerprint,
+                                        }));
+                            }
+
+                            return cli.setDeviceVerified(userId, deviceId, true);
+                        }).then(() => {
+                            // Tell the user we verified everything
+                            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+                            Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, {
+                                title: _t('Verified key'),
+                                description: <div>
+                                    <p>
+                                        {
+                                            _t('The signing key you provided matches the signing key you received ' +
+                                                'from %(userId)s\'s device %(deviceId)s. Device marked as verified.',
+                                                {userId, deviceId})
+                                        }
+                                    </p>
+                                </div>,
+                                hasCancelButton: false,
+                            });
+                        }),
+                    );
+                }
             }
-        }
-        return reject(this.getUsage());
+            return reject(this.getUsage());
+        },
+    }),
+
+    // Command definitions for autocompletion ONLY:
+
+    // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
+    me: new Command({
+        name: 'me',
+        args: '<message>',
+        description: _td('Displays action'),
     }),
 };
 /* eslint-enable babel/no-invalid-this */
@@ -421,50 +476,39 @@ const aliases = {
     j: "join",
 };
 
-module.exports = {
-    /**
-     * Process the given text for /commands and perform them.
-     * @param {string} roomId The room in which the command was performed.
-     * @param {string} input The raw text input by the user.
-     * @return {Object|null} An object with the property 'error' if there was an error
-     * processing the command, or 'promise' if a request was sent out.
-     * Returns null if the input didn't match a command.
-     */
-    processInput: function(roomId, input) {
-        // trim any trailing whitespace, as it can confuse the parser for
-        // IRC-style commands
-        input = input.replace(/\s+$/, "");
-        if (input[0] === "/" && input[1] !== "/") {
-            const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
-            let cmd;
-            let args;
-            if (bits) {
-                cmd = bits[1].substring(1).toLowerCase();
-                args = bits[3];
-            } else {
-                cmd = input;
-            }
-            if (cmd === "me") return null;
-            if (aliases[cmd]) {
-                cmd = aliases[cmd];
-            }
-            if (commands[cmd]) {
-                return commands[cmd].run(roomId, args);
-            } else {
-                return reject(_t("Unrecognised command:") + ' ' + input);
-            }
-        }
-        return null; // not a command
-    },
+/**
+ * Process the given text for /commands and perform them.
+ * @param {string} roomId The room in which the command was performed.
+ * @param {string} input The raw text input by the user.
+ * @return {Object|null} An object with the property 'error' if there was an error
+ * processing the command, or 'promise' if a request was sent out.
+ * Returns null if the input didn't match a command.
+ */
+export function processCommandInput(roomId, input) {
+    // trim any trailing whitespace, as it can confuse the parser for
+    // IRC-style commands
+    input = input.replace(/\s+$/, '');
+    if (input[0] !== '/' || input[1] === '/') return null; // not a command
 
-    getCommandList: function() {
-        // Return all the commands plus /me and /markdown which aren't handled like normal commands
-        const cmds = Object.keys(commands).sort().map(function(cmdKey) {
-            return commands[cmdKey];
-        });
-        cmds.push(new Command("me", "<action>", function() {}));
-        cmds.push(new Command("markdown", "<on|off>", function() {}));
+    const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
+    let cmd;
+    let args;
+    if (bits) {
+        cmd = bits[1].substring(1).toLowerCase();
+        args = bits[3];
+    } else {
+        cmd = input;
+    }
 
-        return cmds;
-    },
-};
+    if (aliases[cmd]) {
+        cmd = aliases[cmd];
+    }
+    if (CommandMap[cmd]) {
+        // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
+        if (!CommandMap[cmd].runFn) return null;
+
+        return CommandMap[cmd].run(roomId, args);
+    } else {
+        return reject(_t('Unrecognised command:') + ' ' + input);
+    }
+}
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index b162f2f92a..01a40be40c 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -18,101 +18,14 @@ limitations under the License.
 */
 
 import React from 'react';
-import { _t, _td } from '../languageHandler';
+import {_t} from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import FuzzyMatcher from './FuzzyMatcher';
 import {TextualCompletion} from './Components';
+import {CommandMap} from '../SlashCommands';
 import type {SelectionRange} from "./Autocompleter";
 
-// TODO merge this with the factory mechanics of SlashCommands?
-// Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file
-const COMMANDS = [
-    {
-        command: '/me',
-        args: '<message>',
-        description: _td('Displays action'),
-    },
-    {
-        command: '/ban',
-        args: '<user-id> [reason]',
-        description: _td('Bans user with given id'),
-    },
-    {
-        command: '/unban',
-        args: '<user-id>',
-        description: _td('Unbans user with given id'),
-    },
-    {
-        command: '/op',
-        args: '<user-id> [<power-level>]',
-        description: _td('Define the power level of a user'),
-    },
-    {
-        command: '/deop',
-        args: '<user-id>',
-        description: _td('Deops user with given id'),
-    },
-    {
-        command: '/invite',
-        args: '<user-id>',
-        description: _td('Invites user with given id to current room'),
-    },
-    {
-        command: '/join',
-        args: '<room-alias>',
-        description: _td('Joins room with given alias'),
-    },
-    {
-        command: '/part',
-        args: '[<room-alias>]',
-        description: _td('Leave room'),
-    },
-    {
-        command: '/topic',
-        args: '<topic>',
-        description: _td('Sets the room topic'),
-    },
-    {
-        command: '/kick',
-        args: '<user-id> [reason]',
-        description: _td('Kicks user with given id'),
-    },
-    {
-        command: '/nick',
-        args: '<display-name>',
-        description: _td('Changes your display nickname'),
-    },
-    {
-        command: '/ddg',
-        args: '<query>',
-        description: _td('Searches DuckDuckGo for results'),
-    },
-    {
-        command: '/tint',
-        args: '<color1> [<color2>]',
-        description: _td('Changes colour scheme of current room'),
-    },
-    {
-        command: '/verify',
-        args: '<user-id> <device-id> <device-signing-key>',
-        description: _td('Verifies a user, device, and pubkey tuple'),
-    },
-    {
-        command: '/ignore',
-        args: '<user-id>',
-        description: _td('Ignores a user, hiding their messages from you'),
-    },
-    {
-        command: '/unignore',
-        args: '<user-id>',
-        description: _td('Stops ignoring a user, showing their messages going forward'),
-    },
-    {
-        command: '/devtools',
-        args: '',
-        description: _td('Opens the Developer Tools dialog'),
-    },
-];
+const COMMANDS = Object.values(CommandMap);
 
 const COMMAND_RE = /(^\/\w*)(?: .*)?/g;
 
@@ -134,11 +47,10 @@ export default class CommandProvider extends AutocompleteProvider {
             return {
                 // If the command is the same as the one they entered, we don't want to discard their arguments
                 completion: result.command === command[1] ? command[0] : (result.command + ' '),
-                component: (<TextualCompletion
+                component: <TextualCompletion
                     title={result.command}
                     subtitle={result.args}
-                    description={_t(result.description)}
-                />),
+                    description={_t(result.description)} />,
                 range,
             };
         });
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 97e8780f0f..1987d4f4be 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -28,7 +28,7 @@ import Promise from 'bluebird';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import type {MatrixClient} from 'matrix-js-sdk/lib/matrix';
-import SlashCommands from '../../../SlashCommands';
+import {processCommandInput} from '../../../SlashCommands';
 import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
@@ -722,7 +722,7 @@ export default class MessageComposerInput extends React.Component {
 
         // Some commands (/join) require pills to be replaced with their text content
         const commandText = this.removeMDLinks(contentState, ['#']);
-        const cmd = SlashCommands.processInput(this.props.room.roomId, commandText);
+        const cmd = processCommandInput(this.props.room.roomId, commandText);
         if (cmd) {
             if (!cmd.error) {
                 this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'html' : 'markdown');

From 107802fa29a8e3dce0f7058f42264c8957d0b6f0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 19:32:12 +0100
Subject: [PATCH 352/702] simplify arrow func

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 01a40be40c..0e780bddd3 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -43,17 +43,15 @@ export default class CommandProvider extends AutocompleteProvider {
 
         // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them
         const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]);
-        return matches.map((result) => {
-            return {
-                // If the command is the same as the one they entered, we don't want to discard their arguments
-                completion: result.command === command[1] ? command[0] : (result.command + ' '),
-                component: <TextualCompletion
-                    title={result.command}
-                    subtitle={result.args}
-                    description={_t(result.description)} />,
-                range,
-            };
-        });
+        return matches.map((result) => ({
+            // If the command is the same as the one they entered, we don't want to discard their arguments
+            completion: result.command === command[1] ? command[0] : (result.command + ' '),
+            component: <TextualCompletion
+                title={result.command}
+                subtitle={result.args}
+                description={_t(result.description)} />,
+            range,
+        }));
     }
 
     getName() {

From 9de6bf4f5a109e62590d3e848c22f9f9189530da Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 17:37:55 +0100
Subject: [PATCH 353/702] once command has a space, strict match instead of
 fuzzy match

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit a852033)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 0e780bddd3..ea271e02ff 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -41,8 +41,26 @@ export default class CommandProvider extends AutocompleteProvider {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!command) return [];
 
-        // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them
-        const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]);
+        let matches;
+        if (command[0] !== command[1]) {
+            // The input looks like a command with arguments, perform exact match
+            const match = COMMANDS.find((o) => o.command === command[1]);
+            if (match) {
+                matches = [match];
+            }
+        }
+
+        // If we don't yet have matches
+        if (!matches) {
+            if (query === '/') {
+                // If they have just entered `/` show everything
+                matches = COMMANDS;
+            } else {
+                // otherwise fuzzy match against all of the fields
+                matches = this.matcher.match(command[1]);
+            }
+        }
+
         return matches.map((result) => ({
             // If the command is the same as the one they entered, we don't want to discard their arguments
             completion: result.command === command[1] ? command[0] : (result.command + ' '),

From 29ea4025d46968e548cf83b5e6e15caaf30dc4cf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Jun 2018 22:13:20 +0100
Subject: [PATCH 354/702] trigger TagTile context menu on right click

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/TagTile.js | 43 +++++++++++++++---------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index fb3ddee093..5bea68e814 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 New Vector Ltd.
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -103,14 +104,27 @@ export default React.createClass({
         }
     },
 
-    onContextButtonClick: function(e) {
-        e.preventDefault();
-        e.stopPropagation();
-
+    _openContextMenu: function(x, y, chevronOffset) {
         // Hide the (...) immediately
         this.setState({ hover: false });
 
         const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
+        ContextualMenu.createMenu(TagTileContextMenu, {
+            chevronOffset: chevronOffset,
+            left: x,
+            top: y,
+            tag: this.props.tag,
+            onFinished: () => {
+                this.setState({ menuDisplayed: false });
+            },
+        });
+        this.setState({ menuDisplayed: true });
+    },
+
+    onContextButtonClick: function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
         const elementRect = e.target.getBoundingClientRect();
 
         // The window X and Y offsets are to adjust position when zoomed in to page
@@ -119,17 +133,14 @@ export default React.createClass({
         let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
         y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
 
-        const self = this;
-        ContextualMenu.createMenu(TagTileContextMenu, {
-            chevronOffset: chevronOffset,
-            left: x,
-            top: y,
-            tag: this.props.tag,
-            onFinished: function() {
-                self.setState({ menuDisplayed: false });
-            },
-        });
-        this.setState({ menuDisplayed: true });
+        this._openContextMenu(x, y, chevronOffset);
+    },
+
+    onContextMenu: function(e) {
+        e.preventDefault();
+
+        const chevronOffset = 12;
+        this._openContextMenu(e.clientX, e.clientY - (chevronOffset + 8), chevronOffset);
     },
 
     onMouseOver: function() {
@@ -164,7 +175,7 @@ export default React.createClass({
             <div className="mx_TagTile_context_button" onClick={this.onContextButtonClick}>
                 { "\u00B7\u00B7\u00B7" }
             </div> : <div />;
-        return <AccessibleButton className={className} onClick={this.onClick}>
+        return <AccessibleButton className={className} onClick={this.onClick} onContextMenu={this.onContextMenu}>
             <div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
                 <BaseAvatar
                     name={name}

From baf0d3798371146bfc2275335b6bc90e7b26602a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 07:56:04 +0100
Subject: [PATCH 355/702] un-break having no displayname user settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/settings/ChangeDisplayName.js       | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index a74e223349..238fd9c2c3 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,21 +24,14 @@ import { _t } from '../../../languageHandler';
 module.exports = React.createClass({
     displayName: 'ChangeDisplayName',
 
-    _getDisplayName: function() {
+    _getDisplayName: async function() {
         const cli = MatrixClientPeg.get();
-        return cli.getProfileInfo(cli.credentials.userId).then(function(result) {
-            let displayname = result.displayname;
-            if (!displayname) {
-                if (MatrixClientPeg.get().isGuest()) {
-                    displayname = "Guest " + MatrixClientPeg.get().getUserIdLocalpart();
-                } else {
-                    displayname = MatrixClientPeg.get().getUserIdLocalpart();
-                }
-            }
-            return displayname;
-        }, function(error) {
+        try {
+            const res = await cli.getProfileInfo(cli.getUserId());
+            return res.displayname;
+        } catch (e) {
             throw new Error("Failed to fetch display name");
-        });
+        }
     },
 
     _changeDisplayName: function(new_displayname) {

From 9fa7cb863567db08bda30bbff6351dd5a7cbc977 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 07:57:28 +0100
Subject: [PATCH 356/702] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/settings/ChangeDisplayName.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index 238fd9c2c3..afe1521f0f 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -15,10 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-const React = require('react');
-const sdk = require('../../../index');
-const MatrixClientPeg = require("../../../MatrixClientPeg");
+import React from 'react';
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
@@ -34,10 +33,10 @@ module.exports = React.createClass({
         }
     },
 
-    _changeDisplayName: function(new_displayname) {
+    _changeDisplayName: function(newDisplayname) {
         const cli = MatrixClientPeg.get();
-        return cli.setDisplayName(new_displayname).catch(function(e) {
-            throw new Error("Failed to set display name");
+        return cli.setDisplayName(newDisplayname).catch(function(e) {
+            throw new Error("Failed to set display name", e);
         });
     },
 

From fffb8379d8e2c4c9abefb242624ffd045a25672e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 08:37:11 +0100
Subject: [PATCH 357/702] delint MImageBody, fixes anonymous class and
 hyphenated style keys which made react cry

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/MImageBody.js | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 1b6bdeb588..e2ff697e55 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,8 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
@@ -29,9 +28,7 @@ import Promise from 'bluebird';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 
-export default class extends React.Component {
-    displayName: 'MImageBody'
-
+export default class MImageBody extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
         mxEvent: PropTypes.object.isRequired,
@@ -41,11 +38,11 @@ export default class extends React.Component {
 
         /* the maximum image height to use */
         maxImageHeight: PropTypes.number,
-    }
+    };
 
     static contextTypes = {
         matrixClient: PropTypes.instanceOf(MatrixClient),
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -90,7 +87,7 @@ export default class extends React.Component {
     }
 
     onClick(ev) {
-        if (ev.button == 0 && !ev.metaKey) {
+        if (ev.button === 0 && !ev.metaKey) {
             ev.preventDefault();
             const content = this.props.mxEvent.getContent();
             const httpUrl = this._getContentUrl();
@@ -177,9 +174,7 @@ export default class extends React.Component {
                 return this.state.decryptedThumbnailUrl;
             }
             return this.state.decryptedUrl;
-        } else if (content.info &&
-                   content.info.mimetype == "image/svg+xml" &&
-                   content.info.thumbnail_url) {
+        } else if (content.info && content.info.mimetype === "image/svg+xml" && content.info.thumbnail_url) {
             // special case to return client-generated thumbnails for SVGs, if any,
             // given we deliberately don't thumbnail them serverside to prevent
             // billion lol attacks and similar
@@ -299,7 +294,7 @@ export default class extends React.Component {
             // which has the same width as the timeline
             // mx_MImageBody_thumbnail resizes img to exactly container size
             img = <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
-                style={{ "max-width": maxWidth + "px" }}
+                style={{ maxWidth: maxWidth + "px" }}
                 alt={content.body}
                 onError={this.onImageError}
                 onLoad={this.onImageLoad}
@@ -308,14 +303,14 @@ export default class extends React.Component {
         }
 
         const thumbnail = (
-            <div className="mx_MImageBody_thumbnail_container" style={{ "max-height": maxHeight + "px" }} >
+            <div className="mx_MImageBody_thumbnail_container" style={{ maxHeight: maxHeight + "px" }} >
                 { /* Calculate aspect ratio, using %padding will size _container correctly */ }
-                <div style={{ paddingBottom: (100 * infoHeight / infoWidth) + '%' }}></div>
+                <div style={{ paddingBottom: (100 * infoHeight / infoWidth) + '%' }} />
 
                 { showPlaceholder &&
                     <div className="mx_MImageBody_thumbnail" style={{
                         // Constrain width here so that spinner appears central to the loaded thumbnail
-                        "max-width": infoWidth + "px",
+                        maxWidth: infoWidth + "px",
                     }}>
                         <div className="mx_MImageBody_thumbnail_spinner">
                             { placeholder }

From 6200c147a6165dd2543765720b5f19c5d539de68 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 08:41:24 +0100
Subject: [PATCH 358/702] Upload File confirmation modal steals focus, send it
 back to composer

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 97e575ff4e..4beafb099c 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -913,6 +913,8 @@ module.exports = React.createClass({
     },
 
     uploadFile: async function(file) {
+        dis.dispatch({action: 'focus_composer'});
+
         if (MatrixClientPeg.get().isGuest()) {
             dis.dispatch({action: 'view_set_mxid'});
             return;

From 72f50a8c61e279829c89ec9264894afd0de8d44d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 11:51:06 +0100
Subject: [PATCH 359/702] rewrite group permalinks in <a hrefs> also

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 7ca404be31..4f66468373 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -216,10 +216,16 @@ const sanitizeHtmlParams = {
                     m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN);
                     if (m) {
                         const entity = m[1];
-                        if (entity[0] === '@') {
-                            attribs.href = '#/user/' + entity;
-                        } else if (entity[0] === '#' || entity[0] === '!') {
-                            attribs.href = '#/room/' + entity;
+                        switch (entity[0]) {
+                            case '@':
+                                attribs.href = '#/user/' + entity;
+                                break;
+                            case '+':
+                                attribs.href = '#/group/' + entity;
+                                break;
+                            case '#': case '!':
+                                attribs.href = '#/room/' + entity;
+                                break;
                         }
                         delete attribs.target;
                     }

From b79cd205a06fed509544e4d927aa0e01fe0a26fb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 11:52:48 +0100
Subject: [PATCH 360/702] Support autocompleting Communities

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/Autocompleter.js     |   4 +-
 src/autocomplete/CommunityProvider.js | 122 ++++++++++++++++++++++++++
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 src/autocomplete/CommunityProvider.js

diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index 3d30363d9f..6ad90eaebe 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 Aviral Dasgupta
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ limitations under the License.
 
 import type {Component} from 'react';
 import CommandProvider from './CommandProvider';
+import CommunityProvider from './CommunityProvider';
 import DuckDuckGoProvider from './DuckDuckGoProvider';
 import RoomProvider from './RoomProvider';
 import UserProvider from './UserProvider';
@@ -47,6 +48,7 @@ const PROVIDERS = [
     EmojiProvider,
     NotifProvider,
     CommandProvider,
+    CommunityProvider,
     DuckDuckGoProvider,
 ];
 
diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js
new file mode 100644
index 0000000000..db4d52fae2
--- /dev/null
+++ b/src/autocomplete/CommunityProvider.js
@@ -0,0 +1,122 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { _t } from '../languageHandler';
+import AutocompleteProvider from './AutocompleteProvider';
+import MatrixClientPeg from '../MatrixClientPeg';
+import FuzzyMatcher from './FuzzyMatcher';
+import {PillCompletion} from './Components';
+import sdk from '../index';
+import _sortBy from 'lodash/sortBy';
+import {makeGroupPermalink} from "../matrix-to";
+import type {Completion, SelectionRange} from "./Autocompleter";
+import FlairStore from "../stores/FlairStore";
+
+const COMMUNITY_REGEX = /(?=\+)(\S*)/g;
+
+function score(query, space) {
+    const index = space.indexOf(query);
+    if (index === -1) {
+        return Infinity;
+    } else {
+        return index;
+    }
+}
+
+export default class CommunityProvider extends AutocompleteProvider {
+    constructor() {
+        super(COMMUNITY_REGEX);
+        this.matcher = new FuzzyMatcher([], {
+            keys: ['groupId', 'name', 'shortDescription'],
+        });
+    }
+
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array<Completion> {
+        const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
+
+        // Disable autocompletions when composing commands because of various issues
+        // (see https://github.com/vector-im/riot-web/issues/4762)
+        if (/^(\/join|\/leave)/.test(query)) {
+            return [];
+        }
+
+        const cli = MatrixClientPeg.get();
+        let completions = [];
+        const {command, range} = this.getCurrentCommand(query, selection, force);
+        if (command) {
+            const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership !== 'invite');
+
+            const groups = (await Promise.all(joinedGroups.map(async ({avatarUrl, groupId, name=''}) => {
+                try {
+                    return FlairStore.getGroupProfileCached(cli, groupId);
+                } catch (e) { // if FlairStore failed, rely on js-sdk's store which lacks info
+                    return Promise.resolve({
+                        name,
+                        groupId,
+                        avatarUrl,
+                        shortDescription: '', // js-sdk doesn't store this
+                    });
+                }
+            })));
+
+            this.matcher.setObjects(groups);
+            // this.matcher.setObjects(joinedGroups);
+            // this.matcher.setObjects(joinedGroups.map(({groupId}) => {
+            //     const groupProfile = GroupStore.getSummary(groupId).profile;
+            //     if (groupProfile) {
+            //         return {
+            //             groupId,
+            //             name: groupProfile.name || '',
+            //             avatarUrl: groupProfile.avatar_url,
+            //         };
+            //     }
+            // })).filter(Boolean);
+
+            const matchedString = command[0];
+            completions = this.matcher.match(matchedString);
+            completions = _sortBy(completions, [
+                (c) => score(matchedString, c.groupId),
+                (c) => c.groupId.length,
+            ]).map(({avatarUrl, groupId, name}) => ({
+                completion: groupId,
+                suffix: ' ',
+                href: makeGroupPermalink(groupId),
+                component: (
+                    <PillCompletion initialComponent={
+                        <BaseAvatar name={name || groupId}
+                                    width={24} height={24}
+                                    url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 24, 24) : null} />
+                    } title={name} description={groupId} />
+                ),
+                range,
+            }))
+            .filter((completion) => !!completion.completion && completion.completion.length > 0)
+            .slice(0, 4);
+        }
+        return completions;
+    }
+
+    getName() {
+        return '💬 ' + _t('Communities');
+    }
+
+    renderCompletions(completions: [React.Component]): ?React.Component {
+        return <div className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate">
+            { completions }
+        </div>;
+    }
+}

From c1e608f1a83f359f21859a84aae7247ea32b89d1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 11:53:17 +0100
Subject: [PATCH 361/702] show permalinks to communities as Pills

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/elements/_RichText.scss |  5 +++-
 src/components/views/elements/Pill.js | 37 ++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 474a123455..eda9f6a4de 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -4,6 +4,7 @@
 
 .mx_UserPill,
 .mx_RoomPill,
+.mx_GroupPill,
 .mx_AtRoomPill {
     border-radius: 16px;
     display: inline-block;
@@ -13,7 +14,8 @@
 }
 
 .mx_EventTile_body .mx_UserPill,
-.mx_EventTile_body .mx_RoomPill {
+.mx_EventTile_body .mx_RoomPill,
+.mx_EventTile_body .mx_GroupPill {
     cursor: pointer;
 }
 
@@ -43,6 +45,7 @@
 
 .mx_UserPill .mx_BaseAvatar,
 .mx_RoomPill .mx_BaseAvatar,
+.mx_GroupPill .mx_BaseAvatar,
 .mx_AtRoomPill .mx_BaseAvatar {
     position: relative;
     left: -3px;
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 7e5ad379de..70e1d0659a 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,12 +23,13 @@ import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { MATRIXTO_URL_PATTERN } from '../../../linkify-matrix';
 import { getDisplayAliasForRoom } from '../../../Rooms';
+import FlairStore from "../../../stores/FlairStore";
 
 const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
-const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room)\/(([\#\!\@\+])[^\/]*)$/;
+const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room|group)\/(([#!@+])[^\/]*)$/;
 
 const Pill = React.createClass({
     statics: {
@@ -45,6 +47,7 @@ const Pill = React.createClass({
         },
         TYPE_USER_MENTION: 'TYPE_USER_MENTION',
         TYPE_ROOM_MENTION: 'TYPE_ROOM_MENTION',
+        TYPE_GROUP_MENTION: 'TYPE_GROUP_MENTION',
         TYPE_AT_ROOM_MENTION: 'TYPE_AT_ROOM_MENTION', // '@room' mention
     },
 
@@ -81,12 +84,14 @@ const Pill = React.createClass({
 
             // The member related to the user pill
             member: null,
+            // The group related to the group pill
+            group: null,
             // The room related to the room pill
             room: null,
         };
     },
 
-    componentWillReceiveProps(nextProps) {
+    async componentWillReceiveProps(nextProps) {
         let regex = REGEX_MATRIXTO;
         if (nextProps.inMessage) {
             regex = REGEX_LOCAL_MATRIXTO;
@@ -109,9 +114,11 @@ const Pill = React.createClass({
             '@': Pill.TYPE_USER_MENTION,
             '#': Pill.TYPE_ROOM_MENTION,
             '!': Pill.TYPE_ROOM_MENTION,
+            '+': Pill.TYPE_GROUP_MENTION,
         }[prefix];
 
         let member;
+        let group;
         let room;
         switch (pillType) {
             case Pill.TYPE_AT_ROOM_MENTION: {
@@ -140,8 +147,17 @@ const Pill = React.createClass({
                 }
             }
                 break;
+            case Pill.TYPE_GROUP_MENTION: {
+                const cli = MatrixClientPeg.get();
+
+                try {
+                    group = await FlairStore.getGroupProfileCached(cli, resourceId);
+                } catch (e) { // if FlairStore failed, rely on js-sdk's store which lacks info
+                    group = cli.getGroup(resourceId);
+                }
+            }
         }
-        this.setState({resourceId, pillType, member, room});
+        this.setState({resourceId, pillType, member, group, room});
     },
 
     componentWillMount() {
@@ -179,6 +195,7 @@ const Pill = React.createClass({
         });
     },
     render: function() {
+        const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
         const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
 
@@ -229,6 +246,20 @@ const Pill = React.createClass({
                 }
             }
                 break;
+            case Pill.TYPE_GROUP_MENTION: {
+                if (this.state.group) {
+                    const {avatarUrl, groupId, name} = this.state.group;
+                    const cli = MatrixClientPeg.get();
+
+                    linkText = groupId;
+                    if (this.props.shouldShowPillAvatar) {
+                        avatar = <BaseAvatar name={name || groupId} width={16} height={16}
+                                             url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 16, 16) : null} />;
+                    }
+                    pillClass = 'mx_RoomPill' || 'mx_GroupPill';
+                }
+            }
+                break;
         }
 
         const classes = classNames(pillClass, {

From 287745f8c6315c7f5a8183f5e24142e249cb3379 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 12:06:13 +0100
Subject: [PATCH 362/702] delint, remove unused imports and fix flow
 annotations

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/AutocompleteProvider.js | 14 +++++++-------
 src/autocomplete/Autocompleter.js        |  3 ++-
 src/autocomplete/CommandProvider.js      |  4 ++--
 src/autocomplete/DuckDuckGoProvider.js   |  5 +++--
 src/autocomplete/EmojiProvider.js        |  8 ++++----
 src/autocomplete/NotifProvider.js        |  3 ++-
 src/autocomplete/RoomProvider.js         |  5 +++--
 src/autocomplete/UserProvider.js         |  8 ++++----
 8 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/autocomplete/AutocompleteProvider.js b/src/autocomplete/AutocompleteProvider.js
index c93ae4fb2a..3fdb2998e7 100644
--- a/src/autocomplete/AutocompleteProvider.js
+++ b/src/autocomplete/AutocompleteProvider.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ export default class AutocompleteProvider {
     /**
      * Of the matched commands in the query, returns the first that contains or is contained by the selection, or null.
      */
-    getCurrentCommand(query: string, selection: {start: number, end: number}, force: boolean = false): ?string {
+    getCurrentCommand(query: string, selection: SelectionRange, force: boolean = false): ?string {
         let commandRegex = this.commandRegex;
 
         if (force && this.shouldForceComplete()) {
@@ -51,14 +51,14 @@ export default class AutocompleteProvider {
 
         let match;
         while ((match = commandRegex.exec(query)) != null) {
-            let matchStart = match.index,
-                matchEnd = matchStart + match[0].length;
-            if (selection.start <= matchEnd && selection.end >= matchStart) {
+            const start = match.index;
+            const end = start + match[0].length;
+            if (selection.start <= end && selection.end >= start) {
                 return {
                     command: match,
                     range: {
-                        start: matchStart,
-                        end: matchEnd,
+                        start,
+                        end,
                     },
                 };
             }
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index 6ad90eaebe..f5fec4c502 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -18,6 +18,7 @@ limitations under the License.
 // @flow
 
 import type {Component} from 'react';
+import {Room} from 'matrix-js-sdk';
 import CommandProvider from './CommandProvider';
 import CommunityProvider from './CommunityProvider';
 import DuckDuckGoProvider from './DuckDuckGoProvider';
@@ -56,7 +57,7 @@ const PROVIDERS = [
 const PROVIDER_COMPLETION_TIMEOUT = 3000;
 
 export default class Autocompleter {
-    constructor(room) {
+    constructor(room: Room) {
         this.room = room;
         this.providers = PROVIDERS.map((p) => {
             return new p(room);
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index b162f2f92a..5e96e612c2 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -22,7 +22,7 @@ import { _t, _td } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import FuzzyMatcher from './FuzzyMatcher';
 import {TextualCompletion} from './Components';
-import type {SelectionRange} from "./Autocompleter";
+import type {Completion, SelectionRange} from "./Autocompleter";
 
 // TODO merge this with the factory mechanics of SlashCommands?
 // Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file
@@ -124,7 +124,7 @@ export default class CommandProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean) {
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean): Array<Completion> {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!command) return [];
 
diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js
index 68d4915f56..e25ef16428 100644
--- a/src/autocomplete/DuckDuckGoProvider.js
+++ b/src/autocomplete/DuckDuckGoProvider.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import AutocompleteProvider from './AutocompleteProvider';
 import 'whatwg-fetch';
 
 import {TextualCompletion} from './Components';
+import type {SelectionRange} from "./Autocompleter";
 
 const DDG_REGEX = /\/ddg\s+(.+)$/g;
 const REFERRER = 'vector';
@@ -36,7 +37,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
          + `&format=json&no_redirect=1&no_html=1&t=${encodeURIComponent(REFERRER)}`;
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}) {
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false) {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!query || !command) {
             return [];
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index f4e576ea0f..81f6144fd3 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import {emojioneList, shortnameToImage, shortnameToUnicode, asciiRegexp, unicodeRegexp} from 'emojione';
+import {shortnameToUnicode, asciiRegexp, unicodeRegexp} from 'emojione';
 import FuzzyMatcher from './FuzzyMatcher';
 import sdk from '../index';
 import {PillCompletion} from './Components';
-import type {SelectionRange, Completion} from './Autocompleter';
+import type {Completion, SelectionRange} from './Autocompleter';
 import _uniq from 'lodash/uniq';
 import _sortBy from 'lodash/sortBy';
 import SettingsStore from "../settings/SettingsStore";
@@ -95,7 +95,7 @@ export default class EmojiProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange) {
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean): Array<Completion> {
         if (SettingsStore.getValue("MessageComposerInput.dontSuggestEmoji")) {
             return []; // don't give any suggestions if the user doesn't want them
         }
diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.js
index b7ac645525..842fb4fb18 100644
--- a/src/autocomplete/NotifProvider.js
+++ b/src/autocomplete/NotifProvider.js
@@ -20,6 +20,7 @@ import { _t } from '../languageHandler';
 import MatrixClientPeg from '../MatrixClientPeg';
 import {PillCompletion} from './Components';
 import sdk from '../index';
+import type {Completion, SelectionRange} from "./Autocompleter";
 
 const AT_ROOM_REGEX = /@\S*/g;
 
@@ -29,7 +30,7 @@ export default class NotifProvider extends AutocompleteProvider {
         this.room = room;
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}, force = false) {
+    async getCompletions(query: string, selection: SelectionRange, force?:boolean = false): Array<Completion> {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
         const client = MatrixClientPeg.get();
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 31599703c2..c222ae95d4 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import {getDisplayAliasForRoom} from '../Rooms';
 import sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../matrix-to";
+import type {Completion, SelectionRange} from "./Autocompleter";
 
 const ROOM_REGEX = /(?=#)(\S*)/g;
 
@@ -46,7 +47,7 @@ export default class RoomProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}, force = false) {
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array<Completion> {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
         // Disable autocompletions when composing commands because of various issues
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index ce8f1020a1..85837d5ebb 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -2,7 +2,7 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,12 +23,12 @@ import AutocompleteProvider from './AutocompleteProvider';
 import {PillCompletion} from './Components';
 import sdk from '../index';
 import FuzzyMatcher from './FuzzyMatcher';
-import _pull from 'lodash/pull';
 import _sortBy from 'lodash/sortBy';
 import MatrixClientPeg from '../MatrixClientPeg';
 
 import type {Room, RoomMember} from 'matrix-js-sdk';
 import {makeUserPermalink} from "../matrix-to";
+import type {SelectionRange} from "./Autocompleter";
 
 const USER_REGEX = /@\S*/g;
 
@@ -36,7 +36,7 @@ export default class UserProvider extends AutocompleteProvider {
     users: Array<RoomMember> = null;
     room: Room = null;
 
-    constructor(room) {
+    constructor(room: Room) {
         super(USER_REGEX, {
             keys: ['name'],
         });
@@ -87,7 +87,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.users = null;
     }
 
-    async getCompletions(query: string, selection: {start: number, end: number}, force = false) {
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false) {
         const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
 
         // Disable autocompletions when composing commands because of various issues

From 5cc15b2e0325bdf5f20f580c5666c851055ad29c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Jun 2018 19:11:22 +0100
Subject: [PATCH 363/702] add additional classes which protect the text from
 overflowing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/groups/GroupInviteTile.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 25dba130f9..7c471cca2e 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -125,9 +125,7 @@ export default React.createClass({
 
         const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;
 
-        const nameClasses = classNames({
-            'mx_RoomTile_name': true,
-            'mx_RoomTile_invite': this.props.isInvite,
+        const nameClasses = classNames('mx_RoomTile_name mx_RoomTile_invite mx_RoomTile_badgeShown', {
             'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed,
         });
 

From e67dae704ab7dc2ba1809a7ed5c2d35350ff96e5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Jun 2018 09:57:11 +0100
Subject: [PATCH 364/702] Take replies out of labs!

---
 .../views/context_menus/MessageContextMenu.js        | 12 +++++-------
 src/components/views/elements/ReplyThread.js         |  2 +-
 src/components/views/messages/TextualBody.js         |  3 +--
 src/components/views/rooms/MessageComposerInput.js   |  2 +-
 src/settings/Settings.js                             |  6 ------
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index bdd267c4ee..59cdb61fd6 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -253,13 +253,11 @@ module.exports = React.createClass({
                     </div>
                 );
 
-                if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
-                    replyButton = (
-                        <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
-                            { _t('Reply') }
-                        </div>
-                    );
-                }
+                replyButton = (
+                    <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
+                        { _t('Reply') }
+                    </div>
+                );
 
                 if (this.state.canPin) {
                     pinButton = (
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 6714de81a4..f9f3f4ca97 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -160,7 +160,7 @@ export default class ReplyThread extends React.Component {
     }
 
     static makeThread(parentEv, onWidgetLoad, ref) {
-        if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !ReplyThread.getParentEventId(parentEv)) {
+        if (!ReplyThread.getParentEventId(parentEv)) {
             return <div />;
         }
         return <ReplyThread parentEv={parentEv} onWidgetLoad={onWidgetLoad} ref={ref} />;
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 60377a47d7..20cf2b69f4 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -423,8 +423,7 @@ module.exports = React.createClass({
         const mxEvent = this.props.mxEvent;
         const content = mxEvent.getContent();
 
-        const stripReply = SettingsStore.isFeatureEnabled("feature_rich_quoting") &&
-            ReplyThread.getParentEventId(mxEvent);
+        const stripReply = ReplyThread.getParentEventId(mxEvent);
         let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
             disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'),
             // Part of Replies fallback support
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 57d433e55c..c59bee641f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1181,7 +1181,7 @@ export default class MessageComposerInput extends React.Component {
         return (
             <div className="mx_MessageComposer_input_wrapper">
                 <div className="mx_MessageComposer_autocomplete_wrapper">
-                    { SettingsStore.isFeatureEnabled("feature_rich_quoting") && <ReplyPreview /> }
+                    <ReplyPreview />
                     <Autocomplete
                         ref={(e) => this.autocomplete = e}
                         room={this.props.room}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 039bd78d79..40bb2dd57e 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -76,12 +76,6 @@ export const SETTINGS = {
     //     // level is always appended to the end.
     //     supportedLevelsAreOrdered: false,
     // },
-    "feature_rich_quoting": {
-        isFeature: true,
-        displayName: _td("Message Replies"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),

From 0e8b4ac2ad472cab7ad2f40a9d5424f285c56023 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Jun 2018 10:01:09 +0100
Subject: [PATCH 365/702] i18n & prunei18n

---
 src/i18n/strings/bg.json      |  5 ---
 src/i18n/strings/ca.json      |  5 ---
 src/i18n/strings/cs.json      |  5 ---
 src/i18n/strings/da.json      |  2 -
 src/i18n/strings/de_DE.json   |  5 ---
 src/i18n/strings/el.json      |  2 -
 src/i18n/strings/en_EN.json   | 73 ++++++++++++++++-------------------
 src/i18n/strings/en_US.json   |  2 -
 src/i18n/strings/eo.json      |  5 ---
 src/i18n/strings/es.json      |  2 -
 src/i18n/strings/eu.json      |  5 ---
 src/i18n/strings/fi.json      |  4 --
 src/i18n/strings/fr.json      |  5 ---
 src/i18n/strings/gl.json      |  5 ---
 src/i18n/strings/hu.json      |  5 ---
 src/i18n/strings/it.json      |  5 ---
 src/i18n/strings/ko.json      |  2 -
 src/i18n/strings/lv.json      |  5 ---
 src/i18n/strings/nl.json      |  5 ---
 src/i18n/strings/pl.json      |  2 -
 src/i18n/strings/pt.json      |  2 -
 src/i18n/strings/pt_BR.json   |  5 ---
 src/i18n/strings/ru.json      |  5 ---
 src/i18n/strings/sk.json      |  5 ---
 src/i18n/strings/sq.json      |  2 -
 src/i18n/strings/sr.json      |  5 ---
 src/i18n/strings/sv.json      |  5 ---
 src/i18n/strings/th.json      |  1 -
 src/i18n/strings/tr.json      |  2 -
 src/i18n/strings/zh_Hans.json |  5 ---
 src/i18n/strings/zh_Hant.json |  5 ---
 31 files changed, 34 insertions(+), 157 deletions(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 0b1305f3e8..f3c12edecb 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -136,7 +136,6 @@
     "Missing room_id in request": "Липсва room_id в заявката",
     "Room %(roomId)s not visible": "Стая %(roomId)s не е видима",
     "Missing user_id in request": "Липсва user_id в заявката",
-    "Failed to lookup current room": "Неуспешно намиране на текущата стая",
     "/ddg is not a command": "/ddg не е команда",
     "To use it, just wait for autocomplete results to load and tab through them.": "За използване, изчакайте зареждането на списъка с предложения и изберете от него.",
     "Unrecognised room alias:": "Непознат псевдоним на стая:",
@@ -206,7 +205,6 @@
     "Failed to join room": "Неуспешно присъединяване към стаята",
     "Message Replies": "Отговори на съобщението",
     "Message Pinning": "Функция за закачане на съобщения",
-    "Tag Panel": "Панел с етикети",
     "Disable Emoji suggestions while typing": "Изключване на предложенията за емотиконите при писане",
     "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения",
     "Hide removed messages": "Скриване на премахнати съобщения",
@@ -491,7 +489,6 @@
     "Decrypt %(text)s": "Разшифровай %(text)s",
     "Download %(text)s": "Изтегли %(text)s",
     "(could not connect media)": "(неуспешно свързване на медийните устройства)",
-    "Must be viewing a room": "Трябва да извършите това в стая",
     "Usage": "Употреба",
     "Remove from community": "Премахни от общността",
     "Disinvite this user from community?": "Оттегляне на поканата към този потребител от общността?",
@@ -520,8 +517,6 @@
     "Community %(groupId)s not found": "Общност %(groupId)s не е намерена",
     "Create a new community": "Създаване на нова общност",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Създайте общност, за да групирате потребители и стаи! Изградете персонализирана начална страница, за да маркирате своето пространство в Matrix Вселената.",
-    "Join an existing community": "Присъединяване към съществуваща общност",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "За да се присъедините към вече съществуваща общност, трябва да знаете нейния идентификатор; той изглежда нещо подобно на <i>+example:matrix.org</i>.",
     "Unknown (user, device) pair:": "Непозната двойка (потребител, устройство):",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Подписващият ключ, който сте предоставили, съвпада с подписващия ключ, който сте получили от устройството %(deviceId)s на %(userId)s. Устройството е маркирано като потвърдено.",
     "Hide avatars in user and room mentions": "Скриване на аватара на потребители и стаи при споменаването им",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index bd8452f0ba..5b3732d725 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -134,10 +134,8 @@
     "You are not in this room.": "No heu entrat a aquesta sala.",
     "You do not have permission to do that in this room.": "No teniu el permís per realitzar aquesta acció en aquesta sala.",
     "Missing room_id in request": "Falta l'ID de la sala en la vostra sol·licitud",
-    "Must be viewing a room": "Hauríeu de veure una sala",
     "Room %(roomId)s not visible": "La sala %(roomId)s no és visible",
     "Missing user_id in request": "Falta l'ID d'usuari a la vostre sol·licitud",
-    "Failed to lookup current room": "No s'ha pogut buscar la sala actual",
     "Usage": "Ús",
     "/ddg is not a command": "/ddg no és un comandament",
     "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-lo, simplement espereu que es completin els resultats automàticament i seleccioneu-ne el desitjat.",
@@ -213,7 +211,6 @@
     "Failed to join room": "No s'ha pogut entrar a la sala",
     "Message Replies": "Respostes del missatge",
     "Message Pinning": "Fixació de missatges",
-    "Tag Panel": "Tauler d'etiquetes",
     "Disable Emoji suggestions while typing": "Desactiva els suggeriments d'Emoji mentre s'escriu",
     "Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Amaga els missatges d'entrada i sortida (no afecta a les invitacions, expulsions o prohibicions)",
@@ -771,8 +768,6 @@
     "Error whilst fetching joined communities": "S'ha produït un error en buscar comunitats unides",
     "Create a new community": "Crea una nova comunitat",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunitat per agrupar usuaris i sales! Creeu una pàgina d'inici personalitzada per definir el vostre espai a l'univers Matrix.",
-    "Join an existing community": "Uneix-te a una comunitat existent",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Per unir-se a una comunitat existent, haureu de conèixer l'identificador de la comunitat; això es veurà com <i>+exemple:matrix.org</i>.",
     "You have no visible notifications": "No teniu cap notificació visible",
     "Scroll to bottom of page": "Desplaça't fins a la part inferior de la pàgina",
     "Message not sent due to unknown devices being present": "El missatge no s'ha enviat perquè hi ha dispositius desconeguts presents",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index e3ce9dcf08..b7298f80ab 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -632,9 +632,7 @@
     "Show these rooms to non-members on the community page and room list?": "Zobrazovat tyto místnosti na domovské stránce skupiny a v seznamu místností i pro nečleny?",
     "Restricted": "Omezené",
     "Missing room_id in request": "V zadání chybí room_id",
-    "Must be viewing a room": "Musí být zobrazena místnost",
     "Missing user_id in request": "V zadání chybí user_id",
-    "Failed to lookup current room": "Nepodařilo se vyhledat aktuální místnost",
     "(could not connect media)": "(média se nepodařilo spojit)",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s uskutečnil %(callType)s hovor.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).",
@@ -859,8 +857,6 @@
     "Error whilst fetching joined communities": "Při získávání vašich skupin se vyskytla chyba",
     "Create a new community": "Vytvořit novou skupinu",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvořte skupinu s cílem seskupit uživatele a místnosti! Vytvořte si vlastní domovskou stránku a vymezte tak váš prostor ve světe Matrix.",
-    "Join an existing community": "Vstoupit do existující skupiny",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Aby jste mohli vstoupit do existující skupiny, musíte znát její identifikátor; Měl by vypadat asi takto <i>+priklad:matrix.org</i>.",
     "You have no visible notifications": "Nejsou dostupná žádná oznámení",
     "Connectivity to the server has been lost.": "Spojení se serverem bylo přerušené.",
     "Sent messages will be stored until your connection has returned.": "Odeslané zprávy zůstanou uložené, dokud se spojení znovu neobnoví.",
@@ -918,7 +914,6 @@
     "Claimed Ed25519 fingerprint key": "Údajný klíč s otiskem prstu Ed25519",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tento proces vás provede importem šifrovacích klíčů, které jste si stáhli z jiného Matrix klienta. Po úspěšném naimportování budete v tomto klientovi moci dešifrovat všechny zprávy, které jste mohli dešifrovat v původním klientovi.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn heslem. Soubor můžete naimportovat pouze pokud zadáte odpovídající heslo.",
-    "Tag Panel": "Připnout panel",
     "Call Failed": "Hovor selhal",
     "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V této místnosti jsou neznámá zařízení: Pokud budete pokračovat bez jejich ověření, někdo může Váš hovor odposlouchávat.",
     "Review Devices": "Ověřit zařízení",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 18c30f29bc..e90de5edfc 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -193,10 +193,8 @@
     "You are not in this room.": "Du er ikke i dette rum.",
     "You do not have permission to do that in this room.": "Du har ikke tilladelse til at gøre dét i dette rum.",
     "Missing room_id in request": "Mangler room_id i forespørgsel",
-    "Must be viewing a room": "Du skal være i gang med at se på rummet",
     "Room %(roomId)s not visible": "rum %(roomId)s ikke synligt",
     "Missing user_id in request": "Manglende user_id i forespørgsel",
-    "Failed to lookup current room": "Kunne ikke slå nuværende rum op",
     "Usage": "Brug",
     "/ddg is not a command": "/ddg er ikke en kommando",
     "To use it, just wait for autocomplete results to load and tab through them.": "For at bruge det skal du bare vente på autocomplete resultaterne indlæser og tab'e igennem dem.",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ba31308e3a..6e1fff98c0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -249,7 +249,6 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".",
     "/ddg is not a command": "/ddg ist kein Kommando",
     "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.",
-    "Failed to lookup current room": "Fehler beim Nachschlagen des Raums",
     "Failed to send request.": "Anfrage konnte nicht gesendet werden.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s hat %(targetName)s eingeladen.",
@@ -264,7 +263,6 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für unbekannt (%(visibility)s).",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
     "Missing user_id in request": "Fehlende user_id in Anfrage",
-    "Must be viewing a room": "Muss einen Raum ansehen",
     "(not supported by this browser)": "(wird von diesem Browser nicht unterstützt)",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s startete einen %(callType)s-Anruf.",
     "Power level must be positive integer.": "Berechtigungslevel muss eine positive ganze Zahl sein.",
@@ -784,8 +782,6 @@
     "Failed to load %(groupId)s": "'%(groupId)s' konnte nicht geladen werden",
     "Error whilst fetching joined communities": "Fehler beim Laden beigetretener Communities",
     "Create a new community": "Neue Community erstellen",
-    "Join an existing community": "Einer bestehenden Community beitreten",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Um einer bereits bestehenden Community beitreten zu können, musst dir deren Community-ID bekannt sein. Diese sieht z. B. aus wie <i>+example:matrix.org</i>.",
     "Your Communities": "Deine Communities",
     "You're not currently a member of any communities.": "Du gehörst aktuell keiner Community an.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.",
@@ -950,7 +946,6 @@
     "Your homeserver's URL": "Die URL deines Homeservers",
     "Your identity server's URL": "Die URL deines Identitätsservers",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "Tag Panel": "Beschriftungsfeld",
     "Message Replies": "Antworten auf Nachrichten",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
     "Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index b3fecf86a2..74ff66ee13 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -424,7 +424,6 @@
     "Failed to ban user": "Δεν ήταν δυνατό ο αποκλεισμός του χρήστη",
     "Failed to change power level": "Δεν ήταν δυνατή η αλλαγή του επιπέδου δύναμης",
     "Failed to fetch avatar URL": "Δεν ήταν δυνατή η ανάκτηση της διεύθυνσης εικόνας",
-    "Failed to lookup current room": "Δεν ήταν δυνατή η εύρεση του τρέχοντος δωματίου",
     "Failed to unban": "Δεν ήταν δυνατή η άρση του αποκλεισμού",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s από %(fromPowerLevel)s σε %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Έχει απενεργοποιηθεί η πρόσβαση στους επισκέπτες σε αυτόν τον διακομιστή.",
@@ -447,7 +446,6 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο άγνωστο (%(visibility)s).",
     "Missing user_id in request": "Λείπει το user_id στο αίτημα",
     "Mobile phone number (optional)": "Αριθμός κινητού τηλεφώνου (προαιρετικό)",
-    "Must be viewing a room": "Πρέπει να βλέπετε ένα δωμάτιο",
     "Never send encrypted messages to unverified devices from this device": "Να μη γίνει ποτέ αποστολή κρυπτογραφημένων μηνυμάτων σε ανεπιβεβαίωτες συσκευές από αυτή τη συσκευή",
     "Never send encrypted messages to unverified devices in this room from this device": "Να μη γίνει ποτέ αποστολή κρυπτογραφημένων μηνυμάτων σε ανεπιβεβαίωτες συσκευές, σε αυτό το δωμάτιο, από αυτή τη συσκευή",
     "not set": "δεν έχει οριστεί",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 41f67ad9d9..e96fd3b887 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,10 +42,6 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -85,7 +81,6 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -116,10 +111,8 @@
     "You are not in this room.": "You are not in this room.",
     "You do not have permission to do that in this room.": "You do not have permission to do that in this room.",
     "Missing room_id in request": "Missing room_id in request",
-    "Must be viewing a room": "Must be viewing a room",
     "Room %(roomId)s not visible": "Room %(roomId)s not visible",
     "Missing user_id in request": "Missing user_id in request",
-    "Failed to lookup current room": "Failed to lookup current room",
     "Usage": "Usage",
     "/ddg is not a command": "/ddg is not a command",
     "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
@@ -184,13 +177,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",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Failed to join room": "Failed to join room",
     "Message Replies": "Message Replies",
     "Message Pinning": "Message Pinning",
-    "Tag Panel": "Tag Panel",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Hide removed messages": "Hide removed messages",
@@ -297,29 +294,6 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -419,11 +393,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -557,6 +531,29 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -876,6 +873,10 @@
     "Public Chat": "Public Chat",
     "Custom": "Custom",
     "Alias (optional)": "Alias (optional)",
+    "Reject invitation": "Reject invitation",
+    "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
+    "Unable to reject invite": "Unable to reject invite",
+    "Reject": "Reject",
     "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "Resend": "Resend",
     "Cancel Sending": "Cancel Sending",
@@ -895,7 +896,6 @@
     "Mentions only": "Mentions only",
     "Leave": "Leave",
     "Forget": "Forget",
-    "Reject": "Reject",
     "Low Priority": "Low Priority",
     "Direct Chat": "Direct Chat",
     "View Community": "View Community",
@@ -930,7 +930,6 @@
     "Failed to upload image": "Failed to upload image",
     "Failed to update community": "Failed to update community",
     "Unable to accept invite": "Unable to accept invite",
-    "Unable to reject invite": "Unable to reject invite",
     "Unable to join community": "Unable to join community",
     "Leave Community": "Leave Community",
     "Leave %(groupName)s?": "Leave %(groupName)s?",
@@ -956,8 +955,6 @@
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
     "Couldn't load home page": "Couldn't load home page",
     "Login": "Login",
-    "Reject invitation": "Reject invitation",
-    "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Failed to reject invitation": "Failed to reject invitation",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
@@ -978,8 +975,6 @@
     "Error whilst fetching joined communities": "Error whilst fetching joined communities",
     "Create a new community": "Create a new community",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
-    "Join an existing community": "Join an existing community",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.",
     "You have no visible notifications": "You have no visible notifications",
     "Members": "Members",
     "%(count)s Members|other": "%(count)s Members",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index dcd7366a55..6f0708f0c2 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -135,7 +135,6 @@
     "Failed to kick": "Failed to kick",
     "Failed to leave room": "Failed to leave room",
     "Failed to load timeline position": "Failed to load timeline position",
-    "Failed to lookup current room": "Failed to lookup current room",
     "Failed to mute user": "Failed to mute user",
     "Failed to reject invite": "Failed to reject invite",
     "Failed to reject invitation": "Failed to reject invitation",
@@ -227,7 +226,6 @@
     "Mobile phone number": "Mobile phone number",
     "Mobile phone number (optional)": "Mobile phone number (optional)",
     "Moderator": "Moderator",
-    "Must be viewing a room": "Must be viewing a room",
     "Mute": "Mute",
     "Name": "Name",
     "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 5982871d8f..abcbcd636a 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -90,10 +90,8 @@
     "You are not in this room.": "Vi ne estas en tiu ĉi ĉambro.",
     "You do not have permission to do that in this room.": "Vi ne havas permeson fari tion en tiu ĉi ĉambro.",
     "Missing room_id in request": "En peto mankas «room_id»",
-    "Must be viewing a room": "Necesas vidi ĉambron",
     "Room %(roomId)s not visible": "Ĉambro %(roomId)s ne videblas",
     "Missing user_id in request": "En peto mankas «user_id»",
-    "Failed to lookup current room": "Malsukcesis trovi nunan ĉambron",
     "Usage": "Uzo",
     "/ddg is not a command": "/ddg ne estas komando",
     "To use it, just wait for autocomplete results to load and tab through them.": "Por uzi ĝin, atendu aperon de sugestaj rezultoj, kaj tabu tra ili.",
@@ -165,7 +163,6 @@
     "Authentication check failed: incorrect password?": "Aŭtentiga kontrolo malsukcesis: ĉu pro malĝusta pasvorto?",
     "Failed to join room": "Malsukcesis aliĝi al ĉambro",
     "Message Pinning": "Fikso de mesaĝoj",
-    "Tag Panel": "Etikeda panelo",
     "Disable Emoji suggestions while typing": "Malŝalti mienetajn sugestojn dum tajpado",
     "Use compact timeline layout": "Uzi densan okazordan aranĝon",
     "Hide removed messages": "Kaŝi forigitajn mesaĝojn",
@@ -746,8 +743,6 @@
     "Error whilst fetching joined communities": "Okazis eraro dum venigado de viaj komunumoj",
     "Create a new community": "Krei novan komunumon",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Kreu komunumon por kunigi uzantojn kaj ĉambrojn! Fari propran hejmpaĝon por montri vian spacon en la universo de Matrix.",
-    "Join an existing community": "Aliĝi al jama komunumo",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Por aliĝi al jama komunumo, vi devos scii ĝian komunuman identigilon; ĝi aspektas proksimume tiel ĉi: <i>+ekzemplo:matrix.org</i>.",
     "You have no visible notifications": "Neniuj videblaj sciigoj",
     "Scroll to bottom of page": "Rulumi al susbo de la paĝo",
     "Message not sent due to unknown devices being present": "Mesaĝoj ne sendiĝis pro ĉeesto de nekonataj aparatoj",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index e0e3c91bcd..5434c570f7 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -108,7 +108,6 @@
     "Failed to kick": "Falló al expulsar",
     "Failed to leave room": "Falló al dejar la sala",
     "Failed to load timeline position": "Falló al cargar el historico",
-    "Failed to lookup current room": "Falló al buscar la actual sala",
     "Failed to mute user": "Falló al silenciar el usuario",
     "Failed to reject invite": "Falló al rechazar invitación",
     "Failed to reject invitation": "Falló al rechazar la invitación",
@@ -313,7 +312,6 @@
     "Mobile phone number": "Número de teléfono móvil",
     "Mobile phone number (optional)": "Número de teléfono móvil (opcional)",
     "Moderator": "Moderador",
-    "Must be viewing a room": "Debe estar viendo una sala",
     "Mute": "Silenciar",
     "%(serverName)s Matrix ID": "%(serverName)s ID de Matrix",
     "Name": "Nombre",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index f5367ba4f3..9526e87285 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -140,7 +140,6 @@
     "Identity Server is": "Identitate zerbitzaria:",
     "Mobile phone number (optional)": "Mugikor zenbakia (aukerazkoa)",
     "Moderator": "Moderatzailea",
-    "Must be viewing a room": "Gela bat ikusten egon behar da",
     "Account": "Kontua",
     "Access Token:": "Sarbide tokena:",
     "Active call (%(roomName)s)": "Dei aktiboa (%(roomName)s)",
@@ -243,7 +242,6 @@
     "Failed to kick": "Huts egin du kanporatzean",
     "Failed to leave room": "Huts egin du gelatik ateratzean",
     "Failed to load timeline position": "Huts egin du denbora-lerroko puntua kargatzean",
-    "Failed to lookup current room": "Huts egin du uneko gela bilatzean",
     "Failed to mute user": "Huts egin du erabiltzailea mututzean",
     "Failed to reject invite": "Huts egin du gonbidapena baztertzean",
     "Failed to reject invitation": "Huts egin du gonbidapena baztertzean",
@@ -722,7 +720,6 @@
     "%(names)s and %(count)s others are typing|one": "%(names)s eta beste bat idazten ari dira",
     "Send": "Bidali",
     "Message Pinning": "Mezuak finkatzea",
-    "Tag Panel": "Etiketen panela",
     "Hide avatar changes": "Ezkutatu abatar aldaketak",
     "Hide display name changes": "Ezkutatu pantaila izenen aldaketak",
     "Disable big emoji in chat": "Desgaitu emoji handiak txatean",
@@ -807,7 +804,6 @@
     "Old cryptography data detected": "Kriptografia datu zaharrak atzeman dira",
     "Your Communities": "Zure komunitateak",
     "Create a new community": "Sortu komunitate berria",
-    "Join an existing community": "Elkartu badagoen komunitate batetara",
     "Warning": "Abisua",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Kontuan izan %(hs)s zerbitzarira elkartu zarela, ez matrix.org.",
     "Sign in to get started": "Hasi saioa hasteko",
@@ -926,7 +922,6 @@
     "Custom of %(powerLevel)s": "%(powerLevel)s pertsonalizatua",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riot bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Bdagoen komunitate batera elkartzeko, komunitatearen identifikatzailea jakin behar duzu; honen antza izango du <i>+adibidea:matrix.org</i>.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
     "Light theme": "Itxura argia",
     "Dark theme": "Itxura iluna",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index ebcee3b6c6..d39091b619 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -450,7 +450,6 @@
     "End-to-end encryption is in beta and may not be reliable": "Päästä päähän salaus on vielä testausvaiheessa ja saattaa toimia epävarmasti",
     "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen.",
     "Existing Call": "Käynnissä oleva puhelu",
-    "Failed to lookup current room": "Nykyisen huoneen löytäminen epäonnistui",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liity käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>.",
     "%(targetName)s joined the room.": "%(targetName)s liittyi huoneeseen.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s poisti käyttäjän %(targetName)s huoneesta.",
@@ -458,7 +457,6 @@
     "Publish this room to the public in %(domain)s's room directory?": "Julkaise tämä huone domainin %(domain)s huoneluettelossa?",
     "Missing room_id in request": "room_id puuttuu kyselystä",
     "Missing user_id in request": "user_id puuttuu kyselystä",
-    "Must be viewing a room": "Pakko olla huoneessa",
     "Never send encrypted messages to unverified devices from this device": "Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tältä laitteelta",
     "Never send encrypted messages to unverified devices in this room from this device": "Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tässä huoneessa tältä laitteelta",
     "New address (e.g. #foo:%(localDomain)s)": "Uusi osoite (esim. #foo:%(localDomain)s)",
@@ -789,7 +787,6 @@
     "You're not currently a member of any communities.": "Et ole minkään yhteisön jäsen tällä hetkellä.",
     "Error whilst fetching joined communities": "Virhe ladatessa listaa yhteistöistä joihin olet liittynyt",
     "Create a new community": "Luo uusi yhteisö",
-    "Join an existing community": "Liity olemassaolevaan yhteisöön",
     "Light theme": "Vaalea ulkoasu",
     "Dark theme": "Tumma ulkoasu",
     "Status.im theme": "Status.im ulkoasu",
@@ -823,7 +820,6 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s pienoisohjelman lisännyt %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s pienoisohjelman poistanut %(senderName)s",
     "Send": "Lähetä",
-    "Tag Panel": "Tagit",
     "Delete %(count)s devices|other": "Poista %(count)s laitetta",
     "Delete %(count)s devices|one": "Poista laite",
     "Select devices": "Valitse laitteet",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c54975b54d..9e6115b853 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -105,7 +105,6 @@
     "Failed to kick": "Échec de l'exclusion",
     "Failed to leave room": "Échec du départ du salon",
     "Failed to load timeline position": "Échec du chargement de la position dans l'historique",
-    "Failed to lookup current room": "Échec de la recherche du salon actuel",
     "Failed to mute user": "Échec de la mise en sourdine de l'utilisateur",
     "Failed to reject invite": "Échec du rejet de l'invitation",
     "Failed to reject invitation": "Échec du rejet de l'invitation",
@@ -182,7 +181,6 @@
     "Missing user_id in request": "Absence du user_id dans la requête",
     "Mobile phone number": "Numéro de téléphone mobile",
     "Moderator": "Modérateur",
-    "Must be viewing a room": "Doit être en train de visualiser un salon",
     "%(serverName)s Matrix ID": "%(serverName)s identifiant Matrix",
     "Name": "Nom",
     "Never send encrypted messages to unverified devices from this device": "Ne jamais envoyer de message chiffré aux appareils non vérifiés depuis cet appareil",
@@ -863,8 +861,6 @@
     "Error whilst fetching joined communities": "Erreur lors de l'obtention des communautés rejointes",
     "Create a new community": "Créer une nouvelle communauté",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Créez une communauté pour grouper des utilisateurs et des salons ! Construisez une page d'accueil personnalisée pour distinguer votre espace dans l'univers Matrix.",
-    "Join an existing community": "Rejoindre une communauté existante",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Pour rejoindre une communauté existante, vous devrez connaître son identifiant. Cela ressemblera à <i>+exemple:matrix.org</i>.",
     "Disable Emoji suggestions while typing": "Désactiver les suggestions d'emojis lors de la saisie",
     "Disable big emoji in chat": "Désactiver les gros emojis dans les discussions",
     "Mirror local video feed": "Refléter le flux vidéo local",
@@ -918,7 +914,6 @@
     "Flair will appear if enabled in room settings": "Les badges n'apparaîtront que s'ils sont activés dans les paramètres de chaque salon",
     "Flair will not appear": "Les badges n'apparaîtront pas",
     "Display your community flair in rooms configured to show it.": "Sélectionnez les badges dans les paramètres de chaque salon pour les afficher.",
-    "Tag Panel": "Panneau des étiquettes",
     "Addresses": "Adresses",
     "expand": "développer",
     "collapse": "réduire",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index aaf84f717d..52feb86b30 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -93,7 +93,6 @@
     "You are not in this room.": "Vostede non está en esta sala.",
     "You do not have permission to do that in this room.": "Non ten permiso para facer eso en esta sala.",
     "Missing room_id in request": "Falta o room_id na petición",
-    "Must be viewing a room": "Debería estar vendo unha sala",
     "Room %(roomId)s not visible": "A sala %(roomId)s non é visible",
     "Missing user_id in request": "Falata o user_id na petición",
     "Usage": "Uso",
@@ -169,7 +168,6 @@
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
     "Failed to join room": "Non se puido unir a sala",
     "Message Pinning": "Fixando mensaxe",
-    "Tag Panel": "Panel de etiquetas",
     "Disable Emoji suggestions while typing": "Deshabilitar a suxestión de Emoji mentras escribe",
     "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
     "Hide removed messages": "Ocultar mensaxes eliminadas",
@@ -752,8 +750,6 @@
     "Error whilst fetching joined communities": "Fallo mentras se obtiñas as comunidades unidas",
     "Create a new community": "Crear unha nova comunidade",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.",
-    "Join an existing community": "Unirse a unha comunidade existente",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como <i>+exemplo:matrix.org</i>.",
     "You have no visible notifications": "Non ten notificacións visibles",
     "Scroll to bottom of page": "Desplácese ate o final da páxina",
     "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos",
@@ -959,7 +955,6 @@
     "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
     "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
-    "Failed to lookup current room": "Fallo ao bloquear a sala actual",
     "Disable Community Filter Panel": "Deshabilitar o panel de filtro de comunidades",
     "Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave -  por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Si rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 64d97ece1f..425f03b180 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -168,7 +168,6 @@
     "Failed to kick": "Kirúgás nem sikerült",
     "Failed to leave room": "A szobát nem sikerült elhagyni",
     "Failed to load timeline position": "Az idővonal pozíciót nem sikerült betölteni",
-    "Failed to lookup current room": "Az aktuális szoba felkeresése sikertelen",
     "Failed to mute user": "A felhasználót nem sikerült hallgatásra bírni",
     "Failed to reject invite": "A meghívót nem sikerült elutasítani",
     "Failed to reject invitation": "A meghívót nem sikerült elutasítani",
@@ -255,7 +254,6 @@
     "Mobile phone number": "Mobil telefonszám",
     "Mobile phone number (optional)": "Mobill telefonszám (opcionális)",
     "Moderator": "Moderátor",
-    "Must be viewing a room": "Meg kell nézni a szobát",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix azonosítóm",
     "Name": "Név",
     "Never send encrypted messages to unverified devices from this device": "Soha ne küldj titkosított üzenetet ellenőrizetlen eszközre erről az eszközről",
@@ -782,8 +780,6 @@
     "This Home server does not support communities": "Ez a saját szerver nem támogatja a közösségeket",
     "Error whilst fetching joined communities": "Hiba a csatlakozott közösségek betöltésénél",
     "Create a new community": "Új közösség létrehozása",
-    "Join an existing community": "Meglévő közösséghez csatlakozás",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Ahhoz hogy csatlakozni tudj egy meglévő közösséghez ismerned kell a közösségi azonosítót ami például így nézhet ki: <i>+pelda:matrix.org</i>.",
     "example": "példa",
     "Failed to load %(groupId)s": "Nem sikerült betölteni: %(groupId)s",
     "Your Communities": "Közösségeid",
@@ -918,7 +914,6 @@
     "Something went wrong when trying to get your communities.": "Valami nem sikerült a közösségeid elérésénél.",
     "Display your community flair in rooms configured to show it.": "Közösségi jelvényeid megjelenítése azokban a szobákban ahol ez engedélyezett.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Ez a saját szerver egyetlen bejelentkezési metódust sem támogat amit ez a kliens ismer.",
-    "Tag Panel": "Címke panel",
     "Addresses": "Címek",
     "collapse": "becsuk",
     "expand": "kinyit",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 4728ee9106..6a7fa39965 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -160,10 +160,8 @@
     "You are not in this room.": "Non sei in questa stanza.",
     "You do not have permission to do that in this room.": "Non hai l'autorizzazione per farlo in questa stanza.",
     "Missing room_id in request": "Manca l'id_stanza nella richiesta",
-    "Must be viewing a room": "Devi vedere una stanza",
     "Room %(roomId)s not visible": "Stanza %(roomId)s non visibile",
     "Missing user_id in request": "Manca l'id_utente nella richiesta",
-    "Failed to lookup current room": "Impossibile cercare la stanza attuale",
     "Usage": "Utilizzo",
     "/ddg is not a command": "/ddg non è un comando",
     "To use it, just wait for autocomplete results to load and tab through them.": "Per usarlo, attendi l'autocompletamento dei risultati e selezionali con tab.",
@@ -231,7 +229,6 @@
     "Not a valid Riot keyfile": "Non è una chiave di Riot valida",
     "Authentication check failed: incorrect password?": "Controllo di autenticazione fallito: password sbagliata?",
     "Failed to join room": "Accesso alla stanza fallito",
-    "Tag Panel": "Pannello etichette",
     "Disable Emoji suggestions while typing": "Disattiva i suggerimenti delle emoji durante la digitazione",
     "Use compact timeline layout": "Usa impaginazione cronologia compatta",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Nascondi i messaggi di entrata/uscita (inviti/kick/ban esclusi)",
@@ -794,8 +791,6 @@
     "Error whilst fetching joined communities": "Errore nella rilevazione delle comunità a cui ti sei unito",
     "Create a new community": "Crea una nuova comunità",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunità per raggruppare utenti e stanze! Crea una pagina iniziale personalizzata per stabilire il tuo spazio nell'universo di Matrix.",
-    "Join an existing community": "Unisciti ad una comunità esistente",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Per unirti ad una comunità esistente devi conoscere il suo identificativo; è qualcosa del tipo <i>+esempio:matrix.org</i>.",
     "You have no visible notifications": "Non hai alcuna notifica visibile",
     "Scroll to bottom of page": "Scorri in fondo alla pagina",
     "Message not sent due to unknown devices being present": "Messaggio non inviato data la presenza di dispositivi sconosciuti",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index f0b6e81ba8..23b7efd97d 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -169,7 +169,6 @@
     "Failed to kick": "내쫓지 못했어요",
     "Failed to leave room": "방을 떠나지 못했어요",
     "Failed to load timeline position": "타임라인 위치를 불러오지 못했어요",
-    "Failed to lookup current room": "현재 방을 찾지 못했어요",
     "Failed to mute user": "사용자의 알림을 끄지 못했어요",
     "Failed to reject invite": "초대를 거절하지 못했어요",
     "Failed to reject invitation": "초대를 거절하지 못했어요",
@@ -257,7 +256,6 @@
     "Mobile phone number": "휴대 전화번호",
     "Mobile phone number (optional)": "휴대 전화번호 (선택)",
     "Moderator": "조정자",
-    "Must be viewing a room": "방을 둘러봐야만 해요",
     "Name": "이름",
     "Never send encrypted messages to unverified devices from this device": "이 장치에서 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요",
     "Never send encrypted messages to unverified devices in this room from this device": "이 장치에서 이 방의 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 91a7de7624..a7458a525f 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -153,7 +153,6 @@
     "Failed to kick": "Neizdevās izspert/padzīt (kick)",
     "Failed to leave room": "Neizdevās pamest istabu",
     "Failed to load timeline position": "Neizdevās ielādēt laikpaziņojumu pozīciju",
-    "Failed to lookup current room": "Neizdevās uziet pašreizējo istabu",
     "Failed to mute user": "Neizdevās apklusināt lietotāju",
     "Failed to reject invite": "Neizdevās noraidīt uzaicinājumu",
     "Failed to reject invitation": "Neizdevās noraidīt uzaicinājumu",
@@ -244,7 +243,6 @@
     "Mobile phone number": "Mobilā telefona numurs",
     "Mobile phone number (optional)": "Mobilā telefona numurs (nav obligāts)",
     "Moderator": "Moderators",
-    "Must be viewing a room": "Jāapskata istaba",
     "Mute": "Noklusināt (izslēgt skaņu)",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix Id",
     "Name": "Vārds",
@@ -721,7 +719,6 @@
     "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta",
     "Message Replies": "Atbildes uz ziņām",
     "Message Pinning": "Ziņu piekabināšana",
-    "Tag Panel": "Birku panelis",
     "Disable Emoji suggestions while typing": "Atspējot Emoji ieteikumus teksta rakstīšanas laikā",
     "Hide avatar changes": "Slēpt avatara izmaiņas",
     "Hide display name changes": "Slēpt attēlojamā/redzamā vārda izmaiņas",
@@ -972,8 +969,6 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "Vai zināji: Tu vari izmantot kopienas, lai filtrētu (atlasītu) savu Riot.im pieredzi!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Lai uzstādītu filtru, uzvelc kopienas avataru uz filtru paneļa ekrāna kreisajā malā. Lai redzētu tikai istabas un cilvēkus, kas saistīti ar šo kopienu, Tu vari klikšķināt uz avatara filtru panelī jebkurā brīdī.",
     "Create a new community": "Izveidot jaunu kopienu",
-    "Join an existing community": "Pievienoties esošai kopienai",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Lai pievienotos esošai kopienai Tev jāzina tā ID; tas izskatīties piemēram šādi <i>+paraugs:matrix.org</i>.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "Tagad<resendText>visas atkārtoti sūtīt</resendText> vai <cancelText>visas atcelt</cancelText>. Tu vari atzīmēt arī individuālas ziņas, kuras atkārtoti sūtīt vai atcelt.",
     "Clear filter": "Attīrīt filtru",
     "Debug Logs Submission": "Iesniegt atutošanas logfailus",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index d85982a3fc..90be5ee923 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -101,7 +101,6 @@
     "OK": "OK",
     "Failed to change password. Is your password correct?": "Wachtwoord wijzigen mislukt. Is uw wachtwoord juist?",
     "Moderator": "Moderator",
-    "Must be viewing a room": "Moet een ruimte weergeven",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
     "Name": "Naam",
     "New password": "Nieuw wachtwoord",
@@ -238,7 +237,6 @@
     "Failed to join room": "Niet gelukt om tot de ruimte toe te treden",
     "Failed to leave room": "Niet gelukt om de ruimte te verlaten",
     "Failed to load timeline position": "Niet gelukt om de tijdlijnpositie te laden",
-    "Failed to lookup current room": "Niet gelukt om de huidige ruimte op te zoeken",
     "Failed to mute user": "Niet gelukt om de gebruiker te dempen",
     "Failed to reject invite": "Niet gelukt om de uitnodiging te weigeren",
     "Failed to reject invitation": "Niet gelukt om de uitnodiging te weigeren",
@@ -708,7 +706,6 @@
     "Send": "Verstuur",
     "Message Pinning": "Boodschap vastpinnen",
     "Message Replies": "Antwoorden op bericht",
-    "Tag Panel": "Label Paneel",
     "Disable Emoji suggestions while typing": "Emoji suggesties tijdens het typen uitzetten",
     "Hide avatar changes": "Avatar veranderingen verbergen",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
@@ -927,8 +924,6 @@
     "Error whilst fetching joined communities": "Er is een fout opgetreden tijdens het ophalen van de gemeenschappen waar je lid van bent",
     "Create a new community": "Maak een nieuwe gemeenschap aan",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Maak een gemeenschap aan om gebruikers en ruimtes samen te groeperen! Bouw een aangepaste homepagina om je eigen plek in het Matrix universum te maken.",
-    "Join an existing community": "Treed tot een bestaande gemeenschap toe",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Je moet het gemeenschaps-ID weten om tot de gemeenschap toe te treden; dit zal er uitzien zoals <i>+voorbeeld:matrix.org</i>.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Toon apparaten</showDevicesText>, <sendAnywayText>Toch versturen</sendAnywayText> of <cancelText>annuleren</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "Je bericht was niet verstuurd.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "Nu alles <resendText>opnieuw versturen</resendText> of <cancelText>annuleren</cancelText>. Je kan ook individuele berichten selecteren om opnieuw te versturen of te annuleren.",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index d0b71cdb8d..367516675f 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -232,7 +232,6 @@
     "Failed to kick": "Nie udało się wykopać użytkownika",
     "Failed to leave room": "Nie udało się opuścić pokoju",
     "Failed to load timeline position": "Nie udało się wczytać pozycji osi czasu",
-    "Failed to lookup current room": "Nie udało się wyszukać aktualnego pokoju",
     "Failed to mute user": "Nie udało się wyciszyć użytkownika",
     "Failed to reject invite": "Nie udało się odrzucić zaproszenia",
     "Failed to reject invitation": "Nie udało się odrzucić zaproszenia",
@@ -434,7 +433,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Podany klucz podpisu odpowiada kluczowi podpisania otrzymanemu z urządzenia %(userId)s %(deviceId)s. Urządzenie oznaczone jako zweryfikowane.",
     "This email address is already in use": "Podany adres e-mail jest już w użyciu",
     "This email address was not found": "Podany adres e-mail nie został znaleziony",
-    "Must be viewing a room": "Musi być w trakcie wyświetlania pokoju",
     "The email address linked to your account must be entered.": "Musisz wpisać adres e-mail połączony z twoim kontem.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Rozmiar pliku '%(fileName)s' przekracza możliwy limit do przesłania na serwer domowy",
     "The file '%(fileName)s' failed to upload": "Przesyłanie pliku '%(fileName)s' nie powiodło się",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index d19eae40d4..7cc80cfc78 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -216,7 +216,6 @@
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
     "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
     "Existing Call": "Chamada em andamento",
-    "Failed to lookup current room": "Não foi possível buscar na sala atual",
     "Failed to send email": "Falha ao enviar email",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to set up conference call": "Não foi possível montar a chamada de conferência",
@@ -235,7 +234,6 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
-    "Must be viewing a room": "Tem que estar visualizando uma sala",
     "(not supported by this browser)": "(não é compatível com este navegador)",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.",
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index b786dc7182..700c7edecc 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -216,7 +216,6 @@
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
     "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
     "Existing Call": "Chamada em andamento",
-    "Failed to lookup current room": "Não foi possível buscar na sala atual",
     "Failed to send email": "Não foi possível enviar email",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to set up conference call": "Não foi possível montar a chamada de conferência",
@@ -235,7 +234,6 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
-    "Must be viewing a room": "Tem que estar visualizando uma sala",
     "(not supported by this browser)": "(não é compatível com este navegador)",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.",
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
@@ -685,7 +683,6 @@
     "Send": "Enviar",
     "Message Replies": "Respostas",
     "Message Pinning": "Fixar mensagem",
-    "Tag Panel": "Painel de tags",
     "Disable Emoji suggestions while typing": "Desativar sugestões de emojis enquanto estiver escrevendo",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada e de saída (não afeta convites, expulsões e banimentos)",
     "Hide avatar changes": "Ocultar alterações da imagem de perfil",
@@ -932,8 +929,6 @@
     "Error whilst fetching joined communities": "Erro baixando comunidades das quais você faz parte",
     "Create a new community": "Criar nova comunidade",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crie uma comunidade para agrupar em um mesmo local pessoas e salas! Monte uma página inicial personalizada para dar uma identidade ao seu espaço no universo Matrix.",
-    "Join an existing community": "Entrar numa comunidade existente",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Para entrar em uma comunidade, você terá que conhecer o seu ID; um ID de comunidade normalmente tem este formato: <i>+exemplo:matrix.org</i>.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Exibir dispositivos</showDevicesText>, <sendAnywayText>enviar assim mesmo</sendAnywayText> ou <cancelText>cancelar</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "Sua mensagem não foi enviada.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todas</resendText> ou <cancelText>cancelar todas</cancelText> agora. Você também pode selecionar mensagens individualmente a serem reenviadas ou canceladas.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 2ef28d03c6..48824c7394 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -155,7 +155,6 @@
     "Drop here to tag %(section)s": "Перетащите сюда, чтобы пометить как %(section)s",
     "%(senderName)s ended the call.": "%(senderName)s завершил(а) звонок.",
     "Existing Call": "Текущий вызов",
-    "Failed to lookup current room": "Не удалось найти текущую комнату",
     "Failed to send request.": "Не удалось отправить запрос.",
     "Failed to set up conference call": "Не удалось сделать конференц-звонок",
     "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить email: убедитесь, что вы перешли по ссылке в письме",
@@ -174,7 +173,6 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s сделал(а) историю комнаты видимой в неизвестном режиме (%(visibility)s).",
     "Missing room_id in request": "Отсутствует room_id в запросе",
     "Missing user_id in request": "Отсутствует user_id в запросе",
-    "Must be viewing a room": "Вы должны просматривать комнату",
     "(not supported by this browser)": "(не поддерживается этим браузером)",
     "Connectivity to the server has been lost.": "Связь с сервером потеряна.",
     "Sent messages will be stored until your connection has returned.": "Отправленные сообщения будут сохранены, пока соединение не восстановится.",
@@ -787,8 +785,6 @@
     "Error whilst fetching joined communities": "Ошибка при загрузке сообществ",
     "Create a new community": "Создать новое сообщество",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Создайте сообщество для объединения пользователей и комнат! Создайте собственную домашнюю страницу, чтобы выделить свое пространство во вселенной Matrix.",
-    "Join an existing community": "Присоединиться к существующему сообществу",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Чтобы присоединиться к существующему сообществу, вам нужно знать его ID; это будет выглядеть примерно так<i>+primer:matrix.org</i>.",
     "Something went wrong whilst creating your community": "При создании сообщества что-то пошло не так",
     "%(names)s and %(count)s others are typing|other": "%(names)s и еще %(count)s печатают",
     "And %(count)s more...|other": "Еще %(count)s…",
@@ -908,7 +904,6 @@
     "Unknown for %(duration)s": "Неизвестно %(duration)s",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить предупреждение о пустой комнате</nowarnText>?",
     "Something went wrong when trying to get your communities.": "Что-то пошло не так при попытке получить список ваших сообществ.",
-    "Tag Panel": "Панель тегов",
     "Delete %(count)s devices|other": "Удалить (%(count)s)",
     "Delete %(count)s devices|one": "Удалить",
     "Select devices": "Выбрать",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 5036699932..4988ac262b 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -84,10 +84,8 @@
     "You are not in this room.": "Nenachádzate sa v tejto miestnosti.",
     "You do not have permission to do that in this room.": "V tejto miestnosti nemáte oprávnenie na vykonanie takejto akcie.",
     "Missing room_id in request": "V požiadavke chýba room_id",
-    "Must be viewing a room": "Musí byť zobrazená miestnosť",
     "Room %(roomId)s not visible": "Miestnosť %(roomId)s nie je viditeľná",
     "Missing user_id in request": "V požiadavke chýba user_id",
-    "Failed to lookup current room": "Nepodarilo sa vyhľadať aktuálnu miestnosť",
     "Usage": "Použitie",
     "/ddg is not a command": "/ddg nie je žiaden príkaz",
     "To use it, just wait for autocomplete results to load and tab through them.": "Ak to chcete použiť, len počkajte na načítanie výsledkov automatického dopĺňania a cyklicky prechádzajte stláčaním klávesu tab..",
@@ -691,8 +689,6 @@
     "Error whilst fetching joined communities": "Pri získavaní vašich komunít sa vyskytla chyba",
     "Create a new community": "Vytvoriť novú komunitu",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvorte si komunitu s cieľom zoskupiť miestnosti a používateľov! Zostavte si vlastnú domovskú stránku a vymedzte tak svoj priestor vo svete Matrix.",
-    "Join an existing community": "Vstúpiť do existujúcej komunity",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Aby ste mohli vstúpiť do existujúcej komunity, musíte poznať jej identifikátor; Mal by vizerať nejako takto <i>+priklad:matrix.org</i>.",
     "You have no visible notifications": "Nie sú k dispozícii žiadne oznámenia",
     "Scroll to bottom of page": "Posunúť na spodok stránky",
     "Connectivity to the server has been lost.": "Spojenie so serverom bolo prerušené.",
@@ -907,7 +903,6 @@
     "Call": "Hovor",
     "Answer": "Prijať",
     "Send": "Odoslať",
-    "Tag Panel": "Panel so značkami",
     "Delete %(count)s devices|other": "Vymazať %(count)s zariadení",
     "Delete %(count)s devices|one": "Vymazať zariadenie",
     "Select devices": "Vybrať zariadenia",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 66f6f032b7..680c63e458 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -106,9 +106,7 @@
     "Power level must be positive integer.": "Niveli fuqie duhet të jetë numër i plotë pozitiv.",
     "You are not in this room.": "Ti nuk je në këtë dhomë.",
     "You do not have permission to do that in this room.": "Nuk ke leje të bësh këtë në këtë dhomë.",
-    "Must be viewing a room": "Duhet të shikohet një dhomë",
     "Room %(roomId)s not visible": "Dhoma %(roomId)s e padukshme",
-    "Failed to lookup current room": "Dhoma aktuale nuk mundi të kërkohej",
     "Usage": "Përdorimi",
     "/ddg is not a command": "/ddg s'është komandë",
     "To use it, just wait for autocomplete results to load and tab through them.": "Për të përdorur, thjesht prit derisa të mbushën rezultatat vetëplotësuese dhe pastaj shfletoji.",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index b8689454d4..86f1faade6 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -85,7 +85,6 @@
     "You are not in this room.": "Нисте у овој соби.",
     "You do not have permission to do that in this room.": "Немате овлашћење да урадите то у овој соби.",
     "Missing room_id in request": "Недостаје room_id у захтеву",
-    "Must be viewing a room": "Морате гледати собу",
     "Room %(roomId)s not visible": "Соба %(roomId)s није видљива",
     "Missing user_id in request": "Недостаје user_id у захтеву",
     "Call Failed": "Позивање неуспешно",
@@ -97,7 +96,6 @@
     "Answer": "Одговори",
     "Call Timeout": "Прекорачено време позивања",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
-    "Failed to lookup current room": "Неуспех при потраживању тренутне собе",
     "Usage": "Коришћење",
     "/ddg is not a command": "/ddg није наредба",
     "To use it, just wait for autocomplete results to load and tab through them.": "Да бисте је користили, само сачекајте да се исходи самодовршавања учитају и табом прођите кроз њих.",
@@ -172,7 +170,6 @@
     "Failed to join room": "Нисам успео да уђем у собу",
     "Message Replies": "Одговори",
     "Message Pinning": "Закачене поруке",
-    "Tag Panel": "Означи површ",
     "Disable Emoji suggestions while typing": "Онемогући предлагање емоџија приликом куцања",
     "Use compact timeline layout": "Користи збијени распоред временске линије",
     "Hide removed messages": "Сакриј уклоњене поруке",
@@ -778,8 +775,6 @@
     "Error whilst fetching joined communities": "Грешка приликом добављања списка са приступљеним заједницама",
     "Create a new community": "Направи нову заједницу",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Направите заједницу да бисте спојили кориснике и собе! Направите прилагођену почетну страницу да бисте означили ваш кутак у Матрикс универзуму.",
-    "Join an existing community": "Приступи већ постојећој заједници",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Да бисте приступили већ постојећој заједници, морате знати њен идентификатор заједнице. Ово изгледа нешто као <i>+primer:matrix.org</i>.",
     "You have no visible notifications": "Немате видљивих обавештења",
     "Scroll to bottom of page": "Превуци на дно странице",
     "Message not sent due to unknown devices being present": "Порука се неће послати због присутности непознатих уређаја",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 1ad48b27a3..2d81d0768b 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -128,7 +128,6 @@
     "Failed to kick": "Det gick inte att kicka",
     "Failed to leave room": "Det gick inte att lämna rummet",
     "Failed to load timeline position": "Det gick inte att hämta positionen på tidslinjen",
-    "Failed to lookup current room": "Det gick inte att hämta det nuvarande rummet",
     "Failed to mute user": "Det gick inte att dämpa användaren",
     "Failed to reject invite": "Det gick inte att avböja inbjudan",
     "Failed to reject invitation": "Det gick inte att avböja inbjudan",
@@ -240,7 +239,6 @@
     "Mobile phone number": "Telefonnummer",
     "Mobile phone number (optional)": "Telefonnummer (valfri)",
     "Moderator": "Moderator",
-    "Must be viewing a room": "Du måste ha ett öppet rum",
     "Mute": "Dämpa",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
     "Name": "Namn",
@@ -1066,8 +1064,6 @@
     "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.": "För att skapa ett filter, dra en community-avatar till filterpanelen längst till vänster på skärmen. Du kan när som helst klicka på en avatar i filterpanelen för att bara se rum och personer som är associerade med den communityn.",
     "Create a new community": "Skapa en ny community",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Skapa en community för att gruppera användare och rum! Bygg en anpassad hemsida för att markera er plats i Matrix-universumet.",
-    "Join an existing community": "Gå med i en befintlig community",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "För att gå med i en befintlig gemenskap behöver du ha community-ID; det ser ut som något i stil med <i>+exempel:matrix.org</i>.",
     "Invite to this community": "Bjud in till denna community",
     "Something went wrong when trying to get your communities.": "Något gick fel vid hämtning av dina communityn.",
     "You're not currently a member of any communities.": "Du är för närvarande inte medlem i någon community.",
@@ -1180,7 +1176,6 @@
     "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.": "Den exporterade filen kommer att låta någon som kan läsa den att dekryptera alla krypterade meddelanden som du kan se, så du bör vara noga med att hålla den säker. För att hjälpa till med detta, bör du ange en lösenfras nedan, som kommer att användas för att kryptera exporterad data. Det kommer bara vara möjligt att importera data genom att använda samma lösenfras.",
     "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.": "Denna process möjliggör import av krypteringsnycklar som tidigare exporterats från en annan Matrix-klient. Du kommer då kunna dekryptera alla meddelanden som den andra klienten kunde dekryptera.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Den exporterade filen kommer vara skyddad med en lösenfras. Du måste ange lösenfrasen här, för att dekryptera filen.",
-    "Tag Panel": "Tagg-panel",
     "Flair": "Emblem",
     "Showing flair for these communities:": "Visar emblem för dessa communityn:",
     "This room is not showing flair for any communities": "Detta rum visar inte emblem för några communityn",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 606c60e95a..3fe7bf8f98 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -132,7 +132,6 @@
     "Failed to join room": "การเข้าร่วมห้องล้มเหลว",
     "Failed to kick": "การเตะล้มเหลว",
     "Failed to leave room": "การออกจากห้องล้มเหลว",
-    "Failed to lookup current room": "การหาห้องปัจจุบันล้มเหลว",
     "Failed to reject invite": "การปฏิเสธคำเชิญล้มเหลว",
     "Failed to reject invitation": "การปฏิเสธคำเชิญล้มเหลว",
     "Failed to save settings": "การบันทึกการตั้งค่าล้มเหลว",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 1a8035a1db..04f78dc1ee 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -153,7 +153,6 @@
     "Failed to kick": "Atma(Kick) işlemi başarısız oldu",
     "Failed to leave room": "Odadan ayrılma başarısız oldu",
     "Failed to load timeline position": "Zaman çizelgesi konumu yüklenemedi",
-    "Failed to lookup current room": "Geçerli odayı aramak başarısız oldu",
     "Failed to mute user": "Kullanıcıyı sessize almak başarısız oldu",
     "Failed to reject invite": "Daveti reddetme başarısız oldu",
     "Failed to reject invitation": "Davetiyeyi reddetme başarısız oldu",
@@ -241,7 +240,6 @@
     "Mobile phone number": "Cep telefonu numarası",
     "Mobile phone number (optional)": "Cep telefonu numarası (isteğe bağlı)",
     "Moderator": "Moderatör",
-    "Must be viewing a room": "Bir oda görüntülemeli olmalı",
     "Mute": "Sessiz",
     "Name": "İsim",
     "Never send encrypted messages to unverified devices from this device": "Bu cihazdan doğrulanmamış cihazlara asla şifrelenmiş mesajlar göndermeyin",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 0fbd0a4ef3..28a1a35ef1 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -42,7 +42,6 @@
     "Failed to kick": "移除失败",
     "Failed to leave room": "无法退出聊天室",
     "Failed to load timeline position": "无法加载时间轴位置",
-    "Failed to lookup current room": "找不到当前聊天室",
     "Failed to mute user": "禁言用户失败",
     "Failed to reject invite": "拒绝邀请失败",
     "Failed to reject invitation": "拒绝邀请失败",
@@ -934,7 +933,6 @@
     "Create a new community": "创建新社区",
     "Error whilst fetching joined communities": "获取已加入社区列表时出现错误",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "创建社区，将用户与聊天室整合在一起！搭建自定义社区主页以在 Matrix 宇宙之中标记出您的私人空间。",
-    "Join an existing community": "加入已有的社区",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>显示未信任的设备</showDevicesText> 、 <sendAnywayText>不经信任直接发送</sendAnywayText> 或 <cancelText>取消发送</cancelText>。",
     "%(count)s of your messages have not been sent.|one": "您的消息尚未发送。",
     "Uploading %(filename)s and %(count)s others|other": "正在上传 %(filename)s 与其他 %(count)s 个文件",
@@ -961,7 +959,6 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "尝试加载此房间的时间线的特定时间点，但是无法找到。",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "现在 <resendText>重新发送消息</resendText> 或 <cancelText>取消发送</cancelText> 。",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "現在 <resendText>重新发送消息</resendText> 或 <cancelText>取消发送</cancelText> 。你也可以单独选择消息以重新发送或取消。",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "要加入已有的社区，你需要知道它的社区链接，比如 <i>+example:matrix.org</i>。",
     "Visibility in Room List": "是否在聊天室目录中可见",
     "Something went wrong when trying to get your communities.": "获取你加入的社区时发生错误。",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "删除小部件后，此聊天室中的所有用户的这个小部件都会被删除。你确定要删除这个小部件吗？",
@@ -1120,14 +1117,12 @@
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "这里没有其他人了！你是想 <inviteText>邀请用户</inviteText> 还是 <nowarnText>不再提示</nowarnText>？",
     "You need to be able to invite users to do that.": "你需要有邀请用户的权限才能进行此操作。",
     "Missing roomId.": "找不到此聊天室 ID 所对应的聊天室。",
-    "Tag Panel": "标签面板",
     "You have been banned from %(roomName)s by %(userName)s.": "您已被 %(userName)s 从聊天室 %(roomName)s 中封禁。",
     "You have been banned from this room by %(userName)s.": "您已被 %(userName)s 从此聊天室中封禁。",
     "Every page you use in the app": "您在 Riot 中使用的每一个页面",
     "e.g. <CurrentPageURL>": "例如：<CurrentPageURL>",
     "Your User Agent": "您的 User Agent",
     "Your device resolution": "您设备的分辨率",
-    "Must be viewing a room": "必须是在查看一个聊天室时",
     "Always show encryption icons": "总是显示加密标志",
     "At this time it is not possible to reply with a file so this will be sent without being a reply.": "目前无法以文件作为回复的内容，所以此文件将不作为回复，独立发送。",
     "Unable to reply": "无法回复",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index ff7650b36f..4250e87c3b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -78,7 +78,6 @@
     "Failed to kick": "踢人失敗",
     "Failed to leave room": "無法離開聊天室",
     "Failed to load timeline position": "無法加載時間軸位置",
-    "Failed to lookup current room": "找不到當前聊天室",
     "Failed to mute user": "禁言用戶失敗",
     "Failed to reject invite": "拒絕邀請失敗",
     "Failed to reject invitation": "拒絕邀請失敗",
@@ -336,7 +335,6 @@
     "Mobile phone number": "行動電話號碼",
     "Mobile phone number (optional)": "行動電話號碼（選擇性）",
     "Moderator": "仲裁者",
-    "Must be viewing a room": "必須檢視房間",
     "Name": "名稱",
     "Never send encrypted messages to unverified devices from this device": "從不自此裝置傳送加密的訊息到未驗證的裝置",
     "Never send encrypted messages to unverified devices in this room from this device": "從不在此房間中從此裝置上傳送未加密的訊息到未驗證的裝置",
@@ -704,7 +702,6 @@
     "Send": "傳送",
     "Message Replies": "訊息回覆",
     "Message Pinning": "訊息釘選",
-    "Tag Panel": "標籤面板",
     "Disable Emoji suggestions while typing": "在輸入時停用繪文字建議",
     "Hide avatar changes": "隱藏大頭貼變更",
     "Hide display name changes": "隱藏顯示名稱變更",
@@ -925,8 +922,6 @@
     "Error whilst fetching joined communities": "擷取已加入的社群時發生錯誤",
     "Create a new community": "建立新社群",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "建立社群以將使用者與聊天室湊成一組！建立自訂的首頁以在 Matrix 宇宙中標出您的空間。",
-    "Join an existing community": "加入既有的社群",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "要加入既有的社群，您必須知道它的社群標記符號；其看起來像是 <i>+example:matrix.org</i>.",
     "%(count)s of your messages have not been sent.|one": "您的訊息尚未傳送。",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "現在<resendText>重新傳送全部</resendText>或<cancelText>取消全部</cancelText>。您也可以選取單一訊息以重新傳送或取消。",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "現在<resendText>重新傳送訊息</resendText>或<cancelText>取消訊息</cancelText>。",

From 0011f23125d9e807c92c997babb46e351b2f2ae8 Mon Sep 17 00:00:00 2001
From: Miguel Branco <mgl.branco@gmail.com>
Date: Mon, 18 Jun 2018 21:04:42 +0000
Subject: [PATCH 366/702] Translated using Weblate (Galician)

Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 572da43dcf..091b7350fb 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -959,7 +959,7 @@
     "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
     "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
-    "Failed to lookup current room": "Fallo ao bloquear a sala actual",
+    "Failed to lookup current room": "Non se deu anovado a actual sala",
     "Disable Community Filter Panel": "Desactivar o panel de filtro de comunidades",
     "Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave -  por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Se rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.",
@@ -968,13 +968,13 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Volver a pedir chaves de cifrado</requestLink> desde os outros dispositivos.",
     "%(user)s is a %(userRole)s": "%(user)s é  %(userRole)s",
     "Flair": "Aura",
-    "Showing flair for these communities:": "Mostrar o aura para estas comunidades:",
-    "Flair will appear if enabled in room settings": "O Aura aparecerá si está activado nas preferencias da sala",
-    "Flair will not appear": "O Aura non aparecerá",
-    "Display your community flair in rooms configured to show it.": "Mostrar o aura da súa comunidade en salas configuradas para mostralo.",
+    "Showing flair for these communities:": "Mostrar a aura para estas comunidades:",
+    "Flair will appear if enabled in room settings": "A aura aparecerá se está activada nas preferencias da sala",
+    "Flair will not appear": "A aura non aparecerá",
+    "Display your community flair in rooms configured to show it.": "Mostrar a aura da súa comunidade nas salas configuradas para que a mostren.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con Riot.im!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
-    "Deops user with given id": "Degradar usuaria co id dado",
+    "Deops user with given id": "Degradar o usuario con esa ID",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s",
     "Code": "Código",
     "Unable to join community": "Non se puido unir a comunidade",

From e5a509bb91eb9d0638eab95bf8e8fed7a1a1e78f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Jun 2018 10:04:03 +0100
Subject: [PATCH 367/702] i18n & prunei18n

---
 src/i18n/strings/bg.json      | 1 -
 src/i18n/strings/ca.json      | 1 -
 src/i18n/strings/de_DE.json   | 1 -
 src/i18n/strings/en_EN.json   | 1 -
 src/i18n/strings/eu.json      | 1 -
 src/i18n/strings/fr.json      | 1 -
 src/i18n/strings/gl.json      | 1 -
 src/i18n/strings/hu.json      | 1 -
 src/i18n/strings/lv.json      | 1 -
 src/i18n/strings/nl.json      | 1 -
 src/i18n/strings/pt_BR.json   | 1 -
 src/i18n/strings/ru.json      | 1 -
 src/i18n/strings/sk.json      | 1 -
 src/i18n/strings/sr.json      | 1 -
 src/i18n/strings/sv.json      | 1 -
 src/i18n/strings/zh_Hans.json | 1 -
 src/i18n/strings/zh_Hant.json | 1 -
 17 files changed, 17 deletions(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index f3c12edecb..357b007a6f 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -203,7 +203,6 @@
     "Not a valid Riot keyfile": "Невалиден файл с ключ за Riot",
     "Authentication check failed: incorrect password?": "Неуспешна автентикация: неправилна парола?",
     "Failed to join room": "Неуспешно присъединяване към стаята",
-    "Message Replies": "Отговори на съобщението",
     "Message Pinning": "Функция за закачане на съобщения",
     "Disable Emoji suggestions while typing": "Изключване на предложенията за емотиконите при писане",
     "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 5b3732d725..98d51e99ac 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -209,7 +209,6 @@
     "Not a valid Riot keyfile": "El fitxer no és un fitxer de claus de Riot valid",
     "Authentication check failed: incorrect password?": "Ha fallat l'autenticació: heu introduït correctament la contrasenya?",
     "Failed to join room": "No s'ha pogut entrar a la sala",
-    "Message Replies": "Respostes del missatge",
     "Message Pinning": "Fixació de missatges",
     "Disable Emoji suggestions while typing": "Desactiva els suggeriments d'Emoji mentre s'escriu",
     "Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6e1fff98c0..0df2e84897 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -946,7 +946,6 @@
     "Your homeserver's URL": "Die URL deines Homeservers",
     "Your identity server's URL": "Die URL deines Identitätsservers",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "Message Replies": "Antworten auf Nachrichten",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
     "Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText>, <sendAnywayText>trotzdem senden</sendAnywayText> oder <cancelText>abbrechen</cancelText>.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e96fd3b887..6d39586c0a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -186,7 +186,6 @@
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Failed to join room": "Failed to join room",
-    "Message Replies": "Message Replies",
     "Message Pinning": "Message Pinning",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9526e87285..7c13228264 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -932,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Zure mezua ez da bidali.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Birbidali guztiak</resendText> edo <cancelText>baztertu guztiak</cancelText> orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain.",
-    "Message Replies": "Mezuei erantzunak",
     "Send an encrypted reply…": "Bidali zifratutako erantzun bat…",
     "Send a reply (unencrypted)…": "Bidali erantzun bat (zifratu gabea)…",
     "Send an encrypted message…": "Bidali zifratutako mezu bat…",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9e6115b853..cb5bc86515 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -932,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez aussi choisir des messages individuels à renvoyer ou annuler.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Renvoyer le message</resendText> ou <cancelText>annuler le message</cancelText> maintenant.",
-    "Message Replies": "Réponses",
     "Send an encrypted reply…": "Envoyer une réponse chiffrée…",
     "Send a reply (unencrypted)…": "Envoyer une réponse (non chiffrée)…",
     "Send an encrypted message…": "Envoyer un message chiffré…",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 52feb86b30..ec2643712a 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -232,7 +232,6 @@
     "Disable Notifications": "Deshabilitar notificacións",
     "Enable Notifications": "Habilitar notificacións",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s",
-    "Message Replies": "Respostas a mensaxe",
     "Mirror local video feed": "Copiar fonte de vídeo local",
     "Cannot add any more widgets": "Non pode engadir máis widgets",
     "The maximum permitted number of widgets have already been added to this room.": "Xa se engadeu o número máximo de widgets a esta sala.",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 425f03b180..4bbfe52d75 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -932,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Az üzeneted nem lett elküldve.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Újraküldöd mind</resendText> vagy <cancelText>elveted mind</cancelText>. Az üzeneteket egyenként is elküldheted vagy elvetheted.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Üzenet újraküldése</resendText> vagy <cancelText>üzenet elvetése</cancelText> most.",
-    "Message Replies": "Üzenet válaszok",
     "Send an encrypted reply…": "Titkosított válasz küldése…",
     "Send a reply (unencrypted)…": "Válasz küldése (titkosítatlanul)…",
     "Send an encrypted message…": "Titkosított üzenet küldése…",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index a7458a525f..0c6bcb0977 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -717,7 +717,6 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s un %(count)s citi raksta",
     "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta",
-    "Message Replies": "Atbildes uz ziņām",
     "Message Pinning": "Ziņu piekabināšana",
     "Disable Emoji suggestions while typing": "Atspējot Emoji ieteikumus teksta rakstīšanas laikā",
     "Hide avatar changes": "Slēpt avatara izmaiņas",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 90be5ee923..ea97531832 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -705,7 +705,6 @@
     "%(names)s and %(count)s others are typing|one": "%(names)s en iemand anders is aan het typen",
     "Send": "Verstuur",
     "Message Pinning": "Boodschap vastpinnen",
-    "Message Replies": "Antwoorden op bericht",
     "Disable Emoji suggestions while typing": "Emoji suggesties tijdens het typen uitzetten",
     "Hide avatar changes": "Avatar veranderingen verbergen",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 700c7edecc..c583e795cb 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -681,7 +681,6 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras pessoas estão escrevendo",
     "%(names)s and %(count)s others are typing|one": "%(names)s e uma outra pessoa estão escrevendo",
     "Send": "Enviar",
-    "Message Replies": "Respostas",
     "Message Pinning": "Fixar mensagem",
     "Disable Emoji suggestions while typing": "Desativar sugestões de emojis enquanto estiver escrevendo",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada e de saída (não afeta convites, expulsões e banimentos)",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 48824c7394..a82e5be64e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -932,7 +932,6 @@
     "%(count)s of your messages have not been sent.|one": "Ваше сообщение не было отправлено.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Отправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для отправки или отмены.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Отправить</resendText> или <cancelText>отменить</cancelText> сообщение сейчас.",
-    "Message Replies": "Сообщения-ответы",
     "Send an encrypted reply…": "Отправить зашифрованный ответ…",
     "Send a reply (unencrypted)…": "Отправить ответ (нешифрованный)…",
     "Send an encrypted message…": "Отправить зашифрованное сообщение…",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 4988ac262b..b1f3f4260d 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -929,7 +929,6 @@
     "Flair will not appear": "Príslušnosť ku komunite nebude zobrazená",
     "Display your community flair in rooms configured to show it.": "Zobrazovať vašu príslušnosť ku komunite v miestnostiach, ktoré sú nastavené na zobrazovanie tejto príslušnosti.",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
-    "Message Replies": "Odpovede na správy",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Túto zmenu nebudete môcť vrátiť späť pretože  znižujete vašu vlastnú úroveň moci. Ak ste jediný poverený používateľ v miestnosti, nebudete môcť znovu získať úroveň, akú máte teraz.",
     "Send an encrypted reply…": "Odoslať šifrovanú odpoveď…",
     "Send a reply (unencrypted)…": "Odoslať odpoveď (nešifrovanú)…",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 86f1faade6..c9f6653e26 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -168,7 +168,6 @@
     "Not a valid Riot keyfile": "Није исправана Riot кључ-датотека",
     "Authentication check failed: incorrect password?": "Провера идентитета није успела: нетачна лозинка?",
     "Failed to join room": "Нисам успео да уђем у собу",
-    "Message Replies": "Одговори",
     "Message Pinning": "Закачене поруке",
     "Disable Emoji suggestions while typing": "Онемогући предлагање емоџија приликом куцања",
     "Use compact timeline layout": "Користи збијени распоред временске линије",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 2d81d0768b..0fb01a4cc6 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1019,7 +1019,6 @@
     "Add rooms to the community": "Lägg till rum i communityn",
     "Add to community": "Lägg till i community",
     "Failed to invite users to community": "Det gick inte att bjuda in användare till communityn",
-    "Message Replies": "Meddelandesvar",
     "Mirror local video feed": "Spegelvänd lokal video",
     "Disable Community Filter Panel": "Inaktivera community-filterpanel",
     "Community Invites": "Community-inbjudningar",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 28a1a35ef1..56d5c1e4dc 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -741,7 +741,6 @@
     "Add rooms to the community": "添加聊天室到社区",
     "Add to community": "添加到社区",
     "Failed to invite users to community": "邀请用户到社区失败",
-    "Message Replies": "消息回复",
     "Disable Peer-to-Peer for 1:1 calls": "在一对一通话中禁用 P2P 对等网络",
     "Enable inline URL previews by default": "默认启用网址预览",
     "Disinvite this user?": "取消邀请此用户？",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 4250e87c3b..e14268cfa1 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -700,7 +700,6 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s 與其他 %(count)s 個人正在輸入",
     "%(names)s and %(count)s others are typing|one": "%(names)s 與另一個人正在輸入",
     "Send": "傳送",
-    "Message Replies": "訊息回覆",
     "Message Pinning": "訊息釘選",
     "Disable Emoji suggestions while typing": "在輸入時停用繪文字建議",
     "Hide avatar changes": "隱藏大頭貼變更",

From f5b12bd66ab5df55b20c81140b66fddbd3415884 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 20 Jun 2018 17:09:49 +0100
Subject: [PATCH 368/702] slash got consumed in the consolidation

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 3743fbb98c..211a68e7b0 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -27,14 +27,14 @@ import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 class Command {
     constructor({name, args='', description, runFn}) {
-        this.command = name;
+        this.command = '/' + name;
         this.args = args;
         this.description = description;
         this.runFn = runFn;
     }
 
     getCommand() {
-        return "/" + this.command;
+        return this.command;
     }
 
     getCommandWithArgs() {

From 7d9d17145c125db962a0eff3bbcd4a065c5b403e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 20 Jun 2018 17:21:06 +0100
Subject: [PATCH 369/702] change so that if someone enters invalid command with
 args we strict match

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index ea271e02ff..4b24e98605 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -41,17 +41,14 @@ export default class CommandProvider extends AutocompleteProvider {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!command) return [];
 
-        let matches;
+        let matches = [];
         if (command[0] !== command[1]) {
             // The input looks like a command with arguments, perform exact match
             const match = COMMANDS.find((o) => o.command === command[1]);
             if (match) {
                 matches = [match];
             }
-        }
-
-        // If we don't yet have matches
-        if (!matches) {
+        } else {
             if (query === '/') {
                 // If they have just entered `/` show everything
                 matches = COMMANDS;

From 884fa3b9139a078310ed9a6162ad06c7306c8b2d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 20 Jun 2018 17:25:23 +0100
Subject: [PATCH 370/702] use existing command hashmap over linear array search

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 4b24e98605..891ef97d65 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -44,9 +44,9 @@ export default class CommandProvider extends AutocompleteProvider {
         let matches = [];
         if (command[0] !== command[1]) {
             // The input looks like a command with arguments, perform exact match
-            const match = COMMANDS.find((o) => o.command === command[1]);
-            if (match) {
-                matches = [match];
+            const name = command[1].substr(1); // strip leading `/`
+            if (CommandMap[name]) {
+                matches = [CommandMap[name]];
             }
         } else {
             if (query === '/') {

From 7cd8a5a2b230ac78c12cc40bddab10dcf9fce59f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 20 Jun 2018 18:01:37 +0100
Subject: [PATCH 371/702] allow chaining right click contextmenus

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ContextualMenu.js | 26 +++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 91ec312f43..e5b3bd0b71 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -64,7 +64,9 @@ export default class ContextualMenu extends React.Component {
         // The component to render as the context menu
         elementClass: PropTypes.element.isRequired,
         // on resize callback
-        windowResize: PropTypes.func
+        windowResize: PropTypes.func,
+        // method to close menu
+        closeMenu: PropTypes.func,
     };
 
     constructor() {
@@ -73,6 +75,7 @@ export default class ContextualMenu extends React.Component {
             contextMenuRect: null,
         };
 
+        this.onContextMenu = this.onContextMenu.bind(this);
         this.collectContextMenuRect = this.collectContextMenuRect.bind(this);
     }
 
@@ -85,6 +88,25 @@ export default class ContextualMenu extends React.Component {
         });
     }
 
+    onContextMenu(e) {
+        if (this.props.closeMenu) {
+            this.props.closeMenu();
+        }
+        e.preventDefault();
+        const x = e.clientX;
+        const y = e.clientY;
+
+        setImmediate(() => {
+            const clickEvent = document.createEvent('MouseEvents');
+            clickEvent.initMouseEvent(
+                'contextmenu', true, true, window, 0,
+                0, 0, x, y, false, false,
+                false, false, 0, null,
+            );
+            document.elementFromPoint(x, y).dispatchEvent(clickEvent);
+        });
+    }
+
     render() {
         const position = {};
         let chevronFace = null;
@@ -195,7 +217,7 @@ export default class ContextualMenu extends React.Component {
                 { chevron }
                 <ElementClass {...props} onFinished={props.closeMenu} onResize={props.windowResize} />
             </div>
-            { props.hasBackground && <div className="mx_ContextualMenu_background" onClick={props.closeMenu} /> }
+            { props.hasBackground && <div className="mx_ContextualMenu_background" onClick={props.closeMenu} onContextMenu={this.onContextMenu} /> }
             <style>{ chevronCSS }</style>
         </div>;
     }

From 4508da56661a4e8bd80122ee1539bfddaf228449 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 20 Jun 2018 18:03:15 +0100
Subject: [PATCH 372/702] only override contextmenu if closeMenu is provided

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ContextualMenu.js | 27 +++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index e5b3bd0b71..8b88cae479 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -91,20 +91,21 @@ export default class ContextualMenu extends React.Component {
     onContextMenu(e) {
         if (this.props.closeMenu) {
             this.props.closeMenu();
-        }
-        e.preventDefault();
-        const x = e.clientX;
-        const y = e.clientY;
 
-        setImmediate(() => {
-            const clickEvent = document.createEvent('MouseEvents');
-            clickEvent.initMouseEvent(
-                'contextmenu', true, true, window, 0,
-                0, 0, x, y, false, false,
-                false, false, 0, null,
-            );
-            document.elementFromPoint(x, y).dispatchEvent(clickEvent);
-        });
+            e.preventDefault();
+            const x = e.clientX;
+            const y = e.clientY;
+
+            setImmediate(() => {
+                const clickEvent = document.createEvent('MouseEvents');
+                clickEvent.initMouseEvent(
+                    'contextmenu', true, true, window, 0,
+                    0, 0, x, y, false, false,
+                    false, false, 0, null,
+                );
+                document.elementFromPoint(x, y).dispatchEvent(clickEvent);
+            });
+        }
     }
 
     render() {

From 28ef65c4aaec6e8678251feb9e85f2cf45852c3e Mon Sep 17 00:00:00 2001
From: Marek Lach <graweeld@gmail.com>
Date: Wed, 20 Jun 2018 13:21:24 +0000
Subject: [PATCH 373/702] Translated using Weblate (Slovak)

Currently translated at 100.0% (1197 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index b1f3f4260d..bc4e749d42 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1180,5 +1180,20 @@
     "Terms and Conditions": "Zmluvné podmienky",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
     "Review terms and conditions": "Prečítať zmluvné podmienky",
-    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť"
+    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť",
+    "Encrypting": "Enkriptovanie",
+    "Encrypted, not sent": "Zakódované, ale neposlané",
+    "Share Link to User": "Pošli link užívateľovi",
+    "Share room": "Zdieľaj miestnosť",
+    "Share Room": "Zdieľaj miestnosť",
+    "Link to most recent message": "Link na najnovšiu správu",
+    "Share User": "Zdieľaj užívateľa",
+    "Share Community": "Zdieľaj komunitu",
+    "Link to selected message": "Link na vybranú správu",
+    "COPY": "Kopíruj",
+    "Share Message": "Zdieľaj správu",
+    "No Audio Outputs detected": "Neboli rozpoznané žiadne zvukové výstupy",
+    "Audio Output": "Zvukový výstup",
+    "Try the app first": "Najskôr aplikáciu vyskúšaj",
+    "Share Room Message": "Správa o zdieľaní miestnosti"
 }

From bce87829b6c348b8da266dd741dc211eae436588 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 00:33:24 +0100
Subject: [PATCH 374/702] hide already chosen results from AddressPickerDialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/AddressPickerDialog.js           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 0d0b7456b5..935eecf5f1 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -510,6 +510,10 @@ module.exports = React.createClass({
         const AddressSelector = sdk.getComponent("elements.AddressSelector");
         this.scrollElement = null;
 
+        // Use set to avoid O(n*m) operation
+        const selectedAddresses = new Set(this.state.userList.map(({address}) => address));
+        const queryList = this.state.queryList.filter(({address}) => !selectedAddresses.has(address));
+
         const query = [];
         // create the invite list
         if (this.state.userList.length > 0) {
@@ -561,16 +565,12 @@ module.exports = React.createClass({
             </div>;
         } else if (this.state.searchError) {
             error = <div className="mx_ChatInviteDialog_error">{ this.state.searchError }</div>;
-        } else if (
-            this.state.query.length > 0 &&
-            this.state.queryList.length === 0 &&
-            !this.state.busy
-        ) {
+        } else if (this.state.query.length > 0 && queryList.length === 0 && !this.state.busy) {
             error = <div className="mx_ChatInviteDialog_error">{ _t("No results") }</div>;
         } else {
             addressSelector = (
                 <AddressSelector ref={(ref) => {this.addressSelector = ref;}}
-                    addressList={this.state.queryList}
+                    addressList={queryList}
                     showAddress={this.props.pickerType === 'user'}
                     onSelected={this.onSelected}
                     truncateAt={TRUNCATE_QUERY_LIST}

From 4040e3f5cf287c253c27c860d0c277f734985ec1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 00:37:37 +0100
Subject: [PATCH 375/702] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/AddressPickerDialog.js      | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 935eecf5f1..0105fb8ca9 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Promise from 'bluebird';
@@ -27,6 +27,13 @@ import GroupStore from '../../../stores/GroupStore';
 const TRUNCATE_QUERY_LIST = 40;
 const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
 
+const addressTypeName = {
+    'mx-user-id': _td("Matrix ID"),
+    'mx-room-id': _td("Matrix Room ID"),
+    'email': _td("email address"),
+};
+
+
 module.exports = React.createClass({
     displayName: "AddressPickerDialog",
 
@@ -129,7 +136,7 @@ module.exports = React.createClass({
         } else if (e.keyCode === 13) { // enter
             e.stopPropagation();
             e.preventDefault();
-            if (this.refs.textinput.value == '') {
+            if (this.refs.textinput.value === '') {
                 // if there's nothing in the input box, submit the form
                 this.onButtonClick();
             } else {
@@ -148,7 +155,7 @@ module.exports = React.createClass({
             clearTimeout(this.queryChangedDebouncer);
         }
         // Only do search if there is something to search
-        if (query.length > 0 && query != '@' && query.length >= 2) {
+        if (query.length > 0 && query !== '@' && query.length >= 2) {
             this.queryChangedDebouncer = setTimeout(() => {
                 if (this.props.pickerType === 'user') {
                     if (this.props.groupId) {
@@ -419,7 +426,7 @@ module.exports = React.createClass({
                 isKnown: false,
             });
             if (this._cancelThreepidLookup) this._cancelThreepidLookup();
-            if (addrType == 'email') {
+            if (addrType === 'email') {
                 this._lookupThreepid(addrType, query).done();
             }
         }
@@ -442,14 +449,14 @@ module.exports = React.createClass({
         if (!this.props.validAddressTypes.includes(addrType)) {
             this.setState({ error: true });
             return null;
-        } else if (addrType == 'mx-user-id') {
+        } else if (addrType === 'mx-user-id') {
             const user = MatrixClientPeg.get().getUser(addrObj.address);
             if (user) {
                 addrObj.displayName = user.displayName;
                 addrObj.avatarMxc = user.avatarUrl;
                 addrObj.isKnown = true;
             }
-        } else if (addrType == 'mx-room-id') {
+        } else if (addrType === 'mx-room-id') {
             const room = MatrixClientPeg.get().getRoom(addrObj.address);
             if (room) {
                 addrObj.displayName = room.name;
@@ -547,21 +554,13 @@ module.exports = React.createClass({
         let error;
         let addressSelector;
         if (this.state.error) {
-            let tryUsing = '';
-            const validTypeDescriptions = this.props.validAddressTypes.map((t) => {
-                return {
-                    'mx-user-id': _t("Matrix ID"),
-                    'mx-room-id': _t("Matrix Room ID"),
-                    'email': _t("email address"),
-                }[t];
-            });
-            tryUsing = _t("Try using one of the following valid address types: %(validTypesList)s.", {
-                validTypesList: validTypeDescriptions.join(", "),
-            });
+            const validTypeDescriptions = this.props.validAddressTypes.map((t) => _t(addressTypeName[t]));
             error = <div className="mx_ChatInviteDialog_error">
                 { _t("You have entered an invalid address.") }
                 <br />
-                { tryUsing }
+                { _t("Try using one of the following valid address types: %(validTypesList)s.", {
+                    validTypesList: validTypeDescriptions.join(", "),
+                }) }
             </div>;
         } else if (this.state.searchError) {
             error = <div className="mx_ChatInviteDialog_error">{ this.state.searchError }</div>;

From fd252ded601d96130bef8b86265e1d63ef21ab16 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 00:47:21 +0100
Subject: [PATCH 376/702] take into account the addressType also

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/AddressPickerDialog.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 0105fb8ca9..a87ffbb518 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -517,9 +517,16 @@ module.exports = React.createClass({
         const AddressSelector = sdk.getComponent("elements.AddressSelector");
         this.scrollElement = null;
 
-        // Use set to avoid O(n*m) operation
-        const selectedAddresses = new Set(this.state.userList.map(({address}) => address));
-        const queryList = this.state.queryList.filter(({address}) => !selectedAddresses.has(address));
+        // map addressType => set of addresses to avoid O(n*m) operation
+        const selectedAddresses = {};
+        this.state.userList.forEach(({address, addressType}) => {
+            if (!selectedAddresses[addressType]) selectedAddresses[addressType] = new Set();
+            selectedAddresses[addressType].add(address);
+        });
+
+        const queryList = this.state.queryList.filter(({address, addressType}) => {
+            return !selectedAddresses[addressType] || !selectedAddresses[addressType].has(address);
+        });
 
         const query = [];
         // create the invite list

From b18c95cdb57ca11068c755dc4493489d02383a62 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Jun 2018 10:03:35 +0100
Subject: [PATCH 377/702] js-sdk rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 33aa428d4b..c7cdfffb31 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.4",
+    "matrix-js-sdk": "0.10.5-rc.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From f3d54a49b65bc220a76357d84b281afbda976ccb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Jun 2018 10:06:52 +0100
Subject: [PATCH 378/702] Prepare changelog for v0.12.8-rc.1

---
 CHANGELOG.md | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b97251604..2120e18a31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,99 @@
+Changes in [0.12.8-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8-rc.1) (2018-06-21)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7...v0.12.8-rc.1)
+
+ * Update from Weblate.
+   [\#1997](https://github.com/matrix-org/matrix-react-sdk/pull/1997)
+ * refactor, consolidate and improve SlashCommands
+   [\#1988](https://github.com/matrix-org/matrix-react-sdk/pull/1988)
+ * Take replies out of labs!
+   [\#1996](https://github.com/matrix-org/matrix-react-sdk/pull/1996)
+ * re-merge reset PR
+   [\#1987](https://github.com/matrix-org/matrix-react-sdk/pull/1987)
+ * once command has a space, strict match instead of fuzzy match
+   [\#1985](https://github.com/matrix-org/matrix-react-sdk/pull/1985)
+ * Fix matrix.to URL RegExp
+   [\#1986](https://github.com/matrix-org/matrix-react-sdk/pull/1986)
+ * Fix blank sticker picker
+   [\#1984](https://github.com/matrix-org/matrix-react-sdk/pull/1984)
+ * fix e2ee file/media stuff
+   [\#1972](https://github.com/matrix-org/matrix-react-sdk/pull/1972)
+ * right click for room tile context menu
+   [\#1978](https://github.com/matrix-org/matrix-react-sdk/pull/1978)
+ * only show m.room.message in FilePanel
+   [\#1983](https://github.com/matrix-org/matrix-react-sdk/pull/1983)
+ * improve command provider
+   [\#1981](https://github.com/matrix-org/matrix-react-sdk/pull/1981)
+ * affix copyButton so that it doesn't get scrolled horizontally
+   [\#1980](https://github.com/matrix-org/matrix-react-sdk/pull/1980)
+ * split continuation if there is a gap in conversation
+   [\#1979](https://github.com/matrix-org/matrix-react-sdk/pull/1979)
+ * fix a bunch of instances of react console spam
+   [\#1973](https://github.com/matrix-org/matrix-react-sdk/pull/1973)
+ * Track decryption success/failure rate with piwik
+   [\#1949](https://github.com/matrix-org/matrix-react-sdk/pull/1949)
+ * route matrix.to/#/+... links internally (not just group ids)
+   [\#1975](https://github.com/matrix-org/matrix-react-sdk/pull/1975)
+ * implement `hitting enter after Ctrl-K should switch to the first result`
+   [\#1976](https://github.com/matrix-org/matrix-react-sdk/pull/1976)
+ * Remove tag panel feature flag
+   [\#1970](https://github.com/matrix-org/matrix-react-sdk/pull/1970)
+ * QuestionDialog pass hasCancelButton to DialogButtons
+   [\#1968](https://github.com/matrix-org/matrix-react-sdk/pull/1968)
+ * check type before msgtype in the case of `m.sticker` with msgtype
+   [\#1965](https://github.com/matrix-org/matrix-react-sdk/pull/1965)
+ * apply roomlist searchFilter to aliases if it begins with a `#`
+   [\#1957](https://github.com/matrix-org/matrix-react-sdk/pull/1957)
+ * Share Dialog
+   [\#1948](https://github.com/matrix-org/matrix-react-sdk/pull/1948)
+ * make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
+   [\#1950](https://github.com/matrix-org/matrix-react-sdk/pull/1950)
+ *  Fix widgets re-appearing after being deleted
+   [\#1958](https://github.com/matrix-org/matrix-react-sdk/pull/1958)
+ * Fix crash on unspecified thumbnail info, and handle gracefully
+   [\#1967](https://github.com/matrix-org/matrix-react-sdk/pull/1967)
+ * fix styling of clearButton when its not there
+   [\#1964](https://github.com/matrix-org/matrix-react-sdk/pull/1964)
+ *  Implement slightly magical CSS soln. to thumbnail sizing
+   [\#1912](https://github.com/matrix-org/matrix-react-sdk/pull/1912)
+ * Select audio output for WebRTC
+   [\#1932](https://github.com/matrix-org/matrix-react-sdk/pull/1932)
+ * move css rule to be more generic; remove overriden rule
+   [\#1962](https://github.com/matrix-org/matrix-react-sdk/pull/1962)
+ * improve tag panel accessibility and remove a no-op dispatch
+   [\#1960](https://github.com/matrix-org/matrix-react-sdk/pull/1960)
+ * Revert "Fix exception when opening dev tools"
+   [\#1963](https://github.com/matrix-org/matrix-react-sdk/pull/1963)
+ * fix message appears unencrypted while encrypting and not_sent
+   [\#1959](https://github.com/matrix-org/matrix-react-sdk/pull/1959)
+ * Fix exception when opening dev tools
+   [\#1961](https://github.com/matrix-org/matrix-react-sdk/pull/1961)
+ * show redacted stickers like other redacted messages
+   [\#1956](https://github.com/matrix-org/matrix-react-sdk/pull/1956)
+ * add mx_filterFlipColor to mx_MemberInfo_cancel img
+   [\#1951](https://github.com/matrix-org/matrix-react-sdk/pull/1951)
+ * don't set the displayname on registration as Synapse now does it
+   [\#1953](https://github.com/matrix-org/matrix-react-sdk/pull/1953)
+ * allow CreateRoom to scale properly horizontally
+   [\#1955](https://github.com/matrix-org/matrix-react-sdk/pull/1955)
+ * Keep context menus that extend downwards vertically on screen
+   [\#1952](https://github.com/matrix-org/matrix-react-sdk/pull/1952)
+ * re-run checkIfAlone if a member change occurred in the active room
+   [\#1947](https://github.com/matrix-org/matrix-react-sdk/pull/1947)
+ * Persist pinned message open-ness between room switches
+   [\#1935](https://github.com/matrix-org/matrix-react-sdk/pull/1935)
+ * Pinned message cosmetic improvements
+   [\#1933](https://github.com/matrix-org/matrix-react-sdk/pull/1933)
+ * Update sinon to 5.0.7
+   [\#1916](https://github.com/matrix-org/matrix-react-sdk/pull/1916)
+ * re-run checkIfAlone if a member change occurred in the active room
+   [\#1946](https://github.com/matrix-org/matrix-react-sdk/pull/1946)
+ * Replace "Login as guest" with "Try the app first" on login page
+   [\#1937](https://github.com/matrix-org/matrix-react-sdk/pull/1937)
+ * kill stream when using gUM for permission to device labels to turn off
+   camera
+   [\#1931](https://github.com/matrix-org/matrix-react-sdk/pull/1931)
+
 Changes in [0.12.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7) (2018-06-12)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7-rc.1...v0.12.7)

From 2b8bc8a80045af99dc3fb22cba825711427b7af1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Jun 2018 10:06:53 +0100
Subject: [PATCH 379/702] v0.12.8-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c7cdfffb31..7da47f27c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.7",
+  "version": "0.12.8-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From d4e3301dd99cb40ef7b64cdb9b5be7d209f94109 Mon Sep 17 00:00:00 2001
From: Marek Lach <graweeld@gmail.com>
Date: Wed, 20 Jun 2018 17:21:38 +0000
Subject: [PATCH 380/702] Translated using Weblate (Czech)

Currently translated at 90.2% (1080 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
---
 src/i18n/strings/cs.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index b7298f80ab..52eabf0edc 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1076,5 +1076,7 @@
     "Collapse panel": "Sbalit panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Vzhled a chování aplikace může být ve vašem aktuální prohlížeči nesprávné a některé nebo všechny funkce mohou být chybné. Chcete-li i přes to pokračovat, nebudeme vám bránit, ale se všemi problémy, na které narazíte, si musíte poradit sami!",
     "Checking for an update...": "Kontrola aktualizací...",
-    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena"
+    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena",
+    "The platform you're on": "Platforma na které jsi",
+    "The version of Riot.im": "Verze Riot.im"
 }

From cb6c41ae6652a850ed9235b8cec366cfdde61fc8 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 21 Jun 2018 09:49:59 +0000
Subject: [PATCH 381/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1197 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 5ec9a93bc5..90bfc3c94a 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1181,5 +1181,19 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.",
     "Review terms and conditions": "Прегледай правилата и условията",
     "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта",
-    "Try the app first": "Първо пробвайте приложението"
+    "Try the app first": "Първо пробвайте приложението",
+    "Encrypting": "Шифроване",
+    "Encrypted, not sent": "Шифровано, неизпратено",
+    "Share Link to User": "Сподели връзка с потребител",
+    "Share room": "Сподели стая",
+    "Share Room": "Споделяне на стая",
+    "Link to most recent message": "Създай връзка към най-новото съобщение",
+    "Share User": "Споделяне на потребител",
+    "Share Community": "Споделяне на общност",
+    "Share Room Message": "Споделяне на съобщение от стая",
+    "Link to selected message": "Създай връзка към избраното съобщение",
+    "COPY": "КОПИРАЙ",
+    "Share Message": "Сподели съобщението",
+    "No Audio Outputs detected": "Не са открити аудио изходи",
+    "Audio Output": "Аудио изходи"
 }

From 2428eb12af651db687a5afed4804dcd258a9df3d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 11:37:06 +0100
Subject: [PATCH 382/702] delint ChatCreateOrReuseDialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/ChatCreateOrReuseDialog.js      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index 9228e59280..b7cf0f5a6e 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,6 +29,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
 
     constructor(props) {
         super(props);
+        this.onFinished = this.onFinished.bind(this);
         this.onRoomTileClick = this.onRoomTileClick.bind(this);
 
         this.state = {
@@ -53,10 +55,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
             const room = client.getRoom(roomId);
             if (room) {
                 const me = room.getMember(client.credentials.userId);
-                const highlight = (
-                    room.getUnreadNotificationCount('highlight') > 0 ||
-                    me.membership == "invite"
-                );
+                const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === "invite";
                 tiles.push(
                     <RoomTile key={room.roomId} room={room}
                         transparent={true}
@@ -64,7 +63,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                         selected={false}
                         unread={Unread.doesRoomHaveUnreadMessages(room)}
                         highlight={highlight}
-                        isInvite={me.membership == "invite"}
+                        isInvite={me.membership === "invite"}
                         onClick={this.onRoomTileClick}
                     />,
                 );
@@ -110,6 +109,10 @@ export default class ChatCreateOrReuseDialog extends React.Component {
         this.props.onExistingRoomSelected(roomId);
     }
 
+    onFinished() {
+        this.props.onFinished(false);
+    }
+
     render() {
         let title = '';
         let content = null;
@@ -177,7 +180,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
             <BaseDialog className='mx_ChatCreateOrReuseDialog'
-                onFinished={this.props.onFinished.bind(false)}
+                onFinished={this.onFinished}
                 title={title}
                 contentId='mx_Dialog_content'
             >

From 073796507937c72bb56efcec7ab8fc032b1bd0a9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 12:13:27 +0100
Subject: [PATCH 383/702] s/userList/selectedList/ & s/queryList/suggestedList/

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/AddressPickerDialog.js      | 81 +++++++++----------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index a87ffbb518..2dabe317dd 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -73,7 +73,7 @@ module.exports = React.createClass({
 
             // List of UserAddressType objects representing
             // the list of addresses we're going to invite
-            userList: [],
+            selectedList: [],
 
             // Whether a search is ongoing
             busy: false,
@@ -83,10 +83,9 @@ module.exports = React.createClass({
             serverSupportsUserDirectory: true,
             // The query being searched for
             query: "",
-            // List of UserAddressType objects representing
-            // the set of auto-completion results for the current search
-            // query.
-            queryList: [],
+            // List of UserAddressType objects representing the set of
+            // auto-completion results for the current search query.
+            suggestedList: [],
         };
     },
 
@@ -98,14 +97,14 @@ module.exports = React.createClass({
     },
 
     onButtonClick: function() {
-        let userList = this.state.userList.slice();
+        let selectedList = this.state.selectedList.slice();
         // Check the text input field to see if user has an unconverted address
-        // If there is and it's valid add it to the local userList
+        // If there is and it's valid add it to the local selectedList
         if (this.refs.textinput.value !== '') {
-            userList = this._addInputToList();
-            if (userList === null) return;
+            selectedList = this._addInputToList();
+            if (selectedList === null) return;
         }
-        this.props.onFinished(true, userList);
+        this.props.onFinished(true, selectedList);
     },
 
     onCancel: function() {
@@ -125,14 +124,14 @@ module.exports = React.createClass({
             e.stopPropagation();
             e.preventDefault();
             if (this.addressSelector) this.addressSelector.moveSelectionDown();
-        } else if (this.state.queryList.length > 0 && (e.keyCode === 188 || e.keyCode === 13 || e.keyCode === 9)) { // comma or enter or tab
+        } else if (this.state.suggestedList.length > 0 && (e.keyCode === 188 || e.keyCode === 13 || e.keyCode === 9)) { // comma or enter or tab
             e.stopPropagation();
             e.preventDefault();
             if (this.addressSelector) this.addressSelector.chooseSelection();
-        } else if (this.refs.textinput.value.length === 0 && this.state.userList.length && e.keyCode === 8) { // backspace
+        } else if (this.refs.textinput.value.length === 0 && this.state.selectedList.length && e.keyCode === 8) { // backspace
             e.stopPropagation();
             e.preventDefault();
-            this.onDismissed(this.state.userList.length - 1)();
+            this.onDismissed(this.state.selectedList.length - 1)();
         } else if (e.keyCode === 13) { // enter
             e.stopPropagation();
             e.preventDefault();
@@ -177,7 +176,7 @@ module.exports = React.createClass({
             }, QUERY_USER_DIRECTORY_DEBOUNCE_MS);
         } else {
             this.setState({
-                queryList: [],
+                suggestedList: [],
                 query: "",
                 searchError: null,
             });
@@ -186,11 +185,11 @@ module.exports = React.createClass({
 
     onDismissed: function(index) {
         return () => {
-            const userList = this.state.userList.slice();
-            userList.splice(index, 1);
+            const selectedList = this.state.selectedList.slice();
+            selectedList.splice(index, 1);
             this.setState({
-                userList: userList,
-                queryList: [],
+                selectedList,
+                suggestedList: [],
                 query: "",
             });
             if (this._cancelThreepidLookup) this._cancelThreepidLookup();
@@ -204,11 +203,11 @@ module.exports = React.createClass({
     },
 
     onSelected: function(index) {
-        const userList = this.state.userList.slice();
-        userList.push(this.state.queryList[index]);
+        const selectedList = this.state.selectedList.slice();
+        selectedList.push(this.state.suggestedList[index]);
         this.setState({
-            userList: userList,
-            queryList: [],
+            selectedList,
+            suggestedList: [],
             query: "",
         });
         if (this._cancelThreepidLookup) this._cancelThreepidLookup();
@@ -386,10 +385,10 @@ module.exports = React.createClass({
     },
 
     _processResults: function(results, query) {
-        const queryList = [];
+        const suggestedList = [];
         results.forEach((result) => {
             if (result.room_id) {
-                queryList.push({
+                suggestedList.push({
                     addressType: 'mx-room-id',
                     address: result.room_id,
                     displayName: result.name,
@@ -406,7 +405,7 @@ module.exports = React.createClass({
 
             // Return objects, structure of which is defined
             // by UserAddressType
-            queryList.push({
+            suggestedList.push({
                 addressType: 'mx-user-id',
                 address: result.user_id,
                 displayName: result.display_name,
@@ -420,7 +419,7 @@ module.exports = React.createClass({
         // a perfectly valid address if there are close matches.
         const addrType = getAddressType(query);
         if (this.props.validAddressTypes.includes(addrType)) {
-            queryList.unshift({
+            suggestedList.unshift({
                 addressType: addrType,
                 address: query,
                 isKnown: false,
@@ -431,7 +430,7 @@ module.exports = React.createClass({
             }
         }
         this.setState({
-            queryList,
+            suggestedList,
             error: false,
         }, () => {
             if (this.addressSelector) this.addressSelector.moveSelectionTop();
@@ -465,15 +464,15 @@ module.exports = React.createClass({
             }
         }
 
-        const userList = this.state.userList.slice();
-        userList.push(addrObj);
+        const selectedList = this.state.selectedList.slice();
+        selectedList.push(addrObj);
         this.setState({
-            userList: userList,
-            queryList: [],
+            selectedList,
+            suggestedList: [],
             query: "",
         });
         if (this._cancelThreepidLookup) this._cancelThreepidLookup();
-        return userList;
+        return selectedList;
     },
 
     _lookupThreepid: function(medium, address) {
@@ -499,7 +498,7 @@ module.exports = React.createClass({
             if (res === null) return null;
             if (cancelled) return null;
             this.setState({
-                queryList: [{
+                suggestedList: [{
                     // a UserAddressType
                     addressType: medium,
                     address: address,
@@ -519,24 +518,24 @@ module.exports = React.createClass({
 
         // map addressType => set of addresses to avoid O(n*m) operation
         const selectedAddresses = {};
-        this.state.userList.forEach(({address, addressType}) => {
+        this.state.selectedList.forEach(({address, addressType}) => {
             if (!selectedAddresses[addressType]) selectedAddresses[addressType] = new Set();
             selectedAddresses[addressType].add(address);
         });
 
-        const queryList = this.state.queryList.filter(({address, addressType}) => {
+        const filteredSuggestedList = this.state.suggestedList.filter(({address, addressType}) => {
             return !selectedAddresses[addressType] || !selectedAddresses[addressType].has(address);
         });
 
         const query = [];
         // create the invite list
-        if (this.state.userList.length > 0) {
+        if (this.state.selectedList.length > 0) {
             const AddressTile = sdk.getComponent("elements.AddressTile");
-            for (let i = 0; i < this.state.userList.length; i++) {
+            for (let i = 0; i < this.state.selectedList.length; i++) {
                 query.push(
                     <AddressTile
                         key={i}
-                        address={this.state.userList[i]}
+                        address={this.state.selectedList[i]}
                         canDismiss={true}
                         onDismissed={this.onDismissed(i)}
                         showAddress={this.props.pickerType === 'user'} />,
@@ -546,7 +545,7 @@ module.exports = React.createClass({
 
         // Add the query at the end
         query.push(
-            <textarea key={this.state.userList.length}
+            <textarea key={this.state.selectedList.length}
                 rows="1"
                 id="textinput"
                 ref="textinput"
@@ -571,12 +570,12 @@ module.exports = React.createClass({
             </div>;
         } else if (this.state.searchError) {
             error = <div className="mx_ChatInviteDialog_error">{ this.state.searchError }</div>;
-        } else if (this.state.query.length > 0 && queryList.length === 0 && !this.state.busy) {
+        } else if (this.state.query.length > 0 && filteredSuggestedList.length === 0 && !this.state.busy) {
             error = <div className="mx_ChatInviteDialog_error">{ _t("No results") }</div>;
         } else {
             addressSelector = (
                 <AddressSelector ref={(ref) => {this.addressSelector = ref;}}
-                    addressList={queryList}
+                    addressList={filteredSuggestedList}
                     showAddress={this.props.pickerType === 'user'}
                     onSelected={this.onSelected}
                     truncateAt={TRUNCATE_QUERY_LIST}

From be612998bde2886c3b542219cc4ff1c25bf80151 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 12:14:16 +0100
Subject: [PATCH 384/702] invert boolean operation for readability and add
 comment

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/AddressPickerDialog.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 2dabe317dd..abc52f7b1d 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -523,8 +523,9 @@ module.exports = React.createClass({
             selectedAddresses[addressType].add(address);
         });
 
+        // Filter out any addresses in the above already selected addresses (matching both type and address)
         const filteredSuggestedList = this.state.suggestedList.filter(({address, addressType}) => {
-            return !selectedAddresses[addressType] || !selectedAddresses[addressType].has(address);
+            return !(selectedAddresses[addressType] && selectedAddresses[addressType].has(address));
         });
 
         const query = [];

From 58be44ad9edb31bc05244f301c4f2e4ff7e34dd2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 13:51:39 +0100
Subject: [PATCH 385/702] factor out conditional LanguageSelector as functional
 component and reuse in Login, ForgotPassword and Registration views

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../structures/login/ForgotPassword.js        |  4 +-
 .../structures/login/LanguageSelector.js      | 38 +++++++++++++++++++
 src/components/structures/login/Login.js      | 25 ++----------
 .../structures/login/Registration.js          |  3 ++
 4 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 src/components/structures/login/LanguageSelector.js

diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index ca50b9db6e..cf054a4e6e 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import MatrixClientPeg from "../../../MatrixClientPeg";
 import SdkConfig from "../../../SdkConfig";
 
 import PasswordReset from "../../../PasswordReset";
+import makeLanguageSelector from "./LanguageSelector";
 
 module.exports = React.createClass({
     displayName: 'ForgotPassword',
@@ -233,6 +234,7 @@ module.exports = React.createClass({
                     <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
                         { _t('Create an account') }
                     </a>
+                    { makeLanguageSelector() }
                     <LoginFooter />
                 </div>
             </div>
diff --git a/src/components/structures/login/LanguageSelector.js b/src/components/structures/login/LanguageSelector.js
new file mode 100644
index 0000000000..1e576bdbb8
--- /dev/null
+++ b/src/components/structures/login/LanguageSelector.js
@@ -0,0 +1,38 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SdkConfig from "../../../SdkConfig";
+import {getCurrentLanguage} from "../../../languageHandler";
+import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import PlatformPeg from "../../../PlatformPeg";
+import sdk from '../../../index';
+import React from 'react';
+
+function onChange(newLang) {
+    if (getCurrentLanguage() !== newLang) {
+        SettingsStore.setValue("language", null, SettingLevel.DEVICE, newLang);
+        PlatformPeg.get().reload();
+    }
+}
+
+export default function makeLanguageSelector() {
+    if (SdkConfig.get()['disable_login_language_selector']) return <div />;
+
+    const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
+    return <div className="mx_Login_language_div">
+        <LanguageDropdown onOptionChange={onChange} className="mx_Login_language" value={getCurrentLanguage()} />
+    </div>;
+}
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 1332f52f97..60e4e51f04 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,12 +21,11 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import * as languageHandler from '../../../languageHandler';
 import sdk from '../../../index';
 import Login from '../../../Login';
-import PlatformPeg from '../../../PlatformPeg';
 import SdkConfig from '../../../SdkConfig';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
+import makeLanguageSelector from "./LanguageSelector";
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9\(\)\-\s]*$/;
@@ -370,23 +370,6 @@ module.exports = React.createClass({
         );
     },
 
-    _onLanguageChange: function(newLang) {
-        if (languageHandler.getCurrentLanguage() !== newLang) {
-            SettingsStore.setValue("language", null, SettingLevel.DEVICE, newLang);
-            PlatformPeg.get().reload();
-        }
-    },
-
-    _renderLanguageSetting: function() {
-        const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
-        return <div className="mx_Login_language_div">
-            <LanguageDropdown onOptionChange={this._onLanguageChange}
-                          className="mx_Login_language"
-                          value={languageHandler.getCurrentLanguage()}
-            />
-        </div>;
-    },
-
     render: function() {
         const Loader = sdk.getComponent("elements.Spinner");
         const LoginPage = sdk.getComponent("login.LoginPage");
@@ -461,7 +444,7 @@ module.exports = React.createClass({
                         </a>
                         { loginAsGuestJsx }
                         { returnToAppJsx }
-                        { !SdkConfig.get().disable_login_language_selector ? this._renderLanguageSetting() : '' }
+                        { makeLanguageSelector() }
                         <LoginFooter />
                     </div>
                 </div>
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 62a3ee4f68..377cffc576 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,6 +30,7 @@ import RtsClient from '../../../RtsClient';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import SettingsStore from "../../../settings/SettingsStore";
+import makeLanguageSelector from "./LanguageSelector";
 
 const MIN_PASSWORD_LENGTH = 6;
 
@@ -432,6 +434,7 @@ module.exports = React.createClass({
                     { signIn }
                     { errorText }
                     { returnToAppJsx }
+                    { makeLanguageSelector() }
                     <LoginFooter />
                 </div>
             </LoginPage>

From f32da97a3abef96808c9c9e60b76559456fad874 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 14:04:08 +0100
Subject: [PATCH 386/702] delint and run generate-eslint-error-ignore-file

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .eslintignore.errorfiles                      | 12 ++---
 .../structures/login/ForgotPassword.js        | 14 +++---
 src/components/structures/login/Login.js      | 50 +++++++++----------
 .../structures/login/Registration.js          | 34 +++++--------
 4 files changed, 49 insertions(+), 61 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 42818244b3..3886b3f728 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -13,8 +13,6 @@ src/components/structures/HomePage.js
 src/components/structures/LeftPanel.js
 src/components/structures/LoggedInView.js
 src/components/structures/login/ForgotPassword.js
-src/components/structures/login/Login.js
-src/components/structures/login/Registration.js
 src/components/structures/LoginBox.js
 src/components/structures/MessagePanel.js
 src/components/structures/NotificationPanel.js
@@ -26,12 +24,11 @@ src/components/structures/ScrollPanel.js
 src/components/structures/SearchBox.js
 src/components/structures/TimelinePanel.js
 src/components/structures/UploadBar.js
+src/components/structures/UserSettings.js
 src/components/structures/ViewSource.js
 src/components/views/avatars/BaseAvatar.js
-src/components/views/avatars/GroupAvatar.js
 src/components/views/avatars/MemberAvatar.js
 src/components/views/create_room/RoomAlias.js
-src/components/views/dialogs/BugReportDialog.js
 src/components/views/dialogs/ChangelogDialog.js
 src/components/views/dialogs/ChatCreateOrReuseDialog.js
 src/components/views/dialogs/DeactivateAccountDialog.js
@@ -47,6 +44,7 @@ src/components/views/elements/InlineSpinner.js
 src/components/views/elements/MemberEventListSummary.js
 src/components/views/elements/Spinner.js
 src/components/views/elements/TintableSvg.js
+src/components/views/elements/UserInfo.js
 src/components/views/elements/UserSelector.js
 src/components/views/globals/MatrixToolbar.js
 src/components/views/globals/NewVersionBar.js
@@ -65,7 +63,6 @@ src/components/views/room_settings/UrlPreviewSettings.js
 src/components/views/rooms/Autocomplete.js
 src/components/views/rooms/AuxPanel.js
 src/components/views/rooms/EntityTile.js
-src/components/views/rooms/EventTile.js
 src/components/views/rooms/LinkPreviewWidget.js
 src/components/views/rooms/MemberDeviceInfo.js
 src/components/views/rooms/MemberInfo.js
@@ -73,12 +70,11 @@ src/components/views/rooms/MemberList.js
 src/components/views/rooms/MemberTile.js
 src/components/views/rooms/MessageComposer.js
 src/components/views/rooms/MessageComposerInput.js
+src/components/views/rooms/PinnedEventTile.js
 src/components/views/rooms/RoomDropTarget.js
 src/components/views/rooms/RoomList.js
 src/components/views/rooms/RoomPreviewBar.js
 src/components/views/rooms/RoomSettings.js
-src/components/views/rooms/RoomTile.js
-src/components/views/rooms/RoomTooltip.js
 src/components/views/rooms/SearchableEntityList.js
 src/components/views/rooms/SearchBar.js
 src/components/views/rooms/SearchResultTile.js
@@ -92,6 +88,7 @@ src/components/views/settings/DevicesPanel.js
 src/components/views/settings/IntegrationsManager.js
 src/components/views/settings/Notifications.js
 src/ContentMessages.js
+src/GroupAddressPicker.js
 src/HtmlUtils.js
 src/ImageUtils.js
 src/languageHandler.js
@@ -135,6 +132,7 @@ test/components/structures/TimelinePanel-test.js
 test/components/views/dialogs/InteractiveAuthDialog-test.js
 test/components/views/login/RegistrationForm-test.js
 test/components/views/rooms/MessageComposerInput-test.js
+test/components/views/rooms/RoomSettings-test.js
 test/mock-clock.js
 test/notifications/ContentRules-test.js
 test/notifications/PushRuleVectorState-test.js
diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index cf054a4e6e..bbee4c3207 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
@@ -46,6 +44,8 @@ module.exports = React.createClass({
             enteredHomeserverUrl: this.props.customHsUrl || this.props.defaultHsUrl,
             enteredIdentityServerUrl: this.props.customIsUrl || this.props.defaultIsUrl,
             progress: null,
+            password: null,
+            password2: null,
         };
     },
 
@@ -104,7 +104,7 @@ module.exports = React.createClass({
                     </div>,
                 button: _t('Continue'),
                 extraButtons: [
-                    <button className="mx_Dialog_primary"
+                    <button key="export_keys" className="mx_Dialog_primary"
                             onClick={this._onExportE2eKeysClicked}>
                         { _t('Export E2E room keys') }
                     </button>,
@@ -170,7 +170,8 @@ module.exports = React.createClass({
         } else if (this.state.progress === "sent_email") {
             resetPasswordJsx = (
                 <div className="mx_Login_prompt">
-                    { _t("An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.", { emailAddress: this.state.email }) }
+                    { _t("An email has been sent to %(emailAddress)s. Once you've followed the link it contains, " +
+                        "click below.", { emailAddress: this.state.email }) }
                     <br />
                     <input className="mx_Login_submit" type="button" onClick={this.onVerify}
                         value={_t('I have verified my email address')} />
@@ -180,14 +181,15 @@ module.exports = React.createClass({
             resetPasswordJsx = (
                 <div className="mx_Login_prompt">
                     <p>{ _t('Your password has been reset') }.</p>
-                    <p>{ _t('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') }.</p>
+                    <p>{ _t('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') }.</p>
                     <input className="mx_Login_submit" type="button" onClick={this.props.onComplete}
                         value={_t('Return to login screen')} />
                 </div>
             );
         } else {
             let serverConfigSection;
-            if (!SdkConfig.get().disable_custom_urls) {
+            if (!SdkConfig.get()['disable_custom_urls']) {
                 serverConfigSection = (
                     <ServerConfig ref="serverConfig"
                         withToggleButton={true}
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 60e4e51f04..c4a5b8ba57 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -28,7 +28,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import makeLanguageSelector from "./LanguageSelector";
 
 // For validating phone numbers without country codes
-const PHONE_NUMBER_REGEX = /^[0-9\(\)\-\s]*$/;
+const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
 
 /**
  * A wire component which glues together login UI components and Login logic
@@ -113,10 +113,10 @@ module.exports = React.createClass({
 
             // Some error strings only apply for logging in
             const usingEmail = username.indexOf("@") > 0;
-            if (error.httpStatus == 400 && usingEmail) {
+            if (error.httpStatus === 400 && usingEmail) {
                 errorText = _t('This Home Server does not support login using email address.');
             } else if (error.httpStatus === 401 || error.httpStatus === 403) {
-                if (SdkConfig.get().disable_custom_urls) {
+                if (SdkConfig.get()['disable_custom_urls']) {
                     errorText = (
                         <div>
                             <div>{ _t('Incorrect username and/or password.') }</div>
@@ -143,7 +143,7 @@ module.exports = React.createClass({
                 // but the login API gives a 403 https://matrix.org/jira/browse/SYN-744
                 // mentions this (although the bug is for UI auth which is not this)
                 // We treat both as an incorrect password
-                loginIncorrect: error.httpStatus === 401 || error.httpStatus == 403,
+                loginIncorrect: error.httpStatus === 401 || error.httpStatus === 403,
             });
         }).finally(() => {
             if (this._unmounted) {
@@ -231,7 +231,7 @@ module.exports = React.createClass({
         hsUrl = hsUrl || this.state.enteredHomeserverUrl;
         isUrl = isUrl || this.state.enteredIdentityServerUrl;
 
-        const fallbackHsUrl = hsUrl == this.props.defaultHsUrl ? this.props.fallbackHsUrl : null;
+        const fallbackHsUrl = hsUrl === this.props.defaultHsUrl ? this.props.fallbackHsUrl : null;
 
         const loginLogic = new Login(hsUrl, isUrl, fallbackHsUrl, {
             defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
@@ -310,19 +310,27 @@ module.exports = React.createClass({
                  !this.state.enteredHomeserverUrl.startsWith("http"))
             ) {
                 errorText = <span>
-                    {
-                        _t("Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. " +
-                            "Either use HTTPS or <a>enable unsafe scripts</a>.",
-                            {},
-                            { 'a': (sub) => { return <a href="https://www.google.com/search?&q=enable%20unsafe%20scripts">{ sub }</a>; } },
+                    { _t("Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. " +
+                        "Either use HTTPS or <a>enable unsafe scripts</a>.", {},
+                        {
+                            'a': (sub) => {
+                                return <a href="https://www.google.com/search?&q=enable%20unsafe%20scripts">
+                                    { sub }
+                                </a>;
+                            },
+                        },
                     ) }
                 </span>;
             } else {
                 errorText = <span>
-                    {
-                        _t("Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
-                            {},
-                            { 'a': (sub) => { return <a href={this.state.enteredHomeserverUrl}>{ sub }</a>; } },
+                    { _t("Can't connect to homeserver - please check your connectivity, ensure your " +
+                        "<a>homeserver's SSL certificate</a> is trusted, and that a browser extension " +
+                        "is not blocking requests.", {},
+                        {
+                            'a': (sub) => {
+                                return <a href={this.state.enteredHomeserverUrl}>{ sub }</a>;
+                            },
+                        },
                     ) }
                 </span>;
             }
@@ -386,21 +394,10 @@ module.exports = React.createClass({
                 </a>;
         }
 
-        let returnToAppJsx;
-        /*
-        // with the advent of ILAG I don't think we need this any more
-        if (this.props.onCancelClick) {
-            returnToAppJsx =
-                <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
-                    { _t('Return to app') }
-                </a>;
-        }
-        */
-
         let serverConfig;
         let header;
 
-        if (!SdkConfig.get().disable_custom_urls) {
+        if (!SdkConfig.get()['disable_custom_urls']) {
             serverConfig = <ServerConfig ref="serverConfig"
                 withToggleButton={true}
                 customHsUrl={this.props.customHsUrl}
@@ -443,7 +440,6 @@ module.exports = React.createClass({
                             { _t('Create an account') }
                         </a>
                         { loginAsGuestJsx }
-                        { returnToAppJsx }
                         { makeLanguageSelector() }
                         <LoginFooter />
                     </div>
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 377cffc576..409234e2ed 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -23,7 +23,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
-import ServerConfig from '../../views/login/ServerConfig';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import RegistrationForm from '../../views/login/RegistrationForm';
 import RtsClient from '../../../RtsClient';
@@ -64,6 +63,12 @@ module.exports = React.createClass({
         onLoginClick: PropTypes.func.isRequired,
         onCancelClick: PropTypes.func,
         onServerConfigChange: PropTypes.func.isRequired,
+
+        rtsClient: PropTypes.shape({
+            getTeamsConfig: PropTypes.func.isRequired,
+            trackReferral: PropTypes.func.isRequired,
+            getTeam: PropTypes.func.isRequired,
+        }),
     },
 
     getInitialState: function() {
@@ -135,7 +140,7 @@ module.exports = React.createClass({
             newState.isUrl = config.isUrl;
         }
         this.props.onServerConfigChange(config);
-        this.setState(newState, function() {
+        this.setState(newState, () => {
             this._replaceClient();
         });
     },
@@ -161,11 +166,11 @@ module.exports = React.createClass({
             let msg = response.message || response.toString();
             // can we give a better error message?
             if (response.required_stages && response.required_stages.indexOf('m.login.msisdn') > -1) {
-                let msisdn_available = false;
+                let msisdnAvailable = false;
                 for (const flow of response.available_flows) {
-                    msisdn_available |= flow.stages.indexOf('m.login.msisdn') > -1;
+                    msisdnAvailable |= flow.stages.indexOf('m.login.msisdn') > -1;
                 }
-                if (!msisdn_available) {
+                if (!msisdnAvailable) {
                     msg = _t('This server does not support authentication with a phone number.');
                 }
             }
@@ -244,7 +249,7 @@ module.exports = React.createClass({
         return matrixClient.getPushers().then((resp)=>{
             const pushers = resp.pushers;
             for (let i = 0; i < pushers.length; ++i) {
-                if (pushers[i].kind == 'email') {
+                if (pushers[i].kind === 'email') {
                     const emailPusher = pushers[i];
                     emailPusher.data = { brand: this.props.brand };
                     matrixClient.setPusher(emailPusher).done(() => {
@@ -269,7 +274,7 @@ module.exports = React.createClass({
                 errMsg = _t('Passwords don\'t match.');
                 break;
             case "RegistrationForm.ERR_PASSWORD_LENGTH":
-                errMsg = _t('Password too short (min %(MIN_PASSWORD_LENGTH)s).', {MIN_PASSWORD_LENGTH: MIN_PASSWORD_LENGTH});
+                errMsg = _t('Password too short (min %(MIN_PASSWORD_LENGTH)s).', {MIN_PASSWORD_LENGTH});
                 break;
             case "RegistrationForm.ERR_EMAIL_INVALID":
                 errMsg = _t('This doesn\'t look like a valid email address.');
@@ -355,7 +360,7 @@ module.exports = React.createClass({
             registerBody = <Spinner />;
         } else {
             let serverConfigSection;
-            if (!SdkConfig.get().disable_custom_urls) {
+            if (!SdkConfig.get()['disable_custom_urls']) {
                 serverConfigSection = (
                     <ServerConfig ref="serverConfig"
                         withToggleButton={true}
@@ -387,18 +392,6 @@ module.exports = React.createClass({
             );
         }
 
-        let returnToAppJsx;
-        /*
-        // with the advent of ILAG I don't think we need this any more
-        if (this.props.onCancelClick) {
-            returnToAppJsx = (
-                <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
-                    { _t('Return to app') }
-                </a>
-            );
-        }
-        */
-
         let header;
         let errorText;
         // FIXME: remove hardcoded Status team tweaks at some point
@@ -433,7 +426,6 @@ module.exports = React.createClass({
                     { registerBody }
                     { signIn }
                     { errorText }
-                    { returnToAppJsx }
                     { makeLanguageSelector() }
                     <LoginFooter />
                 </div>

From ca2937cd65e72a062ea3a803fe881092b7f8ef2b Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 21 Jun 2018 15:38:16 +0000
Subject: [PATCH 387/702] Translated using Weblate (Italian)

Currently translated at 100.0% (1197 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d3f93acec5..ced3ba4db6 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1181,5 +1181,20 @@
     "Replying": "Rispondere",
     "Popout widget": "Oggetto a comparsa",
     "Failed to indicate account erasure": "Impossibile indicare la cancellazione dell'account",
-    "Bulk Options": "Opzioni applicate in massa"
+    "Bulk Options": "Opzioni applicate in massa",
+    "Encrypting": "Cifratura...",
+    "Encrypted, not sent": "Cifrato, non inviato",
+    "Share Link to User": "Condividi link con utente",
+    "Share room": "Condividi stanza",
+    "Share Room": "Condividi stanza",
+    "Link to most recent message": "Link al messaggio più recente",
+    "Share User": "Condividi utente",
+    "Share Community": "Condividi comunità",
+    "Share Room Message": "Condividi messaggio stanza",
+    "Link to selected message": "Link al messaggio selezionato",
+    "COPY": "COPIA",
+    "Share Message": "Condividi messaggio",
+    "No Audio Outputs detected": "Nessuna uscita audio rilevata",
+    "Audio Output": "Uscita audio",
+    "Try the app first": "Prova prima l'app"
 }

From 9d68c9e1a1d248011e3a1ad4276527dd3514a53f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Jun 2018 11:24:30 +0100
Subject: [PATCH 388/702] Logging & comment fix

---
 src/CallHandler.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 55a05798af..a65d82fe85 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -429,6 +429,7 @@ function _startCallApp(roomId, type) {
     const widgetSessionId = Math.random().toString(36).substring(2);
     const confId = room.roomId.replace(/[^A-Za-z0-9]/g, '') + widgetSessionId;
     // NB. we can't just encodeURICompoent all of these because the $ signs need to be there
+    // (but currently the only thing that needs encoding is the confId)
     const queryString = [
         'confId='+encodeURIComponent(confId),
         'isAudioConf='+(type === 'voice' ? 'true' : 'false'),
@@ -460,7 +461,7 @@ function _startCallApp(roomId, type) {
         'im.vector.modular.widgets',
         jitsiEvent,
         widgetId,
-    ).then(() => console.log('Sent state'), (e) => console.error(e));
+    ).then(() => console.log('Sent jitsi widget state event'), (e) => console.error(e));
 }
 
 // FIXME: Nasty way of making sure we only register

From 9ee78de7e5ac0875a263e1a81fda61ede27cac15 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 12:05:46 +0100
Subject: [PATCH 389/702] pr iteration, don't assume js-sdk stores group stuff
 other than groupId

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js                      |  3 ++-
 src/autocomplete/CommunityProvider.js | 24 ++++++------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 4f66468373..57be007209 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -223,7 +223,8 @@ const sanitizeHtmlParams = {
                             case '+':
                                 attribs.href = '#/group/' + entity;
                                 break;
-                            case '#': case '!':
+                            case '#':
+                            case '!':
                                 attribs.href = '#/room/' + entity;
                                 break;
                         }
diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js
index db4d52fae2..6b5438e8c8 100644
--- a/src/autocomplete/CommunityProvider.js
+++ b/src/autocomplete/CommunityProvider.js
@@ -58,33 +58,22 @@ export default class CommunityProvider extends AutocompleteProvider {
         let completions = [];
         const {command, range} = this.getCurrentCommand(query, selection, force);
         if (command) {
-            const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership !== 'invite');
+            const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership === 'join');
 
-            const groups = (await Promise.all(joinedGroups.map(async ({avatarUrl, groupId, name=''}) => {
+            const groups = (await Promise.all(joinedGroups.map(async ({groupId}) => {
                 try {
                     return FlairStore.getGroupProfileCached(cli, groupId);
-                } catch (e) { // if FlairStore failed, rely on js-sdk's store which lacks info
+                } catch (e) { // if FlairStore failed, fall back to just groupId
                     return Promise.resolve({
-                        name,
+                        name: '',
                         groupId,
-                        avatarUrl,
-                        shortDescription: '', // js-sdk doesn't store this
+                        avatarUrl: '',
+                        shortDescription: '',
                     });
                 }
             })));
 
             this.matcher.setObjects(groups);
-            // this.matcher.setObjects(joinedGroups);
-            // this.matcher.setObjects(joinedGroups.map(({groupId}) => {
-            //     const groupProfile = GroupStore.getSummary(groupId).profile;
-            //     if (groupProfile) {
-            //         return {
-            //             groupId,
-            //             name: groupProfile.name || '',
-            //             avatarUrl: groupProfile.avatar_url,
-            //         };
-            //     }
-            // })).filter(Boolean);
 
             const matchedString = command[0];
             completions = this.matcher.match(matchedString);
@@ -104,7 +93,6 @@ export default class CommunityProvider extends AutocompleteProvider {
                 ),
                 range,
             }))
-            .filter((completion) => !!completion.completion && completion.completion.length > 0)
             .slice(0, 4);
         }
         return completions;

From d92d95c37d7d032520e7377c5e9f99e5481f6562 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 12:11:16 +0100
Subject: [PATCH 390/702] don't fall back to getGroups as it gets it no
 additional data

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Pill.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 70e1d0659a..b860f7bf72 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -152,8 +152,12 @@ const Pill = React.createClass({
 
                 try {
                     group = await FlairStore.getGroupProfileCached(cli, resourceId);
-                } catch (e) { // if FlairStore failed, rely on js-sdk's store which lacks info
-                    group = cli.getGroup(resourceId);
+                } catch (e) { // if FlairStore failed, fall back to just groupId
+                    group = {
+                        groupId: resourceId,
+                        avatarUrl: null,
+                        name: null,
+                    };
                 }
             }
         }

From f236b319cccb1804cbdd267d6afbb8a9fdf0f122 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 15 Jun 2018 13:36:36 +0000
Subject: [PATCH 391/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index ebf329b45b..1b8b32af4d 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1195,5 +1195,6 @@
     "Share Room Message": "分享聊天室訊息",
     "Link to selected message": "連結到選定的訊息",
     "COPY": "複製",
-    "Share Message": "分享訊息"
+    "Share Message": "分享訊息",
+    "Jitsi Conference Calling": "Jitsi 會議通話"
 }

From 32ab9972300983b691401374be47e24b1ca3ba36 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 14:36:29 +0100
Subject: [PATCH 392/702] properly style Group Pill

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/elements/_RichText.scss | 12 +++++++++++-
 res/themes/light/css/_base.scss       |  1 +
 src/components/views/elements/Pill.js |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index eda9f6a4de..e21fc184ba 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -37,12 +37,22 @@
 
 /* More specific to override `.markdown-body a` color */
 .mx_EventTile_content .markdown-body a.mx_RoomPill,
-.mx_RoomPill {
+.mx_EventTile_content .markdown-body a.mx_GroupPill,
+.mx_RoomPill,
+.mx_GroupPill {
     color: $accent-fg-color;
     background-color: $rte-room-pill-color;
     padding-right: 5px;
 }
 
+/* More specific to override `.markdown-body a` color */
+.mx_EventTile_content .markdown-body a.mx_GroupPill,
+.mx_GroupPill {
+    color: $accent-fg-color;
+    background-color: $rte-group-pill-color;
+    padding-right: 5px;
+}
+
 .mx_UserPill .mx_BaseAvatar,
 .mx_RoomPill .mx_BaseAvatar,
 .mx_GroupPill .mx_BaseAvatar,
diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss
index 5d5f5d7c90..55c761e8d9 100644
--- a/res/themes/light/css/_base.scss
+++ b/res/themes/light/css/_base.scss
@@ -97,6 +97,7 @@ $voip-accept-color: #80f480;
 $rte-bg-color: #e9e9e9;
 $rte-code-bg-color: rgba(0, 0, 0, 0.04);
 $rte-room-pill-color: #aaa;
+$rte-group-pill-color: #aaa;
 
 // ********************
 
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index b860f7bf72..e14d6c37c9 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -260,7 +260,7 @@ const Pill = React.createClass({
                         avatar = <BaseAvatar name={name || groupId} width={16} height={16}
                                              url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 16, 16) : null} />;
                     }
-                    pillClass = 'mx_RoomPill' || 'mx_GroupPill';
+                    pillClass = 'mx_GroupPill';
                 }
             }
                 break;

From 548a06cad2a77fbe33ad71b502be52c86fa59beb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 14:47:57 +0100
Subject: [PATCH 393/702] use JSX and import via sdk rather than directly

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/login/ForgotPassword.js   | 5 +++--
 src/components/structures/login/LanguageSelector.js | 2 +-
 src/components/structures/login/Login.js            | 5 +++--
 src/components/structures/login/Registration.js     | 5 +++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index bbee4c3207..7e0cd5da8e 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -24,7 +24,6 @@ import MatrixClientPeg from "../../../MatrixClientPeg";
 import SdkConfig from "../../../SdkConfig";
 
 import PasswordReset from "../../../PasswordReset";
-import makeLanguageSelector from "./LanguageSelector";
 
 module.exports = React.createClass({
     displayName: 'ForgotPassword',
@@ -202,6 +201,8 @@ module.exports = React.createClass({
                 );
             }
 
+            const LanguageSelector = sdk.getComponent('structures.login.LanguageSelector');
+
             resetPasswordJsx = (
             <div>
                 <div className="mx_Login_prompt">
@@ -236,7 +237,7 @@ module.exports = React.createClass({
                     <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
                         { _t('Create an account') }
                     </a>
-                    { makeLanguageSelector() }
+                    <LanguageSelector />
                     <LoginFooter />
                 </div>
             </div>
diff --git a/src/components/structures/login/LanguageSelector.js b/src/components/structures/login/LanguageSelector.js
index 1e576bdbb8..965d8334d9 100644
--- a/src/components/structures/login/LanguageSelector.js
+++ b/src/components/structures/login/LanguageSelector.js
@@ -28,7 +28,7 @@ function onChange(newLang) {
     }
 }
 
-export default function makeLanguageSelector() {
+export default function LanguageSelector() {
     if (SdkConfig.get()['disable_login_language_selector']) return <div />;
 
     const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index c4a5b8ba57..bc04434bb2 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -25,7 +25,6 @@ import sdk from '../../../index';
 import Login from '../../../Login';
 import SdkConfig from '../../../SdkConfig';
 import SettingsStore from "../../../settings/SettingsStore";
-import makeLanguageSelector from "./LanguageSelector";
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -427,6 +426,8 @@ module.exports = React.createClass({
             );
         }
 
+        const LanguageSelector = sdk.getComponent('structures.login.LanguageSelector');
+
         return (
             <LoginPage>
                 <div className="mx_Login_box">
@@ -440,7 +441,7 @@ module.exports = React.createClass({
                             { _t('Create an account') }
                         </a>
                         { loginAsGuestJsx }
-                        { makeLanguageSelector() }
+                        <LanguageSelector />
                         <LoginFooter />
                     </div>
                 </div>
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 409234e2ed..462063406f 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -29,7 +29,6 @@ import RtsClient from '../../../RtsClient';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import SettingsStore from "../../../settings/SettingsStore";
-import makeLanguageSelector from "./LanguageSelector";
 
 const MIN_PASSWORD_LENGTH = 6;
 
@@ -413,6 +412,8 @@ module.exports = React.createClass({
             );
         }
 
+        const LanguageSelector = sdk.getComponent('structures.login.LanguageSelector');
+
         return (
             <LoginPage>
                 <div className="mx_Login_box">
@@ -426,7 +427,7 @@ module.exports = React.createClass({
                     { registerBody }
                     { signIn }
                     { errorText }
-                    { makeLanguageSelector() }
+                    <LanguageSelector />
                     <LoginFooter />
                 </div>
             </LoginPage>

From f94ecf9ff5ca38ce82b65403f6c759347d45d41f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Jun 2018 18:08:57 +0100
Subject: [PATCH 394/702] Prepare changelog for v0.12.8-rc.2

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2120e18a31..6c497dc363 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.12.8-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8-rc.2) (2018-06-22)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8-rc.1...v0.12.8-rc.2)
+
+ * slash got consumed in the consolidation
+   [\#1998](https://github.com/matrix-org/matrix-react-sdk/pull/1998)
+
 Changes in [0.12.8-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8-rc.1) (2018-06-21)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7...v0.12.8-rc.1)

From 64fc7d38409386468f34f415159208b4ef5d03f0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Jun 2018 18:08:57 +0100
Subject: [PATCH 395/702] v0.12.8-rc.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7da47f27c3..091158c035 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.8-rc.1",
+  "version": "0.12.8-rc.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 891070d001cd6570f6156b33d8d294704fb0995f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 01:16:01 +0100
Subject: [PATCH 396/702] update UrlPreview settings to be more privacy-aware
 in e2ee rooms

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js         | 24 +++++-
 .../views/room_settings/UrlPreviewSettings.js | 74 ++++++++++++-------
 2 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 97e575ff4e..c465eff44b 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -618,10 +618,26 @@ module.exports = React.createClass({
         }
     },
 
-    _updatePreviewUrlVisibility: function(room) {
-        this.setState({
-            showUrlPreview: SettingsStore.getValue("urlPreviewsEnabled", room.roomId),
-        });
+    _updatePreviewUrlVisibility: function({roomId}) {
+        const levels = [
+            SettingLevel.ROOM_DEVICE,
+            SettingLevel.ROOM_ACCOUNT,
+        ];
+        let showUrlPreview;
+        if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
+            for (const level of levels) {
+                const value = SettingsStore.getValueAt(level, "urlPreviewsEnabled", roomId, true, true);
+                if (value === Boolean(value)) { // if is Boolean
+                    showUrlPreview = value;
+                    break;
+                }
+            }
+
+            showUrlPreview = showUrlPreview || false;
+        } else {
+            showUrlPreview = SettingsStore.getValue("urlPreviewsEnabled", roomId);
+        }
+        this.setState({showUrlPreview});
     },
 
     onRoom: function(room) {
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index ed58d610aa..749167c0a5 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2017 Travis Ralston
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,6 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import {MatrixClient} from "matrix-js-sdk";
 const React = require('react');
 import PropTypes from 'prop-types';
 const sdk = require("../../../index");
@@ -29,6 +31,10 @@ module.exports = React.createClass({
         room: PropTypes.object,
     },
 
+    contextTypes: {
+        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    },
+
     saveSettings: function() {
         const promises = [];
         if (this.refs.urlPreviewsRoom) promises.push(this.refs.urlPreviewsRoom.save());
@@ -39,36 +45,52 @@ module.exports = React.createClass({
     render: function() {
         const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
         const roomId = this.props.room.roomId;
+        const isEncrypted = this.context.matrixClient.isRoomEncrypted(roomId);
 
         let previewsForAccount = null;
-        if (SettingsStore.getValueAt(SettingLevel.ACCOUNT, "urlPreviewsEnabled")) {
-            previewsForAccount = (
-                _t("You have <a>enabled</a> URL previews by default.", {}, { 'a': (sub)=><a href="#/settings">{ sub }</a> })
-            );
-        } else {
-            previewsForAccount = (
-                _t("You have <a>disabled</a> URL previews by default.", {}, { 'a': (sub)=><a href="#/settings">{ sub }</a> })
-            );
-        }
-
         let previewsForRoom = null;
-        if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) {
-            previewsForRoom = (
-                <label>
-                    <SettingsFlag name="urlPreviewsEnabled"
-                                  level={SettingLevel.ROOM}
-                                  roomId={this.props.room.roomId}
-                                  isExplicit={true}
-                                  manualSave={true}
-                                  ref="urlPreviewsRoom" />
-                </label>
-            );
-        } else {
-            let str = _td("URL previews are enabled by default for participants in this room.");
-            if (!SettingsStore.getValueAt(SettingLevel.ROOM, "urlPreviewsEnabled", roomId, /*explicit=*/true)) {
-                str = _td("URL previews are disabled by default for participants in this room.");
+
+
+        if (!isEncrypted) {
+            // Only show account setting state and room state setting state in non-e2ee rooms where they apply
+            const accountEnabled = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "urlPreviewsEnabled");
+            if (accountEnabled) {
+                previewsForAccount = (
+                    _t("You have <a>enabled</a> URL previews by default.", {}, {
+                        'a': (sub)=><a href="#/settings">{ sub }</a>,
+                    })
+                );
+            } else if (accountEnabled) {
+                previewsForAccount = (
+                    _t("You have <a>disabled</a> URL previews by default.", {}, {
+                        'a': (sub)=><a href="#/settings">{ sub }</a>,
+                    })
+                );
             }
-            previewsForRoom = (<label>{ _t(str) }</label>);
+
+            if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) {
+                previewsForRoom = (
+                    <label>
+                        <SettingsFlag name="urlPreviewsEnabled"
+                                      level={SettingLevel.ROOM}
+                                      roomId={this.props.room.roomId}
+                                      isExplicit={true}
+                                      manualSave={true}
+                                      ref="urlPreviewsRoom" />
+                    </label>
+                );
+            } else {
+                let str = _td("URL previews are enabled by default for participants in this room.");
+                if (!SettingsStore.getValueAt(SettingLevel.ROOM, "urlPreviewsEnabled", roomId, /*explicit=*/true)) {
+                    str = _td("URL previews are disabled by default for participants in this room.");
+                }
+                previewsForRoom = (<label>{ _t(str) }</label>);
+            }
+        } else {
+            previewsForAccount = (
+                _t("URL Previews default to off in End-to-End Encrypted rooms to protect your privacy. " +
+                    "They are requested through your homeserver which could infer links which are otherwise encrypted")
+            );
         }
 
         const previewsForRoomAccount = (

From a45dc837b4f7649c42cb5a8db42c3492a9496981 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 01:16:37 +0100
Subject: [PATCH 397/702] add copyright

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c465eff44b..cf7d3f61e8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From ed1f801254a85f2782b080740f516a9d675c49ac Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 01:18:21 +0100
Subject: [PATCH 398/702] add comment

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index cf7d3f61e8..e2de91c035 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -625,6 +625,7 @@ module.exports = React.createClass({
             SettingLevel.ROOM_ACCOUNT,
         ];
         let showUrlPreview;
+        // in e2ee rooms only care about room-device and room-account, so that user has to explicitly enable previews
         if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
             for (const level of levels) {
                 const value = SettingsStore.getValueAt(level, "urlPreviewsEnabled", roomId, true, true);

From ed4b82f8fc4ed8a2017f4d03998faf4eb570822d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 01:40:16 +0100
Subject: [PATCH 399/702] update wording and style it like text (text cursor)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/room_settings/UrlPreviewSettings.js      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 749167c0a5..6d3c6317d9 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -88,8 +88,9 @@ module.exports = React.createClass({
             }
         } else {
             previewsForAccount = (
-                _t("URL Previews default to off in End-to-End Encrypted rooms to protect your privacy. " +
-                    "They are requested through your homeserver which could infer links which are otherwise encrypted")
+                _t("In encrypted rooms, like this one, URL previews are disabled by default to ensure that your " +
+                    "homeserver (where the previews are generated) cannot gather information about links you see in " +
+                    "this room.")
             );
         }
 
@@ -105,8 +106,13 @@ module.exports = React.createClass({
         return (
             <div className="mx_RoomSettings_toggles">
                 <h3>{ _t("URL Previews") }</h3>
-
-                <label>{ previewsForAccount }</label>
+                <div>
+                    { _t('When someone puts a URL in their message, a URL preview can be shown to give more ' +
+                        'information about that link such as the title, description, and an image from the website.') }
+                </div>
+                <div>
+                    { previewsForAccount }
+                </div>
                 { previewsForRoom }
                 <label>{ previewsForRoomAccount }</label>
             </div>

From acbc84a69c3374319d33fa6551597d36d8049aa9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 18:44:54 +0100
Subject: [PATCH 400/702] switch to another settings key for e2e url previews
 to protect on change

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js         | 25 ++++---------------
 .../views/room_settings/UrlPreviewSettings.js |  9 +++----
 src/settings/Settings.js                      |  7 ++++++
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e2de91c035..af994d298f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -620,26 +620,11 @@ module.exports = React.createClass({
     },
 
     _updatePreviewUrlVisibility: function({roomId}) {
-        const levels = [
-            SettingLevel.ROOM_DEVICE,
-            SettingLevel.ROOM_ACCOUNT,
-        ];
-        let showUrlPreview;
-        // in e2ee rooms only care about room-device and room-account, so that user has to explicitly enable previews
-        if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
-            for (const level of levels) {
-                const value = SettingsStore.getValueAt(level, "urlPreviewsEnabled", roomId, true, true);
-                if (value === Boolean(value)) { // if is Boolean
-                    showUrlPreview = value;
-                    break;
-                }
-            }
-
-            showUrlPreview = showUrlPreview || false;
-        } else {
-            showUrlPreview = SettingsStore.getValue("urlPreviewsEnabled", roomId);
-        }
-        this.setState({showUrlPreview});
+        // URL Previews in E2EE rooms can be a privacy leak so use a different setting which is per-room explicit
+        const key = MatrixClientPeg.get().isRoomEncrypted(roomId) ? 'urlPreviewsEnabled_e2ee' : 'urlPreviewsEnabled';
+        this.setState({
+            showUrlPreview: SettingsStore.getValue(key, roomId),
+        });
     },
 
     onRoom: function(room) {
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 6d3c6317d9..fe2a2bacf4 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -50,7 +50,6 @@ module.exports = React.createClass({
         let previewsForAccount = null;
         let previewsForRoom = null;
 
-
         if (!isEncrypted) {
             // Only show account setting state and room state setting state in non-e2ee rooms where they apply
             const accountEnabled = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "urlPreviewsEnabled");
@@ -73,7 +72,7 @@ module.exports = React.createClass({
                     <label>
                         <SettingsFlag name="urlPreviewsEnabled"
                                       level={SettingLevel.ROOM}
-                                      roomId={this.props.room.roomId}
+                                      roomId={roomId}
                                       isExplicit={true}
                                       manualSave={true}
                                       ref="urlPreviewsRoom" />
@@ -94,10 +93,10 @@ module.exports = React.createClass({
             );
         }
 
-        const previewsForRoomAccount = (
-            <SettingsFlag name="urlPreviewsEnabled"
+        const previewsForRoomAccount = ( // in an e2ee room we use a special key to enforce per-room opt-in
+            <SettingsFlag name={isEncrypted ? 'urlPreviewsEnabled_e2ee' : 'urlPreviewsEnabled'}
                           level={SettingLevel.ROOM_ACCOUNT}
-                          roomId={this.props.room.roomId}
+                          roomId={roomId}
                           manualSave={true}
                           ref="urlPreviewsSelf"
             />
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 40bb2dd57e..f9d258c6b8 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -238,6 +238,13 @@ export const SETTINGS = {
         },
         default: true,
     },
+    "urlPreviewsEnabled_e2ee": {
+        supportedLevels: ['room-device', 'room-account'],
+        displayName: {
+            "room-account": _td("Enable URL previews for this room (only affects you)"),
+        },
+        default: false,
+    },
     "roomColor": {
         supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
         displayName: _td("Room Colour"),

From d4f9fec7073401f2f4cf60d6493911ceae32f81f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 18:48:48 +0100
Subject: [PATCH 401/702] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/el.json    |  1 -
 src/i18n/strings/en_EN.json | 96 +++++++++++++++++++------------------
 src/i18n/strings/gl.json    |  1 -
 src/i18n/strings/it.json    |  1 -
 4 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index f6264ce8b0..c4514f629b 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -810,7 +810,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
     "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
-    "Message Replies": "Απαντήσεις",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
     "Hide avatar changes": "Απόκρυψη αλλαγών εικονιδίων χρηστών",
     "Hide display name changes": "Απόκρυψη αλλαγών εμφανιζόμενων ονομάτων",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6d39586c0a..722596d978 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,6 +85,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -114,19 +119,36 @@
     "Room %(roomId)s not visible": "Room %(roomId)s not visible",
     "Missing user_id in request": "Missing user_id in request",
     "Usage": "Usage",
+    "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
     "/ddg is not a command": "/ddg is not a command",
     "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
+    "Changes your display nickname": "Changes your display nickname",
+    "Changes colour scheme of current room": "Changes colour scheme of current room",
+    "Sets the room topic": "Sets the room topic",
+    "Invites user with given id to current room": "Invites user with given id to current room",
+    "Joins room with given alias": "Joins room with given alias",
+    "Leave room": "Leave room",
     "Unrecognised room alias:": "Unrecognised room alias:",
+    "Kicks user with given id": "Kicks user with given id",
+    "Bans user with given id": "Bans user with given id",
+    "Unbans user with given id": "Unbans user with given id",
+    "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
     "Ignored user": "Ignored user",
     "You are now ignoring %(userId)s": "You are now ignoring %(userId)s",
+    "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
     "Unignored user": "Unignored user",
     "You are no longer ignoring %(userId)s": "You are no longer ignoring %(userId)s",
+    "Define the power level of a user": "Define the power level of a user",
+    "Deops user with given id": "Deops user with given id",
+    "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
+    "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
     "Unknown (user, device) pair:": "Unknown (user, device) pair:",
     "Device already verified!": "Device already verified!",
     "WARNING: Device already verified, but keys do NOT MATCH!": "WARNING: Device already verified, but keys do NOT MATCH!",
     "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!": "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!",
     "Verified key": "Verified key",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
+    "Displays action": "Displays action",
     "Unrecognised command:": "Unrecognised command:",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
@@ -177,11 +199,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -293,6 +310,31 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -392,11 +434,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -497,7 +539,6 @@
     "Muted Users": "Muted Users",
     "Banned users": "Banned users",
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
-    "Leave room": "Leave room",
     "Favourite": "Favourite",
     "Tagged as: ": "Tagged as: ",
     "To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
@@ -530,29 +571,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -1142,22 +1160,6 @@
     "You need to enter a user name.": "You need to enter a user name.",
     "An unknown error occurred.": "An unknown error occurred.",
     "I already have an account": "I already have an account",
-    "Displays action": "Displays action",
-    "Bans user with given id": "Bans user with given id",
-    "Unbans user with given id": "Unbans user with given id",
-    "Define the power level of a user": "Define the power level of a user",
-    "Deops user with given id": "Deops user with given id",
-    "Invites user with given id to current room": "Invites user with given id to current room",
-    "Joins room with given alias": "Joins room with given alias",
-    "Sets the room topic": "Sets the room topic",
-    "Kicks user with given id": "Kicks user with given id",
-    "Changes your display nickname": "Changes your display nickname",
-    "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
-    "Changes colour scheme of current room": "Changes colour scheme of current room",
-    "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
-    "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
-    "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
-    "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
     "Commands": "Commands",
     "Results from DuckDuckGo": "Results from DuckDuckGo",
     "Emoji": "Emoji",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 1080e66a26..57d8301df6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -168,7 +168,6 @@
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
     "Failed to join room": "Non se puido unir a sala",
     "Message Pinning": "Fixando mensaxe",
-    "Tag Panel": "Panel de etiquetas",
     "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe",
     "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
     "Hide removed messages": "Ocultar mensaxes eliminadas",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d3f93acec5..0957bc156d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1175,7 +1175,6 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
     "Review terms and conditions": "Leggi i termini e condizioni",
     "Muted Users": "Utenti silenziati",
-    "Message Replies": "Risposte",
     "Message Pinning": "Messaggi appuntati",
     "Mirror local video feed": "Feed video dai ripetitori locali",
     "Replying": "Rispondere",

From d1600bdacf78ca5643c89dd37ce119066a095f06 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 19:17:31 +0100
Subject: [PATCH 402/702] fix event type which room-account settings were read
 from

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/settings/handlers/RoomAccountSettingsHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index 74dbf9eed0..d0dadc2de7 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -74,7 +74,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
         return cli !== undefined && cli !== null;
     }
 
-    _getSettings(roomId, eventType = "im.vector.settings") {
+    _getSettings(roomId, eventType = "im.vector.web.settings") {
         const room = MatrixClientPeg.get().getRoom(roomId);
         if (!room) return null;
 

From b7396c8ef00e9524b7d465dcd037c054f31353c9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 19:17:55 +0100
Subject: [PATCH 403/702] trigger urlPreviews state update on
 {,room}AccountData changes of settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index af994d298f..c6dcc556be 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -648,19 +648,23 @@ module.exports = React.createClass({
     },
 
     onAccountData: function(event) {
-        if (event.getType() === "org.matrix.preview_urls" && this.state.room) {
+        const type = event.getType();
+        if ((type === "org.matrix.preview_urls" || type === "im.vector.web.settings") && this.state.room) {
+            // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
             this._updatePreviewUrlVisibility(this.state.room);
         }
     },
 
     onRoomAccountData: function(event, room) {
         if (room.roomId == this.state.roomId) {
-            if (event.getType() === "org.matrix.room.color_scheme") {
+            const type = event.getType();
+            if (type === "org.matrix.room.color_scheme") {
                 const color_scheme = event.getContent();
                 // XXX: we should validate the event
                 console.log("Tinter.tint from onRoomAccountData");
                 Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
-            } else if (event.getType() === "org.matrix.room.preview_urls") {
+            } else if (type === "org.matrix.room.preview_urls" || type === "im.vector.web.settings") {
+                // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
                 this._updatePreviewUrlVisibility(room);
             }
         }

From b23f84e1f53aacf0cc719857862f9dedfcdc8a2f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 19:23:39 +0100
Subject: [PATCH 404/702] add XXX comment

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ContextualMenu.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 8b88cae479..adc8dfd11c 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -96,6 +96,8 @@ export default class ContextualMenu extends React.Component {
             const x = e.clientX;
             const y = e.clientY;
 
+            // XXX: This isn't pretty but the only way to allow opening a different context menu on right click whilst
+            // a context menu and its click-guard are up without completely rewriting how the context menus work.
             setImmediate(() => {
                 const clickEvent = document.createEvent('MouseEvents');
                 clickEvent.initMouseEvent(

From aff2cc9065cad00b14a266bd59d927c7a1342f78 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 01:21:42 +0100
Subject: [PATCH 405/702] EventTile:notif apply EmojiText to room name

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/EventTile.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index aa2f28024e..537545c904 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -621,13 +621,14 @@ module.exports = withMatrixClient(React.createClass({
 
         switch (this.props.tileShape) {
             case 'notif': {
+                const EmojiText = sdk.getComponent('elements.EmojiText');
                 const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId());
                 return (
                     <div className={classes}>
                         <div className="mx_EventTile_roomName">
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
+                            <EmojiText element="a" href={permalink} onClick={this.onPermalinkClicked}>
                                 { room ? room.name : '' }
-                            </a>
+                            </EmojiText>
                         </div>
                         <div className="mx_EventTile_senderDetails">
                             { avatar }

From 807d72f2d9150ac7f0aa40d0f252a1e9f2352121 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 01:22:38 +0100
Subject: [PATCH 406/702] nullguard SenderProfile,broke when NotifPanel had evs
 from forgotten rooms

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/SenderProfile.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 5ca2fc6ed8..a91bed8a73 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -72,14 +72,12 @@ export default React.createClass({
 
     _updateRelatedGroups() {
         if (this.unmounted) return;
-        const relatedGroupsEvent = this.context.matrixClient
-            .getRoom(this.props.mxEvent.getRoomId())
-            .currentState
-            .getStateEvents('m.room.related_groups', '');
+        const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId())
+        if (!room) return;
+
+        const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
         this.setState({
-            relatedGroups: relatedGroupsEvent ?
-                relatedGroupsEvent.getContent().groups || []
-                : [],
+            relatedGroups: relatedGroupsEvent ? relatedGroupsEvent.getContent().groups || [] : [],
         });
     },
 

From f7a0ad3aa086478d81fc6395cffe3c3b3940aefb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 01:29:38 +0100
Subject: [PATCH 407/702] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/SenderProfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index a91bed8a73..70c9c711fc 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -72,7 +72,7 @@ export default React.createClass({
 
     _updateRelatedGroups() {
         if (this.unmounted) return;
-        const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId())
+        const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
         if (!room) return;
 
         const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');

From ce04c745e51017281fa9daf40138ae5420a37a14 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 01:56:04 +0100
Subject: [PATCH 408/702] strip diacritics for user autocomplete

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/UserProvider.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 85837d5ebb..92b27cd095 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -3,6 +3,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -32,6 +33,10 @@ import type {SelectionRange} from "./Autocompleter";
 
 const USER_REGEX = /@\S*/g;
 
+function stripDiacritics(str: string): string {
+    return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+}
+
 export default class UserProvider extends AutocompleteProvider {
     users: Array<RoomMember> = null;
     room: Room = null;
@@ -107,7 +112,7 @@ export default class UserProvider extends AutocompleteProvider {
         const fullMatch = command[0];
         // Don't search if the query is a single "@"
         if (fullMatch && fullMatch !== '@') {
-            completions = this.matcher.match(fullMatch).map((user) => {
+            completions = this.matcher.match(stripDiacritics(fullMatch)).map((user) => {
                 const displayName = (user.name || user.userId || '').replace(' (IRC)', ''); // FIXME when groups are done
                 return {
                     // Length of completion should equal length of text in decorator. draft-js
@@ -141,8 +146,15 @@ export default class UserProvider extends AutocompleteProvider {
         }
 
         const currentUserId = MatrixClientPeg.get().credentials.userId;
-        this.users = this.room.getJoinedMembers().filter((member) => {
-            if (member.userId !== currentUserId) return true;
+
+        this.users = [];
+        this.room.getJoinedMembers().forEach(({userId, name, ...rest}) => {
+            if (userId === currentUserId) return; // skip self
+            this.users.push({
+                userId,
+                name: stripDiacritics(name),
+                ...rest,
+            });
         });
 
         this.users = _sortBy(this.users, (member) =>

From 104e8d9cbac47cead2ad46ccfbc0743f34700eaa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 02:00:36 +0100
Subject: [PATCH 409/702] delint and add flow annotations to make my editor
 happy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/UserProvider.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 92b27cd095..9fc59e578d 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -27,9 +27,9 @@ import FuzzyMatcher from './FuzzyMatcher';
 import _sortBy from 'lodash/sortBy';
 import MatrixClientPeg from '../MatrixClientPeg';
 
-import type {Room, RoomMember} from 'matrix-js-sdk';
+import type {MatrixEvent, Room, RoomMember, RoomState} from 'matrix-js-sdk';
 import {makeUserPermalink} from "../matrix-to";
-import type {SelectionRange} from "./Autocompleter";
+import type {Completion, SelectionRange} from "./Autocompleter";
 
 const USER_REGEX = /@\S*/g;
 
@@ -49,7 +49,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.matcher = new FuzzyMatcher([], {
             keys: ['name', 'userId'],
             shouldMatchPrefix: true,
-            shouldMatchWordsOnly: false
+            shouldMatchWordsOnly: false,
         });
 
         this._onRoomTimelineBound = this._onRoomTimeline.bind(this);
@@ -66,7 +66,7 @@ export default class UserProvider extends AutocompleteProvider {
         }
     }
 
-    _onRoomTimeline(ev, room, toStartOfTimeline, removed, data) {
+    _onRoomTimeline(ev: MatrixEvent, room: Room, toStartOfTimeline: boolean, removed: boolean, data: Object) {
         if (!room) return;
         if (removed) return;
         if (room.roomId !== this.room.roomId) return;
@@ -82,7 +82,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.onUserSpoke(ev.sender);
     }
 
-    _onRoomStateMember(ev, state, member) {
+    _onRoomStateMember(ev: MatrixEvent, state: RoomState, member: RoomMember) {
         // ignore members in other rooms
         if (member.roomId !== this.room.roomId) {
             return;
@@ -92,7 +92,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.users = null;
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false) {
+    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array<Completion> {
         const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
 
         // Disable autocompletions when composing commands because of various issues
@@ -133,7 +133,7 @@ export default class UserProvider extends AutocompleteProvider {
         return completions;
     }
 
-    getName() {
+    getName(): string {
         return '👥 ' + _t('Users');
     }
 

From 54bccd20160356ef96ce17c8ce1f946399582124 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 02:10:31 +0100
Subject: [PATCH 410/702] make Accent Insensitive match more generic and apply
 to rooms too

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/Autocompleter.js | 4 ++++
 src/autocomplete/RoomProvider.js  | 4 +++-
 src/autocomplete/UserProvider.js  | 5 +----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index f5fec4c502..b8988e889f 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -43,6 +43,10 @@ export type Completion = {
     href: ?string,
 };
 
+export function stripDiacritics(str: string): string {
+    return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+}
+
 const PROVIDERS = [
     UserProvider,
     RoomProvider,
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index c222ae95d4..e4cc9567a0 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -2,6 +2,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@ import sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../matrix-to";
 import type {Completion, SelectionRange} from "./Autocompleter";
+import {stripDiacritics} from "./Autocompleter";
 
 const ROOM_REGEX = /(?=#)(\S*)/g;
 
@@ -71,7 +73,7 @@ export default class RoomProvider extends AutocompleteProvider {
                 };
             }));
             const matchedString = command[0];
-            completions = this.matcher.match(matchedString);
+            completions = this.matcher.match(stripDiacritics(matchedString));
             completions = _sortBy(completions, [
                 (c) => score(matchedString, c.displayedAlias),
                 (c) => c.displayedAlias.length,
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 9fc59e578d..c98304fff8 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -30,13 +30,10 @@ import MatrixClientPeg from '../MatrixClientPeg';
 import type {MatrixEvent, Room, RoomMember, RoomState} from 'matrix-js-sdk';
 import {makeUserPermalink} from "../matrix-to";
 import type {Completion, SelectionRange} from "./Autocompleter";
+import {stripDiacritics} from "./Autocompleter";
 
 const USER_REGEX = /@\S*/g;
 
-function stripDiacritics(str: string): string {
-    return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
-}
-
 export default class UserProvider extends AutocompleteProvider {
     users: Array<RoomMember> = null;
     room: Room = null;

From 7cdc91856be44c6d5be92c6ccbe72c6e0259751a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 02:12:01 +0100
Subject: [PATCH 411/702] retain pre-stripped text so it can be used for
 rendering

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/RoomProvider.js | 3 ++-
 src/autocomplete/UserProvider.js | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index e4cc9567a0..a72cc3fce2 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -45,7 +45,7 @@ export default class RoomProvider extends AutocompleteProvider {
     constructor() {
         super(ROOM_REGEX);
         this.matcher = new FuzzyMatcher([], {
-            keys: ['displayedAlias', 'name'],
+            keys: ['displayedAlias', '_name'],
         });
     }
 
@@ -69,6 +69,7 @@ export default class RoomProvider extends AutocompleteProvider {
                 return {
                     room: room,
                     name: room.name,
+                    _name: stripDiacritics(room.name),
                     displayedAlias: getDisplayAliasForRoom(room),
                 };
             }));
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index c98304fff8..42fcb5899b 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -40,11 +40,11 @@ export default class UserProvider extends AutocompleteProvider {
 
     constructor(room: Room) {
         super(USER_REGEX, {
-            keys: ['name'],
+            keys: ['_name'],
         });
         this.room = room;
         this.matcher = new FuzzyMatcher([], {
-            keys: ['name', 'userId'],
+            keys: ['_name', 'userId'],
             shouldMatchPrefix: true,
             shouldMatchWordsOnly: false,
         });
@@ -149,7 +149,8 @@ export default class UserProvider extends AutocompleteProvider {
             if (userId === currentUserId) return; // skip self
             this.users.push({
                 userId,
-                name: stripDiacritics(name),
+                name,
+                _name: stripDiacritics(name),
                 ...rest,
             });
         });

From 6a84a7ab323f26e4ab5ee2ba99ced6558b43efdd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 02:20:41 +0100
Subject: [PATCH 412/702] apply stripDiacritics to QueryMatcher instead of
 individually

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/Autocompleter.js |  4 ----
 src/autocomplete/QueryMatcher.js  | 16 +++++++++++-----
 src/autocomplete/RoomProvider.js  |  7 ++-----
 src/autocomplete/UserProvider.js  | 23 +++++------------------
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index b8988e889f..f5fec4c502 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -43,10 +43,6 @@ export type Completion = {
     href: ?string,
 };
 
-export function stripDiacritics(str: string): string {
-    return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
-}
-
 const PROVIDERS = [
     UserProvider,
     RoomProvider,
diff --git a/src/autocomplete/QueryMatcher.js b/src/autocomplete/QueryMatcher.js
index 762b285685..9d4d4d0598 100644
--- a/src/autocomplete/QueryMatcher.js
+++ b/src/autocomplete/QueryMatcher.js
@@ -1,6 +1,7 @@
 //@flow
 /*
 Copyright 2017 Aviral Dasgupta
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,6 +28,10 @@ class KeyMap {
     priorityMap = new Map();
 }
 
+function stripDiacritics(str: string): string {
+    return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+}
+
 export default class QueryMatcher {
     /**
      * @param {object[]} objects the objects to perform a match on
@@ -46,10 +51,11 @@ export default class QueryMatcher {
         objects.forEach((object, i) => {
             const keyValues = _at(object, keys);
             for (const keyValue of keyValues) {
-                if (!map.hasOwnProperty(keyValue)) {
-                    map[keyValue] = [];
+                const key = stripDiacritics(keyValue).toLowerCase();
+                if (!map.hasOwnProperty(key)) {
+                    map[key] = [];
                 }
-                map[keyValue].push(object);
+                map[key].push(object);
             }
             keyMap.priorityMap.set(object, i);
         });
@@ -82,7 +88,7 @@ export default class QueryMatcher {
     }
 
     match(query: String): Array<Object> {
-        query = query.toLowerCase();
+        query = stripDiacritics(query).toLowerCase();
         if (this.options.shouldMatchWordsOnly) {
             query = query.replace(/[^\w]/g, '');
         }
@@ -91,7 +97,7 @@ export default class QueryMatcher {
         }
         const results = [];
         this.keyMap.keys.forEach((key) => {
-            let resultKey = key.toLowerCase();
+            let resultKey = key;
             if (this.options.shouldMatchWordsOnly) {
                 resultKey = resultKey.replace(/[^\w]/g, '');
             }
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index a72cc3fce2..c222ae95d4 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -2,7 +2,6 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
-Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,7 +27,6 @@ import sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../matrix-to";
 import type {Completion, SelectionRange} from "./Autocompleter";
-import {stripDiacritics} from "./Autocompleter";
 
 const ROOM_REGEX = /(?=#)(\S*)/g;
 
@@ -45,7 +43,7 @@ export default class RoomProvider extends AutocompleteProvider {
     constructor() {
         super(ROOM_REGEX);
         this.matcher = new FuzzyMatcher([], {
-            keys: ['displayedAlias', '_name'],
+            keys: ['displayedAlias', 'name'],
         });
     }
 
@@ -69,12 +67,11 @@ export default class RoomProvider extends AutocompleteProvider {
                 return {
                     room: room,
                     name: room.name,
-                    _name: stripDiacritics(room.name),
                     displayedAlias: getDisplayAliasForRoom(room),
                 };
             }));
             const matchedString = command[0];
-            completions = this.matcher.match(stripDiacritics(matchedString));
+            completions = this.matcher.match(matchedString);
             completions = _sortBy(completions, [
                 (c) => score(matchedString, c.displayedAlias),
                 (c) => c.displayedAlias.length,
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 42fcb5899b..9c2fb58084 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -30,7 +30,6 @@ import MatrixClientPeg from '../MatrixClientPeg';
 import type {MatrixEvent, Room, RoomMember, RoomState} from 'matrix-js-sdk';
 import {makeUserPermalink} from "../matrix-to";
 import type {Completion, SelectionRange} from "./Autocompleter";
-import {stripDiacritics} from "./Autocompleter";
 
 const USER_REGEX = /@\S*/g;
 
@@ -40,11 +39,11 @@ export default class UserProvider extends AutocompleteProvider {
 
     constructor(room: Room) {
         super(USER_REGEX, {
-            keys: ['_name'],
+            keys: ['name'],
         });
         this.room = room;
         this.matcher = new FuzzyMatcher([], {
-            keys: ['_name', 'userId'],
+            keys: ['name', 'userId'],
             shouldMatchPrefix: true,
             shouldMatchWordsOnly: false,
         });
@@ -109,7 +108,7 @@ export default class UserProvider extends AutocompleteProvider {
         const fullMatch = command[0];
         // Don't search if the query is a single "@"
         if (fullMatch && fullMatch !== '@') {
-            completions = this.matcher.match(stripDiacritics(fullMatch)).map((user) => {
+            completions = this.matcher.match(fullMatch).map((user) => {
                 const displayName = (user.name || user.userId || '').replace(' (IRC)', ''); // FIXME when groups are done
                 return {
                     // Length of completion should equal length of text in decorator. draft-js
@@ -143,21 +142,9 @@ export default class UserProvider extends AutocompleteProvider {
         }
 
         const currentUserId = MatrixClientPeg.get().credentials.userId;
+        this.users = this.room.getJoinedMembers().filter(({userId}) => userId !== currentUserId);
 
-        this.users = [];
-        this.room.getJoinedMembers().forEach(({userId, name, ...rest}) => {
-            if (userId === currentUserId) return; // skip self
-            this.users.push({
-                userId,
-                name,
-                _name: stripDiacritics(name),
-                ...rest,
-            });
-        });
-
-        this.users = _sortBy(this.users, (member) =>
-            1E20 - lastSpoken[member.userId] || 1E20,
-        );
+        this.users = _sortBy(this.users, (member) => 1E20 - lastSpoken[member.userId] || 1E20);
 
         this.matcher.setObjects(this.users);
     }

From 917c655a9f8ded002ac0f65432c425b8ade7094f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Fri, 15 Jun 2018 16:09:24 +0000
Subject: [PATCH 413/702] Translated using Weblate (French)

Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8843ad89ca..1aec3ca8ec 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1195,5 +1195,6 @@
     "Share Room Message": "Partager le message du salon",
     "Link to selected message": "Lien vers le message sélectionné",
     "COPY": "COPIER",
-    "Share Message": "Partager le message"
+    "Share Message": "Partager le message",
+    "Jitsi Conference Calling": "Appel en téléconférence Jitsi"
 }

From eccc17fc69f589d39c8944dd7bc72da64fd64485 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 17 Jun 2018 08:34:45 +0000
Subject: [PATCH 414/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1abaec65c7..9abb39cdb2 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1195,5 +1195,6 @@
     "COPY": "KOPIATU",
     "Share Message": "Partekatu mezua",
     "No Audio Outputs detected": "Ez da audio irteerarik antzeman",
-    "Audio Output": "Audio irteera"
+    "Audio Output": "Audio irteera",
+    "Jitsi Conference Calling": "Jitsi konferentzia deia"
 }

From 346a3353de71b210f16a185041d82ea911ada47d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Sat, 23 Jun 2018 09:04:00 +0000
Subject: [PATCH 415/702] Translated using Weblate (Serbian)

Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
---
 src/i18n/strings/sr.json | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 6d217d5349..ec46986d09 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1177,5 +1177,24 @@
     "Terms and Conditions": "Услови коришћења",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да бисте наставили са коришћењем Кућног сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.",
     "Review terms and conditions": "Погледај услове коришћења",
-    "Try the app first": "Пробајте прво апликацију"
+    "Try the app first": "Пробајте прво апликацију",
+    "Jitsi Conference Calling": "Jitsi конференцијско позивање",
+    "Encrypting": "Шифрујем",
+    "Encrypted, not sent": "Шифровано, непослато",
+    "Share Link to User": "Подели везу са корисником",
+    "Share room": "Подели собу",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ово ће учинити ваш налог трајно неупотребљивим. Нећете моћи да се пријавите и нико се неће моћи поново регистровати са истим корисничким ИБ-јем. Ово ће учинити да ваш налог напусти све собе у којима учествује и уклониће појединости вашег налога са идентитетског сервера. <b>Ова радња се не може опозвати.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Деактивирањем вашег налога се <b>ваше поруке неће заборавити.</b> Ако желите да заборавимо ваше поруке, штиклирајте кућицу испод.",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видљивост порука у Матриксу је слична мејловима. Оне поруке које заборавимо нећемо делити са новим и нерегистрованим корисницима али постојећи корисници који су имали приступ овим порукама ће и даље моћи да виде своју копију.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Заборавите све моје поруке које сам послао када се мој налог деактивира (<b>Упозорење:</b> овим ће будући корисници видети непотпуне разговоре)",
+    "Share Room": "Подели собу",
+    "Link to most recent message": "Веза ка најновијој поруци",
+    "Share User": "Подели корисника",
+    "Share Community": "Подели заједницу",
+    "Share Room Message": "Подели поруку у соби",
+    "Link to selected message": "Веза ка изабраној поруци",
+    "COPY": "КОПИРАЈ",
+    "Share Message": "Подели поруку",
+    "No Audio Outputs detected": "Нема уочених аудио излаза",
+    "Audio Output": "Излаз звука"
 }

From ec12b6dce0473825507ae6a97782956ee8e59b66 Mon Sep 17 00:00:00 2001
From: Miguel Branco <mgl.branco@gmail.com>
Date: Mon, 18 Jun 2018 21:04:42 +0000
Subject: [PATCH 416/702] Translated using Weblate (Galician)

Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 1080e66a26..2e774207e2 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1196,5 +1196,6 @@
     "Review terms and conditions": "Revise os termos e condicións",
     "No Audio Outputs detected": "Non se detectou unha saída de audio",
     "Audio Output": "Saída de audio",
-    "Try the app first": "Probe a aplicación primeiro"
+    "Try the app first": "Probe a aplicación primeiro",
+    "Jitsi Conference Calling": "Chamada para conferencia con Jitsi"
 }

From eb80022991ef793253c34e25600948d91b26ea47 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 16:40:27 +0100
Subject: [PATCH 417/702] focus composer after interacting with e2ee
 statusbar/udd

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomStatusBar.js | 3 +++
 src/cryptodevices.js                       | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 8034923158..36f4719abb 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -25,6 +25,7 @@ import MatrixClientPeg from '../../MatrixClientPeg';
 import MemberAvatar from '../views/avatars/MemberAvatar';
 import Resend from '../../Resend';
 import * as cryptodevices from '../../cryptodevices';
+import dis from '../../dispatcher';
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -157,10 +158,12 @@ module.exports = React.createClass({
 
     _onResendAllClick: function() {
         Resend.resendUnsentEvents(this.props.room);
+        dis.dispatch({action: 'focus_composer'});
     },
 
     _onCancelAllClick: function() {
         Resend.cancelUnsentEvents(this.props.room);
+        dis.dispatch({action: 'focus_composer'});
     },
 
     _onShowDevicesClick: function() {
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index c0b7e3da6e..d11aa47cda 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import Resend from './Resend';
 import sdk from './index';
+import dis from './dispatcher';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 
@@ -65,6 +66,10 @@ export function getUnknownDevicesForRoom(matrixClient, room) {
     });
 }
 
+function focusComposer() {
+    dis.dispatch({action: 'focus_composer'});
+}
+
 /**
  * Show the UnknownDeviceDialog for a given room. The dialog will inform the user
  * that messages they sent to this room have not been sent due to unknown devices
@@ -86,6 +91,7 @@ export function showUnknownDeviceDialogForMessages(matrixClient, room) {
             sendAnywayLabel: _t("Send anyway"),
             sendLabel: _t("Send"),
             onSend: onSendClicked,
+            onFinished: focusComposer,
         }, 'mx_Dialog_unknownDevice');
     });
 }

From e1ba6949d0d6ce9474ab559828a407120d16e7f1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 16:40:53 +0100
Subject: [PATCH 418/702] expand composer input focus region and apply
 cursor:text to it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/rooms/_MessageComposer.scss          |  1 +
 src/components/views/rooms/MessageComposerInput.js | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 0a708a8edc..f1de103d3b 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -70,6 +70,7 @@ limitations under the License.
     flex: 1;
     display: flex;
     flex-direction: column;
+    cursor: text;
 }
 
 .mx_MessageComposer_input {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 8477176cc2..90a14d72fc 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -157,6 +157,7 @@ export default class MessageComposerInput extends React.Component {
         this.setDisplayedCompletion = this.setDisplayedCompletion.bind(this);
         this.onMarkdownToggleClicked = this.onMarkdownToggleClicked.bind(this);
         this.onTextPasted = this.onTextPasted.bind(this);
+        this.focusComposer = this.focusComposer.bind(this);
 
         const isRichtextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
 
@@ -270,13 +271,12 @@ export default class MessageComposerInput extends React.Component {
     }
 
     onAction = (payload) => {
-        const editor = this.refs.editor;
         let contentState = this.state.editorState.getCurrentContent();
 
         switch (payload.action) {
             case 'reply_to_event':
             case 'focus_composer':
-                editor.focus();
+                this.focusComposer();
                 break;
             case 'insert_mention': {
                 // Pretend that we've autocompleted this user because keeping two code
@@ -319,7 +319,7 @@ export default class MessageComposerInput extends React.Component {
                     let editorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
                     editorState = EditorState.moveSelectionToEnd(editorState);
                     this.onEditorContentChanged(editorState);
-                    editor.focus();
+                    this.focusComposer();
                 }
             }
                 break;
@@ -1155,6 +1155,10 @@ export default class MessageComposerInput extends React.Component {
         this.handleKeyCommand('toggle-mode');
     };
 
+    focusComposer() {
+        this.refs.editor.focus();
+    }
+
     render() {
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
@@ -1179,7 +1183,7 @@ export default class MessageComposerInput extends React.Component {
             activeEditorState.getCurrentContent().getBlocksAsArray());
 
         return (
-            <div className="mx_MessageComposer_input_wrapper">
+            <div className="mx_MessageComposer_input_wrapper" onClick={this.focusComposer}>
                 <div className="mx_MessageComposer_autocomplete_wrapper">
                     <ReplyPreview />
                     <Autocomplete

From 15e75ca7b34fc428073bdc6b8c58ac00b8017200 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 17:12:00 +0100
Subject: [PATCH 419/702] generate local errors for blank fields during login

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/login/Login.js    |  8 ++++
 src/components/views/login/PasswordLogin.js | 51 +++++++++++++++++----
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index bc04434bb2..43264e7003 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -93,6 +93,13 @@ module.exports = React.createClass({
         this._unmounted = true;
     },
 
+    onPasswordLoginError: function(errorText) {
+        this.setState({
+            errorText,
+            loginIncorrect: Boolean(errorText),
+        });
+    },
+
     onPasswordLogin: function(username, phoneCountry, phoneNumber, password) {
         this.setState({
             busy: true,
@@ -357,6 +364,7 @@ module.exports = React.createClass({
         return (
             <PasswordLogin
                onSubmit={this.onPasswordLogin}
+               onError={this.onPasswordLoginError}
                initialUsername={this.state.username}
                initialPhoneCountry={this.state.phoneCountry}
                initialPhoneNumber={this.state.phoneNumber}
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 71dfbe2c36..c30cb9d72a 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -28,6 +28,7 @@ import SdkConfig from '../../../SdkConfig';
  */
 class PasswordLogin extends React.Component {
     static defaultProps = {
+        onError: function() {},
         onUsernameChanged: function() {},
         onPasswordChanged: function() {},
         onPhoneCountryChanged: function() {},
@@ -70,19 +71,48 @@ class PasswordLogin extends React.Component {
 
     onSubmitForm(ev) {
         ev.preventDefault();
-        if (this.state.loginType === PasswordLogin.LOGIN_FIELD_PHONE) {
-            this.props.onSubmit(
-                '', // XXX: Synapse breaks if you send null here:
-                this.state.phoneCountry,
-                this.state.phoneNumber,
-                this.state.password,
-            );
+
+        let username = ''; // XXX: Synapse breaks if you send null here:
+        let phoneCountry = null;
+        let phoneNumber = null;
+        let error;
+
+        switch (this.state.loginType) {
+            case PasswordLogin.LOGIN_FIELD_EMAIL:
+                username = this.state.username;
+                if (!username) {
+                    error = _t('The email field must not be blank.');
+                }
+                break;
+            case PasswordLogin.LOGIN_FIELD_MXID:
+                username = this.state.username;
+                if (!username) {
+                    error = _t('The user name field must not be blank.');
+                }
+                break;
+            case PasswordLogin.LOGIN_FIELD_PHONE:
+                phoneCountry = this.state.phoneCountry;
+                phoneNumber = this.state.phoneNumber;
+                if (!phoneNumber) {
+                    error = _t('The phone number field must not be blank.');
+                }
+                break;
+        }
+
+        if (error) {
+            this.props.onError(error);
             return;
         }
+
+        if (!this.state.password) {
+            this.props.onError(_t('The password field must not be blank.'));
+            return;
+        }
+
         this.props.onSubmit(
-            this.state.username,
-            null,
-            null,
+            username,
+            phoneCountry,
+            phoneNumber,
             this.state.password,
         );
     }
@@ -258,6 +288,7 @@ PasswordLogin.LOGIN_FIELD_PHONE = "login_field_phone";
 
 PasswordLogin.propTypes = {
     onSubmit: PropTypes.func.isRequired, // fn(username, password)
+    onError: PropTypes.func,
     onForgotPasswordClick: PropTypes.func, // fn()
     initialUsername: PropTypes.string,
     initialPhoneCountry: PropTypes.string,

From 4a5fbf2c84705de650daa22e8b78c4d490ae59c2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 17:13:40 +0100
Subject: [PATCH 420/702] clear error on login type change

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/login/PasswordLogin.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index c30cb9d72a..16bd339825 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -123,6 +123,7 @@ class PasswordLogin extends React.Component {
     }
 
     onLoginTypeChange(loginType) {
+        this.props.onError(null); // send a null error to clear any error messages
         this.setState({
             loginType: loginType,
             username: "", // Reset because email and username use the same state

From 61def4a973359b5ffce2d2f92e6006000c2f70f1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 17:26:16 +0100
Subject: [PATCH 421/702] highlight top field if blank otherwise the password
 field. remove unused refs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/login/PasswordLogin.js | 27 +++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 16bd339825..a0e5ab0ddb 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -57,15 +57,17 @@ class PasswordLogin extends React.Component {
         this.onPhoneCountryChanged = this.onPhoneCountryChanged.bind(this);
         this.onPhoneNumberChanged = this.onPhoneNumberChanged.bind(this);
         this.onPasswordChanged = this.onPasswordChanged.bind(this);
+        this.isLoginEmpty = this.isLoginEmpty.bind(this);
     }
 
     componentWillMount() {
         this._passwordField = null;
+        this._loginField = null;
     }
 
     componentWillReceiveProps(nextProps) {
         if (!this.props.loginIncorrect && nextProps.loginIncorrect) {
-            field_input_incorrect(this._passwordField);
+            field_input_incorrect(this.isLoginEmpty() ? this._loginField : this._passwordField);
         }
     }
 
@@ -157,8 +159,10 @@ class PasswordLogin extends React.Component {
         switch (loginType) {
             case PasswordLogin.LOGIN_FIELD_EMAIL:
                 classes.mx_Login_email = true;
+                classes.error = this.props.loginIncorrect && !this.state.username;
                 return <input
                     className={classNames(classes)}
+                    ref={(e) => {this._loginField = e;}}
                     key="email_input"
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
@@ -170,8 +174,10 @@ class PasswordLogin extends React.Component {
                 />;
             case PasswordLogin.LOGIN_FIELD_MXID:
                 classes.mx_Login_username = true;
+                classes.error = this.props.loginIncorrect && !this.state.username;
                 return <input
                     className={classNames(classes)}
+                    ref={(e) => {this._loginField = e;}}
                     key="username_input"
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
@@ -184,14 +190,14 @@ class PasswordLogin extends React.Component {
                     autoFocus
                     disabled={disabled}
                 />;
-            case PasswordLogin.LOGIN_FIELD_PHONE:
+            case PasswordLogin.LOGIN_FIELD_PHONE: {
                 const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
                 classes.mx_Login_phoneNumberField = true;
                 classes.mx_Login_field_has_prefix = true;
+                classes.error = this.props.loginIncorrect && !this.state.phoneNumber;
                 return <div className="mx_Login_phoneSection">
                     <CountryDropdown
                         className="mx_Login_phoneCountry mx_Login_field_prefix"
-                        ref="phone_country"
                         onOptionChange={this.onPhoneCountryChanged}
                         value={this.state.phoneCountry}
                         isSmall={true}
@@ -200,7 +206,7 @@ class PasswordLogin extends React.Component {
                     />
                     <input
                         className={classNames(classes)}
-                        ref="phoneNumber"
+                        ref={(e) => {this._loginField = e;}}
                         key="phone_input"
                         type="text"
                         name="phoneNumber"
@@ -211,6 +217,17 @@ class PasswordLogin extends React.Component {
                         disabled={disabled}
                     />
                 </div>;
+            }
+        }
+    }
+
+    isLoginEmpty() {
+        switch (this.state.loginType) {
+            case PasswordLogin.LOGIN_FIELD_EMAIL:
+            case PasswordLogin.LOGIN_FIELD_MXID:
+                return !this.state.username;
+            case PasswordLogin.LOGIN_FIELD_PHONE:
+                return !this.state.phoneCountry || !this.state.phoneNumber;
         }
     }
 
@@ -238,7 +255,7 @@ class PasswordLogin extends React.Component {
         const pwFieldClass = classNames({
             mx_Login_field: true,
             mx_Login_field_disabled: matrixIdText === '',
-            error: this.props.loginIncorrect,
+            error: this.props.loginIncorrect && !this.isLoginEmpty(), // only error password if error isn't top field
         });
 
         const Dropdown = sdk.getComponent('elements.Dropdown');

From 8251de4e35af64b3fcb41b62d031e47fdb59d605 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 17:26:44 +0100
Subject: [PATCH 422/702] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/el.json    |  1 -
 src/i18n/strings/en_EN.json | 64 ++++++++++++++++++++-----------------
 src/i18n/strings/gl.json    |  1 -
 src/i18n/strings/it.json    |  1 -
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index f6264ce8b0..c4514f629b 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -810,7 +810,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
     "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
-    "Message Replies": "Απαντήσεις",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
     "Hide avatar changes": "Απόκρυψη αλλαγών εικονιδίων χρηστών",
     "Hide display name changes": "Απόκρυψη αλλαγών εμφανιζόμενων ονομάτων",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index da47140c96..21dfc87ad2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,6 +85,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -194,11 +199,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -311,6 +311,29 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -410,11 +433,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -547,29 +570,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -614,6 +614,10 @@
     "Code": "Code",
     "Start authentication": "Start authentication",
     "powered by Matrix": "powered by Matrix",
+    "The email field must not be blank.": "The email field must not be blank.",
+    "The user name field must not be blank.": "The user name field must not be blank.",
+    "The phone number field must not be blank.": "The phone number field must not be blank.",
+    "The password field must not be blank.": "The password field must not be blank.",
     "Username on %(hs)s": "Username on %(hs)s",
     "User name": "User name",
     "Mobile phone number": "Mobile phone number",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 1080e66a26..57d8301df6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -168,7 +168,6 @@
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
     "Failed to join room": "Non se puido unir a sala",
     "Message Pinning": "Fixando mensaxe",
-    "Tag Panel": "Panel de etiquetas",
     "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe",
     "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
     "Hide removed messages": "Ocultar mensaxes eliminadas",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d3f93acec5..0957bc156d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1175,7 +1175,6 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
     "Review terms and conditions": "Leggi i termini e condizioni",
     "Muted Users": "Utenti silenziati",
-    "Message Replies": "Risposte",
     "Message Pinning": "Messaggi appuntati",
     "Mirror local video feed": "Feed video dai ripetitori locali",
     "Replying": "Rispondere",

From 6e0db5bfb6bb04f19b4aeb15943118433dfc3db4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 17:41:50 +0100
Subject: [PATCH 423/702] use enum constants for EventStatus and correct isSent
 check

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/context_menus/MessageContextMenu.js      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 59cdb61fd6..4802244c74 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -15,10 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
+import {EventStatus} from 'matrix-js-sdk';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
@@ -220,7 +219,10 @@ module.exports = React.createClass({
         let replyButton;
         let collapseReplyThread;
 
-        if (eventStatus === 'not_sent') {
+        // status is SENT before remote-echo, null after
+        const isSent = !eventStatus || eventStatus === EventStatus.SENT;
+
+        if (eventStatus === EventStatus.NOT_SENT) {
             resendButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onResendClick}>
                     { _t('Resend') }
@@ -228,7 +230,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (!eventStatus && this.state.canRedact) {
+        if (isSent && this.state.canRedact) {
             redactButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
                     { _t('Remove') }
@@ -236,7 +238,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (eventStatus === "queued" || eventStatus === "not_sent") {
+        if (eventStatus === EventStatus.QUEUED || eventStatus === EventStatus.NOT_SENT) {
             cancelButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onCancelSendClick}>
                     { _t('Cancel Sending') }
@@ -244,7 +246,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (!eventStatus && this.props.mxEvent.getType() === 'm.room.message') {
+        if (isSent && this.props.mxEvent.getType() === 'm.room.message') {
             const content = this.props.mxEvent.getContent();
             if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {
                 forwardButton = (

From 7b1ac9b75434e1acd222f4e3de3b1a3c9d2538a2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 19:28:42 +0100
Subject: [PATCH 424/702] upgrade minimum version of linkifyjs for more TLD
 support

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 33aa428d4b..74f97bad9c 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "glob": "^5.0.14",
     "highlight.js": "^9.0.0",
     "isomorphic-fetch": "^2.2.1",
-    "linkifyjs": "^2.1.3",
+    "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
     "matrix-js-sdk": "0.10.4",

From 2d11d6dcc03b75ee117a57beb05cc18887419e39 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 19:28:48 +0100
Subject: [PATCH 425/702] accept repeated TLDs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index d72319948a..e36450b07f 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -70,6 +70,8 @@ function matrixLinkify(linkify) {
     S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_HASH_NAME_COLON_DOMAIN);
     S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS);
 
+    S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
+
 
     const USERID = function(value) {
         MultiToken.call(this, value);
@@ -111,6 +113,8 @@ function matrixLinkify(linkify) {
     S_AT_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_AT_NAME_COLON_DOMAIN);
     S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID);
 
+    S_USERID.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
+
 
     const GROUPID = function(value) {
         MultiToken.call(this, value);
@@ -151,6 +155,8 @@ function matrixLinkify(linkify) {
     S_PLUS_NAME_COLON_DOMAIN.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT);
     S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_PLUS_NAME_COLON_DOMAIN);
     S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_GROUPID);
+
+    S_GROUPID.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
 }
 
 // stubs, overwritten in MatrixChat's componentDidMount

From 1d2945036f29650208547a26f7134b242073c0f8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 Jun 2018 19:42:03 +0100
Subject: [PATCH 426/702] allow TLD to come anywhere in the domain, because
 `com` isn't JUST a TLD

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index e36450b07f..132695b9de 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -66,6 +66,7 @@ function matrixLinkify(linkify) {
 
     S_HASH_NAME_COLON.on(TT.DOMAIN, S_HASH_NAME_COLON_DOMAIN);
     S_HASH_NAME_COLON.on(TT.LOCALHOST, S_ROOMALIAS); // accept #foo:localhost
+    S_HASH_NAME_COLON.on(TT.TLD, S_ROOMALIAS); // accept #foo:com (mostly for (TLD|DOMAIN)+ mixing)
     S_HASH_NAME_COLON_DOMAIN.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT);
     S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_HASH_NAME_COLON_DOMAIN);
     S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS);
@@ -109,6 +110,7 @@ function matrixLinkify(linkify) {
 
     S_AT_NAME_COLON.on(TT.DOMAIN, S_AT_NAME_COLON_DOMAIN);
     S_AT_NAME_COLON.on(TT.LOCALHOST, S_USERID); // accept @foo:localhost
+    S_AT_NAME_COLON.on(TT.TLD, S_USERID); // accept @foo:com (mostly for (TLD|DOMAIN)+ mixing)
     S_AT_NAME_COLON_DOMAIN.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT);
     S_AT_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_AT_NAME_COLON_DOMAIN);
     S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID);
@@ -152,6 +154,7 @@ function matrixLinkify(linkify) {
 
     S_PLUS_NAME_COLON.on(TT.DOMAIN, S_PLUS_NAME_COLON_DOMAIN);
     S_PLUS_NAME_COLON.on(TT.LOCALHOST, S_GROUPID); // accept +foo:localhost
+    S_PLUS_NAME_COLON.on(TT.TLD, S_GROUPID); // accept +foo:com (mostly for (TLD|DOMAIN)+ mixing)
     S_PLUS_NAME_COLON_DOMAIN.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT);
     S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_PLUS_NAME_COLON_DOMAIN);
     S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_GROUPID);

From fcda7f4d40337bc05f4a7dc73bcd929b66ca78d9 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 21 Jun 2018 09:50:06 +0000
Subject: [PATCH 427/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 90bfc3c94a..56025bb00c 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1195,5 +1195,6 @@
     "COPY": "КОПИРАЙ",
     "Share Message": "Сподели съобщението",
     "No Audio Outputs detected": "Не са открити аудио изходи",
-    "Audio Output": "Аудио изходи"
+    "Audio Output": "Аудио изходи",
+    "Jitsi Conference Calling": "Jitsi конферентни разговори"
 }

From f21f7eff4592a149536f3fbd00c22fd198d1832c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 Jun 2018 09:32:51 +0100
Subject: [PATCH 428/702] add word boundary to Community,Room,User provider
 regexps to stop the autocompleter firing mid-word and remove any unused
 capture groups

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommunityProvider.js | 3 ++-
 src/autocomplete/RoomProvider.js      | 3 ++-
 src/autocomplete/UserProvider.js      | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js
index 6b5438e8c8..6bcf1a02fd 100644
--- a/src/autocomplete/CommunityProvider.js
+++ b/src/autocomplete/CommunityProvider.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,7 +27,7 @@ import {makeGroupPermalink} from "../matrix-to";
 import type {Completion, SelectionRange} from "./Autocompleter";
 import FlairStore from "../stores/FlairStore";
 
-const COMMUNITY_REGEX = /(?=\+)(\S*)/g;
+const COMMUNITY_REGEX = /\B\+\S*/g;
 
 function score(query, space) {
     const index = space.indexOf(query);
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index c222ae95d4..4e41a4221a 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -2,6 +2,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,7 +29,7 @@ import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../matrix-to";
 import type {Completion, SelectionRange} from "./Autocompleter";
 
-const ROOM_REGEX = /(?=#)(\S*)/g;
+const ROOM_REGEX = /\B#\S*/g;
 
 function score(query, space) {
     const index = space.indexOf(query);
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 85837d5ebb..97cbae2e63 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -3,6 +3,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -30,7 +31,7 @@ import type {Room, RoomMember} from 'matrix-js-sdk';
 import {makeUserPermalink} from "../matrix-to";
 import type {SelectionRange} from "./Autocompleter";
 
-const USER_REGEX = /@\S*/g;
+const USER_REGEX = /\B@\S*/g;
 
 export default class UserProvider extends AutocompleteProvider {
     users: Array<RoomMember> = null;

From a17455545297948f6bc9a54569d6fca9b94d9cda Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 Jun 2018 09:41:28 +0100
Subject: [PATCH 429/702] hide RoomSubList if has 0 tiles and either
 searchFilter or emptyContent

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 33ff17caa4..025c2b2e08 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -1,6 +1,7 @@
 /*
-Copyright 2017 Vector Creations Ltd
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -349,8 +350,14 @@ var RoomSubList = React.createClass({
         var label = this.props.collapsed ? null : this.props.label;
 
         let content;
-        if (this.state.sortedList.length === 0 && !this.props.searchFilter && this.props.extraTiles.length === 0) {
-            content = this.props.emptyContent;
+        if (this.state.sortedList.length === 0 && this.props.extraTiles.length === 0) {
+            // if no search filter is applied and there is a placeholder defined then show it, otherwise show nothing
+            if (!this.props.searchFilter && this.props.emptyContent) {
+                content = this.props.emptyContent;
+            } else {
+                // don't show an empty sublist
+                return null;
+            }
         } else {
             content = this.makeRoomTiles();
             content.push(...this.props.extraTiles);

From e1f82f41204b789026e99775348c643982b578e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Kozio=C5=82?=
 <translate.riot.im@www.koziolek.biz>
Date: Sun, 24 Jun 2018 17:03:11 +0000
Subject: [PATCH 430/702] Translated using Weblate (Polish)

Currently translated at 93.8% (1124 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 179 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 173 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 0088028aed..1fffff1b87 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -752,9 +752,9 @@
     "Unnamed room": "Pokój bez nazwy",
     "Guests can join": "Goście mogą dołączyć",
     "Remove avatar": "Usuń awatar",
-    "Drop here to favourite": "Upuść to aby dodać do ulubionych",
-    "Drop here to restore": "Upuść tu aby przywrócić",
-    "Drop here to demote": "Upuść tu aby zdegradować",
+    "Drop here to favourite": "Upuść tutaj aby dodać do ulubionych",
+    "Drop here to restore": "Upuść tutaj aby przywrócić",
+    "Drop here to demote": "Upuść tutaj aby zdegradować",
     "You have been kicked from this room by %(userName)s.": "Zostałeś usunięty z tego pokoju przez %(userName)s.",
     "You have been banned from this room by %(userName)s.": "Zostałeś zbanowany z tego pokoju przez %(userName)s.",
     "You are trying to access a room.": "Próbujesz uzyskać dostęp do pokoju.",
@@ -937,8 +937,8 @@
     "An email has been sent to %(emailAddress)s": "Email został wysłany do %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Wysłano wiadomość tekstową do %(msisdn)s",
     "Code": "Kod",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</ UsageDataLink>. Spowoduje to użycie pliku cookie (zobacz naszą <PolicyLink>Politykę plików cookie</ PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</ UsageDataLink>. Spowoduje to użycie pliku cookie.",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</UsageDataLink>. Spowoduje to użycie pliku cookie (zobacz naszą <PolicyLink>Politykę plików cookie</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</UsageDataLink>. Spowoduje to użycie pliku cookie.",
     "Yes, I want to help!": "Tak, chcę pomóc!",
     "Warning: This widget might use cookies.": "Uwaga: Ten widżet może używać ciasteczek.",
     "Delete Widget": "Usuń widżet",
@@ -955,5 +955,172 @@
     "Advanced options": "Opcje zaawansowane",
     "To continue, please enter your password:": "Aby kontynuować, proszę wprowadzić swoje hasło:",
     "password": "hasło",
-    "Refresh": "Odśwież"
+    "Refresh": "Odśwież",
+    "Which officially provided instance you are using, if any": "Jakiej oficjalnej instancji używasz, jeżeli w ogóle",
+    "Every page you use in the app": "Każda strona, której używasz w aplikacji",
+    "e.g. <CurrentPageURL>": "np. <CurrentPageURL>",
+    "Your User Agent": "Identyfikator Twojej przeglądarki",
+    "Your device resolution": "Twoja rozdzielczość ekranu",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Dane identyfikujące, takie jak: pokój, identyfikator użytkownika lub grupy, są usuwane przed wysłaniem na serwer.",
+    "Who would you like to add to this community?": "Kogo chcesz dodać do tej społeczności?",
+    "Missing roomId.": "Brak identyfikatora pokoju (roomId).",
+    "Ignores a user, hiding their messages from you": "Ignoruje użytkownika ukrywając jego wiadomości przed Tobą",
+    "Stops ignoring a user, showing their messages going forward": "Przestaje ignorować użytkownika, zaczynaj pokazywać jego wiadomości od tego momentu",
+    "Opens the Developer Tools dialog": "Otwiera narzędzia deweloperskie",
+    "Encrypting": "Szyfrowanie",
+    "Encrypted, not sent": "Zaszyfrowane, nie wysłane",
+    "Disinvite this user?": "Anulować zaproszenie tego użytkownika?",
+    "Unignore": "Przestań ignorować",
+    "Jump to read receipt": "Przeskocz do potwierdzenia odczytu",
+    "Share Link to User": "Udostępnij link do użytkownika",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "W tej chwili nie można odpowiedzieć plikiem, więc zostanie wysłany nie będąc odpowiedzią.",
+    "Unable to reply": "Nie udało się odpowiedzieć",
+    "At this time it is not possible to reply with an emote.": "W tej chwili nie można odpowiedzieć emotikoną.",
+    "Replying": "Odpowiadanie",
+    "Share room": "Udostępnij pokój",
+    "Drop here to tag direct chat": "Upuść tutaj aby oznaczyć jako rozmowę bezpośrednią",
+    "Community Invites": "Zaproszenia do społeczności",
+    "To change the room's history visibility, you must be a": "Aby zmienić widoczność historii pokoju, musisz być",
+    "To change the permissions in the room, you must be a": "Aby zmienić uprawnienia pokoju, musisz być",
+    "To change the topic, you must be a": "Aby zmienić temat, musisz być",
+    "To modify widgets in the room, you must be a": "Aby modyfikować widżety w tym pokoju, musisz być",
+    "Banned by %(displayName)s": "Zbanowany przez %(displayName)s",
+    "To send messages, you must be a": "Aby wysyłać wiadomości, musisz być",
+    "To invite users into the room, you must be a": "Aby zapraszać użytkowników do pokoju, musisz być",
+    "To configure the room, you must be a": "Aby konfigurować pokój, musisz być",
+    "To kick users, you must be a": "Aby wyrzucać użytkowników, musisz być",
+    "To ban users, you must be a": "Aby blokować użytkowników, musisz być",
+    "To remove other users' messages, you must be a": "Aby usuwać wiadomości innych użytkowników, musisz być",
+    "To notify everyone in the room, you must be a": "Aby powiadamiać wszystkich w pokoju, musisz być",
+    "Muted Users": "Wyciszeni użytkownicy",
+    "To send events of type <eventType/>, you must be a": "Aby wysyłać zdarzenia typu <eventType/>, musisz być",
+    "Addresses": "Adresy",
+    "Invalid community ID": "Błędne ID społeczności",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nie jest poprawnym ID społeczności",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nowe ID społeczności (np. +bla:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "Podglądy linków są domyślnie włączone dla uczestników tego pokoju.",
+    "URL previews are disabled by default for participants in this room.": "Podglądy linków są domyślnie wyłączone dla uczestników tego pokoju.",
+    "Username on %(hs)s": "Nazwa użytkownika na %(hs)s",
+    "Remove from community": "Usuń ze społeczności",
+    "Disinvite this user from community?": "Anulować zaproszenie tego użytkownika ze społeczności?",
+    "Remove this user from community?": "Usunąć tego użytkownika ze społeczności?",
+    "Failed to withdraw invitation": "Nie udało się wycofać zaproszenia",
+    "Failed to remove user from community": "Nie udało się usunąć użytkownika ze społeczności",
+    "Filter community members": "Filtruj członków społeczności",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Czy na pewno chcesz usunąć '%(roomName)s' z %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Usunięcie pokoju ze społeczności spowoduje także jego usunięcie ze strony społeczności.",
+    "Failed to remove room from community": "Nie udało się usunąć pokoju ze społeczności",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Nie udało się usunąć '%(roomName)s' z %(groupId)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Widoczność '%(roomName)s' w %(groupId)s nie może być zaktualizowana.",
+    "Visibility in Room List": "Widoczność na liście pokojów",
+    "Visible to everyone": "Widoczny dla wszystkich",
+    "Only visible to community members": "Widoczny tylko dla członków społeczności",
+    "Filter community rooms": "Filtruj pokoje społeczności",
+    "Something went wrong when trying to get your communities.": "Coś poszło nie tak podczas pobierania Twoich społeczności.",
+    "You're not currently a member of any communities.": "Nie jesteś obecnie członkiem żadnej społeczności.",
+    "Minimize apps": "Zminimalizuj aplikacje",
+    "Reload widget": "Przeładuj widżet",
+    "Picture": "Zdjęcie",
+    "Matrix Room ID": "ID pokoju Matrix",
+    "You have entered an invalid address.": "Podałeś nieprawidłowy adres.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Spróbuj użyć jednego z następujących poprawnych typów adresów: %(validTypesList)s.",
+    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Błędy Riot śledzone są na GitHubie: <a>utwórz nowe zgłoszenie</a>.",
+    "Community IDs cannot not be empty.": "ID społeczności nie może być puste.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID społeczności może zawierać tylko znaki a-z, 0-9 lub '=_-./'",
+    "Something went wrong whilst creating your community": "Coś poszło nie tak podczas tworzenia Twojej społeczności",
+    "Create Community": "Utwórz społeczność",
+    "Community Name": "Nazwa społeczności",
+    "Community ID": "ID społeczności",
+    "Block users on other matrix homeservers from joining this room": "Blokuj użytkowników z innych serwerów Matrix przed dołączaniem do tego pokoju",
+    "This setting cannot be changed later!": "Tego ustawienia nie można zmienić później!",
+    "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>": "To sprawi, że Twoje konto stanie się na stałe niezdatne do użytku. Nie będziesz mógł się zalogować i nikt nie będzie mógł ponownie zarejestrować tego samego identyfikatora użytkownika. Spowoduje to, że Twoje konto opuści wszystkie pokoje, w których uczestniczy, i usunie dane Twojego konta z serwera tożsamości. <b>Ta czynność jest nieodwracalna.</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.": "Dezaktywacja konta <b>domyślnie nie powoduje, że skasowania wysłanych wiadomości.</b> Jeśli chcesz, abyśmy zapomnieli o Twoich wiadomościach, zaznacz pole poniżej.",
+    "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.": "Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapomnienie wiadomości oznacza, że wysłane wiadomości nie będą udostępniane żadnym nowym lub niezarejestrowanym użytkownikom, ale zarejestrowani użytkownicy, którzy już mają dostęp do tych wiadomości, nadal będą mieli dostęp do ich kopii.",
+    "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)": "Proszę zapomnieć o wszystkich wiadomościach, które wysłałem, gdy moje konto jest wyłączone (<b>Ostrzeżenie:</b> spowoduje to, że przyszli użytkownicy zobaczą niepełny obraz rozmów)",
+    "Log out and remove encryption keys?": "Wylogować i usunąć klucze szyfrujące?",
+    "Clear Storage and Sign Out": "Wyczyść pamięć i wyloguj się",
+    "Send Logs": "Wyślij dzienniki",
+    "We encountered an error trying to restore your previous session.": "Napotkaliśmy błąd podczas przywracania poprzedniej sesji.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Wyczyszczenie pamięci przeglądarki może rozwiązać problem, ale wyloguje Cię i spowoduje, że jakakolwiek zaszyfrowana historia czatu stanie się nieczytelna.",
+    "Share Room": "Udostępnij pokój",
+    "Link to most recent message": "Link do najnowszej wiadomości",
+    "Share User": "Udostępnij użytkownika",
+    "Share Community": "Udostępnij Społeczność",
+    "Share Room Message": "Udostępnij wiadomość w pokoju",
+    "Link to selected message": "Link do zaznaczonej wiadomości",
+    "COPY": "KOPIUJ",
+    "Unable to reject invite": "Nie udało się odrzucić zaproszenia",
+    "Share Message": "Udostępnij wiadomość",
+    "Collapse Reply Thread": "Zwiń wątek odpowiedzi",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>Strona HTML dla Twojej Społeczności</h1>\n<p>\n    Skorzystaj z długiego opisu aby wprowadzić nowych członków do Społeczności lub rozpowszechnić ważne <a href=\"blabla\">linki</a>.\n</p>\n<p>\n    Możesz nawet używać tagów 'img'.\n</p>\n",
+    "Add rooms to the community summary": "Dodaj pokoje do podsumowania Społeczności",
+    "Which rooms would you like to add to this summary?": "Które pokoje chcesz dodać do tego podsumowania?",
+    "Add to summary": "Dodaj do podsumowania",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Nie udało się dodać następujących pokojów do podsumowania %(groupId)s:",
+    "Add a Room": "Dodaj pokój",
+    "Failed to remove the room from the summary of %(groupId)s": "Nie udało się usunąć pokoju z podsumowania %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "Pokój '%(roomName)s' nie mógł być usunięty z podsumowania.",
+    "Add users to the community summary": "Dodaj użytkowników do podsumowania Społeczności",
+    "Who would you like to add to this summary?": "Kogo chcesz dodać do tego podsumowania?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Nie udało się dodać następujących użytkowników do podsumowania %(groupId)s:",
+    "Add a User": "Dodaj użytkownika",
+    "Failed to remove a user from the summary of %(groupId)s": "Nie udało się usunąć użytkownika z podsumowania %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "Użytkownik '%(displayName)s' nie mógł być usunięty z podsumowania.",
+    "Failed to update community": "Nie udało się zaktualizować Społeczności",
+    "Unable to accept invite": "Nie udało się zaakceptować zaproszenia",
+    "Unable to join community": "Nie udało się dołączyć do Społeczności",
+    "Leave Community": "Opuść Społeczność",
+    "Leave %(groupName)s?": "Opuścić %(groupName)s?",
+    "Unable to leave community": "Nie udało się opuścić Społeczności",
+    "Community Settings": "Ustawienia Społeczności",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Zmiany <bold1>nazwy</bold1> oraz <bold2>awataru</bold2> Twojej Społeczności mogą nie być widoczne przez innych użytkowników nawet przez 30 minut.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Te pokoje są wyświetlane członkom społeczności na stronie społeczności. Członkowie społeczności mogą dołączyć do pokoi, klikając je.",
+    "%(inviter)s has invited you to join this community": "%(inviter)s zaprosił Cię do przyłączenia się do tej Społeczności",
+    "Join this community": "Dołącz do tej Społeczności",
+    "Leave this community": "Opuść tę Społeczność",
+    "You are an administrator of this community": "Jesteś administratorem tej Społeczności",
+    "You are a member of this community": "Jesteś członkiem tej społeczności",
+    "Who can join this community?": "Kto może dołączyć do tej Społeczności?",
+    "Everyone": "Każdy",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Twoja Społeczność nie ma długiego opisu, strony HTML, która będzie wyświetlana członkom społeczności.<br />Kliknij tutaj, aby otworzyć ustawienia i nadać jej jakąś!",
+    "Long Description (HTML)": "Długi opis (HTML)",
+    "Description": "Opis",
+    "Community %(groupId)s not found": "Społeczność %(groupId)s nie znaleziona",
+    "This Home server does not support communities": "Ten serwer domowy nie wspiera Społeczności",
+    "Failed to load %(groupId)s": "Nie udało się załadować %(groupId)s",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ten pokój nie jest publiczny. Nie będziesz w stanie do niego dołączyć bez zaproszenia.",
+    "Can't leave Server Notices room": "Nie można opuścić pokoju powiadomień serwera",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ten pokój jest używany do ważnych wiadomości z serwera domowego, więc nie możesz go opuścić.",
+    "Terms and Conditions": "Warunki użytkowania",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Aby kontynuować używanie serwera domowego %(homeserverDomain)s musisz przejrzeć i zaakceptować nasze warunki użytkowania.",
+    "Review terms and conditions": "Przejrzyj warunki użytkowania",
+    "Old cryptography data detected": "Wykryto stare dane kryptograficzne",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Dane ze starszej wersji Riot zostały wykryte. Spowoduje to błędne działanie kryptografii typu end-to-end w starszej wersji. Wiadomości szyfrowane end-to-end wymieniane ostatnio podczas korzystania ze starszej wersji mogą być niemożliwe do odszyfrowywane w tej wersji. Może to również spowodować niepowodzenie wiadomości wymienianych z tą wersją. Jeśli wystąpią problemy, wyloguj się i zaloguj ponownie. Aby zachować historię wiadomości, wyeksportuj i ponownie zaimportuj klucze.",
+    "Your Communities": "Twoje Społeczności",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Czy wiesz, że: możesz używać Społeczności do filtrowania swoich doświadczeń z Riot.im!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Aby ustawić filtr, przeciągnij awatar Społeczności do panelu filtra po lewej stronie ekranu. Możesz kliknąć awatar w panelu filtra w dowolnym momencie, aby zobaczyć tylko pokoje i osoby powiązane z tą społecznością.",
+    "Error whilst fetching joined communities": "Błąd podczas pobierania dołączonych społeczności",
+    "Create a new community": "Utwórz nową Społeczność",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Utwórz Społeczność, aby grupować użytkowników i pokoje! Zbuduj niestandardową stronę główną, aby zaznaczyć swoją przestrzeń we wszechświecie Matrix.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Pokaż urządzenia</showDevicesText>, <sendAnywayText>wyślij mimo to</sendAnywayText> lub <cancelText>anuluj</cancelText>.",
+    "%(count)s of your messages have not been sent.|one": "Twoja wiadomość nie została wysłana.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Nikogo tu nie ma! Czy chcesz <inviteText>zaprosić inne osoby</inviteText> lub <nowarnText>przestać ostrzegać o pustym pokoju</nowarnText>?",
+    "Clear filter": "Wyczyść filtr",
+    "Light theme": "Jasny motyw",
+    "Dark theme": "Ciemny motyw",
+    "Status.im theme": "Motyw Status.im",
+    "Ignored Users": "Ignorowani użytkownicy",
+    "Debug Logs Submission": "Wysyłanie dzienników błędów",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Jeśli zgłosiłeś błąd za pośrednictwem GitHuba, dzienniki błędów mogą nam pomóc wyśledzić problem. Dzienniki błędów zawierają dane o użytkowaniu aplikacji, w tym nazwę użytkownika, identyfikatory lub aliasy odwiedzonych pomieszczeń lub grup oraz nazwy użytkowników innych użytkowników. Nie zawierają wiadomości.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Prywatność jest dla nas ważna, dlatego nie gromadzimy żadnych danych osobowych ani danych identyfikujących w naszych analizach.",
+    "Learn more about how we use analytics.": "Dowiedz się więcej co analizujemy.",
+    "No Audio Outputs detected": "Nie wykryto wyjść audio",
+    "Audio Output": "Wyjście audio",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "E-mail został wysłany na adres %(emailAddress)s. Gdy otworzysz link, który zawiera, kliknij poniżej.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Zauważ proszę, że logujesz się na serwer %(hs)s, nie matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Ten serwer domowy nie oferuje żadnych trybów logowania wspieranych przez Twojego klienta.",
+    "Try the app first": "Najpierw wypróbuj aplikację",
+    "Sign in to get started": "Zaloguj się, aby rozpocząć",
+    "Notify the whole room": "Powiadom cały pokój",
+    "Room Notification": "Powiadomienia pokoju"
 }

From 0ccca7972e5b6b20873672e84568ab607dff3f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Sat, 23 Jun 2018 09:04:50 +0000
Subject: [PATCH 431/702] Translated using Weblate (Serbian)

Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
---
 src/i18n/strings/sr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index ec46986d09..c32b4ac202 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1195,6 +1195,6 @@
     "Link to selected message": "Веза ка изабраној поруци",
     "COPY": "КОПИРАЈ",
     "Share Message": "Подели поруку",
-    "No Audio Outputs detected": "Нема уочених аудио излаза",
+    "No Audio Outputs detected": "Нема уочених излаза звука",
     "Audio Output": "Излаз звука"
 }

From 06f55b51b877d88bb49efe87f7dda0d405cfac2a Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Sun, 24 Jun 2018 07:44:28 +0000
Subject: [PATCH 432/702] Translated using Weblate (Ukrainian)

Currently translated at 27.5% (330 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 52 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 5e7cc75f8a..b36642691c 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -279,5 +279,55 @@
     "Your User Agent": "Ваш користувацький агент",
     "Your device resolution": "Роздільність вашого пристрою",
     "Analytics": "Аналітика",
-    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:"
+    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Введіть пароль для захисту експортованого файлу. Щоб розшифрувати файл потрібно буде ввести цей пароль.",
+    "Call Failed": "Виклик не вдався",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "У цій кімнаті є невідомі пристрої: якщо ви продовжите без їхньої перевірки, зважайте на те, що вас можна буде прослуховувати.",
+    "Review Devices": "Перевірити пристрої",
+    "Call Anyway": "Подзвонити все одно",
+    "Answer Anyway": "Відповісти все одно",
+    "Call": "Подзвонити",
+    "Answer": "Відповісти",
+    "The remote side failed to pick up": "На ваш дзвінок не змогли відповісти",
+    "Unable to capture screen": "Не вдалось захопити екран",
+    "Existing Call": "Наявний виклик",
+    "You are already in a call.": "Ви вже розмовляєте.",
+    "VoIP is unsupported": "VoIP не підтримується",
+    "You cannot place VoIP calls in this browser.": "Цей оглядач не підтримує VoIP дзвінки.",
+    "You cannot place a call with yourself.": "Ви не можете подзвонити самим собі.",
+    "Conference calls are not supported in encrypted rooms": "Режим конференції не підтримується у зашифрованих кімнатах",
+    "Conference calls are not supported in this client": "Режим конференції не підтримується у цьому клієнті",
+    "Warning!": "Увага!",
+    "Conference calling is in development and may not be reliable.": "Режим конференції ще знаходиться в стані розробки та може бути ненадійним.",
+    "Failed to set up conference call": "Не вдалось встановити конференцію",
+    "Conference call failed.": "Конференц-виклик зазнав невдачі.",
+    "The file '%(fileName)s' failed to upload": "Не вдалось відвантажити файл '%(fileName)s'",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файл '%(fileName)s' перевищує максимальні розміри, дозволені на цьому сервері",
+    "Upload Failed": "Помилка відвантаження",
+    "Sun": "Нд",
+    "Mon": "Пн",
+    "Tue": "Вт",
+    "Wed": "Ср",
+    "Thu": "Чт",
+    "Fri": "Пт",
+    "Sat": "Сб",
+    "Jan": "Січ",
+    "Feb": "Лют",
+    "Mar": "Бер",
+    "Apr": "Квіт",
+    "May": "Трав",
+    "Jun": "Чер",
+    "Jul": "Лип",
+    "Aug": "Сер",
+    "Sep": "Вер",
+    "Oct": "Жов",
+    "Nov": "Лис",
+    "Dec": "Гру",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s, %(day)s, %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s, %(day)s, %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Who would you like to add to this community?": "Кого ви хочете додати до цієї спільноти?"
 }

From fabdf22aad42a0e3491e6cd4272fc057d41e221c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 Jun 2018 09:51:23 +0100
Subject: [PATCH 433/702] delint RoomSubList and generate eslintignore file

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .eslintignore.errorfiles                 |   5 -
 src/components/structures/RoomSubList.js | 166 +++++++++++------------
 2 files changed, 79 insertions(+), 92 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index c6f25c2480..430546d281 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -2,7 +2,6 @@
 
 src/autocomplete/AutocompleteProvider.js
 src/autocomplete/Autocompleter.js
-src/autocomplete/EmojiProvider.js
 src/autocomplete/UserProvider.js
 src/component-index.js
 src/components/structures/BottomLeftMenu.js
@@ -17,7 +16,6 @@ src/components/structures/MessagePanel.js
 src/components/structures/NotificationPanel.js
 src/components/structures/RoomDirectory.js
 src/components/structures/RoomStatusBar.js
-src/components/structures/RoomSubList.js
 src/components/structures/RoomView.js
 src/components/structures/ScrollPanel.js
 src/components/structures/SearchBox.js
@@ -29,7 +27,6 @@ src/components/views/avatars/BaseAvatar.js
 src/components/views/avatars/MemberAvatar.js
 src/components/views/create_room/RoomAlias.js
 src/components/views/dialogs/ChangelogDialog.js
-src/components/views/dialogs/ChatCreateOrReuseDialog.js
 src/components/views/dialogs/DeactivateAccountDialog.js
 src/components/views/dialogs/SetPasswordDialog.js
 src/components/views/dialogs/UnknownDeviceDialog.js
@@ -37,7 +34,6 @@ src/components/views/directory/NetworkDropdown.js
 src/components/views/elements/AddressSelector.js
 src/components/views/elements/DeviceVerifyButtons.js
 src/components/views/elements/DirectorySearchBox.js
-src/components/views/elements/EditableText.js
 src/components/views/elements/ImageView.js
 src/components/views/elements/InlineSpinner.js
 src/components/views/elements/MemberEventListSummary.js
@@ -81,7 +77,6 @@ src/components/views/rooms/TopUnreadMessagesBar.js
 src/components/views/rooms/UserTile.js
 src/components/views/settings/AddPhoneNumber.js
 src/components/views/settings/ChangeAvatar.js
-src/components/views/settings/ChangeDisplayName.js
 src/components/views/settings/ChangePassword.js
 src/components/views/settings/DevicesPanel.js
 src/components/views/settings/IntegrationsManager.js
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 025c2b2e08..0b6f7eaa45 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -16,30 +16,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
-var React = require('react');
-var ReactDOM = require('react-dom');
-var classNames = require('classnames');
-var sdk = require('../../index');
+import React from 'react';
+import classNames from 'classnames';
+import sdk from '../../index';
 import { Droppable } from 'react-beautiful-dnd';
 import { _t } from '../../languageHandler';
-var dis = require('../../dispatcher');
-var Unread = require('../../Unread');
-var MatrixClientPeg = require('../../MatrixClientPeg');
-var RoomNotifs = require('../../RoomNotifs');
-var FormattingUtils = require('../../utils/FormattingUtils');
-var AccessibleButton = require('../../components/views/elements/AccessibleButton');
-import Modal from '../../Modal';
+import dis from '../../dispatcher';
+import Unread from '../../Unread';
+import * as RoomNotifs from '../../RoomNotifs';
+import * as FormattingUtils from '../../utils/FormattingUtils';
 import { KeyCode } from '../../Keyboard';
 
 
 // turn this on for drop & drag console debugging galore
-var debug = false;
+const debug = false;
 
 const TRUNCATE_AT = 10;
 
-var RoomSubList = React.createClass({
+const RoomSubList = React.createClass({
     displayName: 'RoomSubList',
 
     debug: debug,
@@ -78,8 +72,10 @@ var RoomSubList = React.createClass({
 
     getDefaultProps: function() {
         return {
-            onHeaderClick: function() {}, // NOP
-            onShowMoreRooms: function() {}, // NOP
+            onHeaderClick: function() {
+            }, // NOP
+            onShowMoreRooms: function() {
+            }, // NOP
             extraTiles: [],
             isInvite: false,
         };
@@ -116,7 +112,7 @@ var RoomSubList = React.createClass({
     // The header is collapsable if it is hidden or not stuck
     // The dataset elements are added in the RoomList _initAndPositionStickyHeaders method
     isCollapsableOnClick: function() {
-        var stuck = this.refs.header.dataset.stuck;
+        const stuck = this.refs.header.dataset.stuck;
         if (this.state.hidden || stuck === undefined || stuck === "none") {
             return true;
         } else {
@@ -142,12 +138,12 @@ var RoomSubList = React.createClass({
     onClick: function(ev) {
         if (this.isCollapsableOnClick()) {
             // The header isCollapsable, so the click is to be interpreted as collapse and truncation logic
-            var isHidden = !this.state.hidden;
-            this.setState({ hidden : isHidden });
+            const isHidden = !this.state.hidden;
+            this.setState({hidden: isHidden});
 
             if (isHidden) {
                 // as good a way as any to reset the truncate state
-                this.setState({ truncateAt : TRUNCATE_AT });
+                this.setState({truncateAt: TRUNCATE_AT});
             }
 
             this.props.onShowMoreRooms();
@@ -162,7 +158,7 @@ var RoomSubList = React.createClass({
         dis.dispatch({
             action: 'view_room',
             room_id: roomId,
-            clear_search: (ev && (ev.keyCode == KeyCode.ENTER || ev.keyCode == KeyCode.SPACE)),
+            clear_search: (ev && (ev.keyCode === KeyCode.ENTER || ev.keyCode === KeyCode.SPACE)),
         });
     },
 
@@ -172,17 +168,17 @@ var RoomSubList = React.createClass({
     },
 
     _shouldShowMentionBadge: function(roomNotifState) {
-        return roomNotifState != RoomNotifs.MUTE;
+        return roomNotifState !== RoomNotifs.MUTE;
     },
 
     /**
      * Total up all the notification counts from the rooms
      *
-     * @param {Number} If supplied will only total notifications for rooms outside the truncation number
+     * @param {Number} truncateAt If supplied will only total notifications for rooms outside the truncation number
      * @returns {Array} The array takes the form [total, highlight] where highlight is a bool
      */
     roomNotificationCount: function(truncateAt) {
-        var self = this;
+        const self = this;
 
         if (this.props.isInvite) {
             return [0, true];
@@ -190,9 +186,9 @@ var RoomSubList = React.createClass({
 
         return this.props.list.reduce(function(result, room, index) {
             if (truncateAt === undefined || index >= truncateAt) {
-                var roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
-                var highlight = room.getUnreadNotificationCount('highlight') > 0;
-                var notificationCount = room.getUnreadNotificationCount();
+                const roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
+                const highlight = room.getUnreadNotificationCount('highlight') > 0;
+                const notificationCount = room.getUnreadNotificationCount();
 
                 const notifBadges = notificationCount > 0 && self._shouldShowNotifBadge(roomNotifState);
                 const mentionBadges = highlight && self._shouldShowMentionBadge(roomNotifState);
@@ -242,29 +238,27 @@ var RoomSubList = React.createClass({
     },
 
     _getHeaderJsx: function() {
-        var TintableSvg = sdk.getComponent("elements.TintableSvg");
+        const subListNotifications = this.roomNotificationCount();
+        const subListNotifCount = subListNotifications[0];
+        const subListNotifHighlight = subListNotifications[1];
 
-        var subListNotifications = this.roomNotificationCount();
-        var subListNotifCount = subListNotifications[0];
-        var subListNotifHighlight = subListNotifications[1];
+        const totalTiles = this.props.list.length + (this.props.extraTiles || []).length;
+        const roomCount = totalTiles > 0 ? totalTiles : '';
 
-        var totalTiles = this.props.list.length + (this.props.extraTiles || []).length;
-        var roomCount = totalTiles > 0 ? totalTiles : '';
-
-        var chevronClasses = classNames({
+        const chevronClasses = classNames({
             'mx_RoomSubList_chevron': true,
             'mx_RoomSubList_chevronRight': this.state.hidden,
             'mx_RoomSubList_chevronDown': !this.state.hidden,
         });
 
-        var badgeClasses = classNames({
+        const badgeClasses = classNames({
             'mx_RoomSubList_badge': true,
             'mx_RoomSubList_badgeHighlight': subListNotifHighlight,
         });
 
-        var badge;
+        let badge;
         if (subListNotifCount > 0) {
-            badge = <div className={badgeClasses}>{ FormattingUtils.formatCount(subListNotifCount) }</div>;
+            badge = <div className={badgeClasses}>{FormattingUtils.formatCount(subListNotifCount)}</div>;
         } else if (this.props.isInvite) {
             // no notifications but highlight anyway because this is an invite badge
             badge = <div className={badgeClasses}>!</div>;
@@ -272,7 +266,7 @@ var RoomSubList = React.createClass({
 
         // When collapsed, allow a long hover on the header to show user
         // the full tag name and room count
-        var title;
+        let title;
         if (this.props.collapsed) {
             title = this.props.label;
             if (roomCount !== '') {
@@ -280,63 +274,66 @@ var RoomSubList = React.createClass({
             }
         }
 
-        var incomingCall;
+        let incomingCall;
         if (this.props.incomingCall) {
-            var self = this;
+            const self = this;
             // Check if the incoming call is for this section
-            var incomingCallRoom = this.props.list.filter(function(room) {
+            const incomingCallRoom = this.props.list.filter(function(room) {
                 return self.props.incomingCall.roomId === room.roomId;
             });
 
             if (incomingCallRoom.length === 1) {
-                var IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
-                incomingCall = <IncomingCallBox className="mx_RoomSubList_incomingCall" incomingCall={ this.props.incomingCall }/>;
+                const IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
+                incomingCall =
+                    <IncomingCallBox className="mx_RoomSubList_incomingCall" incomingCall={this.props.incomingCall} />;
             }
         }
 
-        var tabindex = this.props.searchFilter === "" ? "0" : "-1";
+        const tabindex = this.props.searchFilter === "" ? "0" : "-1";
 
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
-            <div className="mx_RoomSubList_labelContainer" title={ title } ref="header">
-                <AccessibleButton onClick={ this.onClick } className="mx_RoomSubList_label" tabIndex={tabindex}>
-                    { this.props.collapsed ? '' : this.props.label }
-                    <div className="mx_RoomSubList_roomCount">{ roomCount }</div>
-                    <div className={chevronClasses}></div>
-                    { badge }
-                    { incomingCall }
+            <div className="mx_RoomSubList_labelContainer" title={title} ref="header">
+                <AccessibleButton onClick={this.onClick} className="mx_RoomSubList_label" tabIndex={tabindex}>
+                    {this.props.collapsed ? '' : this.props.label}
+                    <div className="mx_RoomSubList_roomCount">{roomCount}</div>
+                    <div className={chevronClasses} />
+                    {badge}
+                    {incomingCall}
                 </AccessibleButton>
             </div>
         );
     },
 
     _createOverflowTile: function(overflowCount, totalCount) {
-        var content = <div className="mx_RoomSubList_chevronDown"></div>;
+        let content = <div className="mx_RoomSubList_chevronDown" />;
 
-        var overflowNotifications = this.roomNotificationCount(TRUNCATE_AT);
-        var overflowNotifCount = overflowNotifications[0];
-        var overflowNotifHighlight = overflowNotifications[1];
+        const overflowNotifications = this.roomNotificationCount(TRUNCATE_AT);
+        const overflowNotifCount = overflowNotifications[0];
+        const overflowNotifHighlight = overflowNotifications[1];
         if (overflowNotifCount && !this.props.collapsed) {
             content = FormattingUtils.formatCount(overflowNotifCount);
         }
 
-        var badgeClasses = classNames({
+        const badgeClasses = classNames({
             'mx_RoomSubList_moreBadge': true,
             'mx_RoomSubList_moreBadgeNotify': overflowNotifCount && !this.props.collapsed,
             'mx_RoomSubList_moreBadgeHighlight': overflowNotifHighlight && !this.props.collapsed,
         });
 
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             <AccessibleButton className="mx_RoomSubList_ellipsis" onClick={this._showFullMemberList}>
-                <div className="mx_RoomSubList_line"></div>
-                <div className="mx_RoomSubList_more">{ _t("more") }</div>
-                <div className={ badgeClasses }>{ content }</div>
+                <div className="mx_RoomSubList_line" />
+                <div className="mx_RoomSubList_more">{_t("more")}</div>
+                <div className={badgeClasses}>{content}</div>
             </AccessibleButton>
         );
     },
 
     _showFullMemberList: function() {
         this.setState({
-            truncateAt: -1
+            truncateAt: -1,
         });
 
         this.props.onShowMoreRooms();
@@ -344,10 +341,7 @@ var RoomSubList = React.createClass({
     },
 
     render: function() {
-        var connectDropTarget = this.props.connectDropTarget;
-        var TruncatedList = sdk.getComponent('elements.TruncatedList');
-
-        var label = this.props.collapsed ? null : this.props.label;
+        const TruncatedList = sdk.getComponent('elements.TruncatedList');
 
         let content;
         if (this.state.sortedList.length === 0 && this.props.extraTiles.length === 0) {
@@ -364,23 +358,22 @@ var RoomSubList = React.createClass({
         }
 
         if (this.state.sortedList.length > 0 || this.props.extraTiles.length > 0 || this.props.editable) {
-            var subList;
-            var classes = "mx_RoomSubList";
+            let subList;
+            const classes = "mx_RoomSubList";
 
             if (!this.state.hidden) {
-                subList = <TruncatedList className={ classes } truncateAt={this.state.truncateAt}
-                                         createOverflowElement={this._createOverflowTile} >
-                                { content }
-                          </TruncatedList>;
-            }
-            else {
-                subList = <TruncatedList className={ classes }>
-                          </TruncatedList>;
+                subList = <TruncatedList className={classes} truncateAt={this.state.truncateAt}
+                                         createOverflowElement={this._createOverflowTile}>
+                    {content}
+                </TruncatedList>;
+            } else {
+                subList = <TruncatedList className={classes}>
+                </TruncatedList>;
             }
 
             const subListContent = <div>
-                { this._getHeaderJsx() }
-                { subList }
+                {this._getHeaderJsx()}
+                {subList}
             </div>;
 
             return this.props.editable ?
@@ -388,23 +381,22 @@ var RoomSubList = React.createClass({
                     droppableId={"room-sub-list-droppable_" + this.props.tagName}
                     type="draggable-RoomTile"
                 >
-                    { (provided, snapshot) => (
+                    {(provided, snapshot) => (
                         <div ref={provided.innerRef}>
-                            { subListContent }
+                            {subListContent}
                         </div>
-                    ) }
+                    )}
                 </Droppable> : subListContent;
-        }
-        else {
-            var Loader = sdk.getComponent("elements.Spinner");
+        } else {
+            const Loader = sdk.getComponent("elements.Spinner");
             return (
                 <div className="mx_RoomSubList">
-                    { this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined }
-                    { (this.props.showSpinner && !this.state.hidden) ? <Loader /> : undefined }
+                    {this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined}
+                    {(this.props.showSpinner && !this.state.hidden) ? <Loader /> : undefined}
                 </div>
             );
         }
-    }
+    },
 });
 
 module.exports = RoomSubList;

From 6addfdbcbb3d3be5a8c6ab1f5f43a962214b5d75 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Mon, 25 Jun 2018 10:10:59 +0000
Subject: [PATCH 434/702] Translated using Weblate (Swedish)

Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0e26125c30..92c4163fbf 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1180,5 +1180,21 @@
     "This room is not showing flair for any communities": "Detta rum visar inte emblem för några communityn",
     "Flair will appear if enabled in room settings": "Emblem kommer visas om det är aktiverat i rumsinställningarna",
     "Flair will not appear": "Emblem kommer inte att visas",
-    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det."
+    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det.",
+    "Jitsi Conference Calling": "Jitsi konferenssamtal",
+    "Encrypting": "Krypterar",
+    "Encrypted, not sent": "Krypterat, inte skickat",
+    "Share Link to User": "Dela länk till användare",
+    "Share room": "Dela rum",
+    "Share Room": "Dela rum",
+    "Link to most recent message": "Länk till senaste meddelandet",
+    "Share User": "Dela användare",
+    "Share Community": "Dela community",
+    "Share Room Message": "Dela rumsmeddelande",
+    "Link to selected message": "Länk till valt meddelande",
+    "COPY": "KOPIERA",
+    "Share Message": "Dela meddelande",
+    "No Audio Outputs detected": "Inga ljudutgångar hittades",
+    "Audio Output": "Ljudutgång",
+    "Try the app first": "Testa appen först"
 }

From f941587d015314928c8dada329da89df33929798 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 25 Jun 2018 10:55:24 +0000
Subject: [PATCH 435/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1200 of 1200 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9abb39cdb2..d445453f20 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1196,5 +1196,7 @@
     "Share Message": "Partekatu mezua",
     "No Audio Outputs detected": "Ez da audio irteerarik antzeman",
     "Audio Output": "Audio irteera",
-    "Jitsi Conference Calling": "Jitsi konferentzia deia"
+    "Jitsi Conference Calling": "Jitsi konferentzia deia",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Zifratutako gelatan, honetan esaterako, URL-en aurrebistak lehenetsita desgaituta daude zure hasiera-zerbitzariak gela honetan ikusten dituzun estekei buruzko informaziorik jaso ez dezan, hasiera-zerbitzarian sortzen baitira aurrebistak.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Norbaitek mezu batean URL bat jartzen duenean, URL aurrebista bat erakutsi daiteke estekaren informazio gehiago erakusteko, adibidez webgunearen izenburua, deskripzioa eta irudi bat."
 }

From 24a48daad8f808a9a41ccc37ca376337cccc89e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 25 Jun 2018 11:46:55 +0000
Subject: [PATCH 436/702] Translated using Weblate (French)

Currently translated at 100.0% (1200 of 1200 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 1aec3ca8ec..be61f4fd7d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1196,5 +1196,7 @@
     "Link to selected message": "Lien vers le message sélectionné",
     "COPY": "COPIER",
     "Share Message": "Partager le message",
-    "Jitsi Conference Calling": "Appel en téléconférence Jitsi"
+    "Jitsi Conference Calling": "Appel en téléconférence Jitsi",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Dans les salons chiffrés, comme celui-ci, l'aperçu des liens est désactivé par défaut pour s'assurer que le serveur d'accueil (où sont générés les aperçus) ne puisse pas collecter d'informations sur les liens qui apparaissent dans ce salon.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Quand quelqu'un met un lien dans son message, un aperçu du lien peut être affiché afin de fournir plus d'informations sur ce lien comme le titre, la description et une image du site."
 }

From 5c8eeff08ae2f831d11555c25c906c1b8e8a5628 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 25 Jun 2018 15:30:04 +0100
Subject: [PATCH 437/702] Refactor widgets code

Split logic out of setWidget & re-use it when we add jitsi widgets.

Also fix the detection of existing jitsi widgets and make that use
getRoomWidgets() too.

Add error message when a jitsi call is already in process.
---
 src/CallHandler.js          | 34 ++++++++++---------
 src/ScalarMessaging.js      | 45 ++-----------------------
 src/WidgetUtils.js          | 64 +++++++++++++++++++++++++++++++++++
 src/i18n/strings/en_EN.json | 66 +++++++++++++++++++------------------
 4 files changed, 119 insertions(+), 90 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index a65d82fe85..f431589fb2 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -61,6 +61,8 @@ import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import SettingsStore from "./settings/SettingsStore";
+import WidgetUtils from './WidgetUtils';
+import { getRoomWidgets } from './utils/widgets';
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -412,15 +414,20 @@ function _startCallApp(roomId, type) {
         return;
     }
 
-    const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
-    const currentJitsiWidgets = appsStateEvents.filter((ev) => {
-        ev.getContent().type == 'jitsi';
+    const currentJitsiWidgets = getRoomWidgets(room).filter((ev) => {
+        return ev.getContent().type == 'jitsi';
     });
     if (currentJitsiWidgets.length > 0) {
         console.warn(
             "Refusing to start conference call widget in " + roomId +
             " a conference call widget is already present",
         );
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+        Modal.createTrackedDialog('Already have Jitsi Widget', '', ErrorDialog, {
+            title: _t('Call in Progress'),
+            description: _t('A call is already in progress!'),
+        });
         return;
     }
 
@@ -443,25 +450,22 @@ function _startCallApp(roomId, type) {
         queryString
     );
 
-    const jitsiEvent = {
-        type: 'jitsi',
-        url: widgetUrl,
-        data: {
-            widgetSessionId: widgetSessionId,
-        },
+    const widgetData = {
+        widgetSessionId: widgetSessionId,
     };
+
     const widgetId = (
         'jitsi_' +
         MatrixClientPeg.get().credentials.userId +
         '_' +
         Date.now()
     );
-    MatrixClientPeg.get().sendStateEvent(
-        roomId,
-        'im.vector.modular.widgets',
-        jitsiEvent,
-        widgetId,
-    ).then(() => console.log('Sent jitsi widget state event'), (e) => console.error(e));
+
+    WidgetUtils.setRoomWidget(widgetId, 'jitsi', widgetUrl, 'Jitsi', widgetData, roomId).then(() => {
+        console.log('Jitsi widget added');
+    }).catch((e) => {
+        console.error(e);
+    });
 }
 
 // FIXME: Nasty way of making sure we only register
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index f80162e635..5aae25229a 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -297,12 +297,6 @@ function setWidget(event, roomId) {
     const widgetData = event.data.data; // optional
     const userWidget = event.data.userWidget;
 
-    const client = MatrixClientPeg.get();
-    if (!client) {
-        sendError(event, _t('You need to be logged in.'));
-        return;
-    }
-
     // both adding/removing widgets need these checks
     if (!widgetId || widgetUrl === undefined) {
         sendError(event, _t("Unable to create widget."), new Error("Missing required widget fields."));
@@ -337,34 +331,7 @@ function setWidget(event, roomId) {
     };
 
     if (userWidget) {
-        const client = MatrixClientPeg.get();
-        const userWidgets = Widgets.getUserWidgets();
-
-        // Delete existing widget with ID
-        try {
-            delete userWidgets[widgetId];
-        } catch (e) {
-            console.error(`$widgetId is non-configurable`);
-        }
-
-        // Add new widget / update
-        if (widgetUrl !== null) {
-            userWidgets[widgetId] = {
-                content: content,
-                sender: client.getUserId(),
-                state_key: widgetId,
-                type: 'm.widget',
-                id: widgetId,
-            };
-        }
-
-        // This starts listening for when the echo comes back from the server
-        // since the widget won't appear added until this happens. If we don't
-        // wait for this, the action will complete but if the user is fast enough,
-        // the widget still won't actually be there.
-        client.setAccountData('m.widgets', userWidgets).then(() => {
-            return WidgetUtils.waitForUserWidget(widgetId, widgetUrl !== null);
-        }).then(() => {
+        WidgetUtils.setUserWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData).then(() => {
             sendResponse(event, {
                 success: true,
             });
@@ -377,15 +344,7 @@ function setWidget(event, roomId) {
         if (!roomId) {
             sendError(event, _t('Missing roomId.'), null);
         }
-
-        if (widgetUrl === null) { // widget is being deleted
-            content = {};
-        }
-        // TODO - Room widgets need to be moved to 'm.widget' state events
-        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
-        client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
-            return WidgetUtils.waitForRoomWidget(widgetId, roomId, widgetUrl !== null);
-        }).then(() => {
+        WidgetUtils.setRoomWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData, roomId).then(() => {
             sendResponse(event, {
                 success: true,
             });
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 2e2dcf30cd..453038d953 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -17,6 +17,8 @@ limitations under the License.
 
 import MatrixClientPeg from './MatrixClientPeg';
 import SdkConfig from "./SdkConfig";
+import Widgets from './utils/widgets';
+import dis from './dispatcher';
 import * as url from "url";
 
 export default class WidgetUtils {
@@ -190,4 +192,66 @@ export default class WidgetUtils {
             MatrixClientPeg.get().on('RoomState.events', onRoomStateEvents);
         });
     }
+
+    static setUserWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData) {
+        const content = {
+            type: widgetType,
+            url: widgetUrl,
+            name: widgetName,
+            data: widgetData,
+        };
+
+        const client = MatrixClientPeg.get();
+        const userWidgets = Widgets.getUserWidgets();
+
+        // Delete existing widget with ID
+        try {
+            delete userWidgets[widgetId];
+        } catch (e) {
+            console.error(`$widgetId is non-configurable`);
+        }
+
+        // Add new widget / update
+        if (widgetUrl !== null) {
+            userWidgets[widgetId] = {
+                content: content,
+                sender: client.getUserId(),
+                state_key: widgetId,
+                type: 'm.widget',
+                id: widgetId,
+            };
+        }
+
+        // This starts listening for when the echo comes back from the server
+        // since the widget won't appear added until this happens. If we don't
+        // wait for this, the action will complete but if the user is fast enough,
+        // the widget still won't actually be there.
+        return client.setAccountData('m.widgets', userWidgets).then(() => {
+            return WidgetUtils.waitForUserWidget(widgetId, widgetUrl !== null);
+        }).then(() => {
+            dis.dispatch({ action: "user_widget_updated" });
+        });
+    }
+
+    static setRoomWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData, roomId) {
+        let content;
+
+        if (widgetUrl === null) { // widget is being deleted
+            content = {};
+        } else {
+            content = {
+                type: widgetType,
+                url: widgetUrl,
+                name: widgetName,
+                data: widgetData,
+            };
+        }
+
+        const client = MatrixClientPeg.get();
+        // TODO - Room widgets need to be moved to 'm.widget' state events
+        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
+        return client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
+            return WidgetUtils.waitForRoomWidget(widgetId, roomId, widgetUrl !== null);
+        });
+    }
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d35555af6f..9da6bab5fa 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -39,13 +39,11 @@
     "Conference calling is in development and may not be reliable.": "Conference calling is in development and may not be reliable.",
     "Failed to set up conference call": "Failed to set up conference call",
     "Conference call failed.": "Conference call failed.",
+    "Call in Progress": "Call in Progress",
+    "A call is already in progress!": "A call is already in progress!",
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -85,7 +83,6 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -199,6 +196,11 @@
     "%(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",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -311,31 +313,6 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
-    "URL Previews": "URL Previews",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -435,11 +412,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -572,6 +549,31 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",

From f7dfba417ca7d173ba7e77ad5335792472eaeacf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Mon, 25 Jun 2018 16:31:43 +0100
Subject: [PATCH 438/702] Revert "affix copyButton so that it doesn't get
 scrolled horizontally"

---
 res/css/views/rooms/_EventTile.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 525855f3ed..80d2cd3418 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -392,7 +392,6 @@ limitations under the License.
     overflow-x: overlay;
     overflow-y: visible;
     max-height: 30vh;
-    position: static;
 }
 
 .mx_EventTile_content .markdown-body code {
@@ -407,7 +406,7 @@ limitations under the License.
     visibility: hidden;
     cursor: pointer;
     top: 6px;
-    right: 36px;
+    right: 6px;
     width: 19px;
     height: 19px;
     background-image: url($copy-button-url);

From e292ee942fa3cbddb3fb43b6d9af3dcb06f79d34 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 25 Jun 2018 16:37:45 +0100
Subject: [PATCH 439/702] Fix RoomSubList headers by re-commiting 1faecfd

The original got reverted in ebfafb36 somehow.
---
 src/components/views/rooms/RoomList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 167603ecfb..422bad1afc 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -611,7 +611,7 @@ module.exports = React.createClass({
         const self = this;
         return (
             <GeminiScrollbarWrapper className="mx_RoomList_scrollbar"
-                autoshow={true} onScroll={self._whenScrolling} wrappedRef={this._collectGemini}>
+                autoshow={true} onScroll={self._whenScrolling} onResize={self._whenScrolling} wrappedRef={this._collectGemini}>
             <div className="mx_RoomList">
                 <RoomSubList list={[]}
                              extraTiles={this._makeGroupInviteTiles(self.props.searchFilter)}

From 95728e73bb8421a6c8b62e0750bd767973b52deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 25 Jun 2018 16:12:17 +0000
Subject: [PATCH 440/702] Translated using Weblate (French)

Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index be61f4fd7d..0e0980c0cc 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1198,5 +1198,9 @@
     "Share Message": "Partager le message",
     "Jitsi Conference Calling": "Appel en téléconférence Jitsi",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Dans les salons chiffrés, comme celui-ci, l'aperçu des liens est désactivé par défaut pour s'assurer que le serveur d'accueil (où sont générés les aperçus) ne puisse pas collecter d'informations sur les liens qui apparaissent dans ce salon.",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Quand quelqu'un met un lien dans son message, un aperçu du lien peut être affiché afin de fournir plus d'informations sur ce lien comme le titre, la description et une image du site."
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Quand quelqu'un met un lien dans son message, un aperçu du lien peut être affiché afin de fournir plus d'informations sur ce lien comme le titre, la description et une image du site.",
+    "The email field must not be blank.": "Le champ de l'adresse e-mail ne doit pas être vide.",
+    "The user name field must not be blank.": "Le champ du nom d'utilisateur ne doit pas être vide.",
+    "The phone number field must not be blank.": "Le champ du numéro de téléphone ne doit pas être vide.",
+    "The password field must not be blank.": "Le champ du mot de passe ne doit pas être vide."
 }

From c23bb392033e7030dab591e50d505ccd06e6fb98 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 25 Jun 2018 17:43:08 +0000
Subject: [PATCH 441/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2aea205a15..04ee69b04a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1195,5 +1195,12 @@
     "Share Room Message": "Szoba üzenet megosztás",
     "Link to selected message": "Hivatkozás a kijelölt üzenetre",
     "COPY": "Másol",
-    "Share Message": "Üzenet megosztása"
+    "Share Message": "Üzenet megosztása",
+    "Jitsi Conference Calling": "Jitsi konferencia hívás",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Az olyan titkosított szobákban, mint ez is, az URL előnézet alapértelmezetten ki van kapcsolva, hogy biztosított legyen, hogy a matrix szerver (ahol az előnézet készül) ne tudjon információt gyűjteni arról, hogy milyen linkeket látsz ebben a szobában.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ha valaki URL linket helyez az üzenetébe, lehetőség van egy előnézet megjelenítésére amivel további információt kaphatunk a linkről, mint cím, leírás és a weboldal képe.",
+    "The email field must not be blank.": "Az e-mail mező nem lehet üres.",
+    "The user name field must not be blank.": "A felhasználói név mező nem lehet üres.",
+    "The phone number field must not be blank.": "A telefonszám mező nem lehet üres.",
+    "The password field must not be blank.": "A jelszó mező nem lehet üres."
 }

From f88d26d71c35581f810ae62ec528eebcdece1775 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 26 Jun 2018 00:19:54 +0000
Subject: [PATCH 442/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 1b8b32af4d..2235621f07 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1196,5 +1196,11 @@
     "Link to selected message": "連結到選定的訊息",
     "COPY": "複製",
     "Share Message": "分享訊息",
-    "Jitsi Conference Calling": "Jitsi 會議通話"
+    "Jitsi Conference Calling": "Jitsi 會議通話",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "在加密的聊天室中（這個就是），URL 預覽會預設停用以確保您的家伺服器（預覽生成的地方）無法在這個聊天室中收集關於您看到的連結的資訊。",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "當某人在他們的訊息中放置 URL 時，URL 預覽可以顯示如標題、描述與網頁上的圖片等等來給您更多關於該連結的資訊。",
+    "The email field must not be blank.": "電子郵件欄不能留空。",
+    "The user name field must not be blank.": "使用者名稱欄不能留空。",
+    "The phone number field must not be blank.": "電話號碼欄不能留空。",
+    "The password field must not be blank.": "密碼欄不能留空。"
 }

From e2edf78abbd5a20a3105f250f1e52e24d0b9049f Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Tue, 26 Jun 2018 04:44:03 +0000
Subject: [PATCH 443/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index d445453f20..e23a7493fd 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1198,5 +1198,9 @@
     "Audio Output": "Audio irteera",
     "Jitsi Conference Calling": "Jitsi konferentzia deia",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Zifratutako gelatan, honetan esaterako, URL-en aurrebistak lehenetsita desgaituta daude zure hasiera-zerbitzariak gela honetan ikusten dituzun estekei buruzko informaziorik jaso ez dezan, hasiera-zerbitzarian sortzen baitira aurrebistak.",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Norbaitek mezu batean URL bat jartzen duenean, URL aurrebista bat erakutsi daiteke estekaren informazio gehiago erakusteko, adibidez webgunearen izenburua, deskripzioa eta irudi bat."
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Norbaitek mezu batean URL bat jartzen duenean, URL aurrebista bat erakutsi daiteke estekaren informazio gehiago erakusteko, adibidez webgunearen izenburua, deskripzioa eta irudi bat.",
+    "The email field must not be blank.": "E-mail eremua ezin da hutsik laga.",
+    "The user name field must not be blank.": "Erabiltzaile-izen eremua ezin da hutsik laga.",
+    "The phone number field must not be blank.": "Telefono zenbakia eremua ezin da hutsik laga.",
+    "The password field must not be blank.": "Pasahitza eremua ezin da hutsik laga."
 }

From 9b50daa7486ac95b700c579fd973b048b6838f47 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 07:46:33 +0100
Subject: [PATCH 444/702] give Historical an emptyContent to make it look more
 consistent and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 8 +++++++-
 src/components/views/rooms/RoomList.js   | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 0b6f7eaa45..bd09241ce0 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -389,10 +389,16 @@ const RoomSubList = React.createClass({
                 </Droppable> : subListContent;
         } else {
             const Loader = sdk.getComponent("elements.Spinner");
+            if (this.props.showSpinner && !this.state.hidden) {
+                content = <Loader />;
+            } else if (this.state.hidden) {
+                content = undefined;
+            } // else show content calculated above
+
             return (
                 <div className="mx_RoomSubList">
                     {this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined}
-                    {(this.props.showSpinner && !this.state.hidden) ? <Loader /> : undefined}
+                    { content }
                 </div>
             );
         }
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 167603ecfb..896c09fe4e 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -705,6 +705,13 @@ module.exports = React.createClass({
                              onShowMoreRooms={self.onShowMoreRooms} />
 
                 <RoomSubList list={self.state.lists['im.vector.fake.archived']}
+                             emptyContent={self.props.collapsed ? null :
+                                 <div className="mx_RoomList_emptySubListTip_container">
+                                     <div className="mx_RoomList_emptySubListTip">
+                                         { _t('You have no historical rooms') }
+                                     </div>
+                                 </div>
+                             }
                              label={_t('Historical')}
                              editable={false}
                              order="recent"
@@ -712,7 +719,7 @@ module.exports = React.createClass({
                              alwaysShowHeader={true}
                              startAsHidden={true}
                              showSpinner={self.state.isLoadingLeftRooms}
-                             onHeaderClick= {self.onArchivedHeaderClick}
+                             onHeaderClick={self.onArchivedHeaderClick}
                              incomingCall={self.state.incomingCall}
                              searchFilter={self.props.searchFilter}
                              onShowMoreRooms={self.onShowMoreRooms} />

From cdf71012221141d8afa94abe4241b615dc54373d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 07:46:48 +0100
Subject: [PATCH 445/702] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/el.json    |  1 -
 src/i18n/strings/en_EN.json | 61 +++++++++++++++++++------------------
 src/i18n/strings/gl.json    |  1 -
 src/i18n/strings/it.json    |  1 -
 4 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index f6264ce8b0..c4514f629b 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -810,7 +810,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
     "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
-    "Message Replies": "Απαντήσεις",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
     "Hide avatar changes": "Απόκρυψη αλλαγών εικονιδίων χρηστών",
     "Hide display name changes": "Απόκρυψη αλλαγών εμφανιζόμενων ονομάτων",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index da47140c96..16785dc33d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,6 +85,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -194,11 +199,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -311,6 +311,29 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -410,11 +433,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -459,6 +482,7 @@
     "People": "People",
     "Rooms": "Rooms",
     "Low priority": "Low priority",
+    "You have no historical rooms": "You have no historical rooms",
     "Historical": "Historical",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Unable to ascertain that the address this invite was sent to matches one associated with your account.",
     "This invitation was sent to an email address which is not associated with this account:": "This invitation was sent to an email address which is not associated with this account:",
@@ -547,29 +571,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 1080e66a26..57d8301df6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -168,7 +168,6 @@
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
     "Failed to join room": "Non se puido unir a sala",
     "Message Pinning": "Fixando mensaxe",
-    "Tag Panel": "Panel de etiquetas",
     "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe",
     "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
     "Hide removed messages": "Ocultar mensaxes eliminadas",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d3f93acec5..0957bc156d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1175,7 +1175,6 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
     "Review terms and conditions": "Leggi i termini e condizioni",
     "Muted Users": "Utenti silenziati",
-    "Message Replies": "Risposte",
     "Message Pinning": "Messaggi appuntati",
     "Mirror local video feed": "Feed video dai ripetitori locali",
     "Replying": "Rispondere",

From abd37d141e371a53d9a0c85f03a8e18de17ddb5d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 07:54:38 +0100
Subject: [PATCH 446/702] clear up if statement to make it more readable

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index bd09241ce0..b02fc7902a 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -389,16 +389,14 @@ const RoomSubList = React.createClass({
                 </Droppable> : subListContent;
         } else {
             const Loader = sdk.getComponent("elements.Spinner");
-            if (this.props.showSpinner && !this.state.hidden) {
+            if (this.props.showSpinner) {
                 content = <Loader />;
-            } else if (this.state.hidden) {
-                content = undefined;
-            } // else show content calculated above
+            }
 
             return (
                 <div className="mx_RoomSubList">
                     {this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined}
-                    { content }
+                    { this.state.hidden ? undefined : content }
                 </div>
             );
         }

From 069080e7edefba251892e7f854b38578107ec5ce Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 09:41:20 +0100
Subject: [PATCH 447/702] lint

---
 src/ScalarMessaging.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 5aae25229a..9d0e274c7b 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -323,13 +323,6 @@ function setWidget(event, roomId) {
         }
     }
 
-    let content = {
-        type: widgetType,
-        url: widgetUrl,
-        name: widgetName,
-        data: widgetData,
-    };
-
     if (userWidget) {
         WidgetUtils.setUserWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData).then(() => {
             sendResponse(event, {

From 0f2c47937cb305831e54429e5d3b713a884a64cb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 11:52:21 +0100
Subject: [PATCH 448/702] Merge the two different widget utils files

---
 src/CallHandler.js                          |  3 +-
 src/ScalarMessaging.js                      |  3 +-
 src/WidgetUtils.js                          | 82 ++++++++++++++++++-
 src/components/views/rooms/Stickerpicker.js |  6 +-
 src/utils/widgets.js                        | 90 ---------------------
 5 files changed, 85 insertions(+), 99 deletions(-)
 delete mode 100644 src/utils/widgets.js

diff --git a/src/CallHandler.js b/src/CallHandler.js
index f431589fb2..852827f6fe 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -62,7 +62,6 @@ import dis from './dispatcher';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import SettingsStore from "./settings/SettingsStore";
 import WidgetUtils from './WidgetUtils';
-import { getRoomWidgets } from './utils/widgets';
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -414,7 +413,7 @@ function _startCallApp(roomId, type) {
         return;
     }
 
-    const currentJitsiWidgets = getRoomWidgets(room).filter((ev) => {
+    const currentJitsiWidgets = WidgetUtils.getRoomWidgets(room).filter((ev) => {
         return ev.getContent().type == 'jitsi';
     });
     if (currentJitsiWidgets.length > 0) {
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 9d0e274c7b..24c69194f5 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -236,7 +236,6 @@ import SdkConfig from './SdkConfig';
 import MatrixClientPeg from './MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
 import dis from './dispatcher';
-import Widgets from './utils/widgets';
 import WidgetUtils from './WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
@@ -375,7 +374,7 @@ function getWidgets(event, roomId) {
     }
 
     // Add user widgets (not linked to a specific room)
-    const userWidgets = Widgets.getUserWidgetsArray();
+    const userWidgets = WidgetUtils.getUserWidgetsArray();
     widgetStateEvents = widgetStateEvents.concat(userWidgets);
 
     sendResponse(event, widgetStateEvents);
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 453038d953..f54419f5e2 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -17,7 +17,6 @@ limitations under the License.
 
 import MatrixClientPeg from './MatrixClientPeg';
 import SdkConfig from "./SdkConfig";
-import Widgets from './utils/widgets';
 import dis from './dispatcher';
 import * as url from "url";
 
@@ -202,7 +201,7 @@ export default class WidgetUtils {
         };
 
         const client = MatrixClientPeg.get();
-        const userWidgets = Widgets.getUserWidgets();
+        const userWidgets = WidgetUtils.getUserWidgets();
 
         // Delete existing widget with ID
         try {
@@ -254,4 +253,83 @@ export default class WidgetUtils {
             return WidgetUtils.waitForRoomWidget(widgetId, roomId, widgetUrl !== null);
         });
     }
+
+    /**
+     * Get all widgets (user and room) for the current user
+     * @param  {object} room The room to get widgets for
+     * @return {[object]} Array containing current / active room and user widget state events
+     */
+    static getWidgets(room) {
+        const widgets = getRoomWidgets(room);
+        widgets.concat(getUserWidgetsArray());
+        return widgets;
+    }
+
+    /**
+     * Get room specific widgets
+     * @param  {object} room The room to get widgets force
+     * @return {[object]} Array containing current / active room widgets
+     */
+    static getRoomWidgets(room) {
+        const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+        if (!appsStateEvents) {
+            return [];
+        }
+
+        return appsStateEvents.filter((ev) => {
+            return ev.getContent().type && ev.getContent().url;
+        });
+    }
+
+    /**
+     * Get user specific widgets (not linked to a specific room)
+     * @return {object} Event content object containing current / active user widgets
+     */
+    static getUserWidgets() {
+        const client = MatrixClientPeg.get();
+        if (!client) {
+            throw new Error('User not logged in');
+        }
+        const userWidgets = client.getAccountData('m.widgets');
+        let userWidgetContent = {};
+        if (userWidgets && userWidgets.getContent()) {
+          userWidgetContent = userWidgets.getContent();
+        }
+        return userWidgetContent;
+    }
+
+    /**
+     * Get user specific widgets (not linked to a specific room) as an array
+     * @return {[object]} Array containing current / active user widgets
+     */
+    static getUserWidgetsArray() {
+      return Object.values(WidgetUtils.getUserWidgets());
+    }
+
+    /**
+     * Get active stickerpicker widgets (stickerpickers are user widgets by nature)
+     * @return {[object]} Array containing current / active stickerpicker widgets
+     */
+    static getStickerpickerWidgets() {
+        const widgets = WidgetUtils.getUserWidgetsArray();
+        return widgets.filter((widget) => widget.content && widget.content.type === "m.stickerpicker");
+    }
+
+    /**
+     * Remove all stickerpicker widgets (stickerpickers are user widgets by nature)
+     * @return {Promise} Resolves on account data updated
+     */
+    static removeStickerpickerWidgets() {
+        const client = MatrixClientPeg.get();
+        if (!client) {
+            throw new Error('User not logged in');
+        }
+        const userWidgets = client.getAccountData('m.widgets').getContent() || {};
+        Object.entries(userWidgets).forEach(([key, widget]) => {
+            if (widget.content && widget.content.type === 'm.stickerpicker') {
+                delete userWidgets[key];
+            }
+        });
+        return client.setAccountData('m.widgets', userWidgets);
+    }
 }
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 6152809c1a..992e5b7c53 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 import React from 'react';
 import { _t } from '../../../languageHandler';
-import Widgets from '../../../utils/widgets';
 import AppTile from '../elements/AppTile';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
@@ -24,6 +23,7 @@ import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
+import WidgetUtils from '../../../WidgetUtils';
 
 const widgetType = 'm.stickerpicker';
 
@@ -67,7 +67,7 @@ export default class Stickerpicker extends React.Component {
         }
 
         this.setState({showStickers: false});
-        Widgets.removeStickerpickerWidgets().then(() => {
+        WidgetUtils.removeStickerpickerWidgets().then(() => {
             this.forceUpdate();
         }).catch((e) => {
             console.error('Failed to remove sticker picker widget', e);
@@ -119,7 +119,7 @@ export default class Stickerpicker extends React.Component {
     }
 
     _updateWidget() {
-        const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
+        const stickerpickerWidget = WidgetUtils.getStickerpickerWidgets()[0];
         this.setState({
             stickerpickerWidget,
             widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
diff --git a/src/utils/widgets.js b/src/utils/widgets.js
deleted file mode 100644
index 338df184e2..0000000000
--- a/src/utils/widgets.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import MatrixClientPeg from '../MatrixClientPeg';
-
-/**
- * Get all widgets (user and room) for the current user
- * @param  {object} room The room to get widgets for
- * @return {[object]} Array containing current / active room and user widget state events
- */
-function getWidgets(room) {
-    const widgets = getRoomWidgets(room);
-    widgets.concat(getUserWidgetsArray());
-    return widgets;
-}
-
-/**
- * Get room specific widgets
- * @param  {object} room The room to get widgets force
- * @return {[object]} Array containing current / active room widgets
- */
-function getRoomWidgets(room) {
-    const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
-    if (!appsStateEvents) {
-        return [];
-    }
-
-    return appsStateEvents.filter((ev) => {
-        return ev.getContent().type && ev.getContent().url;
-    });
-}
-
-/**
- * Get user specific widgets (not linked to a specific room)
- * @return {object} Event content object containing current / active user widgets
- */
-function getUserWidgets() {
-    const client = MatrixClientPeg.get();
-    if (!client) {
-        throw new Error('User not logged in');
-    }
-    const userWidgets = client.getAccountData('m.widgets');
-    let userWidgetContent = {};
-    if (userWidgets && userWidgets.getContent()) {
-      userWidgetContent = userWidgets.getContent();
-    }
-    return userWidgetContent;
-}
-
-/**
- * Get user specific widgets (not linked to a specific room) as an array
- * @return {[object]} Array containing current / active user widgets
- */
-function getUserWidgetsArray() {
-  return Object.values(getUserWidgets());
-}
-
-/**
- * Get active stickerpicker widgets (stickerpickers are user widgets by nature)
- * @return {[object]} Array containing current / active stickerpicker widgets
- */
-function getStickerpickerWidgets() {
-    const widgets = getUserWidgetsArray();
-    return widgets.filter((widget) => widget.content && widget.content.type === "m.stickerpicker");
-}
-
-/**
- * Remove all stickerpicker widgets (stickerpickers are user widgets by nature)
- * @return {Promise} Resolves on account data updated
- */
-function removeStickerpickerWidgets() {
-    const client = MatrixClientPeg.get();
-    if (!client) {
-        throw new Error('User not logged in');
-    }
-    const userWidgets = client.getAccountData('m.widgets').getContent() || {};
-    Object.entries(userWidgets).forEach(([key, widget]) => {
-        if (widget.content && widget.content.type === 'm.stickerpicker') {
-            delete userWidgets[key];
-        }
-    });
-    return client.setAccountData('m.widgets', userWidgets);
-}
-
-
-export default {
-    getWidgets,
-    getRoomWidgets,
-    getUserWidgets,
-    getUserWidgetsArray,
-    getStickerpickerWidgets,
-    removeStickerpickerWidgets,
-};

From 6cf11a15e62d8864a351fc1bc76fd5b4e8f4b75c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 11:59:16 +0100
Subject: [PATCH 449/702] Move WidgetUtils to utils dir

---
 src/CallHandler.js                             | 2 +-
 src/ScalarMessaging.js                         | 2 +-
 src/components/views/elements/AppPermission.js | 2 +-
 src/components/views/elements/AppTile.js       | 2 +-
 src/components/views/rooms/AppsDrawer.js       | 2 +-
 src/components/views/rooms/Stickerpicker.js    | 2 +-
 src/{ => utils}/WidgetUtils.js                 | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{ => utils}/WidgetUtils.js (99%)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 852827f6fe..05aa9d974f 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -61,7 +61,7 @@ import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import SettingsStore from "./settings/SettingsStore";
-import WidgetUtils from './WidgetUtils';
+import WidgetUtils from './utils/WidgetUtils';
 
 global.mxCalls = {
     //room_id: MatrixCall
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 24c69194f5..fb5ea9f76d 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -236,7 +236,7 @@ import SdkConfig from './SdkConfig';
 import MatrixClientPeg from './MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
 import dis from './dispatcher';
-import WidgetUtils from './WidgetUtils';
+import WidgetUtils from './utils/WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
 
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 231ed52364..6b4536b620 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import url from 'url';
 import { _t } from '../../../languageHandler';
-import WidgetUtils from "../../../WidgetUtils";
+import WidgetUtils from "../../../utils/WidgetUtils";
 
 export default class AppPermission extends React.Component {
     constructor(props) {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 70b5bd651e..61d5a0f1ac 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -31,7 +31,7 @@ import sdk from '../../../index';
 import AppPermission from './AppPermission';
 import AppWarning from './AppWarning';
 import MessageSpinner from './MessageSpinner';
-import WidgetUtils from '../../../WidgetUtils';
+import WidgetUtils from '../../../utils/WidgetUtils';
 import dis from '../../../dispatcher';
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index f0b7eaa1d7..ecf9859d2b 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -27,7 +27,7 @@ import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import ScalarMessaging from '../../../ScalarMessaging';
 import { _t } from '../../../languageHandler';
-import WidgetUtils from '../../../WidgetUtils';
+import WidgetUtils from '../../../utils/WidgetUtils';
 import SettingsStore from "../../../settings/SettingsStore";
 
 // The maximum number of widgets that can be added in a room
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 992e5b7c53..4cb7c59ce6 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -23,7 +23,7 @@ import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
-import WidgetUtils from '../../../WidgetUtils';
+import WidgetUtils from '../../../utils/WidgetUtils';
 
 const widgetType = 'm.stickerpicker';
 
diff --git a/src/WidgetUtils.js b/src/utils/WidgetUtils.js
similarity index 99%
rename from src/WidgetUtils.js
rename to src/utils/WidgetUtils.js
index f54419f5e2..933609b302 100644
--- a/src/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -15,9 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
-import SdkConfig from "./SdkConfig";
-import dis from './dispatcher';
+import MatrixClientPeg from '../MatrixClientPeg';
+import SdkConfig from "../SdkConfig";
+import dis from '../dispatcher';
 import * as url from "url";
 
 export default class WidgetUtils {

From ca8a4a0c3f137520718e6dd645700abd8e3f0fc6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 12:08:33 +0100
Subject: [PATCH 450/702] Remove unused function

---
 src/utils/WidgetUtils.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 933609b302..b9cc2bae13 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -254,17 +254,6 @@ export default class WidgetUtils {
         });
     }
 
-    /**
-     * Get all widgets (user and room) for the current user
-     * @param  {object} room The room to get widgets for
-     * @return {[object]} Array containing current / active room and user widget state events
-     */
-    static getWidgets(room) {
-        const widgets = getRoomWidgets(room);
-        widgets.concat(getUserWidgetsArray());
-        return widgets;
-    }
-
     /**
      * Get room specific widgets
      * @param  {object} room The room to get widgets force

From b6f3b2f594abfde62870f78cb1ad058ee5f8cc41 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 12:28:59 +0100
Subject: [PATCH 451/702] More code re-use

---
 src/ScalarMessaging.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index fb5ea9f76d..41224c266f 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -360,17 +360,9 @@ function getWidgets(event, roomId) {
             sendError(event, _t('This room is not recognised.'));
             return;
         }
-        // TODO - Room widgets need to be moved to 'm.widget' state events
-        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
-        const stateEvents = room.currentState.getStateEvents("im.vector.modular.widgets");
-        // Only return widgets which have required fields
-        if (room) {
-            stateEvents.forEach((ev) => {
-                if (ev.getContent().type && ev.getContent().url) {
-                    widgetStateEvents.push(ev.event); // return the raw event
-                }
-            });
-        }
+        // XXX: This gets the raw event object (I think because we can't
+        // send the MatrixEvent over postMessage?)
+        widgetStateEvents = WidgetUtils.getRoomWidgets(room).map((ev) => ev.event);
     }
 
     // Add user widgets (not linked to a specific room)

From 0a6450507eb70ea80e856a26183e02e6503da4bc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 15:21:22 +0100
Subject: [PATCH 452/702] Bits of PR feedback

---
 src/CallHandler.js       |  6 ++----
 src/utils/WidgetUtils.js | 16 ++++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 05aa9d974f..b470585f36 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -414,7 +414,7 @@ function _startCallApp(roomId, type) {
     }
 
     const currentJitsiWidgets = WidgetUtils.getRoomWidgets(room).filter((ev) => {
-        return ev.getContent().type == 'jitsi';
+        return ev.getContent().type === 'jitsi';
     });
     if (currentJitsiWidgets.length > 0) {
         console.warn(
@@ -449,9 +449,7 @@ function _startCallApp(roomId, type) {
         queryString
     );
 
-    const widgetData = {
-        widgetSessionId: widgetSessionId,
-    };
+    const widgetData = { widgetSessionId };
 
     const widgetId = (
         'jitsi_' +
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index b9cc2bae13..724fd490a4 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -210,8 +210,10 @@ export default class WidgetUtils {
             console.error(`$widgetId is non-configurable`);
         }
 
+        const addingWidget = widgetUrl !== null;
+
         // Add new widget / update
-        if (widgetUrl !== null) {
+        if (addingWidget) {
             userWidgets[widgetId] = {
                 content: content,
                 sender: client.getUserId(),
@@ -226,7 +228,7 @@ export default class WidgetUtils {
         // wait for this, the action will complete but if the user is fast enough,
         // the widget still won't actually be there.
         return client.setAccountData('m.widgets', userWidgets).then(() => {
-            return WidgetUtils.waitForUserWidget(widgetId, widgetUrl !== null);
+            return WidgetUtils.waitForUserWidget(widgetId, addingWidget);
         }).then(() => {
             dis.dispatch({ action: "user_widget_updated" });
         });
@@ -235,22 +237,24 @@ export default class WidgetUtils {
     static setRoomWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData, roomId) {
         let content;
 
-        if (widgetUrl === null) { // widget is being deleted
-            content = {};
-        } else {
+        const addingWidget = widgetUrl !== null;
+
+        if (addingWidget) {
             content = {
                 type: widgetType,
                 url: widgetUrl,
                 name: widgetName,
                 data: widgetData,
             };
+        } else {
+            content = {};
         }
 
         const client = MatrixClientPeg.get();
         // TODO - Room widgets need to be moved to 'm.widget' state events
         // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
         return client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
-            return WidgetUtils.waitForRoomWidget(widgetId, roomId, widgetUrl !== null);
+            return WidgetUtils.waitForRoomWidget(widgetId, roomId, addingWidget);
         });
     }
 

From c971b685ad8c982d65e3a6a63015660839bb07f2 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 26 Jun 2018 14:35:43 +0000
Subject: [PATCH 453/702] Translated using Weblate (German)

Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9b1c5acb8d..1570c5c285 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1195,5 +1195,12 @@
     "Share Message": "Teile Nachricht",
     "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt",
     "Audio Output": "Ton-Ausgabe",
-    "Try the app first": "App erst ausprobieren"
+    "Try the app first": "App erst ausprobieren",
+    "Jitsi Conference Calling": "Jitsi-Konferenz Anruf",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In verschlüsselten Räumen, wie diesem, ist die Link-Vorschau standardmäßig deaktiviert damit dein Heimserver (auf dem die Vorschau erzeugt wird) keine Informationen über Links in diesem Raum bekommt.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Wenn jemand eine Nachricht mit einem Link schickt, kann die Link-Vorschau mehr Informationen, wie Titel, Beschreibung und Bild der Webseite, über den Link anzeigen.",
+    "The email field must not be blank.": "Das E-Mail-Feld darf nicht leer sein.",
+    "The user name field must not be blank.": "Das Benutzername-Feld darf nicht leer sein.",
+    "The phone number field must not be blank.": "Das Telefonnummern-Feld darf nicht leer sein.",
+    "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein."
 }

From 4a39297e65efc3effc329dc6a64f21b0cbc9ec2c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 15:41:43 +0100
Subject: [PATCH 454/702] PR feedback

---
 src/utils/WidgetUtils.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 724fd490a4..69a840ce55 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -284,11 +284,10 @@ export default class WidgetUtils {
             throw new Error('User not logged in');
         }
         const userWidgets = client.getAccountData('m.widgets');
-        let userWidgetContent = {};
         if (userWidgets && userWidgets.getContent()) {
-          userWidgetContent = userWidgets.getContent();
+            return userWidgets.getContent();
         }
-        return userWidgetContent;
+        return {};
     }
 
     /**

From cb89406d3e25cce745e60155703717a38110ac69 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 15:42:29 +0100
Subject: [PATCH 455/702] Indent

---
 src/utils/WidgetUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 69a840ce55..924500b97d 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -295,7 +295,7 @@ export default class WidgetUtils {
      * @return {[object]} Array containing current / active user widgets
      */
     static getUserWidgetsArray() {
-      return Object.values(WidgetUtils.getUserWidgets());
+        return Object.values(WidgetUtils.getUserWidgets());
     }
 
     /**

From 9539a749e544d40bb816580ceaa3e1ee7e74e323 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 16:03:58 +0100
Subject: [PATCH 456/702] More refactoring

---
 src/components/structures/RoomView.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 8f03199a62..98d700e0a0 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -46,6 +46,7 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import WidgetUtils from '../../utils/WidgetUtils';
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -318,14 +319,7 @@ module.exports = React.createClass({
             return false;
         }
 
-        const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
-        // any valid widget = show apps
-        for (let i = 0; i < appsStateEvents.length; i++) {
-            if (appsStateEvents[i].getContent().type && appsStateEvents[i].getContent().url) {
-                return true;
-            }
-        }
-        return false;
+        return WidgetUtils.getRoomWidgets(room).length > 0;
     },
 
     componentDidMount: function() {

From a88297d7a6eeadaecab0abf15a059c6255cf17d5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 16:27:17 +0100
Subject: [PATCH 457/702] More code reuse

---
 src/components/views/elements/AppTile.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 61d5a0f1ac..ea303a96b2 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -319,14 +319,15 @@ export default class AppTile extends React.Component {
                             return;
                         }
                         this.setState({deleting: true});
-                        MatrixClientPeg.get().sendStateEvent(
-                            this.props.room.roomId,
-                            'im.vector.modular.widgets',
-                            {}, // empty content
+
+                        WidgetUtils.setRoomWidget(
                             this.props.id,
-                        ).then(() => {
-                            return WidgetUtils.waitForRoomWidget(this.props.id, this.props.room.roomId, false);
-                        }).catch((e) => {
+                            null,
+                            null,
+                            null,
+                            null,
+                            this.props.room.roomId,
+                        ).catch((e) => {
                             console.error('Failed to delete widget', e);
                         }).finally(() => {
                             this.setState({deleting: false});

From c780cd05a8b918cc91926a697faf374eaa55da7b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 16:33:28 +0100
Subject: [PATCH 458/702] Change argument order of setRoomWidget

So when deleting a widget we can just omit the ones we don't need
---
 src/CallHandler.js                       | 2 +-
 src/ScalarMessaging.js                   | 2 +-
 src/components/views/elements/AppTile.js | 6 +-----
 src/utils/WidgetUtils.js                 | 6 +++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index b470585f36..7403483e36 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -458,7 +458,7 @@ function _startCallApp(roomId, type) {
         Date.now()
     );
 
-    WidgetUtils.setRoomWidget(widgetId, 'jitsi', widgetUrl, 'Jitsi', widgetData, roomId).then(() => {
+    WidgetUtils.setRoomWidget(roomId, widgetId, 'jitsi', widgetUrl, 'Jitsi', widgetData).then(() => {
         console.log('Jitsi widget added');
     }).catch((e) => {
         console.error(e);
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 41224c266f..3325044b84 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -336,7 +336,7 @@ function setWidget(event, roomId) {
         if (!roomId) {
             sendError(event, _t('Missing roomId.'), null);
         }
-        WidgetUtils.setRoomWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData, roomId).then(() => {
+        WidgetUtils.setRoomWidget(roomId, widgetId, widgetType, widgetUrl, widgetName, widgetData).then(() => {
             sendResponse(event, {
                 success: true,
             });
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index ea303a96b2..7b69057e3e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -321,12 +321,8 @@ export default class AppTile extends React.Component {
                         this.setState({deleting: true});
 
                         WidgetUtils.setRoomWidget(
-                            this.props.id,
-                            null,
-                            null,
-                            null,
-                            null,
                             this.props.room.roomId,
+                            this.props.id,
                         ).catch((e) => {
                             console.error('Failed to delete widget', e);
                         }).finally(() => {
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 924500b97d..ab5b5b0130 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -210,7 +210,7 @@ export default class WidgetUtils {
             console.error(`$widgetId is non-configurable`);
         }
 
-        const addingWidget = widgetUrl !== null;
+        const addingWidget = Boolean(widgetUrl);
 
         // Add new widget / update
         if (addingWidget) {
@@ -234,10 +234,10 @@ export default class WidgetUtils {
         });
     }
 
-    static setRoomWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData, roomId) {
+    static setRoomWidget(roomId, widgetId, widgetType, widgetUrl, widgetName, widgetData) {
         let content;
 
-        const addingWidget = widgetUrl !== null;
+        const addingWidget = Boolean(widgetUrl);
 
         if (addingWidget) {
             content = {

From 0ee8d18f5aff89a8dabb4c1ca5a2ae1cf6ce179e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jun 2018 16:41:44 +0100
Subject: [PATCH 459/702] More code de-duping

---
 src/components/views/rooms/AppsDrawer.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index ecf9859d2b..04e47f0f9f 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -163,14 +163,7 @@ module.exports = React.createClass({
     },
 
     _getApps: function() {
-        const appsStateEvents = this.props.room.currentState.getStateEvents('im.vector.modular.widgets');
-        if (!appsStateEvents) {
-            return [];
-        }
-
-        return appsStateEvents.filter((ev) => {
-            return ev.getContent().type && ev.getContent().url;
-        }).map((ev) => {
+        return WidgetUtils.getRoomWidgets(this.props.room).map((ev) => {
             return this._initAppConfig(ev.getStateKey(), ev.getContent(), ev.sender);
         });
     },

From 4fb4589ebd443e876c45756159cba0a113798053 Mon Sep 17 00:00:00 2001
From: Marek Lach <graweeld@gmail.com>
Date: Tue, 26 Jun 2018 12:14:37 +0000
Subject: [PATCH 460/702] Translated using Weblate (Slovak)

Currently translated at 99.7% (1201 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index bc4e749d42..a9ef860add 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1195,5 +1195,9 @@
     "No Audio Outputs detected": "Neboli rozpoznané žiadne zvukové výstupy",
     "Audio Output": "Zvukový výstup",
     "Try the app first": "Najskôr aplikáciu vyskúšaj",
-    "Share Room Message": "Správa o zdieľaní miestnosti"
+    "Share Room Message": "Správa o zdieľaní miestnosti",
+    "The email field must not be blank.": "Položka emailu nemôže byť prázdna.",
+    "The user name field must not be blank.": "Položka užívateľovej prezývky nemôže byť prázdna.",
+    "The phone number field must not be blank.": "Telefonné číslo nemôže ostať nevyplnené.",
+    "The password field must not be blank.": "Položka s heslom nemôže ostať nevyplnená."
 }

From 67f803bc5f7ac78b526dfe7fb1f4bdcc7553cf86 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 16:59:49 +0100
Subject: [PATCH 461/702] don't fire share dialog when clicking timestamp of
 event, it was tripping people up and broke search permalinks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/EventTile.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index aa2f28024e..bae3ac8fa7 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -439,17 +439,6 @@ module.exports = withMatrixClient(React.createClass({
         });
     },
 
-    onPermalinkShareClicked: function(e) {
-        // These permalinks are like above, can be opened in new tab/window to matrix.to
-        // but otherwise fire the ShareDialog as it makes little sense to click permalink
-        // whilst it is in the current room
-        e.preventDefault();
-        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
-        Modal.createTrackedDialog('share room event dialog', '', ShareDialog, {
-            target: this.props.mxEvent,
-        });
-    },
-
     _renderE2EPadlock: function() {
         const ev = this.props.mxEvent;
         const props = {onClick: this.onCryptoClicked};
@@ -680,7 +669,7 @@ module.exports = withMatrixClient(React.createClass({
                         { avatar }
                         { sender }
                         <div className="mx_EventTile_reply">
-                            <a href={permalink} onClick={this.onPermalinkShareClicked}>
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { timestamp }
                             </a>
                             { this._renderE2EPadlock() }
@@ -707,7 +696,7 @@ module.exports = withMatrixClient(React.createClass({
                         { avatar }
                         { sender }
                         <div className="mx_EventTile_line">
-                            <a href={permalink} onClick={this.onPermalinkShareClicked}>
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { timestamp }
                             </a>
                             { this._renderE2EPadlock() }

From b1b140d7aaae140f1f805a1d0b530883f97b6ccd Mon Sep 17 00:00:00 2001
From: Marek Lach <graweeld@gmail.com>
Date: Tue, 26 Jun 2018 12:19:40 +0000
Subject: [PATCH 462/702] Translated using Weblate (Czech)

Currently translated at 89.8% (1082 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
---
 src/i18n/strings/cs.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 52eabf0edc..9ac753e285 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1078,5 +1078,7 @@
     "Checking for an update...": "Kontrola aktualizací...",
     "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena",
     "The platform you're on": "Platforma na které jsi",
-    "The version of Riot.im": "Verze Riot.im"
+    "The version of Riot.im": "Verze Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Jestli jsi, nebo nejsi přihlášen (tvou přezdívku neukládáme)",
+    "Your language of choice": "Tvá jazyková volba"
 }

From e1afe2a4696bfa144d97e09bbc5f9e1960f50554 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 25 Jun 2018 17:15:53 +0000
Subject: [PATCH 463/702] Translated using Weblate (Russian)

Currently translated at 99.6% (1200 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ae889c5677..0ec001a138 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1191,5 +1191,12 @@
     "Share User": "Поделиться пользователем",
     "Share Community": "Поделиться сообществом",
     "Link to selected message": "Ссылка на выбранное сообщение",
-    "COPY": "КОПИРОВАТЬ"
+    "COPY": "КОПИРОВАТЬ",
+    "Jitsi Conference Calling": "Конференц-связь Jitsi",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "В зашифрованных комнатах, подобных этой, предварительный просмотр URL-адресов отключен по умолчанию, чтобы гарантировать, что ваш сервер (где создаются предварительные просмотры) не может собирать информацию о ссылках, которые вы видите в этой комнате.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Когда кто-то вставляет URL-адрес в свое сообщение, может быть отображен предварительный просмотр URL-адреса, чтобы предоставить дополнительную информацию об этой ссылке, такую как название, описание и изображение с веб-сайта.",
+    "The email field must not be blank.": "Поле email не должно быть пустым.",
+    "The user name field must not be blank.": "Поле имени пользователя не должно быть пустым.",
+    "The phone number field must not be blank.": "Поле номера телефона не должно быть пустым.",
+    "The password field must not be blank.": "Поле пароля не должно быть пустым."
 }

From cef624d6bec8e6bb172d79f017fa5cc576ea7986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 26 Jun 2018 15:52:27 +0000
Subject: [PATCH 464/702] Translated using Weblate (Slovak)

Currently translated at 99.8% (1202 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index a9ef860add..73a57754f0 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1199,5 +1199,6 @@
     "The email field must not be blank.": "Položka emailu nemôže byť prázdna.",
     "The user name field must not be blank.": "Položka užívateľovej prezývky nemôže byť prázdna.",
     "The phone number field must not be blank.": "Telefonné číslo nemôže ostať nevyplnené.",
-    "The password field must not be blank.": "Položka s heslom nemôže ostať nevyplnená."
+    "The password field must not be blank.": "Položka s heslom nemôže ostať nevyplnená.",
+    "Jitsi Conference Calling": "Konferenčné hovory Jitsi"
 }

From 19e948155c8957094430d4af9c10dcbc93502c4e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 26 Jun 2018 17:06:12 +0100
Subject: [PATCH 465/702] Redact pathnames with origin `file://`

---
 src/Analytics.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 8ffce7077f..41eaca0f63 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -39,9 +39,16 @@ function getRedactedHash(hash) {
     return hash.replace(hashRegex, "#/$1");
 }
 
-// Return the current origin and hash separated with a `/`. This does not include query parameters.
+// Return the current origin, path and hash separated with a `/`. This does
+// not include query parameters.
 function getRedactedUrl() {
     const { origin, pathname, hash } = window.location;
+
+    // Redact paths which could contain unexpected PII
+    if (origin.startsWith('file://')) {
+        pathname = "/<redacted>/";
+    }
+
     return origin + pathname + getRedactedHash(hash);
 }
 

From a548c836473d7f1b9787f66f598bdba545953568 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 17:07:39 +0100
Subject: [PATCH 466/702] when the user switches room, close room settings this
 is especially annoying if they choose Leave Room which indirectly switches
 room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/RoomViewStore.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 923c073065..35cfe69086 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -147,6 +147,8 @@ class RoomViewStore extends Store {
                 joining: payload.joining || false,
                 // Reset replyingToEvent because we don't want cross-room because bad UX
                 replyingToEvent: null,
+                // pull the user out of Room Settings
+                isEditingSettings: false,
             };
 
             if (this._state.forwardingEvent) {

From d91730d930ea12fe7efe454a2d8c65a4bd34c737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 26 Jun 2018 16:12:22 +0000
Subject: [PATCH 467/702] Translated using Weblate (Slovak)

Currently translated at 99.7% (1203 of 1206 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 73a57754f0..bd705e7063 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1200,5 +1200,6 @@
     "The user name field must not be blank.": "Položka užívateľovej prezývky nemôže byť prázdna.",
     "The phone number field must not be blank.": "Telefonné číslo nemôže ostať nevyplnené.",
     "The password field must not be blank.": "Položka s heslom nemôže ostať nevyplnená.",
-    "Jitsi Conference Calling": "Konferenčné hovory Jitsi"
+    "Jitsi Conference Calling": "Konferenčné hovory Jitsi",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Náhľady URL adries sú v šifrovaných miestnostiach ako je táto predvolene zakázané, aby ste si mohli byť istí, že obsah odkazov z vašej konverzácii nebude zaznamenaný na vašom domovskom serveri počas ich generovania."
 }

From fc593d7359f64ddb64dc060c8781e3d0761cc066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 26 Jun 2018 16:38:22 +0000
Subject: [PATCH 468/702] Translated using Weblate (Slovak)

Currently translated at 99.8% (1204 of 1206 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 47 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index bd705e7063..ec5dce1139 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -60,7 +60,7 @@
     "Riot was not given permission to send notifications - please try again": "Aplikácii Riot neboli udelené oprávnenia potrebné pre posielanie oznámení - prosím, skúste to znovu",
     "Unable to enable Notifications": "Nie je možné povoliť oznámenia",
     "This email address was not found": "Túto emailovú adresu sa nepodarilo nájsť",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zdá sa, že vaša emailová adresa nie je priradená k žiadnemu Matrix ID na tomto domovskom servery.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zdá sa, že vaša emailová adresa nie je priradená k žiadnemu Matrix ID na tomto domovskom serveri.",
     "Default": "Predvolené",
     "Moderator": "Moderátor",
     "Admin": "Správca",
@@ -118,7 +118,7 @@
     "%(targetName)s rejected the invitation.": "%(targetName)s odmietol pozvanie.",
     "%(targetName)s left the room.": "%(targetName)s opustil miestnosť.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s povolil vstup %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopol %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykázal %(targetName)s.",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s stiahol pozvanie %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmenil tému na \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstránil názov miestnosti.",
@@ -219,10 +219,10 @@
     "Unverified": "Neoverené",
     "device id: ": "ID zariadenia: ",
     "Disinvite": "Stiahnuť pozvanie",
-    "Kick": "Vykopnúť",
+    "Kick": "Vykázať",
     "Disinvite this user?": "Stiahnuť pozvanie tohoto používateľa?",
-    "Kick this user?": "Vykopnúť tohoto používateľa?",
-    "Failed to kick": "Nepodarilo sa vykopnúť",
+    "Kick this user?": "Vykázať tohoto používateľa?",
+    "Failed to kick": "Nepodarilo sa vykázať",
     "Unban": "Povoliť vstup",
     "Ban": "Zakázať vstup",
     "Unban this user?": "Povoliť vstúpiť tomuto používateľovi?",
@@ -326,8 +326,8 @@
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Chcete <acceptText>prijať</acceptText> alebo <declineText>odmietnuť</declineText> toto pozvanie?",
     "Reason: %(reasonText)s": "Dôvod: %(reasonText)s",
     "Rejoin": "Vstúpiť znovu",
-    "You have been kicked from %(roomName)s by %(userName)s.": "Používateľ %(userName)s vás vykopol z miestnosti %(roomName)s.",
-    "You have been kicked from this room by %(userName)s.": "Používateľ %(userName)s vás vykopol z tejto miestnosti.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Používateľ %(userName)s vás vykázal z miestnosti %(roomName)s.",
+    "You have been kicked from this room by %(userName)s.": "Používateľ %(userName)s vás vykázal z tejto miestnosti.",
     "You have been banned from %(roomName)s by %(userName)s.": "Používateľ %(userName)s vám zakázal vstúpiť do miestnosti %(roomName)s.",
     "You have been banned from this room by %(userName)s.": "Používateľ %(userName)s vám zakázal vstúpiť do tejto miestnosti.",
     "This room": "Táto miestnosť",
@@ -364,7 +364,7 @@
     "Privileged Users": "Poverení používatelia",
     "No users have specific privileges in this room": "Žiadny používatelia nemajú v tejto miestnosti pridelené konkrétne poverenia",
     "Banned users": "Používatelia, ktorým bol zakázaný vstup",
-    "This room is not accessible by remote Matrix servers": "Táto miestnosť nie je prístupná cez vzdialené Matrix servery",
+    "This room is not accessible by remote Matrix servers": "Táto miestnosť nie je prístupná zo vzdialených Matrix serverov",
     "Leave room": "Opustiť miestnosť",
     "Favourite": "Obľúbená",
     "Tagged as: ": "Označená ako: ",
@@ -375,7 +375,7 @@
     "Only people who have been invited": "Len pozvaní ľudia",
     "Anyone who knows the room's link, apart from guests": "Ktokoľvek, kto pozná odkaz do miestnosti (okrem hostí)",
     "Anyone who knows the room's link, including guests": "Ktokoľvek, kto pozná odkaz do miestnosti (vrátane hostí)",
-    "Publish this room to the public in %(domain)s's room directory?": "Uverejniť túto miestnosť v adresáry miestností na servery %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "Uverejniť túto miestnosť v adresári miestností na serveri %(domain)s?",
     "Who can read history?": "Kto môže čítať históriu?",
     "Anyone": "Ktokoľvek",
     "Members only (since the point in time of selecting this option)": "Len členovia (odkedy je aktívna táto voľba)",
@@ -387,7 +387,7 @@
     "To send messages, you must be a": "Aby ste mohli posielať správy, musíte byť",
     "To invite users into the room, you must be a": "Aby ste mohli pozývať používateľov do miestnosti, musíte byť",
     "To configure the room, you must be a": "Aby ste mohli nastavovať miestnosť, musíte byť",
-    "To kick users, you must be a": "Aby ste mohli vykopávať používateľov, musíte byť",
+    "To kick users, you must be a": "Aby ste mohli vykazovať používateľov, musíte byť",
     "To ban users, you must be a": "Aby ste používateľom mohli zakazovať vstup, musíte byť",
     "To remove other users' messages, you must be a": "Aby ste mohli odstraňovať správy, ktoré poslali iní používatelia, musíte byť",
     "To send events of type <eventType/>, you must be a": "Aby ste mohli posielať udalosti typu <eventType/>, musíte byť",
@@ -437,7 +437,7 @@
     "Sign in with CAS": "Prihlásiť sa s použitím CAS",
     "Custom Server Options": "Vlastné možnosti servera",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Vlastné nastavenia servera môžete použiť na pripojenie k iným serverom Matrix a to zadaním URL adresy domovského servera.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "Umožní vám to použiť túto aplikáciu s už existujúcim Matrix účtom na akomkoľvek domovskom servery.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Umožní vám to použiť túto aplikáciu s už existujúcim Matrix účtom na akomkoľvek domovskom serveri.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Môžete tiež zadať vlastnú adresu servera totožností, čo však za štandardných okolností znemožní interakcie medzi používateľmi založené emailovou adresou.",
     "Dismiss": "Zamietnuť",
     "To continue, please enter your password.": "Aby ste mohli pokračovať, prosím zadajte svoje heslo.",
@@ -452,7 +452,7 @@
     "User name": "Meno používateľa",
     "Mobile phone number": "Číslo mobilného telefónu",
     "Forgot your password?": "Zabudli ste heslo?",
-    "%(serverName)s Matrix ID": "Matrix ID na servery %(serverName)s",
+    "%(serverName)s Matrix ID": "Matrix ID na serveri %(serverName)s",
     "Sign in with": "Na prihlásenie sa použije",
     "Email address": "Emailová adresa",
     "Sign in": "Prihlásiť sa",
@@ -539,10 +539,10 @@
     "were unbanned %(count)s times|one": "mali povolený vstup",
     "was unbanned %(count)s times|other": "mal %(count)s krát povolený vstup",
     "was unbanned %(count)s times|one": "mal povolený vstup",
-    "were kicked %(count)s times|other": "boli %(count)s krát vykopnutí",
-    "were kicked %(count)s times|one": "boli vykopnutí",
-    "was kicked %(count)s times|other": "bol %(count)s krát vykopnutý",
-    "was kicked %(count)s times|one": "bol vykopnutý",
+    "were kicked %(count)s times|other": "boli %(count)s krát vykázaní",
+    "were kicked %(count)s times|one": "boli vykázaní",
+    "was kicked %(count)s times|other": "bol %(count)s krát vykázaný",
+    "was kicked %(count)s times|one": "bol vykázaný",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)ssi %(count)s krát zmenili meno",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)ssi zmenili meno",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)ssi %(count)s krát zmenil meno",
@@ -621,7 +621,7 @@
     "An error occurred: %(error_string)s": "Vyskytla sa chyba: %(error_string)s",
     "Username available": "Používateľské meno je k dispozícii",
     "To get started, please pick a username!": "Začnite tým, že si zvolíte používateľské meno!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude názov vašeho účtu na domovskom servery <span></span>, alebo si môžete zvoliť <a>iný server</a>.",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude názov vašeho účtu na domovskom serveri <span></span>, alebo si môžete zvoliť <a>iný server</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Ak už máte Matrix účet, môžete sa hneď <a>Prihlásiť</a>.",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Momentálne sa ku všetkym neovereným zariadeniam správate ako by boli na čiernej listine; aby ste na tieto zariadenia mohli posielať správy, mali by ste ich overiť.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Odporúčame vám prejsť procesom overenia pre všetky tieto zariadenia aby ste si potvrdili, že skutočne patria ich pravým vlastníkom, ak si to však želáte, môžete tiež znovu poslať správu bez overovania.",
@@ -725,7 +725,7 @@
     "Don't send typing notifications": "Neposielať oznámenia keď píšete",
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Skryť správy o vstupe a opustení miestnosti (netýka sa pozvaní/vykopnutí/zákazov vstupu)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Skryť správy o vstupe a opustení miestnosti (netýka sa pozvaní/vykázaní/zákazov vstupu)",
     "Use compact timeline layout": "Použiť kompaktné rozloženie časovej osy",
     "Hide removed messages": "Skryť odstránené správy",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
@@ -813,7 +813,7 @@
     "Create an account": "Vytvoriť účet",
     "This Home Server does not support login using email address.": "Tento domovský server nepodporuje prihlasovanie sa emailom.",
     "Incorrect username and/or password.": "Nesprávne meno používateľa a / alebo heslo.",
-    "Guest access is disabled on this Home Server.": "Na tomto domovskom servery je zakázaný prístup pre hostí.",
+    "Guest access is disabled on this Home Server.": "Na tomto domovskom serveri je zakázaný prístup pre hostí.",
     "The phone number entered looks invalid": "Zdá sa, že zadané telefónne číslo je neplatné",
     "Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo <a>povolte nezabezpečené skripty</a>.",
@@ -838,7 +838,7 @@
     "Invites user with given id to current room": "Pošle používateľovi so zadaným ID pozvanie do tejto miestnosti",
     "Joins room with given alias": "Vstúpi do miestnosti so zadaným aliasom",
     "Sets the room topic": "Nastaví tému miestnosti",
-    "Kicks user with given id": "Vykopne používateľa so zadaným ID",
+    "Kicks user with given id": "Vykáže používateľa so zadaným ID",
     "Changes your display nickname": "Zmení vaše zobrazované meno",
     "Searches DuckDuckGo for results": "Vyhľadá výsledky na DuckDuckGo",
     "Changes colour scheme of current room": "Zmení farebnú schému aktuálnej miestnosti",
@@ -884,7 +884,7 @@
     "Sign in to get started": "Začnite prihlásením sa",
     "Status.im theme": "Téma status.im",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Všimnite si: Práve sa prihlasujete na server %(hs)s, nie na server matrix.org.",
-    "Username on %(hs)s": "Meno používateľa na servery %(hs)s",
+    "Username on %(hs)s": "Meno používateľa na serveri %(hs)s",
     "Restricted": "Obmedzené",
     "Hide avatar changes": "Skryť zmeny obrázka v profile",
     "Hide display name changes": "Skryť zmeny zobrazovaného mena",
@@ -1095,7 +1095,7 @@
     "When I'm invited to a room": "Pozvania vstúpiť do miestnosti",
     "Can't update user notification settings": "Nie je možné aktualizovať používateľské nastavenia oznamovania",
     "Notify for all other messages/rooms": "oznamovať všetky ostatné správy / miestnosti",
-    "Unable to look up room ID from server": "Nie je možné vyhľadať ID miestnosti na servery",
+    "Unable to look up room ID from server": "Nie je možné vyhľadať ID miestnosti na serveri",
     "Couldn't find a matching Matrix room": "Nie je možné nájsť zodpovedajúcu Matrix miestnosť",
     "Invite to this room": "Pozvať do tejto miestnosti",
     "You cannot delete this message. (%(code)s)": "Nemôžete vymazať túto správu. (%(code)s)",
@@ -1201,5 +1201,6 @@
     "The phone number field must not be blank.": "Telefonné číslo nemôže ostať nevyplnené.",
     "The password field must not be blank.": "Položka s heslom nemôže ostať nevyplnená.",
     "Jitsi Conference Calling": "Konferenčné hovory Jitsi",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Náhľady URL adries sú v šifrovaných miestnostiach ako je táto predvolene zakázané, aby ste si mohli byť istí, že obsah odkazov z vašej konverzácii nebude zaznamenaný na vašom domovskom serveri počas ich generovania."
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Náhľady URL adries sú v šifrovaných miestnostiach ako je táto predvolene zakázané, aby ste si mohli byť istí, že obsah odkazov z vašej konverzácii nebude zaznamenaný na vašom domovskom serveri počas ich generovania.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ak niekto vo svojej správe pošle URL adresu, môže byť zobrazený jej náhľad obsahujúci názov, popis a obrázok z cieľovej web stránky."
 }

From 5c7f2cc32f5d8d518148197518e4c2f0713da56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 26 Jun 2018 19:57:33 +0000
Subject: [PATCH 469/702] Translated using Weblate (Slovak)

Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index ec5dce1139..633734acfc 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1202,5 +1202,8 @@
     "The password field must not be blank.": "Položka s heslom nemôže ostať nevyplnená.",
     "Jitsi Conference Calling": "Konferenčné hovory Jitsi",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Náhľady URL adries sú v šifrovaných miestnostiach ako je táto predvolene zakázané, aby ste si mohli byť istí, že obsah odkazov z vašej konverzácii nebude zaznamenaný na vašom domovskom serveri počas ich generovania.",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ak niekto vo svojej správe pošle URL adresu, môže byť zobrazený jej náhľad obsahujúci názov, popis a obrázok z cieľovej web stránky."
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ak niekto vo svojej správe pošle URL adresu, môže byť zobrazený jej náhľad obsahujúci názov, popis a obrázok z cieľovej web stránky.",
+    "Call in Progress": "Prebiehajúci hovor",
+    "A call is already in progress!": "Jeden hovor už prebieha!",
+    "You have no historical rooms": "Nemáte žiadne historické miestnosti"
 }

From 09b09846cfe20b1fc1e83956397003d199fff100 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 23:33:35 +0100
Subject: [PATCH 470/702] allow `:port` specifiers in roomalias,groupid and
 userid as per spec

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 132695b9de..4cfd7382e5 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -41,6 +41,7 @@ function matrixLinkify(linkify) {
     const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
     const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
+    const S_ROOMALIAS_COLON = new linkify.parser.State();
 
     const roomname_tokens = [
         TT.DOT,
@@ -72,6 +73,8 @@ function matrixLinkify(linkify) {
     S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS);
 
     S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
+    S_ROOMALIAS.on(TT.COLON, S_ROOMALIAS_COLON); // do not accept trailing `:`
+    S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS); // but do accept :NUM (port specifier)
 
 
     const USERID = function(value) {
@@ -87,6 +90,7 @@ function matrixLinkify(linkify) {
     const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
     const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_USERID = new linkify.parser.State(USERID);
+    const S_USERID_COLON = new linkify.parser.State();
 
     const username_tokens = [
         TT.DOT,
@@ -116,6 +120,8 @@ function matrixLinkify(linkify) {
     S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID);
 
     S_USERID.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
+    S_USERID.on(TT.COLON, S_USERID_COLON); // do not accept trailing `:`
+    S_USERID_COLON.on(TT.NUM, S_USERID); // but do accept :NUM (port specifier)
 
 
     const GROUPID = function(value) {
@@ -131,6 +137,7 @@ function matrixLinkify(linkify) {
     const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State();
     const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_GROUPID = new linkify.parser.State(GROUPID);
+    const S_GROUPID_COLON = new linkify.parser.State();
 
     const groupid_tokens = [
         TT.DOT,
@@ -160,6 +167,8 @@ function matrixLinkify(linkify) {
     S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_GROUPID);
 
     S_GROUPID.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
+    S_GROUPID.on(TT.COLON, S_GROUPID_COLON); // do not accept trailing `:`
+    S_GROUPID_COLON.on(TT.NUM, S_GROUPID); // but do accept :NUM (port specifier)
 }
 
 // stubs, overwritten in MatrixChat's componentDidMount

From 9f3a121abca1b2a40ceb9feb46489c8095a3f1cc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 23:36:01 +0100
Subject: [PATCH 471/702] optimize linkify-matrix by skipping an intermediary
 state

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 4cfd7382e5..637b5869ef 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -35,7 +35,7 @@ function matrixLinkify(linkify) {
     };
     ROOMALIAS.prototype = new MultiToken();
 
-    const S_HASH = new linkify.parser.State();
+    const S_HASH = S_START.jump(TT.POUND);
     const S_HASH_NAME = new linkify.parser.State();
     const S_HASH_NAME_COLON = new linkify.parser.State();
     const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
@@ -57,8 +57,6 @@ function matrixLinkify(linkify) {
         TT.LOCALHOST,
     ];
 
-    S_START.on(TT.POUND, S_HASH);
-
     S_HASH.on(roomname_tokens, S_HASH_NAME);
     S_HASH_NAME.on(roomname_tokens, S_HASH_NAME);
     S_HASH_NAME.on(TT.DOMAIN, S_HASH_NAME);
@@ -84,7 +82,7 @@ function matrixLinkify(linkify) {
     };
     USERID.prototype = new MultiToken();
 
-    const S_AT = new linkify.parser.State();
+    const S_AT = S_START.jump(TT.AT);
     const S_AT_NAME = new linkify.parser.State();
     const S_AT_NAME_COLON = new linkify.parser.State();
     const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
@@ -104,8 +102,6 @@ function matrixLinkify(linkify) {
         TT.LOCALHOST,
     ];
 
-    S_START.on(TT.AT, S_AT);
-
     S_AT.on(username_tokens, S_AT_NAME);
     S_AT_NAME.on(username_tokens, S_AT_NAME);
     S_AT_NAME.on(TT.DOMAIN, S_AT_NAME);
@@ -131,7 +127,7 @@ function matrixLinkify(linkify) {
     };
     GROUPID.prototype = new MultiToken();
 
-    const S_PLUS = new linkify.parser.State();
+    const S_PLUS = S_START.jump(TT.PLUS);
     const S_PLUS_NAME = new linkify.parser.State();
     const S_PLUS_NAME_COLON = new linkify.parser.State();
     const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State();
@@ -151,8 +147,6 @@ function matrixLinkify(linkify) {
         TT.LOCALHOST,
     ];
 
-    S_START.on(TT.PLUS, S_PLUS);
-
     S_PLUS.on(groupid_tokens, S_PLUS_NAME);
     S_PLUS_NAME.on(groupid_tokens, S_PLUS_NAME);
     S_PLUS_NAME.on(TT.DOMAIN, S_PLUS_NAME);

From 96163d14025ed9cc3707ba52b255c31bc1bbe9c4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 23:41:46 +0100
Subject: [PATCH 472/702] prevent multiple ports (:1234:1234:1234)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 637b5869ef..50d50f219a 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -42,6 +42,7 @@ function matrixLinkify(linkify) {
     const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
     const S_ROOMALIAS_COLON = new linkify.parser.State();
+    const S_ROOMALIAS_COLON_NUM = new linkify.parser.State(ROOMALIAS);
 
     const roomname_tokens = [
         TT.DOT,
@@ -72,7 +73,7 @@ function matrixLinkify(linkify) {
 
     S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
     S_ROOMALIAS.on(TT.COLON, S_ROOMALIAS_COLON); // do not accept trailing `:`
-    S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS); // but do accept :NUM (port specifier)
+    S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS_COLON_NUM); // but do accept :NUM (port specifier)
 
 
     const USERID = function(value) {
@@ -89,6 +90,7 @@ function matrixLinkify(linkify) {
     const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_USERID = new linkify.parser.State(USERID);
     const S_USERID_COLON = new linkify.parser.State();
+    const S_USERID_COLON_NUM = new linkify.parser.State(USERID);
 
     const username_tokens = [
         TT.DOT,
@@ -117,7 +119,7 @@ function matrixLinkify(linkify) {
 
     S_USERID.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
     S_USERID.on(TT.COLON, S_USERID_COLON); // do not accept trailing `:`
-    S_USERID_COLON.on(TT.NUM, S_USERID); // but do accept :NUM (port specifier)
+    S_USERID_COLON.on(TT.NUM, S_USERID_COLON_NUM); // but do accept :NUM (port specifier)
 
 
     const GROUPID = function(value) {
@@ -134,6 +136,7 @@ function matrixLinkify(linkify) {
     const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_GROUPID = new linkify.parser.State(GROUPID);
     const S_GROUPID_COLON = new linkify.parser.State();
+    const S_GROUPID_COLON_NUM = new linkify.parser.State(GROUPID);
 
     const groupid_tokens = [
         TT.DOT,
@@ -162,7 +165,7 @@ function matrixLinkify(linkify) {
 
     S_GROUPID.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk)
     S_GROUPID.on(TT.COLON, S_GROUPID_COLON); // do not accept trailing `:`
-    S_GROUPID_COLON.on(TT.NUM, S_GROUPID); // but do accept :NUM (port specifier)
+    S_GROUPID_COLON.on(TT.NUM, S_GROUPID_COLON_NUM); // but do accept :NUM (port specifier)
 }
 
 // stubs, overwritten in MatrixChat's componentDidMount

From 2782b2ff9ddc6b963d551f5bf9dc39a95c3ffdbb Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 27 Jun 2018 05:52:45 +0000
Subject: [PATCH 473/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 56025bb00c..024166b37c 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1196,5 +1196,14 @@
     "Share Message": "Сподели съобщението",
     "No Audio Outputs detected": "Не са открити аудио изходи",
     "Audio Output": "Аудио изходи",
-    "Jitsi Conference Calling": "Jitsi конферентни разговори"
+    "Jitsi Conference Calling": "Jitsi конферентни разговори",
+    "Call in Progress": "Тече разговор",
+    "A call is already in progress!": "В момента вече тече разговор!",
+    "You have no historical rooms": "Нямате стаи в архива",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "В шифровани стаи като тази, по подразбиране URL прегледите са изключени, за да се подсигури че сървърът (където става генерирането на прегледите) не може да събира информация за връзките споделени в стаята.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Когато някой сподели URL връзка в съобщение, може да бъде показан URL преглед даващ повече информация за връзката (заглавие, описание и картинка от уебсайта).",
+    "The email field must not be blank.": "Имейл полето не може да бъде празно.",
+    "The user name field must not be blank.": "Полето за потребителско име не може да е празно.",
+    "The phone number field must not be blank.": "Полето за телефонен номер не може да е празно.",
+    "The password field must not be blank.": "Полето за парола не може да е празно."
 }

From 13d26d0d5864125deac5e9d1b3050810720e9f92 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 27 Jun 2018 08:31:27 +0000
Subject: [PATCH 474/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index e23a7493fd..bf7b3da656 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1202,5 +1202,8 @@
     "The email field must not be blank.": "E-mail eremua ezin da hutsik laga.",
     "The user name field must not be blank.": "Erabiltzaile-izen eremua ezin da hutsik laga.",
     "The phone number field must not be blank.": "Telefono zenbakia eremua ezin da hutsik laga.",
-    "The password field must not be blank.": "Pasahitza eremua ezin da hutsik laga."
+    "The password field must not be blank.": "Pasahitza eremua ezin da hutsik laga.",
+    "Call in Progress": "Deia abian",
+    "A call is already in progress!": "Badago dei bat abian!",
+    "You have no historical rooms": "Ez duzu gelen historialik"
 }

From 0c2240a1f278347f18dfed7cc535e02c4c8ff5ea Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 27 Jun 2018 08:48:32 +0000
Subject: [PATCH 475/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 04ee69b04a..561a6bd35a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1202,5 +1202,8 @@
     "The email field must not be blank.": "Az e-mail mező nem lehet üres.",
     "The user name field must not be blank.": "A felhasználói név mező nem lehet üres.",
     "The phone number field must not be blank.": "A telefonszám mező nem lehet üres.",
-    "The password field must not be blank.": "A jelszó mező nem lehet üres."
+    "The password field must not be blank.": "A jelszó mező nem lehet üres.",
+    "Call in Progress": "Hívás folyamatban",
+    "A call is already in progress!": "A hívás már folyamatban van!",
+    "You have no historical rooms": "Nincsenek archív szobáid"
 }

From b3341e6664ccfaf76e2a8673fe9b26d7a19b74a7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 Jun 2018 09:16:37 +0100
Subject: [PATCH 476/702] on click roomsublist notif badge, goto first room
 with notif

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_RoomSubList.scss     |  4 ++++
 src/components/structures/RoomSubList.js | 27 +++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index a2863460ad..6798f75a14 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -91,6 +91,10 @@ limitations under the License.
     background-color: $accent-color;
 }
 
+.mx_RoomSubList_label .mx_RoomSubList_badge:hover {
+    filter: brightness($focus-brightness);
+}
+
 /*
 .collapsed .mx_RoomSubList_badge {
     display: none;
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 0b6f7eaa45..db23466f9a 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -237,6 +237,29 @@ const RoomSubList = React.createClass({
         });
     },
 
+    _onNotifBadgeClick: function(e) {
+        // prevent the roomsublist collapsing
+        e.preventDefault();
+        e.stopPropagation();
+        // find first room which has notifications and switch to it
+        for (const room of this.state.sortedList) {
+            const roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
+            const highlight = room.getUnreadNotificationCount('highlight') > 0;
+            const notificationCount = room.getUnreadNotificationCount();
+
+            const notifBadges = notificationCount > 0 && this._shouldShowNotifBadge(roomNotifState);
+            const mentionBadges = highlight && this._shouldShowMentionBadge(roomNotifState);
+
+            if (notifBadges || mentionBadges) {
+                dis.dispatch({
+                    action: 'view_room',
+                    room_id: room.roomId,
+                });
+                return;
+            }
+        }
+    },
+
     _getHeaderJsx: function() {
         const subListNotifications = this.roomNotificationCount();
         const subListNotifCount = subListNotifications[0];
@@ -258,7 +281,9 @@ const RoomSubList = React.createClass({
 
         let badge;
         if (subListNotifCount > 0) {
-            badge = <div className={badgeClasses}>{FormattingUtils.formatCount(subListNotifCount)}</div>;
+            badge = <div className={badgeClasses} onClick={this._onNotifBadgeClick}>
+                { FormattingUtils.formatCount(subListNotifCount) }
+            </div>;
         } else if (this.props.isInvite) {
             // no notifications but highlight anyway because this is an invite badge
             badge = <div className={badgeClasses}>!</div>;

From 613e83edb4b89368e54f2ecca559337130f0c351 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 Jun 2018 09:49:58 +0100
Subject: [PATCH 477/702] on roomsublist invite badge click goto first
 room/group

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 25 +++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index db23466f9a..e5a08d62ea 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -26,6 +26,7 @@ import Unread from '../../Unread';
 import * as RoomNotifs from '../../RoomNotifs';
 import * as FormattingUtils from '../../utils/FormattingUtils';
 import { KeyCode } from '../../Keyboard';
+import { Group } from 'matrix-js-sdk';
 
 
 // turn this on for drop & drag console debugging galore
@@ -260,6 +261,28 @@ const RoomSubList = React.createClass({
         }
     },
 
+    _onInviteBadgeClick: function(e) {
+        // prevent the roomsublist collapsing
+        e.preventDefault();
+        e.stopPropagation();
+        // switch to first room in sortedList as that'll be the top of the list for the user
+        if (this.state.sortedList && this.state.sortedList.length > 0) {
+            dis.dispatch({
+                action: 'view_room',
+                room_id: this.state.sortedList[0].roomId,
+            });
+        } else if (this.props.extraTiles && this.props.extraTiles.length > 0) {
+            // Group Invites are different in that they are all extra tiles and not rooms
+            // XXX: this is a horrible special case because Group Invite sublist is a hack
+            if (this.props.extraTiles[0].props && this.props.extraTiles[0].props.group instanceof Group) {
+                dis.dispatch({
+                    action: 'view_group',
+                    group_id: this.props.extraTiles[0].props.group.groupId,
+                });
+            }
+        }
+    },
+
     _getHeaderJsx: function() {
         const subListNotifications = this.roomNotificationCount();
         const subListNotifCount = subListNotifications[0];
@@ -286,7 +309,7 @@ const RoomSubList = React.createClass({
             </div>;
         } else if (this.props.isInvite) {
             // no notifications but highlight anyway because this is an invite badge
-            badge = <div className={badgeClasses}>!</div>;
+            badge = <div className={badgeClasses} onClick={this._onInviteBadgeClick}>!</div>;
         }
 
         // When collapsed, allow a long hover on the header to show user

From a6ab51cd73589eb7c076be4aaba54d7ffec49253 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 Jun 2018 09:50:32 +0100
Subject: [PATCH 478/702] change GroupInviteTile from RoomSubList css so new
 :hover won't apply

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/groups/GroupInviteTile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 7c471cca2e..9e28ff5adf 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -134,7 +134,7 @@ export default React.createClass({
         </EmojiText>;
 
         const badgeEllipsis = this.state.badgeHover || this.state.menuDisplayed;
-        const badgeClasses = classNames('mx_RoomSubList_badge mx_RoomSubList_badgeHighlight', {
+        const badgeClasses = classNames('mx_RoomTile_badge mx_RoomTile_highlight', {
             'mx_RoomTile_badgeButton': badgeEllipsis,
         });
 

From ee729233c849af843e451ad49d4bd49e2f37c709 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 27 Jun 2018 10:17:25 +0100
Subject: [PATCH 479/702] Update package-lock.json

---
 package-lock.json | 2427 ++++++++++++++++++++++++++-------------------
 1 file changed, 1386 insertions(+), 1041 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 433ed3ea4a..048fba30e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
       "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.11",
+        "mime-types": "2.1.17",
         "negotiator": "0.6.1"
       }
     },
@@ -35,7 +35,7 @@
       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
       "dev": true,
       "requires": {
-        "acorn": "^3.0.4"
+        "acorn": "3.3.0"
       },
       "dependencies": {
         "acorn": {
@@ -52,6 +52,17 @@
       "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
       "dev": true
     },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.1.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
+      }
+    },
     "ajv-keywords": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
@@ -64,9 +75,9 @@
       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
       }
     },
     "amdefine": {
@@ -75,6 +86,11 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
+    "another-json": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz",
+      "integrity": "sha1-tfQBnJc7bdXGUGotk0acttMq7tw="
+    },
     "ansi-escapes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
@@ -99,8 +115,8 @@
       "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
       }
     },
     "argparse": {
@@ -109,7 +125,7 @@
       "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
       "dev": true,
       "requires": {
-        "sprintf-js": "~1.0.2"
+        "sprintf-js": "1.0.3"
       },
       "dependencies": {
         "sprintf-js": {
@@ -126,7 +142,7 @@
       "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.0.1"
+        "arr-flatten": "1.1.0"
       }
     },
     "arr-flatten": {
@@ -141,8 +157,8 @@
       "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.7.0"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.9.0"
       }
     },
     "array-slice": {
@@ -157,7 +173,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "^1.0.1"
+        "array-uniq": "1.0.3"
       }
     },
     "array-uniq": {
@@ -189,6 +205,11 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
     "assert": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
@@ -198,6 +219,11 @@
         "util": "0.10.3"
       }
     },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
     "async": {
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
@@ -210,27 +236,42 @@
       "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
       "dev": true
     },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
+      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
+    },
     "babel-cli": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
       "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
       "dev": true,
       "requires": {
-        "babel-core": "^6.26.0",
-        "babel-polyfill": "^6.26.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "chokidar": "^1.6.1",
-        "commander": "^2.11.0",
-        "convert-source-map": "^1.5.0",
-        "fs-readdir-recursive": "^1.0.0",
-        "glob": "^7.1.2",
-        "lodash": "^4.17.4",
-        "output-file-sync": "^1.1.2",
-        "path-is-absolute": "^1.0.1",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.6",
-        "v8flags": "^2.1.1"
+        "babel-core": "6.26.0",
+        "babel-polyfill": "6.26.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "chokidar": "1.7.0",
+        "commander": "2.11.0",
+        "convert-source-map": "1.5.0",
+        "fs-readdir-recursive": "1.0.0",
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "output-file-sync": "1.1.2",
+        "path-is-absolute": "1.0.1",
+        "slash": "1.0.0",
+        "source-map": "0.5.7",
+        "v8flags": "2.1.1"
       },
       "dependencies": {
         "glob": {
@@ -239,12 +280,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         }
       }
@@ -255,9 +296,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
       }
     },
     "babel-core": {
@@ -266,25 +307,25 @@
       "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-helpers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "convert-source-map": "^1.5.0",
-        "debug": "^2.6.8",
-        "json5": "^0.5.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.4",
-        "path-is-absolute": "^1.0.1",
-        "private": "^0.1.7",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.6"
+        "babel-code-frame": "6.26.0",
+        "babel-generator": "6.26.0",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "convert-source-map": "1.5.0",
+        "debug": "2.6.9",
+        "json5": "0.5.1",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.8",
+        "slash": "1.0.0",
+        "source-map": "0.5.7"
       }
     },
     "babel-eslint": {
@@ -293,11 +334,11 @@
       "integrity": "sha1-UpNBn+NnLWZZjTJ9qWlFZ7pqXy8=",
       "dev": true,
       "requires": {
-        "babel-traverse": "^6.0.20",
-        "babel-types": "^6.0.19",
-        "babylon": "^6.0.18",
-        "lodash.assign": "^4.0.0",
-        "lodash.pickby": "^4.0.0"
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash.assign": "4.2.0",
+        "lodash.pickby": "4.6.0"
       }
     },
     "babel-generator": {
@@ -306,14 +347,14 @@
       "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
       "dev": true,
       "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.6",
-        "trim-right": "^1.0.1"
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.4",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
       }
     },
     "babel-helper-builder-binary-assignment-operator-visitor": {
@@ -322,9 +363,9 @@
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
       "dev": true,
       "requires": {
-        "babel-helper-explode-assignable-expression": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-helper-explode-assignable-expression": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-builder-react-jsx": {
@@ -333,9 +374,9 @@
       "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "esutils": "^2.0.2"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "esutils": "2.0.2"
       }
     },
     "babel-helper-call-delegate": {
@@ -344,10 +385,10 @@
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-define-map": {
@@ -356,10 +397,10 @@
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
       }
     },
     "babel-helper-explode-assignable-expression": {
@@ -368,9 +409,9 @@
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-function-name": {
@@ -379,11 +420,11 @@
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-get-function-arity": {
@@ -392,8 +433,8 @@
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-hoist-variables": {
@@ -402,8 +443,8 @@
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-optimise-call-expression": {
@@ -412,8 +453,8 @@
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-regex": {
@@ -422,9 +463,9 @@
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
       }
     },
     "babel-helper-remap-async-to-generator": {
@@ -433,11 +474,11 @@
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-replace-supers": {
@@ -446,12 +487,12 @@
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helpers": {
@@ -460,8 +501,8 @@
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-loader": {
@@ -470,10 +511,10 @@
       "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^0.1.1",
-        "loader-utils": "^0.2.16",
-        "mkdirp": "^0.5.1",
-        "object-assign": "^4.0.1"
+        "find-cache-dir": "0.1.1",
+        "loader-utils": "0.2.17",
+        "mkdirp": "0.5.1",
+        "object-assign": "4.1.1"
       }
     },
     "babel-messages": {
@@ -482,7 +523,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-add-module-exports": {
@@ -497,7 +538,7 @@
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-syntax-async-functions": {
@@ -548,10 +589,10 @@
       "integrity": "sha1-Ruo+fFr2KXgqyfHtG3zTj4Qlr9Q=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.8.0",
-        "babel-plugin-syntax-async-functions": "^6.8.0",
-        "babel-template": "^6.9.0",
-        "babel-traverse": "^6.10.4"
+        "babel-helper-function-name": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0"
       }
     },
     "babel-plugin-transform-async-to-generator": {
@@ -560,9 +601,9 @@
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
       "dev": true,
       "requires": {
-        "babel-helper-remap-async-to-generator": "^6.24.1",
-        "babel-plugin-syntax-async-functions": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-class-properties": {
@@ -571,10 +612,10 @@
       "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-plugin-syntax-class-properties": "^6.8.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-helper-function-name": "6.24.1",
+        "babel-plugin-syntax-class-properties": "6.13.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-arrow-functions": {
@@ -583,7 +624,7 @@
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
@@ -592,7 +633,7 @@
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoping": {
@@ -601,11 +642,11 @@
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -614,15 +655,15 @@
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
       "dev": true,
       "requires": {
-        "babel-helper-define-map": "^6.24.1",
-        "babel-helper-function-name": "^6.24.1",
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-define-map": "6.26.0",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -631,8 +672,8 @@
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-destructuring": {
@@ -641,7 +682,7 @@
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-duplicate-keys": {
@@ -650,8 +691,8 @@
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-for-of": {
@@ -660,7 +701,7 @@
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-function-name": {
@@ -669,9 +710,9 @@
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-literals": {
@@ -680,7 +721,7 @@
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-amd": {
@@ -689,9 +730,9 @@
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
@@ -700,10 +741,10 @@
       "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-strict-mode": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-types": "^6.26.0"
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
@@ -712,9 +753,9 @@
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-umd": {
@@ -723,9 +764,9 @@
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-object-super": {
@@ -734,8 +775,8 @@
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-parameters": {
@@ -744,12 +785,12 @@
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "^6.24.1",
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
@@ -758,8 +799,8 @@
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-spread": {
@@ -768,7 +809,7 @@
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-sticky-regex": {
@@ -777,9 +818,9 @@
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-template-literals": {
@@ -788,7 +829,7 @@
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
@@ -797,7 +838,7 @@
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -806,9 +847,9 @@
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "regexpu-core": "^2.0.0"
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "regexpu-core": "2.0.0"
       }
     },
     "babel-plugin-transform-exponentiation-operator": {
@@ -817,9 +858,9 @@
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-flow-strip-types": {
@@ -828,8 +869,8 @@
       "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-flow": "^6.18.0",
-        "babel-runtime": "^6.22.0"
+        "babel-plugin-syntax-flow": "6.18.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-object-rest-spread": {
@@ -838,8 +879,8 @@
       "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
-        "babel-runtime": "^6.26.0"
+        "babel-plugin-syntax-object-rest-spread": "6.13.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-react-display-name": {
@@ -848,7 +889,7 @@
       "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-react-jsx": {
@@ -857,9 +898,9 @@
       "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-react-jsx": "^6.24.1",
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-builder-react-jsx": "6.26.0",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-react-jsx-self": {
@@ -868,8 +909,8 @@
       "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-react-jsx-source": {
@@ -878,8 +919,8 @@
       "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-regenerator": {
@@ -888,7 +929,7 @@
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.10.0"
+        "regenerator-transform": "0.10.1"
       }
     },
     "babel-plugin-transform-runtime": {
@@ -897,7 +938,7 @@
       "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-strict-mode": {
@@ -906,8 +947,8 @@
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-polyfill": {
@@ -916,9 +957,9 @@
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "regenerator-runtime": "^0.10.5"
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.10.5"
       },
       "dependencies": {
         "regenerator-runtime": {
@@ -935,30 +976,30 @@
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "^6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
-        "babel-plugin-transform-es2015-classes": "^6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
-        "babel-plugin-transform-es2015-for-of": "^6.22.0",
-        "babel-plugin-transform-es2015-function-name": "^6.24.1",
-        "babel-plugin-transform-es2015-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
-        "babel-plugin-transform-es2015-object-super": "^6.24.1",
-        "babel-plugin-transform-es2015-parameters": "^6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-spread": "^6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
-        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
-        "babel-plugin-transform-regenerator": "^6.24.1"
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0"
       }
     },
     "babel-preset-es2016": {
@@ -967,7 +1008,7 @@
       "integrity": "sha1-+QC/k+LrwNJ235uKtZck6/2Vn4s=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-exponentiation-operator": "^6.24.1"
+        "babel-plugin-transform-exponentiation-operator": "6.24.1"
       }
     },
     "babel-preset-es2017": {
@@ -976,8 +1017,8 @@
       "integrity": "sha1-WXvq37n38gi8/YoS6bKym4svFNE=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
-        "babel-plugin-transform-async-to-generator": "^6.24.1"
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-to-generator": "6.24.1"
       }
     },
     "babel-preset-flow": {
@@ -986,7 +1027,7 @@
       "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-flow-strip-types": "^6.22.0"
+        "babel-plugin-transform-flow-strip-types": "6.22.0"
       }
     },
     "babel-preset-react": {
@@ -995,12 +1036,12 @@
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "^6.3.13",
-        "babel-plugin-transform-react-display-name": "^6.23.0",
-        "babel-plugin-transform-react-jsx": "^6.24.1",
-        "babel-plugin-transform-react-jsx-self": "^6.22.0",
-        "babel-plugin-transform-react-jsx-source": "^6.22.0",
-        "babel-preset-flow": "^6.23.0"
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-plugin-transform-react-display-name": "6.25.0",
+        "babel-plugin-transform-react-jsx": "6.24.1",
+        "babel-plugin-transform-react-jsx-self": "6.22.0",
+        "babel-plugin-transform-react-jsx-source": "6.22.0",
+        "babel-preset-flow": "6.23.0"
       }
     },
     "babel-register": {
@@ -1009,13 +1050,13 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "home-or-tmp": "^2.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.15"
+        "babel-core": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.1",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18"
       }
     },
     "babel-runtime": {
@@ -1023,8 +1064,8 @@
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.11.0"
       }
     },
     "babel-template": {
@@ -1033,11 +1074,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.4"
       }
     },
     "babel-traverse": {
@@ -1046,15 +1087,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
       }
     },
     "babel-types": {
@@ -1063,10 +1104,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.4",
+        "to-fast-properties": "1.0.3"
       }
     },
     "babylon": {
@@ -1104,6 +1145,15 @@
       "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
       "dev": true
     },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
     "better-assert": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
@@ -1148,15 +1198,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.0.0",
-        "content-type": "~1.0.4",
+        "content-type": "1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.1",
-        "http-errors": "~1.6.2",
+        "depd": "1.1.1",
+        "http-errors": "1.6.2",
         "iconv-lite": "0.4.19",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.3.0",
         "qs": "6.5.1",
         "raw-body": "2.3.2",
-        "type-is": "~1.6.15"
+        "type-is": "1.6.15"
       }
     },
     "brace-expansion": {
@@ -1164,7 +1214,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
       "requires": {
-        "balanced-match": "^1.0.0",
+        "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -1174,9 +1224,9 @@
       "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
       "dev": true,
       "requires": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
       }
     },
     "browser-encrypt-attachment": {
@@ -1201,7 +1251,7 @@
       "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1"
+        "inherits": "2.0.3"
       }
     },
     "browserify-zlib": {
@@ -1210,7 +1260,7 @@
       "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
       "dev": true,
       "requires": {
-        "pako": "~0.2.0"
+        "pako": "0.2.9"
       },
       "dependencies": {
         "pako": {
@@ -1227,9 +1277,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "1.2.1",
+        "ieee754": "1.1.8",
+        "isarray": "1.0.0"
       }
     },
     "builtin-status-codes": {
@@ -1250,7 +1300,7 @@
       "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
       "dev": true,
       "requires": {
-        "callsites": "^0.2.0"
+        "callsites": "0.2.0"
       }
     },
     "callsite": {
@@ -1271,14 +1321,19 @@
       "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
       "dev": true
     },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
     "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
       "dev": true,
       "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
       }
     },
     "chalk": {
@@ -1287,11 +1342,11 @@
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "dev": true,
       "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "ansi-styles": "2.2.1",
+        "escape-string-regexp": "1.0.5",
+        "has-ansi": "2.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "2.0.0"
       }
     },
     "chokidar": {
@@ -1300,15 +1355,15 @@
       "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
       "dev": true,
       "requires": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "fsevents": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
+        "anymatch": "1.3.2",
+        "async-each": "1.0.1",
+        "fsevents": "1.1.2",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0"
       }
     },
     "circular-json": {
@@ -1328,7 +1383,7 @@
       "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
       "dev": true,
       "requires": {
-        "restore-cursor": "^1.0.1"
+        "restore-cursor": "1.0.1"
       }
     },
     "cli-width": {
@@ -1343,8 +1398,8 @@
       "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
       "dev": true,
       "requires": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
+        "center-align": "0.1.3",
+        "right-align": "0.1.3",
         "wordwrap": "0.0.2"
       },
       "dependencies": {
@@ -1365,8 +1420,7 @@
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "code-point-at": {
       "version": "1.1.0",
@@ -1386,7 +1440,15 @@
       "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
       "dev": true,
       "requires": {
-        "lodash": "^4.5.0"
+        "lodash": "4.17.4"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "requires": {
+        "delayed-stream": "1.0.0"
       }
     },
     "commander": {
@@ -1406,10 +1468,10 @@
       "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz",
       "integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=",
       "requires": {
-        "entities": "~ 1.1.1",
-        "mdurl": "~ 1.0.1",
-        "minimist": "~ 1.2.0",
-        "string.prototype.repeat": "^0.2.0"
+        "entities": "1.1.1",
+        "mdurl": "1.0.1",
+        "minimist": "1.2.0",
+        "string.prototype.repeat": "0.2.0"
       }
     },
     "component-bind": {
@@ -1441,9 +1503,9 @@
       "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
       }
     },
     "connect": {
@@ -1454,7 +1516,7 @@
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.0.6",
-        "parseurl": "~1.3.2",
+        "parseurl": "1.3.2",
         "utils-merge": "1.0.1"
       }
     },
@@ -1464,7 +1526,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "^0.1.4"
+        "date-now": "0.1.4"
       }
     },
     "constants-browserify": {
@@ -1476,8 +1538,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "convert-source-map": {
       "version": "1.5.0",
@@ -1506,11 +1567,11 @@
       "resolved": "https://registry.npmjs.org/counterpart/-/counterpart-0.18.3.tgz",
       "integrity": "sha512-tli4qPAFeYB34LvvCc/1xYRLCWjf4WsUt6sXfpggDfGDKoI8rhnabz0SljDoBpAK8z1u8GBCg0YDkbvWb16uUQ==",
       "requires": {
-        "date-names": "^0.1.9",
-        "except": "^0.1.3",
-        "extend": "^3.0.0",
-        "pluralizers": "^0.1.6",
-        "sprintf-js": "^1.0.3"
+        "date-names": "0.1.10",
+        "except": "0.1.3",
+        "extend": "3.0.1",
+        "pluralizers": "0.1.6",
+        "sprintf-js": "1.1.1"
       }
     },
     "create-react-class": {
@@ -1518,9 +1579,9 @@
       "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.2.tgz",
       "integrity": "sha1-zx7RXxKq1/FO9fLf4F5sQvke8Co=",
       "requires": {
-        "fbjs": "^0.8.9",
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1"
       }
     },
     "crypto-browserify": {
@@ -1547,7 +1608,15 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.9"
+        "es5-ext": "0.10.35"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "1.0.0"
       }
     },
     "date-names": {
@@ -1588,8 +1657,8 @@
       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
       "dev": true,
       "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
       }
     },
     "del": {
@@ -1598,15 +1667,20 @@
       "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
       "dev": true,
       "requires": {
-        "globby": "^5.0.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "rimraf": "^2.2.8"
+        "globby": "5.0.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.0",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "rimraf": "2.6.2"
       }
     },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
     "depd": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
@@ -1619,7 +1693,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "di": {
@@ -1640,8 +1714,8 @@
       "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
+        "esutils": "2.0.2",
+        "isarray": "1.0.0"
       }
     },
     "dom-serialize": {
@@ -1650,10 +1724,10 @@
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "void-elements": "2.0.1"
       }
     },
     "dom-serializer": {
@@ -1661,8 +1735,8 @@
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
       },
       "dependencies": {
         "domelementtype": {
@@ -1688,7 +1762,7 @@
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
       "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
       "requires": {
-        "domelementtype": "1"
+        "domelementtype": "1.3.0"
       }
     },
     "domutils": {
@@ -1696,8 +1770,8 @@
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
       "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
       "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
       }
     },
     "draft-js": {
@@ -1705,9 +1779,9 @@
       "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0-alpha.tgz",
       "integrity": "sha1-MtshCPkn6bhEbaH3nkR1wrf4aK4=",
       "requires": {
-        "fbjs": "^0.8.12",
-        "immutable": "~3.7.4",
-        "object-assign": "^4.1.0"
+        "fbjs": "0.8.16",
+        "immutable": "3.7.6",
+        "object-assign": "4.1.1"
       }
     },
     "draft-js-export-html": {
@@ -1715,7 +1789,7 @@
       "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz",
       "integrity": "sha1-zIDwVExD0Kf+28U8DLCRToCQ92k=",
       "requires": {
-        "draft-js-utils": ">=0.2.0"
+        "draft-js-utils": "1.2.0"
       }
     },
     "draft-js-export-markdown": {
@@ -1723,7 +1797,7 @@
       "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz",
       "integrity": "sha1-hjkOA86vHTR/xhaGerf1Net2v0I=",
       "requires": {
-        "draft-js-utils": ">=0.2.0"
+        "draft-js-utils": "1.2.0"
       }
     },
     "draft-js-utils": {
@@ -1731,6 +1805,15 @@
       "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.2.0.tgz",
       "integrity": "sha1-9csj6xZzJf/tPXmIL9wxdyHS/RI="
     },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -1759,7 +1842,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
-        "iconv-lite": "~0.4.13"
+        "iconv-lite": "0.4.19"
       }
     },
     "engine.io": {
@@ -1856,9 +1939,9 @@
       "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.2.0",
-        "tapable": "^0.1.8"
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.2.0",
+        "tapable": "0.1.10"
       },
       "dependencies": {
         "memory-fs": {
@@ -1886,7 +1969,7 @@
       "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
       "dev": true,
       "requires": {
-        "prr": "~0.0.0"
+        "prr": "0.0.0"
       }
     },
     "es-abstract": {
@@ -1895,11 +1978,11 @@
       "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.1",
+        "is-callable": "1.1.3",
+        "is-regex": "1.0.4"
       }
     },
     "es-to-primitive": {
@@ -1908,9 +1991,9 @@
       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
       }
     },
     "es5-ext": {
@@ -1919,8 +2002,8 @@
       "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
       "dev": true,
       "requires": {
-        "es6-iterator": "~2.0.1",
-        "es6-symbol": "~3.1.1"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
       }
     },
     "es6-iterator": {
@@ -1929,9 +2012,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-symbol": "3.1.1"
       }
     },
     "es6-map": {
@@ -1940,12 +2023,12 @@
       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-iterator": "2.0.3",
+        "es6-set": "0.1.5",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
       }
     },
     "es6-set": {
@@ -1954,11 +2037,11 @@
       "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
+        "event-emitter": "0.3.5"
       }
     },
     "es6-symbol": {
@@ -1967,8 +2050,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
       }
     },
     "es6-weak-map": {
@@ -1977,10 +2060,10 @@
       "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
       }
     },
     "escape-html": {
@@ -2001,10 +2084,10 @@
       "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
       "dev": true,
       "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "es6-map": "0.1.5",
+        "es6-weak-map": "2.0.2",
+        "esrecurse": "4.2.0",
+        "estraverse": "4.2.0"
       }
     },
     "eslint": {
@@ -2013,41 +2096,41 @@
       "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.16.0",
-        "chalk": "^1.1.3",
-        "concat-stream": "^1.5.2",
-        "debug": "^2.1.1",
-        "doctrine": "^2.0.0",
-        "escope": "^3.6.0",
-        "espree": "^3.4.0",
-        "esquery": "^1.0.0",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
-        "glob": "^7.0.3",
-        "globals": "^9.14.0",
-        "ignore": "^3.2.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^0.12.0",
-        "is-my-json-valid": "^2.10.0",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.5.1",
-        "json-stable-stringify": "^1.0.0",
-        "levn": "^0.3.0",
-        "lodash": "^4.0.0",
-        "mkdirp": "^0.5.0",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.1",
-        "pluralize": "^1.2.1",
-        "progress": "^1.1.8",
-        "require-uncached": "^1.0.2",
-        "shelljs": "^0.7.5",
-        "strip-bom": "^3.0.0",
-        "strip-json-comments": "~2.0.1",
-        "table": "^3.7.8",
-        "text-table": "~0.2.0",
-        "user-home": "^2.0.0"
+        "babel-code-frame": "6.26.0",
+        "chalk": "1.1.3",
+        "concat-stream": "1.6.0",
+        "debug": "2.6.9",
+        "doctrine": "2.0.0",
+        "escope": "3.6.0",
+        "espree": "3.5.1",
+        "esquery": "1.0.0",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "file-entry-cache": "2.0.0",
+        "glob": "7.1.2",
+        "globals": "9.18.0",
+        "ignore": "3.3.5",
+        "imurmurhash": "0.1.4",
+        "inquirer": "0.12.0",
+        "is-my-json-valid": "2.16.1",
+        "is-resolvable": "1.0.0",
+        "js-yaml": "3.10.0",
+        "json-stable-stringify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "optionator": "0.8.2",
+        "path-is-inside": "1.0.2",
+        "pluralize": "1.2.1",
+        "progress": "1.1.8",
+        "require-uncached": "1.0.3",
+        "shelljs": "0.7.8",
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1",
+        "table": "3.8.3",
+        "text-table": "0.2.0",
+        "user-home": "2.0.0"
       },
       "dependencies": {
         "glob": {
@@ -2056,12 +2139,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "user-home": {
@@ -2070,7 +2153,7 @@
           "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
           "dev": true,
           "requires": {
-            "os-homedir": "^1.0.0"
+            "os-homedir": "1.0.2"
           }
         }
       }
@@ -2093,7 +2176,7 @@
       "integrity": "sha512-RiQv+7Z9QDJuzt+NO8sYgkLGT+h+WeCrxP7y8lI7wpU41x3x/2o3PGtHk9ck8QnA9/mlbNcy/hG0eKvmd7npaA==",
       "dev": true,
       "requires": {
-        "lodash": "^4.15.0"
+        "lodash": "4.17.4"
       }
     },
     "eslint-plugin-react": {
@@ -2102,10 +2185,10 @@
       "integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==",
       "dev": true,
       "requires": {
-        "doctrine": "^2.0.2",
-        "has": "^1.0.1",
-        "jsx-ast-utils": "^2.0.1",
-        "prop-types": "^15.6.0"
+        "doctrine": "2.1.0",
+        "has": "1.0.1",
+        "jsx-ast-utils": "2.0.1",
+        "prop-types": "15.6.0"
       },
       "dependencies": {
         "doctrine": {
@@ -2114,7 +2197,7 @@
           "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
           "requires": {
-            "esutils": "^2.0.2"
+            "esutils": "2.0.2"
           }
         }
       }
@@ -2125,8 +2208,8 @@
       "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
       "dev": true,
       "requires": {
-        "acorn": "^5.1.1",
-        "acorn-jsx": "^3.0.0"
+        "acorn": "5.1.2",
+        "acorn-jsx": "3.0.1"
       }
     },
     "esprima": {
@@ -2141,7 +2224,7 @@
       "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
       "dev": true,
       "requires": {
-        "estraverse": "^4.0.0"
+        "estraverse": "4.2.0"
       }
     },
     "esrecurse": {
@@ -2150,8 +2233,8 @@
       "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0",
-        "object-assign": "^4.0.1"
+        "estraverse": "4.2.0",
+        "object-assign": "4.1.1"
       }
     },
     "estraverse": {
@@ -2178,8 +2261,8 @@
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
       }
     },
     "eventemitter3": {
@@ -2214,9 +2297,9 @@
       "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
       "dev": true,
       "requires": {
-        "array-slice": "^0.2.3",
-        "array-unique": "^0.2.1",
-        "braces": "^0.1.2"
+        "array-slice": "0.2.3",
+        "array-unique": "0.2.1",
+        "braces": "0.1.5"
       },
       "dependencies": {
         "braces": {
@@ -2225,7 +2308,7 @@
           "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
           "dev": true,
           "requires": {
-            "expand-range": "^0.1.0"
+            "expand-range": "0.1.1"
           }
         },
         "expand-range": {
@@ -2234,8 +2317,8 @@
           "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
           "dev": true,
           "requires": {
-            "is-number": "^0.1.1",
-            "repeat-string": "^0.2.2"
+            "is-number": "0.1.1",
+            "repeat-string": "0.2.2"
           }
         },
         "is-number": {
@@ -2258,7 +2341,7 @@
       "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
       "dev": true,
       "requires": {
-        "is-posix-bracket": "^0.1.0"
+        "is-posix-bracket": "0.1.1"
       }
     },
     "expand-range": {
@@ -2267,7 +2350,7 @@
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "dev": true,
       "requires": {
-        "fill-range": "^2.1.0"
+        "fill-range": "2.2.3"
       }
     },
     "expect": {
@@ -2276,13 +2359,13 @@
       "integrity": "sha1-1Fj+TFYAQDa64yMkFqP2Nh8E+WU=",
       "dev": true,
       "requires": {
-        "define-properties": "~1.1.2",
-        "has": "^1.0.1",
-        "is-equal": "^1.5.1",
-        "is-regex": "^1.0.3",
-        "object-inspect": "^1.1.0",
-        "object-keys": "^1.0.9",
-        "tmatch": "^2.0.1"
+        "define-properties": "1.1.2",
+        "has": "1.0.1",
+        "is-equal": "1.5.5",
+        "is-regex": "1.0.4",
+        "object-inspect": "1.3.0",
+        "object-keys": "1.0.11",
+        "tmatch": "2.0.1"
       }
     },
     "extend": {
@@ -2296,9 +2379,24 @@
       "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
       "dev": true,
       "requires": {
-        "is-extglob": "^1.0.0"
+        "is-extglob": "1.0.0"
       }
     },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -2310,7 +2408,7 @@
       "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz",
       "integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=",
       "requires": {
-        "fbjs": "^0.8.4"
+        "fbjs": "0.8.16"
       }
     },
     "fbjs": {
@@ -2318,13 +2416,13 @@
       "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
       "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
       "requires": {
-        "core-js": "^1.0.0",
-        "isomorphic-fetch": "^2.1.1",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.9"
+        "core-js": "1.2.7",
+        "isomorphic-fetch": "2.2.1",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "promise": "7.3.1",
+        "setimmediate": "1.0.5",
+        "ua-parser-js": "0.7.17"
       },
       "dependencies": {
         "core-js": {
@@ -2340,8 +2438,8 @@
       "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5",
-        "object-assign": "^4.1.0"
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
       }
     },
     "file-entry-cache": {
@@ -2350,8 +2448,8 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
       }
     },
     "file-saver": {
@@ -2376,11 +2474,11 @@
       "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
       "dev": true,
       "requires": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^1.1.3",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.7",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
       }
     },
     "finalhandler": {
@@ -2390,12 +2488,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.1",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.3.1",
-        "unpipe": "~1.0.0"
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
       }
     },
     "find-cache-dir": {
@@ -2404,9 +2502,9 @@
       "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "mkdirp": "^0.5.1",
-        "pkg-dir": "^1.0.0"
+        "commondir": "1.0.1",
+        "mkdirp": "0.5.1",
+        "pkg-dir": "1.0.0"
       }
     },
     "find-up": {
@@ -2415,8 +2513,8 @@
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
       "dev": true,
       "requires": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "path-exists": "2.1.0",
+        "pinkie-promise": "2.0.1"
       }
     },
     "flat-cache": {
@@ -2425,10 +2523,10 @@
       "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "del": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "write": "^0.2.1"
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
       }
     },
     "flow-parser": {
@@ -2442,9 +2540,9 @@
       "resolved": "https://registry.npmjs.org/flux/-/flux-2.1.1.tgz",
       "integrity": "sha1-LGrGUtQzdIiWhInGWG86/yajjqQ=",
       "requires": {
-        "fbemitter": "^2.0.0",
+        "fbemitter": "2.1.1",
         "fbjs": "0.1.0-alpha.7",
-        "immutable": "^3.7.4"
+        "immutable": "3.7.6"
       },
       "dependencies": {
         "core-js": {
@@ -2457,9 +2555,9 @@
           "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.1.0-alpha.7.tgz",
           "integrity": "sha1-rUMIuPIy+zxzYDNJ6nJdHpw5Mjw=",
           "requires": {
-            "core-js": "^1.0.0",
-            "promise": "^7.0.3",
-            "whatwg-fetch": "^0.9.0"
+            "core-js": "1.2.7",
+            "promise": "7.3.1",
+            "whatwg-fetch": "0.9.0"
           }
         },
         "whatwg-fetch": {
@@ -2474,7 +2572,7 @@
       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-2.4.3.tgz",
       "integrity": "sha512-sT5Ip9nyAIxWq8Apt1Fdv6yTci5GotaOtO5Ro1/+F3PizttNBcCYz8j/Qze54PPFK73KUbOqh++HUCiyNPqvhA==",
       "requires": {
-        "tabbable": "^1.0.3"
+        "tabbable": "1.1.2"
       }
     },
     "focus-trap-react": {
@@ -2482,7 +2580,7 @@
       "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-3.1.2.tgz",
       "integrity": "sha512-MoQmONoy9gRPyrC5DGezkcOMGgx7MtIOAQDHe098UtL2sA2vmucJwEmQisb+8LRXNYFHxuw5zJ1oLFeKu4Mteg==",
       "requires": {
-        "focus-trap": "^2.0.1"
+        "focus-trap": "2.4.3"
       }
     },
     "for-in": {
@@ -2497,7 +2595,7 @@
       "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "for-in": "1.0.2"
       }
     },
     "foreach": {
@@ -2512,13 +2610,28 @@
       "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=",
       "dev": true
     },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "2.1.17"
+      }
+    },
     "fs-access": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
-        "null-check": "^1.0.0"
+        "null-check": "1.0.0"
       }
     },
     "fs-readdir-recursive": {
@@ -2540,8 +2653,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "^2.3.0",
-        "node-pre-gyp": "^0.6.36"
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.36"
       },
       "dependencies": {
         "abbrev": {
@@ -2556,8 +2669,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
         "ansi-regex": {
@@ -2577,8 +2690,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
           }
         },
         "asn1": {
@@ -2622,7 +2735,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "tweetnacl": "^0.14.3"
+            "tweetnacl": "0.14.5"
           }
         },
         "block-stream": {
@@ -2630,7 +2743,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "inherits": "~2.0.0"
+            "inherits": "2.0.3"
           }
         },
         "boom": {
@@ -2638,7 +2751,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "hoek": "2.x.x"
+            "hoek": "2.16.3"
           }
         },
         "brace-expansion": {
@@ -2646,7 +2759,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "balanced-match": "^0.4.1",
+            "balanced-match": "0.4.2",
             "concat-map": "0.0.1"
           }
         },
@@ -2677,7 +2790,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "delayed-stream": "~1.0.0"
+            "delayed-stream": "1.0.0"
           }
         },
         "concat-map": {
@@ -2701,7 +2814,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "boom": "2.x.x"
+            "boom": "2.10.1"
           }
         },
         "dashdash": {
@@ -2710,7 +2823,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "^1.0.0"
+            "assert-plus": "1.0.0"
           },
           "dependencies": {
             "assert-plus": {
@@ -2753,7 +2866,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsbn": "~0.1.0"
+            "jsbn": "0.1.1"
           }
         },
         "extend": {
@@ -2794,10 +2907,10 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
           }
         },
         "fstream-ignore": {
@@ -2806,9 +2919,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "fstream": "^1.0.0",
-            "inherits": "2",
-            "minimatch": "^3.0.0"
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
           }
         },
         "gauge": {
@@ -2817,14 +2930,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
           }
         },
         "getpass": {
@@ -2833,7 +2946,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "^1.0.0"
+            "assert-plus": "1.0.0"
           },
           "dependencies": {
             "assert-plus": {
@@ -2849,12 +2962,12 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "graceful-fs": {
@@ -2874,8 +2987,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ajv": "^4.9.1",
-            "har-schema": "^1.0.5"
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
           }
         },
         "has-unicode": {
@@ -2890,10 +3003,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "boom": "2.x.x",
-            "cryptiles": "2.x.x",
-            "hoek": "2.x.x",
-            "sntp": "1.x.x"
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
           }
         },
         "hoek": {
@@ -2907,9 +3020,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "^0.2.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
           }
         },
         "inflight": {
@@ -2917,8 +3030,8 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
           }
         },
         "inherits": {
@@ -2963,7 +3076,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsbn": "~0.1.0"
+            "jsbn": "0.1.1"
           }
         },
         "jsbn": {
@@ -2984,7 +3097,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsonify": "~0.0.0"
+            "jsonify": "0.0.0"
           }
         },
         "json-stringify-safe": {
@@ -3065,15 +3178,15 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "mkdirp": "^0.5.1",
-            "nopt": "^4.0.1",
-            "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
-            "request": "^2.81.0",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^2.2.1",
-            "tar-pack": "^3.4.0"
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
           }
         },
         "nopt": {
@@ -3082,8 +3195,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
           }
         },
         "npmlog": {
@@ -3092,10 +3205,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
         "number-is-nan": {
@@ -3120,7 +3233,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "wrappy": "1"
+            "wrappy": "1.0.2"
           }
         },
         "os-homedir": {
@@ -3179,10 +3292,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "~0.4.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -3198,13 +3311,13 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "buffer-shims": "~1.0.0",
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "string_decoder": "~1.0.0",
-            "util-deprecate": "~1.0.1"
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "request": {
@@ -3213,28 +3326,28 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.1.1",
-            "har-validator": "~4.2.1",
-            "hawk": "~3.1.3",
-            "http-signature": "~1.1.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.7",
-            "oauth-sign": "~0.8.1",
-            "performance-now": "^0.2.0",
-            "qs": "~6.4.0",
-            "safe-buffer": "^5.0.1",
-            "stringstream": "~0.0.4",
-            "tough-cookie": "~2.3.0",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.0.0"
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
           }
         },
         "rimraf": {
@@ -3242,7 +3355,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "7.1.2"
           }
         },
         "safe-buffer": {
@@ -3274,7 +3387,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "hoek": "2.x.x"
+            "hoek": "2.16.3"
           }
         },
         "sshpk": {
@@ -3283,15 +3396,15 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jodid25519": "^1.0.0",
-            "jsbn": "~0.1.0",
-            "tweetnacl": "~0.14.0"
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
           },
           "dependencies": {
             "assert-plus": {
@@ -3307,9 +3420,9 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "string_decoder": {
@@ -3317,7 +3430,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "^5.0.1"
+            "safe-buffer": "5.0.1"
           }
         },
         "stringstream": {
@@ -3331,7 +3444,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "strip-json-comments": {
@@ -3345,9 +3458,9 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.2",
-            "inherits": "2"
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
           }
         },
         "tar-pack": {
@@ -3356,14 +3469,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^2.2.0",
-            "fstream": "^1.0.10",
-            "fstream-ignore": "^1.0.5",
-            "once": "^1.3.3",
-            "readable-stream": "^2.1.4",
-            "rimraf": "^2.5.1",
-            "tar": "^2.2.1",
-            "uid-number": "^0.0.6"
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
           }
         },
         "tough-cookie": {
@@ -3372,7 +3485,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "punycode": "^1.4.1"
+            "punycode": "1.4.1"
           }
         },
         "tunnel-agent": {
@@ -3381,7 +3494,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "^5.0.1"
+            "safe-buffer": "5.0.1"
           }
         },
         "tweetnacl": {
@@ -3422,7 +3535,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2"
+            "string-width": "1.0.2"
           }
         },
         "wrappy": {
@@ -3443,6 +3556,9 @@
       "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-2.7.4.tgz",
       "integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk="
     },
+    "gemini-scrollbar": {
+      "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
+    },
     "generate-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
@@ -3455,7 +3571,15 @@
       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
       "dev": true,
       "requires": {
-        "is-property": "^1.0.0"
+        "is-property": "1.0.2"
+      }
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "1.0.0"
       }
     },
     "gfm.css": {
@@ -3468,11 +3592,11 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
       "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
       "requires": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
       }
     },
     "glob-base": {
@@ -3481,8 +3605,8 @@
       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
       "dev": true,
       "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
       }
     },
     "glob-parent": {
@@ -3491,7 +3615,7 @@
       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
       "dev": true,
       "requires": {
-        "is-glob": "^2.0.0"
+        "is-glob": "2.0.1"
       }
     },
     "globals": {
@@ -3506,12 +3630,12 @@
       "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
       "dev": true,
       "requires": {
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "array-union": "1.0.2",
+        "arrify": "1.0.1",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
       },
       "dependencies": {
         "glob": {
@@ -3520,12 +3644,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         }
       }
@@ -3536,13 +3660,27 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "requires": {
+        "ajv": "5.5.2",
+        "har-schema": "2.0.0"
+      }
+    },
     "has": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
       "dev": true,
       "requires": {
-        "function-bind": "^1.0.2"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -3551,7 +3689,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "has-binary": {
@@ -3605,8 +3743,8 @@
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "htmlparser2": {
@@ -3614,12 +3752,12 @@
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
       "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
       "requires": {
-        "domelementtype": "^1.3.0",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.2"
+        "domelementtype": "1.3.0",
+        "domhandler": "2.4.1",
+        "domutils": "1.6.2",
+        "entities": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
       }
     },
     "http-errors": {
@@ -3631,7 +3769,7 @@
         "depd": "1.1.1",
         "inherits": "2.0.3",
         "setprototypeof": "1.0.3",
-        "statuses": ">= 1.3.1 < 2"
+        "statuses": "1.3.1"
       }
     },
     "http-proxy": {
@@ -3640,8 +3778,18 @@
       "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
       "dev": true,
       "requires": {
-        "eventemitter3": "1.x.x",
-        "requires-port": "1.x.x"
+        "eventemitter3": "1.2.0",
+        "requires-port": "1.0.0"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.14.2"
       }
     },
     "https-browserify": {
@@ -3688,8 +3836,8 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
       }
     },
     "inherits": {
@@ -3703,19 +3851,19 @@
       "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^1.1.0",
-        "ansi-regex": "^2.0.0",
-        "chalk": "^1.0.0",
-        "cli-cursor": "^1.0.1",
-        "cli-width": "^2.0.0",
-        "figures": "^1.3.5",
-        "lodash": "^4.3.0",
-        "readline2": "^1.0.1",
-        "run-async": "^0.1.0",
-        "rx-lite": "^3.1.2",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.0",
-        "through": "^2.3.6"
+        "ansi-escapes": "1.4.0",
+        "ansi-regex": "2.1.1",
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "cli-width": "2.2.0",
+        "figures": "1.7.0",
+        "lodash": "4.17.4",
+        "readline2": "1.0.1",
+        "run-async": "0.1.0",
+        "rx-lite": "3.1.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "through": "2.3.8"
       }
     },
     "interpret": {
@@ -3729,7 +3877,7 @@
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
       "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.3.1"
       }
     },
     "is-arrow-function": {
@@ -3738,7 +3886,7 @@
       "integrity": "sha1-Kb4sLY2UUIUri7r7Y1unuNjofsI=",
       "dev": true,
       "requires": {
-        "is-callable": "^1.0.4"
+        "is-callable": "1.1.3"
       }
     },
     "is-binary-path": {
@@ -3747,7 +3895,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "1.10.0"
       }
     },
     "is-boolean-object": {
@@ -3786,17 +3934,17 @@
       "integrity": "sha1-XoXxlX4FKIMkf+s4aWWju6Ffuz0=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1",
-        "is-arrow-function": "^2.0.3",
-        "is-boolean-object": "^1.0.0",
-        "is-callable": "^1.1.3",
-        "is-date-object": "^1.0.1",
-        "is-generator-function": "^1.0.6",
-        "is-number-object": "^1.0.3",
-        "is-regex": "^1.0.3",
-        "is-string": "^1.0.4",
-        "is-symbol": "^1.0.1",
-        "object.entries": "^1.0.4"
+        "has": "1.0.1",
+        "is-arrow-function": "2.0.3",
+        "is-boolean-object": "1.0.0",
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-generator-function": "1.0.6",
+        "is-number-object": "1.0.3",
+        "is-regex": "1.0.4",
+        "is-string": "1.0.4",
+        "is-symbol": "1.0.1",
+        "object.entries": "1.0.4"
       }
     },
     "is-equal-shallow": {
@@ -3805,7 +3953,7 @@
       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
       "dev": true,
       "requires": {
-        "is-primitive": "^2.0.0"
+        "is-primitive": "2.0.0"
       }
     },
     "is-extendable": {
@@ -3826,7 +3974,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-fullwidth-code-point": {
@@ -3835,7 +3983,7 @@
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-generator-function": {
@@ -3850,7 +3998,7 @@
       "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
       "dev": true,
       "requires": {
-        "is-extglob": "^1.0.0"
+        "is-extglob": "1.0.0"
       }
     },
     "is-my-json-valid": {
@@ -3859,10 +4007,10 @@
       "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
       "dev": true,
       "requires": {
-        "generate-function": "^2.0.0",
-        "generate-object-property": "^1.1.0",
-        "jsonpointer": "^4.0.0",
-        "xtend": "^4.0.0"
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
       }
     },
     "is-number": {
@@ -3871,7 +4019,7 @@
       "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       }
     },
     "is-number-object": {
@@ -3892,7 +4040,7 @@
       "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "1.0.0"
       }
     },
     "is-path-inside": {
@@ -3901,7 +4049,7 @@
       "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "1.0.2"
       }
     },
     "is-posix-bracket": {
@@ -3928,7 +4076,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "1.0.1"
       }
     },
     "is-resolvable": {
@@ -3937,7 +4085,7 @@
       "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
       "dev": true,
       "requires": {
-        "tryit": "^1.0.1"
+        "tryit": "1.0.3"
       }
     },
     "is-stream": {
@@ -3957,6 +4105,11 @@
       "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
       "dev": true
     },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -3988,15 +4141,19 @@
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
       "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
       "requires": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
+        "node-fetch": "1.7.3",
+        "whatwg-fetch": "1.1.1"
       }
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
     "jquery": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=",
-      "optional": true
+      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -4009,10 +4166,16 @@
       "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
       }
     },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -4025,15 +4188,30 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
     "json-stable-stringify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
       "dev": true,
       "requires": {
-        "jsonify": "~0.0.0"
+        "jsonify": "0.0.0"
       }
     },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
     "json3": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
@@ -4058,13 +4236,24 @@
       "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
       "dev": true
     },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
     "jsx-ast-utils": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
       "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
       "dev": true,
       "requires": {
-        "array-includes": "^3.0.3"
+        "array-includes": "3.0.3"
       }
     },
     "just-extend": {
@@ -4079,33 +4268,33 @@
       "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "chokidar": "^1.4.1",
-        "colors": "^1.1.0",
-        "combine-lists": "^1.0.0",
-        "connect": "^3.6.0",
-        "core-js": "^2.2.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^3.8.0",
-        "log4js": "^0.6.31",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
-        "qjobs": "^1.1.4",
-        "range-parser": "^1.2.0",
-        "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
+        "bluebird": "3.5.1",
+        "body-parser": "1.18.2",
+        "chokidar": "1.7.0",
+        "colors": "1.1.2",
+        "combine-lists": "1.0.1",
+        "connect": "3.6.5",
+        "core-js": "2.5.1",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "expand-braces": "0.1.2",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "http-proxy": "1.16.2",
+        "isbinaryfile": "3.0.2",
+        "lodash": "3.10.1",
+        "log4js": "0.6.38",
+        "mime": "1.4.1",
+        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
+        "qjobs": "1.1.5",
+        "range-parser": "1.2.0",
+        "rimraf": "2.6.2",
+        "safe-buffer": "5.1.1",
         "socket.io": "1.7.3",
-        "source-map": "^0.5.3",
+        "source-map": "0.5.7",
         "tmp": "0.0.31",
-        "useragent": "^2.1.12"
+        "useragent": "2.2.1"
       },
       "dependencies": {
         "glob": {
@@ -4114,12 +4303,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "lodash": {
@@ -4136,8 +4325,8 @@
       "integrity": "sha1-TG1wDRY6nTTGGO/YeRi+SeekqMk=",
       "dev": true,
       "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
+        "fs-access": "1.0.1",
+        "which": "1.3.0"
       }
     },
     "karma-cli": {
@@ -4146,7 +4335,7 @@
       "integrity": "sha1-ys6oQ3Hs4Zh2JlyPoQLru5/uSow=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.4.0"
       }
     },
     "karma-junit-reporter": {
@@ -4155,7 +4344,7 @@
       "integrity": "sha1-SSojZyj+TJKqz0GfzQEQpDJ+nX8=",
       "dev": true,
       "requires": {
-        "path-is-absolute": "^1.0.0",
+        "path-is-absolute": "1.0.1",
         "xmlbuilder": "3.1.0"
       }
     },
@@ -4177,7 +4366,7 @@
       "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2"
+        "graceful-fs": "4.1.11"
       }
     },
     "karma-spec-reporter": {
@@ -4186,7 +4375,7 @@
       "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
       "dev": true,
       "requires": {
-        "colors": "^1.1.2"
+        "colors": "1.1.2"
       }
     },
     "karma-summary-reporter": {
@@ -4195,7 +4384,7 @@
       "integrity": "sha1-nHQKJLYL+RNes59acylsTM0Q2Zs=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3"
+        "chalk": "1.1.3"
       }
     },
     "karma-webpack": {
@@ -4204,11 +4393,11 @@
       "integrity": "sha1-OdX9Lt7qPMPvW0BZibN9Ww5qO04=",
       "dev": true,
       "requires": {
-        "async": "~0.9.0",
-        "loader-utils": "^0.2.5",
-        "lodash": "^3.8.0",
-        "source-map": "^0.1.41",
-        "webpack-dev-middleware": "^1.0.11"
+        "async": "0.9.2",
+        "loader-utils": "0.2.17",
+        "lodash": "3.10.1",
+        "source-map": "0.1.43",
+        "webpack-dev-middleware": "1.12.0"
       },
       "dependencies": {
         "lodash": {
@@ -4223,7 +4412,7 @@
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -4234,7 +4423,7 @@
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "requires": {
-        "is-buffer": "^1.1.5"
+        "is-buffer": "1.1.5"
       }
     },
     "lazy-cache": {
@@ -4249,18 +4438,50 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
       }
     },
     "linkifyjs": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.5.tgz",
-      "integrity": "sha512-8FqxPXQDLjI2nNHlM7eGewxE6DHvMbtiW0AiXzm0s4RkTwVZYRDTeVXkiRxLHTd4CuRBQY/JPtvtqJWdS7gHyA==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.6.tgz",
+      "integrity": "sha512-nA94bEM9rmt7Iu4OEIYSKpW+Dy6fhlBTjk2Bg9bFuxHQYcy+lWq2EleHb0rp/ev8oBO82vLHZctM5YlSR5DTzw==",
       "requires": {
-        "jquery": ">=1.9.0",
-        "react": ">=0.14.0",
-        "react-dom": ">=0.14.0"
+        "jquery": "3.3.1",
+        "react": "16.4.1",
+        "react-dom": "16.4.1"
+      },
+      "dependencies": {
+        "jquery": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+          "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
+          "optional": true
+        },
+        "react": {
+          "version": "16.4.1",
+          "resolved": "https://registry.npmjs.org/react/-/react-16.4.1.tgz",
+          "integrity": "sha512-3GEs0giKp6E0Oh/Y9ZC60CmYgUPnp7voH9fbjWsvXtYFb4EWtgQub0ADSq0sJR0BbHc4FThLLtzlcFaFXIorwg==",
+          "optional": true,
+          "requires": {
+            "fbjs": "0.8.16",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1",
+            "prop-types": "15.6.0"
+          }
+        },
+        "react-dom": {
+          "version": "16.4.1",
+          "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.1.tgz",
+          "integrity": "sha512-1Gin+wghF/7gl4Cqcvr1DxFX2Osz7ugxSwl6gBqCMpdrxHjIFUS7GYxrFftZ9Ln44FHw0JxCFD9YtZsrbR5/4A==",
+          "optional": true,
+          "requires": {
+            "fbjs": "0.8.16",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1",
+            "prop-types": "15.6.0"
+          }
+        }
       }
     },
     "loader-utils": {
@@ -4269,10 +4490,10 @@
       "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
       "dev": true,
       "requires": {
-        "big.js": "^3.1.3",
-        "emojis-list": "^2.0.0",
-        "json5": "^0.5.0",
-        "object-assign": "^4.0.1"
+        "big.js": "3.2.0",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1",
+        "object-assign": "4.1.1"
       }
     },
     "lodash": {
@@ -4309,8 +4530,8 @@
       "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
       "dev": true,
       "requires": {
-        "readable-stream": "~1.0.2",
-        "semver": "~4.3.3"
+        "readable-stream": "1.0.34",
+        "semver": "4.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -4325,10 +4546,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "string_decoder": {
@@ -4355,7 +4576,7 @@
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
       "requires": {
-        "js-tokens": "^3.0.0"
+        "js-tokens": "3.0.2"
       }
     },
     "lru-cache": {
@@ -4364,14 +4585,27 @@
       "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
       "dev": true
     },
+    "matrix-js-sdk": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.4.tgz",
+      "integrity": "sha512-jmO08eml0mr+us2Xs9F9UD2U6gX/MVD20QEqrEt3p+cuZ043OEWCg6Ko8mR65P/JteqjXMz+TXOMmfcxLwCLFA==",
+      "requires": {
+        "another-json": "0.2.0",
+        "babel-runtime": "6.26.0",
+        "bluebird": "3.5.1",
+        "browser-request": "0.3.3",
+        "content-type": "1.0.4",
+        "request": "2.87.0"
+      }
+    },
     "matrix-mock-request": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/matrix-mock-request/-/matrix-mock-request-1.2.1.tgz",
       "integrity": "sha1-2aWrqNPYJG6I/3YyWYuZwUE/QjI=",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.0",
-        "expect": "^1.20.2"
+        "bluebird": "3.5.1",
+        "expect": "1.20.2"
       }
     },
     "matrix-react-test-utils": {
@@ -4380,8 +4614,8 @@
       "integrity": "sha1-tUiETQ6+M46hucjxZHTDDRfDvfQ=",
       "dev": true,
       "requires": {
-        "react": "^15.6.1",
-        "react-dom": "^15.6.1"
+        "react": "15.6.2",
+        "react-dom": "15.6.2"
       }
     },
     "mdurl": {
@@ -4406,8 +4640,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "errno": "0.1.4",
+        "readable-stream": "2.3.3"
       }
     },
     "micromatch": {
@@ -4416,19 +4650,19 @@
       "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
       "dev": true,
       "requires": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.4"
       }
     },
     "mime": {
@@ -4440,16 +4674,14 @@
     "mime-db": {
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-      "dev": true
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
     },
     "mime-types": {
       "version": "2.1.17",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "dev": true,
       "requires": {
-        "mime-db": "~1.30.0"
+        "mime-db": "1.30.0"
       }
     },
     "minimatch": {
@@ -4457,7 +4689,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "1.1.8"
       }
     },
     "minimist": {
@@ -4522,12 +4754,12 @@
           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "growl": {
@@ -4548,7 +4780,7 @@
           "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^2.0.0"
+            "has-flag": "2.0.0"
           }
         }
       }
@@ -4590,11 +4822,11 @@
       "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==",
       "dev": true,
       "requires": {
-        "@sinonjs/formatio": "^2.0.0",
-        "just-extend": "^1.1.27",
-        "lolex": "^2.3.2",
-        "path-to-regexp": "^1.7.0",
-        "text-encoding": "^0.6.4"
+        "@sinonjs/formatio": "2.0.0",
+        "just-extend": "1.1.27",
+        "lolex": "2.6.0",
+        "path-to-regexp": "1.7.0",
+        "text-encoding": "0.6.4"
       },
       "dependencies": {
         "lolex": {
@@ -4610,8 +4842,8 @@
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
       "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
       "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
+        "encoding": "0.1.12",
+        "is-stream": "1.1.0"
       }
     },
     "node-libs-browser": {
@@ -4620,28 +4852,28 @@
       "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
       "dev": true,
       "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.1.4",
-        "buffer": "^4.9.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
+        "assert": "1.4.1",
+        "browserify-zlib": "0.1.4",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
         "crypto-browserify": "3.3.0",
-        "domain-browser": "^1.1.1",
-        "events": "^1.0.0",
+        "domain-browser": "1.1.7",
+        "events": "1.1.1",
         "https-browserify": "0.0.1",
-        "os-browserify": "^0.2.0",
+        "os-browserify": "0.2.1",
         "path-browserify": "0.0.0",
-        "process": "^0.11.0",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.0.5",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.3.1",
-        "string_decoder": "^0.10.25",
-        "timers-browserify": "^2.0.2",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.3",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.7.2",
+        "string_decoder": "0.10.31",
+        "timers-browserify": "2.0.4",
         "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.10.3",
+        "url": "0.11.0",
+        "util": "0.10.3",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
@@ -4659,7 +4891,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "^1.0.1"
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "null-check": {
@@ -4674,6 +4906,11 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true
     },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -4703,10 +4940,10 @@
       "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.6.1",
-        "function-bind": "^1.1.0",
-        "has": "^1.0.1"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.9.0",
+        "function-bind": "1.1.1",
+        "has": "1.0.1"
       }
     },
     "object.omit": {
@@ -4715,8 +4952,8 @@
       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
       "dev": true,
       "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
       }
     },
     "on-finished": {
@@ -4733,7 +4970,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
-        "wrappy": "1"
+        "wrappy": "1.0.2"
       }
     },
     "onetime": {
@@ -4747,8 +4984,8 @@
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
+        "minimist": "0.0.10",
+        "wordwrap": "0.0.3"
       },
       "dependencies": {
         "minimist": {
@@ -4764,12 +5001,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
       },
       "dependencies": {
         "wordwrap": {
@@ -4810,9 +5047,9 @@
       "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.4",
-        "mkdirp": "^0.5.1",
-        "object-assign": "^4.1.0"
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "object-assign": "4.1.1"
       }
     },
     "pako": {
@@ -4832,10 +5069,10 @@
       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
       "dev": true,
       "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
       }
     },
     "parsejson": {
@@ -4844,7 +5081,7 @@
       "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseqs": {
@@ -4853,7 +5090,7 @@
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseuri": {
@@ -4862,7 +5099,7 @@
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseurl": {
@@ -4883,7 +5120,7 @@
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
       "dev": true,
       "requires": {
-        "pinkie-promise": "^2.0.0"
+        "pinkie-promise": "2.0.1"
       }
     },
     "path-is-absolute": {
@@ -4949,7 +5186,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "^2.0.0"
+        "pinkie": "2.0.4"
       }
     },
     "pkg-dir": {
@@ -4958,7 +5195,7 @@
       "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0"
+        "find-up": "1.1.2"
       }
     },
     "pluralize": {
@@ -5012,7 +5249,7 @@
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "requires": {
-        "asap": "~2.0.3"
+        "asap": "2.0.6"
       }
     },
     "prop-types": {
@@ -5020,9 +5257,9 @@
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
       "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
       "requires": {
-        "fbjs": "^0.8.16",
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1"
       }
     },
     "prr": {
@@ -5034,8 +5271,7 @@
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qjobs": {
       "version": "1.1.5",
@@ -5043,11 +5279,23 @@
       "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=",
       "dev": true
     },
+    "qr.js": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz",
+      "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
+    },
+    "qrcode-react": {
+      "version": "0.1.16",
+      "resolved": "https://registry.npmjs.org/qrcode-react/-/qrcode-react-0.1.16.tgz",
+      "integrity": "sha512-FK+QCfFqCQMSxUE1byzglERJQkwKqXYvYMCS+/Ad2zACJOfoHkHHtRqsQQPji7lfb1y1qCXLvL+3eP1hAfg8Ng==",
+      "requires": {
+        "qr.js": "0.0.0"
+      }
+    },
     "qs": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-      "dev": true
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
     },
     "querystring": {
       "version": "0.2.0",
@@ -5065,7 +5313,7 @@
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
       "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
       "requires": {
-        "performance-now": "^2.1.0"
+        "performance-now": "2.1.0"
       }
     },
     "raf-schd": {
@@ -5079,8 +5327,8 @@
       "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -5089,7 +5337,7 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -5098,7 +5346,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.5"
               }
             }
           }
@@ -5109,7 +5357,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.5"
           }
         }
       }
@@ -5137,11 +5385,11 @@
       "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
       "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
       "requires": {
-        "create-react-class": "^15.6.0",
-        "fbjs": "^0.8.9",
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.0",
-        "prop-types": "^15.5.10"
+        "create-react-class": "15.6.2",
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "prop-types": "15.6.0"
       }
     },
     "react-addons-css-transition-group": {
@@ -5160,16 +5408,16 @@
       "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz",
       "integrity": "sha512-d73RMu4QOFCyjUELLWFyY/EuclnfqulI9pECx+2gIuJvV0ycf1uR88o+1x0RSB9ILD70inHMzCBKNkWVbbt+vA==",
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "invariant": "^2.2.2",
-        "memoize-one": "^3.0.1",
-        "prop-types": "^15.6.0",
-        "raf-schd": "^2.1.0",
-        "react-motion": "^0.5.2",
-        "react-redux": "^5.0.6",
-        "redux": "^3.7.2",
-        "redux-thunk": "^2.2.0",
-        "reselect": "^3.0.1"
+        "babel-runtime": "6.26.0",
+        "invariant": "2.2.2",
+        "memoize-one": "3.1.1",
+        "prop-types": "15.6.0",
+        "raf-schd": "2.1.1",
+        "react-motion": "0.5.2",
+        "react-redux": "5.0.7",
+        "redux": "3.7.2",
+        "redux-thunk": "2.2.0",
+        "reselect": "3.0.1"
       }
     },
     "react-dom": {
@@ -5177,10 +5425,16 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
       "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
       "requires": {
-        "fbjs": "^0.8.9",
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.0",
-        "prop-types": "^15.5.10"
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "prop-types": "15.6.0"
+      }
+    },
+    "react-gemini-scrollbar": {
+      "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
+      "requires": {
+        "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
       }
     },
     "react-motion": {
@@ -5188,9 +5442,9 @@
       "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
       "integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==",
       "requires": {
-        "performance-now": "^0.2.0",
-        "prop-types": "^15.5.8",
-        "raf": "^3.1.0"
+        "performance-now": "0.2.0",
+        "prop-types": "15.6.0",
+        "raf": "3.4.0"
       },
       "dependencies": {
         "performance-now": {
@@ -5205,12 +5459,12 @@
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
       "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
       "requires": {
-        "hoist-non-react-statics": "^2.5.0",
-        "invariant": "^2.0.0",
-        "lodash": "^4.17.5",
-        "lodash-es": "^4.17.5",
-        "loose-envify": "^1.1.0",
-        "prop-types": "^15.6.0"
+        "hoist-non-react-statics": "2.5.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.10",
+        "lodash-es": "4.17.10",
+        "loose-envify": "1.3.1",
+        "prop-types": "15.6.0"
       },
       "dependencies": {
         "lodash": {
@@ -5225,13 +5479,13 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
       "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~1.0.6",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.0.3",
-        "util-deprecate": "~1.0.1"
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
       }
     },
     "readdirp": {
@@ -5240,10 +5494,10 @@
       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "readable-stream": "^2.0.2",
-        "set-immediate-shim": "^1.0.1"
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.3",
+        "set-immediate-shim": "1.0.1"
       }
     },
     "readline2": {
@@ -5252,8 +5506,8 @@
       "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
         "mute-stream": "0.0.5"
       }
     },
@@ -5263,7 +5517,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.4.0"
       }
     },
     "redux": {
@@ -5271,10 +5525,10 @@
       "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
       "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
       "requires": {
-        "lodash": "^4.2.1",
-        "lodash-es": "^4.2.1",
-        "loose-envify": "^1.1.0",
-        "symbol-observable": "^1.0.3"
+        "lodash": "4.17.4",
+        "lodash-es": "4.17.10",
+        "loose-envify": "1.3.1",
+        "symbol-observable": "1.2.0"
       }
     },
     "redux-thunk": {
@@ -5299,9 +5553,9 @@
       "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.18.0",
-        "babel-types": "^6.19.0",
-        "private": "^0.1.6"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "private": "0.1.8"
       }
     },
     "regex-cache": {
@@ -5310,7 +5564,7 @@
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "^0.1.3"
+        "is-equal-shallow": "0.1.3"
       }
     },
     "regexp-quote": {
@@ -5324,9 +5578,9 @@
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
       "dev": true,
       "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
+        "regenerate": "1.3.3",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
       }
     },
     "regjsgen": {
@@ -5341,7 +5595,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "~0.5.0"
+        "jsesc": "0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -5376,7 +5630,34 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "^1.0.0"
+        "is-finite": "1.0.2"
+      }
+    },
+    "request": {
+      "version": "2.87.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+      "requires": {
+        "aws-sign2": "0.7.0",
+        "aws4": "1.7.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.6",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.2",
+        "har-validator": "5.0.3",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
+        "safe-buffer": "5.1.1",
+        "tough-cookie": "2.3.4",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.3.0"
       }
     },
     "require-json": {
@@ -5391,8 +5672,8 @@
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
       "dev": true,
       "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
+        "caller-path": "0.1.0",
+        "resolve-from": "1.0.1"
       }
     },
     "requires-port": {
@@ -5412,7 +5693,7 @@
       "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
       "dev": true,
       "requires": {
-        "path-parse": "^1.0.5"
+        "path-parse": "1.0.5"
       }
     },
     "resolve-from": {
@@ -5427,8 +5708,8 @@
       "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
       "dev": true,
       "requires": {
-        "exit-hook": "^1.0.0",
-        "onetime": "^1.0.0"
+        "exit-hook": "1.1.1",
+        "onetime": "1.1.0"
       }
     },
     "right-align": {
@@ -5437,7 +5718,7 @@
       "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
       "dev": true,
       "requires": {
-        "align-text": "^0.1.1"
+        "align-text": "0.1.4"
       }
     },
     "rimraf": {
@@ -5446,7 +5727,7 @@
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "7.1.2"
       },
       "dependencies": {
         "glob": {
@@ -5455,12 +5736,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         }
       }
@@ -5477,7 +5758,7 @@
       "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
       "dev": true,
       "requires": {
-        "once": "^1.3.0"
+        "once": "1.4.0"
       }
     },
     "rx-lite": {
@@ -5491,6 +5772,11 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
     "samsam": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
@@ -5502,9 +5788,9 @@
       "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz",
       "integrity": "sha1-cw/6Ikm98YMz7/5FsoYXPJxa0Lg=",
       "requires": {
-        "htmlparser2": "^3.9.0",
+        "htmlparser2": "3.9.2",
         "regexp-quote": "0.0.0",
-        "xtend": "^4.0.0"
+        "xtend": "4.0.1"
       }
     },
     "semver": {
@@ -5542,9 +5828,9 @@
       "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
+        "glob": "7.1.2",
+        "interpret": "1.0.4",
+        "rechoir": "0.6.2"
       },
       "dependencies": {
         "glob": {
@@ -5553,12 +5839,12 @@
           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         }
       }
@@ -5569,13 +5855,13 @@
       "integrity": "sha512-GvNLrwpvLZ8jIMZBUhHGUZDq5wlUdceJWyHvZDmqBxnjazpxY1L0FNbGBX6VpcOEoQ8Q4XMWFzm2myJMvx+VjA==",
       "dev": true,
       "requires": {
-        "@sinonjs/formatio": "^2.0.0",
-        "diff": "^3.1.0",
-        "lodash.get": "^4.4.2",
-        "lolex": "^2.2.0",
-        "nise": "^1.2.0",
-        "supports-color": "^5.1.0",
-        "type-detect": "^4.0.5"
+        "@sinonjs/formatio": "2.0.0",
+        "diff": "3.5.0",
+        "lodash.get": "4.4.2",
+        "lolex": "2.6.0",
+        "nise": "1.3.3",
+        "supports-color": "5.4.0",
+        "type-detect": "4.0.8"
       },
       "dependencies": {
         "has-flag": {
@@ -5596,7 +5882,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5773,9 +6059,9 @@
       "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==",
       "dev": true,
       "requires": {
-        "async": "^2.5.0",
-        "loader-utils": "~0.2.2",
-        "source-map": "~0.6.1"
+        "async": "2.6.0",
+        "loader-utils": "0.2.17",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "async": {
@@ -5784,7 +6070,7 @@
           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
           "dev": true,
           "requires": {
-            "lodash": "^4.14.0"
+            "lodash": "4.17.4"
           }
         },
         "source-map": {
@@ -5801,7 +6087,7 @@
       "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
-        "source-map": "^0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "sprintf-js": {
@@ -5809,6 +6095,22 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
       "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
     },
+    "sshpk": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
+      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2",
+        "tweetnacl": "0.14.5"
+      }
+    },
     "statuses": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -5821,8 +6123,8 @@
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
       }
     },
     "stream-http": {
@@ -5831,11 +6133,11 @@
       "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.2.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
       }
     },
     "string-width": {
@@ -5844,9 +6146,9 @@
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
       }
     },
     "string.prototype.repeat": {
@@ -5859,7 +6161,7 @@
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
       "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "5.1.1"
       }
     },
     "strip-ansi": {
@@ -5868,7 +6170,7 @@
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "strip-bom": {
@@ -5905,12 +6207,12 @@
       "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
       "dev": true,
       "requires": {
-        "ajv": "^4.7.0",
-        "ajv-keywords": "^1.0.0",
-        "chalk": "^1.1.1",
-        "lodash": "^4.0.0",
+        "ajv": "4.11.8",
+        "ajv-keywords": "1.5.1",
+        "chalk": "1.1.3",
+        "lodash": "4.17.4",
         "slice-ansi": "0.0.4",
-        "string-width": "^2.0.0"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ajv": {
@@ -5919,8 +6221,8 @@
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
         "ansi-regex": {
@@ -5941,8 +6243,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
           }
         },
         "strip-ansi": {
@@ -5951,7 +6253,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -5997,7 +6299,7 @@
       "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
       "dev": true,
       "requires": {
-        "setimmediate": "^1.0.4"
+        "setimmediate": "1.0.5"
       }
     },
     "tmatch": {
@@ -6012,7 +6314,7 @@
       "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.1"
+        "os-tmpdir": "1.0.2"
       }
     },
     "to-array": {
@@ -6033,6 +6335,14 @@
       "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
       "dev": true
     },
+    "tough-cookie": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -6051,13 +6361,27 @@
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "1.1.2"
       }
     },
     "type-detect": {
@@ -6073,7 +6397,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.15"
+        "mime-types": "2.1.17"
       }
     },
     "typedarray": {
@@ -6093,10 +6417,10 @@
       "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
       "dev": true,
       "requires": {
-        "async": "~0.2.6",
-        "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.10.0"
+        "async": "0.2.10",
+        "source-map": "0.5.7",
+        "uglify-to-browserify": "1.0.2",
+        "yargs": "3.10.0"
       },
       "dependencies": {
         "async": {
@@ -6153,8 +6477,8 @@
       "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
       "dev": true,
       "requires": {
-        "lru-cache": "2.2.x",
-        "tmp": "0.0.x"
+        "lru-cache": "2.2.4",
+        "tmp": "0.0.31"
       }
     },
     "util": {
@@ -6185,13 +6509,34 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
       "dev": true
     },
+    "uuid": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz",
+      "integrity": "sha512-ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="
+    },
     "v8flags": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
       "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
       "dev": true,
       "requires": {
-        "user-home": "^1.1.1"
+        "user-home": "1.1.1"
+      }
+    },
+    "velocity-vector": {
+      "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
+      "requires": {
+        "jquery": "3.2.1"
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
       }
     },
     "vm-browserify": {
@@ -6215,7 +6560,7 @@
       "integrity": "sha1-MbTbZnjyrgHDnqn7hyWpAx5Vins=",
       "dev": true,
       "requires": {
-        "foreachasync": "^3.0.0"
+        "foreachasync": "3.0.0"
       }
     },
     "watchpack": {
@@ -6224,9 +6569,9 @@
       "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
       "dev": true,
       "requires": {
-        "async": "^0.9.0",
-        "chokidar": "^1.0.0",
-        "graceful-fs": "^4.1.2"
+        "async": "0.9.2",
+        "chokidar": "1.7.0",
+        "graceful-fs": "4.1.11"
       }
     },
     "webpack": {
@@ -6235,21 +6580,21 @@
       "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
       "dev": true,
       "requires": {
-        "acorn": "^3.0.0",
-        "async": "^1.3.0",
-        "clone": "^1.0.2",
-        "enhanced-resolve": "~0.9.0",
-        "interpret": "^0.6.4",
-        "loader-utils": "^0.2.11",
-        "memory-fs": "~0.3.0",
-        "mkdirp": "~0.5.0",
-        "node-libs-browser": "^0.7.0",
-        "optimist": "~0.6.0",
-        "supports-color": "^3.1.0",
-        "tapable": "~0.1.8",
-        "uglify-js": "~2.7.3",
-        "watchpack": "^0.2.1",
-        "webpack-core": "~0.6.9"
+        "acorn": "3.3.0",
+        "async": "1.5.2",
+        "clone": "1.0.2",
+        "enhanced-resolve": "0.9.1",
+        "interpret": "0.6.6",
+        "loader-utils": "0.2.17",
+        "memory-fs": "0.3.0",
+        "mkdirp": "0.5.1",
+        "node-libs-browser": "0.7.0",
+        "optimist": "0.6.1",
+        "supports-color": "3.2.3",
+        "tapable": "0.1.10",
+        "uglify-js": "2.7.5",
+        "watchpack": "0.2.9",
+        "webpack-core": "0.6.9"
       },
       "dependencies": {
         "acorn": {
@@ -6276,8 +6621,8 @@
           "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
           "dev": true,
           "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
+            "errno": "0.1.4",
+            "readable-stream": "2.3.3"
           }
         },
         "supports-color": {
@@ -6286,7 +6631,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -6297,8 +6642,8 @@
       "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
       "dev": true,
       "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
+        "source-list-map": "0.1.8",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-map": {
@@ -6307,7 +6652,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -6318,11 +6663,11 @@
       "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
       "dev": true,
       "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^1.3.4",
-        "path-is-absolute": "^1.0.0",
-        "range-parser": "^1.0.3",
-        "time-stamp": "^2.0.0"
+        "memory-fs": "0.4.1",
+        "mime": "1.4.1",
+        "path-is-absolute": "1.0.1",
+        "range-parser": "1.2.0",
+        "time-stamp": "2.0.0"
       }
     },
     "whatwg-fetch": {
@@ -6336,7 +6681,7 @@
       "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "isexe": "2.0.0"
       }
     },
     "window-size": {
@@ -6361,7 +6706,7 @@
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1"
+        "mkdirp": "0.5.1"
       }
     },
     "ws": {
@@ -6370,8 +6715,8 @@
       "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
       "dev": true,
       "requires": {
-        "options": ">=0.0.5",
-        "ultron": "1.0.x"
+        "options": "0.0.6",
+        "ultron": "1.0.2"
       }
     },
     "wtf-8": {
@@ -6386,7 +6731,7 @@
       "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
       "dev": true,
       "requires": {
-        "lodash": "^3.5.0"
+        "lodash": "3.10.1"
       },
       "dependencies": {
         "lodash": {
@@ -6414,9 +6759,9 @@
       "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
       "dev": true,
       "requires": {
-        "camelcase": "^1.0.2",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
+        "camelcase": "1.2.1",
+        "cliui": "2.1.0",
+        "decamelize": "1.2.0",
         "window-size": "0.1.0"
       }
     },

From 7ab229cd4d7eca4579e570f92daa2ea88f9d6603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 26 Jun 2018 20:59:21 +0000
Subject: [PATCH 480/702] Translated using Weblate (Slovak)

Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 633734acfc..9043f86686 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -775,8 +775,8 @@
     "No media permissions": "Žiadne oprávnenia k médiám",
     "You may need to manually permit Riot to access your microphone/webcam": "Mali by ste aplikácii Riot ručne udeliť právo pristupovať k mikrofónu a kamere",
     "Missing Media Permissions, click here to request.": "Kliknutím sem vyžiadate chýbajúce oprávnenia na prístup k mediálnym zariadeniam.",
-    "No Microphones detected": "Neboli nájdené žiadne mikrofóny",
-    "No Webcams detected": "Neboli nájdené žiadne kamery",
+    "No Microphones detected": "Neboli rozpoznané žiadne mikrofóny",
+    "No Webcams detected": "Neboli rozpoznané žiadne kamery",
     "Default Device": "Predvolené zariadenie",
     "Microphone": "Mikrofón",
     "Camera": "Kamera",
@@ -1181,25 +1181,25 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
     "Review terms and conditions": "Prečítať zmluvné podmienky",
     "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť",
-    "Encrypting": "Enkriptovanie",
-    "Encrypted, not sent": "Zakódované, ale neposlané",
-    "Share Link to User": "Pošli link užívateľovi",
+    "Encrypting": "Šifrovanie",
+    "Encrypted, not sent": "Zašifrované, ale neodoslané",
+    "Share Link to User": "Zdieľať odkaz na používateľa",
     "Share room": "Zdieľaj miestnosť",
-    "Share Room": "Zdieľaj miestnosť",
-    "Link to most recent message": "Link na najnovšiu správu",
-    "Share User": "Zdieľaj užívateľa",
-    "Share Community": "Zdieľaj komunitu",
-    "Link to selected message": "Link na vybranú správu",
-    "COPY": "Kopíruj",
+    "Share Room": "Zdieľať miestnosť",
+    "Link to most recent message": "Odkaz na najnovšiu správu",
+    "Share User": "Zdieľať používateľa",
+    "Share Community": "Zdieľať komunitu",
+    "Link to selected message": "Odkaz na vybratú správu",
+    "COPY": "Kopírovať",
     "Share Message": "Zdieľaj správu",
     "No Audio Outputs detected": "Neboli rozpoznané žiadne zvukové výstupy",
-    "Audio Output": "Zvukový výstup",
-    "Try the app first": "Najskôr aplikáciu vyskúšaj",
-    "Share Room Message": "Správa o zdieľaní miestnosti",
-    "The email field must not be blank.": "Položka emailu nemôže byť prázdna.",
-    "The user name field must not be blank.": "Položka užívateľovej prezývky nemôže byť prázdna.",
-    "The phone number field must not be blank.": "Telefonné číslo nemôže ostať nevyplnené.",
-    "The password field must not be blank.": "Položka s heslom nemôže ostať nevyplnená.",
+    "Audio Output": "Výstup zvuku",
+    "Try the app first": "Vyskúšať si aplikáciu",
+    "Share Room Message": "Zdieľať správu z miestnosti",
+    "The email field must not be blank.": "Email nemôže ostať prázdny.",
+    "The user name field must not be blank.": "Používateľské meno nemôže ostať prázdne.",
+    "The phone number field must not be blank.": "Telefónne číslo nemôže ostať prázdne.",
+    "The password field must not be blank.": "Heslo nemôže ostať prázdne.",
     "Jitsi Conference Calling": "Konferenčné hovory Jitsi",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Náhľady URL adries sú v šifrovaných miestnostiach ako je táto predvolene zakázané, aby ste si mohli byť istí, že obsah odkazov z vašej konverzácii nebude zaznamenaný na vašom domovskom serveri počas ich generovania.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ak niekto vo svojej správe pošle URL adresu, môže byť zobrazený jej náhľad obsahujúci názov, popis a obrázok z cieľovej web stránky.",

From 483edb821106bda1579dbf44bd556ffe4acbaacb Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 27 Jun 2018 10:31:51 +0100
Subject: [PATCH 481/702] `pathname` is not constant

---
 src/Analytics.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 41eaca0f63..fbc8fb79c8 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -42,7 +42,8 @@ function getRedactedHash(hash) {
 // Return the current origin, path and hash separated with a `/`. This does
 // not include query parameters.
 function getRedactedUrl() {
-    const { origin, pathname, hash } = window.location;
+    const { origin, hash } = window.location;
+    let { pathname } = window.location;
 
     // Redact paths which could contain unexpected PII
     if (origin.startsWith('file://')) {

From 6345fcb8f2d1770aa64f3e88c8700ce928117cd3 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 27 Jun 2018 11:31:55 +0100
Subject: [PATCH 482/702] Fix incorrectly positioned copy button on `<pre>`
 blocks

---
 res/css/views/rooms/_EventTile.scss          |  9 +++++++--
 src/components/views/messages/TextualBody.js | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 80d2cd3418..d95ed2ded0 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -400,6 +400,12 @@ limitations under the License.
     color: #333;
 }
 
+.mx_EventTile_pre_container {
+    // For correct positioning of _copyButton (See TextualBody)
+    position: relative;
+}
+
+// Inserted adjacent to <pre> blocks, (See TextualBody)
 .mx_EventTile_copyButton {
     position: absolute;
     display: inline-block;
@@ -413,7 +419,6 @@ limitations under the License.
 }
 
 .mx_EventTile_body pre {
-    position: relative;
     border: 1px solid transparent;
 }
 
@@ -422,7 +427,7 @@ limitations under the License.
     border: 1px solid #e5e5e5; // deliberate constant as we're behind an invert filter
 }
 
-.mx_EventTile_body pre:hover .mx_EventTile_copyButton
+.mx_EventTile_body .mx_EventTile_pre_container:hover .mx_EventTile_copyButton
 {
     visibility: visible;
 }
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 20cf2b69f4..2e5fe2aabc 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -340,7 +340,18 @@ module.exports = React.createClass({
                 }, false);
                 e.target.onmouseleave = close;
             };
-            p.appendChild(button);
+
+            // Wrap a div around <pre> so that the copy button can be correctly positioned
+            // when the <pre> overflows and is scrolled horizontally.
+            const div = document.createElement("div");
+            div.className = "mx_EventTile_pre_container";
+
+            // Insert containing div in place of <pre> block
+            p.parentNode.replaceChild(div, p);
+
+            // Append <pre> block and copy button to container
+            div.appendChild(p);
+            div.appendChild(button);
         });
     },
 

From 55f4f1723d76287b0d6764a9f641e9b17e60f2d8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 Jun 2018 11:44:11 +0100
Subject: [PATCH 483/702] fix nullguard on EventTile, getComponent never
 returns falsey, it throws

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/EventTile.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 7f376502d7..9b8aae9726 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -484,12 +484,14 @@ module.exports = withMatrixClient(React.createClass({
         // Info messages are basically information about commands processed on a room
         const isInfoMessage = (eventType !== 'm.room.message' && eventType !== 'm.sticker');
 
-        const EventTileType = sdk.getComponent(getHandlerTile(this.props.mxEvent));
+        const tileHandler = getHandlerTile(this.props.mxEvent);
         // This shouldn't happen: the caller should check we support this type
         // before trying to instantiate us
-        if (!EventTileType) {
-            throw new Error("Event type not supported");
+        if (!tileHandler) {
+            const {mxEvent} = this.props;
+            throw new Error(`Event type not supported: type:${mxEvent.getType()} isState:${mxEvent.isState()}`);
         }
+        const EventTileType = sdk.getComponent(tileHandler);
 
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
         const isRedacted = isMessageEvent(this.props.mxEvent) && this.props.isRedacted;

From 8be173cae357931edd6d4561ce3e2241915d2648 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 27 Jun 2018 15:08:56 +0100
Subject: [PATCH 484/702] Show nicer error when receiving a consent error after
 sending a message

---
 src/components/structures/RoomStatusBar.js | 21 ++++++++++++++++++++-
 src/i18n/strings/en_EN.json                |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 36f4719abb..e6e0fa70f0 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -308,7 +308,26 @@ module.exports = React.createClass({
                 },
             );
         } else {
-            if (
+            let consentError = null;
+            for (const m of unsentMessages) {
+                if (m.error && m.error.errcode === 'M_CONSENT_NOT_GIVEN') {
+                    consentError = m.error;
+                    break;
+                }
+            }
+            if (consentError) {
+                title = _t(
+                    "You can't send any messages until you review and agree to " +
+                    "<consentLink>our terms and conditions</consentLink>.",
+                    {},
+                    {
+                        'consentLink': (sub) =>
+                            <a href={consentError.data && consentError.data.consent_uri} target="_blank">
+                                { sub }
+                            </a>,
+                    },
+                );
+            } else if (
                 unsentMessages.length === 1 &&
                 unsentMessages[0].error &&
                 unsentMessages[0].error.data &&
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b18d167ea4..7717d45aa5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1030,6 +1030,7 @@
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.",
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",

From 66002a4c0061b7b58d1309f937b1dd9ba2064550 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 27 Jun 2018 15:19:27 +0100
Subject: [PATCH 485/702] Fix status bar element positioning

---
 res/css/structures/_RoomStatusBar.scss     |  3 +++
 src/components/structures/RoomStatusBar.js | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/res/css/structures/_RoomStatusBar.scss b/res/css/structures/_RoomStatusBar.scss
index ca7431eac2..2a9cc9f6c7 100644
--- a/res/css/structures/_RoomStatusBar.scss
+++ b/res/css/structures/_RoomStatusBar.scss
@@ -113,6 +113,8 @@ limitations under the License.
 }
 
 .mx_RoomStatusBar_connectionLostBar {
+    display: flex;
+
     margin-top: 19px;
     min-height: 58px;
 }
@@ -132,6 +134,7 @@ limitations under the License.
     color: $primary-fg-color;
     font-size: 13px;
     opacity: 0.5;
+    padding-bottom: 20px;
 }
 
 .mx_RoomStatusBar_resend_link {
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index e6e0fa70f0..d1dc8d3c12 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -351,11 +351,13 @@ module.exports = React.createClass({
 
         return <div className="mx_RoomStatusBar_connectionLostBar">
             <img src="img/warning.svg" width="24" height="23" title={_t("Warning")} alt={_t("Warning")} />
-            <div className="mx_RoomStatusBar_connectionLostBar_title">
-                { title }
-            </div>
-            <div className="mx_RoomStatusBar_connectionLostBar_desc">
-                { content }
+            <div>
+                <div className="mx_RoomStatusBar_connectionLostBar_title">
+                    { title }
+                </div>
+                <div className="mx_RoomStatusBar_connectionLostBar_desc">
+                    { content }
+                </div>
             </div>
         </div>;
     },

From 239b973df37f75d8224e9875d2d23a6d445e5994 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 27 Jun 2018 11:42:29 +0000
Subject: [PATCH 486/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1205 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 0ec001a138..1416921ea0 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1198,5 +1198,10 @@
     "The email field must not be blank.": "Поле email не должно быть пустым.",
     "The user name field must not be blank.": "Поле имени пользователя не должно быть пустым.",
     "The phone number field must not be blank.": "Поле номера телефона не должно быть пустым.",
-    "The password field must not be blank.": "Поле пароля не должно быть пустым."
+    "The password field must not be blank.": "Поле пароля не должно быть пустым.",
+    "Call in Progress": "Выполнение вызова",
+    "A call is already in progress!": "Вызов выполняется!",
+    "You have no historical rooms": "У вас нет архивных комнат",
+    "Share Room Message": "Обмен сообщениями в комнате",
+    "Share Message": "Обмен сообщениями"
 }

From b5266f0f51033a13fe3e5114db9965b4305f24e4 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 27 Jun 2018 16:05:26 +0000
Subject: [PATCH 487/702] Translated using Weblate (German)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1570c5c285..b4e244f542 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1202,5 +1202,9 @@
     "The email field must not be blank.": "Das E-Mail-Feld darf nicht leer sein.",
     "The user name field must not be blank.": "Das Benutzername-Feld darf nicht leer sein.",
     "The phone number field must not be blank.": "Das Telefonnummern-Feld darf nicht leer sein.",
-    "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein."
+    "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein.",
+    "Call in Progress": "Gespräch läuft",
+    "A call is already in progress!": "Ein Gespräch läuft bereits!",
+    "You have no historical rooms": "Du hast keine historischen Räume",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kannst keine Nachrichten senden bis du die <consentLink>unsere Geschläftsbedingungen</consentLink> gelesen und akzeptiert hast."
 }

From 7bce29db6e41cfdb7655481732617b3d824a9224 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 27 Jun 2018 17:17:44 +0100
Subject: [PATCH 488/702] Replace share icons

with ones that look a bit more like the actual logos those sites use now
---
 res/img/social/facebook.png  | Bin 1201 -> 1604 bytes
 res/img/social/linkedin.png  | Bin 1366 -> 1624 bytes
 res/img/social/reddit.png    | Bin 2279 -> 1559 bytes
 res/img/social/twitter-2.png | Bin 1519 -> 2026 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/img/social/facebook.png b/res/img/social/facebook.png
index 6a29e3820aa997e5bc06d42995891ce570defd25..457ef761a146c8cdf29ab13dc432aa1aceb1390d 100644
GIT binary patch
delta 1587
zcmV-32F&@f3B(MLB!32COGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc
z00(qQO+^Rd1{)9u1|<Zgl>h(*(Md!>RCwCun}29kWf;dl_uRYPZK=5$YPfKvK@JoJ
zQ$izlXiy>VAEiMgs7W0)&`8=JAq6h59E1f0FM`@Yip+lw6@OUpP6Dme2t!b)#mZSu
zb8KzSyL<0Br$5fQ^KRbVd$!%Pdw1^_#>US3zUMsO_j%s;eSW+l0)TFqC@E5Z&jNH{
zHLw(D03HD50##m@7|;(~1G<3Az*(R}NzpfU%zPpg5CO}9Ex<;geu~5O0LOuLCB?a-
zCO|jL*MSyqhJS-VFVF@YP*T|W(27u=1aAfQGQIc!Xi-vFQyD~?tc`oWx9NtNEP(I;
zZvaW%Fn6VY)3j)SZkTm|0+vx6_#J3cQgjEV0co@T9B`wEga=pxT+t14>qNCd^DDfP
z0^KkV0w*Y59M%o<Q}0{zV*+Wye*-+j%)n_S#X3K`M1RPq@ZSSZ6iOP$f#HNjv@*=%
zg>$HzTSZkgjN?EeX%kOa+#a?V7)sDTILyty7?l;_3rdO=xkv~V^UT|hLv=L53(bpZ
zUQ^G)dH4A4+q~l|Y{xmHq*$Acgj^bM5ZGM^;S))l9UB^X@##k<)!!ok;FywP(}Wj6
zZ?!Lo@P8E%jnDQ!HEH3;;3eHKU-4}M-s)NBZFL2~7w<Q7|GiaH8Y4{uQg{gH8fyx7
zX@J*26+-ZM!sgwbtEVjdI5?GQ9ndmpz_vmia#lWC$K%WA2Q~a6-7w$uvj)h*%)Z6;
z=Np55%>msoqv?kvErVAVE(8I!v!gUVTstjZWPiFTM8-TUgjWZ^x|I_TAzZmO$c?@j
ziKIR1|5cS?obkKu)D3fwk|H*W056zP5ZJau<6{4_ug+cNy(7Oc6icFMp}V#+$J<J?
z;4R?ou_n+`C;}|o;lcT{e6{`UuYUG^d=|@gh*pNFh-gH{{NxZGV9$sNcniYv0K-_m
zG=HFWcGOqf6Y3ADt0Gf<WsPo_O+bg{EeKl*?Y@OW{$ev-e-GsAm7A3mBPOu1&;&R>
z+r{EmzFxTzK=b1E^~?}BPTq#9(G7EvhMTk~S2St38Jlv&Dh)SXRjyd7;pXbf6%CQ;
z*#DyyVZ@USSeBjfdBSp-Ra4>5&tFqd|9`-6);4{EalZSho3NI1Yh4h*&C&*ns%V7m
z8}j4nZF)9$l<0?Fd-(RpEBFX{*J#{HQ5V53pC5Gh3=-D-<$SbKH0<u{xA1weM8hpk
zC@EaMe#>`T4Yx9*<TSwV$y&oLODR_kxTfLO<dh7CV##s0+f2@-hFg$SQnMcp`+qKb
zxUAt;V+D#(Ftu12@z1|QzPCW&d<5tS`lAMJ$JyO>8r#l%9*8GxT6aFiyxQuVW9>Wi
zGdFr~kNf;)|L{aK;8a9O(We_`4-i;J!m=DLcJ_|@d^m0qkNdOR&hG!{?itL-XT_Bi
zohe;8UWSg)m*7T(0NTrtfOg$5iGO%O(Q~?C_5$~niSP*}#mTY0KwBBj{=rPn(19`{
zpf!~s9U(wTVdIvcmO73qDF#vr(h&kYMq0{%fL-b7@kp8m09d+V?gl<AQQ`L~DF(6z
zM3fXC;nv=k8hVrz?_`PxjDn{gO(jS`Q>OCSNCpi6=++JMW#Dj$2;ZWlxPO%C!MJXd
zlHy2-oDjcOQjB}X$yO+dl43J(dIk%BQAx2rTjh8*4M>r&4!AG_h3`~SEX!3aoi%ch
zM#2i<%nY0PC4S1~bB0dRNLULTn;|y8%<qjdU$LV!5;g&^7Wrzwej?ZDd<V}`11c#F
z;T9hMSxko<pfR=DPvkD)WPej*T}q0EBJmyeDJd2JmnPGBQUs)FLmO^#^^<86_fC<}
zQD9E$cstn}r1?mW4l5~M1FC^mU?@QG6Vb|Wn<w~IV9GUfL0z710yg88qSfSNFmCbr
z{$}duXS@>>#|>b%heDx~X@|7Dd}}12nd(qdbO2j)!(8M!SF5;leJp-K24Z52zCM2*
lI28(oI$h0o?lQrA;D3sSDN|uesSf}E002ovPDHLkV1jm1?;HRC

delta 1181
zcmV;O1Y-Nd46zB2B!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o000C-Nkl<Zc-rJ!Z%9*76hFSrnPr(nLo1X(Gc-TQ!bpTb3JN1X
z6cpBnVq$$z6oW|eWB(8o1u+VwPYPo6A&3M^7>I&UK?7;1k$-|A8OzzoG=<J_XYktQ
z+V<Xkd-MI^#~b?Iz32Siz31L@?|n&i4_<>{WFb!?3z7NA68<|~E&O{8>Ez#ZokqHl
z4&<Up<IIA}wIMGet7Hy`gN2^~*%f4hyh1)lzSFY+X~;UH9a*Gexh2dy$Vp@`@+s1*
zM&XhQWuznTB7bL*?J7GTh$60Img`K9w*c3WQ^<QrD`*ER*Ez*DXfD7Z<QVc92f275
zi)|R=0IP`r6x=={Pk??vwtQgQgbG0YZ;%6?-jK$&b&3#xhN(VeGw2_UY^z1BVbFwp
z!DD)&poT|?YUGB}7SNtx&ihftwkzrac5YIMibnP!rhhI_f$R}7|29c*{OEqL9mxjk
zo*j^rxphpv@o-3Kbv>L{j7B3sF86zj+Rh)y+6^}^l)}D@om#a53;S{mITvXc=o2x)
zp*MZ&N|~0<%O^~Ik;VW!H-FV}^=vWhN==SeJg5j252O%t>^2d#=O4`2WSr3!n6pSB
zqNb3frhlwBM-QWdHE>ju0;ZDnqG~>zYXzO4UOttV3s5IArOn)%suuyQ>}$|4XctwZ
zl#~R?W>eUE{;Y4n;9D0sr@w)F`L}2h$kz^e3$TH}m7Eld>A&|341WU0`#CL~2lmw_
z7vNI7+of}6QR^ye<N}<Dw*aea>snWN+AjbFg?|z-9>`}a2~Y{fMJ0^_g(6DsY(534
zDdwo|55&sqIy7~>5h*~SBuW4^@a3yV_-G)3*o_QDn3?|}x{A#fkS(I*WV7;3r@4h?
z;b}5inJ%JaTJ=$i&+|*71xS-XpKJW^eQ5=L{#p|*fT->9ptZawE#c={6zwVMYYl1v
zUVktyyd;3f=mIPlSb#+mz-3?orb&QF0}J3ZdJAxo01g8S;2;5LDaL8U=I;-Jgb@P@
zFyfyG5&8`%K)+mo34;Yg7yJCr#z?P$1n8CL0)9L;$h6qQz6J?ENl}*p1n80{fKrHm
zy0@|O?!cEUg}9-08w=1H_<}>NTT%ZQ-G7G8kIMUgH~|Q?u)P*ayzCQ1Du8RN2ND#u
zTg`LAtqBf*?_iNCr$$sb?-wh&*%yeW1^CgF;M3%O_5orQfDRg8M-C;R^TTYr;=|Ik
zIA0yE8R-yY>p8X^lnUS%;WGCpy`!6Ljc8XT+Wo5rE?kd8q?c`Lh~^<F#^zOu9Dmo5
z^W$t&)ZH}J9ZdSPwVcP-c;*gnwxOJD0<8p)=hX$s`x>Xx9<H-M={km_(p#V;BM;dE
zVpo=2Tt{B0#3mM)Remdvm}TJmhVMKmKY~L}zXadM(-UedDr$Rtf_WQ!Cs1fgO~=ym
vSr7{ZAI)>}(B<O(?Boni=-%aD0Tu=TqC(z?^D_)000000NkvXXu0mjfT~;BP

diff --git a/res/img/social/linkedin.png b/res/img/social/linkedin.png
index 2b868a585ba59ca2f716f0a21254ccbdb3c95438..4c92adb56be870593394a4b5082e8b55397d8033 100644
GIT binary patch
delta 1607
zcmV-N2Dtgw3fK&gB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Rd1{)9!C<8q}&;S4h<w-<ARCwC$n|o|iRUF4Z_qJsNWGm>B0pk&Q43G>7
z0U-{RM2xgC{KNbc<{$U~k^y4s1H^=cQ4$DC@bQN+h(==wiGP|Di5fSusR_aGP5}kR
zABDkO*~T8-Zrkf0=XNVwAE%>T?^eIbva~z*ob&tccYf#hx(b<w%ToZX0+s>uftf%t
zU<dMzQ30S8XaX7mFK`;D#qDg*<o1*d3B4Ft4^#kCA8|Gxa11z#+j-W!1h_mZupM~Y
z_z!0SO~3)*Ab)OW*c=47JQiRN@E*g9YG4;`XXsHTQHLmW<o71y{0_J97;6TMJ@oHs
zSTw-pnFKT#M$HWH0_C`!{>*ED%d-J!F_G{XducKDmH`6#RsIlg1oPsEu}A46p-2hu
zc7n^}p*Q4MG-D!;(jxM0Dp#62`S#px&@*<S4izVGJAa*hdml0Z#srGXQ(u^GEkE_<
z3d)Kn3>x;<_m}vr{wCNgW+I^hw{vAO5@a;MW6!rbnm=5PRgFJ<Z|y&P@Y7XL74vDr
zkZpj=a|kWu_;us*gu(;7ziKv%OA5_q6C8auA!P!DMXg#;Qpl321yZZ+eYq4uVY87?
zmFRX*;(u8DNyb&jJI_7Ie#bm{$71V`kZ(2P4e>bOA7~E-Yk(Ng5c&96UW$fI*UfrG
zHpDW9Y77n76z$|(Z|Ra=!QZ8UMKLP@^ZVT9xCDs6rY8EUZ_eG8Ug4{=KC@kg15snh
z7*_-K01qADU?|MapRXmIIT+U2;qii^n3({pA%9~GBPine*rBBs;_$jMHm{fw^Ur}`
zn3?-(x!2Ky&WL~|l23@%fbDUI+bnE3ev#FmpXQHS_xrxS+tEYK?~RPzd2%EP|B$TF
z8gNG{lM@V!A6*BF3O3d3Y9BkZ<aSQ(*8q{jlS^Y+RdLUcwZRz6NE9BR*pRvJ2&^~l
zR)2LJv=H<Jp<9DM5PE}#7CzF<>xr`X6-m`zOP+dD#@Pn>L5c!;mzMgoT8Oggb}E;Y
zux4%%)9hmzKgQDMZ=Ao=&KX}DU!V1H;a02A#?(*&Y*UQ9eOscD)i0Ow?hCV$3sLoh
zI2zID*3fI#%0C;{Sva|XFDlAdDj8f|`+v8SSB{+FT61Trd5J<5QM5>ip5QPAI9iC0
zUYg6rZ7ZdP2blZBc&_evo;CA|Qgy{wsfdbA_MwG2ysnJhFU}cy@c-IU%BB>g^2jn3
zlO#7^Up*(Tqm>GN+qfKhrAr0#RYa{W>-c!>Q|XC$$Jto>^c30QGgUHI#!AgePk&=7
z?Tu%q%O+-uRYa9`RAEhNk?b+BTj?)Rn+oUev{QG(PiwbEVZMzGOQte$;1!zyvr6n-
zZ|O`n%zU}4``sGPe)=a~Uz>2d6$NyiZO1Qg_|-+yhH_rfco_mv5yef@c)hdt*Wta_
zArdQ*I73k&&&rnX&U5MR1F5+tPk+dh85U3xof)Qp>*N)YR!g9;hZ-8C=9*@gI@zr%
zqUpdCI9Pu(sVjTxhF@BnWWr(<(UX&P-0*i13IvmmYYS-UT((g~)Yh|(i%k!tGRn<u
zX*F417152Ab#(NE<dQ2|D4olmR)JbG5a93b%|?m6RyF$Yd|4-;OB?R=ntu<svptd$
zJ4Wu|Si}(mIGTe59PKASbYM2+knl~BuG8qk$blRp;6QXN(C3Kd5CI1V6Ci43)j1%1
zb#$Nc!0PZWAUKMJ4;nHOn*h;xTs4Xbs2bQ@9jis=6SKqzX@=L3jl=|qCaLmKNI-e4
z_E~ET4FK@t@>F8(zTi|)8Go;nJbs^`+xaB}`h`X)Y7ALOjQ~NyR^UWfA9+$6dp=>v
z5EqHF!lKdGd3oVq^}B!hyF5|tBG0PE?hvzC*jINwX@Rv)GSwwBUs#9BcONv!bd0Cg
zE)R|oq5#tE^2uMA5W-`0UDu3|GcP5)oCXZmhz%yb9V!zUyz~$tNI=Npm!<^#xSb1t
z%~_5eg1}~DFaDuSkn=B2{{QN1Mz)!gFHgrO!_=?O{|C623?&8Ra037U002ovPDHLk
FV1l9I0muLV

delta 1347
zcmV-J1-$y$4Au&eB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o000E&Nkl<Zc-rJ!U1$_n6h1qylO}GnaqZTKH8H6YOj$Jsq=uBD
zv{<TC1);^hC@VsXqVz#p>_Z<EidIkv3YJh`vZYx1P}(9CLVr`zSOQVWmXsx_t+iFt
zXzH3pV-nMzGdUyU?##OLx4E<P!N*Q!a_^k;&AIoUd*@DIYoZHWMilunvH`ga8RPTx
zEA#OLGRepEJA_Oj$+!_WjSIR|Z!>Z`a+Aj4e2}>eXnsK>$hXKZk$oZy5JK)j#*vK<
z)*EBKj~qa@BY)2zGfq@4IZ#I!c?fwGdE8;=v(d=+xXSko&$a+Nk%P#?$Ose<5x(aj
z+fZ}?>X1Fi&$yGDEkxOd9`0a^A^>%6{m6A74#<{EY@4eBQ2RT_9iC_iv27>Z5P*iM
z4&-|vKK8S%vQxw09OPF#rh5fDc!b!3d}ucUj(f~`6@Q!9c3Vv#&LQPh>}MY=3DAl>
z1>VOg_QjL{HQesy5)eRUUuw*Bf*pk<I19?lVCR~8SP`vM{{D63E}Xr11#aJeAesnK
z_UWZUA|ReGWK=A!EQb@XH$!VpR1tzm$8>H<xI)B8Xw~ZvB%K`lXhGx5$~p+ixdBAy
zcC1_~YJYP$nmuQcbb8H#CN-<8tMXi%FRB2M>`_h1N+tI~>0_@pmDdWe$IO(rfB25!
zwaYjE6<L4?`<f#_+)OQr{y!iyF_m+k&e1i&5ziK&8BDI^Tua}B1K;&Q&$U}{XM92-
z9n(3wCO8_|=SO+Kn^tO}@%~u%fLHqhnlSaL5r6O+_z$nDO@KOum=6UYpCcr|2JkO7
zP#@4>rDVtU7O0qOyq>b{^B+zBzZ3{4>2z#i71YfSK~M@nZPh$wWEswk<L@N=@=qFm
z`f~(sjNNxafCkF~IE|{OWcX-(OmSE*y$(fYa+g(@WxkE6cITC0__S{b#-|?I8Vw|H
z_kTr3;Ys?&CSB(ZW4C@Ge6n#3RF=)P6#*nbwGi{wiZat>XhwRl)z<Tik^o`wFkW~z
z3@<+SjMd_yAPBU^e}3?~l1)-3IW;{Ei=HlrwTl<P))h;X4$%m&JYNkz|8>i<079Vs
z;&1Rx>hH(S4c;D8IEJIZuBLj!vg(SI6@O3@$cP}o55Esvx<;VkRi0z%HD`uOr9}{6
z`ak1qcOOhXv3yXnF2GGMbawY9r`)J^gak<WI29fu0S0_5K+^9KkRk!Pd@Mj02|)Ys
zl70+-wG$+C`cQyQH4!2td?-LdD?qQ$I>QwE{MdVeb{`4QuAK|0I4w$A>@w2qYk!Ua
zG$}gi0|8EICxDX9#nBRWel+_b2Xwv{cn3;jZ;&3|)rP-b1gL#McL_S*o$b7l0EFEj
z$U=!j$godPr~oOW0v^R~qdX_yGRhaowi0l@jeP;L0uT;(JWWop4`5XQdhfIgdESH0
zf6unt-YiX@v~9^3MgoFt-ORRwU4H>o5#I7hpU}p(P89ObX4jJUapfWokr}papP53E
z#qerEUJ%In3v83=W@`1TG5WN%g~!*~oI8xN4J~XF6iWc@ym~qENRg+~X};%jyXzQ|
zLr>vDWG(UoaCc=X#rLS?d)kh^pu<n)W9C|z`G)Teu)hU|oc<bSKA!G%T0Bv=UXS-O
z55mk26xyp#+tQY?ATs1`%}esomE!iC<Qbf+?=JrrU;t@uC6PgoH%kBj002ovPDHLk
FV1oS;cq;$^

diff --git a/res/img/social/reddit.png b/res/img/social/reddit.png
index bd6131186f990ad2902c6d76165f5bf7e6457244..131016847070dd6499d46452341d45064b933f1f 100644
GIT binary patch
delta 1541
zcmV+g2KxEu5tj^*B!3BTNLh0L00oHv00oHwZD^hP000HaNkl<Zc%1E<J#ZRF6vuz3
zQ76p^S8^97>IH6<LZ?F48o5`DySSsUYvVea37yM8+*_zU7daZ*aP(qu7gf>Ci271I
zHXw1_?jCmtP5hr>4vzhN`@VPAiQ||;;W;kg0#%?4R5Ue0V1En@fB-)Z3L6{X<W2z3
zDFL<V=VeZ<UIAU8iyz<S)FzN80c54?!0UV(T#63R!jA`eG`2bcWa3TWc=h2}p$9Zq
z6_M-&5LRzd{EF+)0UB9FBO3ucrv|ivy)2y;fC#AL$6ecsTh?89P8+ynb0!Zmmdokb
ztYFRo!tw!nGk^Bj2m#krB+NMA=}aDEjKOrwTIe~zbIOQQvPmp&f(R(<I3b+_go<6B
z-sC~XtmOoq2n0M0wqFJjhZHO)fN0e9On$cn6<40Ra$X(In{ZS!ZM~9a9g=l`*!fG-
z9#+Py2K@4ye82ey*8>;^@(crce^7;s0Cwi2aoB@q4S(*86#iL~pRh;(k(n{;l>3VS
z4pThoQ3yLF*#BYizt11xbJL`kM5VZ$P_V_im7bdXt7kINiYqIAP?i6FOp(Nj3!ja8
z*+b@5pMQCu020`&*S9~Y%5xM7E8pFM-(D>9>90I`dyVI`=L4vRO0bznFIG?lxK4>~
zuLmOUNq<l}!W_-{A2R}YPL=hCv}ObV_|$+&bpPG32bV3|9*?J-4%`=khHXo^pyJ9?
zx02TbI4_I&+b_%SzIE`YP-p5Nh!qgc|4-J|R)RmZLY}kko}b~zw@L(zy^36+R)3j%
z7mFIqbim^fz*PQ=!94=xmA$pYp({^&O`Zo{0)K4JYsA8_Tas1ZDa{-mfS;xeIJp&W
zFmr8Jhv&FXd`c7eP)G;6CDGbPHIernLkDvb30L&H@+poWAD#G=E_sVU#f7s59Ocw(
z|4QtA{-Sc_#HS3f342vYs=`s_y7s%m(r;Vofz2uy_QWB&9!URQeHKFZyD|<tZV8?E
z6o2!)_-;uex1``?*eh=0rhSb<_)vqJv2jy&1ki=8n}A^t-nqub&G!XVXu9b*Jf2w>
z1DF%QJO%amuo!DnLL?tdB2id3W3l_M8s;1{?7^3o_yzlAQLLsW)Dq@8z$Pg%i9`+`
zy0|7fBuR#o@_}i1`@-10HWz`kq{Kt?yMM_8_+k*dCzY`YeMg~HY+<)K`fFV}(BbcK
z^81N_jb2t}S)21vX3zp#$Y!D$ZpOl%IwGhr_aXMn`aYJGS=Oe)D3q~T_y9n-g`~jE
zp%RyAI6M|FZ63-?)ZuMw(TsU@z3wm>*CNK-$i`>>;qbfPW#C}|&&y((OqAHpo_{F3
zeplGO;uh(D47QQnm|Zk@GsY-?dU%{|@H=~OYMGt4V||5SE7KvP$4OwMBg>flI8avL
z%Bo_&yO^SWOiZFI8R9FLnL)eSceiFXeO>s{%Ax?fkd*)+35uI<`f~42pm}D;F_TE@
zyg$*G9fesoN8la-WXH5)RsHT(wtuE|6FY0jR`*#6F5bY`PO?Wi?8$!@Z=~!nkh*D@
zMB<#;uYO1E63@2BB{}-1ZA(Ue`XrKUjo;S0sRvatpI%+xW>UOih8OCn?fvrso)eH|
zfAF9R@7w9y*b0+K20fqseO?w1@StkuD~v)}`D~N#;m5A}@sI#6S-3#qynhMj#Uz;j
zgZY7oWjL8P{YfW8+N^R$V80AMH|-r69lmzpk7ibfN1=ls*XLgpcSL4>Patc0ynmJF
z-az6Jne`o#QpaADtS2E1X1hcAdz*%bq!d;ah0VeO>no%mmGvCEO_R+;h#xOa6YDZU
zE;b31&4ZjAPl3r{>3o#p`hF1sRs49IR!E-{6s=k2X>me`X#BCRpjlE>h~V-xh+uVL
z!v4<CW?P4)+I|`A?+i%?XNZh#3L?bL*KI4>69AYx6lH8f=wi@8<lR1}!S{=kxn7;E
rBBxE)ado!6>ckbkU!MNIU!VUM1UzH=D*fU300000NkvXXu0mjfW+3&t

delta 2267
zcmV<12qgEH4CfJ$B!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o000PiNkl<Zc-q`sd2AGA6o1`f1p)}ga>!MV(sIgWIfWo9R1i=r
zqVW&44aP`=M??vYMuUGKAzH1N7|=waK_DQ?83Iy{maANaN`Gm~B}dC?p+c=td_Ued
z?6jTT&au1Q?Mq%}I-U8x_uluu-#cbD>~7kt<Y$Uv9>pBX+>N=9x{hOnI<H{PRp&Ss
zGUqdAGGFqia1H!4?m*^5=J7g(y-|dEhIB{L8DuT<3g#SN3mWD_4`{+XjX8<Ar=JX)
z$GnL7d*(7<41ehI!59xQ&t^W&Jl~JXlNx)znrpV2yG{-88gl{j9Og(097U=*3zQ52
zH$Z3REao2-$ki1^DH*a9zy`zs0Jp=;Ln(L&vK&yd`PBf}f6Eo%1sgR{vVG+b10YN-
zVSbN-pJpgoBYc$ygfp*HF+Ei16%`>SG2e0O0rNvld4G+@E7=`wfh6Tpp-MB94z>(1
zf_VXjJ}pqXSTaCIweKV9fdL|vE*-6a;F3B{aB5PgzFa2pwr<ba@Xb=93!DUQ&mg*P
zs#uItIz4X207>3l#&7gUccM6+wi(NM>pB;~XIM$Dh%azu+>5K}G0AdY*)?9%2Z_24
z;x+9}w10XY(fQ+MW*DJ#TjZ@8j8yq`WI&Z4&FOrfF~<M<yM(A|OQOo#Tok7fojD@c
z<DVlM^1S^2=b1!zE6vPwl{rQo4Lx8+z?FyM;5)3~p^ZdE`{a7-u0+xOWR*cVzq^$O
z?O7$;qAiyIZMul3m@A^7<0nQSh*WZVK$UO6_<uCy1v%gN9np@Zq6qjP8{^lxas-tc
z?DZR$<=D8nm073jQ+d4srUiWU0ceeyvO}IDD%|72Y0t?qCcf(RhO9&T9`0>ot(2Z-
zWPqeP0Y1>FgP!jx+)GqmCfi}cy8?ba7|at>dF46VEh!?p@|V?_ld5CDKtFeKJk)Q>
z;eRfBQ2@$s_?GCI6rwHzgf+T$LAH*)&JuLa(G2iX;M0@F67udT`H%N|0e*`=BI-Am
zs8wg8igKc2g%h_coD@tsS{OuwqmN${4RZ-v1F0eW!<~5LThzP{@x8P}R`udZIi5S_
z&m};&xi1U=KfGcK!Lc9P#mV2u$nv&HmVX9n*@1`W@D?*z0INFT{_-;SSdr}vP@cs)
zw2A0X9{1J_xdyN4+)u^_o#$k!D2M33ayv$72?HdmPKtR#?0u4fv_;#h*Wr%))^Ot4
zQH-O}rPD+w_w&l0V%IHl8_8%}w2Br_iS8>=0)!l)U^g4>B2oVYq6ZpQeGcQTPk*=L
zF)zXZXfMw(A4GVirhX=?2K3EYE7v>p5_HxGLg#KKI+|$*r4>l>R_QU4l^$2si!de(
z3UBB=T4buYNtBUlwl>fx6(AUENhqYBQ2uP5<l#^>oQLVAi_^z<5$#+mF6@MW3wu|~
zHi(}ns}D>;?r{3B%ncwM_cl@YA%8?88PC>yX(<}GEQdb;8ffP-xAKV32v7KX^Fj$*
zPL<aaRu@^~s=0y%m@6Sg<_7IvskUZ})sbUifHszZPuqVQ=nPF1qhS9db%lHSi{N$3
zKXn^n_*6IcfZ!R{D5?QjdA)>*u%Cgz$jo4n0jgcN<p*OBLX;Sx1jQ=W27gqw-H)_)
z-Pc5uKa{+nV3!n5Aaey#6_jz2)gC`k9yELk(b%`-9C7>DPUHI%ri*~!1QWHEnfqZB
zZ9YUJ%@Yo+w`Blpl%GYkYo&mZ76vt=7*S=V@wwCcQ67UJ1F!(z;;Epjr73FtH8W~)
zxI74r2yev<KoM~ojPu&a?0@~(3R<POZ86dQwYK66Frbv|yz0_`2Y}=)A4j-aXrawu
z<$gpO<N)@vz<UOO2NXL(W><LKHA=%Bf8cTn2FSPdXlaSNF@c_4U657}l-mA`s1OFo
zvuC?AlAwT)t_GTr2O#ca`xO`39VOSk2Vmm-Y&n1QDJf)(2wfYb&wtu#nIRziuqoaX
zo5v=qsFdxbCy);V*iYS%r^5>%=+kdXXsl5=#z+er1r(HO7UkWganH+Kn+<x_b7~8N
zB2NJLK?eJj>AWF=jBw)na*m<}AxYn(hf$zR{N$>jg%I}dExyJe+NfDg96=?y^{1Ns
zepG)?ydmf7zOfbi^?wZ!O`<Kf4S*aVYniMZwnFpP(x=m!9Z&$PbaX419>ZksqF-Rt
z06`ZB`F`GZX?9jed{led3lxlLUwKXE`)`I&%kFjrO6Ub(WgsY&&tAcbWJ-nTsrdn8
zX}tq)Jp*_d>H`=J28EZw+nmv0q;&dMW5+D_2C5U<+%ST+x_?Mi(9S~MZmoAOxB`!f
z8!jCpZQEd5oXvBpJb*t=?*X6>n7{Bz6BPRtZ+!G94&l)fL*WEtRBww#G!l=1vRYeA
zBh90Z{9*PTU~M#$d0uq`ARRtSKKT0bz9G=O>^Vw~VJ>_40z5$b%hOh}k-{;z*J>br
zE{O|i%pdz?8h@<RiT%RBh1Ok&+Qg_;j&>W#<#H>B<O)Ct04zD-B))s2G<^XW9IwX%
zM>SrLy9{nfrTR;$dgYA_0K&_*9raN89ZEN<%>bZe^3nJBK|*CpCo*e*d`}OAC?$I;
z`n<)aUzpSDf%54}7qV&q&^yc-A*_6c(t+$603RB^&VRfi1eM>UWOw|rG_sLN-rOh%
z39?R5vXfH-XhxVCBAAe_WHpsWT20VX)ZoDwBFmI)DOMhG*>tb|%-KPte72Iw@;0^m
zt1+};hpG5_wT^T9WF?EO*09sx4K7l}#pkNb3>1~BIb*2W$IpQ_fWCn0#5{}aw%N^h
za%QQyQdE86ePMq3^*DNr`1lIV`&b_+{Ts=Tr}y|;(69jfd>&t*;9Grkox3T6L{QBx
pbgl|r`D#DsstT^ypThkwzyNr(v=B#;25kTU002ovPDHLkV1kvnK|=rl

diff --git a/res/img/social/twitter-2.png b/res/img/social/twitter-2.png
index 84f8033a30c5cef33bb14ee59b5b8d5398b9162f..9f6e7c602bca62fe41cc5a6f0a1d99765dc0c433 100644
GIT binary patch
delta 2012
zcmV<22P63J3+fM$B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Rd1{)9n8RtztrvLy4cS%G+RCwC$n}2LuR~5%U@A}!X<K{J_tb;mEr<HYr
zwn!Z+=|HGd+NfwinxGv8B;Njj3EE0jOdUaG6$6Pe!J<}LC4W?PNS-!r+CNO9DP_|p
zD5AxSLOPh*!rD#Cb3)fOZQ|6P?PtHsAMd$!(m1i-d(N-&{VPi1>vPUM_ndpq`CbK|
z5l^HsbglezGtdsifDOQU;4UBzv;nH~u_AB<Fo3s#0iX{U0#b&qWhbxg7nBAm-U;jn
zI)Nw<cDZa0$bSGy;OB;}CH*#pp9W|L9t8F{JKP8uzyaVTL)TJsYJl=C#1rWta0K`c
zvx{ee?;5&hdhrP1Msc95d^d1u4wT3F&P(w`y1U}&HP!<vc0J~t%NX+mLqMmYYeV&V
zgK(kzUf{w!QXWT^3-LsHuOp-X9uQBY1HeIG7xNp3fPWtvx>oYV0FE_P;G~nw7Xtc#
z&jH1mjzcX+Km~dikn%XP_Euc9>h}O==L5j01*ZIDPq-H-Rr3Tf!>#V%0#?542?wVO
zjADjpzl(*BUDIU;rHTi{oK)Au;y@l)W$4<_v>s4lq2wY`9!HntRJTQCirw!9o?vm}
zCx)*5s(-2hoWkZ3(7H$sFbXU;bj_?51dq%Y<t0$Gz_g$weOtEG(Q%>&IOn3>ski48
zg%aFzTYwF>2l(Vi1mOUT<|PA{Elyo5F*t4!3QYWrX+cD_4OZ*T-sv>mI0ErR`bWT1
zb(fP0NdI<-m$o$1xjcYU<%;(7zY6@aKaVPGFMmP8H&+MQv_fU)Up}NpQ64dLtp`A@
zxb*C)SJ;w-hwcus{-c7OCvt=X?iIhIMey?0X4;yjFHd%_3vqX=;MG)-dv90S6bsPS
zq|nuyrH*~r1N6ib>FY<J6Zm_*LSHi_0}r;avPI#=^CsP=a#$|B!L*=%`w~_}-8HE8
zC4cigbEd$OAQWmp1{)1sOO}J+em7qn4Jxc`v4!68i6Do+7(u#FzUT8{SISG^XMK6z
zO<Nq^9A?|9U_EhQKY-%2t_Oi-^$KuXM9{xII^lP3jacZfXL&y>5jE)48dCV%*Q2xq
z>o-8&f+lARlkb=K+VL!b+LsvtI)oGbqkpcFYW`+(uU#fM@j#T_>zYUx<cuD%BC61=
zx^w-q@&lJkeCyS^l*iGzT{!I|SAF}-ImtCsPI)xC?+NkGZ?tfKTqU9^m=;qSLklVO
z3O)gU94zvc-fTUtUq%>+2`}Ytv#RjBvu4%5ceE%xvpGWl_9%~U2(vV#P_UQ~D1R-y
z;it(wLIIbVc!P>Pu5yK-fam{HVCT9J)x1~%mIM_ZUK8ZuH9;<nSqxk*@$XTK|7Ij@
zVFii%0flKvFVmg%D)y|-6%-(qkv!g)=NF%?t$19uRIqBPz%PsyJl(?X61W^=N#M?<
zg6Hmw@NU}TH>dOXcp<DK5PSO8xPOX0rFFIY#<<1in9Amu%3R>wsO2eu0&RjCI;T|=
zX<qW)xW!!I)Ws4(;mHE3r^DE+DjayTFlPpMEoI(R8P*GdO-^uyfC5L~Gr5wV{nP(p
zQS#21^g7=!3T$SE2SH%#(JWVI*$5Z25+mdJ_>Bm!O%S2LaK>WO%NYi*&3~Q|dfqI!
zsyrtlC9pX;-dk7_zWj#_dr#&$bEUC?aX2G+@x19Z0|30OViS^fcwOn!%K|)qe`Hp6
z|JSGUo|-Qe7!cU=Gtc<*aFKIY8=n$C$Vq<xj_DV<sZU_DD{@{}3MkOkoAG)xn-LEj
zb5;3Gg&Z&>fD|?r%`;33wtpPWGLmbI5uQ4oXK>s?__O^PASE0UV$#0=W$~#O#yRv>
zf%9V)`I0~DzLqNS<Uqb^x7Y=ehOT8jHAQDCmO=uGQsKG#!hGT5?(2oVOC@%^lEw5l
z#Mn(yr!Ahu$Dv4B(68PR<c)1nPs$%3EVAuSzAJASx|WP5(x?^8iGKsQ7>ra_hl*kc
z!*8z+vF|e>mIS@|>$B%f_PvqwkIs4n2f*e!x*CmH67JLl-(MRdUxKI#ZDED>s9<%g
z@EoL4*DM}6nd9|Tk%-y=^`{z*Ifh73BkQvyAr=+<c2k%&Z2_8mxR{I;B!|zKJkg)?
z>^;*UVd&aJm7ZH^fPcEi<FdjVwsffcU`>c+;razXF<j!v*#iIgpu|W{5)_Tn{pRtw
zZv=^=1=*rxZCik?D^)grEWq-JAfj@;VJd-K5i&)|*{c?R9WHX*D3UQHk$~c7imQeh
z2@++3R0@|=*z&|yI_(x!+#n%H=jfQ0T|6lYG+yWH7&3INeSb2S`2QrSDU`?g$H!Pa
zc&yAMpDKM*#R$X`>8DxvT){(zuI;Wyqrc^;vbC_q%Vg;<EimO@0lExbo3`m&OU5k%
zU4AuAW^w1csG;M1%RiW?=gw6!bZs~AsFPOaW2$@9k+J43#4Z15s_u)}q!*&yz>k?b
zcIhbaWchmQ=2iXRLVh@z0KVt-;p8p<bk@(pGiB&nkD+TFz((L0HWkfF%RT3;aSXeM
u*WplHQ+^5Udofny^Z9mcUgDfTpZ_22)*QteKuO#H0000<MNUMnLSTZ0r`p&6

delta 1501
zcmV<31tR+D5AO?*B!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o000GnNkl<Zc-rJ!e`p*<6n?k4Zhm-8(u=9FN@CK~NJ#wAs$dBU
z6;W($p;TG~(Q*<HS|SQ!X#UfJREic$1tIhgNi;+YDoU|X2!DiD18Iw=v9U2GwXM;_
z%UyaVX?jU~@A5XDm+fVDXLfJbe(-U}-QMhb-@ci7Z)VQ7qiYasMk(?!WDT+!S<j!-
ztIF?ZkYRpLuLH<_WEXPOPUHMGwYvei1GzcH;Y?8ZH<0oQDS~{3{1n;iW&r}oMq~(C
zE3w^r<{QX9WPdC2Lu6b=<BEhfijez|!^ne@oli$C-(#5XS(I%7UPN9%zJ&~ea|rT1
zFR%@c3s8wXg*?iGT((fkHk{%C))4_{aQhzl2)GAi%UQO~RspF0b@G7cHU!wV_v{dW
zrl~gMtKfb#v8}4CX)p(QjOTQ(;5nWlwjpOlBjBLNoPXD_nQa&90wE45ucC>4u+#+_
zkVlN(sd{BDJX=wmd?gHAy#^l-jl)oUCfgz$;ku&Ri~!}_?+pzkPv21pFI1I);`{fr
z^}zzTcU3+d{Urk5T$#wG04n?PAo8NoF3@H)!J#Lf?);*<J|BeEmOxb?H``HA%03wy
z1411BhJQd|ujl;Y4e-0i%UqE*H0X^7icXGwz)Y+66y_~|O;H}W1P9V<7DZ>&G*#3T
z_!TMFI9NnA-ADk6(>?J2$DY(wK2?B5hfCUQMnR*V03o<}5K0$d1K7Kg<2KZ?&x?uB
zPCM^*Ypx$UAFUK_XEHGd=O?D2b2ysJG$j;Fy?<H+JmrPQMzaZJnEUTv16%GCUJiUh
z>jE?=)O#s@DY<&SG6;7U3T2q&bC3ks<i$=*BJ8YKCECm;5}?MbBbiot3ZTZ*0{Al(
zAqHmy#mm#*p!iIXjDRw)3ebVmp=g;*0u*`C`C}KO@I!P;w3&b(+_}cDi#R4i6!s^6
zzkdqfj{Pm8$$;Mp!^f^A;N|arbLVsllD3&WiZ}@nyV(U85ouv&ZhrY3K1Xq@0Hb7C
zzeo$yvvY=un8Fn~ZWLgE1n3iKVPq;{=(_d6d^ZXZ7LI@`Q`Ze$_Y9V=;+d;-^pgNx
zA}#!AFc~SoMU_##$wn6mK<DtnR$DkXK7R!U#=#`EmlwnCwIyzegs?UU5>8reB|0-}
zDkY_T#5eC-lU&)!vJgq1wM?)b1h&CH!@Qg}LXCn}a+>RIvoz)YJTVQQUy8xGh;SXy
zu4RIR9+APYFE%ZsFj*EVhD=>?KJ2S2OLirZ!H<3Z&%QvbNQ-U1jzeO8-m&<lu7A|9
z+HxJ&npz8J_&_8rre*4n1|yDk;wNukY2{}z_H~H>R1_T&G3e{d6SB%wL#VR0CU_{d
z0916o6nc#BpC5Hhgv6ZbE*D9E$coMdEuzKIyFdL2#~nBpGZ;6$CfJhxfc45W>L1-A
zhS7s*9rz30>H7m~h3mEn@Z}{_B7b+M_Weu(5MGk8P|`Ct39t2DP7aQ=DkKXeFwHt=
zB9n&ee)eezd>Q^SLmQ@_$b4e7k?~MT0o)Z(p;*m<)p;u*VB+)$tqD>h)G-t_8~(eH
z9eQ76S`(xn(7_^Ur$%V1l(4I77Kd--e5Nj-;T0`q^eEcd2e2vt9W>sJJb&&%=TETh
z!iS~ltn0Q+VdO%Pty|c35EVcZVHfu&x8pF|YUq%%+2z{3+_)R}65?#zUNb*ZEQZ$u
z$kQ%z{xsWUx|>>Eu&2MaZsg=5l10ZOY{N#j37irjwXR-=+z-y~Fva+u>qOTv6iH8k
zii`?mGYBrT8(7I{=6kish*mzo<frmB^I=%{58qZ0KY~L}e*p`Bp6-#Ys9oFRJ<Qi(
z;RFh$)O0MZngvl|>CwC}PhI`opTk_ijo8_j{t;jRWgubk*2>pD00000NkvXXu0mjf
DAEm;9


From 2e892fa3992b426526af66820b2914b99aa6cddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Wed, 27 Jun 2018 21:34:11 +0000
Subject: [PATCH 489/702] Translated using Weblate (French)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 0e0980c0cc..b0062c0d90 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1202,5 +1202,9 @@
     "The email field must not be blank.": "Le champ de l'adresse e-mail ne doit pas être vide.",
     "The user name field must not be blank.": "Le champ du nom d'utilisateur ne doit pas être vide.",
     "The phone number field must not be blank.": "Le champ du numéro de téléphone ne doit pas être vide.",
-    "The password field must not be blank.": "Le champ du mot de passe ne doit pas être vide."
+    "The password field must not be blank.": "Le champ du mot de passe ne doit pas être vide.",
+    "Call in Progress": "Appel en cours",
+    "A call is already in progress!": "Un appel est déjà en cours !",
+    "You have no historical rooms": "Vous n'avez aucun salon historique",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vous ne pouvez voir aucun message tant que vous ne lisez et n'acceptez pas nos <consentLink>conditions générales</consentLink>."
 }

From fc841d2dc586596d46b338e84aeb911342f4c4a4 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 27 Jun 2018 08:31:40 +0000
Subject: [PATCH 490/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index bf7b3da656..9d46758420 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1205,5 +1205,6 @@
     "The password field must not be blank.": "Pasahitza eremua ezin da hutsik laga.",
     "Call in Progress": "Deia abian",
     "A call is already in progress!": "Badago dei bat abian!",
-    "You have no historical rooms": "Ez duzu gelen historialik"
+    "You have no historical rooms": "Ez duzu gelen historialik",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Ezin duzu mezurik bidali <consentLink>gure termino eta baldintzak</consentLink> irakurri eta onartu arte."
 }

From 01dd3879702ed19b60d882b183338b62c797d967 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 28 Jun 2018 15:03:47 +0100
Subject: [PATCH 491/702] Track UISIs in bulk

Piwik supports sending an event value, which we can use to indicate
cardinality of UISIs to be tracked instead of tracking them individually.

This means we can track them at a lower frequency of (fairly arbitrary)
60s.
---
 src/Analytics.js                        |  4 +-
 src/DecryptionFailureTracker.js         |  8 ++--
 src/components/structures/MatrixChat.js |  4 +-
 test/DecryptionFailureTracker-test.js   | 52 +++++++------------------
 4 files changed, 21 insertions(+), 47 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index fbc8fb79c8..d85d635b28 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -199,9 +199,9 @@ class Analytics {
         this._paq.push(['trackPageView']);
     }
 
-    trackEvent(category, action, name) {
+    trackEvent(category, action, name, value) {
         if (this.disabled) return;
-        this._paq.push(['trackEvent', category, action, name]);
+        this._paq.push(['trackEvent', category, action, name, value]);
     }
 
     logout() {
diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index b1c6a71289..447562af26 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -40,9 +40,8 @@ export default class DecryptionFailureTracker {
     checkInterval = null;
     trackInterval = null;
 
-    // Spread the load on `Analytics` by sending at most 1 event per
-    // `TRACK_INTERVAL_MS`.
-    static TRACK_INTERVAL_MS = 1000;
+    // Spread the load on `Analytics` by tracking at a low frequency, `TRACK_INTERVAL_MS`.
+    static TRACK_INTERVAL_MS = 60000;
 
     // Call `checkFailures` every `CHECK_INTERVAL_MS`.
     static CHECK_INTERVAL_MS = 5000;
@@ -163,7 +162,8 @@ export default class DecryptionFailureTracker {
      */
     trackFailure() {
         if (this.failuresToTrack.length > 0) {
-            this.trackDecryptionFailure(this.failuresToTrack.shift());
+            // Remove all failures, and expose the number of failures
+            this.trackDecryptionFailure(this.failuresToTrack.splice(0).length);
         }
     }
 }
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 4b8b75ad74..293b0130d0 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1304,9 +1304,9 @@ export default React.createClass({
             }
         });
 
-        const dft = new DecryptionFailureTracker((failure) => {
+        const dft = new DecryptionFailureTracker((total) => {
             // TODO: Pass reason for failure as third argument to trackEvent
-            Analytics.trackEvent('E2E', 'Decryption failure');
+            Analytics.trackEvent('E2E', 'Decryption failure', null, total);
         });
 
         // Shelved for later date when we have time to think about persisting history of
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index c4f3116cba..4979fb9bb4 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -33,10 +33,9 @@ function createFailedDecryptionEvent() {
 describe('DecryptionFailureTracker', function() {
     it('tracks a failed decryption', function(done) {
         const failedDecryptionEvent = createFailedDecryptionEvent();
-        let trackedFailure = null;
-        const tracker = new DecryptionFailureTracker((failure) => {
-            trackedFailure = failure;
-        });
+
+        let count = 0;
+        const tracker = new DecryptionFailureTracker((total) => count += total);
 
         tracker.eventDecrypted(failedDecryptionEvent);
 
@@ -46,14 +45,14 @@ describe('DecryptionFailureTracker', function() {
         // Immediately track the newest failure, if there is one
         tracker.trackFailure();
 
-        expect(trackedFailure).toNotBe(null, 'should track a failure for an event that failed decryption');
+        expect(count).toNotBe(0, 'should track a failure for an event that failed decryption');
 
         done();
     });
 
     it('does not track a failed decryption where the event is subsequently successfully decrypted', (done) => {
         const decryptedEvent = createFailedDecryptionEvent();
-        const tracker = new DecryptionFailureTracker((failure) => {
+        const tracker = new DecryptionFailureTracker((total) => {
             expect(true).toBe(false, 'should not track an event that has since been decrypted correctly');
         });
 
@@ -76,7 +75,7 @@ describe('DecryptionFailureTracker', function() {
         const decryptedEvent2 = createFailedDecryptionEvent();
 
         let count = 0;
-        const tracker = new DecryptionFailureTracker((failure) => count++);
+        const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Arbitrary number of failed decryptions for both events
         tracker.eventDecrypted(decryptedEvent);
@@ -102,36 +101,11 @@ describe('DecryptionFailureTracker', function() {
         done();
     });
 
-    it('track failures in the order they occured', (done) => {
-        const decryptedEvent = createFailedDecryptionEvent();
-        const decryptedEvent2 = createFailedDecryptionEvent();
-
-        const failures = [];
-        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
-
-        // Indicate decryption
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent2);
-
-        // Pretend "now" is Infinity
-        tracker.checkFailures(Infinity);
-
-        // Simulated polling of `trackFailure`, an arbitrary number ( > 2 ) times
-        tracker.trackFailure();
-        tracker.trackFailure();
-
-        expect(failures.length).toBe(2, 'expected 2 failures to be tracked, got ' + failures.length);
-        expect(failures[0].failedEventId).toBe(decryptedEvent.getId(), 'the first failure should be tracked first');
-        expect(failures[1].failedEventId).toBe(decryptedEvent2.getId(), 'the second failure should be tracked second');
-
-        done();
-    });
-
     it('should not track a failure for an event that was tracked previously', (done) => {
         const decryptedEvent = createFailedDecryptionEvent();
 
-        const failures = [];
-        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+        let count = 0;
+        const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Indicate decryption
         tracker.eventDecrypted(decryptedEvent);
@@ -146,7 +120,7 @@ describe('DecryptionFailureTracker', function() {
 
         tracker.trackFailure();
 
-        expect(failures.length).toBe(1, 'should only track a single failure per event');
+        expect(count).toBe(1, 'should only track a single failure per event');
 
         done();
     });
@@ -157,8 +131,8 @@ describe('DecryptionFailureTracker', function() {
 
         const decryptedEvent = createFailedDecryptionEvent();
 
-        const failures = [];
-        const tracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+        let count = 0;
+        const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Indicate decryption
         tracker.eventDecrypted(decryptedEvent);
@@ -170,7 +144,7 @@ describe('DecryptionFailureTracker', function() {
         tracker.trackFailure();
 
         // Simulate the browser refreshing by destroying tracker and creating a new tracker
-        const secondTracker = new DecryptionFailureTracker((failure) => failures.push(failure));
+        const secondTracker = new DecryptionFailureTracker((total) => count += total);
 
         //secondTracker.loadTrackedEventHashMap();
 
@@ -178,7 +152,7 @@ describe('DecryptionFailureTracker', function() {
         secondTracker.checkFailures(Infinity);
         secondTracker.trackFailure();
 
-        expect(failures.length).toBe(1, 'should track a single failure per event per session, got ' + failures.length);
+        expect(count).toBe(1, count + ' failures tracked, should only track a single failure per event');
 
         done();
     });

From ab990d8cec6caba17b6716a12ad3d12bc67ddafd Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 28 Jun 2018 15:07:58 +0100
Subject: [PATCH 492/702] Increase grace period to allow time for key sharing

---
 src/DecryptionFailureTracker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 447562af26..58ba1ae8dc 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -48,7 +48,7 @@ export default class DecryptionFailureTracker {
 
     // Give events a chance to be decrypted by waiting `GRACE_PERIOD_MS` before moving
     // the failure to `failuresToTrack`.
-    static GRACE_PERIOD_MS = 5000;
+    static GRACE_PERIOD_MS = 60000;
 
     constructor(fn) {
         if (!fn || typeof fn !== 'function') {

From 3846aef8a1ce05fe1722122a7e63ce181ec48c54 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 28 Jun 2018 16:06:12 +0100
Subject: [PATCH 493/702] Alter docs, add comments

---
 src/DecryptionFailureTracker.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index 58ba1ae8dc..e7809d2f6c 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -157,12 +157,15 @@ export default class DecryptionFailureTracker {
     }
 
     /**
-     * If there is a failure that should be tracked, call the given trackDecryptionFailure
-     * function with the first failure in the FIFO of failures that should be tracked.
+     * If there are failures that should be tracked, call the given trackDecryptionFailure
+     * function with the number of failures that should be tracked.
      */
     trackFailure() {
         if (this.failuresToTrack.length > 0) {
-            // Remove all failures, and expose the number of failures
+            // Remove all failures, and expose the number of failures for now.
+            //
+            // TODO: Track a histogram of error types to cardinailty to allow for
+            // aggregation by error type.
             this.trackDecryptionFailure(this.failuresToTrack.splice(0).length);
         }
     }

From 016e9176f6e624b57565452f15140c2a84e99be0 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 28 Jun 2018 18:11:52 +0100
Subject: [PATCH 494/702] Fix room topics/names reseting when UserSetting
 re-renders

This reverts a fix to EditableText introduced in
    https://github.com/matrix-org/matrix-react-sdk/pull/1445
which introduced a bug that causes room name and topic to
reset when UserSettings is rerendered because
    `initialValue != this.value`

This also fixes the same bug originally fixed by #1445:
 >fix entering the same thing twice (which had the bug of not
 >emptying the "new" field)

which, in other words meant that clicking "+" when adding a room
alias would not reset the contents of the bottom-most alias in the
list.

The fix is to increment the `key` of the element, causing a new
instance to be mounted instead of passing new props to the existing
one.
---
 src/components/views/elements/EditableItemList.js | 5 ++++-
 src/components/views/elements/EditableText.js     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 05ae625515..02fdc96a78 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -139,8 +139,11 @@ module.exports = React.createClass({
             </div>
             { editableItems }
             { this.props.canEdit ?
+                // This is slightly evil; we want a new instance of
+                // EditableItem when the list grows. To make sure it's
+                // reset to its initial state.
                 <EditableItem
-                    key={-1}
+                    key={editableItems.length}
                     initialValue={this.props.newItem}
                     onAdd={this.onItemAdded}
                     onChange={this.onNewItemChanged}
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index 1f49bcddae..44f86f1be8 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -61,7 +61,7 @@ module.exports = React.createClass({
     },
 
     componentWillReceiveProps: function(nextProps) {
-        if (nextProps.initialValue !== this.props.initialValue || nextProps.initialValue !== this.value) {
+        if (nextProps.initialValue !== this.props.initialValue) {
             this.value = nextProps.initialValue;
             if (this.refs.editable_div) {
                 this.showPlaceholder(!this.value);

From ad5f1bf180af19cb9448c555567e9497d124766c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 29 Jun 2018 09:46:01 +0100
Subject: [PATCH 495/702] Fix layout bug introduced by #2025

Fixes https://github.com/vector-im/riot-web/issues/6958

(https://github.com/matrix-org/matrix-react-sdk/pull/2025)
---
 src/components/structures/RoomStatusBar.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index d1dc8d3c12..9aa77e695a 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -374,11 +374,13 @@ module.exports = React.createClass({
             return (
                 <div className="mx_RoomStatusBar_connectionLostBar">
                     <img src="img/warning.svg" width="24" height="23" title="/!\ " alt="/!\ " />
-                    <div className="mx_RoomStatusBar_connectionLostBar_title">
-                        { _t('Connectivity to the server has been lost.') }
-                    </div>
-                    <div className="mx_RoomStatusBar_connectionLostBar_desc">
-                        { _t('Sent messages will be stored until your connection has returned.') }
+                    <div>
+                        <div className="mx_RoomStatusBar_connectionLostBar_title">
+                            { _t('Connectivity to the server has been lost.') }
+                        </div>
+                        <div className="mx_RoomStatusBar_connectionLostBar_desc">
+                            { _t('Sent messages will be stored until your connection has returned.') }
+                        </div>
                     </div>
                 </div>
             );

From fcc9479c1d92634e4fc8b401c022a12dcd0a630c Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 27 Jun 2018 08:49:00 +0000
Subject: [PATCH 496/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 561a6bd35a..f6bb85b0c7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1205,5 +1205,6 @@
     "The password field must not be blank.": "A jelszó mező nem lehet üres.",
     "Call in Progress": "Hívás folyamatban",
     "A call is already in progress!": "A hívás már folyamatban van!",
-    "You have no historical rooms": "Nincsenek archív szobáid"
+    "You have no historical rooms": "Nincsenek archív szobáid",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nem tudsz üzenetet küldeni amíg nem olvasod el és nem fogadod el a <consentLink>felhasználási feltételeket</consentLink>."
 }

From 1539180cdccc008676ef34577926aa3c3801b958 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 27 Jun 2018 17:54:51 +0000
Subject: [PATCH 497/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1206 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1416921ea0..2b75f9c443 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1203,5 +1203,6 @@
     "A call is already in progress!": "Вызов выполняется!",
     "You have no historical rooms": "У вас нет архивных комнат",
     "Share Room Message": "Обмен сообщениями в комнате",
-    "Share Message": "Обмен сообщениями"
+    "Share Message": "Обмен сообщениями",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Вы не можете отправлять сообщения до тех пор, пока вы не примете <consentLink>наши правила и положения</consentLink>."
 }

From c4b6b458f22dbd05e551d2a8d85f9b33216e6522 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 16:59:49 +0100
Subject: [PATCH 498/702] don't fire share dialog when clicking timestamp of
 event, it was tripping people up and broke search permalinks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/EventTile.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index aa2f28024e..bae3ac8fa7 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -439,17 +439,6 @@ module.exports = withMatrixClient(React.createClass({
         });
     },
 
-    onPermalinkShareClicked: function(e) {
-        // These permalinks are like above, can be opened in new tab/window to matrix.to
-        // but otherwise fire the ShareDialog as it makes little sense to click permalink
-        // whilst it is in the current room
-        e.preventDefault();
-        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
-        Modal.createTrackedDialog('share room event dialog', '', ShareDialog, {
-            target: this.props.mxEvent,
-        });
-    },
-
     _renderE2EPadlock: function() {
         const ev = this.props.mxEvent;
         const props = {onClick: this.onCryptoClicked};
@@ -680,7 +669,7 @@ module.exports = withMatrixClient(React.createClass({
                         { avatar }
                         { sender }
                         <div className="mx_EventTile_reply">
-                            <a href={permalink} onClick={this.onPermalinkShareClicked}>
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { timestamp }
                             </a>
                             { this._renderE2EPadlock() }
@@ -707,7 +696,7 @@ module.exports = withMatrixClient(React.createClass({
                         { avatar }
                         { sender }
                         <div className="mx_EventTile_line">
-                            <a href={permalink} onClick={this.onPermalinkShareClicked}>
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { timestamp }
                             </a>
                             { this._renderE2EPadlock() }

From 21978b18df2ecdde7ef91b8c96a9c80e8d42e8a1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jun 2018 17:07:39 +0100
Subject: [PATCH 499/702] when the user switches room, close room settings this
 is especially annoying if they choose Leave Room which indirectly switches
 room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/RoomViewStore.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 923c073065..35cfe69086 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -147,6 +147,8 @@ class RoomViewStore extends Store {
                 joining: payload.joining || false,
                 // Reset replyingToEvent because we don't want cross-room because bad UX
                 replyingToEvent: null,
+                // pull the user out of Room Settings
+                isEditingSettings: false,
             };
 
             if (this._state.forwardingEvent) {

From a1fcff8bb803eb36cb71660bbca09734491c78cd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Mon, 25 Jun 2018 16:31:43 +0100
Subject: [PATCH 500/702] Revert "affix copyButton so that it doesn't get
 scrolled horizontally"

---
 res/css/views/rooms/_EventTile.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 525855f3ed..80d2cd3418 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -392,7 +392,6 @@ limitations under the License.
     overflow-x: overlay;
     overflow-y: visible;
     max-height: 30vh;
-    position: static;
 }
 
 .mx_EventTile_content .markdown-body code {
@@ -407,7 +406,7 @@ limitations under the License.
     visibility: hidden;
     cursor: pointer;
     top: 6px;
-    right: 36px;
+    right: 6px;
     width: 19px;
     height: 19px;
     background-image: url($copy-button-url);

From 30ddc9610a908fdfb5b49675518abb39b21111af Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 29 Jun 2018 11:34:56 +0100
Subject: [PATCH 501/702] Released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 091158c035..27763d39f8 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.5-rc.1",
+    "matrix-js-sdk": "0.10.5",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 66b17d9120cd3cf0fb316b2a442f503c2720702c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 29 Jun 2018 11:39:35 +0100
Subject: [PATCH 502/702] Prepare changelog for v0.12.8

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c497dc363..8483e2a0a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+Changes in [0.12.8](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8) (2018-06-29)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8-rc.2...v0.12.8)
+
+ * Revert "affix copyButton so that it doesn't get scrolled horizontally"
+   [\#2013](https://github.com/matrix-org/matrix-react-sdk/pull/2013)
+ * don't fire share dialog when clicking timestamp of event
+   [\#2017](https://github.com/matrix-org/matrix-react-sdk/pull/2017)
+ * when the user switches room, close room settings
+   [\#2019](https://github.com/matrix-org/matrix-react-sdk/pull/2019)
+
 Changes in [0.12.8-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8-rc.2) (2018-06-22)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8-rc.1...v0.12.8-rc.2)

From 2dc94ac277bfaed6e7a8116ff08bba22ee8fb642 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 29 Jun 2018 11:40:18 +0100
Subject: [PATCH 503/702] v0.12.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 27763d39f8..c6d5a403bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.8-rc.2",
+  "version": "0.12.8",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 322b77b57f6407b59822b5b885c66b9c97aec80d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 Jun 2018 12:54:36 +0100
Subject: [PATCH 504/702] don't throw, console.warn + dummy render instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/EventTile.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 9b8aae9726..76c808f0fd 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -489,7 +489,12 @@ module.exports = withMatrixClient(React.createClass({
         // before trying to instantiate us
         if (!tileHandler) {
             const {mxEvent} = this.props;
-            throw new Error(`Event type not supported: type:${mxEvent.getType()} isState:${mxEvent.isState()}`);
+            console.warn(`Event type not supported: type:${mxEvent.getType()} isState:${mxEvent.isState()}`);
+            return <div className="mx_EventTile mx_EventTile_info mx_MNoticeBody">
+                <div className="mx_EventTile_line">
+                    { _t('This event could not be displayed') }
+                </div>
+            </div>;
         }
         const EventTileType = sdk.getComponent(tileHandler);
 

From f9b3e40bfa3a63295d6855a2a344546ffdf454dc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 Jun 2018 12:54:54 +0100
Subject: [PATCH 505/702] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 65 +++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b18d167ea4..9b9d566831 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -44,6 +44,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -83,6 +87,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -196,11 +201,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -313,6 +313,31 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -321,6 +346,7 @@
     " (unsupported)": " (unsupported)",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
+    "This event could not be displayed": "This event could not be displayed",
     "%(senderName)s sent an image": "%(senderName)s sent an image",
     "%(senderName)s sent a video": "%(senderName)s sent a video",
     "%(senderName)s uploaded a file": "%(senderName)s uploaded a file",
@@ -412,11 +438,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -550,31 +576,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
-    "URL Previews": "URL Previews",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",

From e93171831c3bea28729a5befee54ec61707a497a Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 29 Jun 2018 13:13:10 +0000
Subject: [PATCH 506/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 2235621f07..d5d43fa2a0 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1202,5 +1202,9 @@
     "The email field must not be blank.": "電子郵件欄不能留空。",
     "The user name field must not be blank.": "使用者名稱欄不能留空。",
     "The phone number field must not be blank.": "電話號碼欄不能留空。",
-    "The password field must not be blank.": "密碼欄不能留空。"
+    "The password field must not be blank.": "密碼欄不能留空。",
+    "Call in Progress": "進行中的通話",
+    "A call is already in progress!": "已有一通電話進行中！",
+    "You have no historical rooms": "您沒有過去的聊天室",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "您在審閱並同意<consentLink>我們的條款與條件</consentLink>前無法傳送訊息。"
 }

From 1d91469104bae6f94c33cc772130cb5c67b52847 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 Jun 2018 14:52:25 +0100
Subject: [PATCH 507/702] switch to <ClickableUsername> and use `<a>` over
 `<span>`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/TextForEvent.js | 68 +++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 0cdaaac4ab..3d2e3c1fb5 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -19,16 +19,30 @@ import { _t } from './languageHandler';
 import * as Roles from './Roles';
 import dis from "./dispatcher";
 import React from 'react';
+import PropTypes from 'prop-types';
 
-function onUsernameClick(e) {
-    dis.dispatch({
-        action: 'insert_mention',
-        user_id: e.target.id,
-    });
-}
+class ClickableUsername extends React.PureComponent {
+    static propTypes = {
+        mxid: PropTypes.string.isRequired,
+        text: PropTypes.string.isRequired,
+    };
 
-function makeUsernameSpan(mxid, text) {
-    return <span className="mx_TextForEvent_username" dir="auto" onClick={onUsernameClick} id={mxid}>{ text }</span>;
+    constructor(props) {
+        super(props);
+        this.onClick = this.onClick.bind(this);
+    }
+
+    onClick() {
+        dis.dispatch({
+            action: 'insert_mention',
+            user_id: this.props.mxid,
+        });
+    }
+
+    render() {
+        const {mxid, text} = this.props;
+        return <a className="mx_TextForEvent_username" dir="auto" onClick={this.onClick} data-mxid={mxid}>{ text }</a>;
+    }
 }
 
 function textForMemberEvent(ev) {
@@ -36,8 +50,8 @@ function textForMemberEvent(ev) {
     const senderName = ev.sender ? ev.sender.name : ev.getSender();
     const targetName = ev.target ? ev.target.name : ev.getStateKey();
 
-    const sender = makeUsernameSpan(ev.getSender(), senderName);
-    const target = makeUsernameSpan(ev.getStateKey(), targetName);
+    const sender = <ClickableUsername mxid={ev.getSender()} text={senderName} />;
+    const target = <ClickableUsername mxid={ev.getStateKey()} text={targetName} />;
 
     const prevContent = ev.getPrevContent();
     const content = ev.getContent();
@@ -71,18 +85,18 @@ function textForMemberEvent(ev) {
             if (prevContent && prevContent.membership === 'join') {
                 if (prevContent.displayname && content.displayname && prevContent.displayname !== content.displayname) {
                     return _t('<oldDisplayName> changed their display name to <displayName>.', {}, {
-                        oldDisplayName: makeUsernameSpan(ev.getStateKey(), prevContent.displayname),
-                        displayName: makeUsernameSpan(ev.getStateKey(), content.displayname),
+                        oldDisplayName: <ClickableUsername mxid={ev.getStateKey()} text={prevContent.displayname} />,
+                        displayName: <ClickableUsername mxid={ev.getStateKey()} text={content.displayname} />,
                     });
                 } else if (!prevContent.displayname && content.displayname) {
                     return _t('<sender> set their display name to <displayName>.', {}, {
                         sender,
-                        displayName: makeUsernameSpan(ev.getSender(), content.displayname),
+                        displayName: <ClickableUsername mxid={ev.getSender()} text={content.displayname} />,
                     });
                 } else if (prevContent.displayname && !content.displayname) {
                     return _t('<sender> removed their display name (<oldDisplayName>).', {
                         sender,
-                        oldDisplayName: makeUsernameSpan(ev.getSender(), prevContent.displayname),
+                        oldDisplayName: <ClickableUsername mxid={ev.getSender()} text={prevContent.displayname} />,
                     });
                 } else if (prevContent.avatar_url && !content.avatar_url) {
                     return _t('<sender> removed their profile picture.', {}, {sender});
@@ -129,13 +143,13 @@ function textForTopicEvent(ev) {
     return _t('<sender> changed the topic to "%(topic)s".', {
         topic: ev.getContent().topic,
     }, {
-        sender: makeUsernameSpan(ev.getSender(), senderDisplayName),
+        sender: <ClickableUsername mxid={ev.getSender()} text={senderDisplayName} />,
     });
 }
 
 function textForRoomNameEvent(ev) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    const sender = makeUsernameSpan(ev.getSender(), senderDisplayName);
+    const sender = <ClickableUsername mxid={ev.getSender()} text={senderDisplayName} />;
 
     if (!ev.getContent().name || ev.getContent().name.trim().length === 0) {
         return _t('<sender> removed the room name.', {}, {sender});
@@ -154,7 +168,7 @@ function textForMessageEvent(ev) {
         message = "* " + senderDisplayName + " " + message;
     } else if (ev.getContent().msgtype === "m.image") {
         message = _t('<sender> sent an image.', {}, {
-            sender: makeUsernameSpan(ev.getSender(), senderDisplayName),
+            sender: <ClickableUsername mxid={ev.getSender()} text={senderDisplayName} />,
         });
     }
     return message;
@@ -164,7 +178,7 @@ function textForCallAnswerEvent(event) {
     const senderName = event.sender ? event.sender.name : _t('Someone');
     const supported = MatrixClientPeg.get().supportsVoip() ? '' : _t('(not supported by this browser)');
     return _t('<sender> answered the call.', {}, {
-        sender: makeUsernameSpan(event.getSender(), senderName),
+        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
     }) + ' ' + supported;
 }
 
@@ -184,13 +198,13 @@ function textForCallHangupEvent(event) {
         }
     }
     return _t('<sender> ended the call.', {}, {
-        sender: makeUsernameSpan(event.getSender(), senderName),
+        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
     }) + ' ' + reason;
 }
 
 function textForCallInviteEvent(event) {
     const senderName = event.sender ? event.sender.name : _t('Someone');
-    const sender = makeUsernameSpan(event.getSender(), senderName);
+    const sender = <ClickableUsername mxid={event.getSender()} text={senderName} />;
     // FIXME: Find a better way to determine this from the event?
     let callType = "voice";
     if (event.getContent().offer && event.getContent().offer.sdp &&
@@ -206,13 +220,13 @@ function textForThreePidInviteEvent(event) {
     return _t('<sender> sent an invitation to %(targetDisplayName)s to join the room.', {
         targetDisplayName: event.getContent().display_name,
     }, {
-        sender: makeUsernameSpan(event.getSender(), senderName),
+        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
     });
 }
 
 function textForHistoryVisibilityEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    const sender = makeUsernameSpan(event.getSender(), senderName);
+    const sender = <ClickableUsername mxid={event.getSender()} text={senderName} />;
     switch (event.getContent().history_visibility) {
         case 'invited':
             return _t('<sender> made future room history visible to all room members, '
@@ -238,7 +252,7 @@ function textForEncryptionEvent(event) {
     return _t('<sender> turned on end-to-end encryption (algorithm %(algorithm)s).', {
         algorithm: event.getContent().algorithm,
     }, {
-        sender: makeUsernameSpan(event.getSender(), senderName),
+        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
     });
 }
 
@@ -274,7 +288,7 @@ function textForPowerEvent(event) {
                     fromPowerLevel: Roles.textualPowerLevel(from, userDefault),
                     toPowerLevel: Roles.textualPowerLevel(to, userDefault),
                 }, {
-                    user: makeUsernameSpan(userId, userId),
+                    user: <ClickableUsername mxid={userId} text={userId} />,
                 }),
             );
         }
@@ -285,19 +299,19 @@ function textForPowerEvent(event) {
     return _t('<sender> changed the power level of %(powerLevelDiffText)s.', {
         powerLevelDiffText: diff.join(", "),
     }, {
-        sender: makeUsernameSpan(event.getSender(), senderName),
+        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
     });
 }
 
 function textForPinnedEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    const sender = makeUsernameSpan(event.getSender(), senderName);
+    const sender = <ClickableUsername mxid={event.getSender()} text={senderName} />;
     return _t("<sender> changed the pinned messages for the room.", {}, {sender});
 }
 
 function textForWidgetEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    const sender = makeUsernameSpan(event.getSender(), senderName);
+    const sender = <ClickableUsername mxid={event.getSender()} text={senderName} />;
 
     const {name: prevName, type: prevType, url: prevUrl} = event.getPrevContent();
     const {name, type, url} = event.getContent() || {};

From dddf7991b904353eb6884b185d17fd877256b226 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 Jun 2018 14:52:50 +0100
Subject: [PATCH 508/702] create map-i18n to aid with transforming the i18n
 entries not to waste them

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 scripts/map-i18n.js | 69 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 scripts/map-i18n.js

diff --git a/scripts/map-i18n.js b/scripts/map-i18n.js
new file mode 100644
index 0000000000..32f81d5e82
--- /dev/null
+++ b/scripts/map-i18n.js
@@ -0,0 +1,69 @@
+#!/usr/bin/env node
+
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+ * Looks through all the translation files and maps matches of fromRegex
+ * in both key and value of the i18n translation to toStr where i18nKeyRegex
+ * matches. Simplifies changing from text to react replacements.
+ * e.g:
+ * node scripts\map-i18n.js "%\(targetName\)s accepted the invitation for %\(displayName\)s\." "%\(targetName\)s" "<target>"
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const I18NDIR = 'src/i18n/strings';
+
+if (process.argv.length !== 5) {
+    console.error("Required exactly 3 arguments");
+    console.info("Usage: <i18n_key> <fromStr> <toStr>");
+    return;
+}
+
+const [, , i18nKey, fromStr, toStr] = process.argv;
+const i18nKeyRegex = new RegExp(i18nKey, 'i');
+const fromRegex = new RegExp(fromStr, 'i');
+
+console.info(`Replacing instances of "${fromRegex}" with "${toStr}" in keys and values where key matches "${i18nKey}"`);
+
+for (const filename of fs.readdirSync(I18NDIR)) {
+    if (!filename.endsWith('.json')) continue;
+
+    let numChanged = 0;
+
+    const trs = JSON.parse(fs.readFileSync(path.join(I18NDIR, filename)));
+    for (const tr of Object.keys(trs)) {
+        if (i18nKeyRegex.test(tr) && (fromRegex.test(tr) || fromRegex.test(tr))) {
+            const v = trs[tr];
+            delete trs[tr];
+
+            trs[tr.replace(fromRegex, toStr)] = v.replace(fromRegex, toStr);
+            numChanged++;
+        }
+    }
+
+    if (numChanged > 0) {
+        console.log(`${filename}: transformed ${numChanged} translations`);
+        // XXX: This is totally relying on the impl serialising the JSON object in the
+        // same order as they were parsed from the file. JSON.stringify() has a specific argument
+        // that can be used to control the order, but JSON.parse() lacks any kind of equivalent.
+        // Empirically this does maintain the order on my system, so I'm going to leave it like
+        // this for now.
+        fs.writeFileSync(path.join(I18NDIR, filename), JSON.stringify(trs, undefined, 4) + "\n");
+    }
+}

From 36ace9dcb935b7b91f87963c3d8815566ecc0e69 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 Jun 2018 15:21:44 +0100
Subject: [PATCH 509/702] using map-i18n remap all changed `%(...)s` => `<...>`
 to keep i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/bg.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/ca.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/cs.json      | 78 +++++++++++++++++-----------------
 src/i18n/strings/da.json      | 48 ++++++++++-----------
 src/i18n/strings/de_DE.json   | 80 +++++++++++++++++------------------
 src/i18n/strings/el.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/en_EN.json   | 80 +++++++++++++++++------------------
 src/i18n/strings/en_US.json   | 76 ++++++++++++++++-----------------
 src/i18n/strings/eo.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/es.json      | 64 ++++++++++++++--------------
 src/i18n/strings/eu.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/fi.json      | 78 +++++++++++++++++-----------------
 src/i18n/strings/fr.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/gl.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/hu.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/id.json      | 20 ++++-----
 src/i18n/strings/is.json      | 10 ++---
 src/i18n/strings/it.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/ja.json      |  4 +-
 src/i18n/strings/ko.json      | 70 +++++++++++++++---------------
 src/i18n/strings/lv.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/nl.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/pl.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/pt.json      | 76 ++++++++++++++++-----------------
 src/i18n/strings/pt_BR.json   | 80 +++++++++++++++++------------------
 src/i18n/strings/ru.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/sk.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/sr.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/sv.json      | 80 +++++++++++++++++------------------
 src/i18n/strings/te.json      | 10 ++---
 src/i18n/strings/th.json      | 48 ++++++++++-----------
 src/i18n/strings/tr.json      | 70 +++++++++++++++---------------
 src/i18n/strings/uk.json      | 20 ++++-----
 src/i18n/strings/zh_Hans.json | 80 +++++++++++++++++------------------
 src/i18n/strings/zh_Hant.json | 80 +++++++++++++++++------------------
 35 files changed, 1176 insertions(+), 1176 deletions(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 5ec9a93bc5..cd5cf5058e 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -148,49 +148,13 @@
     "Verified key": "Потвърден ключ",
     "Unrecognised command:": "Неразпозната команда:",
     "Reason": "Причина",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прие поканата за %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s прие поканата.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s заяви VoIP групов разговор.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s покани %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s блокира %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s смени своето име на %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s си сложи име %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s премахна своето име (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s премахна своята профилна снимка.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s промени своята профилна снимка.",
-    "%(senderName)s set a profile picture.": "%(senderName)s зададе снимка на профила си.",
     "VoIP conference started.": "Започна VoIP групов разговор.",
-    "%(targetName)s joined the room.": "%(targetName)s се присъедини към стаята.",
     "VoIP conference finished.": "Груповият разговор приключи.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s отхвърли поканата.",
-    "%(targetName)s left the room.": "%(targetName)s напусна стаята.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s отблокира %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s изгони %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s оттегли поканата си за %(targetName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s смени темата на \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s премахна името на стаята.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s промени името на стаята на %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s изпрати снимка.",
     "Someone": "Някой",
     "(not supported by this browser)": "(не се поддържа от този браузър)",
-    "%(senderName)s answered the call.": "%(senderName)s отговори на повикването.",
     "(no answer)": "(няма отговор)",
     "(unknown failure: %(reason)s)": "(неизвестна грешка: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s прекрати разговора.",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s започна %(callType)s разговор.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s изпрати покана на %(targetDisplayName)s да се присъедини към стаята.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s направи бъдещата история на стаята видима за всички членове, от момента на поканването им в нея.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s направи бъдещата история на стаята видима за всички членове, от момента на присъединяването им в нея.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s направи бъдещата история на стаята видима за всички членове в нея.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s направи бъдещата история на стаята видима за всеки.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s направи бъдещата история на стаята видима по непознат начин (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включи шифроване от край до край (алгоритъм %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s от %(fromPowerLevel)s на %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s смени нивото на достъп на %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s смени закачените съобщения за стаята.",
-    "%(widgetName)s widget modified by %(senderName)s": "Приспособлението %(widgetName)s беше променено от %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "Приспособлението %(widgetName)s беше добавено от %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Приспособлението %(widgetName)s беше премахнато от %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s пише",
     "%(names)s and %(count)s others are typing|other": "%(names)s и %(count)s други пишат",
     "%(names)s and %(count)s others are typing|one": "%(names)s и още един човек пишат",
@@ -526,9 +490,6 @@
     "Invalid file%(extra)s": "Невалиден файл%(extra)s",
     "Error decrypting image": "Грешка при разшифроване на снимка",
     "Error decrypting video": "Грешка при разшифроване на видео",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s промени аватара на %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s премахна аватара на стаята.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s промени аватара на стаята на <img/>",
     "Copied!": "Копирано!",
     "Failed to copy": "Неуспешно копиране",
     "Add an Integration": "Добавяне на интеграция",
@@ -1181,5 +1142,44 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.",
     "Review terms and conditions": "Прегледай правилата и условията",
     "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта",
-    "Try the app first": "Първо пробвайте приложението"
+    "Try the app first": "Първо пробвайте приложението",
+    "<target> accepted the invitation for %(displayName)s.": "<target> прие поканата за %(displayName)s.",
+    "<target> accepted an invitation.": "<target> прие поканата.",
+    "<sender> requested a VoIP conference.": "<sender> заяви VoIP групов разговор.",
+    "<sender> invited <target>.": "<sender> покани <target>.",
+    "<sender> banned <target>.": "<sender> блокира <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> смени своето име на <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> си сложи име <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> премахна своето име (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> премахна своята профилна снимка.",
+    "<sender> changed their profile picture.": "<sender> промени своята профилна снимка.",
+    "<sender> set a profile picture.": "<sender> зададе снимка на профила си.",
+    "<target> joined the room.": "<target> се присъедини към стаята.",
+    "<target> rejected the invitation.": "<target> отхвърли поканата.",
+    "<target> left the room.": "<target> напусна стаята.",
+    "<sender> unbanned <target>.": "<sender> отблокира <target>.",
+    "<sender> kicked <target>.": "<sender> изгони <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> оттегли поканата си за <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> смени темата на \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> промени името на стаята на %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> промени аватара на %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> промени аватара на стаята на <img/>",
+    "<sender> removed the room name.": "<sender> премахна името на стаята.",
+    "<sender> removed the room avatar.": "<sender> премахна аватара на стаята.",
+    "<sender> answered the call.": "<sender> отговори на повикването.",
+    "<sender> ended the call.": "<sender> прекрати разговора.",
+    "<sender> placed a %(callType)s call.": "<sender> започна %(callType)s разговор.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> изпрати покана на %(targetDisplayName)s да се присъедини към стаята.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> направи бъдещата история на стаята видима за всички членове, от момента на поканването им в нея.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> направи бъдещата история на стаята видима за всички членове, от момента на присъединяването им в нея.",
+    "<sender> made future room history visible to all room members.": "<sender> направи бъдещата история на стаята видима за всички членове в нея.",
+    "<sender> made future room history visible to anyone.": "<sender> направи бъдещата история на стаята видима за всеки.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> направи бъдещата история на стаята видима по непознат начин (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> включи шифроване от край до край (алгоритъм %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> от %(fromPowerLevel)s на %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> смени нивото на достъп на %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> смени закачените съобщения за стаята.",
+    "%(widgetName)s widget modified by <sender>": "Приспособлението %(widgetName)s беше променено от <sender>",
+    "%(widgetName)s widget added by <sender>": "Приспособлението %(widgetName)s беше добавено от <sender>",
+    "%(widgetName)s widget removed by <sender>": "Приспособлението %(widgetName)s беше премахнато от <sender>"
 }
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 98d51e99ac..2e84e60e4c 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -153,49 +153,14 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clau de signatura que heu proporcionat coincideix amb la clau de signatura que heu rebut del dispositiu %(deviceId)s de l'usuari %(userId)s. S'ha marcat el dispositiu com a dispositiu verificat.",
     "Unrecognised command:": "Ordre no reconegut:",
     "Reason": "Raó",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha acceptat la invitació de %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ha acceptat una invitació.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha sol·licitat una conferència VoIP.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha convidat a %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha expulsat a %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha establert %(displayName)s com el seu nom visible.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha retirat el seu nom visible %(oldDisplayName)s.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ha retirat la seva foto de perfil.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ha canviat la seva foto de perfil.",
-    "%(senderName)s set a profile picture.": "%(senderName)s ha establert una foto de perfil.",
     "VoIP conference started.": "S'ha iniciat la conferència VoIP.",
-    "%(targetName)s joined the room.": "%(targetName)s ha entrat a la sala.",
     "VoIP conference finished.": "S'ha finalitzat la conferència VoIP.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ha rebutjat la invitació.",
-    "%(targetName)s left the room.": "%(targetName)s ha sortir de la sala.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha readmès a %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha fet fora a %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirat la invitació per a %(targetName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha canviat el tema a \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha eliminat el nom de la sala.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha canviat el nom de la sala a %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ha enviat una imatge.",
     "Someone": "Algú",
     "(not supported by this browser)": "(no és compatible amb aquest navegador)",
-    "%(senderName)s answered the call.": "%(senderName)s ha contestat la trucada.",
     "(could not connect media)": "(no s'ha pogut connectar el medi)",
     "(no answer)": "(sense resposta)",
     "(unknown failure: %(reason)s)": "(error desconegut: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ha penjat.",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha col·locat una trucada de %(callType)s.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha enviat una invitació a %(targetDisplayName)s a entrar a aquesta sala.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha fet visible l'històric futur de la sala per a tots els membres, a partir de que hi són convidats.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres, des de que entren a la sala.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres de la sala.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha fet visible l´historial de la sala per a tothom.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha fet visible l'històric de la sala per a desconeguts (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activat l'encriptació d'extrem a extrem (algoritme %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s fins %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de potència de %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha canviat els missatges fixats de la sala.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s ha modificat el giny %(widgetName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s ha afegit el giny %(widgetName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s ha eliminat el giny %(widgetName)s",
     "%(displayName)s is typing": "%(displayName)s està escrivint",
     "%(names)s and %(count)s others are typing|other": "%(names)s i %(count)s més estan escrivint",
     "%(names)s and %(count)s others are typing|one": "%(names)s i algú altre està escrivint",
@@ -495,9 +460,6 @@
     "Invalid file%(extra)s": "Fitxer invàlid%(extra)s",
     "Error decrypting image": "S'ha produït un error en desencriptar la imatge",
     "Error decrypting video": "S'ha produït un error en desencriptar el vídeo",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha canviat el seu avatar per a la sala %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s ha eliminat l'avatar de la sala.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha canviat l'avatar de la sala per aquest <img/>",
     "Copied!": "Copiat!",
     "Failed to copy": "No s'ha pogut copiar",
     "Add an Integration": "Afegeix una integració",
@@ -851,7 +813,6 @@
     "Your homeserver's URL": "URL del teu homeserver",
     "Your identity server's URL": "URL del teu servidor d'identitat",
     "Analytics": "Analítiques",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha canviat el seu nom visible a %(displayName)s.",
     "Server may be unavailable or overloaded": "El servidor pot estar inaccessible o sobrecarregat",
     "Display name": "Nom visible",
     "Identity Server is": "El servidor d'identitat es",
@@ -1016,5 +977,44 @@
     "Collapse panel": "Col·lapsa el tauler",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Amb el vostre navegador actual, l'aparença de l'aplicació pot ser completament incorrecta i algunes o totes les funcions poden no funcionar correctament. Si voleu provar-ho de totes maneres, podeu continuar, però esteu sols pel que fa als problemes que pugueu trobar!",
     "Checking for an update...": "Comprovant si hi ha actualitzacions...",
-    "There are advanced notifications which are not shown here": "Hi ha notificacions avançades que no es mostren aquí"
+    "There are advanced notifications which are not shown here": "Hi ha notificacions avançades que no es mostren aquí",
+    "<target> accepted the invitation for %(displayName)s.": "<target> ha acceptat la invitació de %(displayName)s.",
+    "<target> accepted an invitation.": "<target> ha acceptat una invitació.",
+    "<sender> requested a VoIP conference.": "<sender> ha sol·licitat una conferència VoIP.",
+    "<sender> invited <target>.": "<sender> ha convidat a <target>.",
+    "<sender> banned <target>.": "<sender> ha expulsat a <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> ha canviat el seu nom visible a <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> ha establert <displayName> com el seu nom visible.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> ha retirat el seu nom visible <oldDisplayName>.",
+    "<sender> removed their profile picture.": "<sender> ha retirat la seva foto de perfil.",
+    "<sender> changed their profile picture.": "<sender> ha canviat la seva foto de perfil.",
+    "<sender> set a profile picture.": "<sender> ha establert una foto de perfil.",
+    "<target> joined the room.": "<target> ha entrat a la sala.",
+    "<target> rejected the invitation.": "<target> ha rebutjat la invitació.",
+    "<target> left the room.": "<target> ha sortir de la sala.",
+    "<sender> unbanned <target>.": "<sender> ha readmès a <target>.",
+    "<sender> kicked <target>.": "<sender> ha fet fora a <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> ha retirat la invitació per a <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> ha canviat el tema a \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> ha canviat el nom de la sala a %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> ha canviat el seu avatar per a la sala %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> ha canviat l'avatar de la sala per aquest <img/>",
+    "<sender> removed the room name.": "<sender> ha eliminat el nom de la sala.",
+    "<sender> removed the room avatar.": "<sender> ha eliminat l'avatar de la sala.",
+    "<sender> answered the call.": "<sender> ha contestat la trucada.",
+    "<sender> ended the call.": "<sender> ha penjat.",
+    "<sender> placed a %(callType)s call.": "<sender> ha col·locat una trucada de %(callType)s.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> ha enviat una invitació a %(targetDisplayName)s a entrar a aquesta sala.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> ha fet visible l'històric futur de la sala per a tots els membres, a partir de que hi són convidats.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> ha fet visible l'històric futur de la sala a tots els membres, des de que entren a la sala.",
+    "<sender> made future room history visible to all room members.": "<sender> ha fet visible l'històric futur de la sala a tots els membres de la sala.",
+    "<sender> made future room history visible to anyone.": "<sender> ha fet visible l´historial de la sala per a tothom.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> ha fet visible l'històric de la sala per a desconeguts (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ha activat l'encriptació d'extrem a extrem (algoritme %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s fins %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ha canviat el nivell de potència de %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> ha canviat els missatges fixats de la sala.",
+    "%(widgetName)s widget modified by <sender>": "<sender> ha modificat el giny %(widgetName)s",
+    "%(widgetName)s widget added by <sender>": "<sender> ha afegit el giny %(widgetName)s",
+    "%(widgetName)s widget removed by <sender>": "<sender> ha eliminat el giny %(widgetName)s"
 }
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index b7298f80ab..a2646300a7 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -61,7 +61,6 @@
     "Custom Server Options": "Vlastní serverové volby",
     "Add a widget": "Přidat widget",
     "Accept": "Přijmout",
-    "%(targetName)s accepted an invitation.": "%(targetName)s přijal/a pozvání.",
     "Account": "Účet",
     "Access Token:": "Přístupový žeton:",
     "Add": "Přidat",
@@ -100,10 +99,6 @@
     "Can't load user settings": "Nelze načíst uživatelské nastavení",
     "Cannot add any more widgets": "Nelze přidat žádné další widgety",
     "Change Password": "Změnit heslo",
-    "%(senderName)s changed their profile picture.": "%(senderName)s změnil/a svůj profilový obrázek.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s změnil/a název místnosti na %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstranil/a název místnosti.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s změnil/a téma na „%(topic)s“.",
     "Changes to who can read history will only apply to future messages in this room": "Změny viditelnosti historie budou platné až pro budoucí zprávy v této místnosti",
     "Changes your display nickname": "Změní vaši zobrazovanou přezdívku",
     "Changes colour scheme of current room": "Změní barevné schéma aktuální místnosti",
@@ -165,7 +160,6 @@
     "Encrypted room": "Zašifrovaná místnost",
     "Encryption is enabled in this room": "V této místnosti je zapnuto šifrování",
     "Encryption is not enabled in this room": "V této místnosti není zapnuto šifrování",
-    "%(senderName)s ended the call.": "%(senderName)s ukončil/a hovor.",
     "End-to-end encryption information": "Informace o end-to-end šifrování",
     "End-to-end encryption is in beta and may not be reliable": "End-to-end šifrování je v raném vývoji a nemusí být spolehlivé",
     "Enter Code": "Zadejte kód",
@@ -198,12 +192,8 @@
     "For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s a %(lastPerson)s píší",
     "and %(count)s others...|other": "a %(count)s další...",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget upravil/a %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget odstranil/a %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget přidal/a %(senderName)s",
     "Automatically replace plain text Emoji": "Automaticky nahrazovat textové emodži",
     "Failed to upload image": "Obrázek se nepodařilo nahrát",
-    "%(senderName)s answered the call.": "%(senderName)s přijal/a hovor.",
     "Click to mute audio": "Kliknutím ztlumíte zvuk",
     "Failed to verify email address: make sure you clicked the link in the email": "E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste kliknul/a na zaslaný odkaz",
     "Guest access is disabled on this Home Server.": "Na tomto domovském serveru je hostům vstup odepřen.",
@@ -223,15 +213,12 @@
     "Invalid alias format": "Neplaný formát aliasu",
     "Invalid address format": "Neplatný formát adresy",
     "Invalid Email Address": "Neplatná e-mailová adresa",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval/a %(targetName)s.",
     "Invite new room members": "Pozvat do místnosti nové členy",
     "Invites": "Pozvánky",
     "Invites user with given id to current room": "Pozve do aktuální místnosti uživatele s daným id",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' není platný formát adresy",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' není platný formát aliasu",
     "Join Room": "Vstoupit do místnosti",
-    "%(targetName)s joined the room.": "%(targetName)s vstoupil/a do místnosti.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopnul/a %(targetName)s.",
     "Kick": "Vykopnout",
     "Kicks user with given id": "Vykopne uživatele s daným id",
     "Last seen": "Naposledy viděn/a",
@@ -266,7 +253,6 @@
     "Passwords can't be empty": "Hesla nemohou být prázdná",
     "Permissions": "Oprávnění",
     "Phone": "Telefon",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s změnil/a úroveň moci o %(powerLevelDiffText)s.",
     "Define the power level of a user": "Stanovte úroveň moci uživatele",
     "Failed to change power level": "Nepodařilo se změnit úroveň moci",
     "Power level must be positive integer.": "Úroveň moci musí být kladné celé číslo.",
@@ -290,7 +276,6 @@
     "Sender device information": "Informace o odesilatelově zařízení",
     "Send Reset Email": "Poslat resetovací e-mail",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal/a obrázek.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s poslal/a %(targetDisplayName)s pozvánku ke vstupu do místnosti.",
     "Server error": "Chyba serveru",
     "Server may be unavailable or overloaded": "Server může být nedostupný nebo přetížený",
     "Server may be unavailable, overloaded, or search timed out :(": "Server může být nedostupný, přetížený nebo vyhledávání vypršelo :(",
@@ -298,8 +283,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server může být nedostupný, přetížený nebo jste narazili na chybu.",
     "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, přetížený nebo se pokazilo něco jiného.",
     "Session ID": "ID sezení",
-    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil/a profilový obrázek.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si změnil/a zobrazované jméno na %(displayName)s.",
     "Sets the room topic": "Nastavuje téma místnosti",
     "Show panel": "Zobrazit panel",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zobrazovat časové značky v 12hodinovém formátu (např. 2:30 odp.)",
@@ -349,9 +332,7 @@
     "Start chatting": "Zahájit rozhovor",
     "Start Chatting": "Začít chatovat",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Textová zpráva byla odeslána na +%(msisdn)s. Prosím vložte ověřovací kód z dané zprávy",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s přijal/a pozvánku pro %(displayName)s.",
     "Active call (%(roomName)s)": "Probíhající hovor (%(roomName)s)",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s vykázal/a %(targetName)s.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nelze se připojit k domovskému serveru přes HTTP, pokud je v adresním řádku HTTPS. Buď použijte HTTPS, nebo <a>povolte nebezpečné scripty</a>.",
     "Click here to fix": "Klikněte zde pro opravu",
     "Click to mute video": "Klikněte pro zakázání videa",
@@ -363,7 +344,6 @@
     "Do you want to load widget from URL:": "Chcete načíst widget z URL:",
     "Ed25519 fingerprint": "Ed25519 otisk",
     "Fill screen": "Vyplnit obrazovku",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "This doesn't appear to be a valid email address": "Tato e-mailová adresa se zdá být neplatná",
     "This is a preview of this room. Room interactions have been disabled": "Toto je náhled místnosti. Interakce byly zakázány",
     "This phone number is already in use": "Toto číslo se již používá",
@@ -375,14 +355,12 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Zpráva v daném časovém úseku nenalezena.",
     "Turn Markdown off": "Vypnout Markdown",
     "Turn Markdown on": "Zapnout Markdown",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s zapnul/a end-to-end šifrování (algoritmus %(algorithm)s).",
     "Unable to add email address": "Nepodařilo se přidat e-mailovou adresu",
     "Unable to create widget.": "Nepodařilo se vytvořit widget.",
     "Unable to remove contact information": "Nepodařilo se smazat kontaktní údaje",
     "Unable to verify email address.": "Nepodařilo se ověřit e-mailovou adresu.",
     "Unban": "Přijmout zpět",
     "Unbans user with given id": "Přijme zpět uživatele s daným id",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s přijal/a zpět %(targetName)s.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Nepodařilo se prokázat, že adresa, na kterou byla tato pozvánka odeslána, se shoduje s adresou přidruženou k vašemu účtu.",
     "Unable to capture screen": "Nepodařilo se zachytit obrazovku",
     "Unable to enable Notifications": "Nepodařilo se povolit upozornění",
@@ -456,11 +434,7 @@
     "Reason": "Důvod",
     "VoIP conference started.": "VoIP konference započata.",
     "VoIP conference finished.": "VoIP konference ukončena.",
-    "%(targetName)s left the room.": "%(targetName)s opustil/a místnost.",
     "You are already in a call.": "Již máte probíhající hovor.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s požádal/a o VoIP konferenci.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s odstranil/a svůj profilový obrázek.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s odmítl/a pozvání.",
     "Communities": "Skupiny",
     "Message Pinning": "Připíchnutí zprávy",
     "Your browser does not support the required cryptography extensions": "Váš prohlížeč nepodporuje požadovaná kryptografická rozšíření",
@@ -480,21 +454,12 @@
     "numbullet": "číselný seznam",
     "No pinned messages.": "Žádné připíchnuté zprávy.",
     "Pinned Messages": "Připíchnuté zprávy",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstranil/a svoje zobrazované jméno (%(oldDisplayName)s).",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s odvolal/a pozvánku pro %(targetName)s.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich pozvání.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich vstupu do místnosti.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou komukoliv.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s změnil/a připíchnuté zprávy této místnosti.",
     "%(names)s and %(count)s others are typing|other": "%(names)s a %(count)s další píší",
     "Authentication check failed: incorrect password?": "Kontrola ověření selhala: špatné heslo?",
     "You need to be able to invite users to do that.": "Pro tuto akci musíte mít právo zvát uživatele.",
     "Delete Widget": "Smazat widget",
     "Error decrypting image": "Chyba při dešifrování obrázku",
     "Error decrypting video": "Chyba při dešifrování videa",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odstranil/a avatar místnosti.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s změnil/a avatar místnosti na <img/>",
     "Copied!": "Zkopírováno!",
     "Failed to copy": "Nepodařilo se zkopírovat",
     "Removed or unknown message type": "Zpráva odstraněna nebo neznámého typu",
@@ -614,7 +579,6 @@
     "You have <a>disabled</a> URL previews by default.": "<a>Vypnul/a</a> jste automatické náhledy webových adres.",
     "You have <a>enabled</a> URL previews by default.": "<a>Zapnul/a</a> jste automatické náhledy webových adres.",
     "URL Previews": "Náhledy webových adres",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s změnil/a avatar místnosti %(roomName)s",
     "Add an Integration": "Přidat začlenění",
     "Message removed": "Zpráva odstraněna",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Ochrana před roboty není aktuálně na desktopu dostupná. Použijte prosím <a>webový prohlížeč</a>",
@@ -634,8 +598,6 @@
     "Missing room_id in request": "V zadání chybí room_id",
     "Missing user_id in request": "V zadání chybí user_id",
     "(could not connect media)": "(média se nepodařilo spojit)",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s uskutečnil %(callType)s hovor.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).",
     "Not a valid Riot keyfile": "Neplatný soubor s klíčem Riot",
     "Disable Emoji suggestions while typing": "Zakázat návrhy Emoji během psaní",
     "Hide avatar changes": "Skrýt změny avatara",
@@ -1076,5 +1038,43 @@
     "Collapse panel": "Sbalit panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Vzhled a chování aplikace může být ve vašem aktuální prohlížeči nesprávné a některé nebo všechny funkce mohou být chybné. Chcete-li i přes to pokračovat, nebudeme vám bránit, ale se všemi problémy, na které narazíte, si musíte poradit sami!",
     "Checking for an update...": "Kontrola aktualizací...",
-    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena"
+    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena",
+    "<target> accepted the invitation for %(displayName)s.": "<target> přijal/a pozvánku pro %(displayName)s.",
+    "<target> accepted an invitation.": "<target> přijal/a pozvání.",
+    "<sender> requested a VoIP conference.": "<sender> požádal/a o VoIP konferenci.",
+    "<sender> invited <target>.": "<sender> pozval/a <target>.",
+    "<sender> banned <target>.": "<sender> vykázal/a <target>.",
+    "<sender> set their display name to <displayName>.": "<sender> si změnil/a zobrazované jméno na <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> odstranil/a svoje zobrazované jméno (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> odstranil/a svůj profilový obrázek.",
+    "<sender> changed their profile picture.": "<sender> změnil/a svůj profilový obrázek.",
+    "<sender> set a profile picture.": "<sender> si nastavil/a profilový obrázek.",
+    "<target> joined the room.": "<target> vstoupil/a do místnosti.",
+    "<target> rejected the invitation.": "<target> odmítl/a pozvání.",
+    "<target> left the room.": "<target> opustil/a místnost.",
+    "<sender> unbanned <target>.": "<sender> přijal/a zpět <target>.",
+    "<sender> kicked <target>.": "<sender> vykopnul/a <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> odvolal/a pozvánku pro <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> změnil/a téma na „%(topic)s“.",
+    "<sender> changed the room name to %(roomName)s.": "<sender> změnil/a název místnosti na %(roomName)s.",
+    "<sender> changed the room avatar to <img/>": "<sender> změnil/a avatar místnosti na <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> změnil/a avatar místnosti %(roomName)s",
+    "<sender> removed the room name.": "<sender> odstranil/a název místnosti.",
+    "<sender> removed the room avatar.": "<sender> odstranil/a avatar místnosti.",
+    "<sender> answered the call.": "<sender> přijal/a hovor.",
+    "<sender> ended the call.": "<sender> ukončil/a hovor.",
+    "<sender> placed a %(callType)s call.": "<sender> uskutečnil %(callType)s hovor.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> poslal/a %(targetDisplayName)s pozvánku ke vstupu do místnosti.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich pozvání.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich vstupu do místnosti.",
+    "<sender> made future room history visible to all room members.": "<sender> učinil/a budoucí historii místnosti viditelnou všem členům.",
+    "<sender> made future room history visible to anyone.": "<sender> učinil/a budoucí historii místnosti viditelnou komukoliv.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> zapnul/a end-to-end šifrování (algoritmus %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> z %(fromPowerLevel)s na %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> změnil/a úroveň moci o %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> změnil/a připíchnuté zprávy této místnosti.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s widget upravil/a <sender>",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget odstranil/a <sender>",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget přidal/a <sender>"
 }
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index e90de5edfc..9f2e3f5b59 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -87,10 +87,7 @@
     "Remove": "Fjern",
     "Settings": "Indstillinger",
     "unknown error code": "Ukendt fejlkode",
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepterede en invitation.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepterede invitationen til %(displayName)s.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s og %(lastPerson)s er ved at skrive",
-    "%(senderName)s answered the call.": "%(senderName)s besvarede opkaldet.",
     "Add a widget": "Tilføj en widget",
     "OK": "OK",
     "Search": "Søg",
@@ -211,34 +208,14 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signaturnøglen du oplste passer med nøglen fra %(userId)ss enhed %(deviceId)s. Enheden er markeret som verificeret.",
     "Unrecognised command:": "Ukendt kommando:",
     "Reason": "Årsag",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s forespurgte en VoIP konference.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterede %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannede %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s satte deres viste navn til %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjernede deres viste navn (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s fjernede deres profilbillede.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ændrede deres profilbillede.",
-    "%(senderName)s set a profile picture.": "%(senderName)s indstillede deres profilbillede.",
     "VoIP conference started.": "VoIP konference startet.",
-    "%(targetName)s joined the room.": "%(targetName)s forbandt til rummet.",
     "VoIP conference finished.": "VoIP konference afsluttet.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s afviste invitationen.",
-    "%(targetName)s left the room.": "%(targetName)s forlod rummet.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbannede %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickede %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trak %(targetName)ss invitation tilbage.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ændrede emnet til \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjernede rumnavnet.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ændrede rumnavnet til %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendte et billed.",
     "Someone": "Nogen",
     "(not supported by this browser)": "(Ikke understøttet af denne browser)",
     "(could not connect media)": "(kunne ikke forbinde til mediet)",
     "(no answer)": "(intet svar)",
     "(unknown failure: %(reason)s)": "(ukendt fejl: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s afsluttede opkaldet.",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s startede et %(callType)s opkald.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s inviterede %(targetDisplayName)s til rummet.",
     "Submit debug logs": "Indsend debug-logfiler",
     "Online": "Online",
     "Fetching third party location failed": "Hentning af tredjeparts placering mislykkedes",
@@ -397,5 +374,28 @@
     "View Community": "Vis community",
     "%(count)s Members|one": "%(count)s medlem",
     "Notes:": "Noter:",
-    "Preparing to send logs": "Forbereder afsendelse af logfiler"
+    "Preparing to send logs": "Forbereder afsendelse af logfiler",
+    "<target> accepted the invitation for %(displayName)s.": "<target> accepterede invitationen til %(displayName)s.",
+    "<target> accepted an invitation.": "<target> accepterede en invitation.",
+    "<sender> requested a VoIP conference.": "<sender> forespurgte en VoIP konference.",
+    "<sender> invited <target>.": "<sender> inviterede <target>.",
+    "<sender> banned <target>.": "<sender> bannede <target>.",
+    "<sender> set their display name to <displayName>.": "<sender> satte deres viste navn til <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> fjernede deres viste navn (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> fjernede deres profilbillede.",
+    "<sender> changed their profile picture.": "<sender> ændrede deres profilbillede.",
+    "<sender> set a profile picture.": "<sender> indstillede deres profilbillede.",
+    "<target> joined the room.": "<target> forbandt til rummet.",
+    "<target> rejected the invitation.": "<target> afviste invitationen.",
+    "<target> left the room.": "<target> forlod rummet.",
+    "<sender> unbanned <target>.": "<sender> unbannede <target>.",
+    "<sender> kicked <target>.": "<sender> kickede <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> trak <target>s invitation tilbage.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> ændrede emnet til \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> ændrede rumnavnet til %(roomName)s.",
+    "<sender> removed the room name.": "<sender> fjernede rumnavnet.",
+    "<sender> answered the call.": "<sender> besvarede opkaldet.",
+    "<sender> ended the call.": "<sender> afsluttede opkaldet.",
+    "<sender> placed a %(callType)s call.": "<sender> startede et %(callType)s opkald.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> inviterede %(targetDisplayName)s til rummet."
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9b1c5acb8d..72d6570ec9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -239,51 +239,21 @@
     "Share message history with new users": "Bisherigen Chatverlauf mit neuen Nutzern teilen",
     "Encrypt room": "Raum verschlüsseln",
     "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
-    "%(targetName)s accepted an invitation.": "%(targetName)s hat eine Einladung angenommen.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hat die Einladung für %(displayName)s akzeptiert.",
-    "%(senderName)s answered the call.": "%(senderName)s hat den Anruf angenommen.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s verbannt.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s hat den Raumnamen geändert zu %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".",
     "/ddg is not a command": "/ddg ist kein Kommando",
-    "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.",
     "Failed to send request.": "Anfrage konnte nicht gesendet werden.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s hat %(targetName)s eingeladen.",
     "%(displayName)s is typing": "%(displayName)s schreibt",
-    "%(targetName)s joined the room.": "%(targetName)s hat den Raum betreten.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s hat %(targetName)s gekickt.",
-    "%(targetName)s left the room.": "%(targetName)s hat den Raum verlassen.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind).",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für Alle.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für unbekannt (%(visibility)s).",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
     "Missing user_id in request": "Fehlende user_id in Anfrage",
     "(not supported by this browser)": "(wird von diesem Browser nicht unterstützt)",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s startete einen %(callType)s-Anruf.",
     "Power level must be positive integer.": "Berechtigungslevel muss eine positive ganze Zahl sein.",
     "Reason": "Grund",
-    "%(targetName)s rejected the invitation.": "%(targetName)s hat die Einladung abgelehnt.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s hat den Anzeigenamen entfernt (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s hat das Profilbild gelöscht.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s möchte eine VoIP-Konferenz beginnen.",
     "Room %(roomId)s not visible": "Raum %(roomId)s ist nicht sichtbar",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s hat ein Bild gesendet.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s hat %(targetDisplayName)s in diesen Raum eingeladen.",
-    "%(senderName)s set a profile picture.": "%(senderName)s hat ein Profilbild gesetzt.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s hat den Anzeigenamen geändert in %(displayName)s.",
     "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
     "These are experimental features that may break in unexpected ways": "Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können",
     "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte einfach auf die Autovervollständigungsergebnisse und benutze dann die TAB-Taste zum durchblättern.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s hat die Ende-zu-Ende-Verschlüsselung aktiviert (Algorithmus: %(algorithm)s).",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.",
     "Usage": "Verwendung",
     "Use with caution": "Mit Vorsicht zu verwenden",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
     "You need to be able to invite users to do that.": "Du musst die Berechtigung haben, Benutzer einzuladen, um diese Aktion ausführen zu können.",
     "You need to be logged in.": "Du musst angemeldet sein.",
     "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
@@ -406,7 +376,6 @@
     "Invalid file%(extra)s": "Ungültige Datei%(extra)s",
     "Remove %(threePid)s?": "%(threePid)s entfernen?",
     "Please select the destination room for this message": "Bitte den Raum auswählen, an den diese Nachricht gesendet werden soll",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s hat den Raum-Namen entfernt.",
     "Passphrases must match": "Passphrases müssen übereinstimmen",
     "Passphrase must not be empty": "Passphrase darf nicht leer sein",
     "Export room keys": "Raum-Schlüssel exportieren",
@@ -486,7 +455,6 @@
     "Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.",
     "Options": "Optionen",
     "Invited": "Eingeladen",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raum-Bild entfernt.",
     "VoIP": "VoIP",
     "No Webcams detected": "Keine Webcam erkannt",
     "Missing Media Permissions, click here to request.": "Fehlende Medienberechtigungen. Hier klicken, um Berechtigungen zu beantragen.",
@@ -528,8 +496,6 @@
     "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!": "WARNUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signatur-Schlüssel für %(userId)s und das Gerät %(deviceId)s ist \"%(fprint)s\", welcher nicht mit dem bereitgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Dies kann bedeuten, dass deine Kommunikation abgehört wird!",
     "You have <a>disabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>deaktiviert</a>.",
     "You have <a>enabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>aktiviert</a>.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s hat das Raum-Bild geändert zu <img/>",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raum-Bild für %(roomName)s geändert",
     "Hide removed messages": "Gelöschte Nachrichten verbergen",
     "Start new chat": "Neuen Chat starten",
     "Add": "Hinzufügen",
@@ -664,10 +630,7 @@
     "Do you want to load widget from URL:": "Möchtest du das Widget von folgender URL laden:",
     "Integrations Error": "Integrations-Error",
     "NOTE: Apps are not end-to-end encrypted": "BEACHTE: Apps sind nicht Ende-zu-Ende-verschlüsselt",
-    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s hinzugefügt",
-    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s entfernt",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "In der Desktop-Version kann derzeit nicht geprüft werden, ob ein Benutzer ein Roboter ist. Bitte einen <a>Webbrowser</a> verwenden",
-    "%(widgetName)s widget modified by %(senderName)s": "Das Widget '%(widgetName)s' wurde von %(senderName)s bearbeitet",
     "Copied!": "Kopiert!",
     "Failed to copy": "Kopieren fehlgeschlagen",
     "Ignored Users": "Ignorierte Benutzer",
@@ -734,7 +697,6 @@
     "Remove avatar": "Profilbild entfernen",
     "Disable big emoji in chat": "Große Emojis im Chat deaktiveren",
     "Pinned Messages": "Angeheftete Nachrichten",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s hat die angehefteten Nachrichten für diesen Raum geändert.",
     "Jump to read receipt": "Zur Lesebestätigung springen",
     "Message Pinning": "Anheften von Nachrichten",
     "Long Description (HTML)": "Lange Beschreibung (HTML)",
@@ -955,7 +917,6 @@
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
     "<a>In reply to</a> <pill>": "<a>Antwort zu</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
     "Failed to remove tag %(tagName)s from room": "Fehler beim Entfernen des \"%(tagName)s\"-Tags von dem Raum",
     "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum",
@@ -1195,5 +1156,44 @@
     "Share Message": "Teile Nachricht",
     "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt",
     "Audio Output": "Ton-Ausgabe",
-    "Try the app first": "App erst ausprobieren"
+    "Try the app first": "App erst ausprobieren",
+    "<target> accepted the invitation for %(displayName)s.": "<target> hat die Einladung für %(displayName)s akzeptiert.",
+    "<target> accepted an invitation.": "<target> hat eine Einladung angenommen.",
+    "<sender> requested a VoIP conference.": "<sender> möchte eine VoIP-Konferenz beginnen.",
+    "<sender> invited <target>.": "<sender> hat <target> eingeladen.",
+    "<sender> banned <target>.": "<sender> hat <target> verbannt.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> änderte den Anzeigenamen auf <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> hat den Anzeigenamen geändert in <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> hat den Anzeigenamen entfernt (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> hat das Profilbild gelöscht.",
+    "<sender> changed their profile picture.": "<sender> hat das Profilbild geändert.",
+    "<sender> set a profile picture.": "<sender> hat ein Profilbild gesetzt.",
+    "<target> joined the room.": "<target> hat den Raum betreten.",
+    "<target> rejected the invitation.": "<target> hat die Einladung abgelehnt.",
+    "<target> left the room.": "<target> hat den Raum verlassen.",
+    "<sender> unbanned <target>.": "<sender> hat die Verbannung von <target> aufgehoben.",
+    "<sender> kicked <target>.": "<sender> hat <target> gekickt.",
+    "<sender> withdrew <target>'s invitation.": "<sender> hat die Einladung für <target> zurückgezogen.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> hat das Thema geändert in \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> hat den Raumnamen geändert zu %(roomName)s.",
+    "<sender> changed the room avatar to <img/>": "<sender> hat das Raum-Bild geändert zu <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> hat das Raum-Bild für %(roomName)s geändert",
+    "<sender> removed the room name.": "<sender> hat den Raum-Namen entfernt.",
+    "<sender> removed the room avatar.": "<sender> hat das Raum-Bild entfernt.",
+    "<sender> answered the call.": "<sender> hat den Anruf angenommen.",
+    "<sender> ended the call.": "<sender> hat den Anruf beendet.",
+    "<sender> placed a %(callType)s call.": "<sender> startete einen %(callType)s-Anruf.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> hat %(targetDisplayName)s in diesen Raum eingeladen.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind).",
+    "<sender> made future room history visible to all room members.": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.",
+    "<sender> made future room history visible to anyone.": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für Alle.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für unbekannt (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> hat die Ende-zu-Ende-Verschlüsselung aktiviert (Algorithmus: %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> von %(fromPowerLevel)s zu %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
+    "<sender> changed the pinned messages for the room.": "<sender> hat die angehefteten Nachrichten für diesen Raum geändert.",
+    "%(widgetName)s widget modified by <sender>": "Das Widget '%(widgetName)s' wurde von <sender> bearbeitet",
+    "%(widgetName)s widget added by <sender>": "<sender> hat das Widget %(widgetName)s hinzugefügt",
+    "%(widgetName)s widget removed by <sender>": "<sender> hat das Widget %(widgetName)s entfernt"
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index c4514f629b..1bc4972dac 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -8,8 +8,6 @@
     "Search": "Αναζήτηση",
     "Settings": "Ρυθμίσεις",
     "unknown error code": "άγνωστος κωδικός σφάλματος",
-    "%(targetName)s accepted an invitation.": "%(targetName)s δέχτηκε την πρόσκληση.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s δέχτηκες την πρόσκληση για %(displayName)s.",
     "Account": "Λογαριασμός",
     "Add a topic": "Προσθήκη θέματος",
     "Add email address": "Προσθήκη διεύθυνσης ηλ. αλληλογραφίας",
@@ -26,7 +24,6 @@
     "Hide removed messages": "Απόκρυψη διαγραμμένων μηνυμάτων",
     "Authentication": "Πιστοποίηση",
     "A new password must be entered.": "Ο νέος κωδικός πρόσβασης πρέπει να εισαχθεί.",
-    "%(senderName)s answered the call.": "Ο χρήστης %(senderName)s απάντησε την κλήση.",
     "An error has occurred.": "Παρουσιάστηκε ένα σφάλμα.",
     "Anyone": "Oποιοσδήποτε",
     "Are you sure?": "Είστε σίγουροι;",
@@ -34,7 +31,6 @@
     "Are you sure you want to reject the invitation?": "Είστε σίγουροι ότι θέλετε να απορρίψετε την πρόσκληση;",
     "Are you sure you want to upload the following files?": "Είστε σίγουροι ότι θέλετε να αποστείλετε τα ακόλουθα αρχεία;",
     "Attachment": "Επισύναψη",
-    "%(senderName)s banned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Autoplay GIFs and videos": "Αυτόματη αναπαραγωγή GIFs και βίντεο",
     "Anyone who knows the room's link, apart from guests": "Oποιοσδήποτε",
     "%(items)s and %(lastItem)s": "%(items)s  %(lastItem)s",
@@ -48,13 +44,9 @@
     "Blacklisted": "Στη μαύρη λίστα",
     "Can't load user settings": "Δεν είναι δυνατή η φόρτωση των ρυθμίσεων χρήστη",
     "Change Password": "Αλλαγή κωδικού πρόσβασης",
-    "%(senderName)s changed their profile picture.": "Ο %(senderName)s άλλαξε τη φωτογραφία του προφίλ του.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "Ο %(senderDisplayName)s άλλαξε το όνομα του δωματίου σε %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Ο %(senderDisplayName)s άλλαξε το θέμα σε \"%(topic)s\".",
     "Clear Cache and Reload": "Εκκαθάριση μνήμης και ανανέωση",
     "Clear Cache": "Εκκαθάριση μνήμης",
     "Bans user with given id": "Αποκλεισμός χρήστη με το συγκεκριμένο αναγνωριστικό",
-    "%(senderDisplayName)s removed the room name.": "Ο %(senderDisplayName)s διέγραψε το όνομα του δωματίου.",
     "Changes your display nickname": "Αλλάζει το ψευδώνυμο χρήστη",
     "Conference call failed.": "Η κλήση συνδιάσκεψης απέτυχε.",
     "powered by Matrix": "βασισμένο στο Matrix",
@@ -92,7 +84,6 @@
     "Emoji": "Εικονίδια",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Τα κρυπτογραφημένα μηνύματα δεν θα είναι ορατά σε εφαρμογές που δεν παρέχουν τη δυνατότητα κρυπτογράφησης",
     "Encrypted room": "Κρυπτογραφημένο δωμάτιο",
-    "%(senderName)s ended the call.": "%(senderName)s τερμάτισε την κλήση.",
     "End-to-end encryption information": "Πληροφορίες σχετικά με τη κρυπτογράφηση από άκρο σε άκρο (End-to-end encryption)",
     "Error decrypting attachment": "Σφάλμα κατά την αποκρυπτογράφηση της επισύναψης",
     "Event information": "Πληροφορίες συμβάντος",
@@ -132,14 +123,11 @@
     "Invites": "Προσκλήσεις",
     "%(displayName)s is typing": "Ο χρήστης %(displayName)s γράφει",
     "Sign in with": "Συνδεθείτε με",
-    "%(targetName)s joined the room.": "ο %(targetName)s συνδέθηκε στο δωμάτιο.",
     "Jump to first unread message.": "Πηγαίνετε στο πρώτο μη αναγνωσμένο μήνυμα.",
-    "%(senderName)s kicked %(targetName)s.": "Ο %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Kick": "Απομάκρυνση",
     "Kicks user with given id": "Διώχνει χρήστες με το συγκεκριμένο id",
     "Labs": "Πειραματικά",
     "Leave room": "Αποχώρηση από το δωμάτιο",
-    "%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
     "Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
     "Logged in as:": "Συνδεθήκατε ως:",
     "Logout": "Αποσύνδεση",
@@ -254,7 +242,6 @@
     "Reason": "Αιτία",
     "Reason: %(reasonText)s": "Αιτία: %(reasonText)s",
     "Revoke Moderator": "Ανάκληση συντονιστή",
-    "%(targetName)s rejected the invitation.": "Ο %(targetName)s απέρριψε την πρόσκληση.",
     "Reject invitation": "Απόρριψη πρόσκλησης",
     "Remote addresses for this room:": "Απομακρυσμένες διευθύνσεις για το δωμάτιο:",
     "Remove Contact Information?": "Αφαίρεση πληροφοριών επαφής;",
@@ -271,7 +258,6 @@
     "%(senderDisplayName)s sent an image.": "Ο %(senderDisplayName)s έστειλε μια φωτογραφία.",
     "Server may be unavailable or overloaded": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος ή υπερφορτωμένος",
     "Session ID": "Αναγνωριστικό συνεδρίας",
-    "%(senderName)s set a profile picture.": "Ο %(senderName)s όρισε τη φωτογραφία του προφίλ του.",
     "Start authentication": "Έναρξη πιστοποίησης",
     "Submit": "Υποβολή",
     "Tagged as: ": "Με ετικέτα: ",
@@ -289,7 +275,6 @@
     "Unable to remove contact information": "Αδυναμία αφαίρεσης πληροφοριών επαφής",
     "Unable to verify email address.": "Αδυναμία επιβεβαίωσης διεύθυνσης ηλεκτρονικής αλληλογραφίας.",
     "Unban": "Άρση αποκλεισμού",
-    "%(senderName)s unbanned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Unable to enable Notifications": "Αδυναμία ενεργοποίησης των ειδοποιήσεων",
     "Unable to load device list": "Αδυναμία φόρτωσης της λίστας συσκευών",
     "Unencrypted room": "Μη κρυπτογραφημένο δωμάτιο",
@@ -410,8 +395,6 @@
     "Start chatting": "Έναρξη συνομιλίας",
     "Start Chatting": "Έναρξη συνομιλίας",
     "Click on the button below to start chatting!": "Κάντε κλικ στο κουμπί παρακάτω για να ξεκινήσετε μια συνομιλία!",
-    "%(senderDisplayName)s removed the room avatar.": "Ο %(senderDisplayName)s διέγραψε την προσωπική εικόνα του δωματίου.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "Ο %(senderDisplayName)s άλλαξε την προσωπική εικόνα του %(roomName)s",
     "Username available": "Διαθέσιμο όνομα χρήστη",
     "Username not available": "Μη διαθέσιμο όνομα χρήστη",
     "Something went wrong!": "Κάτι πήγε στραβά!",
@@ -425,7 +408,6 @@
     "Failed to change power level": "Δεν ήταν δυνατή η αλλαγή του επιπέδου δύναμης",
     "Failed to fetch avatar URL": "Δεν ήταν δυνατή η ανάκτηση της διεύθυνσης εικόνας",
     "Failed to unban": "Δεν ήταν δυνατή η άρση του αποκλεισμού",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s από %(fromPowerLevel)s σε %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Έχει απενεργοποιηθεί η πρόσβαση στους επισκέπτες σε αυτόν τον διακομιστή.",
     "Guests cannot join this room even if explicitly invited.": "Οι επισκέπτες δεν μπορούν να συνδεθούν στο δωμάτιο ακόμη και αν έχουν καλεστεί.",
     "Hide Text Formatting Toolbar": "Απόκρυψη εργαλειοθήκης μορφοποίησης κειμένου",
@@ -435,15 +417,9 @@
     "Invalid alias format": "Μη έγκυρη μορφή ψευδώνυμου",
     "Invalid address format": "Μη έγκυρη μορφή διεύθυνσης",
     "Invalid file%(extra)s": "Μη έγκυρο αρχείο %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "Ο %(senderName)s προσκάλεσε τον %(targetName)s.",
     "Invites user with given id to current room": "Προσκαλεί τον χρήστη με το δοσμένο αναγνωριστικό στο τρέχον δωμάτιο",
     "'%(alias)s' is not a valid format for an address": "Το '%(alias)s' δεν είναι μια έγκυρη μορφή διεύθυνσης",
     "'%(alias)s' is not a valid format for an alias": "Το '%(alias)s' δεν είναι μια έγκυρη μορφή ψευδώνυμου",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που προσκλήθηκαν.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που συνδέθηκαν.",
-    "%(senderName)s made future room history visible to all room members.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη.",
-    "%(senderName)s made future room history visible to anyone.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο οποιοσδήποτε.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο άγνωστο (%(visibility)s).",
     "Missing user_id in request": "Λείπει το user_id στο αίτημα",
     "Mobile phone number (optional)": "Αριθμός κινητού τηλεφώνου (προαιρετικό)",
     "Never send encrypted messages to unverified devices from this device": "Να μη γίνει ποτέ αποστολή κρυπτογραφημένων μηνυμάτων σε ανεπιβεβαίωτες συσκευές από αυτή τη συσκευή",
@@ -456,12 +432,9 @@
     "No users have specific privileges in this room": "Κανένας χρήστης δεν έχει συγκεκριμένα δικαιώματα σε αυτό το δωμάτιο",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Μόλις ενεργοποιηθεί η κρυπτογράφηση για ένα δωμάτιο, δεν μπορεί να απενεργοποιηθεί ξανά (για τώρα)",
     "Only people who have been invited": "Μόνο άτομα που έχουν προσκληθεί",
-    "%(senderName)s placed a %(callType)s call.": "Ο %(senderName)s πραγματοποίησε μια %(callType)s κλήση.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Παρακαλούμε ελέγξτε την ηλεκτρονική σας αλληλογραφία και κάντε κλικ στον σύνδεσμο που περιέχει. Μόλις γίνει αυτό, κάντε κλίκ στο κουμπί συνέχεια.",
     "Refer a friend to Riot:": "Πείτε για το Riot σε έναν φίλο σας:",
     "Rejoin": "Επανασύνδεση",
-    "%(senderName)s removed their profile picture.": "Ο %(senderName)s αφαίρεσε τη φωτογραφία του προφίλ του.",
-    "%(senderName)s requested a VoIP conference.": "Ο %(senderName)s αιτήθηκε μια συνδιάσκεψη VoIP.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Το Riot δεν έχει δικαιώματα για αποστολή ειδοποιήσεων - παρακαλούμε ελέγξτε τις ρυθμίσεις του περιηγητή σας",
     "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα αποστολής ειδοποιήσεων στο Riot - παρακαλούμε προσπαθήστε ξανά",
     "Room contains unknown devices": "Το δωμάτιο περιέχει άγνωστες συσκευές",
@@ -495,7 +468,6 @@
     "Who can access this room?": "Ποιος μπορεί να προσπελάσει αυτό το δωμάτιο;",
     "Who can read history?": "Ποιος μπορεί να διαβάσει το ιστορικό;",
     "Who would you like to add to this room?": "Ποιον θέλετε να προσθέσετε σε αυτό το δωμάτιο;",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "Ο %(senderName)s ανακάλεσε την πρόσκληση του %(targetName)s.",
     "You cannot place a call with yourself.": "Δεν μπορείτε να καλέσετε τον ευατό σας.",
     "You cannot place VoIP calls in this browser.": "Δεν μπορείτε να πραγματοποιήσετε κλήσεις VoIP με αυτόν τον περιηγητή.",
     "You do not have permission to post to this room": "Δεν έχετε δικαιώματα για να δημοσιεύσετε σε αυτό το δωμάτιο",
@@ -522,19 +494,14 @@
     "You are registering with %(SelectedTeamName)s": "Εγγραφείτε με %(SelectedTeamName)s",
     "Removed or unknown message type": "Αφαιρέθηκε ή άγνωστος τύπος μηνύματος",
     " (unsupported)": " (μη υποστηριζόμενο)",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "Ο %(senderDisplayName)s άλλαξε την εικόνα του δωματίου σε <img/>",
     "Missing Media Permissions, click here to request.": "Λείπουν τα δικαιώματα πολύμεσων, κάντε κλικ για να ζητήσετε.",
     "You may need to manually permit Riot to access your microphone/webcam": "Μπορεί να χρειαστεί να ορίσετε χειροκίνητα την πρόσβαση του Riot στο μικρόφωνο/κάμερα",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή - παρακαλούμε ελέγξτε την συνδεσιμότητα, βεβαιωθείτε ότι το <a>πιστοποιητικό SSL</a> του διακομιστή είναι έμπιστο και ότι κάποιο πρόσθετο περιηγητή δεν αποτρέπει τα αιτήματα.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή μέσω HTTP όταν μια διεύθυνση HTTPS βρίσκεται στην μπάρα του περιηγητή. Είτε χρησιμοποιήστε HTTPS ή <a>ενεργοποιήστε τα μη ασφαλή σενάρια εντολών</a>.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Ο %(senderName)s άλλαξε το επίπεδο δύναμης του %(powerLevelDiffText)s.",
     "Changes to who can read history will only apply to future messages in this room": "Οι αλλαγές που αφορούν την ορατότητα του ιστορικού θα εφαρμοστούν μόνο στα μελλοντικά μηνύματα του δωματίου",
     "Conference calling is in development and may not be reliable.": "Η κλήση συνδιάσκεψης είναι υπό ανάπτυξη και μπορεί να μην είναι αξιόπιστη.",
     "Devices will not yet be able to decrypt history from before they joined the room": "Οι συσκευές δεν θα είναι σε θέση να αποκρυπτογραφήσουν το ιστορικό πριν από την είσοδο τους στο δωμάτιο",
     "End-to-end encryption is in beta and may not be reliable": "Η κρυπτογράφηση από άκρο σε άκρο είναι σε δοκιμαστικό στάδιο και μπορεί να μην είναι αξιόπιστη",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "Ο %(senderName)s αφαίρεσε το όνομα εμφάνισης του (%(oldDisplayName)s).",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Ο %(senderName)s έστειλε μια πρόσκληση στον %(targetDisplayName)s για να συνδεθεί στο δωμάτιο.",
-    "%(senderName)s set their display name to %(displayName)s.": "Ο %(senderName)s όρισε το όνομα του σε %(displayName)s.",
     "The phone number entered looks invalid": "Ο αριθμός που καταχωρίσατε δεν είναι έγκυρος",
     "The email address linked to your account must be entered.": "Πρέπει να εισηχθεί η διεύθυνση ηλ. αλληλογραφίας που είναι συνδεδεμένη με τον λογαριασμό σας.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Το αρχείο '%(fileName)s' υπερβαίνει το όριο μεγέθους του διακομιστή για αποστολές",
@@ -546,7 +513,6 @@
     "This is a preview of this room. Room interactions have been disabled": "Αυτή είναι μια προεπισκόπηση του δωματίου. Οι αλληλεπιδράσεις δωματίου έχουν απενεργοποιηθεί",
     "This room is not accessible by remote Matrix servers": "Αυτό το δωμάτιο δεν είναι προσβάσιμο από απομακρυσμένους διακομιστές Matrix",
     "To reset your password, enter the email address linked to your account": "Για να επαναφέρετε τον κωδικό πρόσβασης σας, πληκτρολογήστε τη διεύθυνση ηλ. αλληλογραφίας όπου είναι συνδεδεμένη με τον λογαριασμό σας",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Ο %(senderName)s ενεργοποίησε την από άκρο σε άκρο κρυπτογράφηση (algorithm %(algorithm)s).",
     "Undecryptable": "Μη αποκρυπτογραφημένο",
     "Uploading %(filename)s and %(count)s others|one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Θα θέλατε να <acceptText>δεχθείτε</acceptText> ή να <declineText>απορρίψετε</declineText> την πρόσκληση;",
@@ -803,11 +769,6 @@
     "You do not have permission to do that in this room.": "Δεν έχετε την άδεια να το κάνετε αυτό σε αυτό το δωμάτιο.",
     "You are now ignoring %(userId)s": "Τώρα αγνοείτε τον/την %(userId)s",
     "You are no longer ignoring %(userId)s": "Δεν αγνοείτε πια τον/την %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "Ο/Η %(oldDisplayName)s άλλαξε το εμφανιζόμενο όνομά του/της σε %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "Ο/Η %(senderName)s άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.",
-    "%(widgetName)s widget modified by %(senderName)s": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "Προστέθηκε το widget %(widgetName)s από τον/την %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
     "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
@@ -849,5 +810,44 @@
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Διαβάστηκε από τον/την %(displayName)s (%(userName)s) στις %(dateTime)s",
     "Room Notification": "Ειδοποίηση Δωματίου",
     "Notify the whole room": "Ειδοποιήστε όλο το δωμάτιο",
-    "Sets the room topic": "Ορίζει το θέμα του δωματίου"
+    "Sets the room topic": "Ορίζει το θέμα του δωματίου",
+    "<target> accepted the invitation for %(displayName)s.": "<target> δέχτηκες την πρόσκληση για %(displayName)s.",
+    "<target> accepted an invitation.": "<target> δέχτηκε την πρόσκληση.",
+    "<sender> requested a VoIP conference.": "Ο <sender> αιτήθηκε μια συνδιάσκεψη VoIP.",
+    "<sender> invited <target>.": "Ο <sender> προσκάλεσε τον <target>.",
+    "<sender> banned <target>.": "Ο χρήστης <sender> έδιωξε τον χρήστη <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "Ο/Η <oldDisplayName> άλλαξε το εμφανιζόμενο όνομά του/της σε <displayName>.",
+    "<sender> set their display name to <displayName>.": "Ο <sender> όρισε το όνομα του σε <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "Ο <sender> αφαίρεσε το όνομα εμφάνισης του (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "Ο <sender> αφαίρεσε τη φωτογραφία του προφίλ του.",
+    "<sender> changed their profile picture.": "Ο <sender> άλλαξε τη φωτογραφία του προφίλ του.",
+    "<sender> set a profile picture.": "Ο <sender> όρισε τη φωτογραφία του προφίλ του.",
+    "<target> joined the room.": "ο <target> συνδέθηκε στο δωμάτιο.",
+    "<target> rejected the invitation.": "Ο <target> απέρριψε την πρόσκληση.",
+    "<target> left the room.": "Ο χρήστης <target> έφυγε από το δωμάτιο.",
+    "<sender> unbanned <target>.": "Ο χρήστης <sender> έδιωξε τον χρήστη <target>.",
+    "<sender> kicked <target>.": "Ο <sender> έδιωξε τον χρήστη <target>.",
+    "<sender> withdrew <target>'s invitation.": "Ο <sender> ανακάλεσε την πρόσκληση του <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "Ο <sender> άλλαξε το θέμα σε \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "Ο <sender> άλλαξε το όνομα του δωματίου σε %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "Ο <sender> άλλαξε την προσωπική εικόνα του %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "Ο <sender> άλλαξε την εικόνα του δωματίου σε <img/>",
+    "<sender> removed the room name.": "Ο <sender> διέγραψε το όνομα του δωματίου.",
+    "<sender> removed the room avatar.": "Ο <sender> διέγραψε την προσωπική εικόνα του δωματίου.",
+    "<sender> answered the call.": "Ο χρήστης <sender> απάντησε την κλήση.",
+    "<sender> ended the call.": "<sender> τερμάτισε την κλήση.",
+    "<sender> placed a %(callType)s call.": "Ο <sender> πραγματοποίησε μια %(callType)s κλήση.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "Ο <sender> έστειλε μια πρόσκληση στον %(targetDisplayName)s για να συνδεθεί στο δωμάτιο.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που προσκλήθηκαν.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που συνδέθηκαν.",
+    "<sender> made future room history visible to all room members.": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη.",
+    "<sender> made future room history visible to anyone.": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο οποιοσδήποτε.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο άγνωστο (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "Ο <sender> ενεργοποίησε την από άκρο σε άκρο κρυπτογράφηση (algorithm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> από %(fromPowerLevel)s σε %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "Ο <sender> άλλαξε το επίπεδο δύναμης του %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "Ο/Η <sender> άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.",
+    "%(widgetName)s widget modified by <sender>": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την <sender>",
+    "%(widgetName)s widget added by <sender>": "Προστέθηκε το widget %(widgetName)s από τον/την <sender>",
+    "%(widgetName)s widget removed by <sender>": "Το widget %(widgetName)s αφαιρέθηκε από τον/την <sender>"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7717d45aa5..969d68082f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -148,50 +148,14 @@
     "Displays action": "Displays action",
     "Unrecognised command:": "Unrecognised command:",
     "Reason": "Reason",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
-    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
     "VoIP conference started.": "VoIP conference started.",
-    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
     "VoIP conference finished.": "VoIP conference finished.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
-    "%(targetName)s left the room.": "%(targetName)s left the room.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
     "Someone": "Someone",
     "(not supported by this browser)": "(not supported by this browser)",
-    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
     "(could not connect media)": "(could not connect media)",
     "(no answer)": "(no answer)",
     "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s placed a %(callType)s call.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s made future room history visible to all room members, from the point they joined.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s is typing",
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
@@ -591,9 +555,6 @@
     "Invalid file%(extra)s": "Invalid file%(extra)s",
     "Error decrypting image": "Error decrypting image",
     "Error decrypting video": "Error decrypting video",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
     "Copied!": "Copied!",
     "Failed to copy": "Failed to copy",
     "Add an Integration": "Add an Integration",
@@ -1206,5 +1167,44 @@
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
+    "<target> accepted the invitation for %(displayName)s.": "<target> accepted the invitation for %(displayName)s.",
+    "<target> accepted an invitation.": "<target> accepted an invitation.",
+    "<sender> requested a VoIP conference.": "<sender> requested a VoIP conference.",
+    "<sender> invited <target>.": "<sender> invited <target>.",
+    "<sender> banned <target>.": "<sender> banned <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> changed their display name to <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> set their display name to <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> removed their display name (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> removed their profile picture.",
+    "<sender> changed their profile picture.": "<sender> changed their profile picture.",
+    "<sender> set a profile picture.": "<sender> set a profile picture.",
+    "<target> joined the room.": "<target> joined the room.",
+    "<target> rejected the invitation.": "<target> rejected the invitation.",
+    "<target> left the room.": "<target> left the room.",
+    "<sender> unbanned <target>.": "<sender> unbanned <target>.",
+    "<sender> kicked <target>.": "<sender> kicked <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> withdrew <target>'s invitation.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> changed the topic to \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> changed the room name to %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> changed the avatar for %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> changed the room avatar to <img/>",
+    "<sender> removed the room name.": "<sender> removed the room name.",
+    "<sender> removed the room avatar.": "<sender> removed the room avatar.",
+    "<sender> answered the call.": "<sender> answered the call.",
+    "<sender> ended the call.": "<sender> ended the call.",
+    "<sender> placed a %(callType)s call.": "<sender> placed a %(callType)s call.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sent an invitation to %(targetDisplayName)s to join the room.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> made future room history visible to all room members, from the point they are invited.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> made future room history visible to all room members, from the point they joined.",
+    "<sender> made future room history visible to all room members.": "<sender> made future room history visible to all room members.",
+    "<sender> made future room history visible to anyone.": "<sender> made future room history visible to anyone.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> made future room history visible to unknown (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> from %(fromPowerLevel)s to %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> changed the power level of %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> changed the pinned messages for the room.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s widget modified by <sender>",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget added by <sender>",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget removed by <sender>"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 6f0708f0c2..e1b91cfa81 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -3,8 +3,6 @@
     "AM": "AM",
     "PM": "PM",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
     "Account": "Account",
     "Access Token:": "Access Token:",
     "Add a topic": "Add a topic",
@@ -30,7 +28,6 @@
     "and %(count)s others...|one": "and one other...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
     "A new password must be entered.": "A new password must be entered.",
-    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
     "An error has occurred.": "An error has occurred.",
     "Anyone": "Anyone",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -41,7 +38,6 @@
     "Are you sure you want to upload the following files?": "Are you sure you want to upload the following files?",
     "Attachment": "Attachment",
     "Autoplay GIFs and videos": "Autoplay GIFs and videos",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
     "Ban": "Ban",
     "Banned users": "Banned users",
     "Bans user with given id": "Bans user with given id",
@@ -51,11 +47,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Can't load user settings": "Can't load user settings",
     "Change Password": "Change Password",
-    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
     "Changes your display nickname": "Changes your display nickname",
     "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.": "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.",
@@ -117,7 +108,6 @@
     "Enable encryption": "Enable encryption",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
     "Encrypted room": "Encrypted room",
-    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
     "End-to-end encryption information": "End-to-end encryption information",
     "End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
     "Enter Code": "Enter Code",
@@ -157,7 +147,6 @@
     "Forgot your password?": "Forgot your password?",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
     "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.": "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.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Hangup": "Hangup",
@@ -176,7 +165,6 @@
     "Invalid address format": "Invalid address format",
     "Invalid Email Address": "Invalid Email Address",
     "Invalid file%(extra)s": "Invalid file%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
     "Invite new room members": "Invite new room members",
     "Invited": "Invited",
     "Invites": "Invites",
@@ -186,10 +174,8 @@
     "%(displayName)s is typing": "%(displayName)s is typing",
     "Sign in with": "Sign in with",
     "Join Room": "Join Room",
-    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
     "Joins room with given alias": "Joins room with given alias",
     "Jump to first unread message.": "Jump to first unread message.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
     "Kick": "Kick",
     "Kicks user with given id": "Kicks user with given id",
     "Labs": "Labs",
@@ -204,17 +190,11 @@
     "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
     "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
     "Leave room": "Leave room",
-    "%(targetName)s left the room.": "%(targetName)s left the room.",
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "Local addresses for this room:": "Local addresses for this room:",
     "Logged in as:": "Logged in as:",
     "Logout": "Logout",
     "Low priority": "Low priority",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s made future room history visible to all room members, from the point they joined.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
     "Manage Integrations": "Manage Integrations",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
@@ -256,7 +236,6 @@
     "People": "People",
     "Permissions": "Permissions",
     "Phone": "Phone",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s placed a %(callType)s call.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
     "Power level must be positive integer.": "Power level must be positive integer.",
     "Privacy warning": "Privacy warning",
@@ -267,15 +246,11 @@
     "Revoke widget access": "Revoke widget access",
     "Refer a friend to Riot:": "Refer a friend to Riot:",
     "Register": "Register",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
     "Reject invitation": "Reject invitation",
     "Remote addresses for this room:": "Remote addresses for this room:",
     "Remove Contact Information?": "Remove Contact Information?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
     "Remove": "Remove",
     "Remove %(threePid)s?": "Remove %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
     "Resetting 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.": "Resetting 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.",
     "Results from DuckDuckGo": "Results from DuckDuckGo",
     "Return to login screen": "Return to login screen",
@@ -296,7 +271,6 @@
     "Send Invites": "Send Invites",
     "Send Reset Email": "Send Reset Email",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
     "Server error": "Server error",
     "Server may be unavailable or overloaded": "Server may be unavailable or overloaded",
     "Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
@@ -304,8 +278,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
     "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
     "Session ID": "Session ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
     "Settings": "Settings",
     "Show panel": "Show panel",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
@@ -344,12 +316,10 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Turn Markdown off": "Turn Markdown off",
     "Turn Markdown on": "Turn Markdown on",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
     "Unable to add email address": "Unable to add email address",
     "Unable to remove contact information": "Unable to remove contact information",
     "Unable to verify email address.": "Unable to verify email address.",
     "Unban": "Unban",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
     "Unable to capture screen": "Unable to capture screen",
     "Unable to enable Notifications": "Unable to enable Notifications",
     "Unable to load device list": "Unable to load device list",
@@ -393,7 +363,6 @@
     "Who can read history?": "Who can read history?",
     "Who would you like to add to this room?": "Who would you like to add to this room?",
     "Who would you like to communicate with?": "Who would you like to communicate with?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
     "You are already in a call.": "You are already in a call.",
     "You are trying to access %(roomName)s.": "You are trying to access %(roomName)s.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
@@ -561,9 +530,6 @@
     "Online": "Online",
     "Idle": "Idle",
     "Offline": "Offline",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "Active call (%(roomName)s)": "Active call (%(roomName)s)",
     "Accept": "Accept",
     "Add": "Add",
@@ -690,11 +656,8 @@
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Failed to upload image": "Failed to upload image",
     "Hide avatars in user and room mentions": "Hide avatars in user and room mentions",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
     "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
     "Fetching third party location failed": "Fetching third party location failed",
     "A new version of Riot is available.": "A new version of Riot is available.",
     "Couldn't load home page": "Couldn't load home page",
@@ -828,5 +791,42 @@
     "Collapse panel": "Collapse panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
     "Checking for an update...": "Checking for an update...",
-    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here"
+    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
+    "<target> accepted the invitation for %(displayName)s.": "<target> accepted the invitation for %(displayName)s.",
+    "<target> accepted an invitation.": "<target> accepted an invitation.",
+    "<sender> requested a VoIP conference.": "<sender> requested a VoIP conference.",
+    "<sender> invited <target>.": "<sender> invited <target>.",
+    "<sender> banned <target>.": "<sender> banned <target>.",
+    "<sender> set their display name to <displayName>.": "<sender> set their display name to <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> removed their display name (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> removed their profile picture.",
+    "<sender> changed their profile picture.": "<sender> changed their profile picture.",
+    "<sender> set a profile picture.": "<sender> set a profile picture.",
+    "<target> joined the room.": "<target> joined the room.",
+    "<target> rejected the invitation.": "<target> rejected the invitation.",
+    "<target> left the room.": "<target> left the room.",
+    "<sender> unbanned <target>.": "<sender> unbanned <target>.",
+    "<sender> kicked <target>.": "<sender> kicked <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> withdrew <target>'s invitation.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> changed the topic to \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> changed the room name to %(roomName)s.",
+    "<sender> changed the room avatar to <img/>": "<sender> changed the room avatar to <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> changed the avatar for %(roomName)s",
+    "<sender> removed the room name.": "<sender> removed the room name.",
+    "<sender> removed the room avatar.": "<sender> removed the room avatar.",
+    "<sender> answered the call.": "<sender> answered the call.",
+    "<sender> ended the call.": "<sender> ended the call.",
+    "<sender> placed a %(callType)s call.": "<sender> placed a %(callType)s call.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sent an invitation to %(targetDisplayName)s to join the room.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> made future room history visible to all room members, from the point they are invited.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> made future room history visible to all room members, from the point they joined.",
+    "<sender> made future room history visible to all room members.": "<sender> made future room history visible to all room members.",
+    "<sender> made future room history visible to anyone.": "<sender> made future room history visible to anyone.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> made future room history visible to unknown (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> from %(fromPowerLevel)s to %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> changed the power level of %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> changed the pinned messages for the room.",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget added by <sender>",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget removed by <sender>"
 }
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index abcbcd636a..9e606ea90a 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -108,49 +108,14 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La donita subskriba ŝlosilo kongruas kun la ŝlosilo ricevita de %(userId)s por ĝia aparato %(deviceId)s. Aparato markita kiel kontrolita.",
     "Unrecognised command:": "Nerekonita komando:",
     "Reason": "Kialo",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akceptis la inviton por %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s akceptis inviton.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s petis rettelefonan vokon.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s invitis uzanton %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s forbaris uzanton %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s agordis sian vidigan nomon al %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s forigis sian vidigan nomon (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s forigis sian profilbildon.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ŝanĝis sian profilbildon.",
-    "%(senderName)s set a profile picture.": "%(senderName)s agordis profilbildon.",
     "VoIP conference started.": "Rettelefona voko komenciĝis.",
-    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambron.",
     "VoIP conference finished.": "Rettelefona voko finiĝis.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rifuzis la inviton.",
-    "%(targetName)s left the room.": "%(targetName)s forlasis la ĉambron.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s malbaris uzanton %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s forpelis uzanton %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s nuligis inviton por %(targetName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ŝanĝis la temon al «%(topic)s».",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s forigis nomon de la ĉambro.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro al %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendis bildon.",
     "Someone": "Iu",
     "(not supported by this browser)": "(nesubtenata de tiu ĉi foliumilo)",
-    "%(senderName)s answered the call.": "%(senderName)s akceptis la vokon.",
     "(could not connect media)": "(aŭdvidaĵoj ne kunigeblis)",
     "(no answer)": "(sen respondo)",
     "(unknown failure: %(reason)s)": "(nekonata eraro: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s finis la vokon.",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s faris vokon de speco: %(callType)s.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendis ĉambran inviton al %(targetDisplayName)s.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de invito.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de aliĝo.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s videbligis estontan historion de la ĉambro al nekonatoj (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ŝaltis ĝiscelan ĉifradon (algoritmo: %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s al %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
-    "%(widgetName)s widget modified by %(senderName)s": "Fenestraĵon %(widgetName)s ŝanĝis %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "Fenestraĵon %(widgetName)s aldonis %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Fenestraĵon %(widgetName)s forigis %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s tajpas",
     "%(names)s and %(count)s others are typing|other": "%(names)s kaj %(count)s aliaj tajpas",
     "%(names)s and %(count)s others are typing|one": "%(names)s kaj unu alia tajpas",
@@ -276,7 +241,6 @@
     "Unignore": "Reatenti",
     "Ignore": "Malatenti",
     "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.": "Ŝanĝo de pasvorto nuntempe nuligos ĉiujn ĝiscele ĉifrajn ŝlosilojn sur ĉiuj viaj aparatoj. Tio faros ĉifritajn babilajn historiojn nelegeblaj, krom se vi unue elportos viajn ĉambrajn ŝlosilojn kaj reenportos ilin poste. Estontece ĉi tio pliboniĝos.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ŝanĝis la profilbildon de %(roomName)s",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vi estas direktota al ekstera retejo por aŭtentigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?",
     "Jump to read receipt": "Salti al legokonfirmo",
     "Mention": "Mencio",
@@ -472,8 +436,6 @@
     "Invalid file%(extra)s": "Malvalida dosiero%(extra)s",
     "Error decrypting image": "Eraro malĉifrante bildon",
     "Error decrypting video": "Eraro malĉifrante videon",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s forigis la ĉambran profilbildon.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s agordis la ĉambran profilbildon al <img/>",
     "Copied!": "Kopiita!",
     "Failed to copy": "Malsukcesis kopii",
     "Add an Integration": "Aldoni integron",
@@ -925,7 +887,6 @@
     "Whether or not you're logged in (we don't record your user name)": "Ĉu vi salutis aŭ ne (ni ne registras vian salutnomon)",
     "Your language of choice": "Via preferata lingvo",
     "The information being sent to us to help make Riot.im better includes:": "Informoj sendataj al ni por plibonigi la servon Riot.im inkluzivas:",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ŝanĝis sian vidigan nomon al %(displayName)s.",
     "Send an encrypted reply…": "Sendi ĉifritan respondon…",
     "Send a reply (unencrypted)…": "Sendi respondon (neĉifritan)…",
     "Send an encrypted message…": "Sendi ĉifritan mesaĝon…",
@@ -1096,5 +1057,44 @@
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Sencimigaj protokoloj enhavas informojn pri uzo de aplikaĵo, inkluzive vian salutnomon, la identigilojn aŭ nomojn de la ĉambroj aŭ grupoj kiujn vi vizitis, kaj la salutnomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
     "Failed to send logs: ": "Malsukcesis sendi protokolon: ",
     "Notes:": "Rimarkoj:",
-    "Preparing to send logs": "Pretiganta sendon de protokolo"
+    "Preparing to send logs": "Pretiganta sendon de protokolo",
+    "<target> accepted the invitation for %(displayName)s.": "<target> akceptis la inviton por %(displayName)s.",
+    "<target> accepted an invitation.": "<target> akceptis inviton.",
+    "<sender> requested a VoIP conference.": "<sender> petis rettelefonan vokon.",
+    "<sender> invited <target>.": "<sender> invitis uzanton <target>.",
+    "<sender> banned <target>.": "<sender> forbaris uzanton <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> ŝanĝis sian vidigan nomon al <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> agordis sian vidigan nomon al <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> forigis sian vidigan nomon (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> forigis sian profilbildon.",
+    "<sender> changed their profile picture.": "<sender> ŝanĝis sian profilbildon.",
+    "<sender> set a profile picture.": "<sender> agordis profilbildon.",
+    "<target> joined the room.": "<target> venis en la ĉambron.",
+    "<target> rejected the invitation.": "<target> rifuzis la inviton.",
+    "<target> left the room.": "<target> forlasis la ĉambron.",
+    "<sender> unbanned <target>.": "<sender> malbaris uzanton <target>.",
+    "<sender> kicked <target>.": "<sender> forpelis uzanton <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> nuligis inviton por <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> ŝanĝis la temon al «%(topic)s».",
+    "<sender> changed the room name to %(roomName)s.": "<sender> ŝanĝis nomon de la ĉambro al %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> ŝanĝis la profilbildon de %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> agordis la ĉambran profilbildon al <img/>",
+    "<sender> removed the room name.": "<sender> forigis nomon de la ĉambro.",
+    "<sender> removed the room avatar.": "<sender> forigis la ĉambran profilbildon.",
+    "<sender> answered the call.": "<sender> akceptis la vokon.",
+    "<sender> ended the call.": "<sender> finis la vokon.",
+    "<sender> placed a %(callType)s call.": "<sender> faris vokon de speco: %(callType)s.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sendis ĉambran inviton al %(targetDisplayName)s.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de invito.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de aliĝo.",
+    "<sender> made future room history visible to all room members.": "<sender> videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj.",
+    "<sender> made future room history visible to anyone.": "<sender> videbligis estontan historion de la ĉambro al ĉiuj.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> videbligis estontan historion de la ĉambro al nekonatoj (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ŝaltis ĝiscelan ĉifradon (algoritmo: %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s al %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
+    "%(widgetName)s widget modified by <sender>": "Fenestraĵon %(widgetName)s ŝanĝis <sender>",
+    "%(widgetName)s widget added by <sender>": "Fenestraĵon %(widgetName)s aldonis <sender>",
+    "%(widgetName)s widget removed by <sender>": "Fenestraĵon %(widgetName)s forigis <sender>"
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 5434c570f7..8b010d70b3 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1,7 +1,5 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un mensaje de texto ha sido enviado a +%(msisdn)s. Por favor ingrese el código de verificación que lo contiene",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ha aceptado una invitación.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha aceptado la invitación para %(displayName)s.",
     "Account": "Cuenta",
     "Access Token:": "Token de Acceso:",
     "Add email address": "Agregar correo eléctronico",
@@ -16,7 +14,6 @@
     "and %(count)s others...|one": "y otro...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s y %(lastPerson)s están escribiendo",
     "A new password must be entered.": "Una nueva clave debe ser ingresada.",
-    "%(senderName)s answered the call.": "%(senderName)s atendió la llamada.",
     "An error has occurred.": "Un error ha ocurrido.",
     "Anyone who knows the room's link, apart from guests": "Cualquiera que sepa el enlace de la sala, salvo invitados",
     "Anyone who knows the room's link, including guests": "Cualquiera que sepa del enlace de la sala, incluyendo los invitados",
@@ -24,7 +21,6 @@
     "Are you sure you want to reject the invitation?": "¿Estás seguro que quieres rechazar la invitación?",
     "Attachment": "Adjunto",
     "Autoplay GIFs and videos": "Reproducir automáticamente GIFs y videos",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha bloqueado a %(targetName)s.",
     "Ban": "Bloquear",
     "Banned users": "Usuarios bloqueados",
     "Bans user with given id": "Bloquear usuario por ID",
@@ -34,10 +30,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "No se puede conectar al servidor via HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o <a>habilitando los scripts inseguros</a>.",
     "Can't load user settings": "No se puede cargar las configuraciones del usuario",
     "Change Password": "Cambiar clave",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ha cambiado su foto de perfil.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha cambiado el nivel de acceso de %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha cambiado el nombre de la sala a %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha cambiado el tema de la sala a \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Cambios para quien pueda leer el historial solo serán aplicados a futuros mensajes en la sala",
     "Changes your display nickname": "Cambia la visualización de tu apodo",
     "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.": "El cambio de contraseña restablecerá actualmente todas las claves de cifrado de extremo a extremo de todos los dispositivos, haciendo que el historial de chat cifrado sea ilegible, a menos que primero exporte las claves de la habitación y vuelva a importarlas después. En el futuro esto será mejorado.",
@@ -91,7 +83,6 @@
     "Enable encryption": "Habilitar encriptación",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Los mensajes encriptados no serán visibles en navegadores que no han implementado aun la encriptación",
     "Encrypted room": "Sala encriptada",
-    "%(senderName)s ended the call.": "%(senderName)s terminó la llamada.",
     "End-to-end encryption information": "Información de encriptación de extremo a extremo",
     "End-to-end encryption is in beta and may not be reliable": "El cifrado de extremo a extremo está en pruebas, podría no ser fiable",
     "Enter Code": "Ingresar Código",
@@ -130,7 +121,6 @@
     "Forgot your password?": "¿Olvidaste tu clave?",
     "For security, this session has been signed out. Please sign in again.": "Por seguridad, esta sesión ha sido cerrada. Por favor inicia sesión nuevamente.",
     "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.": "Por seguridad, al cerrar la sesión borrará cualquier clave de encriptación de extremo a extremo en este navegador. Si quieres ser capaz de descifrar tu historial de conversación, para las futuras sesiones en Riot, por favor exporta las claves de la sala para protegerlas.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Invitados no pueden unirse a esta sala aun cuando han sido invitados explícitamente.",
     "Hangup": "Colgar",
     "Hide read receipts": "Ocultar mensajes leídos",
@@ -146,7 +136,6 @@
     "Invalid address format": "Formato de dirección inválida",
     "Invalid Email Address": "Dirección de correo electrónico inválida",
     "Invalid file%(extra)s": "Archivo inválido %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha invitado a %(targetName)s.",
     "Invite new room members": "Invitar nuevos miembros a la sala",
     "Invites": "Invitar",
     "Invites user with given id to current room": "Invitar a usuario con ID dado a esta sala",
@@ -155,14 +144,11 @@
     "%(displayName)s is typing": "%(displayName)s está escribiendo",
     "Sign in with": "Quiero iniciar sesión con",
     "Join Room": "Unirte a la sala",
-    "%(targetName)s joined the room.": "%(targetName)s se ha unido a la sala.",
     "Joins room with given alias": "Unirse a la sala con el alias dado",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha expulsado a %(targetName)s.",
     "Kick": "Expulsar",
     "Kicks user with given id": "Expulsar usuario con ID dado",
     "Labs": "Laboratorios",
     "Leave room": "Dejar sala",
-    "%(targetName)s left the room.": "%(targetName)s ha dejado la sala.",
     "Local addresses for this room:": "Direcciones locales para esta sala:",
     "Logged in as:": "Sesión iniciada como:",
     "Logout": "Cerrar Sesión",
@@ -212,11 +198,6 @@
     "Jump to first unread message.": "Ir al primer mensaje sin leer.",
     "Last seen": "Visto por última vez",
     "Level:": "Nivel:",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que son invitados.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que se han unido.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha configurado el historial de la sala visible para nadie.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha configurado el historial de la sala visible para desconocido (%(visibility)s).",
     "Something went wrong!": "¡Algo ha fallado!",
     "Please select the destination room for this message": "Por favor, seleccione la sala destino para este mensaje",
     "Create new room": "Crear nueva sala",
@@ -263,15 +244,12 @@
     "Send Invites": "Enviar invitaciones",
     "Send Reset Email": "Enviar e-mail de reinicio",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s envió una imagen.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.",
     "Server error": "Error del servidor",
     "Server may be unavailable, overloaded, or search timed out :(": "El servidor podría estar saturado o desconectado, o la búsqueda caducó :(",
     "Server may be unavailable, overloaded, or the file too big": "El servidor podría estar saturado o desconectado, o el fichero ser demasiado grande",
     "Server may be unavailable, overloaded, or you hit a bug.": "El servidor podría estar saturado o desconectado, o encontraste un fallo.",
     "Server unavailable, overloaded, or something else went wrong.": "Servidor saturado, desconectado, o alguien ha roto algo.",
     "Session ID": "ID de sesión",
-    "%(senderName)s set a profile picture.": "%(senderName)s puso una foto de perfil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s cambió su nombre a %(displayName)s.",
     "Settings": "Configuración",
     "Show panel": "Mostrar panel",
     "Show Text Formatting Toolbar": "Mostrar la barra de formato de texto",
@@ -297,7 +275,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "¿Está seguro de que desea abandonar la sala '%(roomName)s'?",
     "Are you sure you want to upload the following files?": "¿Está seguro que desea enviar los siguientes archivos?",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "No se puede conectar al servidor - compruebe su conexión, asegúrese de que el <a>certificado SSL del servidor</a> es de confiaza, y compruebe que no hay extensiones del navegador bloqueando las peticiones.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha quitado el nombre de la sala.",
     "Device key:": "Clave del dispositivo:",
     "Drop File Here": "Deje el fichero aquí",
     "Guest access is disabled on this Home Server.": "El acceso de invitados está desactivado en este servidor.",
@@ -344,7 +321,6 @@
     "People": "Gente",
     "Permissions": "Permisos",
     "Phone": "Teléfono",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha hecho una llamada de tipo %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor, compruebe su e-mail y pulse el enlace que contiene. Una vez esté hecho, pulse continuar.",
     "Power level must be positive integer.": "El nivel debe ser un entero positivo.",
     "Privacy warning": "Alerta de privacidad",
@@ -357,16 +333,12 @@
     "Revoke Moderator": "Eliminar Moderador",
     "Refer a friend to Riot:": "Informar a un amigo sobre Riot:",
     "Register": "Registro",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ha rechazado la invitación.",
     "Reject invitation": "Rechazar invitación",
     "Rejoin": "Volver a unirse",
     "Remote addresses for this room:": "Dirección remota de esta sala:",
     "Remove Contact Information?": "¿Eliminar información del contacto?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha suprimido su nombre para mostar (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ha eliminado su foto de perfil.",
     "Remove": "Eliminar",
     "Remove %(threePid)s?": "¿Eliminar %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha solicitado una conferencia Voz-IP.",
     "Resetting 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.": "Reiniciar la contraseña también reiniciará las claves de cifrado extremo-a-extremo, haciendo ilegible el historial de las conversaciones, salvo que exporte previamente las claves de sala, y las importe posteriormente. Esto será mejorado en futuras versiones.",
     "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
     "Return to login screen": "Volver a la pantalla de inicio de sesión",
@@ -427,7 +399,6 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no se ha podido encontrarlo.",
     "Turn Markdown off": "Desactivar markdown",
     "Turn Markdown on": "Activar markdown",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activado el cifrado de extremo-a-extremo (algorithm %(algorithm)s).",
     "Unable to add email address": "No se ha podido añadir la dirección de correo electrónico",
     "Unable to create widget.": "No se ha podido crear el widget.",
     "Unable to remove contact information": "No se ha podido eliminar la información de contacto",
@@ -483,7 +454,6 @@
     "Who can read history?": "¿Quién puede leer el historial?",
     "Who would you like to add to this room?": "¿A quién quiere añadir a esta sala?",
     "Who would you like to communicate with?": "¿Con quién quiere comunicar?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirado la invitación de %(targetName)s.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "¿Quiere <acceptText>aceptar</acceptText> o <declineText>rechazar</declineText> esta invitación?",
     "You already have existing direct chats with this user:": "Ya tiene chats directos con este usuario:",
     "You are already in a call.": "Ya está participando en una llamada.",
@@ -502,7 +472,6 @@
     "Revoke widget access": "Revocar acceso del widget",
     "The maximum permitted number of widgets have already been added to this room.": "La cantidad máxima de widgets permitida ha sido alcanzada en esta sala.",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar, solo espere a que carguen los resultados de auto-completar y navegue entre ellos.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s levanto la suspensión de %(targetName)s.",
     "unencrypted": "no cifrado",
     "Unmute": "desactivar el silencio",
     "Unrecognised command:": "comando no reconocido:",
@@ -736,5 +705,36 @@
     "Collapse panel": "Colapsar panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
     "Checking for an update...": "Comprobando actualizaciones...",
-    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí"
+    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí",
+    "<target> accepted the invitation for %(displayName)s.": "<target> ha aceptado la invitación para %(displayName)s.",
+    "<target> accepted an invitation.": "<target> ha aceptado una invitación.",
+    "<sender> requested a VoIP conference.": "<sender> ha solicitado una conferencia Voz-IP.",
+    "<sender> invited <target>.": "<sender> ha invitado a <target>.",
+    "<sender> banned <target>.": "<sender> ha bloqueado a <target>.",
+    "<sender> set their display name to <displayName>.": "<sender> cambió su nombre a <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> ha suprimido su nombre para mostar (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> ha eliminado su foto de perfil.",
+    "<sender> changed their profile picture.": "<sender> ha cambiado su foto de perfil.",
+    "<sender> set a profile picture.": "<sender> puso una foto de perfil.",
+    "<target> joined the room.": "<target> se ha unido a la sala.",
+    "<target> rejected the invitation.": "<target> ha rechazado la invitación.",
+    "<target> left the room.": "<target> ha dejado la sala.",
+    "<sender> unbanned <target>.": "<sender> levanto la suspensión de <target>.",
+    "<sender> kicked <target>.": "<sender> ha expulsado a <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> ha retirado la invitación de <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> ha cambiado el tema de la sala a \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> ha cambiado el nombre de la sala a %(roomName)s.",
+    "<sender> removed the room name.": "<sender> ha quitado el nombre de la sala.",
+    "<sender> answered the call.": "<sender> atendió la llamada.",
+    "<sender> ended the call.": "<sender> terminó la llamada.",
+    "<sender> placed a %(callType)s call.": "<sender> ha hecho una llamada de tipo %(callType)s.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> invitó a %(targetDisplayName)s a unirse a la sala.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que son invitados.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que se han unido.",
+    "<sender> made future room history visible to all room members.": "<sender> ha configurado el historial de la sala visible para Todos los miembros de la sala.",
+    "<sender> made future room history visible to anyone.": "<sender> ha configurado el historial de la sala visible para nadie.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> ha configurado el historial de la sala visible para desconocido (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ha activado el cifrado de extremo-a-extremo (algorithm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s a %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ha cambiado el nivel de acceso de %(powerLevelDiffText)s."
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1abaec65c7..d48798c222 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1,7 +1,6 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Mezu bat bidali da +%(msisdn)s zenbakira. Sartu hemen mezuko egiaztaketa kodea",
     "Accept": "Onartu",
-    "%(targetName)s accepted an invitation.": "%(targetName)s erabiltzaileak gonbidapena onartu du.",
     "Close": "Itxi",
     "Create new room": "Sortu gela berria",
     "Continue": "Jarraitu",
@@ -166,7 +165,6 @@
     "Are you sure you want to upload the following files?": "Ziur hurrengo fitxategiak igo nahi dituzula?",
     "Attachment": "Eranskina",
     "Autoplay GIFs and videos": "Automatikoki erreproduzitu GIFak eta bideoa",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s debekatu du.",
     "Bans user with given id": "Debekatu ID zehatz bat duen erabiltzailea",
     "Call Timeout": "Deiaren denbora-muga",
     "Change Password": "Aldatu pasahitza",
@@ -210,10 +208,7 @@
     "Displays action": "Ekintza bistaratzen du",
     "Drop File Here": "Jaregin fitxategia hona",
     "%(items)s and %(lastItem)s": "%(items)s eta %(lastItem)s",
-    "%(senderName)s answered the call.": "%(senderName)s erabiltzaileak deia erantzun du.",
     "Can't load user settings": "Ezin izan dira erabiltzailearen ezarpenak kargatu",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s erabiltzaileak gelaren izena kendu du.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s erabiltzaileak mintzagaia aldatu du beste honetara: \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Historiala irakurtzeko baimenen aldaketak gela honetara hemendik aurrera heldutako mezuei aplikatuko zaizkie",
     "Clear Cache and Reload": "Garbitu cachea eta birkargatu",
     "Devices will not yet be able to decrypt history from before they joined the room": "Gailuek ezin izango dute taldera elkartu aurretiko historiala deszifratu",
@@ -229,7 +224,6 @@
     "Encrypted room": "Zifratutako gela",
     "Encryption is enabled in this room": "Zifratzea gaitu da gela honetan",
     "Encryption is not enabled in this room": "Ez da zifratzea gaitu gela honetan",
-    "%(senderName)s ended the call.": "%(senderName)s erabiltzaileak deia amaitu du.",
     "End-to-end encryption is in beta and may not be reliable": "Muturretik muturrerako zifratzea beta egoeran dago eta agian ez dabil guztiz ondo",
     "Enter Code": "Sartu kodea",
     "Error decrypting attachment": "Errorea eranskina deszifratzean",
@@ -259,18 +253,13 @@
     "Fill screen": "Bete pantaila",
     "Forget room": "Ahaztu gela",
     "Forgot your password?": "Pasahitza ahaztu duzu?",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s %(fromPowerLevel)s mailatik %(toPowerLevel)s mailara",
     "Guest access is disabled on this Home Server.": "Bisitarien sarbidea desgaituta dago hasiera zerbitzari honetan.",
     "Hide Text Formatting Toolbar": "Ezkutatu testu-formatuaren tresna-barra",
     "Incoming call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
     "Incoming video call from %(name)s": "%(name)s erabiltzailearen bideo deia jasotzen",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s erabiltzaileak %(displayName)s erabiltzailearen gonbidapena onartu du.",
     "Bulk Options": "Aukera masiboak",
     "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.": "Ezin da hasiera zerbitzarira konektatu, egiaztatu zure konexioa, ziurtatu zure <a>hasiera zerbitzariaren SSL ziurtagiria</a> fidagarritzat jotzen duela zure gailuak, eta nabigatzailearen pluginen batek ez dituela eskaerak blokeatzen.",
     "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>.": "Ezin zara hasiera zerbitzarira HTTP bidez konektatu zure nabigatzailearen barran dagoen URLa HTTS bada. Erabili HTTPS edo <a>gaitu script ez seguruak</a>.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia aldatu du.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s erabiltzaileak botere mailaz aldatu du %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s erabiltzaileak gelaren izena aldatu du, orain %(roomName)s da.",
     "Drop here to tag %(section)s": "Jaregin hona %(section)s atalari etiketa jartzeko",
     "Incoming voice call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
     "Incorrect username and/or password.": "Erabiltzaile-izen edo pasahitz okerra.",
@@ -278,7 +267,6 @@
     "Invalid address format": "Helbide formatu baliogabea",
     "Invalid Email Address": "E-mail helbide baliogabea",
     "Invalid file%(extra)s": "Fitxategi %(extra)s baliogabea",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s gonbidatu du.",
     "Invite new room members": "Gonbidatu kide berriak gelara",
     "Invited": "Gonbidatuta",
     "Invites user with given id to current room": "Emandako ID-a duen erabiltzailea gonbidatzen du gelara",
@@ -287,20 +275,12 @@
     "%(displayName)s is typing": "%(displayName)s idazten ari da",
     "Sign in with": "Hasi saioa hau erabilita:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Elkartu <voiceText>ahotsa</voiceText> edo <videoText>bideoa</videoText> erabiliz.",
-    "%(targetName)s joined the room.": "%(targetName)s erabiltzailea gelara elkartu da.",
     "Joins room with given alias": "Gelara emandako ezizenarekin elkartu da",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s kanporatu du.",
     "Kick": "Kanporatu",
     "Kicks user with given id": "Kanporatu emandako ID-a duen erabiltzailea",
-    "%(targetName)s left the room.": "%(targetName)s erabiltzailea gelatik atera da.",
     "Level:": "Maila:",
     "Local addresses for this room:": "Gela honen tokiko helbideak:",
     "Logged in as:": "Saioa hasteko erabiltzailea:",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du edonorentzat.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du ezezagunentzat (%(visibility)s).",
     "Manage Integrations": "Kudeatu interakzioak",
     "Markdown is disabled": "Markdown desgaituta dago",
     "Markdown is enabled": "Markdown gaituta dago",
@@ -329,7 +309,6 @@
     "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.": "Segurtasunagatik, saioa amaitzeak nabigatzaile honetako muturretik muturrerako zifratze gako guztiak ezabatuko ditu. Zure elkarrizketen historiala deszifratzeko gai izan nahi baduzu etorkizuneko Riot saioetan, esportatu zure gelako gakoen babes-kopia bat.",
     "Passwords can't be empty": "Pasahitzak ezin dira hutsik egon",
     "Permissions": "Baimenak",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s erabiltzaileak %(callType)s dei bat hasi du.",
     "Power level must be positive integer.": "Botere maila osoko zenbaki positibo bat izan behar da.",
     "Press <StartChatButton> to start a chat with someone": "Sakatu <StartChatButton> norbaitekin txat bat hasteko",
     "Privacy warning": "Pribatutasun abisua",
@@ -341,16 +320,12 @@
     "Reason: %(reasonText)s": "Arrazoia: %(reasonText)s",
     "Revoke Moderator": "Kendu moderatzaile baimena",
     "Refer a friend to Riot:": "Aipatu Riot lagun bati:",
-    "%(targetName)s rejected the invitation.": "%(targetName)s erabiltzaileak gonbidapena baztertu du.",
     "Reject invitation": "Baztertu gonbidapena",
     "Reject all %(invitedRooms)s invites": "Baztertu %(invitedRooms)s gelarako gonbidapen guztiak",
     "Rejoin": "Berriro elkartu",
     "Remote addresses for this room:": "Gela honen urruneko helbideak:",
     "Remove Contact Information?": "Kendu kontaktuaren informazioa?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s erabiltzaileak bere pantaila-izena kendu du (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia kendu du.",
     "Remove %(threePid)s?": "Kendu %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s erabiltzaileak VoIP konferentzia bat eskatu du.",
     "Resetting 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.": "Oraingoz pasahitza aldatzeak gailu guztietako muturretik muturrerako zifratze-gakoak berrezarriko ditu, eta ezin izango dituzu zifratutako txatetako historialak irakurri ez badituzu aurretik zure gelako gakoak esportatzen eta aldaketa eta gero berriro inportatzen.",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Une honetan egiaztatu gabeko gailuak blokeatzen ari zara, gailu hauetara mezuak bidali ahal izateko egiaztatu behar dituzu.",
     "Results from DuckDuckGo": "DuckDuckGo bilatzaileko emaitzak",
@@ -370,14 +345,11 @@
     "Send anyway": "Bidali hala ere",
     "Send Invites": "Bidali gonbidapenak",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s erabiltzaileak irudi bat bidali du.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %(targetDisplayName)s erbiltzaileari.",
     "Server error": "Zerbitzari-errorea",
     "Server may be unavailable or overloaded": "Zerbitzaria eskuraezin edo gainezka egon daiteke",
     "Server may be unavailable, overloaded, or search timed out :(": "Zerbitzaria eskuraezin edo gainezka egon daiteke, edo bilaketaren denbora muga gainditu da :(",
     "Server may be unavailable, overloaded, or the file too big": "Zerbitzaria eskuraezin edo gainezka egon daiteke edo fitxategia handiegia da",
     "Server unavailable, overloaded, or something else went wrong.": "Zerbitzaria eskuraezin edo gainezka egon daiteke edo zerbaitek huts egin du.",
-    "%(senderName)s set a profile picture.": "%(senderName)s erabiltzaileak profileko argazkia ezarri du.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s erabiltzaileak %(displayName)s ezarri du pantaila izen gisa.",
     "Show panel": "Erakutsi panela",
     "Show Text Formatting Toolbar": "Erakutsi testu-formatuaren tresna-barra",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Erakutsi denbora-zigiluak 12 ordutako formatuan (adib. 2:30pm)",
@@ -410,11 +382,9 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu da, baina ezin izan da aurkitu.",
     "Turn Markdown off": "Desaktibatu Markdown",
     "Turn Markdown on": "Aktibatu Markdown",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s erabiltzaileak muturretik muturrerako (%(algorithm)s algoritmoa) zifratzea aktibatu du.",
     "Unable to add email address": "Ezin izan da e-mail helbidea gehitu",
     "Unable to remove contact information": "Ezin izan da kontaktuaren informazioa kendu",
     "Unable to verify email address.": "Ezin izan da e-mail helbidea egiaztatu.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s erabiltzaileak debekua kendu dio %(targetName)s erabiltzaileari.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Ezin izan da ziurtatu gonbidapen hau zure kontuarekin lotutako helbide batera bidali zela.",
     "Unable to capture screen": "Ezin izan da pantaila-argazkia atera",
     "Unable to enable Notifications": "Ezin izan dira jakinarazpenak gaitu",
@@ -462,7 +432,6 @@
     "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!": "ABISUA: GAKOEN EGIAZTAKETAK HUTS EGIN DU! %(userId)s erabiltzailearen %(deviceId)s gailuaren sinadura-gakoa \"%(fprint)s\" da, eta ez dator bat emandako \"%(fingerprint)s\" gakoarekin. Honek inor komunikazioa antzematen ari dela esan nahi lezake!",
     "Who would you like to add to this room?": "Nor gehitu nahi duzu gela honetara?",
     "Who would you like to communicate with?": "Norekin komunikatu nahi duzu?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s erabiltzaileak atzera bota du %(targetName)s erabiltzailearen gonbidapena.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Gonbidapen hau <acceptText>onartu</acceptText> ala <declineText>ukatu</declineText> nahi duzu?",
     "You already have existing direct chats with this user:": "Baduzu jada txat zuzen bat erabiltzaile honekin:",
     "You are already in a call.": "Bazaude dei batean.",
@@ -603,9 +572,6 @@
     "Start chatting": "Hasi txateatzen",
     "Start Chatting": "Hasi txateatzen",
     "Click on the button below to start chatting!": "Egin klik beheko botoian txateatzen hasteko!",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s erabiltzaileak gelaren abatarra aldatu du beste honetara: <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s erabiltzaileak gelaren abatarra ezabatu du.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s erabiltzaileak %(roomName)s gelaren abatarra aldatu du",
     "Username available": "Erabiltzaile-izena eskuragarri dago",
     "Username not available": "Erabiltzaile-izena ez dago eskuragarri",
     "Something went wrong!": "Zerk edo zerk huts egin du!",
@@ -661,11 +627,8 @@
     "Automatically replace plain text Emoji": "Automatikoki ordezkatu Emoji testu soila",
     "Failed to upload image": "Irudia igotzeak huts egin du",
     "Hide avatars in user and room mentions": "Ezkutatu abatarrak erabiltzaile eta gelen aipamenetan",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s trepeta gehitu du %(senderName)s erabiltzaileak",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s trepeta kendu du %(senderName)s erabiltzaileak",
     "Verifies a user, device, and pubkey tuple": "Erabiltzaile, gailu eta gako publiko multzoa egiaztatzen du",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot egiaztaketa orain ez dago eskuragarri mahaigainean - erabili <a>web nabigatzailea</a>",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s trepeta aldatu du %(senderName)s erabiltzaileak",
     "Copied!": "Kopiatuta!",
     "Failed to copy": "Kopiak huts egin du",
     "Cancel": "Utzi",
@@ -715,7 +678,6 @@
     "Failed to invite users to %(groupId)s": "Huts egin du erabiltzaileak %(groupId)s komunitatera gonbidatzean",
     "Failed to add the following rooms to %(groupId)s:": "Huts egin du honako gela hauek %(groupId)s komunitatera gehitzean:",
     "Restricted": "Mugatua",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s erabiltzaileak gelan finkatutako mezuak aldatu ditu.",
     "%(names)s and %(count)s others are typing|other": "%(names)s eta beste %(count)s idazten ari dira",
     "%(names)s and %(count)s others are typing|one": "%(names)s eta beste bat idazten ari dira",
     "Send": "Bidali",
@@ -955,7 +917,6 @@
     "Community IDs cannot not be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>bidali hala ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
     "<a>In reply to</a> <pill>": "<a>honi erantzunez:</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s erabiltzaileak bere pantaila izena aldatu du %(displayName)s izatera.",
     "Failed to set direct chat tag": "Huts egin du txat zuzenarenaren etiketa jartzean",
     "Failed to remove tag %(tagName)s from room": "Huts egin du %(tagName)s etiketa gelatik kentzean",
     "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean",
@@ -1195,5 +1156,44 @@
     "COPY": "KOPIATU",
     "Share Message": "Partekatu mezua",
     "No Audio Outputs detected": "Ez da audio irteerarik antzeman",
-    "Audio Output": "Audio irteera"
+    "Audio Output": "Audio irteera",
+    "<target> accepted the invitation for %(displayName)s.": "<target> erabiltzaileak %(displayName)s erabiltzailearen gonbidapena onartu du.",
+    "<target> accepted an invitation.": "<target> erabiltzaileak gonbidapena onartu du.",
+    "<sender> requested a VoIP conference.": "<sender> erabiltzaileak VoIP konferentzia bat eskatu du.",
+    "<sender> invited <target>.": "<sender> erabiltzaileak <target> gonbidatu du.",
+    "<sender> banned <target>.": "<sender> erabiltzaileak <target> debekatu du.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> erabiltzaileak bere pantaila izena aldatu du <displayName> izatera.",
+    "<sender> set their display name to <displayName>.": "<sender> erabiltzaileak <displayName> ezarri du pantaila izen gisa.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> erabiltzaileak bere pantaila-izena kendu du (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> erabiltzaileak bere profileko argazkia kendu du.",
+    "<sender> changed their profile picture.": "<sender> erabiltzaileak bere profileko argazkia aldatu du.",
+    "<sender> set a profile picture.": "<sender> erabiltzaileak profileko argazkia ezarri du.",
+    "<target> joined the room.": "<target> erabiltzailea gelara elkartu da.",
+    "<target> rejected the invitation.": "<target> erabiltzaileak gonbidapena baztertu du.",
+    "<target> left the room.": "<target> erabiltzailea gelatik atera da.",
+    "<sender> unbanned <target>.": "<sender> erabiltzaileak debekua kendu dio <target> erabiltzaileari.",
+    "<sender> kicked <target>.": "<sender> erabiltzaileak <target> kanporatu du.",
+    "<sender> withdrew <target>'s invitation.": "<sender> erabiltzaileak atzera bota du <target> erabiltzailearen gonbidapena.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> erabiltzaileak mintzagaia aldatu du beste honetara: \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> erabiltzaileak gelaren izena aldatu du, orain %(roomName)s da.",
+    "<sender> changed the room avatar to <img/>": "<sender> erabiltzaileak gelaren abatarra aldatu du beste honetara: <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> erabiltzaileak %(roomName)s gelaren abatarra aldatu du",
+    "<sender> removed the room name.": "<sender> erabiltzaileak gelaren izena kendu du.",
+    "<sender> removed the room avatar.": "<sender> erabiltzaileak gelaren abatarra ezabatu du.",
+    "<sender> answered the call.": "<sender> erabiltzaileak deia erantzun du.",
+    "<sender> ended the call.": "<sender> erabiltzaileak deia amaitu du.",
+    "<sender> placed a %(callType)s call.": "<sender> erabiltzaileak %(callType)s dei bat hasi du.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %(targetDisplayName)s erbiltzaileari.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
+    "<sender> made future room history visible to all room members.": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
+    "<sender> made future room history visible to anyone.": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du edonorentzat.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du ezezagunentzat (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> erabiltzaileak muturretik muturrerako (%(algorithm)s algoritmoa) zifratzea aktibatu du.",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> %(fromPowerLevel)s mailatik %(toPowerLevel)s mailara",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> erabiltzaileak botere mailaz aldatu du %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> erabiltzaileak gelan finkatutako mezuak aldatu ditu.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s trepeta aldatu du <sender> erabiltzaileak",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s trepeta gehitu du <sender> erabiltzaileak",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s trepeta kendu du <sender> erabiltzaileak"
 }
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index d39091b619..0c207bb505 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -46,7 +46,6 @@
     "%(items)s and %(lastItem)s": "%(items)s ja %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s ja %(lastPerson)s kirjoittavat",
     "A new password must be entered.": "Sinun täytyy syöttää uusi salasana.",
-    "%(senderName)s answered the call.": "%(senderName)s vastasi puheluun.",
     "An error has occurred.": "Virhe.",
     "Anyone": "Kaikki",
     "Anyone who knows the room's link, apart from guests": "Kaikki jotka tietävät huoneen osoitteen, paitsi vieraat",
@@ -57,14 +56,10 @@
     "Are you sure you want to upload the following files?": "Oletko varma että haluat ladata seuraavat tiedostot?",
     "Attachment": "Liite",
     "Autoplay GIFs and videos": "Toista automaattisesti GIF-animaatiot ja videot",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s antoi porttikiellon käyttäjälle %(targetName)s.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Yhdistäminen kotipalvelimeen epäonnistui. Ole hyvä ja tarkista verkkoyhteytesi ja varmista että <a>kotipalvelimen SSL-sertifikaatti</a> on luotettu, ja että jokin selaimen lisäosa ei estä pyyntöjen lähettämisen.",
     "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>.": "Yhdistäminen kotipalveluun HTTP:n avulla ei ole mahdollista kun selaimen osoitepalkissa on HTTPS URL. Käytä joko HTTPS tai <a>salli turvattomat skriptit</a>.",
     "Can't load user settings": "Käyttäjäasetusten lataaminen epäonnistui",
     "Change Password": "Muuta salasana",
-    "%(senderName)s changed their profile picture.": "%(senderName)s muutti profiilikuvansa.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s hyväksyi kutsun.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hyväksyi kutsun käyttäjän %(displayName)s puolesta.",
     "Account": "Tili",
     "and %(count)s others...|other": "ja %(count)s lisää...",
     "and %(count)s others...|one": "ja yksi lisää...",
@@ -294,11 +289,9 @@
     "Uploading %(filename)s and %(count)s others|zero": "Ladataan %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Ladataan %(filename)s ja %(count)s muuta",
     "Blacklisted": "Estetyt",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s muuti huoneen nimeksi %(roomName)s.",
     "Drop here to tag %(section)s": "Pudota tähän tägätäksesi %(section)s",
     "Enable automatic language detection for syntax highlighting": "Ota automaattinen kielentunnistus käyttöön koodin väritystä varten",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Salatut viestit eivät näy ohjelmissa joissa salaus ei ole vielä implementoitu",
-    "%(senderName)s ended the call.": "%(senderName)s lopetti puhelun.",
     "Guest access is disabled on this Home Server.": "Vierailijat on estetty tällä kotipalvelimella.",
     "Guests cannot join this room even if explicitly invited.": "Vierailijat eivät voi liittyä tähän huoneeseen vaikka heidät on eksplisiittisesti kutsuttu.",
     "Hangup": "Lopeta",
@@ -306,15 +299,11 @@
     "Historical": "Vanhat",
     "Home": "Etusivu",
     "Invalid file%(extra)s": "Virheellinen tiedosto%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsui käyttäjän %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s kirjoittaa",
     "none": "Ei mikään",
     "No devices with registered encryption keys": "Ei laitteita joilla rekisteröityjä salausavaimia",
     "No users have specific privileges in this room": "Kellään käyttäjällä ei ole erityisiä oikeuksia",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s soitti %(callType)spuhelun.",
     "Remove %(threePid)s?": "Poista %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s pyysi VoIP konferenssia.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s asetti näyttönimekseen %(displayName)s.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Tiedosto ‘%(fileName)s’ ylittää tämän kotipalvelimen maksimitiedostokoon",
     "The file '%(fileName)s' failed to upload": "Tiedoston ‘%(fileName)s’ lataaminen epäonnistui",
     "This Home Server does not support login using email address.": "Kotipalvelin ei tue kirjatumista sähköpostiosoitteen avulla.",
@@ -327,7 +316,6 @@
     "To link to a room it must have <a>an address</a>.": "Linkittääksesi tähän huoneseen sillä on oltava <a>osoite</a>.",
     "Turn Markdown off": "Ota Markdown pois käytöstä",
     "Turn Markdown on": "Ota Markdown käyttöön",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s otti päästä päähän-salauksen käyttöön (algoritmi %(algorithm)s).",
     "Username invalid: %(errMessage)s": "Virheellinen käyttäjänimi: %(errMessage)s",
     "Users": "Käyttäjät",
     "Verification": "Varmennus",
@@ -437,7 +425,6 @@
     "Verify device": "Varmenna laite",
     "I verify that the keys match": "Totean että avaimet vastaavat toisiaan",
     "Unable to restore session": "Istunnon palautus epäonnistui",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s poisti huoneen nimen.",
     "Changes to who can read history will only apply to future messages in this room": "Muutokset koskien ketkä voivat lukea historian koskevat vain uusia viestejä",
     "<a>Click here</a> to join the discussion!": "<a>Paina tästä</a> liittyäksesi keskusteluun",
     "%(count)s new messages|one": "%(count)s uusi viesti",
@@ -451,9 +438,6 @@
     "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen.",
     "Existing Call": "Käynnissä oleva puhelu",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liity käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>.",
-    "%(targetName)s joined the room.": "%(targetName)s liittyi huoneeseen.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s poisti käyttäjän %(targetName)s huoneesta.",
-    "%(targetName)s left the room.": "%(targetName)s poistui huoneesta.",
     "Publish this room to the public in %(domain)s's room directory?": "Julkaise tämä huone domainin %(domain)s huoneluettelossa?",
     "Missing room_id in request": "room_id puuttuu kyselystä",
     "Missing user_id in request": "user_id puuttuu kyselystä",
@@ -463,9 +447,7 @@
     "Press <StartChatButton> to start a chat with someone": "Paina <StartChatButton>",
     "Revoke Moderator": "Poista moderaattorioikeudet",
     "Refer a friend to Riot:": "Suosittele Riot ystävälle:",
-    "%(targetName)s rejected the invitation.": "%(targetName)s hylkäsi kutsun.",
     "Remote addresses for this room:": "Tämän huoneen etäosoitteet:",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s poisti näyttönimensä (%(oldDisplayName)s).",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riotilla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset",
     "Riot was not given permission to send notifications - please try again": "Riotilla ei saannut oikeuksia lähettää ilmoituksia. Ole hyvä ja yritä uudelleen",
     "Room %(roomId)s not visible": "Huone %(roomId)s ei ole näkyvissä",
@@ -474,7 +456,6 @@
     "Seen by %(userName)s at %(dateTime)s": "Käyttäjän %(userName)s näkemä %(dateTime)s",
     "Send Reset Email": "Lähetä salasanan palautusviesti",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s lähetti kuvan.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s lähetti kutsun käyttäjälle %(targetDisplayName)s liittyäkseen huoneeseen.",
     "Server may be unavailable or overloaded": "Palvelin saattaa olla saavuttamattomissa tai ylikuormitettu",
     "Show Text Formatting Toolbar": "Näytä tekstinmuotoilupalkki",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Näytä aikaleimat 12h muodossa (esim. 2:30pm)",
@@ -490,7 +471,6 @@
     "Unable to remove contact information": "Yhteystietojen poistaminen epäonnistui",
     "Unable to verify email address.": "Sähköpostin varmentaminen epäonnistui.",
     "Unbans user with given id": "Poistaa porttikiellon annetun ID:n omaavalta käyttäjältä",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s poisti porttikiellon käyttäjältä %(targetName)s.",
     "Unable to capture screen": "Ruudun kaappaus epäonnistui",
     "Unable to enable Notifications": "Ilmoitusten käyttöönotto epäonnistui",
     "Unable to load device list": "Laitelistan lataaminen epäonnistui",
@@ -505,7 +485,6 @@
     "User ID": "Käyttäjätunniste",
     "User Interface": "Käyttöliittymä",
     "User name": "Käyttäjänimi",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s asetti aiheeksi \"%(topic)s\".",
     "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.": "Salasanan muuttaminen uudelleenalustaa myös päästä päähän-salausavaimet kaikilla laitteilla, jolloin vanhojen viestien lukeminen ei ole enään mahdollista, ellet ensin vie huoneavaimet ja tuo ne takaisin jälkeenpäin. Tämä tulee muuttumaan tulevaisuudessa.",
     "Define the power level of a user": "Määritä käyttäjän oikeustaso",
     "Failed to change power level": "Oikeustason muuttaminen epäonnistui",
@@ -531,7 +510,6 @@
     "(could not connect media)": "(mediaa ei voitu yhdistää)",
     "WARNING: Device already verified, but keys do NOT MATCH!": "VAROITUS: Laite on jo varmennettu mutta avaimet eivät vastaa toisiaan!",
     "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!": "VAROITUS: AVAIMEN VARMENNUS EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s allekirjoitusavain on \"%(fprint)s\" joka ei vastaa annettua avainta \"%(fingerprint)s\". Tämä saattaa tarkoittaa että viestintäsi siepataan!",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s veti takaisin käyttäjän %(targetName)s kutsun.",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Et ole vielä missään huoneessa! Paina <CreateRoomButton> luodaksesi huoneen tai <RoomDirectoryButton> selatakseski hakemistoa",
     "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": "Sinut on kirjattu ulos kaikista laitteista etkä enää saa Push-ilmoituksia. Jotta saisit jälleen ilmoituksia pitää sinun jälleen kirjautua sisään jokaisella laitteella",
     "You may wish to login with a different account, or add this email to this account.": "Haluat ehkä kirjautua toiseen tiliin tai lisätä tämä sähköpostiosoite tähän tiliin.",
@@ -630,14 +608,6 @@
     "Restricted": "Rajoitettu",
     "You are now ignoring %(userId)s": "Et enää huomioi käyttäjää %(userId)s",
     "You are no longer ignoring %(userId)s": "Huomioit jälleen käyttäjän %(userId)s",
-    "%(senderName)s removed their profile picture.": "%(senderName)s poisti profiilikuvansa.",
-    "%(senderName)s set a profile picture.": "%(senderName)s asetti profiilikuvan.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s muutti tulevat viestit näkyviksi kaikille huoneen jäsenille, alkaen kutsusta huoneeseen.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, liittymisestä asti.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s teki tulevan huonehistorian näkyväksi tuntemattomalle (%(visibility)s).",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s muutti tämän huoneen kiinnitetyt viestit.",
     "%(names)s and %(count)s others are typing|other": "%(names)s ja %(count)s muuta kirjoittavat",
     "%(names)s and %(count)s others are typing|one": "%(names)s ja yksi muu kirjoittvat",
     "Message Pinning": "Kiinnitetyt viestit",
@@ -702,9 +672,6 @@
     "Invalid community ID": "Virheellinen yhteistötunniste",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' on virheellinen yhteisötunniste",
     "New community ID (e.g. +foo:%(localDomain)s)": "Uusi yhteisötunniste (esim. +foo:%(localDomain)s)",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutti huoneen %(roomName)s avatarin",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s poisti huoneen avatarin.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s vaihtoi huoneen kuvaksi <img/>",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Sinut ohjataan kolmannen osapuolen sivustolle jotta voit autentikoida tilisi käyttääksesi %(integrationsUrl)s. Haluatko jatkaa?",
     "Message removed by %(userId)s": "Käyttäjän %(userId)s poistama viesti",
     "Message removed": "Viesti poistettu",
@@ -814,11 +781,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "Ignored user": "Estetyt käyttäjät",
     "Unignored user": "Sallitut käyttäjät",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s tasolta %(fromPowerLevel)s tasolle %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s muutettiin tehotasoa %(powerLevelDiffText)s.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s pienoisohjelmaa muokannut %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s pienoisohjelman lisännyt %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s pienoisohjelman poistanut %(senderName)s",
     "Send": "Lähetä",
     "Delete %(count)s devices|other": "Poista %(count)s laitetta",
     "Delete %(count)s devices|one": "Poista laite",
@@ -1065,5 +1027,43 @@
     "Collapse panel": "Piilota paneeli",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Nykyisellä selaimellasi ohjelman ulkonäkö voi olla aivan virheellinen, ja jotkut ominaisuudet eivät saata toimia. Voit jatkaa jos haluat kokeilla mutta et voi odottaa saavasi apua mahdollisesti ilmeneviin ongelmiin!",
     "Checking for an update...": "Tarkistetaan päivityksen saatavuutta...",
-    "There are advanced notifications which are not shown here": "On kehittyneitä ilmoituksia joita ei näytetä tässä"
+    "There are advanced notifications which are not shown here": "On kehittyneitä ilmoituksia joita ei näytetä tässä",
+    "<target> accepted the invitation for %(displayName)s.": "<target> hyväksyi kutsun käyttäjän %(displayName)s puolesta.",
+    "<target> accepted an invitation.": "<target> hyväksyi kutsun.",
+    "<sender> requested a VoIP conference.": "<sender> pyysi VoIP konferenssia.",
+    "<sender> invited <target>.": "<sender> kutsui käyttäjän <target>.",
+    "<sender> banned <target>.": "<sender> antoi porttikiellon käyttäjälle <target>.",
+    "<sender> set their display name to <displayName>.": "<sender> asetti näyttönimekseen <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> poisti näyttönimensä (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> poisti profiilikuvansa.",
+    "<sender> changed their profile picture.": "<sender> muutti profiilikuvansa.",
+    "<sender> set a profile picture.": "<sender> asetti profiilikuvan.",
+    "<target> joined the room.": "<target> liittyi huoneeseen.",
+    "<target> rejected the invitation.": "<target> hylkäsi kutsun.",
+    "<target> left the room.": "<target> poistui huoneesta.",
+    "<sender> unbanned <target>.": "<sender> poisti porttikiellon käyttäjältä <target>.",
+    "<sender> kicked <target>.": "<sender> poisti käyttäjän <target> huoneesta.",
+    "<sender> withdrew <target>'s invitation.": "<sender> veti takaisin käyttäjän <target> kutsun.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> asetti aiheeksi \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> muuti huoneen nimeksi %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> muutti huoneen %(roomName)s avatarin",
+    "<sender> changed the room avatar to <img/>": "<sender> vaihtoi huoneen kuvaksi <img/>",
+    "<sender> removed the room name.": "<sender> poisti huoneen nimen.",
+    "<sender> removed the room avatar.": "<sender> poisti huoneen avatarin.",
+    "<sender> answered the call.": "<sender> vastasi puheluun.",
+    "<sender> ended the call.": "<sender> lopetti puhelun.",
+    "<sender> placed a %(callType)s call.": "<sender> soitti %(callType)spuhelun.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> lähetti kutsun käyttäjälle %(targetDisplayName)s liittyäkseen huoneeseen.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> muutti tulevat viestit näkyviksi kaikille huoneen jäsenille, alkaen kutsusta huoneeseen.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, liittymisestä asti.",
+    "<sender> made future room history visible to all room members.": "<sender> teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
+    "<sender> made future room history visible to anyone.": "<sender> teki tulevan huonehistorian näkyväksi kaikille.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> teki tulevan huonehistorian näkyväksi tuntemattomalle (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> otti päästä päähän-salauksen käyttöön (algoritmi %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> tasolta %(fromPowerLevel)s tasolle %(toPowerLevel)s",
+    "<sender> changed the pinned messages for the room.": "<sender> muutti tämän huoneen kiinnitetyt viestit.",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> muutettiin tehotasoa %(powerLevelDiffText)s.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s pienoisohjelmaa muokannut <sender>",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s pienoisohjelman lisännyt <sender>",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s pienoisohjelman poistanut <sender>"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8843ad89ca..8c6e6c2998 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -12,7 +12,6 @@
     "Enable encryption": "Activer le chiffrement",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Les messages chiffrés ne seront pas visibles dans les clients qui n’implémentent pas encore le chiffrement",
     "Encrypted room": "Salon chiffré",
-    "%(senderName)s ended the call.": "%(senderName)s a terminé l’appel.",
     "End-to-end encryption information": "Informations sur le chiffrement de bout en bout",
     "End-to-end encryption is in beta and may not be reliable": "Le chiffrement de bout en bout est en bêta et risque de ne pas être fiable",
     "Enter Code": "Saisir le code",
@@ -33,7 +32,6 @@
     "Notifications": "Notifications",
     "Settings": "Paramètres",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un SMS a été envoyé à +%(msisdn)s. Merci de saisir le code de vérification qu'il contient",
-    "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
     "Account": "Compte",
     "Add email address": "Ajouter une adresse e-mail",
     "Add phone number": "Ajouter un numéro de téléphone",
@@ -52,7 +50,6 @@
     "Are you sure you want to upload the following files?": "Voulez-vous vraiment envoyer les fichiers suivants ?",
     "Attachment": "Pièce jointe",
     "Autoplay GIFs and videos": "Jouer automatiquement les GIFs et les vidéos",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.",
     "Ban": "Bannir",
     "Banned users": "Utilisateurs bannis",
     "Bans user with given id": "Bannit l'utilisateur à partir de son identifiant",
@@ -61,10 +58,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Impossible de se connecter au serveur d'accueil en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou <a>activez le support des scripts non-vérifiés</a>.",
     "Can't load user settings": "Impossible de charger les paramètres de l'utilisateur",
     "Change Password": "Changer le mot de passe",
-    "%(senderName)s changed their profile picture.": "%(senderName)s a changé son image de profil.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le rang de %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Les changements de visibilité de l’historique de ce salon ne s’appliquent qu’aux futurs messages",
     "Changes your display nickname": "Change votre nom affiché",
     "Claimed Ed25519 fingerprint key": "Clé d'empreinte Ed25519 déclarée",
@@ -114,11 +107,9 @@
     "Failed to set display name": "Échec de l'enregistrement du nom affiché",
     "Failed to set up conference call": "Échec de l’établissement de la téléconférence",
     "Failed to toggle moderator status": "Échec de l’activation du statut de modérateur",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté l’invitation de %(displayName)s.",
     "Access Token:": "Jeton d’accès :",
     "Always show message timestamps": "Toujours afficher l'heure des messages",
     "Authentication": "Authentification",
-    "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.",
     "An error has occurred.": "Une erreur est survenue.",
     "Email": "E-mail",
     "Failed to unban": "Échec de la révocation du bannissement",
@@ -131,7 +122,6 @@
     "Forget room": "Oublier le salon",
     "Forgot your password?": "Mot de passe oublié ?",
     "For security, this session has been signed out. Please sign in again.": "Par mesure de sécurité, la session a expiré. Merci de vous authentifier à nouveau.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s à %(toPowerLevel)s",
     "Hangup": "Raccrocher",
     "Hide read receipts": "Cacher les accusés de lecture",
     "Hide Text Formatting Toolbar": "Cacher la barre de formatage de texte",
@@ -145,7 +135,6 @@
     "Invalid alias format": "Format d'alias non valide",
     "Invalid address format": "Format d'adresse non valide",
     "Invalid Email Address": "Adresse e-mail non valide",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s a invité %(targetName)s.",
     "Invite new room members": "Inviter de nouveaux membres",
     "Invited": "Invités",
     "Invites": "Invitations",
@@ -155,23 +144,15 @@
     "%(displayName)s is typing": "%(displayName)s écrit",
     "Sign in with": "Se connecter avec",
     "Join Room": "Rejoindre le salon",
-    "%(targetName)s joined the room.": "%(targetName)s a rejoint le salon.",
     "Joins room with given alias": "Rejoint le salon avec l'alias renseigné",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s a exclu %(targetName)s.",
     "Kick": "Exclure",
     "Kicks user with given id": "Exclut l'utilisateur à partir de son identifiant",
     "Labs": "Laboratoire",
     "Leave room": "Quitter le salon",
-    "%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
     "Local addresses for this room:": "Adresses locales pour ce salon :",
     "Logged in as:": "Identifié en tant que :",
     "Logout": "Se déconnecter",
     "Low priority": "Priorité basse",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont rejoint.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s a rendu l'historique visible à tous les membres du salon.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s a rendu l'historique visible à n'importe qui.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s a rendu l'historique visible à inconnu (%(visibility)s).",
     "Manage Integrations": "Gestion des intégrations",
     "Markdown is disabled": "Le formatage Markdown est désactivé",
     "Markdown is enabled": "Le formatage Markdown est activé",
@@ -220,7 +201,6 @@
     "Mute": "Mettre en sourdine",
     "No users have specific privileges in this room": "Aucun utilisateur n’a de privilège spécifique dans ce salon",
     "olm version:": "version de olm :",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s a passé un appel %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez vérifier vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
     "Power level must be positive integer.": "Le niveau d'autorité doit être un entier positif.",
     "Privacy warning": "Alerte de confidentialité",
@@ -229,13 +209,9 @@
     "Reason": "Raison",
     "Revoke Moderator": "Révoquer le modérateur",
     "Refer a friend to Riot:": "Recommander Riot à un ami :",
-    "%(targetName)s rejected the invitation.": "%(targetName)s a rejeté l’invitation.",
     "Reject invitation": "Rejeter l'invitation",
     "Remove Contact Information?": "Supprimer les informations du contact ?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s a supprimé son nom affiché (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s a supprimé son image de profil.",
     "Remove %(threePid)s?": "Supprimer %(threePid)s ?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s a demandé une téléconférence audio.",
     "Resetting 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.": "Pour le moment, réinitialiser le mot de passe va réinitialiser les clés de chiffrement sur tous les appareils, rendant l’historique des salons chiffrés illisible, à moins que vous exportiez d'abord les clés de salon puis que vous les ré-importiez après. Cela sera amélioré prochainement.",
     "Return to login screen": "Retourner à l’écran de connexion",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot n’a pas la permission de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
@@ -254,7 +230,6 @@
     "Send Invites": "Envoyer des invitations",
     "Send Reset Email": "Envoyer l'e-mail de réinitialisation",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s a envoyé une image.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s a invité %(targetDisplayName)s à rejoindre le salon.",
     "Server error": "Erreur du serveur",
     "Server may be unavailable or overloaded": "Le serveur semble être inaccessible ou surchargé",
     "Server may be unavailable, overloaded, or search timed out :(": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
@@ -262,8 +237,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé ou vous avez rencontré un problème.",
     "Server unavailable, overloaded, or something else went wrong.": "Le serveur semble être inaccessible, surchargé ou quelque chose s'est mal passé.",
     "Session ID": "Identifiant de session",
-    "%(senderName)s set a profile picture.": "%(senderName)s a défini une image de profil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a défini son nom affiché comme %(displayName)s.",
     "Show panel": "Dévoiler le panneau",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Afficher l’heure au format am/pm (par ex. 2:30pm)",
     "Signed Out": "Déconnecté",
@@ -298,12 +271,10 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Un instant donné de la chronologie n’a pu être chargé car il n’a pas pu être trouvé.",
     "Turn Markdown off": "Désactiver le formatage ’Markdown’",
     "Turn Markdown on": "Activer le formatage ’Markdown’",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout-en-bout (algorithme %(algorithm)s).",
     "Unable to add email address": "Impossible d'ajouter l'adresse e-mail",
     "Unable to remove contact information": "Impossible de supprimer les informations du contact",
     "Unable to verify email address.": "Impossible de vérifier l’adresse e-mail.",
     "Unban": "Révoquer le bannissement",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s a révoqué le bannissement de %(targetName)s.",
     "Unable to capture screen": "Impossible de capturer l'écran",
     "Unable to enable Notifications": "Impossible d'activer les notifications",
     "Unable to load device list": "Impossible de charger la liste des appareils",
@@ -336,7 +307,6 @@
     "Who can read history?": "Qui peut lire l'historique ?",
     "Who would you like to add to this room?": "Qui voulez-vous ajouter à ce salon ?",
     "Who would you like to communicate with?": "Avec qui voulez-vous communiquer ?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a annulé l’invitation de %(targetName)s.",
     "You are already in a call.": "Vous avez déjà un appel en cours.",
     "You are trying to access %(roomName)s.": "Vous essayez d'accéder à %(roomName)s.",
     "You cannot place a call with yourself.": "Vous ne pouvez pas passer d'appel avec vous-même.",
@@ -405,7 +375,6 @@
     "bullet": "liste à puces",
     "numbullet": "liste numérotée",
     "Please select the destination room for this message": "Merci de sélectionner le salon de destination pour ce message",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s a supprimé le nom du salon.",
     "Analytics": "Collecte de données",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collecte des données anonymes qui nous permettent d’améliorer l’application.",
     "Passphrases must match": "Les phrases de passe doivent être identiques",
@@ -485,9 +454,6 @@
     "Options": "Options",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez-vous continuer ?",
     "Removed or unknown message type": "Type de message inconnu ou supprimé",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s a changé l’avatar du salon en <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l'avatar du salon.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’avatar de %(roomName)s",
     "Device already verified!": "Appareil déjà vérifié !",
     "Export": "Exporter",
     "Guest access is disabled on this Home Server.": "L’accès en tant que visiteur est désactivé sur ce serveur d'accueil.",
@@ -655,8 +621,6 @@
     "Failed to upload image": "Impossible d'envoyer l'image",
     "Hide avatars in user and room mentions": "Masquer les avatars dans les mentions d'utilisateur et de salon",
     "Do you want to load widget from URL:": "Voulez-vous charger le widget depuis l’URL :",
-    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s ajouté par %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s supprimé par %(senderName)s",
     "Publish this room to the public in %(domain)s's room directory?": "Publier ce salon dans le répertoire de salons public de %(domain)s ?",
     "Integrations Error": "Erreur d'intégration",
     "Cannot add any more widgets": "Impossible d'ajouter plus de widgets",
@@ -667,7 +631,6 @@
     "Copied!": "Copié !",
     "Failed to copy": "Échec de la copie",
     "Verifies a user, device, and pubkey tuple": "Vérifie un utilisateur, un appareil et une clé publique",
-    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modifié par %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "La vérification robot n'est pas encore disponible pour le bureau - veuillez utiliser un <a>navigateur</a>",
     "Who would you like to add to this community?": "Qui souhaitez-vous ajouter à cette communauté ?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Attention : toute personne ajoutée à une communauté sera visible par tous ceux connaissant l'identifiant de la communauté",
@@ -712,7 +675,6 @@
     "To modify widgets in the room, you must be a": "Pour modifier les widgets, vous devez être un",
     "Banned by %(displayName)s": "Banni par %(displayName)s",
     "To send messages, you must be a": "Pour envoyer des messages, vous devez être un(e)",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s a changé les messages épinglés du salon.",
     "%(names)s and %(count)s others are typing|other": "%(names)s et %(count)s autres écrivent",
     "Jump to read receipt": "Aller à l'accusé de lecture",
     "World readable": "Lisible publiquement",
@@ -955,7 +917,6 @@
     "Community IDs cannot not be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
     "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom affiché en %(displayName)s.",
     "Failed to set direct chat tag": "Échec de l'ajout de l'étiquette discussion directe",
     "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l'étiquette %(tagName)s du salon",
     "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon",
@@ -1195,5 +1156,44 @@
     "Share Room Message": "Partager le message du salon",
     "Link to selected message": "Lien vers le message sélectionné",
     "COPY": "COPIER",
-    "Share Message": "Partager le message"
+    "Share Message": "Partager le message",
+    "<target> accepted the invitation for %(displayName)s.": "<target> a accepté l’invitation de %(displayName)s.",
+    "<target> accepted an invitation.": "<target> a accepté une invitation.",
+    "<sender> requested a VoIP conference.": "<sender> a demandé une téléconférence audio.",
+    "<sender> invited <target>.": "<sender> a invité <target>.",
+    "<sender> banned <target>.": "<sender> a banni <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> a changé son nom affiché en <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> a défini son nom affiché comme <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> a supprimé son nom affiché (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> a supprimé son image de profil.",
+    "<sender> changed their profile picture.": "<sender> a changé son image de profil.",
+    "<sender> set a profile picture.": "<sender> a défini une image de profil.",
+    "<target> joined the room.": "<target> a rejoint le salon.",
+    "<target> rejected the invitation.": "<target> a rejeté l’invitation.",
+    "<target> left the room.": "<target> a quitté le salon.",
+    "<sender> unbanned <target>.": "<sender> a révoqué le bannissement de <target>.",
+    "<sender> kicked <target>.": "<sender> a exclu <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> a annulé l’invitation de <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> a changé le sujet du salon en \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> a changé le nom du salon en %(roomName)s.",
+    "<sender> changed the room avatar to <img/>": "<sender> a changé l’avatar du salon en <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> a changé l’avatar de %(roomName)s",
+    "<sender> removed the room name.": "<sender> a supprimé le nom du salon.",
+    "<sender> removed the room avatar.": "<sender> a supprimé l'avatar du salon.",
+    "<sender> answered the call.": "<sender> a répondu à l’appel.",
+    "<sender> ended the call.": "<sender> a terminé l’appel.",
+    "<sender> placed a %(callType)s call.": "<sender> a passé un appel %(callType)s.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> a invité %(targetDisplayName)s à rejoindre le salon.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont rejoint.",
+    "<sender> made future room history visible to all room members.": "<sender> a rendu l'historique visible à tous les membres du salon.",
+    "<sender> made future room history visible to anyone.": "<sender> a rendu l'historique visible à n'importe qui.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> a rendu l'historique visible à inconnu (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> a activé le chiffrement de bout-en-bout (algorithme %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s à %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> a changé le rang de %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> a changé les messages épinglés du salon.",
+    "%(widgetName)s widget modified by <sender>": "Widget %(widgetName)s modifié par <sender>",
+    "%(widgetName)s widget added by <sender>": "Widget %(widgetName)s ajouté par <sender>",
+    "%(widgetName)s widget removed by <sender>": "Widget %(widgetName)s supprimé par <sender>"
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 57d8301df6..f61389ad9b 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -111,49 +111,14 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibiu do  dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.",
     "Unrecognised command:": "Orde non recoñecida:",
     "Reason": "Razón",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptou o convite para %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s aceptou o convite.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s solicitou unha conferencia VoIP.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou a %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s bloqueou a %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableceu o seu nome público a %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminou o seu nome público (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s eliminou a súa imaxe de perfil.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s cambiou a súa imaxe de perfil.",
-    "%(senderName)s set a profile picture.": "%(senderName)s estableceu a imaxe de perfil.",
     "VoIP conference started.": "Comezou a conferencia VoIP.",
-    "%(targetName)s joined the room.": "%(targetName)s uniuse a sala.",
     "VoIP conference finished.": "Rematou a conferencia VoIP.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rexeitou a invitación.",
-    "%(targetName)s left the room.": "%(targetName)s deixou a sala.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desbloqueou a %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s expulsou a %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s rexeitou o convite de %(targetName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambiou o asunto a \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminou o nome da sala.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambiou o nome da sala a %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou unha imaxe.",
     "Someone": "Alguén",
     "(not supported by this browser)": "(non soportado por este navegador)",
-    "%(senderName)s answered the call.": "%(senderName)s respondeu a chamada.",
     "(could not connect media)": "(non puido conectar os medios)",
     "(no answer)": "(sen resposta)",
     "(unknown failure: %(reason)s)": "(fallo descoñecido: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s rematou a chamada.",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s estableceu unha chamada %(callType)s.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou un convite a %(targetDisplayName)s para unirse a sala.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para todos os participantes, desde o punto en que foron convidadas.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a todos os participantes, desde o punto en que se uniron.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para todos participantes o historial futuro da sala.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s fixo visible para calquera o historial futuro da sala.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado de par-a-par (algoritmo %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s desde %(fromPowerLevel)s a %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s cambiou o nivel de autoridade a %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambiou as mensaxes fixadas para a sala.",
-    "%(widgetName)s widget modified by %(senderName)s": "O trebello %(widgetName)s modificado por %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "O trebello %(widgetName)s engadido por %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s eliminado por %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s está a escribir",
     "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras están a escribir",
     "%(names)s and %(count)s others are typing|one": "%(names)s e outra está a escribir",
@@ -472,9 +437,6 @@
     "Invalid file%(extra)s": "Ficheiro non válido %(extra)s",
     "Error decrypting image": "Fallo ao descifrar a imaxe",
     "Error decrypting video": "Fallo descifrando vídeo",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s cambiou o avatar para %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eliminou o avatar da sala.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s cambiou o avatar da sala a <img/>",
     "Copied!": "Copiado!",
     "Failed to copy": "Fallo ao copiar",
     "Add an Integration": "Engadir unha integración",
@@ -949,7 +911,6 @@
     "<a>In reply to</a> <pill>": "<a>En resposta a</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá volver a ela sen un convite.",
     "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambiou o seu nome mostrado a %(displayName)s.",
     "Clear filter": "Quitar filtro",
     "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
@@ -1195,5 +1156,44 @@
     "Review terms and conditions": "Revise os termos e condicións",
     "No Audio Outputs detected": "Non se detectou unha saída de audio",
     "Audio Output": "Saída de audio",
-    "Try the app first": "Probe a aplicación primeiro"
+    "Try the app first": "Probe a aplicación primeiro",
+    "<target> accepted the invitation for %(displayName)s.": "<target> aceptou o convite para %(displayName)s.",
+    "<target> accepted an invitation.": "<target> aceptou o convite.",
+    "<sender> requested a VoIP conference.": "<sender> solicitou unha conferencia VoIP.",
+    "<sender> invited <target>.": "<sender> convidou a <target>.",
+    "<sender> banned <target>.": "<sender> bloqueou a <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> cambiou o seu nome mostrado a <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> estableceu o seu nome público a <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> eliminou o seu nome público (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> eliminou a súa imaxe de perfil.",
+    "<sender> changed their profile picture.": "<sender> cambiou a súa imaxe de perfil.",
+    "<sender> set a profile picture.": "<sender> estableceu a imaxe de perfil.",
+    "<target> joined the room.": "<target> uniuse a sala.",
+    "<target> rejected the invitation.": "<target> rexeitou a invitación.",
+    "<target> left the room.": "<target> deixou a sala.",
+    "<sender> unbanned <target>.": "<sender> desbloqueou a <target>.",
+    "<sender> kicked <target>.": "<sender> expulsou a <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> rexeitou o convite de <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> cambiou o asunto a \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> cambiou o nome da sala a %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> cambiou o avatar para %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> cambiou o avatar da sala a <img/>",
+    "<sender> removed the room name.": "<sender> eliminou o nome da sala.",
+    "<sender> removed the room avatar.": "<sender> eliminou o avatar da sala.",
+    "<sender> answered the call.": "<sender> respondeu a chamada.",
+    "<sender> ended the call.": "<sender> rematou a chamada.",
+    "<sender> placed a %(callType)s call.": "<sender> estableceu unha chamada %(callType)s.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> enviou un convite a %(targetDisplayName)s para unirse a sala.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> fixo o historial da sala visible para todos os participantes, desde o punto en que foron convidadas.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> estableceu o historial futuro visible a todos os participantes, desde o punto en que se uniron.",
+    "<sender> made future room history visible to all room members.": "<sender> fixo visible para todos participantes o historial futuro da sala.",
+    "<sender> made future room history visible to anyone.": "<sender> fixo visible para calquera o historial futuro da sala.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> activou o cifrado de par-a-par (algoritmo %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> desde %(fromPowerLevel)s a %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> cambiou o nivel de autoridade a %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> cambiou as mensaxes fixadas para a sala.",
+    "%(widgetName)s widget modified by <sender>": "O trebello %(widgetName)s modificado por <sender>",
+    "%(widgetName)s widget added by <sender>": "O trebello %(widgetName)s engadido por <sender>",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s eliminado por <sender>"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2aea205a15..d0a87414d1 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -16,8 +16,6 @@
     "unknown error code": "ismeretlen hibakód",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Elküldtük a szöveges üzenetet ide: +%(msisdn)s. Kérlek add meg az ellenőrző kódot ami benne van",
     "Accept": "Elfogad",
-    "%(targetName)s accepted an invitation.": "%(targetName)s elfogadta a meghívást.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s elfogadta a meghívást ide: %(displayName)s.",
     "Account": "Fiók",
     "Access Token:": "Elérési kulcs:",
     "Active call (%(roomName)s)": "Hívás folyamatban (%(roomName)s)",
@@ -53,7 +51,6 @@
     "and %(count)s others...|one": "és még egy...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s és %(lastPerson)s írnak",
     "A new password must be entered.": "Új jelszót kell megadni.",
-    "%(senderName)s answered the call.": "%(senderName)s felvette a telefont.",
     "An error has occurred.": "Hiba történt.",
     "Anyone": "Bárki",
     "Anyone who knows the room's link, apart from guests": "A vendégeken kívül bárki aki ismeri a szoba link-jét",
@@ -64,7 +61,6 @@
     "Are you sure you want to upload the following files?": "Biztos feltöltöd ezeket a fájlokat?",
     "Attachment": "Csatolmány",
     "Autoplay GIFs and videos": "GIF-ek és videók automatikus lejátszása",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s kitiltotta őt: %(targetName)s.",
     "Ban": "Kitilt",
     "Banned users": "Kitiltott felhasználók",
     "Bans user with given id": "Kitiltja a felhasználót a megadott ID-vel",
@@ -75,11 +71,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nem lehet csatlakozni a saját szerverhez HTTP-n keresztül ha HTTPS van a böngésző címsorában. Vagy használj HTTPS-t vagy <a>engedélyezd a nem biztonságos script-et</a>.",
     "Can't load user settings": "A felhasználói beállítások nem tölthetők be",
     "Change Password": "Jelszó megváltoztatása",
-    "%(senderName)s changed their profile picture.": "%(senderName)s megváltoztatta a profil képét.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s megváltoztatta a hozzáférési szintjét erre: %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s megváltoztatta a szoba nevét erre: %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s törölte a szoba nevét.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s megváltoztatta a témát erre \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Változtatások a napló olvasási jogosultságon csak a szoba új üzeneteire fog vonatkozni",
     "Changes your display nickname": "Becenév megváltoztatása",
     "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.": "Jelszó megváltoztatása jelenleg alaphelyzetbe állítja a titkosításnál használt kulcsokat minden készüléken, ezzel a régi titkosított üzenetek olvashatatlanok lesznek hacsak először nem mented ki a kulcsokat és újra betöltöd. A jövőben ezen javítunk.",
@@ -150,7 +141,6 @@
     "Encrypted room": "Titkosított szoba",
     "Encryption is enabled in this room": "Ebben a szobában a titkosítás be van kapcsolva",
     "Encryption is not enabled in this room": "Ebben a szobában a titkosítás nincs bekapcsolva",
-    "%(senderName)s ended the call.": "%(senderName)s befejezte a hívást.",
     "End-to-end encryption information": "Ponttól pontig való titkosítási információk",
     "End-to-end encryption is in beta and may not be reliable": "Ponttól pontig tartó titkosítás béta állapotú és lehet, hogy nem megbízható",
     "Enter Code": "Kód megadása",
@@ -190,7 +180,6 @@
     "Forgot your password?": "Elfelejtetted a jelszavad?",
     "For security, this session has been signed out. Please sign in again.": "A biztonság érdekében ez a kapcsolat le lesz bontva. Légy szíves jelentkezz be újra.",
     "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.": "A biztonság érdekében a kilépéskor a ponttól pontig való (E2E) titkosításhoz szükséges kulcsok törlésre kerülnek a böngészőből. Ha a régi üzeneteket továbbra is el szeretnéd olvasni, kérlek mentsed ki a szobákhoz tartozó kulcsot.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s : %(fromPowerLevel)s -> %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Vendég belépés tiltva van a Saját szerveren.",
     "Guests cannot join this room even if explicitly invited.": "Vendégek akkor sem csatlakozhatnak ehhez a szobához ha külön meghívók kaptak.",
     "Hangup": "Megszakít",
@@ -213,7 +202,6 @@
     "Invalid address format": "Hibás cím formátum",
     "Invalid Email Address": "Hibás e-mail cím",
     "Invalid file%(extra)s": "Hibás fájl%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s meghívta: %(targetName)s.",
     "Invite new room members": "Új tagok meghívása",
     "Invited": "Meghívva",
     "Invites": "Meghívók",
@@ -224,26 +212,18 @@
     "Sign in with": "Belépés ezzel:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Csatlakozás <voiceText>hang</voiceText>gal vagy <videoText>videó</videoText>val.",
     "Join Room": "Belépés a szobába",
-    "%(targetName)s joined the room.": "%(targetName)s belépett a szobába.",
     "Joins room with given alias": "A megadott becenévvel belépett a szobába",
     "Jump to first unread message.": "Ugrás az első olvasatlan üzenetre.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kizárta: %(targetName)s.",
     "Kick": "Kirúg",
     "Kicks user with given id": "Az adott azonosítójú felhasználó kirúgása",
     "Labs": "Labor",
     "Last seen": "Utoljára láttuk",
     "Leave room": "Szoba elhagyása",
-    "%(targetName)s left the room.": "%(targetName)s elhagyta a szobát.",
     "Level:": "Szint:",
     "Local addresses for this room:": "A szoba helyi címe:",
     "Logged in as:": "Bejelentkezve mint:",
     "Logout": "Kilép",
     "Low priority": "Alacsony prioritás",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta csatlakozott.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden szoba tagság.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik bárki.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik ismeretlen (%(visibility)s).",
     "Manage Integrations": "Integrációk kezelése",
     "Markdown is disabled": "Markdown kikapcsolva",
     "Markdown is enabled": "Markdown engedélyezett",
@@ -282,7 +262,6 @@
     "People": "Emberek",
     "Permissions": "Jogosultságok",
     "Phone": "Telefon",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s  %(callType)s hívást kezdeményezett.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ellenőrizd az e-mail-edet és kattints a benne lévő linkre. Ha ez megvan, kattints a folytatásra.",
     "Power level must be positive integer.": "A szintnek pozitív egésznek kell lennie.",
     "Private Chat": "Privát csevegés",
@@ -294,15 +273,11 @@
     "Revoke Moderator": "Moderátor visszahívása",
     "Refer a friend to Riot:": "Ismerős meghívása a Riotba:",
     "Register": "Regisztráció",
-    "%(targetName)s rejected the invitation.": "%(targetName)s elutasította a meghívót.",
     "Reject invitation": "Meghívó elutasítása",
     "Rejoin": "Újracsatlakozás",
     "Remote addresses for this room:": "A szoba távoli címei:",
     "Remove Contact Information?": "Kapcsolat információk törlése?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s törölte a megjelenítési nevet (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s törölte a profil képét.",
     "Remove %(threePid)s?": "Töröl: %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konferenciát kezdeményez.",
     "Results from DuckDuckGo": "Eredmények a DuckDuckGo-ból",
     "Return to login screen": "Vissza a bejelentkezési képernyőre",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riotnak nincs jogosultsága értesítést küldeni neked - ellenőrizd  a böngésző beállításait",
@@ -326,7 +301,6 @@
     "Send Invites": "Meghívók elküldése",
     "Send Reset Email": "Visszaállítási e-mail küldése",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s képet küldött.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s meghívót küldött %(targetDisplayName)s felhasználónak, hogy lépjen be a szobába.",
     "Server error": "Szerver hiba",
     "Server may be unavailable or overloaded": "A szerver elérhetetlen vagy túlterhelt",
     "Server may be unavailable, overloaded, or search timed out :(": "A szerver elérhetetlen, túlterhelt vagy a keresés túllépte az időkorlátot :(",
@@ -334,8 +308,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "A szerver elérhetetlen, túlterhelt vagy hibára futott.",
     "Server unavailable, overloaded, or something else went wrong.": "A szerver elérhetetlen, túlterhelt vagy valami más probléma van.",
     "Session ID": "Kapcsolat azonosító",
-    "%(senderName)s set a profile picture.": "%(senderName)s profil képet állított be.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a megjelenítési nevét megváltoztatta erre: %(displayName)s.",
     "Show panel": "Panel megjelenítése",
     "Show Text Formatting Toolbar": "Szöveg formázási eszköztár megjelenítése",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Az időbélyegek 12 órás formátumban mutatása (pl.: 2:30pm)",
@@ -381,12 +353,10 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nem találom.",
     "Turn Markdown off": "Markdown kikapcsolása",
     "Turn Markdown on": "Markdown bekapcsolása",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a  titkosítást ponttól pontig (algoritmus %(algorithm)s).",
     "Unable to add email address": "Az e-mail címet nem sikerült hozzáadni",
     "Unable to remove contact information": "A névjegy információkat nem sikerült törölni",
     "Unable to verify email address.": "Az e-mail cím ellenőrzése sikertelen.",
     "Unban": "Kitiltás visszavonása",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s visszaengedte %(targetName)s felhasználót.",
     "Unable to capture screen": "A képernyő felvétele sikertelen",
     "Unable to enable Notifications": "Az értesítések engedélyezése sikertelen",
     "Unable to load device list": "Az eszközlista betöltése sikertelen",
@@ -440,7 +410,6 @@
     "Who can read history?": "Ki olvashatja a régi üzeneteket?",
     "Who would you like to add to this room?": "Kit szeretnél hozzáadni ehhez a szobához?",
     "Who would you like to communicate with?": "Kivel szeretnél beszélgetni?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s visszavonta %(targetName)s meghívóját.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Ezt a meghívót szeretnéd <acceptText>elfogadni</acceptText> vagy <declineText>elutasítani</declineText>?",
     "You already have existing direct chats with this user:": "Már van közvetlen csevegésed ezzel a felhasználóval:",
     "You are already in a call.": "Már hívásban vagy.",
@@ -590,9 +559,6 @@
     "Start chatting": "Csevegés indítása",
     "Start Chatting": "Csevegés indítása",
     "Click on the button below to start chatting!": "Csevegés indításához kattints a gombra alább!",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s megváltoztatta a szoba avatar képét: <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s törölte a szoba avatar képét.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s megváltoztatta %(roomName)s szoba avatar képét",
     "Username available": "Szabad felhasználói név",
     "Username not available": "A felhasználói név foglalt",
     "Something went wrong!": "Valami tönkrement!",
@@ -664,10 +630,7 @@
     "Publish this room to the public in %(domain)s's room directory?": "Publikálod a szobát a(z) %(domain)s szoba listájába?",
     "NOTE: Apps are not end-to-end encrypted": "Megjegyzés: Az alkalmazások nem végponttól végpontig titkosítottak",
     "The maximum permitted number of widgets have already been added to this room.": "A maximálisan megengedett számú kisalkalmazás már hozzá van adva a szobához.",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s hozzáadta",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s eltávolította",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot ellenőrzés az asztali verzióban nem érhető el - használd a <a>web böngészőt</a>",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s módosította",
     "Copied!": "Lemásolva!",
     "Failed to copy": "Sikertelen másolás",
     "Advanced options": "További beállítások",
@@ -736,7 +699,6 @@
     "Message Pinning": "Üzenet kitűzése",
     "Remove avatar": "Avatar törlése",
     "Pinned Messages": "Kitűzött üzenetek",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s megváltoztatta a szoba kitűzött szövegeit.",
     "Who would you like to add to this community?": "Kit szeretnél hozzáadni ehhez a közösséghez?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Figyelem: minden személy akit hozzáadsz a közösséghez mindenki számára látható lesz aki ismeri a közösség azonosítóját",
     "Invite new community members": "Új tagok meghívása a közösségbe",
@@ -955,7 +917,6 @@
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>.",
     "Community IDs cannot not be empty.": "A közösségi azonosító nem lehet üres.",
     "<a>In reply to</a> <pill>": "<a>Válaszolva neki</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s.",
     "Failed to set direct chat tag": "Nem sikerült a közvetlen beszélgetés jelzést beállítani",
     "Failed to remove tag %(tagName)s from room": "Nem sikerült a szobáról eltávolítani ezt: %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s",
@@ -1195,5 +1156,44 @@
     "Share Room Message": "Szoba üzenet megosztás",
     "Link to selected message": "Hivatkozás a kijelölt üzenetre",
     "COPY": "Másol",
-    "Share Message": "Üzenet megosztása"
+    "Share Message": "Üzenet megosztása",
+    "<target> accepted the invitation for %(displayName)s.": "<target> elfogadta a meghívást ide: %(displayName)s.",
+    "<target> accepted an invitation.": "<target> elfogadta a meghívást.",
+    "<sender> requested a VoIP conference.": "<sender> VoIP konferenciát kezdeményez.",
+    "<sender> invited <target>.": "<sender> meghívta: <target>.",
+    "<sender> banned <target>.": "<sender> kitiltotta őt: <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> megváltoztatta a nevét erre: <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> a megjelenítési nevét megváltoztatta erre: <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> törölte a megjelenítési nevet (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> törölte a profil képét.",
+    "<sender> changed their profile picture.": "<sender> megváltoztatta a profil képét.",
+    "<sender> set a profile picture.": "<sender> profil képet állított be.",
+    "<target> joined the room.": "<target> belépett a szobába.",
+    "<target> rejected the invitation.": "<target> elutasította a meghívót.",
+    "<target> left the room.": "<target> elhagyta a szobát.",
+    "<sender> unbanned <target>.": "<sender> visszaengedte <target> felhasználót.",
+    "<sender> kicked <target>.": "<sender> kizárta: <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> visszavonta <target> meghívóját.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> megváltoztatta a témát erre \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> megváltoztatta a szoba nevét erre: %(roomName)s.",
+    "<sender> changed the room avatar to <img/>": "<sender> megváltoztatta a szoba avatar képét: <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> megváltoztatta %(roomName)s szoba avatar képét",
+    "<sender> removed the room name.": "<sender> törölte a szoba nevét.",
+    "<sender> removed the room avatar.": "<sender> törölte a szoba avatar képét.",
+    "<sender> answered the call.": "<sender> felvette a telefont.",
+    "<sender> ended the call.": "<sender> befejezte a hívást.",
+    "<sender> placed a %(callType)s call.": "<sender>  %(callType)s hívást kezdeményezett.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> meghívót küldött %(targetDisplayName)s felhasználónak, hogy lépjen be a szobába.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta csatlakozott.",
+    "<sender> made future room history visible to all room members.": "<sender> elérhetővé tette a szoba új üzeneteit nekik minden szoba tagság.",
+    "<sender> made future room history visible to anyone.": "<sender> elérhetővé tette a szoba új üzeneteit nekik bárki.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> elérhetővé tette a szoba új üzeneteit nekik ismeretlen (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> bekapcsolta a  titkosítást ponttól pontig (algoritmus %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> : %(fromPowerLevel)s -> %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> megváltoztatta a hozzáférési szintjét erre: %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> megváltoztatta a szoba kitűzött szövegeit.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s kisalkalmazást <sender> módosította",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s kisalkalmazást <sender> hozzáadta",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s kisalkalmazást <sender> eltávolította"
 }
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 86605c1d41..a57b337acf 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -146,8 +146,6 @@
     "Nov": "Nov",
     "Dec": "Des",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Sebuah pesan sudah dikirim ke +%(msisdn)s. Mohon masukkan kode verifikasi pada pesan tersebut",
-    "%(targetName)s accepted an invitation.": "%(targetName)s telah menerima undangan.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s menerima undangan untuk %(displayName)s.",
     "Access Token:": "Token Akses:",
     "Active call (%(roomName)s)": "Panggilan aktif (%(roomName)s)",
     "Admin": "Admin",
@@ -165,22 +163,15 @@
     "A new password must be entered.": "Password baru harus diisi.",
     "%(items)s and %(lastItem)s": "%(items)s dan %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s dan %(lastPerson)s sedang mengetik",
-    "%(senderName)s answered the call.": "%(senderName)s telah menjawab panggilan.",
     "Anyone who knows the room's link, including guests": "Siapa pun yang tahu tautan ruang, termasuk tamu",
     "Anyone who knows the room's link, apart from guests": "Siapa pun yang tahu tautan ruang, selain tamu",
     "Are you sure you want to upload the following files?": "Anda yakin akan mengunggah berkas-berkas berikut?",
     "Blacklisted": "Didaftarhitamkan",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s telah memblokir %(targetName)s.",
     "Banned users": "Pengguna yang diblokir",
     "Bulk Options": "Opsi Massal",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Tidak dapat terhubung ke server Home - harap cek koneksi anda, pastikan <a>sertifikat SSL server Home</a> Anda terpercaya, dan ekstensi dari browser tidak memblokir permintaan.",
     "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>.": "Tidak dapat terhubung ke server Home melalui HTTP ketika URL di browser berupa HTTPS. Pilih gunakan HTTPS atau <a>aktifkan skrip yang tidak aman</a>.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s telah mengubah foto profilnya.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s telah mengubah tingkat kekuatan dari %(powerLevelDiffText)s.",
     "Changes your display nickname": "Ubah tampilan nama panggilan Anda",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s telah menghapus nama ruang.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s telah mengubah nama ruang menjadi %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s telah mengubah topik menjadi \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Pengubahan siapa yang dapat membaca sejarah akan berlaku untuk pesan selanjutnya di ruang ini",
     "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.": "Mengubah password saat ini akan mengatur ulang semua kunci enkripsi end-to-end di semua perangkat, menyebabkan sejarah obrolan yang terenkripsi menjadi tidak dapat dibaca, kecuali sebelumnya Anda ekspor dahulu kunci ruang lalu kemudian impor ulang setelahnya. Ke depan hal ini akan diperbaiki.",
     "<a>Click here</a> to join the discussion!": "<a>Klik di sini</a> untuk gabung diskusi!",
@@ -341,5 +332,14 @@
     "Collapse panel": "Lipat panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Dengan browser ini, tampilan dari aplikasi mungkin tidak sesuai, dan beberapa atau bahkan semua fitur mungkin tidak berjalan. Jika Anda ingin tetap mencobanya, Anda bisa melanjutkan, tapi Anda tanggung sendiri jika muncul masalah yang terjadi!",
     "Checking for an update...": "Cek pembaruan...",
-    "There are advanced notifications which are not shown here": "Ada notifikasi lanjutan yang tidak ditampilkan di sini"
+    "There are advanced notifications which are not shown here": "Ada notifikasi lanjutan yang tidak ditampilkan di sini",
+    "<target> accepted the invitation for %(displayName)s.": "<target> menerima undangan untuk %(displayName)s.",
+    "<target> accepted an invitation.": "<target> telah menerima undangan.",
+    "<sender> banned <target>.": "<sender> telah memblokir <target>.",
+    "<sender> changed their profile picture.": "<sender> telah mengubah foto profilnya.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> telah mengubah topik menjadi \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> telah mengubah nama ruang menjadi %(roomName)s.",
+    "<sender> removed the room name.": "<sender> telah menghapus nama ruang.",
+    "<sender> answered the call.": "<sender> telah menjawab panggilan.",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> telah mengubah tingkat kekuatan dari %(powerLevelDiffText)s."
 }
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 6770a0ea25..28d2faedf7 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -535,11 +535,7 @@
     "Device already verified!": "Tæki er þegar sannreynt!",
     "Verified key": "Staðfestur dulritunarlykill",
     "Unrecognised command:": "Óþekkt skipun:",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s breytti umræðuefninu í \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjarlægði heiti spjallrásarinnar.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s breytti heiti spjallrásarinnar í %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendi mynd.",
-    "%(senderName)s answered the call.": "%(senderName)s svaraði símtalinu.",
     "Disinvite": "Taka boð til baka",
     "Unknown Address": "Óþekkt vistfang",
     "Delete Widget": "Eyða viðmótshluta",
@@ -641,5 +637,9 @@
     "Notify the whole room": "Tilkynna öllum á spjallrásinni",
     "Room Notification": "Tilkynning á spjallrás",
     "Passphrases must match": "Lykilfrasar verða að stemma",
-    "Passphrase must not be empty": "Lykilfrasi má ekki vera auður"
+    "Passphrase must not be empty": "Lykilfrasi má ekki vera auður",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> breytti umræðuefninu í \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> breytti heiti spjallrásarinnar í %(roomName)s.",
+    "<sender> removed the room name.": "<sender> fjarlægði heiti spjallrásarinnar.",
+    "<sender> answered the call.": "<sender> svaraði símtalinu."
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 0957bc156d..4506b20f9f 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -20,8 +20,6 @@
     "OK": "OK",
     "Failed to change password. Is your password correct?": "Modifica password fallita. La tua password è corretta?",
     "Continue": "Continua",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ha accettato un invito.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha accettato l'invito per %(displayName)s.",
     "Account": "Account",
     "Access Token:": "Token di Accesso:",
     "Add": "Aggiungi",
@@ -113,7 +111,6 @@
     "Conference calling is in development and may not be reliable.": "Le chiamate di gruppo sono in sviluppo e potrebbero essere inaffidabili.",
     "Failed to set up conference call": "Impostazione della chiamata di gruppo fallita",
     "Conference call failed.": "Chiamata di gruppo fallita.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha richiesto una conferenza VoIP.",
     "VoIP conference started.": "Conferenza VoIP iniziata.",
     "VoIP conference finished.": "Conferenza VoIP terminata.",
     "Ongoing conference call%(supportedText)s.": "Chiamata di gruppo in corso%(supportedText)s.",
@@ -178,44 +175,12 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La chiave che hai fornito corrisponde alla chiave che hai ricevuto dal dispositivo %(deviceId)s di %(userId)s . Dispositivo segnato come verificato.",
     "Unrecognised command:": "Comando non riconosciuto:",
     "Reason": "Motivo",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha invitato %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha bandito %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha modificato il proprio nome in %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha impostato il proprio nome a %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha rimosso il proprio nome visibile (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ha rimosso la propria immagine del profilo.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s ha cambiato la propria immagine del profilo.",
-    "%(senderName)s set a profile picture.": "%(senderName)s ha impostato un'immagine del profilo.",
-    "%(targetName)s joined the room.": "%(targetName)s è entrato nella stanza.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ha rifiutato l'invito.",
-    "%(targetName)s left the room.": "%(targetName)s è uscito dalla stanza.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha rimosso il ban a %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha cacciato %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha revocato l'invito per %(targetName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha modificato l'argomento in \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha rimosso il nome della stanza.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha modificato il nome della stanza in %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ha inviato un'immagine.",
     "Someone": "Qualcuno",
     "(not supported by this browser)": "(non supportato da questo browser)",
-    "%(senderName)s answered the call.": "%(senderName)s ha risposto alla chiamata.",
     "(could not connect media)": "(connessione del media non riuscita)",
     "(no answer)": "(nessuna risposta)",
     "(unknown failure: %(reason)s)": "(errore sconosciuto: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ha terminato la chiamata.",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha avviato una chiamata %(callType)s .",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha mandato un invito a %(targetDisplayName)s per unirsi alla stanza.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento del loro invito.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento in cui sono entrati.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha reso visibile la futura cronologia della stanza a (%(visibility)s) sconosciuto.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha attivato la crottografia end-to-end (algoritmo %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s da %(fromPowerLevel)s a %(toPowerLevel)s",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha cambiato il messaggio ancorato della stanza.",
-    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificato da %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s aggiunto da %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s rimosso da %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s sta scrivendo",
     "%(names)s and %(count)s others are typing|other": "%(names)s e altri %(count)s stanno scrivendo",
     "%(names)s and %(count)s others are typing|one": "%(names)s e un altro stanno scrivendo",
@@ -416,7 +381,6 @@
     "Historical": "Cronologia",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Impossibile verificare che l'indirizzo al quale questo invito è stato inviato corrisponda a uno associato al tuo account.",
     "Power level must be positive integer.": "Il livello di poteri deve essere un intero positivo.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha modificato il livello di poteri di %(powerLevelDiffText)s.",
     "Jump to read receipt": "Salta alla ricevuta di lettura",
     "This invitation was sent to an email address which is not associated with this account:": "Questo invito è stato mandato a un indirizzo email non associato a questo account:",
     "You may wish to login with a different account, or add this email to this account.": "Dovresti accedere con un account diverso, o aggiungere questa email all'account.",
@@ -518,9 +482,6 @@
     "Invalid file%(extra)s": "File non valido %(extra)s",
     "Error decrypting image": "Errore decifratura immagine",
     "Error decrypting video": "Errore decifratura video",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha cambiato l'avatar per %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s ha rimosso l'avatar della stanza.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha cambiato l'avatar della stanza a <img/>",
     "Copied!": "Copiato!",
     "Failed to copy": "Copia fallita",
     "Add an Integration": "Aggiungi un'integrazione",
@@ -1180,5 +1141,44 @@
     "Replying": "Rispondere",
     "Popout widget": "Oggetto a comparsa",
     "Failed to indicate account erasure": "Impossibile indicare la cancellazione dell'account",
-    "Bulk Options": "Opzioni applicate in massa"
+    "Bulk Options": "Opzioni applicate in massa",
+    "<target> accepted the invitation for %(displayName)s.": "<target> ha accettato l'invito per %(displayName)s.",
+    "<target> accepted an invitation.": "<target> ha accettato un invito.",
+    "<sender> requested a VoIP conference.": "<sender> ha richiesto una conferenza VoIP.",
+    "<sender> invited <target>.": "<sender> ha invitato <target>.",
+    "<sender> banned <target>.": "<sender> ha bandito <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> ha modificato il proprio nome in <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> ha impostato il proprio nome a <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> ha rimosso il proprio nome visibile (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> ha rimosso la propria immagine del profilo.",
+    "<sender> changed their profile picture.": "<sender> ha cambiato la propria immagine del profilo.",
+    "<sender> set a profile picture.": "<sender> ha impostato un'immagine del profilo.",
+    "<target> joined the room.": "<target> è entrato nella stanza.",
+    "<target> rejected the invitation.": "<target> ha rifiutato l'invito.",
+    "<target> left the room.": "<target> è uscito dalla stanza.",
+    "<sender> unbanned <target>.": "<sender> ha rimosso il ban a <target>.",
+    "<sender> kicked <target>.": "<sender> ha cacciato <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> ha revocato l'invito per <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> ha modificato l'argomento in \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> ha modificato il nome della stanza in %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> ha cambiato l'avatar per %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> ha cambiato l'avatar della stanza a <img/>",
+    "<sender> removed the room name.": "<sender> ha rimosso il nome della stanza.",
+    "<sender> removed the room avatar.": "<sender> ha rimosso l'avatar della stanza.",
+    "<sender> answered the call.": "<sender> ha risposto alla chiamata.",
+    "<sender> ended the call.": "<sender> ha terminato la chiamata.",
+    "<sender> placed a %(callType)s call.": "<sender> ha avviato una chiamata %(callType)s .",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> ha mandato un invito a %(targetDisplayName)s per unirsi alla stanza.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento del loro invito.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento in cui sono entrati.",
+    "<sender> made future room history visible to all room members.": "<sender> ha reso visibile la futura cronologia della stanza a tutti i membri della stanza.",
+    "<sender> made future room history visible to anyone.": "<sender> ha reso visibile la futura cronologia della stanza a tutti.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> ha reso visibile la futura cronologia della stanza a (%(visibility)s) sconosciuto.",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ha attivato la crottografia end-to-end (algoritmo %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> da %(fromPowerLevel)s a %(toPowerLevel)s",
+    "<sender> changed the pinned messages for the room.": "<sender> ha cambiato il messaggio ancorato della stanza.",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ha modificato il livello di poteri di %(powerLevelDiffText)s.",
+    "%(widgetName)s widget modified by <sender>": "Widget %(widgetName)s modificato da <sender>",
+    "%(widgetName)s widget added by <sender>": "Widget %(widgetName)s aggiunto da <sender>",
+    "%(widgetName)s widget removed by <sender>": "Widget %(widgetName)s rimosso da <sender>"
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 741de4b551..233430978f 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -17,7 +17,6 @@
     "Hide read receipts": "発言を読んでも既読状態にしない",
     "Invited": "招待中",
     "%(displayName)s is typing": "%(displayName)s 文字入力中",
-    "%(targetName)s joined the room.": "%(targetName)s 部屋に参加しました。",
     "Low priority": "低優先度",
     "Mute": "通知しない",
     "New password": "新しいパスワード",
@@ -240,5 +239,6 @@
     "Checking for an update...": "アップデートを確認しています…",
     "There are advanced notifications which are not shown here": "ここに表示されない詳細な通知があります",
     "Call": "通話",
-    "Answer": "応答"
+    "Answer": "応答",
+    "<target> joined the room.": "<target> 部屋に参加しました。"
 }
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 23b7efd97d..2fb6649f09 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -74,8 +74,6 @@
     "Operation failed": "작업 실패",
     "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했어요. 이 비밀번호가 정말 맞으세요?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "+%(msisdn)s로 문자 메시지를 보냈어요. 인증 번호를 입력해주세요",
-    "%(targetName)s accepted an invitation.": "%(targetName)s님이 초대를 수락했어요.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s님이 %(displayName)s님에게서 초대를 수락했어요.",
     "Access Token:": "접근 토큰:",
     "Active call (%(roomName)s)": "(%(roomName)s)에서 전화를 걸고 받을 수 있어요",
     "Add a topic": "주제 추가",
@@ -85,21 +83,14 @@
     "and %(count)s others...|one": "그리고 다른 하나...",
     "and %(count)s others...|other": "그리고 %(count)s...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s님과 %(lastPerson)s님이 입력중",
-    "%(senderName)s answered the call.": "%(senderName)s님이 전화를 받았어요.",
     "Anyone who knows the room's link, apart from guests": "손님을 제외하고, 방의 주소를 아는 누구나",
     "Anyone who knows the room's link, including guests": "손님을 포함하여, 방의 주소를 아는 누구나",
     "Are you sure you want to reject the invitation?": "초대를 거절하시겠어요?",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 차단하셨어요.",
     "Bans user with given id": "받은 ID로 사용자 차단하기",
     "Bulk Options": "대규모 설정",
     "Call Timeout": "전화 대기 시간 초과",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "홈 서버에 연결할 수 없어요 - 연결을 확인해주시고, <a>홈 서버의 SSL 인증서</a>가 믿을 수 있는지 확인하시고, 브라우저 확장기능이 요청을 차단하고 있는지 확인해주세요.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "주소창에 HTTPS URL이 있을 때는 HTTP로 홈 서버를 연결할 수 없어요. HTTPS를 쓰거나 <a>안전하지 않은 스크립트를 허용해주세요</a>.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s님이 자기 소개 사진을 바꾸셨어요.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s님이 %(powerLevelDiffText)s의 권한 등급을 바꾸셨어요.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s님이 방 이름을 %(roomName)s로 바꾸셨어요.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s님이 방 이름을 지우셨어요.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s님이 주제를 \"%(topic)s\"로 바꾸셨어요.",
     "Changes to who can read history will only apply to future messages in this room": "방의 이후 메시지부터 기록을 읽을 수 있는 조건의 변화가 적용되어요",
     "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.": "비밀번호를 바꾸면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
     "Claimed Ed25519 fingerprint key": "Ed25519 지문 키가 필요",
@@ -151,7 +142,6 @@
     "Encrypted room": "암호화한 방",
     "Encryption is enabled in this room": "이 방은 암호화중이에요",
     "Encryption is not enabled in this room": "이 방은 암호화하고 있지 않아요",
-    "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었어요.",
     "End-to-end encryption information": "종단간 암호화 정보",
     "End-to-end encryption is in beta and may not be reliable": "종단간 암호화는 시험중이며 믿을 수 없어요",
     "Enter Code": "코드를 입력하세요",
@@ -191,7 +181,6 @@
     "Forgot your password?": "비밀번호를 잊어버리셨어요?",
     "For security, this session has been signed out. Please sign in again.": "보안을 위해서, 이 세션에서 로그아웃했어요. 다시 로그인해주세요.",
     "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.": "보안을 위해서, 로그아웃하면 이 브라우저에서 모든 종단간 암호화 키를 없앨 거에요. 이후 라이엇에서 이야기를 해독하고 싶으시면, 방 키를 내보내서 안전하게 보관하세요.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s를 %(fromPowerLevel)s에서 %(toPowerLevel)s로",
     "Guest access is disabled on this Home Server.": "손님은 이 홈 서버에 접근하실 수 없어요.",
     "Guests cannot join this room even if explicitly invited.": "손님은 분명하게 초대받았어도 이 방에 들어가실 수 없어요.",
     "Hangup": "전화 끊기",
@@ -215,7 +204,6 @@
     "Invalid address format": "주소 형식이 맞지 않아요",
     "Invalid Email Address": "이메일 주소가 맞지 않아요",
     "Invalid file%(extra)s": "파일%(extra)s이 맞지 않아요",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 초대하셨어요.",
     "Invite new room members": "새 구성원 초대하기",
     "Invited": "초대받기",
     "Invites": "초대하기",
@@ -226,26 +214,18 @@
     "Sign in with": "로그인",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText>음성</voiceText> 또는 <videoText>영상</videoText>으로 참여하세요.",
     "Join Room": "방에 들어가기",
-    "%(targetName)s joined the room.": "%(targetName)s님이 방에 들어오셨어요.",
     "Joins room with given alias": "받은 가명으로 방에 들어가기",
     "Jump to first unread message.": "읽지 않은 첫 메시지로 이동할래요.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s님이 %(targetName)s을 내쫓았어요.",
     "Kick": "내쫓기",
     "Kicks user with given id": "받은 ID로 사용자 내쫓기",
     "Labs": "실험실",
     "Last seen": "마지막으로 본 곳",
     "Leave room": "방 떠나기",
-    "%(targetName)s left the room.": "%(targetName)s님이 방을 떠나셨어요.",
     "Level:": "등급:",
     "Local addresses for this room:": "이 방의 로컬 주소:",
     "Logged in as:": "로그인:",
     "Logout": "로그아웃",
     "Low priority": "낮은 우선순위",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 방에 들어온 시점부터.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 누구나.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 알 수 없음 (%(visibility)s).",
     "Manage Integrations": "통합 관리",
     "Markdown is disabled": "마크다운이 꺼져있어요",
     "Markdown is enabled": "마크다운이 켜져있어요",
@@ -283,7 +263,6 @@
     "Phone": "전화",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "방을 암호화하면 암호화를 도중에 끌 수 없어요. (현재로서는)",
     "Only people who have been invited": "초대받은 사람만",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s님이 %(callType)s 전화를 걸었어요.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "이메일을 확인하시고 그 안에 있는 주소를 누르세요. 이 일을 하고 나서, 계속하기를 누르세요.",
     "Power level must be positive integer.": "권한 등급은 양의 정수여야만 해요.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (권한 %(powerLevelNumber)s)",
@@ -292,22 +271,17 @@
     "Private Chat": "비공개 이야기",
     "Privileged Users": "권한 있는 사용자",
     "Profile": "자기 소개",
-    "%(senderName)s removed their profile picture.": "%(senderName)s님이 자기 소개 사진을 지우셨어요.",
-    "%(senderName)s set a profile picture.": "%(senderName)s님이 자기 소개 사진을 설정하셨어요.",
     "Public Chat": "공개 이야기",
     "Reason": "이유",
     "Reason: %(reasonText)s": "이유: %(reasonText)s",
     "Revoke Moderator": "조정자 철회",
     "Refer a friend to Riot:": "라이엇을 친구에게 추천해주세요:",
     "Register": "등록",
-    "%(targetName)s rejected the invitation.": "%(targetName)s님이 초대를 거절하셨어요.",
     "Reject invitation": "초대 거절",
     "Rejoin": "다시 들어가기",
     "Remote addresses for this room:": "이 방의 원격 주소:",
     "Remove Contact Information?": "연락처를 지우시겠어요?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s님이 별명 (%(oldDisplayName)s)을 지우셨어요.",
     "Remove %(threePid)s?": "%(threePid)s 지우시겠어요?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s님이 인터넷전화 회의를 요청하셨어요.",
     "Resetting 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.": "비밀번호를 다시 설정하면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
     "Results from DuckDuckGo": "덕덕고에서 검색한 결과",
     "Return to login screen": "로그인 화면으로 돌아가기",
@@ -332,7 +306,6 @@
     "Send Invites": "초대 보내기",
     "Send Reset Email": "재설정 이메일 보내기",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈어요.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s님이 %(targetDisplayName)s님에게 들어오라는 초대를 보냈어요.",
     "Server error": "서버 오류",
     "Server may be unavailable or overloaded": "서버를 쓸 수 없거나 과부하일 수 있어요",
     "Server may be unavailable, overloaded, or search timed out :(": "서버를 쓸 수 없거나 과부하거나, 검색 시간을 초과했어요 :(",
@@ -340,7 +313,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "서버를 쓸 수 없거나 과부하거나, 오류에요.",
     "Server unavailable, overloaded, or something else went wrong.": "서버를 쓸 수 없거나 과부하거나, 다른 문제가 있어요.",
     "Session ID": "세션 ID",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s님이 별명을 %(displayName)s로 바꾸셨어요.",
     "Show panel": "패널 보이기",
     "Show Text Formatting Toolbar": "문자 서식 도구 보이기",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "시간을 12시간제로 보이기 (예. 오후 2:30)",
@@ -384,12 +356,10 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었어요.",
     "Turn Markdown off": "마크다운 끄기",
     "Turn Markdown on": "마크다운 켜기",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s님이 종단간 암호화를 켜셨어요 (알고리즘 %(algorithm)s).",
     "Unable to add email address": "이메일 주소를 추가할 수 없어요",
     "Unable to remove contact information": "연락처를 지울 수 없어요",
     "Unable to verify email address.": "이메일 주소를 인증할 수 없어요.",
     "Unban": "차단풀기",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님의 차단을 푸셨어요.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "이 이매알 주소가 초대를 받은 계정과 연결된 주소가 맞는지 확인할 수 없어요.",
     "Unable to capture screen": "화면을 찍을 수 없어요",
     "Unable to enable Notifications": "알림을 켤 수 없어요",
@@ -443,7 +413,6 @@
     "Who can read history?": "누가 기록을 읽을 수 있나요?",
     "Who would you like to add to this room?": "이 방에 누구를 초대하고 싶으세요?",
     "Who would you like to communicate with?": "누구와 이야기하고 싶으세요?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s님이 %(targetName)s니의 초대를 취소하셨어요.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "초대를 <acceptText>받아들이거나</acceptText> <declineText>거절</declineText>하시겠어요?",
     "You already have existing direct chats with this user:": "이미 이 사용자와 직접 이야기하는 중이에요:",
     "You are already in a call.": "이미 자신이 통화 중이네요.",
@@ -608,9 +577,6 @@
     "Start chatting": "이야기하기",
     "Start Chatting": "이야기하기",
     "Click on the button below to start chatting!": "이야기하려면 아래 버튼을 누르세요!",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s님이 방 아바타를 <img/>로 바꾸셨어요",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s님이 방 아바타를 지우셨어요.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s가 %(roomName)s 방의 아바타를 바꾸셨어요",
     "Username available": "쓸 수 있는 사용자 이름",
     "Username not available": "쓸 수 없는 사용자 이름",
     "Something went wrong!": "문제가 생겼어요!",
@@ -767,5 +733,39 @@
     "Collapse panel": "패널 접기",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "현재 브라우저에서는, 응용 프로그램의 모양과 기능이 완벽하게 맞지 않거나, 일부 혹은 모든 기능이 작동하지 않을 수 있어요. 계속할 수는 있지만, 맞닥뜨리는 모든 문제는 직접 해결하셔야해요!",
     "Checking for an update...": "업데이트를 확인하는 중...",
-    "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요"
+    "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요",
+    "<target> accepted the invitation for %(displayName)s.": "<target>님이 %(displayName)s님에게서 초대를 수락했어요.",
+    "<target> accepted an invitation.": "<target>님이 초대를 수락했어요.",
+    "<sender> requested a VoIP conference.": "<sender>님이 인터넷전화 회의를 요청하셨어요.",
+    "<sender> invited <target>.": "<sender>님이 <target>님을 초대하셨어요.",
+    "<sender> banned <target>.": "<sender>님이 <target>님을 차단하셨어요.",
+    "<sender> set their display name to <displayName>.": "<sender>님이 별명을 <displayName>로 바꾸셨어요.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender>님이 별명 (<oldDisplayName>)을 지우셨어요.",
+    "<sender> removed their profile picture.": "<sender>님이 자기 소개 사진을 지우셨어요.",
+    "<sender> changed their profile picture.": "<sender>님이 자기 소개 사진을 바꾸셨어요.",
+    "<sender> set a profile picture.": "<sender>님이 자기 소개 사진을 설정하셨어요.",
+    "<target> joined the room.": "<target>님이 방에 들어오셨어요.",
+    "<target> rejected the invitation.": "<target>님이 초대를 거절하셨어요.",
+    "<target> left the room.": "<target>님이 방을 떠나셨어요.",
+    "<sender> unbanned <target>.": "<sender>님이 <target>님의 차단을 푸셨어요.",
+    "<sender> kicked <target>.": "<sender>님이 <target>을 내쫓았어요.",
+    "<sender> withdrew <target>'s invitation.": "<sender>님이 <target>니의 초대를 취소하셨어요.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender>님이 주제를 \"%(topic)s\"로 바꾸셨어요.",
+    "<sender> changed the room name to %(roomName)s.": "<sender>님이 방 이름을 %(roomName)s로 바꾸셨어요.",
+    "<sender> changed the room avatar to <img/>": "<sender>님이 방 아바타를 <img/>로 바꾸셨어요",
+    "<sender> changed the avatar for %(roomName)s": "<sender>가 %(roomName)s 방의 아바타를 바꾸셨어요",
+    "<sender> removed the room name.": "<sender>님이 방 이름을 지우셨어요.",
+    "<sender> removed the room avatar.": "<sender>님이 방 아바타를 지우셨어요.",
+    "<sender> answered the call.": "<sender>님이 전화를 받았어요.",
+    "<sender> ended the call.": "<sender>님이 전화를 끊었어요.",
+    "<sender> placed a %(callType)s call.": "<sender>님이 %(callType)s 전화를 걸었어요.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender>님이 %(targetDisplayName)s님에게 들어오라는 초대를 보냈어요.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 방에 들어온 시점부터.",
+    "<sender> made future room history visible to all room members.": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두.",
+    "<sender> made future room history visible to anyone.": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 누구나.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 알 수 없음 (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender>님이 종단간 암호화를 켜셨어요 (알고리즘 %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user>를 %(fromPowerLevel)s에서 %(toPowerLevel)s로",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender>님이 %(powerLevelDiffText)s의 권한 등급을 바꾸셨어요."
 }
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 0c6bcb0977..b1552f91e7 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1,8 +1,6 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Teksta ziņa tika nosūtīta +%(msisdn)s. Lūdzu ievadi tajā atrodamo verifikācijas kodu",
     "Accept": "Pieņemt",
-    "%(targetName)s accepted an invitation.": "%(targetName)s apstiprināja uzaicinājumu.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s apstiprināja uzaicinājumu no %(displayName)s.",
     "Account": "Konts",
     "Access Token:": "Pieejas tokens:",
     "Active call (%(roomName)s)": "Aktīvs zvans (%(roomName)s)",
@@ -30,7 +28,6 @@
     "%(items)s and %(lastItem)s": "%(items)s un %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s un %(lastPerson)s raksta",
     "A new password must be entered.": "Nepieciešams ievadīt jauno paroli.",
-    "%(senderName)s answered the call.": "%(senderName)s atbildēja zvanam.",
     "An error has occurred.": "Notikusi kļūda.",
     "Anyone": "Ikviens",
     "Anyone who knows the room's link, apart from guests": "Ikviens, kurš zina adreses saiti uz istabu, izņemot viesus",
@@ -41,7 +38,6 @@
     "Are you sure you want to upload the following files?": "Vai tiešām vēlies augšuplādēt sekojošos failus?",
     "Attachment": "Pielikums",
     "Autoplay GIFs and videos": "Automātiski rādīt GIF animācijas un video",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s liedza pieeju %(targetName)s.",
     "Ban": "Nobanot/liegt pieeju",
     "Banned users": "Banotie/bloķētie lietotāji (kuriem liegta pieeja)",
     "Bans user with given id": "Bloķē (liedz pieeju) lietotāju pēc uzdotā ID (nobano)",
@@ -52,11 +48,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdodas savienoties ar bāzes serveri izmantojot HTTP protokolu, kad Tava pārlūka adreses laukā norādīts HTTPS protokols. Tā vietā izmanto HTTPS vai <a>iespējo nedrošos skriptus</a>.",
     "Can't load user settings": "Neizdevās ielādēt lietotāja iestatījumus",
     "Change Password": "Paroles maiņa",
-    "%(senderName)s changed their profile picture.": "%(senderName)s nomainīja profila attēlu.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s nomainīja statusa līmeni %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s nomainīja istabas nosaukumu uz %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s dzēsa istabas nosaukumu.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s nomainīja tēmas nosaukumu uz \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Izmaiņas attiecībā uz to, kurš varēs lasīt vēstures ziņas, stāsies spēkā tikai uz ziņām,kuras vēl tiks pievienotas šajā istabā",
     "Changes your display nickname": "Nomaina Tavu publisko segvārdu (niku)",
     "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.": "Paroles maiņa dzēsīs pašreizējās šifrēšanas atslēgas visās savstarpēji saistītajās ierīcēs, padarot čata vēsturi neizlasāmu, ja vien vien istabas atslēgas nav tikušas iepriekš eksportētas un no jauna importētas atpakaļ. Nākotnē to plānojam uzlabot.",
@@ -130,7 +121,6 @@
     "Encrypted room": "Šifrēta istaba",
     "Encryption is enabled in this room": "Šajā istabā šifrēšana ir ieslēgta",
     "Encryption is not enabled in this room": "Šajā istabā šifrēšana ir izslēgta",
-    "%(senderName)s ended the call.": "%(senderName)s beidza zvanu.",
     "End-to-end encryption information": "\"End-to-End\" (ierīce-ierīce) šifrēšanas informācija",
     "End-to-end encryption is in beta and may not be reliable": "\"End-to-end\" (ierīce-ierīce) šifrēšana šobrīd ir beta stadijā, un var nebūt stabila",
     "Enter Code": "Ievadi kodu",
@@ -176,7 +166,6 @@
     "Forgot your password?": "Aizmirsi paroli?",
     "For security, this session has been signed out. Please sign in again.": "Drošības nolūkos, šī sesija ir beigusies. Lūdzu, pieraksties par jaunu.",
     "For security, 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.": "Drošības nolūkos, izrakstīšanās dzēsīs jebkādas ierīce-ierīce šifrēšanas atslēgas no šī pārlūka. Ja Tu vēlies  saglabāt iespēju atšifrēt tavu saziņas vēsturi no Riot nākotnes sesijām, lūdzu eksportē tavas istabas atslēgas, saglabājot tās drošā vietā.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s no %(fromPowerLevel)s uz %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Šajā Bāzes serverī viesu pierakstīšanās nav iespējama.",
     "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai, pat ja ir uzaicināti.",
     "Hangup": "Beigt zvanu",
@@ -199,7 +188,6 @@
     "Invalid address format": "Nepareizs adreses formāts",
     "Invalid Email Address": "Nepareiza epasta adrese",
     "Invalid file%(extra)s": "Nederīgs fails %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s uzaicināja %(targetName)s.",
     "Invite new room members": "Uzaicināt jaunus istabas biedrus",
     "Invited": "Uzaicināts/a",
     "Invites": "Uzaicinājumi",
@@ -210,26 +198,18 @@
     "Sign in with": "Pierakstīties ar",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>AUDIO</voiceText> vai <videoText>VIDEO</videoText>.",
     "Join Room": "Pievienoties istabai",
-    "%(targetName)s joined the room.": "%(targetName)s pievienojās istabai.",
     "Joins room with given alias": "Pievienojas istabai ar minēto aliasi (pseidonīmu)",
     "Jump to first unread message.": "Pāriet uz pirmo neizlasīto ziņu.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s iespēra (kick) %(targetName)s.",
     "Kick": "Izspert/padzīt no istabas (kick)",
     "Kicks user with given id": "Padzen (kick) lietotāju ar norādīto Id",
     "Labs": "Izmēģinājumu lauciņš",
     "Last seen": "Pēdējo reizi redzēts/a",
     "Leave room": "Doties prom no istabas",
-    "%(targetName)s left the room.": "%(targetName)s devās prom no istabas.",
     "Level:": "Līmenis:",
     "Local addresses for this room:": "Šīs istabas lokālās adreses:",
     "Logged in as:": "Pierakstījās kā:",
     "Logout": "Izrakstīties",
     "Low priority": "Zemas prioritātes",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem ar brīdi, kad tie pievienojās.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
     "Manage Integrations": "Pārvaldīt integrācijas",
     "Markdown is disabled": "\"Markdown\" formatēšana izslēgta",
     "Markdown is enabled": "\"Markdown\" formatēšana ieslēgta",
@@ -275,7 +255,6 @@
     "People": "Cilvēki",
     "Permissions": "Atļaujas",
     "Phone": "Telefons",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s veica %(callType)s zvanu.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lūdzu pārbaudi savu epastu un noklikšķini tajā esošo saiti. Tiklīdz tas ir izdarīts, klikšķini \"turpināt\".",
     "Press <StartChatButton> to start a chat with someone": "Nospied <StartChatButton>, lai ar kādu uzsāktu čalošanu",
     "Privacy warning": "Privātuma brīdinājums",
@@ -288,16 +267,12 @@
     "Revoke Moderator": "Atcelt moderatoru",
     "Refer a friend to Riot:": "Rekomendēt draugam Riot:",
     "Register": "Reģistrēties",
-    "%(targetName)s rejected the invitation.": "%(targetName)s noraidīja uzaicinājumu.",
     "Reject invitation": "Noraidīt uzaicinājumu",
     "Rejoin": "Pievienoties atkārtoti",
     "Remote addresses for this room:": "Attālinātā adrese šai istabai:",
     "Remove Contact Information?": "Dzēst kontaktinformāciju?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s dzēsa attēlojamo/redzamo vārdu (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s dzēsa profila attēlu.",
     "Remove": "Dzēst",
     "Remove %(threePid)s?": "Dzēst %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s vēlas VoIP konferenci.",
     "Resetting 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.": "Paroles atiestatīšana atiestatīs visas ierīce-ierīce šifrēšanas atslēgas visās ierīcēs, padarot čata šifrēto ziņu vēsturi nelasāmu, ja vien Tu pirms tam neesi eksportējis savas istabas atslēgas un atkārtoti importējis tās atpakaļ. Nākotnē šo ir plānots uzlabot.",
     "Results from DuckDuckGo": "Rezultāti no DuckDuckGo",
     "Return to login screen": "Atgriezties uz pierakstīšanās lapu",
@@ -314,14 +289,9 @@
     "%(roomName)s is not accessible at this time.": "%(roomName)s šobrīd nav pieejama.",
     "Seen by %(userName)s at %(dateTime)s": "Redzējis %(userName)s %(dateTime)s",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s nosūtīja attēlu.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
-    "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nomainīja attēlojamo/redzamo vārdu uz: %(displayName)s.",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Tevis uzdotā pierakstīšanās atslēga sakrīt ar atslēgu, kuru Tu saņēmi no %(userId)s ierīces %(deviceId)s. Ierīce tika atzīmēta kā verificēta.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Faila '%(fileName)s' izmērs pārsniedz šī Bāzes servera augšupielādes lieluma ierobežojumu",
     "The file '%(fileName)s' failed to upload": "Failu '%(fileName)s' neizdevās nosūtīt (augšuplādēt)",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza \"end-to-end\" (ierīce-ierīce) šifrēšanu (algorithm %(algorithm)s).",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas ierobežojumu (atbanoja) %(targetName)s.",
     "Unknown room %(roomId)s": "Nezināma istaba %(roomId)s",
     "Uploading %(filename)s and %(count)s others|zero": "Tiek augšuplādēts %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Tiek augšuplādēts %(filename)s un %(count)s citi",
@@ -330,7 +300,6 @@
     "Username invalid: %(errMessage)s": "Neatbilstošs lietotājvārds: %(errMessage)s",
     "(unknown failure: %(reason)s)": "(nezināma kļūda: %(reason)s)",
     "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!": "BRĪDINĀJUMS: NEIZDEVĀS VERIFICĒT ATSLĒGU! Pierakstīšanās atslēga priekš %(userId)s un ierīces %(deviceId)s ir \"%(fprint)s\", kura nesakrīt ar ievadīto atslēgu \"%(fingerprint)s\". Tas var nozīmēt, ka Tava saziņa var tikt pārtverta!",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s atsauca %(targetName)s uzaicinājumu.",
     "You are trying to access %(roomName)s.": "Tu mēģini piekļūt %(roomName)s.",
     "You have been banned from %(roomName)s by %(userName)s.": "Tev ir liegta pieeja istabai %(roomName)s no %(userName)s.",
     "You have been invited to join this room by %(inviterName)s": "%(inviterName)s Tevi uzaicināja pievienoties šai istabai",
@@ -348,8 +317,6 @@
     "You are registering with %(SelectedTeamName)s": "Tu reģistrējies ar %(SelectedTeamName)s",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Notiek Tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
     "Ongoing conference call%(supportedText)s.": "Notiekošs konferences zvans %(supportedText)s.",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas avataru.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja istabas avataru %(roomName)s",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "Tu pievienoji jaunu ierīci '%(displayName)s', kas prasa šifrēšanas atslēgas.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Tava neverificētā ierīce '%(displayName)s' pieprasa šifrēšanas atslēgas.",
     "Room Colour": "Istabas krāsa",
@@ -510,7 +477,6 @@
     "Nov": "Nov.",
     "Dec": "Dec.",
     "Set a display name:": "Iestatīt attēloto vārdu:",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s nomainīja istabas avataru uz <img/>",
     "Upload an avatar:": "Augšuplādē avataru (profila attēlu):",
     "This server does not support authentication with a phone number.": "Šis serveris neatbalsta autentifikāciju pēc telefona numura.",
     "Missing password.": "Trūkst parole.",
@@ -663,8 +629,6 @@
     "Automatically replace plain text Emoji": "Automātiski aizvietot tekstu ar emocīšiem (emoji)",
     "Failed to upload image": "Neizdevās augšupielādēt attēlu",
     "Hide avatars in user and room mentions": "Slēpt profila attēlus lietotāja un istabas pieminējumos",
-    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pievienoja %(widgetName)s vidžetu",
-    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s dzēsa vidžetu %(widgetName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robotu pārbaude šobrīd nav pieejama darbvirsmas versijā. Lūdzu izmanto <a>web pārlūku</a>",
     "Revoke widget access": "Atsaukt vidžeta piekļuvi",
     "Unpin Message": "Atkabināt ziņu",
@@ -712,9 +676,6 @@
     "You are now ignoring %(userId)s": "Tagad Tu ignorē %(userId)s",
     "Unignored user": "Atignorēts lietotājs",
     "You are no longer ignoring %(userId)s": "Tu vairāk neignorē %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s nomainīja savu attēlojamo/redzamo vārdu uz %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s šai istabai nomainīja piestiprinātās ziņas.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s un %(count)s citi raksta",
     "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta",
     "Message Pinning": "Ziņu piekabināšana",
@@ -1126,5 +1087,44 @@
     "Collapse panel": "Sakļaut (saritināt) paneli",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Tavā pašreizējā pārlūkā aplikācijas izskats un uzvedība var būt pilnīgi neatbilstoša, kā arī dažas no visām funkcijām var nedarboties. Ja vēlies turpināt izmantot šo pārlūku, Tu vari arī turpināt, apzinoties, ka šajā gadījumā esi viens/a ar iespējamo problēmu!",
     "Checking for an update...": "Lūkojos pēc aktualizācijas...",
-    "There are advanced notifications which are not shown here": "Pastāv papildus paziņojumi, kuri šeit netiek rādīti"
+    "There are advanced notifications which are not shown here": "Pastāv papildus paziņojumi, kuri šeit netiek rādīti",
+    "<target> accepted the invitation for %(displayName)s.": "<target> apstiprināja uzaicinājumu no %(displayName)s.",
+    "<target> accepted an invitation.": "<target> apstiprināja uzaicinājumu.",
+    "<sender> requested a VoIP conference.": "<sender> vēlas VoIP konferenci.",
+    "<sender> invited <target>.": "<sender> uzaicināja <target>.",
+    "<sender> banned <target>.": "<sender> liedza pieeju <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> nomainīja savu attēlojamo/redzamo vārdu uz <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> nomainīja attēlojamo/redzamo vārdu uz: <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> dzēsa attēlojamo/redzamo vārdu (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> dzēsa profila attēlu.",
+    "<sender> changed their profile picture.": "<sender> nomainīja profila attēlu.",
+    "<sender> set a profile picture.": "<sender> uzstādīja profila attēlu.",
+    "<target> joined the room.": "<target> pievienojās istabai.",
+    "<target> rejected the invitation.": "<target> noraidīja uzaicinājumu.",
+    "<target> left the room.": "<target> devās prom no istabas.",
+    "<sender> unbanned <target>.": "<sender> atcēla pieejas ierobežojumu (atbanoja) <target>.",
+    "<sender> kicked <target>.": "<sender> iespēra (kick) <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> atsauca <target> uzaicinājumu.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> nomainīja tēmas nosaukumu uz \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> nomainīja istabas nosaukumu uz %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> nomainīja istabas avataru %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> nomainīja istabas avataru uz <img/>",
+    "<sender> removed the room name.": "<sender> dzēsa istabas nosaukumu.",
+    "<sender> removed the room avatar.": "<sender> dzēsa istabas avataru.",
+    "<sender> answered the call.": "<sender> atbildēja zvanam.",
+    "<sender> ended the call.": "<sender> beidza zvanu.",
+    "<sender> placed a %(callType)s call.": "<sender> veica %(callType)s zvanu.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem ar brīdi, kad tie pievienojās.",
+    "<sender> made future room history visible to all room members.": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
+    "<sender> made future room history visible to anyone.": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ieslēdza \"end-to-end\" (ierīce-ierīce) šifrēšanu (algorithm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> no %(fromPowerLevel)s uz %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> nomainīja statusa līmeni %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> šai istabai nomainīja piestiprinātās ziņas.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s vidžets, kuru mainīja <sender>",
+    "%(widgetName)s widget added by <sender>": "<sender> pievienoja %(widgetName)s vidžetu",
+    "%(widgetName)s widget removed by <sender>": "<sender> dzēsa vidžetu %(widgetName)s"
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 1ba068daa0..90c9bf799e 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1,7 +1,5 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Voer alsjeblieft de verificatiecode in die is verstuurd naar +%(msisdn)s",
-    "%(targetName)s accepted an invitation.": "%(targetName)s heeft een uitnodiging geaccepteerd.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s heeft de uitnodiging voor %(displayName)s geaccepteerd.",
     "Account": "Account",
     "Access Token:": "Toegangstoken:",
     "Add email address": "Voeg een e-mailadres toe",
@@ -16,7 +14,6 @@
     "and %(count)s others...|one": "en één andere...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s en %(lastPerson)s zijn aan het typen",
     "A new password must be entered.": "Er moet een nieuw wachtwoord worden ingevoerd.",
-    "%(senderName)s answered the call.": "%(senderName)s heeft deelgenomen aan het audiogesprek.",
     "An error has occurred.": "Er is een fout opgetreden.",
     "Anyone who knows the room's link, apart from guests": "Iedereen die de link van de ruimte weet, behalve gasten",
     "Anyone who knows the room's link, including guests": "Iedereen die link van de ruimte weet, inclusief gasten",
@@ -24,7 +21,6 @@
     "Are you sure you want to reject the invitation?": "Weet je zeker dat je de uitnodiging wilt weigeren?",
     "Attachment": "Bijlage",
     "Autoplay GIFs and videos": "Start GIFs en videos automatisch",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s heeft %(targetName)s verbannen.",
     "Ban": "Verban",
     "Banned users": "Verbannen gebruikers",
     "Bans user with given id": "Verbant de gebruiker met het gegeven ID",
@@ -34,10 +30,6 @@
     "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 niet met de thuisserver verbinden via HTTP wanneer er een HTTPS-URL in je browser balk staat. Gebruik HTTPS of <a>activeer onveilige scripts</a>.",
     "Can't load user settings": "Kan de gebruikersinstellingen niet laden",
     "Change Password": "Wachtwoord veranderen",
-    "%(senderName)s changed their profile picture.": "%(senderName)s heeft zijn of haar profielfoto veranderd.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de ruimtenaam van %(roomName)s gewijzigd.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s heeft het onderwerp gewijzigd naar \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Veranderingen aan wie de geschiedenis kan lezen worden alleen maar toegepast op toekomstige berichten in deze ruimte",
     "Changes your display nickname": "Verandert jouw weergavenaam",
     "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.": "Het veranderen van het wachtwoord zal op het moment alle eind-tot-eind encryptie sleutels resetten, wat alle versleutelde gespreksgeschiedenis onleesbaar zou maken, behalve als je eerst je ruimtesleutels exporteert en achteraf opnieuw importeert. Dit zal worden verbeterd in de toekomst.",
@@ -122,7 +114,6 @@
     "People": "Mensen",
     "Permissions": "Toestemmingen",
     "Phone": "Telefoonnummer",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s heeft een %(callType)s-gesprek gestart.",
     "Privacy warning": "Privacywaarschuwing",
     "Private Chat": "Privégesprek",
     "Privileged Users": "Gebruikers met rechten",
@@ -133,7 +124,6 @@
     "Revoke Moderator": "Beheerder terugtrekken",
     "Refer a friend to Riot:": "Laat een vriend weten over Riot:",
     "Register": "Registreer",
-    "%(targetName)s rejected the invitation.": "%(targetName)s heeft de uitnodiging geweigerd.",
     "Reject invitation": "Uitnodiging weigeren",
     "Rejoin": "Opnieuw toetreden",
     "Remote addresses for this room:": "Adres op afstand voor deze ruimte:",
@@ -174,7 +164,6 @@
     "Create an account": "Open een account",
     "Cryptography": "Cryptografie",
     "Current password": "Huidig wachtwoord",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de naam van de ruimte verwijderd.",
     "Create a new chat or reuse an existing one": "Maak een nieuw gesprek aan of hergebruik een al bestaand gesprek",
     "Create Room": "Maak een ruimte aan",
     "Curve25519 identity key": "Curve25519-identiteitssleutel",
@@ -220,7 +209,6 @@
     "Encrypted room": "Versleutelde ruimte",
     "Encryption is enabled in this room": "Versleuteling is ingeschakeld in deze ruimte",
     "Encryption is not enabled in this room": "Versleuteling is niet ingeschakeld in deze ruimte",
-    "%(senderName)s ended the call.": "%(senderName)s heeft opgehangen.",
     "End-to-end encryption information": "end-to-endbeveiligingsinformatie",
     "End-to-end encryption is in beta and may not be reliable": "End-to-endbeveiliging is nog in bèta en kan onbetrouwbaar zijn",
     "Enter Code": "Voer code in",
@@ -259,7 +247,6 @@
     "Forgot your password?": "Wachtwoord vergeten?",
     "For security, this session has been signed out. Please sign in again.": "Voor veiligheidsredenen is deze sessie uitgelogd. Log alsjeblieft opnieuw in.",
     "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 deze ruimte toetreden, zelfs als ze expliciet uitgenodigd zijn.",
     "Hangup": "Ophangen",
@@ -282,7 +269,6 @@
     "Invalid address format": "Ongeldig adresformaat",
     "Invalid Email Address": "Ongeldig e-mailadres",
     "Invalid file%(extra)s": "Ongeldig bestand%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s heeft %(targetName)s uitgenodigd.",
     "Invite new room members": "Nieuwe ruimte leden uitnodigen",
     "Invited": "Uitgenodigd",
     "Invites": "Uitnodigingen",
@@ -293,23 +279,16 @@
     "Sign in with": "Inloggen met",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Toetreden als <voiceText>spraak</voiceText> of <videoText>video</videoText>.",
     "Join Room": "Ruimte toetreden",
-    "%(targetName)s joined the room.": "%(targetName)s is tot de ruimte toegetreden.",
     "Joins room with given alias": "Treed de ruimte toe met een gegeven naam",
     "Jump to first unread message.": "Spring naar het eerste ongelezen bericht.",
     "Labs": "Labs",
     "Last seen": "Laatst gezien",
     "Leave room": "Ruimte verlaten",
-    "%(targetName)s left the room.": "%(targetName)s heeft de ruimte verlaten.",
     "Level:": "Niveau:",
     "Local addresses for this room:": "Lokale adressen voor deze ruimte:",
     "Logged in as:": "Ingelogd als:",
     "Logout": "Uitloggen",
     "Low priority": "Lage prioriteit",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze uitgenodigd zijn.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze toegetreden zijn.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor iedereen.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
     "Manage Integrations": "Integraties beheren",
     "Markdown is disabled": "Markdown is uitgeschakeld",
     "Markdown is enabled": "Markdown ingeschakeld",
@@ -328,12 +307,9 @@
     "Only people who have been invited": "Alleen personen die zijn uitgenodigd",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bekijk je e-mail en klik op de link die het bevat. Zodra dit klaar is, klik op verder gaan.",
     "Power level must be positive integer.": "Machtsniveau moet een positief geheel getal zijn.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s heeft zijn of haar weergavenaam (%(oldDisplayName)s) verwijderd.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s heeft zijn of haar profielfoto verwijderd.",
     "Failed to kick": "Niet gelukt om te er uit te zetten",
     "Press <StartChatButton> to start a chat with someone": "Druk op <StartChatButton> om een gesprek met iemand te starten",
     "Remove %(threePid)s?": "%(threePid)s verwijderen?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s heeft een VoIP-gesprek aangevraagd.",
     "Resetting 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.": "Het wachtwoord veranderen betekent momenteel dat alle end-to-endbeveiligingssleutels op alle apparaten veranderen waardoor versleutelde gespreksgeschiedenis onleesbaar wordt, behalve als je eerst de ruimte sleutels exporteert en daarna opnieuw importeert. Dit zal in de toekomst verbeterd worden.",
     "Results from DuckDuckGo": "Resultaten van DuckDuckGo",
     "Return to login screen": "Naar het inlogscherm terugkeren",
@@ -357,7 +333,6 @@
     "Sender device information": "Afzenderapparaatinformatie",
     "Send Reset Email": "Stuur Reset-E-mail",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s stuurde een afbeelding.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s stuurde een uitnodiging naar %(targetDisplayName)s om tot de ruimte toe te treden.",
     "Server error": "Serverfout",
     "Server may be unavailable or overloaded": "De server kan onbereikbaar of overbelast zijn",
     "Server may be unavailable, overloaded, or search timed out :(": "De server is misschien onbereikbaar, overbelast of het zoeken duurde te lang :(",
@@ -365,11 +340,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "De server is misschien onbereikbaar, overbelast of je bent tegen een fout aangelopen.",
     "Server unavailable, overloaded, or something else went wrong.": "De server is onbereikbaar, overbelast of iets anders ging fout.",
     "Session ID": "Sessie-ID",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s heeft %(targetName)s de ruimte uitgestuurd.",
     "Kick": "Er uit sturen",
     "Kicks user with given id": "Stuurt de gebruiker met het gegeven ID er uit",
-    "%(senderName)s set a profile picture.": "%(senderName)s heeft een profielfoto ingesteld.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s heeft zijn of haar weergavenaam naar %(displayName)s veranderd.",
     "Show panel": "Paneel weergeven",
     "Show Text Formatting Toolbar": "Tekstopmaakwerkbalk Weergeven",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Laat de tijd in twaalf uur formaat zien (bijv. 2:30pm)",
@@ -407,12 +379,10 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Het is niet gelukt om een specifiek punt in de tijdlijn van deze ruimte te laden.",
     "Turn Markdown off": "Zet Markdown uit",
     "Turn Markdown on": "Zet Markdown aan",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft end-to-endbeveiliging aangezet (algoritme %(algorithm)s).",
     "Unable to add email address": "Niet mogelijk om e-mailadres toe te voegen",
     "Unable to remove contact information": "Niet mogelijk om contactinformatie te verwijderen",
     "Unable to verify email address.": "Niet mogelijk om het e-mailadres te verifiëren.",
     "Unban": "Ontbannen",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ontbande %(targetName)s.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Niet mogelijk om vast te stellen dat het adres waar deze uitnodiging naartoe was verstuurd overeenkomt met het adres dat is geassocieerd met je account.",
     "Unable to capture screen": "Niet mogelijk om het scherm vast te leggen",
     "Unable to enable Notifications": "Niet mogelijk om notificaties aan te zetten",
@@ -468,7 +438,6 @@
     "Who can read history?": "Wie kan de geschiedenis lezen?",
     "Who would you like to add to this room?": "Wie wil je aan deze ruimte toevoegen?",
     "Who would you like to communicate with?": "Met wie zou je willen communiceren?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trok %(targetName)s's uitnodiging terug.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Wil je deze uitnodiging <acceptText>accepteren</acceptText> of <declineText>afwijzen</declineText>?",
     "You already have existing direct chats with this user:": "Je hebt al bestaande privé-gesprekken met deze gebruiker:",
     "You are already in a call.": "Je bent al in gesprek.",
@@ -609,9 +578,6 @@
     "Start chatting": "Start met praten",
     "Start Chatting": "Start Met Praten",
     "Click on the button below to start chatting!": "Klik op de knop hieronder om te starten met praten!",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s heeft de ruimte avatar aangepast naar <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s heeft de ruimte avatar verwijderd.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s veranderde de avatar voor %(roomName)s",
     "Username available": "Gebruikersnaam beschikbaar",
     "Username not available": "Gebruikersnaam niet beschikbaar",
     "Something went wrong!": "Iets ging niet goed!",
@@ -664,10 +630,7 @@
     "Automatically replace plain text Emoji": "Automatisch normale tekst vervangen met Emoji",
     "Failed to upload image": "Het is niet gelukt om de afbeelding te uploaden",
     "Hide avatars in user and room mentions": "Avatars in gebruiker- en ruimte-vermeldingen verbergen",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget toegevoegd door %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget verwijderd door %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot-check is momenteel niet beschikbaar op de desktop - gebruik in plaats daarvan een <a>webbrowser</a>",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget aangepast door %(senderName)s",
     "Copied!": "Gekopieerd!",
     "Failed to copy": "Kopiëren mislukt",
     "Unpin Message": "Maak pin los",
@@ -700,7 +663,6 @@
     "You are now ignoring %(userId)s": "Je bent nu %(userId)s aan het negeren",
     "Unignored user": "Niet genegeerde gebruiker",
     "You are no longer ignoring %(userId)s": "Je bent %(userId)s niet meer aan het negeren",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s heeft de gepinde boodschappen voor de ruimte gewijzigd.",
     "%(names)s and %(count)s others are typing|other": "%(names)s en %(count)s andere gebruikers zijn aan het typen",
     "%(names)s and %(count)s others are typing|one": "%(names)s en iemand anders is aan het typen",
     "Send": "Verstuur",
@@ -956,7 +918,6 @@
     "<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.": "Deze ruimte is niet publiekelijk. Je zal niet opnieuw kunnen toetreden zonder een uitnodiging.",
     "were unbanned %(count)s times|one": "waren ontbant",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s heeft zijn/haar weergavenaam veranderd naar %(displayName)s.",
     "Disable Community Filter Panel": "Gemeenschapsfilterpaneel uitzetten",
     "Your key share request has been sent - please check your other devices for key share requests.": "Je verzoek om sleutels te delen is verzonden - controleer je andere apparaten voor het verzoek.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Verzoeken om sleutels te delen worden automatisch naar andere apparaten verstuurd. Als je het verzoek hebt afgewezen of weg hebt geklikt, klik dan hier voor een nieuwe verzoek voor de sleutels van deze sessie.",
@@ -1180,5 +1141,44 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Deze ruimte wordt gebruikt voor belangrijke berichten van de thuisserver, dus je kan het niet verlaten.",
     "Terms and Conditions": "Voorwaarden",
     "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 zal je de voorwaarden moeten lezen en ermee akkoord moeten gaan.",
-    "Review terms and conditions": "Voorwaarden lezen"
+    "Review terms and conditions": "Voorwaarden lezen",
+    "<target> accepted the invitation for %(displayName)s.": "<target> heeft de uitnodiging voor %(displayName)s geaccepteerd.",
+    "<target> accepted an invitation.": "<target> heeft een uitnodiging geaccepteerd.",
+    "<sender> requested a VoIP conference.": "<sender> heeft een VoIP-gesprek aangevraagd.",
+    "<sender> invited <target>.": "<sender> heeft <target> uitgenodigd.",
+    "<sender> banned <target>.": "<sender> heeft <target> verbannen.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> heeft zijn/haar weergavenaam veranderd naar <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> heeft zijn of haar weergavenaam naar <displayName> veranderd.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> heeft zijn of haar weergavenaam (<oldDisplayName>) verwijderd.",
+    "<sender> removed their profile picture.": "<sender> heeft zijn of haar profielfoto verwijderd.",
+    "<sender> changed their profile picture.": "<sender> heeft zijn of haar profielfoto veranderd.",
+    "<sender> set a profile picture.": "<sender> heeft een profielfoto ingesteld.",
+    "<target> joined the room.": "<target> is tot de ruimte toegetreden.",
+    "<target> rejected the invitation.": "<target> heeft de uitnodiging geweigerd.",
+    "<target> left the room.": "<target> heeft de ruimte verlaten.",
+    "<sender> unbanned <target>.": "<sender> ontbande <target>.",
+    "<sender> kicked <target>.": "<sender> heeft <target> de ruimte uitgestuurd.",
+    "<sender> withdrew <target>'s invitation.": "<sender> trok <target>'s uitnodiging terug.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> heeft het onderwerp gewijzigd naar \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> heeft de ruimtenaam van %(roomName)s gewijzigd.",
+    "<sender> changed the room avatar to <img/>": "<sender> heeft de ruimte avatar aangepast naar <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> veranderde de avatar voor %(roomName)s",
+    "<sender> removed the room name.": "<sender> heeft de naam van de ruimte verwijderd.",
+    "<sender> removed the room avatar.": "<sender> heeft de ruimte avatar verwijderd.",
+    "<sender> answered the call.": "<sender> heeft deelgenomen aan het audiogesprek.",
+    "<sender> ended the call.": "<sender> heeft opgehangen.",
+    "<sender> placed a %(callType)s call.": "<sender> heeft een %(callType)s-gesprek gestart.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> stuurde een uitnodiging naar %(targetDisplayName)s om tot de ruimte toe te treden.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze uitgenodigd zijn.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze toegetreden zijn.",
+    "<sender> made future room history visible to all room members.": "<sender> heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers.",
+    "<sender> made future room history visible to anyone.": "<sender> heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor iedereen.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> heeft end-to-endbeveiliging aangezet (algoritme %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> van %(fromPowerLevel)s naar %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
+    "<sender> changed the pinned messages for the room.": "<sender> heeft de gepinde boodschappen voor de ruimte gewijzigd.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s-widget aangepast door <sender>",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s-widget toegevoegd door <sender>",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s-widget verwijderd door <sender>"
 }
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 0088028aed..c70f1c6e22 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -99,8 +99,6 @@
     "Failed to change password. Is your password correct?": "Zmiana hasła nie powiodła się. Czy Twoje hasło jest poprawne?",
     "Add a topic": "Dodaj temat",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Wysłano wiadomość tekstową do +%(msisdn)s. Proszę wprowadzić kod w niej zawarty",
-    "%(targetName)s accepted an invitation.": "%(targetName)s zaakceptował(a) zaproszenie.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s zaakceptował(a) zaproszenie dla %(displayName)s.",
     "Access Token:": "Jednorazowy kod dostępu:",
     "Active call (%(roomName)s)": "Aktywne połączenie (%(roomName)s)",
     "Add email address": "Dodaj adres e-mail",
@@ -119,7 +117,6 @@
     "%(items)s and %(lastItem)s": "%(items)s i %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s i %(lastPerson)s piszą",
     "A new password must be entered.": "Musisz wprowadzić nowe hasło.",
-    "%(senderName)s answered the call.": "%(senderName)s odebrał połączenie.",
     "An error has occurred.": "Wystąpił błąd.",
     "Anyone": "Każdy",
     "Anyone who knows the room's link, apart from guests": "Każdy kto posiada łącze do pokoju, poza gośćmi",
@@ -128,7 +125,6 @@
     "Are you sure you want to reject the invitation?": "Czy na pewno chcesz odrzucić zaproszenie?",
     "Are you sure you want to upload the following files?": "Czy na pewno chcesz przesłać następujące pliki?",
     "Autoplay GIFs and videos": "Automatycznie odtwarzaj GIFy i filmiki",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s zbanował %(targetName)s.",
     "Ban": "Zbanuj",
     "Bans user with given id": "Blokuje użytkownika o podanym ID",
     "Blacklisted": "Umieszczono na czarnej liście",
@@ -143,11 +139,6 @@
     "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>.": "Nie można nawiązać połączenia z serwerem przy użyciu HTTP podczas korzystania z HTTPS dla bieżącej strony. Użyj HTTPS lub <a>włącz niebezpieczne skrypty</a>.",
     "Can't load user settings": "Nie można załadować ustawień użytkownika",
     "Cannot add any more widgets": "Nie można dodać już więcej widżetów",
-    "%(senderName)s changed their profile picture.": "%(senderName)s zmienił swoje zdjęcie profilowe.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmienił poziom mocy %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmienił nazwę pokoju na %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s usunął nazwę pokoju.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmienił temat na \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Zmiany w dostępie do historii będą dotyczyć tylko przyszłych wiadomości w tym pokoju",
     "Changes your display nickname": "Zmień swój pseudonim",
     "Changes colour scheme of current room": "Zmień schemat kolorystyczny bieżącego pokoju",
@@ -214,7 +205,6 @@
     "Encrypted room": "Pokój szyfrowany",
     "Encryption is enabled in this room": "Szyfrowanie jest włączone w tym pokoju",
     "Encryption is not enabled in this room": "Szyfrowanie nie jest włączone w tym pokoju",
-    "%(senderName)s ended the call.": "%(senderName)s zakończył połączenie.",
     "End-to-end encryption information": "Informacje o szyfrowaniu końcówka-do-końcówki",
     "End-to-end encryption is in beta and may not be reliable": "Szyfrowanie końcówka-do-końcówki jest w fazie beta i może nie być dopracowane",
     "Enter Code": "Wpisz kod",
@@ -254,7 +244,6 @@
     "Forgot your password?": "Zapomniałeś hasła?",
     "For security, this session has been signed out. Please sign in again.": "Ze względów bezpieczeństwa ta sesja została wylogowana. Zaloguj się jeszcze raz.",
     "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.": "Ze względów bezpieczeństwa, wylogowanie skasuje z tej przeglądarki wszystkie klucze szyfrowania końcówka-do-końcówki. Jeśli chcesz móc odszyfrować swoje historie konwersacji z przyszłych sesji Riot-a, proszę wyeksportuj swoje klucze pokojów do bezpiecznego miejsca.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Dostęp dla gości jest wyłączony na tym serwerze.",
     "Deops user with given id": "Usuwa prawa administratora użytkownikowi o danym ID",
     "Guests cannot join this room even if explicitly invited.": "Goście nie mogą dołączać do tego pokoju, nawet jeśli zostali specjalnie zaproszeni.",
@@ -277,7 +266,6 @@
     "Invalid address format": "Nieprawidłowy format adresu",
     "Invalid Email Address": "Nieprawidłowy adres e-mail",
     "Invalid file%(extra)s": "Nieprawidłowy plik %(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s zaprosił %(targetName)s.",
     "Invite new room members": "Zaproś nowych członków do pokoju",
     "Invited": "Zaproszony",
     "Invites": "Zaproszenia",
@@ -288,27 +276,19 @@
     "Sign in with": "Zaloguj się używając",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Dołącz <voiceText>głosowo</voiceText> lub przez <videoText>wideo</videoText>.",
     "Join Room": "Dołącz do pokoju",
-    "%(targetName)s joined the room.": "%(targetName)s dołączył do pokoju.",
     "Joins room with given alias": "Dołącz do pokoju o podanym aliasie",
     "Jump to first unread message.": "Przeskocz do pierwszej nieprzeczytanej wiadomości.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s wyrzucił %(targetName)s.",
     "Kick": "Wyrzuć",
     "Kicks user with given id": "Wyrzuca użytkownika o danym ID",
     "Labs": "Laboratoria",
     "Last seen": "Ostatnio widziany",
     "Leave room": "Opuść pokój",
-    "%(targetName)s left the room.": "%(targetName)s opuścił pokój.",
     "Level:": "Poziom:",
     "Publish this room to the public in %(domain)s's room directory?": "Czy opublikować ten pokój dla ogółu w spisie pokojów domeny %(domain)s?",
     "Local addresses for this room:": "Lokalne adresy dla tego pokoju:",
     "Logged in as:": "Zalogowany jako:",
     "Logout": "Wyloguj",
     "Low priority": "Niski priorytet",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich dołączenia.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla kazdego.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
     "Manage Integrations": "Zarządzaj integracjami",
     "Markdown is disabled": "Markdown jest wyłączony",
     "Markdown is enabled": "Markdown jest włączony",
@@ -350,7 +330,6 @@
     "People": "Ludzie",
     "Permissions": "Uprawnienia",
     "Phone": "Telefon",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s rozpoczął połączenie %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Sprawdź swój e-mail i kliknij link w nim zawarty. Kiedy już to zrobisz, kliknij \"kontynuuj\".",
     "Power level must be positive integer.": "Poziom uprawnień musi być liczbą dodatnią.",
     "Press <StartChatButton> to start a chat with someone": "Naciśnij <StartChatButton>, by rozpocząć rozmowę z kimś",
@@ -365,15 +344,11 @@
     "Revoke widget access": "Usuń dostęp do widżetów",
     "Refer a friend to Riot:": "Zaproś znajomego do Riota:",
     "Register": "Rejestracja",
-    "%(targetName)s rejected the invitation.": "%(targetName)s odrzucił zaproszenie.",
     "Reject invitation": "Odrzuć zaproszenie",
     "Rejoin": "Dołącz ponownie",
     "Remote addresses for this room:": "Adresy zdalne dla tego pokoju:",
     "Remove Contact Information?": "Usunąć dane kontaktowe?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s usunął swoją nazwę ekranową (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s usunął swoje zdjęcie profilowe.",
     "Remove %(threePid)s?": "Usunąć %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s zażądał grupowego połączenia głosowego VoIP.",
     "Results from DuckDuckGo": "Wyniki z DuckDuckGo",
     "Return to login screen": "Wróć do ekranu logowania",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot nie ma uprawnień, by wysyłać ci powiadomienia - sprawdź ustawienia swojej przeglądarki",
@@ -401,7 +376,6 @@
     "Send Invites": "Wyślij zaproszenie",
     "Send Reset Email": "Wyślij e-mail resetujący hasło",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s wysłał obraz.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
     "Server error": "Błąd serwera",
     "Server may be unavailable or overloaded": "Serwer może być niedostępny lub przeciążony",
     "Server may be unavailable, overloaded, or search timed out :(": "Serwer może być niedostępny, przeciążony, lub upłynął czas wyszukiwania :(",
@@ -409,8 +383,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Serwer może być niedostępny, przeciążony, lub trafiłeś na błąd.",
     "Server unavailable, overloaded, or something else went wrong.": "Serwer może być niedostępny, przeciążony, lub coś innego poszło źle.",
     "Session ID": "Identyfikator sesji",
-    "%(senderName)s set a profile picture.": "%(senderName)s ustawił zdjęcie profilowe.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ustawił swoją nazwę na %(displayName)s.",
     "Sets the room topic": "Ustaw temat pokoju",
     "Show panel": "Pokaż panel",
     "Show Text Formatting Toolbar": "Pokaż pasek narzędzi formatowania tekstu",
@@ -451,12 +423,10 @@
     "To reset your password, enter the email address linked to your account": "Aby zresetować swoje hasło, wpisz adres e-mail powiązany z twoim kontem",
     "Turn Markdown off": "Wyłącz Markdown",
     "Turn Markdown on": "Włącz Markdown",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s włączył szyfrowanie użytkownik-użytkownik (algorithm %(algorithm)s).",
     "Unable to add email address": "Nie można dodać adresu e-mail",
     "Unable to create widget.": "Nie można utworzyć widżetu.",
     "Unable to remove contact information": "Nie można usunąć informacji kontaktowych",
     "Unable to verify email address.": "Weryfikacja adresu e-mail nie powiodła się.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s odblokował/a %(targetName)s.",
     "Unable to capture screen": "Nie można zrobić zrzutu ekranu",
     "Unable to enable Notifications": "Nie można włączyć powiadomień",
     "Unable to load device list": "Nie można załadować listy urządzeń",
@@ -503,7 +473,6 @@
     "Who can access this room?": "Kto może uzyskać dostęp do tego pokoju?",
     "Who would you like to add to this room?": "Kogo chciał(a)byś dodać do tego pokoju?",
     "Who would you like to communicate with?": "Z kim chciał(a)byś się komunikować?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s wycofał(a) zaproszenie %(targetName)s.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Czy chcesz <acceptText>zaakceptować</acceptText> czy <declineText>odrzucić</declineText> to zaproszenie?",
     "You already have existing direct chats with this user:": "Masz już istniejącą bezpośrednią konwersację z tym użytkownikiem:",
     "You are already in a call.": "Jesteś już w trakcie połączenia.",
@@ -629,9 +598,6 @@
     " (unsupported)": " (niewspierany)",
     "Idle": "Bezczynny",
     "Check for update": "Sprawdź aktualizacje",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s zmienił awatar pokoju na <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s usunął awatar pokoju.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s zmienił awatar %(roomName)s",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "To będzie twoja nazwa konta na <span></span> serwerze domowym; możesz też wybrać <a>inny serwer</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jeśli już posiadasz konto Matrix możesz się <a>zalogować</a>.",
     "Not a valid Riot keyfile": "Niepoprawny plik klucza Riot",
@@ -664,9 +630,6 @@
     "Featured Rooms:": "Wyróżnione pokoje:",
     "Featured Users:": "Wyróżnieni użytkownicy:",
     "Hide avatars in user and room mentions": "Ukryj awatary we wzmiankach użytkowników i pokoi",
-    "%(widgetName)s widget added by %(senderName)s": "Widżet %(widgetName)s został dodany przez %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Widżet %(widgetName)s został usunięty przez %(senderName)s",
-    "%(widgetName)s widget modified by %(senderName)s": "Widżet %(widgetName)s został zmodyfikowany przez %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Sprawdzanie człowieczeństwa jest obecnie niedostępne na aplikacji klienckiej desktop - proszę użyć <a>przeglądarki internetowej</a>",
     "Unpin Message": "Odepnij Wiadomość",
     "Add rooms to this community": "Dodaj pokoje do tej społeczności",
@@ -700,8 +663,6 @@
     "Ignored user": "Użytkownik ignorowany",
     "You are now ignoring %(userId)s": "Ignorujesz teraz %(userId)s",
     "You are no longer ignoring %(userId)s": "Nie ignorujesz już %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s zmienił swoją wyświetlaną nazwę na %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s zmienił przypiętą wiadomość dla tego pokoju.",
     "Message Pinning": "Przypinanie wiadomości",
     "%(names)s and %(count)s others are typing|other": "%(names)s oraz %(count)s innych piszą",
     "%(names)s and %(count)s others are typing|one": "%(names)s oraz jedna inna osoba piszą",
@@ -955,5 +916,44 @@
     "Advanced options": "Opcje zaawansowane",
     "To continue, please enter your password:": "Aby kontynuować, proszę wprowadzić swoje hasło:",
     "password": "hasło",
-    "Refresh": "Odśwież"
+    "Refresh": "Odśwież",
+    "<target> accepted the invitation for %(displayName)s.": "<target> zaakceptował(a) zaproszenie dla %(displayName)s.",
+    "<target> accepted an invitation.": "<target> zaakceptował(a) zaproszenie.",
+    "<sender> requested a VoIP conference.": "<sender> zażądał grupowego połączenia głosowego VoIP.",
+    "<sender> invited <target>.": "<sender> zaprosił <target>.",
+    "<sender> banned <target>.": "<sender> zbanował <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> zmienił swoją wyświetlaną nazwę na <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> ustawił swoją nazwę na <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> usunął swoją nazwę ekranową (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> usunął swoje zdjęcie profilowe.",
+    "<sender> changed their profile picture.": "<sender> zmienił swoje zdjęcie profilowe.",
+    "<sender> set a profile picture.": "<sender> ustawił zdjęcie profilowe.",
+    "<target> joined the room.": "<target> dołączył do pokoju.",
+    "<target> rejected the invitation.": "<target> odrzucił zaproszenie.",
+    "<target> left the room.": "<target> opuścił pokój.",
+    "<sender> unbanned <target>.": "<sender> odblokował/a <target>.",
+    "<sender> kicked <target>.": "<sender> wyrzucił <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> wycofał(a) zaproszenie <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> zmienił temat na \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> zmienił nazwę pokoju na %(roomName)s.",
+    "<sender> changed the room avatar to <img/>": "<sender> zmienił awatar pokoju na <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> zmienił awatar %(roomName)s",
+    "<sender> removed the room name.": "<sender> usunął nazwę pokoju.",
+    "<sender> removed the room avatar.": "<sender> usunął awatar pokoju.",
+    "<sender> answered the call.": "<sender> odebrał połączenie.",
+    "<sender> ended the call.": "<sender> zakończył połączenie.",
+    "<sender> placed a %(callType)s call.": "<sender> rozpoczął połączenie %(callType)s.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich dołączenia.",
+    "<sender> made future room history visible to all room members.": "<sender> uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju.",
+    "<sender> made future room history visible to anyone.": "<sender> uczynił przyszłą historię pokoju widoczną dla kazdego.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> uczynił przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> włączył szyfrowanie użytkownik-użytkownik (algorithm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> z %(fromPowerLevel)s na %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> zmienił poziom mocy %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> zmienił przypiętą wiadomość dla tego pokoju.",
+    "%(widgetName)s widget modified by <sender>": "Widżet %(widgetName)s został zmodyfikowany przez <sender>",
+    "%(widgetName)s widget added by <sender>": "Widżet %(widgetName)s został dodany przez <sender>",
+    "%(widgetName)s widget removed by <sender>": "Widżet %(widgetName)s został usunięty przez <sender>"
 }
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 7cc80cfc78..1f3e83c14c 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -16,7 +16,6 @@
     "Blacklisted": "Bloqueado",
     "Bulk Options": "Opcões de Batelada",
     "Can't load user settings": "Não é possível carregar configurações de usuário",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "As mudanças sobre quem pode ler o histórico da sala só serão aplicadas às mensagens futuras nesta sala",
     "Changes your display nickname": "Troca o seu apelido",
     "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
@@ -198,15 +197,8 @@
     "Dec": "Dez",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s às %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
-    "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s estão escrevendo",
-    "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
-    "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "click to reveal": "clique para ver",
     "Conference call failed.": "Chamada de conferência falhou.",
     "Conference calling is in development and may not be reliable.": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar.",
@@ -214,41 +206,22 @@
     "Conference calls are not supported in this client": "Chamadas de conferência não são possíveis neste navegador",
     "/ddg is not a command": "/ddg não é um comando",
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
-    "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
     "Existing Call": "Chamada em andamento",
     "Failed to send email": "Falha ao enviar email",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to set up conference call": "Não foi possível montar a chamada de conferência",
     "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
     "Failure to create room": "Não foi possível criar a sala",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
-    "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
-    "%(targetName)s left the room.": "%(targetName)s saiu da sala.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s deixou o histórico futuro da sala visível para todas as pessoas da sala.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s deixou o histórico futuro da sala visível para qualquer pessoa.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
     "(not supported by this browser)": "(não é compatível com este navegador)",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.",
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Reason": "Razão",
-    "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma imagem de perfil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu seu nome público para %(displayName)s.",
     "This email address is already in use": "Este endereço de email já está sendo usado",
     "This email address was not found": "Este endereço de email não foi encontrado",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O arquivo '%(fileName)s' ultrapassa o limite de tamanho que nosso servidor permite enviar",
@@ -258,15 +231,12 @@
     "These are experimental features that may break in unexpected ways": "Estas são funcionalidades experimentais que podem apresentar falhas",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
     "You are already in a call.": "Você já está em  uma chamada.",
     "You are trying to access %(roomName)s.": "Você está tentando acessar a sala %(roomName)s.",
     "You cannot place a call with yourself.": "Você não pode iniciar uma chamada.",
@@ -406,7 +376,6 @@
     "Warning!": "Atenção!",
     "You need to enter a user name.": "Você precisa inserir um nome de usuária(o).",
     "Please select the destination room for this message": "Por favor, escolha a sala para onde quer encaminhar esta mensagem",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s apagou o nome da sala.",
     "Analytics": "Análise",
     "Options": "Opções",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot coleta informações anônimas de uso para nos permitir melhorar o sistema.",
@@ -501,9 +470,6 @@
     "Verified key": "Chave verificada",
     "WARNING: Device already verified, but keys do NOT MATCH!": "ATENÇÃO: O dispositivo já foi verificado, mas as chaves NÃO SÃO IGUAIS!",
     "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!": "ATENÇÃO: VERIFICAÇÃO DE CHAVE FALHOU! A chave de assinatura para a(o) usuária(o) %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\", que não é igual à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estão sendo interceptadas!",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
     "Missing Media Permissions, click here to request.": "Faltam permissões para uso de mídia no seu computador. Clique aqui para solicitá-las.",
     "No Microphones detected": "Não foi detetado nenhum microfone",
     "No Webcams detected": "Não foi detetada nenhuma Webcam",
@@ -665,9 +631,6 @@
     "Automatically replace plain text Emoji": "Substituir Emoji em texto automaticamente",
     "Failed to upload image": "Falha ao carregar imagem",
     "Hide avatars in user and room mentions": "Ocultar avatares nas menções de utilizadores e salas",
-    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s adicionado por %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s removido por %(senderName)s",
-    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificado por %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "A verificação através de robot está atualmente indisponível na versão desktop - utilize um <a>navegador web</a>",
     "Advanced options": "Opções avançadas",
     "This setting cannot be changed later!": "Esta definição não pode ser alterada mais tarde!",
@@ -842,5 +805,42 @@
     "Collapse panel": "Colapsar o painel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e algumas das funcionalidades poderão não funcionar. Se quiser tentar de qualquer maneira pode continuar, mas  está por sua conta com algum problema que possa encontrar!",
     "Checking for an update...": "A procurar uma atualização...",
-    "There are advanced notifications which are not shown here": "Existem notificações avançadas que não são exibidas aqui"
+    "There are advanced notifications which are not shown here": "Existem notificações avançadas que não são exibidas aqui",
+    "<target> accepted the invitation for %(displayName)s.": "<target> aceitou o convite para %(displayName)s.",
+    "<target> accepted an invitation.": "<target> aceitou um convite.",
+    "<sender> requested a VoIP conference.": "<sender> está solicitando uma conferência de voz.",
+    "<sender> invited <target>.": "<sender> convidou <target>.",
+    "<sender> banned <target>.": "<sender> removeu <target> da sala.",
+    "<sender> set their display name to <displayName>.": "<sender> definiu seu nome público para <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> removeu o seu nome público (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> removeu sua imagem de perfil.",
+    "<sender> changed their profile picture.": "<sender> alterou sua imagem de perfil.",
+    "<sender> set a profile picture.": "<sender> definiu uma imagem de perfil.",
+    "<target> joined the room.": "<target> entrou na sala.",
+    "<target> rejected the invitation.": "<target> recusou o convite.",
+    "<target> left the room.": "<target> saiu da sala.",
+    "<sender> unbanned <target>.": "<sender> desfez o banimento de <target>.",
+    "<sender> kicked <target>.": "<sender> removeu <target> da sala.",
+    "<sender> withdrew <target>'s invitation.": "<sender> desfez o convite a <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> mudou o tópico para \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> alterou o nome da sala para %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> alterou a imagem da sala %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> alterou a imagem da sala para <img/>",
+    "<sender> removed the room name.": "<sender> apagou o nome da sala.",
+    "<sender> removed the room avatar.": "<sender> removeu a imagem da sala.",
+    "<sender> answered the call.": "<sender> atendeu à chamada.",
+    "<sender> ended the call.": "<sender> finalizou a chamada.",
+    "<sender> placed a %(callType)s call.": "<sender> fez uma chamada de %(callType)s.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> enviou um convite para %(targetDisplayName)s entrar na sala.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
+    "<sender> made future room history visible to all room members.": "<sender> deixou o histórico futuro da sala visível para todas as pessoas da sala.",
+    "<sender> made future room history visible to anyone.": "<sender> deixou o histórico futuro da sala visível para qualquer pessoa.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s para %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> alterou o nível de permissões de %(powerLevelDiffText)s.",
+    "%(widgetName)s widget modified by <sender>": "Widget %(widgetName)s modificado por <sender>",
+    "%(widgetName)s widget added by <sender>": "Widget %(widgetName)s adicionado por <sender>",
+    "%(widgetName)s widget removed by <sender>": "Widget %(widgetName)s removido por <sender>"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index c583e795cb..e07b51ea79 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -16,7 +16,6 @@
     "Blacklisted": "Bloqueado",
     "Bulk Options": "Opcões de Batelada",
     "Can't load user settings": "Não é possível carregar configurações de usuário",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "As mudanças sobre quem pode ler o histórico da sala só serão aplicadas às mensagens futuras nesta sala",
     "Changes your display nickname": "Troca o seu apelido",
     "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
@@ -198,15 +197,8 @@
     "Dec": "Dez",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s às %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
-    "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s estão escrevendo",
-    "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
-    "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "click to reveal": "clique para ver",
     "Conference call failed.": "Chamada de conferência falhou.",
     "Conference calling is in development and may not be reliable.": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar.",
@@ -214,42 +206,23 @@
     "Conference calls are not supported in this client": "Chamadas de conferência não são possíveis neste navegador",
     "/ddg is not a command": "/ddg não é um comando",
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
-    "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
     "Existing Call": "Chamada em andamento",
     "Failed to send email": "Não foi possível enviar email",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to set up conference call": "Não foi possível montar a chamada de conferência",
     "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
     "Failure to create room": "Não foi possível criar a sala",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
-    "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
-    "%(targetName)s left the room.": "%(targetName)s saiu da sala.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s deixou o histórico futuro da sala visível para todas as pessoas da sala.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s deixou o histórico futuro da sala visível para qualquer pessoa.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
     "(not supported by this browser)": "(não é compatível com este navegador)",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.",
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press <StartChatButton> to start a chat with someone": "Clique em <StartChatButton> para iniciar a conversa com alguém",
     "Reason": "Razão",
-    "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma imagem de perfil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu seu nome público para %(displayName)s.",
     "This email address is already in use": "Este endereço de email já está sendo usado",
     "This email address was not found": "Este endereço de email não foi encontrado",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O arquivo '%(fileName)s' ultrapassa o limite de tamanho que nosso servidor permite enviar",
@@ -259,15 +232,12 @@
     "These are experimental features that may break in unexpected ways": "Estas são funcionalidades experimentais que podem apresentar falhas",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
     "You are already in a call.": "Você já está em uma chamada.",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Você ainda não está em nenhuma sala! Clique em <CreateRoomButton> para criar uma sala ou em <RoomDirectoryButton> para navegar pela lista pública de salas",
     "You are trying to access %(roomName)s.": "Você está tentando acessar a sala %(roomName)s.",
@@ -408,7 +378,6 @@
     "Warning!": "Atenção!",
     "You need to enter a user name.": "Você precisa inserir um nome de usuária(o).",
     "Please select the destination room for this message": "Por favor, escolha a sala para onde quer encaminhar esta mensagem",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s apagou o nome da sala.",
     "Analytics": "Análise",
     "Options": "Opções",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot coleta informações anônimas de uso para nos permitir melhorar o sistema.",
@@ -503,9 +472,6 @@
     "Verified key": "Chave verificada",
     "WARNING: Device already verified, but keys do NOT MATCH!": "ATENÇÃO: O dispositivo já foi verificado, mas as chaves NÃO SÃO IGUAIS!",
     "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!": "ATENÇÃO: VERIFICAÇÃO DE CHAVE FALHOU! A chave de assinatura para a(o) usuária(o) %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\", que não é igual à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estão sendo interceptadas!",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
     "Missing Media Permissions, click here to request.": "Faltam permissões para uso de mídia no seu computador. Clique aqui para solicitá-las.",
     "No Microphones detected": "Não foi detectado nenhum microfone",
     "No Webcams detected": "Não foi detectada nenhuma Webcam",
@@ -673,11 +639,6 @@
     "Unable to create widget.": "Não foi possível criar o widget.",
     "You are now ignoring %(userId)s": "Você está agora ignorando %(userId)s",
     "Unignored user": "Usuária/o não está sendo mais ignorada/o",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s alterou o seu nome público para %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s alterou as mensagens fixas da sala.",
-    "%(widgetName)s widget modified by %(senderName)s": "O widget %(widgetName)s foi modificado por %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "O widget %(widgetName)s foi criado por %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "O widget %(widgetName)s foi removido por %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras pessoas estão escrevendo",
     "%(names)s and %(count)s others are typing|one": "%(names)s e uma outra pessoa estão escrevendo",
     "Send": "Enviar",
@@ -1114,5 +1075,44 @@
     "Collapse panel": "Colapsar o painel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e algumas das funcionalidades poderão não funcionar. Se você quiser tentar de qualquer maneira, pode continuar, mas aí vai ter que se virar sozinho(a) com os problemas que porventura encontrar!",
     "Checking for an update...": "Verificando se há atualizações...",
-    "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui"
+    "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui",
+    "<target> accepted the invitation for %(displayName)s.": "<target> aceitou o convite para %(displayName)s.",
+    "<target> accepted an invitation.": "<target> aceitou um convite.",
+    "<sender> requested a VoIP conference.": "<sender> está solicitando uma conferência de voz.",
+    "<sender> invited <target>.": "<sender> convidou <target>.",
+    "<sender> banned <target>.": "<sender> removeu <target> da sala.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> alterou o seu nome público para <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> definiu seu nome público para <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> removeu o seu nome público (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> removeu sua imagem de perfil.",
+    "<sender> changed their profile picture.": "<sender> alterou sua imagem de perfil.",
+    "<sender> set a profile picture.": "<sender> definiu uma imagem de perfil.",
+    "<target> joined the room.": "<target> entrou na sala.",
+    "<target> rejected the invitation.": "<target> recusou o convite.",
+    "<target> left the room.": "<target> saiu da sala.",
+    "<sender> unbanned <target>.": "<sender> desfez o banimento de <target>.",
+    "<sender> kicked <target>.": "<sender> removeu <target> da sala.",
+    "<sender> withdrew <target>'s invitation.": "<sender> desfez o convite a <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> mudou o tópico para \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> alterou o nome da sala para %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> alterou a imagem da sala %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> alterou a imagem da sala para <img/>",
+    "<sender> removed the room name.": "<sender> apagou o nome da sala.",
+    "<sender> removed the room avatar.": "<sender> removeu a imagem da sala.",
+    "<sender> answered the call.": "<sender> atendeu à chamada.",
+    "<sender> ended the call.": "<sender> finalizou a chamada.",
+    "<sender> placed a %(callType)s call.": "<sender> fez uma chamada de %(callType)s.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> enviou um convite para %(targetDisplayName)s entrar na sala.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
+    "<sender> made future room history visible to all room members.": "<sender> deixou o histórico futuro da sala visível para todas as pessoas da sala.",
+    "<sender> made future room history visible to anyone.": "<sender> deixou o histórico futuro da sala visível para qualquer pessoa.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s para %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> alterou o nível de permissões de %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> alterou as mensagens fixas da sala.",
+    "%(widgetName)s widget modified by <sender>": "O widget %(widgetName)s foi modificado por <sender>",
+    "%(widgetName)s widget added by <sender>": "O widget %(widgetName)s foi criado por <sender>",
+    "%(widgetName)s widget removed by <sender>": "O widget %(widgetName)s foi removido por <sender>"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ae889c5677..68483ab4ff 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -136,41 +136,22 @@
     "Your password has been reset": "Ваш пароль был сброшен",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Пароль успешно изменен. До повторной авторизации вы не будете получать push-уведомления на других устройствах",
     "You should not yet trust it to secure data": "На данный момент не следует полагаться на то, что ваша переписка будет надежно зашифрована",
-    "%(targetName)s accepted an invitation.": "%(targetName)s принял приглашение.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
     "Active call": "Активный вызов",
     "%(names)s and %(lastPerson)s are typing": "%(names)s и %(lastPerson)s печатают",
-    "%(senderName)s answered the call.": "%(senderName)s ответил(а) на звонок.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокировал(а) %(targetName)s.",
     "Call Timeout": "Нет ответа",
-    "%(senderName)s changed their profile picture.": "%(senderName)s изменил(а) свой аватар.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s изменил(а) уровни прав %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s изменил(а) название комнаты на %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\".",
     "Conference call failed.": "Сбой конференц-звонка.",
     "Conference calling is in development and may not be reliable.": "Конференц-связь находится в разработке и может не работать.",
     "Conference calls are not supported in encrypted rooms": "Конференц-связь не поддерживается в зашифрованных комнатах",
     "Conference calls are not supported in this client": "Конференц-связь в этом клиенте не поддерживается",
     "/ddg is not a command": "/ddg — это не команда",
     "Drop here to tag %(section)s": "Перетащите сюда, чтобы пометить как %(section)s",
-    "%(senderName)s ended the call.": "%(senderName)s завершил(а) звонок.",
     "Existing Call": "Текущий вызов",
     "Failed to send request.": "Не удалось отправить запрос.",
     "Failed to set up conference call": "Не удалось сделать конференц-звонок",
     "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить email: убедитесь, что вы перешли по ссылке в письме",
     "Failure to create room": "Не удалось создать комнату",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "click to reveal": "нажмите для открытия",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s печатает",
-    "%(targetName)s joined the room.": "%(targetName)s вошел(-ла) в комнату.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s выгнал(а) %(targetName)s.",
-    "%(targetName)s left the room.": "%(targetName)s покинул(а) комнату.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их входа в комнату.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s сделал(а) историю разговора видимой для всех.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s сделал(а) историю комнаты видимой в неизвестном режиме (%(visibility)s).",
     "Missing room_id in request": "Отсутствует room_id в запросе",
     "Missing user_id in request": "Отсутствует user_id в запросе",
     "(not supported by this browser)": "(не поддерживается этим браузером)",
@@ -200,7 +181,6 @@
     "You are already in a call.": "Идет разговор.",
     "You are trying to access %(roomName)s.": "Вы пытаетесь войти в %(roomName)s.",
     "You cannot place a call with yourself.": "Вы не можете позвонить самому себе.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s отозвал(а) свое приглашение %(targetName)s.",
     "Sep": "Сен",
     "Jan": "Янв",
     "Feb": "Фев",
@@ -223,8 +203,6 @@
     "Sat": "Сб",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш email не связан ни с одним пользователем на этом сервере.",
     "To use it, just wait for autocomplete results to load and tab through them.": "Чтобы воспользоваться этой функцией, дождитесь загрузки результатов в окне автодополнения, а затем используйте Tab для прокрутки.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включил(а) в комнате сквозное шифрование (алгоритм %(algorithm)s).",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s разблокировал(а) %(targetName)s.",
     "Unable to capture screen": "Не удается сделать снимок экрана",
     "Unable to enable Notifications": "Не удалось включить уведомления",
     "Upload Failed": "Сбой отправки файла",
@@ -298,17 +276,12 @@
     "OK": "OK",
     "Only people who have been invited": "Только приглашенные участники",
     "Passwords can't be empty": "Пароли не могут быть пустыми",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s начал(а) %(callType)s-звонок.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Проверьте свою электронную почту и нажмите на содержащуюся ссылку. После этого нажмите кнопку Продолжить.",
     "Power level must be positive integer.": "Уровень прав должен быть положительным целым числом.",
     "Profile": "Профиль",
     "Reason": "Причина",
-    "%(targetName)s rejected the invitation.": "%(targetName)s отклонил(а) приглашение.",
     "Reject invitation": "Отклонить приглашение",
     "Remove Contact Information?": "Удалить контактную информацию?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удалил(а) свое отображаемое имя (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s удалил(а) свой аватар.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s хочет начать конференц-звонок.",
     "Resetting 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.": "Сброс пароля на данный момент сбрасывает ключи шифрования на всех устройствах, делая зашифрованную историю чатов нечитаемой. Чтобы избежать этого, экспортируйте ключи комнат и импортируйте их после сброса пароля. В будущем это будет исправлено.",
     "Riot does not have permission to send you notifications - please check your browser settings": "У Riot нет разрешения на отправку уведомлений — проверьте настройки браузера",
     "Riot was not given permission to send notifications - please try again": "Riot не получил разрешение на отправку уведомлений, пожалуйста, попробуйте снова",
@@ -324,7 +297,6 @@
     "Sender device information": "Информация об устройстве отправителя",
     "Send Invites": "Отправить приглашения",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s отправил(а) изображение.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s пригласил(а) %(targetDisplayName)s в комнату.",
     "Show panel": "Показать панель",
     "Sign in": "Войти",
     "Sign out": "Выйти",
@@ -393,7 +365,6 @@
     "You may need to manually permit Riot to access your microphone/webcam": "Вам необходимо предоставить Riot доступ к микрофону или веб-камере вручную",
     "Anyone": "Все",
     "Are you sure you want to leave the room '%(roomName)s'?": "Вы уверены, что хотите покинуть '%(roomName)s'?",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s удалил(а) имя комнаты.",
     "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.": "Смена пароля на данный момент сбрасывает ключи сквозного шифрования на всех устройствах, делая историю зашифрованных чатов нечитаемой. Чтобы избежать этого, экспортируйте ключи сквозного шифрования и импортируйте их после смены пароля. В будущем это будет исправлено.",
     "Custom level": "Специальные права",
     "Device already verified!": "Устройство уже проверено!",
@@ -430,8 +401,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Возможно, сервер недоступен, перегружен или случилась ошибка.",
     "Server unavailable, overloaded, or something else went wrong.": "Возможно, сервер недоступен, перегружен или что-то еще пошло не так.",
     "Session ID": "ID сессии",
-    "%(senderName)s set a profile picture.": "%(senderName)s установил(а) себе аватар.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Signed Out": "Выполнен выход",
     "Tagged as: ": "Метки: ",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Предоставленный вами ключ совпадает с ключом, полученным от %(userId)s с устройства %(deviceId)s. Это устройство помечено как проверенное.",
@@ -526,9 +495,6 @@
     "Online": "Онлайн",
     "Idle": "Неактивен",
     "Offline": "Не в сети",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s сменил(а) аватар комнаты на <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s удалил(а) аватар комнаты.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s сменил(а) аватар %(roomName)s",
     "Create new room": "Создать комнату",
     "Room directory": "Каталог комнат",
     "Start chat": "Начать чат",
@@ -663,11 +629,8 @@
     "Automatically replace plain text Emoji": "Автоматически заменять текстовые смайлики на Emoji",
     "Failed to upload image": "Не удалось загрузить изображение",
     "Hide avatars in user and room mentions": "Скрывать аватары в упоминаниях пользователей и комнат",
-    "%(widgetName)s widget added by %(senderName)s": "Виджет %(widgetName)s был добавлен %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Виджет %(widgetName)s был удален %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "CAPTCHA-тест в настоящее время недоступен в Desktop-клиенте - пожалуйста, используйте <a>браузер</a>",
     "Publish this room to the public in %(domain)s's room directory?": "Опубликовать эту комнату в каталоге комнат %(domain)s?",
-    "%(widgetName)s widget modified by %(senderName)s": "Виджет %(widgetName)s был изменен %(senderName)s",
     "Copied!": "Скопировано!",
     "Failed to copy": "Не удалось скопировать",
     "Advanced options": "Дополнительные параметры",
@@ -722,7 +685,6 @@
     "Which rooms would you like to add to this summary?": "Какие комнаты вы хотите добавить в эту сводку?",
     "Room name or alias": "Название или идентификатор комнаты",
     "Pinned Messages": "Закрепленные сообщения",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s изменил(а) закрепленные в этой комнате сообщения.",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Не удалось добавить следующие комнаты в сводку %(groupId)s:",
     "Failed to remove the room from the summary of %(groupId)s": "Не удалось удалить комнату из сводки %(groupId)s",
     "The room '%(roomName)s' could not be removed from the summary.": "Комнату '%(roomName)s' не удалось удалить из сводки.",
@@ -955,7 +917,6 @@
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>.",
     "Community IDs cannot not be empty.": "ID сообществ не могут быть пустыми.",
     "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
     "Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
@@ -1191,5 +1152,44 @@
     "Share User": "Поделиться пользователем",
     "Share Community": "Поделиться сообществом",
     "Link to selected message": "Ссылка на выбранное сообщение",
-    "COPY": "КОПИРОВАТЬ"
+    "COPY": "КОПИРОВАТЬ",
+    "<target> accepted the invitation for %(displayName)s.": "<target> принял приглашение от %(displayName)s.",
+    "<target> accepted an invitation.": "<target> принял приглашение.",
+    "<sender> requested a VoIP conference.": "<sender> хочет начать конференц-звонок.",
+    "<sender> invited <target>.": "<sender> приглашает <target>.",
+    "<sender> banned <target>.": "<sender> заблокировал(а) <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> изменил(а) отображаемое имя на <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> изменил(а) отображаемое имя на <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> удалил(а) свое отображаемое имя (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> удалил(а) свой аватар.",
+    "<sender> changed their profile picture.": "<sender> изменил(а) свой аватар.",
+    "<sender> set a profile picture.": "<sender> установил(а) себе аватар.",
+    "<target> joined the room.": "<target> вошел(-ла) в комнату.",
+    "<target> rejected the invitation.": "<target> отклонил(а) приглашение.",
+    "<target> left the room.": "<target> покинул(а) комнату.",
+    "<sender> unbanned <target>.": "<sender> разблокировал(а) <target>.",
+    "<sender> kicked <target>.": "<sender> выгнал(а) <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> отозвал(а) свое приглашение <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> изменил(а) тему комнаты на \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> изменил(а) название комнаты на %(roomName)s.",
+    "<sender> changed the room avatar to <img/>": "<sender> сменил(а) аватар комнаты на <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> сменил(а) аватар %(roomName)s",
+    "<sender> removed the room name.": "<sender> удалил(а) имя комнаты.",
+    "<sender> removed the room avatar.": "<sender> удалил(а) аватар комнаты.",
+    "<sender> answered the call.": "<sender> ответил(а) на звонок.",
+    "<sender> ended the call.": "<sender> завершил(а) звонок.",
+    "<sender> placed a %(callType)s call.": "<sender> начал(а) %(callType)s-звонок.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> пригласил(а) %(targetDisplayName)s в комнату.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> сделал(а) историю разговора видимой для всех собеседников с момента их входа в комнату.",
+    "<sender> made future room history visible to all room members.": "<sender> сделал(а) историю разговора видимой для всех собеседников.",
+    "<sender> made future room history visible to anyone.": "<sender> сделал(а) историю разговора видимой для всех.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> сделал(а) историю комнаты видимой в неизвестном режиме (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> включил(а) в комнате сквозное шифрование (алгоритм %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "для <user> с %(fromPowerLevel)s на %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> изменил(а) уровни прав %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> изменил(а) закрепленные в этой комнате сообщения.",
+    "%(widgetName)s widget modified by <sender>": "Виджет %(widgetName)s был изменен <sender>",
+    "%(widgetName)s widget added by <sender>": "Виджет %(widgetName)s был добавлен <sender>",
+    "%(widgetName)s widget removed by <sender>": "Виджет %(widgetName)s был удален <sender>"
 }
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index b1f3f4260d..eae28ee1fa 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -102,49 +102,14 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Podpisovací kľúč, ktorý ste poskytli súhlasí s podpisovacím kľúčom, ktorý ste dostali zo zariadenia %(deviceId)s používateľa %(userId)s's. Zariadenie je považované za overené.",
     "Unrecognised command:": "Nerozpoznaný príkaz:",
     "Reason": "Dôvod",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s prijal pozvanie do %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s prijal pozvanie.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s požiadal o VoIP konferenciu.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s zakázal vstup %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si nastavil zobrazované meno %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstránil svoje zobrazované meno (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s si z profilu odstránil obrázok.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s si zmenil obrázok v profile.",
-    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil obrázok v profile.",
     "VoIP conference started.": "Začala VoIP konferencia.",
-    "%(targetName)s joined the room.": "%(targetName)s vstúpil do miestnosti.",
     "VoIP conference finished.": "Skončila VoIP konferencia.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s odmietol pozvanie.",
-    "%(targetName)s left the room.": "%(targetName)s opustil miestnosť.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s povolil vstup %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopol %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s stiahol pozvanie %(targetName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmenil tému na \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstránil názov miestnosti.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmenil názov miestnosti na %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal obrázok.",
     "Someone": "Niekto",
     "(not supported by this browser)": "(Nepodporované v tomto prehliadači)",
-    "%(senderName)s answered the call.": "%(senderName)s prijal hovor.",
     "(could not connect media)": "(nie je možné spojiť médiá)",
     "(no answer)": "(žiadna odpoveď)",
     "(unknown failure: %(reason)s)": "(neznáma chyba: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ukončil hovor.",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s uskutočnil %(callType)s hovor.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s pozval %(targetDisplayName)s vstúpiť do miestnosti.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy boli pozvaní.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy vstúpili.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre každého.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s sprístupnil budúcu históriu miestnosti neznámym (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s povolil E2E šifrovanie (algoritmus %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmenil úroveň moci pre %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s zmenil pripnuté správy pre túto miestnosť.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s zmenil widget %(widgetName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pridal widget %(widgetName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s odstránil widget %(widgetName)s",
     "Communities": "Komunity",
     "Message Pinning": "Pripnutie správ",
     "%(displayName)s is typing": "%(displayName)s píše",
@@ -422,9 +387,6 @@
     "Invalid file%(extra)s": "Neplatný súbor%(extra)s",
     "Error decrypting image": "Chyba pri dešifrovaní obrázka",
     "Error decrypting video": "Chyba pri dešifrovaní videa",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s zmenil obrázok miestnosti %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odstránil obrázok miestnosti.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s zmenil obrázok miestnosti <img/>",
     "Copied!": "Skopírované!",
     "Failed to copy": "Nepodarilo sa skopírovať",
     "Add an Integration": "Pridať integráciu",
@@ -952,7 +914,6 @@
     "Your homeserver's URL": "URL adresa vami používaného domovského servera",
     "Your identity server's URL": "URL adresa vami používaného servera totožností",
     "This room is not public. You will not be able to rejoin without an invite.": "Toto nie je verejne dostupná miestnosť. Bez pozvánky nebudete do nej môcť vstúpiť znovu.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si zmenil zobrazované meno na %(displayName)s.",
     "Failed to set direct chat tag": "Nepodarilo sa nastaviť značku priama konverzácia",
     "Failed to remove tag %(tagName)s from room": "Z miestnosti sa nepodarilo odstrániť značku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
@@ -1180,5 +1141,44 @@
     "Terms and Conditions": "Zmluvné podmienky",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
     "Review terms and conditions": "Prečítať zmluvné podmienky",
-    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť"
+    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť",
+    "<target> accepted the invitation for %(displayName)s.": "<target> prijal pozvanie do %(displayName)s.",
+    "<target> accepted an invitation.": "<target> prijal pozvanie.",
+    "<sender> requested a VoIP conference.": "<sender> požiadal o VoIP konferenciu.",
+    "<sender> invited <target>.": "<sender> pozval <target>.",
+    "<sender> banned <target>.": "<sender> zakázal vstup <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> si zmenil zobrazované meno na <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> si nastavil zobrazované meno <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> odstránil svoje zobrazované meno (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> si z profilu odstránil obrázok.",
+    "<sender> changed their profile picture.": "<sender> si zmenil obrázok v profile.",
+    "<sender> set a profile picture.": "<sender> si nastavil obrázok v profile.",
+    "<target> joined the room.": "<target> vstúpil do miestnosti.",
+    "<target> rejected the invitation.": "<target> odmietol pozvanie.",
+    "<target> left the room.": "<target> opustil miestnosť.",
+    "<sender> unbanned <target>.": "<sender> povolil vstup <target>.",
+    "<sender> kicked <target>.": "<sender> vykopol <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> stiahol pozvanie <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> zmenil tému na \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> zmenil názov miestnosti na %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> zmenil obrázok miestnosti %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> zmenil obrázok miestnosti <img/>",
+    "<sender> removed the room name.": "<sender> odstránil názov miestnosti.",
+    "<sender> removed the room avatar.": "<sender> odstránil obrázok miestnosti.",
+    "<sender> answered the call.": "<sender> prijal hovor.",
+    "<sender> ended the call.": "<sender> ukončil hovor.",
+    "<sender> placed a %(callType)s call.": "<sender> uskutočnil %(callType)s hovor.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> pozval %(targetDisplayName)s vstúpiť do miestnosti.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy boli pozvaní.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy vstúpili.",
+    "<sender> made future room history visible to all room members.": "<sender> sprístupnil budúcu históriu miestnosti pre všetkých členov.",
+    "<sender> made future room history visible to anyone.": "<sender> sprístupnil budúcu históriu miestnosti pre každého.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> sprístupnil budúcu históriu miestnosti neznámym (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> povolil E2E šifrovanie (algoritmus %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> z %(fromPowerLevel)s na %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> zmenil úroveň moci pre %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> zmenil pripnuté správy pre túto miestnosť.",
+    "%(widgetName)s widget modified by <sender>": "<sender> zmenil widget %(widgetName)s",
+    "%(widgetName)s widget added by <sender>": "<sender> pridal widget %(widgetName)s",
+    "%(widgetName)s widget removed by <sender>": "<sender> odstránil widget %(widgetName)s"
 }
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 6d217d5349..350338a908 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -110,51 +110,16 @@
     "Verified key": "Проверени кључ",
     "Unrecognised command:": "Непрепозната наредба:",
     "Reason": "Разлог",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s је прихватио позивницу за %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s је прихватио позивницу.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s је затражио VoIP конференцију.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s је позвао %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s.",
     "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!": "УПОЗОРЕЊЕ: ПРОВЕРА КЉУЧА НИЈЕ УСПЕЛА! Кључ потписивања за корисника %(userId)s и уређај %(deviceId)s је „%(fprint)s“ а то се не подудара са достављеним кључем „%(fingerprint)s“. Ово можда значи да се ваши разговори прате!",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Кључ за потписивање који сте доставили се подудара са кључем за потписивање од корисника %(userId)s и уређаја %(deviceId)s. Уређај је означен као проверен.",
-    "%(senderName)s set their display name to %(displayName)s.": "Корисник %(senderName)s је себи поставио приказно име %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "Корисник %(senderName)s је себи уклонио приказно име %(oldDisplayName)s.",
-    "%(senderName)s removed their profile picture.": "Корисник %(senderName)s је себи уклонио профилну слику.",
-    "%(senderName)s changed their profile picture.": "Корисник %(senderName)s је себи променио профилну слику.",
-    "%(senderName)s set a profile picture.": "Корисник %(senderName)s је себи поставио профилну слику.",
     "VoIP conference started.": "VoIP конференција је започета.",
-    "%(targetName)s joined the room.": "Корисник %(targetName)s је ушао у собу.",
     "VoIP conference finished.": "VoIP конференција је завршена.",
-    "%(targetName)s rejected the invitation.": "Корисник %(targetName)s је одбацио позивницу.",
-    "%(targetName)s left the room.": "Корисник %(targetName)s је напустио собу.",
-    "%(senderName)s unbanned %(targetName)s.": "Корисник %(senderName)s је скинуо забрану приступа са %(targetName)s.",
-    "%(senderName)s kicked %(targetName)s.": "Корисник %(senderName)s је избацио %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "Пошиљалац %(senderName)s је повукао позивницу за %(targetName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Корисник %(senderDisplayName)s је променио тему у „%(topic)s“.",
-    "%(senderDisplayName)s removed the room name.": "Корисник %(senderDisplayName)s је уклонио назив собе.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "Корисник %(senderDisplayName)s је променио назив собе у %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "Корисник %(senderDisplayName)s је послао слику.",
     "Someone": "Неко",
     "(not supported by this browser)": "(није подржано од стране овог прегледача)",
-    "%(senderName)s answered the call.": "Корисник %(senderName)s се јавио.",
     "(could not connect media)": "(не могу да повежем медије)",
     "(no answer)": "(нема одговора)",
     "(unknown failure: %(reason)s)": "(непозната грешка: %(reason)s)",
-    "%(senderName)s ended the call.": "Корисник %(senderName)s је окончао позив.",
-    "%(senderName)s placed a %(callType)s call.": "Корисник %(senderName)s је направио %(callType)s позив.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Корисник %(senderName)s је послао позивницу за приступ соби ка %(targetDisplayName)s.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе, од тренутка позивања у собу.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе, од тренутка приступања соби.",
-    "%(senderName)s made future room history visible to all room members.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе.",
-    "%(senderName)s made future room history visible to anyone.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свима.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Корисник %(senderName)s је учинио будући историјат собе непознатим (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Корисник %(senderName)s је укључио шифровање с краја на крај (алгоритам %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s са %(fromPowerLevel)s на %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Корисник %(senderName)s је променио ниво моћи од %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "Корисник %(senderName)s је променио закачене поруке у соби.",
-    "%(widgetName)s widget modified by %(senderName)s": "Корисник %(senderName)s је променио виџет %(widgetName)s",
-    "%(widgetName)s widget added by %(senderName)s": "Корисник %(senderName)s је додао виџет %(widgetName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Корисник %(senderName)s је уклонио виџет %(widgetName)s",
     "%(displayName)s is typing": "%(displayName)s куца",
     "%(names)s and %(count)s others are typing|other": "%(names)s и %(count)s корисник(а) куцају",
     "%(names)s and %(count)s others are typing|one": "%(names)s и још један куцају",
@@ -476,9 +441,6 @@
     "Invalid file%(extra)s": "Неисправна датотека %(extra)s",
     "Error decrypting image": "Грешка при дешифровању слике",
     "Error decrypting video": "Грешка при дешифровању видеа",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "Корисник %(senderDisplayName)s је променио аватара собе %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "Корисник %(senderDisplayName)s је уклонио аватара собе.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "Корисник %(senderDisplayName)s је променио аватара собе у <img/>",
     "Copied!": "Копирано!",
     "Failed to copy": "Нисам успео да ископирам",
     "Add an Integration": "Додај уградњу",
@@ -762,7 +724,6 @@
     "Analytics": "Аналитика",
     "The information being sent to us to help make Riot.im better includes:": "У податке које нам шаљете зарад побољшавања Riot.im-а спадају:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ако страница садржи поверљиве податке (као што је назив собе, корисника или ИБ-ја групе), ти подаци се уклањају пре слања на сервер.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "Корисник %(oldDisplayName)s је променио приказно име у %(displayName)s.",
     "Failed to set direct chat tag": "Нисам успео да поставим ознаку директног ћаскања",
     "Failed to remove tag %(tagName)s from room": "Нисам успео да скинем ознаку %(tagName)s са собе",
     "Failed to add tag %(tagName)s to room": "Нисам успео да додам ознаку %(tagName)s на собу",
@@ -1177,5 +1138,44 @@
     "Terms and Conditions": "Услови коришћења",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да бисте наставили са коришћењем Кућног сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.",
     "Review terms and conditions": "Погледај услове коришћења",
-    "Try the app first": "Пробајте прво апликацију"
+    "Try the app first": "Пробајте прво апликацију",
+    "<target> accepted the invitation for %(displayName)s.": "<target> је прихватио позивницу за %(displayName)s.",
+    "<target> accepted an invitation.": "<target> је прихватио позивницу.",
+    "<sender> requested a VoIP conference.": "<sender> је затражио VoIP конференцију.",
+    "<sender> invited <target>.": "<sender> је позвао <target>.",
+    "<sender> banned <target>.": "<sender> је бановао <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "Корисник <oldDisplayName> је променио приказно име у <displayName>.",
+    "<sender> set their display name to <displayName>.": "Корисник <sender> је себи поставио приказно име <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "Корисник <sender> је себи уклонио приказно име <oldDisplayName>.",
+    "<sender> removed their profile picture.": "Корисник <sender> је себи уклонио профилну слику.",
+    "<sender> changed their profile picture.": "Корисник <sender> је себи променио профилну слику.",
+    "<sender> set a profile picture.": "Корисник <sender> је себи поставио профилну слику.",
+    "<target> joined the room.": "Корисник <target> је ушао у собу.",
+    "<target> rejected the invitation.": "Корисник <target> је одбацио позивницу.",
+    "<target> left the room.": "Корисник <target> је напустио собу.",
+    "<sender> unbanned <target>.": "Корисник <sender> је скинуо забрану приступа са <target>.",
+    "<sender> kicked <target>.": "Корисник <sender> је избацио <target>.",
+    "<sender> withdrew <target>'s invitation.": "Пошиљалац <sender> је повукао позивницу за <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "Корисник <sender> је променио тему у „%(topic)s“.",
+    "<sender> changed the room name to %(roomName)s.": "Корисник <sender> је променио назив собе у %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "Корисник <sender> је променио аватара собе %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "Корисник <sender> је променио аватара собе у <img/>",
+    "<sender> removed the room name.": "Корисник <sender> је уклонио назив собе.",
+    "<sender> removed the room avatar.": "Корисник <sender> је уклонио аватара собе.",
+    "<sender> answered the call.": "Корисник <sender> се јавио.",
+    "<sender> ended the call.": "Корисник <sender> је окончао позив.",
+    "<sender> placed a %(callType)s call.": "Корисник <sender> је направио %(callType)s позив.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "Корисник <sender> је послао позивницу за приступ соби ка %(targetDisplayName)s.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "Корисник <sender> је учинио будући историјат собе видљивим свим члановима собе, од тренутка позивања у собу.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "Корисник <sender> је учинио будући историјат собе видљивим свим члановима собе, од тренутка приступања соби.",
+    "<sender> made future room history visible to all room members.": "Корисник <sender> је учинио будући историјат собе видљивим свим члановима собе.",
+    "<sender> made future room history visible to anyone.": "Корисник <sender> је учинио будући историјат собе видљивим свима.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "Корисник <sender> је учинио будући историјат собе непознатим (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "Корисник <sender> је укључио шифровање с краја на крај (алгоритам %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> са %(fromPowerLevel)s на %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "Корисник <sender> је променио ниво моћи од %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "Корисник <sender> је променио закачене поруке у соби.",
+    "%(widgetName)s widget modified by <sender>": "Корисник <sender> је променио виџет %(widgetName)s",
+    "%(widgetName)s widget added by <sender>": "Корисник <sender> је додао виџет %(widgetName)s",
+    "%(widgetName)s widget removed by <sender>": "Корисник <sender> је уклонио виџет %(widgetName)s"
 }
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0e26125c30..986f48c81e 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1,7 +1,5 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Ett SMS har skickats till +%(msisdn)s. Vänligen ange verifieringskoden ur meddelandet",
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepterade en inbjudan.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepterade inbjudan för %(displayName)s.",
     "Account": "Konto",
     "Add a topic": "Lägg till ett ämne",
     "Add email address": "Lägg till en epostadress",
@@ -26,7 +24,6 @@
     "and %(count)s others...|one": "och en annan...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s och %(lastPerson)s skriver",
     "A new password must be entered.": "Ett nytt lösenord måste anges.",
-    "%(senderName)s answered the call.": "%(senderName)s svarade på samtalet.",
     "Anyone who knows the room's link, including guests": "Alla som har rummets adress, inklusive gäster",
     "Anyone": "Vem som helst",
     "Anyone who knows the room's link, apart from guests": "Alla som har rummets adress, förutom gäster",
@@ -38,7 +35,6 @@
     "Are you sure you want to reject the invitation?": "Är du säker på att du vill avböja inbjudan?",
     "Bulk Options": "Volymhandlingar",
     "Blacklisted": "Svartlistad",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
     "Banned users": "Bannade användare",
     "Bans user with given id": "Bannar användare med givet id",
     "Ban": "Banna",
@@ -47,10 +43,6 @@
     "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>.": "Det går inte att ansluta till en hemserver via HTTP då adressen i webbläsaren är HTTPS. Använd HTTPS, eller <a>sätt på osäkra skript</a>.",
     "Can't load user settings": "Det gick inte att ladda användarinställningar",
     "Change Password": "Byt lösenord",
-    "%(senderName)s changed their profile picture.": "%(senderName)s bytte sin profilbild.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s bytte rummets namn till %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s tog bort rummets namn.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s bytte rummets ämne till \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Ändringar till vem som kan läsa meddelandehistorik tillämpas endast till framtida meddelanden i det här rummet",
     "Changes your display nickname": "Byter ditt synliga namn",
     "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.": "Om du byter lösenord kommer för tillfället alla krypteringsnycklar på alla enheter att nollställas, vilket gör all krypterad meddelandehistorik omöjligt att läsa, om du inte först exporterar rumsnycklarna och sedan importerar dem efteråt. I framtiden kommer det här att förbättras.",
@@ -110,7 +102,6 @@
     "Enable encryption": "Aktivera kryptering",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Krypterade meddelanden syns inte på klienter som inte ännu stöder kryptering",
     "Encrypted room": "Krypterat rum",
-    "%(senderName)s ended the call.": "%(senderName)s avslutade samtalet.",
     "End-to-end encryption information": "Krypteringsinformation",
     "End-to-end encryption is in beta and may not be reliable": "Kryptering är i beta och är inte nödvändigtvis pålitligt",
     "Enter Code": "Skriv in kod",
@@ -149,7 +140,6 @@
     "Admin Tools": "Admin-verktyg",
     "Alias (optional)": "Alias (valfri)",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till hemservern - kontrollera anslutningen, se till att <a>hemserverns SSL-certifikat</a> är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.",
     "<a>Click here</a> to join the discussion!": "<a>Klicka här</a> för att gå med i diskussionen!",
     "Close": "Stäng",
     "%(count)s new messages|one": "%(count)s nytt meddelande",
@@ -176,7 +166,6 @@
     "Forgot your password?": "Glömt lösenord?",
     "For security, this session has been signed out. Please sign in again.": "Av säkerhetsskäl har den här sessionen loggats ut. Vänligen logga in igen.",
     "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.": "Av säkerhetsskäl kommer alla krypteringsnycklar att raderas från den här webbläsaren om du loggar ut. Om du vill läsa din krypterade meddelandehistorik från framtida Riot-sessioner, exportera nycklarna till förvar.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s från %(fromPowerLevel)s till %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Gäståtkomst är inte aktiverat på den här hemservern.",
     "Guests cannot join this room even if explicitly invited.": "Gäster kan inte gå med i det här rummet fastän de är uttryckligen inbjudna.",
     "Hangup": "Lägg på",
@@ -199,7 +188,6 @@
     "Invalid address format": "Fel adressformat",
     "Invalid Email Address": "Ogiltig epostadress",
     "Invalid file%(extra)s": "Fel fil%(extra)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s bjöd in %(targetName)s.",
     "Invite new room members": "Bjud in nya rumsmedlemmar",
     "Invited": "Inbjuden",
     "Invites": "Inbjudningar",
@@ -210,25 +198,18 @@
     "Sign in with": "Logga in med",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Gå med som <voiceText>röst</voiceText> eller <videoText>video</videoText>.",
     "Join Room": "Gå med i rum",
-    "%(targetName)s joined the room.": "%(targetName)s gick med i rummet.",
     "Joins room with given alias": "Går med i rummet med givet alias",
     "Jump to first unread message.": "Hoppa till första olästa meddelande.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickade %(targetName)s.",
     "Kick": "Kicka",
     "Kicks user with given id": "Kickar användaren med givet id",
     "Labs": "Labb",
     "Last seen": "Senast sedd",
     "Leave room": "Lämna rummet",
-    "%(targetName)s left the room.": "%(targetName)s lämnade rummet.",
     "Level:": "Nivå:",
     "Local addresses for this room:": "Lokala adresser för rummet:",
     "Logged in as:": "Inloggad som:",
     "Logout": "Logga ut",
     "Low priority": "Låg prioritet",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde framtida rumshistorik synligt för alla.",
     "Manage Integrations": "Hantera integrationer",
     "Markdown is disabled": "Markdown är inaktiverat",
     "Markdown is enabled": "Markdown är aktiverat",
@@ -271,7 +252,6 @@
     "People": "Personer",
     "Permissions": "Behörigheter",
     "Phone": "Telefon",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s startade ett %(callType)ssamtal.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Öppna meddelandet i din epost och klicka på länken i meddelandet. När du har gjort detta, klicka vidare.",
     "Power level must be positive integer.": "Behörighetsnivå måste vara ett positivt heltal.",
     "Press <StartChatButton> to start a chat with someone": "Tryck på <StartChatButton> för att starta en chatt med någon",
@@ -285,16 +265,12 @@
     "Revoke Moderator": "Degradera moderator",
     "Refer a friend to Riot:": "Hänvisa en vän till Riot:",
     "Register": "Registrera",
-    "%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.",
     "Reject invitation": "Avböj inbjudan",
     "Rejoin": "Gå med igen",
     "Remote addresses for this room:": "Fjärradresser för det här rummet:",
     "Remove Contact Information?": "Ta bort kontaktuppgifter?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s tog bort sitt visningsnamn (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s tog bort sin profilbild.",
     "Remove": "Ta bort",
     "Remove %(threePid)s?": "Ta bort %(threePid)s?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s begärde en VoIP-konferens.",
     "Resetting 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.": "Om du återställer ditt lösenord kommer alla krypteringsnycklar på alla enheter att återställas, vilket gör krypterad meddelandehistorik oläsbar om du inte först exporterar dina rumsnycklar och sedan importerar dem igen. I framtiden kommer det här att förbättras.",
     "Results from DuckDuckGo": "Resultat från DuckDuckGo",
     "Return to login screen": "Tillbaka till login-skärmen",
@@ -320,7 +296,6 @@
     "Send Invites": "Skicka inbjudningar",
     "Send Reset Email": "Skicka återställningsmeddelande",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s skickade en bild.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s bjöd in %(targetDisplayName)s med i rummet.",
     "Server error": "Serverfel",
     "Server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad",
     "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så tog sökningen för lång tid :(",
@@ -328,8 +303,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Servern kan vara otillgänglig, överbelastad, eller så stötte du på en bugg.",
     "Server unavailable, overloaded, or something else went wrong.": "Servern är otillgänglig, överbelastad, eller så gick något annat fel.",
     "Session ID": "Sessions-ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s satte en profilbild.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s bytte sitt visningnamn till %(displayName)s.",
     "Settings": "Inställningar",
     "Show panel": "Visa panel",
     "Show Text Formatting Toolbar": "Visa textformatteringsverktygsfält",
@@ -591,13 +564,7 @@
     "You are now ignoring %(userId)s": "Du ignorerar nu %(userId)s",
     "Unignored user": "Oignorerad användare",
     "You are no longer ignoring %(userId)s": "Du ignorerar inte längre %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s bytte sitt visningsnamn till %(displayName)s.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s avbannade %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s drog tillbaka inbjudan för %(targetName)s.",
     "(no answer)": "(inget svar)",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget har modifierats av %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget har lagts till av %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget har tagits bort av %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s och %(count)s andra skriver",
     "%(names)s and %(count)s others are typing|one": "%(names)s och en till skriver",
     "Unnamed Room": "Namnlöst rum",
@@ -763,9 +730,6 @@
     "Always show encryption icons": "Visa alltid krypteringsikoner",
     "Disable big emoji in chat": "Inaktivera stor emoji i chatt",
     "Hide avatars in user and room mentions": "Dölj avatarer i användar- och rumsnämningar",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s bytte avatar för %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s tog bort rummets avatar.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ändrade rummets avatar till <img/>",
     "Automatically replace plain text Emoji": "Ersätt text-emojis automatiskt",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
@@ -949,7 +913,6 @@
     "Verifies a user, device, and pubkey tuple": "Verifierar en användare, enhet och nycklar",
     "VoIP conference started.": "VoIP-konferens startad.",
     "VoIP conference finished.": "VoIP-konferens avslutad.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern.",
     "The remote side failed to pick up": "Mottagaren kunde inte svara",
     "Room name or alias": "Rumsnamn eller alias",
@@ -969,7 +932,6 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie (se vår <PolicyLink>Cookiepolicy</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie.",
     "Yes, I want to help!": "Ja, jag vill hjälpa till!",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s aktiverade kryptering (algoritm %(algorithm)s).",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)slämnade och gick med igen %(count)s gånger",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)slämnade och gick med igen",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)slämnade och gick med igen %(count)s gånger",
@@ -1166,7 +1128,6 @@
     "Passphrases must match": "Passfraser måste matcha",
     "Passphrase must not be empty": "Lösenfras får inte vara tom",
     "Confirm passphrase": "Bekräfta lösenfrasen",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ändrade fastnålade meddelanden för rummet.",
     "Message Pinning": "Nåla fast meddelanden",
     "Unpin Message": "Ta bort fastnålning",
     "No pinned messages.": "Inga fastnålade meddelanden.",
@@ -1180,5 +1141,44 @@
     "This room is not showing flair for any communities": "Detta rum visar inte emblem för några communityn",
     "Flair will appear if enabled in room settings": "Emblem kommer visas om det är aktiverat i rumsinställningarna",
     "Flair will not appear": "Emblem kommer inte att visas",
-    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det."
+    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det.",
+    "<target> accepted the invitation for %(displayName)s.": "<target> accepterade inbjudan för %(displayName)s.",
+    "<target> accepted an invitation.": "<target> accepterade en inbjudan.",
+    "<sender> requested a VoIP conference.": "<sender> begärde en VoIP-konferens.",
+    "<sender> invited <target>.": "<sender> bjöd in <target>.",
+    "<sender> banned <target>.": "<sender> bannade <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> bytte sitt visningsnamn till <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> bytte sitt visningnamn till <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> tog bort sitt visningsnamn (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> tog bort sin profilbild.",
+    "<sender> changed their profile picture.": "<sender> bytte sin profilbild.",
+    "<sender> set a profile picture.": "<sender> satte en profilbild.",
+    "<target> joined the room.": "<target> gick med i rummet.",
+    "<target> rejected the invitation.": "<target> avvisade inbjudan.",
+    "<target> left the room.": "<target> lämnade rummet.",
+    "<sender> unbanned <target>.": "<sender> avbannade <target>.",
+    "<sender> kicked <target>.": "<sender> kickade <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> drog tillbaka inbjudan för <target>.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> bytte rummets ämne till \"%(topic)s\".",
+    "<sender> changed the room name to %(roomName)s.": "<sender> bytte rummets namn till %(roomName)s.",
+    "<sender> changed the avatar for %(roomName)s": "<sender> bytte avatar för %(roomName)s",
+    "<sender> changed the room avatar to <img/>": "<sender> ändrade rummets avatar till <img/>",
+    "<sender> removed the room name.": "<sender> tog bort rummets namn.",
+    "<sender> removed the room avatar.": "<sender> tog bort rummets avatar.",
+    "<sender> answered the call.": "<sender> svarade på samtalet.",
+    "<sender> ended the call.": "<sender> avslutade samtalet.",
+    "<sender> placed a %(callType)s call.": "<sender> startade ett %(callType)ssamtal.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> bjöd in %(targetDisplayName)s med i rummet.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> gjorde framtida rumshistorik synligt för alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
+    "<sender> made future room history visible to all room members.": "<sender> gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
+    "<sender> made future room history visible to anyone.": "<sender> gjorde framtida rumshistorik synligt för alla.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> aktiverade kryptering (algoritm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> från %(fromPowerLevel)s till %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ändrade behörighetsnivå för %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> ändrade fastnålade meddelanden för rummet.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s-widget har modifierats av <sender>",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s-widget har lagts till av <sender>",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s-widget har tagits bort av <sender>"
 }
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index b6102a5eb5..301651a13d 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -1,7 +1,6 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "ఒక టెక్స్ట్ సందేశం +%(msisdn)s కు పంపబడింది. దయచేసి దీనిలో ఉన్న ధృవీకరణ కోడ్ను నమోదు చేయండి",
     "Accept": "అంగీకరించు",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ఆహ్వానాన్ని అంగీకరించింది.",
     "Account": "ఖాతా",
     "Access Token:": "యాక్సెస్ టోకెన్:",
     "Add": "చేర్చు",
@@ -29,7 +28,6 @@
     "You have been invited to join this room by %(inviterName)s": "%(inviterName)s ఈ గదిలో చేరడానికి మీరు ఆహ్వానించబడ్డారు",
     "Active call (%(roomName)s)": "క్రియాశీల కాల్ల్ (%(roomName)s)",
     "A new password must be entered.": "కొత్త పాస్ వర్డ్ ను తప్పక నమోదు చేయాలి.",
-    "%(senderName)s answered the call.": "%(senderName)s కు సమాధానం ఇచ్చారు.",
     "An error has occurred.": "ఒక లోపము సంభవించినది.",
     "Anyone": "ఎవరైనా",
     "Anyone who knows the room's link, apart from guests": "అతిథులు కాకుండా గది యొక్క లింక్ తెలిసిన వారు ఎవరైనా",
@@ -49,8 +47,6 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "గృహనిర్వాహకులకు కనెక్ట్ చేయలేరు - దయచేసి మీ కనెక్టివిటీని తనిఖీ చేయండి, మీ <a> 1 హోమరుసు యొక్క ఎస్ఎస్ఎల్ సర్టిఫికేట్ </a> 2 ని విశ్వసనీయపరుచుకొని, బ్రౌజర్ పొడిగింపు అభ్యర్థనలను నిరోధించబడదని నిర్ధారించుకోండి.",
     "Can't load user settings": "వినియోగదారు సెట్టింగ్లను లోడ్ చేయలేరు",
     "Change Password": "పాస్వర్డ్ మార్చండి",
-    "%(senderName)s changed their profile picture.": "%(senderName)s వారి ప్రొఫైల్ చిత్రాన్ని మార్చారు.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s గది పేరు తొలగించబడింది.",
     "Changes to who can read history will only apply to future messages in this room": "చరిత్ర చదివేవారికి మార్పులు ఈ గదిలో భవిష్య సందేశాలకు మాత్రమే వర్తిస్తాయి",
     "Changes your display nickname": "మీ ప్రదర్శన మారుపేరుని మారుస్తుంది",
     "You cannot place a call with yourself.": "మీరు మీతో కాల్ చేయలేరు.",
@@ -275,5 +271,9 @@
     "#example": "#ఉదాహరణ",
     "Collapse panel": "ప్యానెల్ కుదించు",
     "Checking for an update...": "నవీకరణ కోసం చూస్తోంది...",
-    "Saturday": "శనివారం"
+    "Saturday": "శనివారం",
+    "<target> accepted an invitation.": "<target> ఆహ్వానాన్ని అంగీకరించింది.",
+    "<sender> changed their profile picture.": "<sender> వారి ప్రొఫైల్ చిత్రాన్ని మార్చారు.",
+    "<sender> removed the room name.": "<sender> గది పేరు తొలగించబడింది.",
+    "<sender> answered the call.": "<sender> కు సమాధానం ఇచ్చారు."
 }
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 3fe7bf8f98..878d5eaaee 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -11,8 +11,6 @@
     "Delete": "ลบ",
     "Default": "ค่าเริ่มต้น",
     "Default Device": "อุปกรณ์เริ่มต้น",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s แบน %(targetName)s แล้ว",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s เปลี่ยนหัวข้อเป็น \"%(topic)s\"",
     "Decrypt %(text)s": "ถอดรหัส %(text)s",
     "Device ID": "ID อุปกรณ์",
     "Device ID:": "ID อุปกรณ์:",
@@ -51,8 +49,6 @@
     "Custom Server Options": "กำหนดเซิร์ฟเวอร์เอง",
     "Favourite": "รายการโปรด",
     "Failed to forget room %(errCode)s": "การลืมห้องล้มเหลว %(errCode)s",
-    "%(targetName)s accepted an invitation.": "%(targetName)s ตอบรับคำเชิญแล้ว",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ตอบรับคำเชิญสำหรับ %(displayName)s แล้ว",
     "Add a topic": "เพิ่มหัวข้อ",
     "Add email address": "เพิ่มที่อยู่อีเมล",
     "Admin": "ผู้ดูแล",
@@ -66,7 +62,6 @@
     "and %(count)s others...|one": "และอีกหนึ่งผู้ใช้...",
     "and %(count)s others...|other": "และอีก %(count)s ผู้ใช้...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s และ %(lastPerson)s กำลังพิมพ์",
-    "%(senderName)s answered the call.": "%(senderName)s รับสายแล้ว",
     "An error has occurred.": "เกิดข้อผิดพลาด",
     "Anyone": "ทุกคน",
     "Anyone who knows the room's link, apart from guests": "ทุกคนที่มีลิงก์ ยกเว้นแขก",
@@ -81,9 +76,6 @@
     "Bans user with given id": "ผู้ใช้และ id ที่ถูกแบน",
     "Blacklisted": "ขึ้นบัญชีดำ",
     "Can't load user settings": "ไม่สามารถโหลดการตั้งค่าผู้ใช้ได้",
-    "%(senderName)s changed their profile picture.": "%(senderName)s เปลี่ยนรูปโปรไฟล์ของเขา",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s เปลี่ยนชื่อห้องไปเป็น %(roomName)s",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ลบชื่อห้อง",
     "Changes your display nickname": "เปลี่ยนชื่อเล่นที่แสดงของคุณ",
     "Clear Cache and Reload": "ล้างแคชแล้วโหลดใหม่",
     "Clear Cache": "ล้างแคช",
@@ -123,7 +115,6 @@
     "Email address (optional)": "ที่อยู่อีเมล (ไม่ใส่ก็ได้)",
     "Email, name or matrix ID": "อีเมล ชื่อ หรือ ID matrix",
     "Encrypted room": "ห้องที่ถูกเข้ารหัส",
-    "%(senderName)s ended the call.": "%(senderName)s จบการโทร",
     "Enter Code": "กรอกรหัส",
     "Error decrypting attachment": "การถอดรหัสไฟล์แนบผิดพลาด",
     "Export": "ส่งออก",
@@ -147,7 +138,6 @@
     "Filter room members": "กรองสมาชิกห้อง",
     "Forget room": "ลืมห้อง",
     "Forgot your password?": "ลิมรหัสผ่าน?",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s จาก %(fromPowerLevel)s ไปเป็น %(toPowerLevel)s",
     "Hangup": "วางสาย",
     "Historical": "ประวัติแชทเก่า",
     "Homeserver is": "เซิร์ฟเวอร์บ้านคือ",
@@ -161,7 +151,6 @@
     "Invalid address format": "รูปแบบที่อยู่ไม่ถูกต้อง",
     "Invalid Email Address": "ที่อยู่อีเมลไม่ถูกต้อง",
     "Invalid file%(extra)s": "ไฟล์ %(extra)s ไม่ถูกต้อง",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s เชิญ %(targetName)s แล้ว",
     "Invite new room members": "เชิญสมาชิกใหม่",
     "Invited": "เชิญแล้ว",
     "Invites": "คำเชิญ",
@@ -170,12 +159,9 @@
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ไม่ใช่รูปแบบที่ถูกต้องสำหรับนามแฝง",
     "Sign in with": "เข้าสู่ระบบด้วย",
     "Join Room": "เข้าร่วมห้อง",
-    "%(targetName)s joined the room.": "%(targetName)s เข้าร่วมห้องแล้ว",
     "Jump to first unread message.": "ข้ามไปยังข้อความแรกที่ยังไม่ได้อ่าน",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s เตะ %(targetName)s แล้ว",
     "Labs": "ห้องทดลอง",
     "Leave room": "ออกจากห้อง",
-    "%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
     "Logged in as:": "เข้าสู่ระบบในชื่อ:",
     "Logout": "ออกจากระบบ",
     "Markdown is disabled": "ปิดใช้งาน Markdown แล้ว",
@@ -198,16 +184,12 @@
     "People": "บุคคล",
     "Permissions": "สิทธิ์",
     "Phone": "โทรศัพท์",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ได้เริ่มการโทรแบบ%(callType)s",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "กรุณาเช็คอีเมลและคลิกลิงก์ข้างใน หลังจากนั้น คลิกดำเนินการต่อ",
     "Privacy warning": "คำเตือนเกี่ยวกับความเป็นส่วนตัว",
     "Privileged Users": "ผู้ใช้ที่มีสิทธิพิเศษ",
     "Revoke Moderator": "เพิกถอนผู้ช่วยดูแล",
     "Refer a friend to Riot:": "แนะนำเพื่อนให้รู้จัก Riot:",
-    "%(targetName)s rejected the invitation.": "%(targetName)s ปฏิเสธคำเชิญแล้ว",
     "Reject invitation": "ปฏิเสธคำเชิญ",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ลบชื่อที่แสดงแล้ว (%(oldDisplayName)s)",
-    "%(senderName)s removed their profile picture.": "%(senderName)s ลบรูปโปรไฟล์ของเขาแล้ว",
     "Remove %(threePid)s?": "ลบ %(threePid)s?",
     "Return to login screen": "กลับไปยังหน้าลงชื่อเข้าใช้",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot ไม่มีสิทธิ์ส่งการแจ้งเตือน - กรุณาตรวจสอบการตั้งค่าเบราว์เซอร์ของคุณ",
@@ -222,15 +204,12 @@
     "Searches DuckDuckGo for results": "ค้นหาบน DuckDuckGo",
     "Send Invites": "ส่งคำเชิญ",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ได้ส่งรูป",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ได้ส่งคำเชิญให้ %(targetDisplayName)s เข้าร่วมห้อง",
     "Server error": "เซิร์ฟเวอร์ผิดพลาด",
     "Server may be unavailable or overloaded": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งานหรือทำงานหนักเกินไป",
     "Server may be unavailable, overloaded, or search timed out :(": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือการค้นหาหมดเวลา :(",
     "Server may be unavailable, overloaded, or the file too big": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือไฟล์ใหญ่เกินไป",
     "Server may be unavailable, overloaded, or you hit a bug.": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือเจอจุดบกพร่อง",
     "Server unavailable, overloaded, or something else went wrong.": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือบางอย่างผิดปกติ",
-    "%(senderName)s set a profile picture.": "%(senderName)s ตั้งรูปโปรไฟล์",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ตั้งชื่อที่แสดงเป็น %(displayName)s",
     "Show panel": "แสดงหน้าต่าง",
     "Signed Out": "ออกจากระบบแล้ว",
     "Sign in": "เข้าสู่ระบบ",
@@ -269,11 +248,9 @@
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "ไฟล์ '%(fileName)s' มีขนาดใหญ่เกินจำกัดของเซิร์ฟเวอร์บ้าน",
     "Turn Markdown off": "ปิด markdown",
     "Turn Markdown on": "เปิด markdown",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ได้เปิดใช้งานการเข้ารหัสจากปลายทางถึงปลายทาง (อัลกอริทึม%(algorithm)s).",
     "Unable to add email address": "ไมาสามารถเพิ่มที่อยู่อีเมล",
     "Unable to verify email address.": "ไม่สามารถยืนยันที่อยู่อีเมล",
     "Unban": "ปลดแบน",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ปลดแบน %(targetName)s แล้ว",
     "Unable to capture screen": "ไม่สามารถจับภาพหน้าจอ",
     "Unable to enable Notifications": "ไม่สามารถเปิดใช้งานการแจ้งเตือน",
     "Unable to load device list": "ไม่สามารถโหลดรายชื่ออุปกรณ์",
@@ -558,5 +535,28 @@
     "Collapse panel": "ซ่อนหน้าต่าง",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "การแสดงผลของโปรแกรมอาจผิดพลาด ฟังก์ชันบางอย่างหรือทั้งหมดอาจไม่ทำงานในเบราว์เซอร์ปัจจุบันของคุณ หากคุณต้องการลองดำเนินการต่อ คุณต้องรับมือกับปัญหาที่อาจจะเกิดขึ้นด้วยตัวคุณเอง!",
     "Checking for an update...": "กำลังตรวจหาอัปเดต...",
-    "There are advanced notifications which are not shown here": "มีการแจ้งเตือนขั้นสูงที่ไม่ได้แสดงที่นี่"
+    "There are advanced notifications which are not shown here": "มีการแจ้งเตือนขั้นสูงที่ไม่ได้แสดงที่นี่",
+    "<target> accepted the invitation for %(displayName)s.": "<target> ตอบรับคำเชิญสำหรับ %(displayName)s แล้ว",
+    "<target> accepted an invitation.": "<target> ตอบรับคำเชิญแล้ว",
+    "<sender> invited <target>.": "<sender> เชิญ <target> แล้ว",
+    "<sender> banned <target>.": "<sender> แบน <target> แล้ว",
+    "<sender> set their display name to <displayName>.": "<sender> ตั้งชื่อที่แสดงเป็น <displayName>",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> ลบชื่อที่แสดงแล้ว (<oldDisplayName>)",
+    "<sender> removed their profile picture.": "<sender> ลบรูปโปรไฟล์ของเขาแล้ว",
+    "<sender> changed their profile picture.": "<sender> เปลี่ยนรูปโปรไฟล์ของเขา",
+    "<sender> set a profile picture.": "<sender> ตั้งรูปโปรไฟล์",
+    "<target> joined the room.": "<target> เข้าร่วมห้องแล้ว",
+    "<target> rejected the invitation.": "<target> ปฏิเสธคำเชิญแล้ว",
+    "<target> left the room.": "<target> ออกจากห้องแล้ว",
+    "<sender> unbanned <target>.": "<sender> ปลดแบน <target> แล้ว",
+    "<sender> kicked <target>.": "<sender> เตะ <target> แล้ว",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> เปลี่ยนหัวข้อเป็น \"%(topic)s\"",
+    "<sender> changed the room name to %(roomName)s.": "<sender> เปลี่ยนชื่อห้องไปเป็น %(roomName)s",
+    "<sender> removed the room name.": "<sender> ลบชื่อห้อง",
+    "<sender> answered the call.": "<sender> รับสายแล้ว",
+    "<sender> ended the call.": "<sender> จบการโทร",
+    "<sender> placed a %(callType)s call.": "<sender> ได้เริ่มการโทรแบบ%(callType)s",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> ได้ส่งคำเชิญให้ %(targetDisplayName)s เข้าร่วมห้อง",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ได้เปิดใช้งานการเข้ารหัสจากปลายทางถึงปลายทาง (อัลกอริทึม%(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> จาก %(fromPowerLevel)s ไปเป็น %(toPowerLevel)s"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 04f78dc1ee..9bedd16ccb 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1,8 +1,6 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "+%(msisdn)s 'ye bir kısa mesaj gönderildi . Lütfen içerdiği doğrulama kodunu girin",
     "Accept": "Kabul Et",
-    "%(targetName)s accepted an invitation.": "%(targetName)s bir davetiyeyi kabul etti.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s %(displayName)s için davetiyeyi kabul etti.",
     "Account": "Hesap",
     "Access Token:": "Erişim Anahtarı:",
     "Active call (%(roomName)s)": "Aktif çağrı (%(roomName)s)",
@@ -32,7 +30,6 @@
     "and %(count)s others...|other": "ve %(count)s diğerleri...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s ve %(lastPerson)s yazıyorlar",
     "A new password must be entered.": "Yeni bir şifre girilmelidir.",
-    "%(senderName)s answered the call.": "%(senderName)s aramayı cevapladı.",
     "An error has occurred.": "Bir hata oluştu.",
     "Anyone": "Kimse",
     "Anyone who knows the room's link, apart from guests": "Misafirler dışında odanın bağlantısını bilen herkes",
@@ -43,7 +40,6 @@
     "Are you sure you want to upload the following files?": "Aşağıdaki dosyaları yüklemek istediğinizden emin misiniz ?",
     "Attachment": "Ek Dosya",
     "Autoplay GIFs and videos": "GIF'leri ve Videoları otomatik olarak oynat",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s %(targetName)s'i banladı.",
     "Ban": "Yasak",
     "Banned users": "Yasaklanan(Banlanan) Kullanıcılar",
     "Bans user with given id": "Yasaklanan(Banlanan) Kullanıcılar , ID'leri ile birlikte",
@@ -54,11 +50,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Tarayıcı çubuğunuzda bir HTTPS URL'si olduğunda Ana Sunusuna HTTP üzerinden bağlanılamıyor . Ya HTTPS kullanın veya  <a> güvensiz komut dosyalarını</a> etkinleştirin.",
     "Can't load user settings": "Kullanıcı ayarları yüklenemiyor",
     "Change Password": "Şifre Değiştir",
-    "%(senderName)s changed their profile picture.": "%(senderName)s profil resmini değiştirdi.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s %(powerLevelDiffText)s'nin güç düzeyini değiştirdi.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s odanın ismini  %(roomName)s olarak değiştirdi.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s oda adını kaldırdı.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s konuyu \"%(topic)s\" olarak değiştirdi.",
     "Changes to who can read history will only apply to future messages in this room": "Geçmişi kimlerin okuyabileceğine ait değişiklikler yalnızca bu odada gelecekteki iletiler için geçerli olur",
     "Changes your display nickname": "Görünen takma adınızı değiştirir",
     "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.": "Şifre değiştirme eğer oda anahtarlarınızı dışa aktarmaz ve daha sonra tekrar içe aktarmazsanız , şu anda tüm cihazlarda uçtan uca şifreleme anahtarlarını sıfırlayacak ve geçmişi okunamaz hale getirecek . Gelecekte bu geliştirilecek.",
@@ -132,7 +123,6 @@
     "Encrypted room": "Şifrelenmiş Oda",
     "Encryption is enabled in this room": "Şifreleme bu oda için etkin",
     "Encryption is not enabled in this room": "Şifreleme bu oda için etkin değil",
-    "%(senderName)s ended the call.": "%(senderName)s çağrıyı bitirdi.",
     "End-to-end encryption information": "Uçtan-uca şifreleme bilgileri",
     "End-to-end encryption is in beta and may not be reliable": "Uçtan uca şifreleme beta sürümünde ve güvenilir olmayabilir",
     "Enter Code": "Kodu Girin",
@@ -176,7 +166,6 @@
     "Forgot your password?": "Şifrenizi mi unuttunuz ?",
     "For security, this session has been signed out. Please sign in again.": "Güvenlik için , bu oturuma çıkış yapıldı . Lütfen tekrar oturum açın.",
     "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.": "Güvenlik için , çıkış yaparsanız bu tarayıcıdan tüm uçtan uca şifreleme anahtarları silinecek . Konuşma geçmişinizi çözebilmek isterseniz gelecekteki Riot oturumlarında  , lütfen Oda Anahtarlarını güvenlik amaçlı Dışa Aktarın.",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s %(fromPowerLevel)s den %(toPowerLevel)s ' ye",
     "Guest access is disabled on this Home Server.": "Misafir erişimi bu Ana Sunucu için devre dışı.",
     "Guests cannot join this room even if explicitly invited.": "Misafirler açıkca davet edilseler bile bu odaya katılamazlar.",
     "Hangup": "Sorun",
@@ -199,7 +188,6 @@
     "Invalid address format": "Geçersiz adres formatı",
     "Invalid Email Address": "Geçersiz E-posta Adresi",
     "Invalid file%(extra)s": "Geçersiz dosya %(extra)s'ı",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s %(targetName)s ' ı davet etti.",
     "Invite new room members": "Yeni oda üyelerini davet et",
     "Invited": "Davet Edildi",
     "Invites": "Davetler",
@@ -210,26 +198,18 @@
     "Sign in with": "Şununla giriş yap",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText> ses </voiceText> veya <videoText> video </videoText> olarak katılın.",
     "Join Room": "Odaya Katıl",
-    "%(targetName)s joined the room.": "%(targetName)s odaya katıldı.",
     "Joins room with given alias": "Verilen takma ad (nick name) ile odaya katıl",
     "Jump to first unread message.": "İlk okunmamış iletiye atla.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s %(targetName)s' ı attı.",
     "Kick": "Atmak (Odadan atmak vs.)",
     "Kicks user with given id": "Verilen ID ' li kullanıcıyı at",
     "Labs": "Laboratuarlar",
     "Last seen": "Son görülme",
     "Leave room": "Odadan ayrıl",
-    "%(targetName)s left the room.": "%(targetName)s odadan ayrıldı.",
     "Level:": "Seviye :",
     "Local addresses for this room:": "Bu oda için yerel adresler :",
     "Logged in as:": "Olarak giriş yaptı :",
     "Logout": "Çıkış Yap",
     "Low priority": "Düşük öncelikli",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , katıldıkları noktalardan.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s gelecekte oda geçmişini görünür yaptı herhangi biri.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gelecekte oda geçmişini görünür yaptı bilinmeyen (%(visibility)s).",
     "Manage Integrations": "Entegrasyonları Yönet",
     "Markdown is disabled": "Markdown devre dışı",
     "Markdown is enabled": "Markdown aktif",
@@ -271,7 +251,6 @@
     "People": "İnsanlar",
     "Permissions": "İzinler",
     "Phone": "Telefon",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s bir %(callType)s çağrısı yerleştirdi.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lütfen e-postanızı kontrol edin ve içerdiği bağlantıya tıklayın . Bu işlem tamamlandıktan sonra , 'devam et' e tıklayın .",
     "Power level must be positive integer.": "Güç seviyesi pozitif tamsayı olmalıdır.",
     "Press <StartChatButton> to start a chat with someone": "Birisiyle sohbet başlatmak için <StartChatButton> tuşuna basın",
@@ -285,16 +264,12 @@
     "Revoke Moderator": "Moderatörü İptal Et",
     "Refer a friend to Riot:": "Riot'tan bir arkadaşa bakın :",
     "Register": "Kaydolun",
-    "%(targetName)s rejected the invitation.": "%(targetName)s daveti reddetti.",
     "Reject invitation": "Daveti Reddet",
     "Rejoin": "Yeniden Katıl",
     "Remote addresses for this room:": "Bu oda için uzak adresler:",
     "Remove Contact Information?": "İletişim Bilgilerini Kaldır ?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s görünen adı (%(oldDisplayName)s) kaldırdı.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s profil resmini kaldırdı.",
     "Remove": "Kaldır",
     "Remove %(threePid)s?": "%(threePid)s 'i  kaldır ?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s bir VoIP konferansı talep etti.",
     "Resetting 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.": "Şifrenizi sıfırlamak , eğer Oda Anahtarlarınızı dışa aktarmaz ve daha sonra içe aktarmaz iseniz , şu anda tüm cihazlarda uçtan uca şifreleme anahtarlarını sıfırlayarak şifreli sohbetleri okunamaz hale getirecek . Gelecekte bu iyileştirilecek.",
     "Results from DuckDuckGo": "DuckDuckGo Sonuçları",
     "Return to login screen": "Giriş ekranına dön",
@@ -320,7 +295,6 @@
     "Send Invites": "Davetiye Gönder",
     "Send Reset Email": "E-posta Sıfırlama Gönder",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s bir resim gönderdi.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s %(targetDisplayName)s' a odaya katılması için bir davet gönderdi.",
     "Server error": "Sunucu Hatası",
     "Server may be unavailable or overloaded": "Sunucu kullanılamıyor veya aşırı yüklenmiş olabilir",
     "Server may be unavailable, overloaded, or search timed out :(": "Sunucu kullanılamıyor , aşırı yüklenmiş veya arama zaman aşımına uğramış olabilir :(",
@@ -328,8 +302,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Sunucu kullanılamıyor , aşırı yüklenmiş , veya bir hatayla karşılaşmış olabilirsiniz.",
     "Server unavailable, overloaded, or something else went wrong.": "Sunucu kullanılamıyor , aşırı yüklenmiş veya başka bir şey ters gitmiş olabilir.",
     "Session ID": "Oturum ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s bir profil resmi ayarladı.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s görünür ismini %(displayName)s ' a ayarladı.",
     "Settings": "Ayarlar",
     "Show panel": "Paneli göster",
     "Show Text Formatting Toolbar": "Metin Biçimlendirme Araç Çubuğunu Göster",
@@ -374,12 +346,10 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Bu odanın akışında belirli bir noktaya yüklemeye çalışıldı , ancak bulunamadı.",
     "Turn Markdown off": "Markdown'u kapat",
     "Turn Markdown on": "Markdown'u Aç",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s uçtanuca şifrelemeyi açtı (algoritma -> %(algorithm)s).",
     "Unable to add email address": "E-posta adresi eklenemiyor",
     "Unable to remove contact information": "Kişi bilgileri kaldırılamıyor",
     "Unable to verify email address.": "E-posta adresi doğrulanamıyor.",
     "Unban": "Yasağı Kaldır",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s %(targetName)s 'in yasağını kaldırdı.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Bu davetiyenin gönderildiği adresin hesabınızla ilişkili bir adresle eşleştiğini tespit etmek mümkün değil.",
     "Unable to capture screen": "Ekran yakalanamadı",
     "Unable to enable Notifications": "Bildirimler aktif edilemedi",
@@ -436,7 +406,6 @@
     "Who can read history?": "Geçmişi kimler okuyabilir ?",
     "Who would you like to add to this room?": "Bu odaya kimi eklemek istersiniz ?",
     "Who would you like to communicate with?": "Kimlerle iletişim kurmak istersiniz ?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s %(targetName)s'nin davetinden çekildi.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Bu daveti <acceptText> kabul etmek </acceptText> veya <declineText> reddetmek </declineText> ister misiniz ?",
     "You already have existing direct chats with this user:": "Bu kullanıcıyla var olan doğrudan sohbetleriniz var :",
     "You are already in a call.": "Zaten bir çağrıdasınız.",
@@ -606,9 +575,6 @@
     "Start chatting": "Sohbeti başlat",
     "Start Chatting": "Sohbeti Başlat",
     "Click on the button below to start chatting!": "Sohbeti başlatmak için aşağıdaki butona tıklayın!",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s odanın avatarını <img/> olarak çevirdi",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odanın avatarını kaldırdı.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s  %(roomName)s için avatarı değiştirdi",
     "Username available": "Kullanıcı ismi uygun",
     "Username not available": "Kullanıcı ismi uygun değil",
     "Something went wrong!": "Bir şeyler yanlış gitti!",
@@ -751,5 +717,39 @@
     "View Source": "Kaynağı Görüntüle",
     "Collapse panel": "Katlanır panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
-    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var"
+    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
+    "<target> accepted the invitation for %(displayName)s.": "<target> %(displayName)s için davetiyeyi kabul etti.",
+    "<target> accepted an invitation.": "<target> bir davetiyeyi kabul etti.",
+    "<sender> requested a VoIP conference.": "<sender> bir VoIP konferansı talep etti.",
+    "<sender> invited <target>.": "<sender> <target> ' ı davet etti.",
+    "<sender> banned <target>.": "<sender> <target>'i banladı.",
+    "<sender> set their display name to <displayName>.": "<sender> görünür ismini <displayName> ' a ayarladı.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> görünen adı (<oldDisplayName>) kaldırdı.",
+    "<sender> removed their profile picture.": "<sender> profil resmini kaldırdı.",
+    "<sender> changed their profile picture.": "<sender> profil resmini değiştirdi.",
+    "<sender> set a profile picture.": "<sender> bir profil resmi ayarladı.",
+    "<target> joined the room.": "<target> odaya katıldı.",
+    "<target> rejected the invitation.": "<target> daveti reddetti.",
+    "<target> left the room.": "<target> odadan ayrıldı.",
+    "<sender> unbanned <target>.": "<sender> <target> 'in yasağını kaldırdı.",
+    "<sender> kicked <target>.": "<sender> <target>' ı attı.",
+    "<sender> withdrew <target>'s invitation.": "<sender> <target>'nin davetinden çekildi.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> konuyu \"%(topic)s\" olarak değiştirdi.",
+    "<sender> changed the room name to %(roomName)s.": "<sender> odanın ismini  %(roomName)s olarak değiştirdi.",
+    "<sender> changed the room avatar to <img/>": "<sender> odanın avatarını <img/> olarak çevirdi",
+    "<sender> changed the avatar for %(roomName)s": "<sender>  %(roomName)s için avatarı değiştirdi",
+    "<sender> removed the room name.": "<sender> oda adını kaldırdı.",
+    "<sender> removed the room avatar.": "<sender> odanın avatarını kaldırdı.",
+    "<sender> answered the call.": "<sender> aramayı cevapladı.",
+    "<sender> ended the call.": "<sender> çağrıyı bitirdi.",
+    "<sender> placed a %(callType)s call.": "<sender> bir %(callType)s çağrısı yerleştirdi.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> %(targetDisplayName)s' a odaya katılması için bir davet gönderdi.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , katıldıkları noktalardan.",
+    "<sender> made future room history visible to all room members.": "<sender> gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri.",
+    "<sender> made future room history visible to anyone.": "<sender> gelecekte oda geçmişini görünür yaptı herhangi biri.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> gelecekte oda geçmişini görünür yaptı bilinmeyen (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> uçtanuca şifrelemeyi açtı (algoritma -> %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> %(fromPowerLevel)s den %(toPowerLevel)s ' ye",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> %(powerLevelDiffText)s'nin güç düzeyini değiştirdi."
 }
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 5e7cc75f8a..09158411fc 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -23,8 +23,6 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Текстове повідомлення було надіслано +%(msisdn)s. Введіть, будь ласка, код підтвердження з цього повідомлення",
     "Accept": "Прийняти",
     "Account": "Обліковка",
-    "%(targetName)s accepted an invitation.": "%(targetName)s прийняв запрошення.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прийняв запрошення від %(displayName)s.",
     "Access Token:": "Токен доступу:",
     "Active call (%(roomName)s)": "Активний виклик (%(roomName)s)",
     "Add": "Додати",
@@ -57,7 +55,6 @@
     "A new password must be entered.": "Має бути введений новий пароль.",
     "Add a widget": "Добавити віджет",
     "Allow": "Принюти",
-    "%(senderName)s answered the call.": "%(senderName)s відповіла на дзвінок.",
     "An error has occurred.": "Трапилась помилка.",
     "Anyone": "Кожний",
     "Anyone who knows the room's link, apart from guests": "Кожний, хто знає посилання на кімнату, окрім гостей",
@@ -68,7 +65,6 @@
     "Are you sure you want to upload the following files?": "Ви впевнені, що ви хочете відправити наступний файл?",
     "Attachment": "Прикріплення",
     "Autoplay GIFs and videos": "Автовідтворення GIF і відео",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокував(ла) %(targetName)s.",
     "Ban": "Заблокувати",
     "Banned users": "Заблоковані користувачі",
     "Bans user with given id": "Блокує користувача з заданим ID",
@@ -79,11 +75,6 @@
     "Can't load user settings": "Неможливо завантажити настройки користувача",
     "Cannot add any more widgets": "Неможливо додати більше віджетів",
     "Change Password": "Поміняти пароль",
-    "%(senderName)s changed their profile picture.": "%(senderName)s змінив зображення профіля.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінив(ла) рівень доступу для %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінив(ла) назву кімнати на %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s видалив ім'я кімнати.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінив тему на %(topic)s.",
     "Email": "е-пошта",
     "Email address": "Адреса е-почти",
     "Email address (optional)": "Адреса е-почти (не обов'язково)",
@@ -279,5 +270,14 @@
     "Your User Agent": "Ваш користувацький агент",
     "Your device resolution": "Роздільність вашого пристрою",
     "Analytics": "Аналітика",
-    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:"
+    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:",
+    "<target> accepted the invitation for %(displayName)s.": "<target> прийняв запрошення від %(displayName)s.",
+    "<target> accepted an invitation.": "<target> прийняв запрошення.",
+    "<sender> banned <target>.": "<sender> заблокував(ла) <target>.",
+    "<sender> changed their profile picture.": "<sender> змінив зображення профіля.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> змінив тему на %(topic)s.",
+    "<sender> changed the room name to %(roomName)s.": "<sender> змінив(ла) назву кімнати на %(roomName)s.",
+    "<sender> removed the room name.": "<sender> видалив ім'я кімнати.",
+    "<sender> answered the call.": "<sender> відповіла на дзвінок.",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> змінив(ла) рівень доступу для %(powerLevelDiffText)s."
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 56d5c1e4dc..e1c9dbe953 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -26,7 +26,6 @@
     "Enable encryption": "启用加密",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "不支持加密的客户端将看不到加密的消息",
     "Encrypted room": "加密聊天室",
-    "%(senderName)s ended the call.": "%(senderName)s 结束了通话。.",
     "End-to-end encryption information": "端到端加密信息",
     "End-to-end encryption is in beta and may not be reliable": "端到端加密现为 beta 版，不一定可靠",
     "Enter Code": "输入验证码",
@@ -64,7 +63,6 @@
     "Forgot your password?": "忘记密码？",
     "For security, this session has been signed out. Please sign in again.": "出于安全考虑，此会话已被注销。请重新登录。.",
     "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.": "出于安全考虑，用户注销时会清除浏览器里的端到端加密密钥。如果你想要下次登录 Riot 时能解密过去的聊天记录，请导出你的聊天室密钥。",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 从 %(fromPowerLevel)s 变为 %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主动邀请。.",
     "Hangup": "挂断",
     "Hide read receipts": "隐藏已读回执",
@@ -98,7 +96,6 @@
     "Send Invites": "发送邀请",
     "Send Reset Email": "发送密码重设邮件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 发了一张图片。.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 发了加入聊天室的邀请。.",
     "Server error": "服务器错误",
     "Server may be unavailable or overloaded": "服务器可能不可用或者超载",
     "Server may be unavailable, overloaded, or search timed out :(": "服务器可能不可用、超载，或者搜索超时 :(",
@@ -106,8 +103,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "服务器可能不可用、超载，或者你遇到了一个 bug。",
     "Server unavailable, overloaded, or something else went wrong.": "服务器可能不可用、超载，或者其他东西出错了.",
     "Session ID": "会话 ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s 设置了头像。.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 将昵称改为了 %(displayName)s。.",
     "Settings": "设置",
     "Show panel": "显示侧边栏",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小时制显示时间戳 （如：下午 2:30）",
@@ -134,11 +129,9 @@
     "Always show message timestamps": "总是显示消息时间戳",
     "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在输入",
     "A new password must be entered.": "一个新的密码必须被输入。.",
-    "%(senderName)s answered the call.": "%(senderName)s 接了通话。.",
     "An error has occurred.": "一个错误出现了。",
     "Attachment": "附件",
     "Autoplay GIFs and videos": "自动播放GIF和视频",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s.",
     "Ban": "封禁",
     "Banned users": "被封禁的用户",
     "Click here to fix": "点击这里修复",
@@ -148,9 +141,7 @@
     "Ed25519 fingerprint": "Ed25519指纹",
     "Invite new room members": "邀请新的聊天室成员",
     "Join Room": "加入聊天室",
-    "%(targetName)s joined the room.": "%(targetName)s 已加入聊天室。",
     "Jump to first unread message.": "跳到第一条未读消息。",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "退出聊天室",
     "New password": "新密码",
     "Add a topic": "添加一个主题",
@@ -186,10 +177,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "当浏览器地址栏里有 HTTPS 的 URL 时，不能使用 HTTP 连接主服务器。请使用 HTTPS 或者<a>允许不安全的脚本</a>。",
     "Can't load user settings": "无法加载用户设置",
     "Change Password": "修改密码",
-    "%(senderName)s changed their profile picture.": "%(senderName)s 修改了头像。",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 将聊天室名称改为 %(roomName)s。",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 移除了聊天室名称。",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 将话题修改为 “%(topic)s”。",
     "Changes to who can read history will only apply to future messages in this room": "修改阅读历史的权限仅对此聊天室以后的消息有效",
     "Changes your display nickname": "修改昵称",
     "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.": "目前，修改密码会导致所有设备上的端到端密钥被重置，使得加密的聊天记录不再可读。除非你事先导出聊天室密钥，修改密码后再导入。这个问题未来会改善。",
@@ -238,7 +225,6 @@
     "Incoming video call from %(name)s": "来自 %(name)s 的视频通话",
     "Incoming voice call from %(name)s": "来自 %(name)s 的语音通话",
     "Incorrect username and/or password.": "用户名或密码错误。",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s 邀请了 %(targetName)s。",
     "Invited": "已邀请",
     "Invites": "邀请",
     "Invites user with given id to current room": "按照 ID 邀请指定用户加入当前聊天室",
@@ -291,7 +277,6 @@
     "Edit": "编辑",
     "Joins room with given alias": "以指定的别名加入聊天室",
     "Labs": "实验室",
-    "%(targetName)s left the room.": "%(targetName)s 退出了聊天室。",
     "Logged in as:": "登录为：",
     "Logout": "登出",
     "Low priority": "低优先级",
@@ -306,7 +291,6 @@
     "Privileged Users": "特权用户",
     "Reason": "理由",
     "Register": "注册",
-    "%(targetName)s rejected the invitation.": "%(targetName)s 拒绝了邀请。",
     "Reject invitation": "拒绝邀请",
     "Rejoin": "重新加入",
     "Users": "用户",
@@ -445,32 +429,21 @@
     "I already have an account": "我已经有一个帐号",
     "Unblacklist": "移出黑名单",
     "Not a valid Riot keyfile": "不是一个有效的 Riot 密钥文件",
-    "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀请。",
     "Do you want to load widget from URL:": "你想从此 URL 加载小组件吗：",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "隐藏加入/退出消息（邀请/踢出/封禁不受影响）",
     "Integrations Error": "集成错误",
     "Publish this room to the public in %(domain)s's room directory?": "把这个聊天室发布到 %(domain)s 的聊天室目录吗？",
     "Manage Integrations": "管理集成",
     "No users have specific privileges in this room": "没有用户在这个聊天室有特殊权限",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s 发起了一个 %(callType)s 通话。",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "请检查你的电子邮箱并点击里面包含的链接。完成时请点击继续。",
     "Press <StartChatButton> to start a chat with someone": "按下 <StartChatButton> 来开始和某个人聊天",
-    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他们的头像。",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s 已请求发起 VoIP 会议。",
     "Seen by %(userName)s at %(dateTime)s": "在 %(dateTime)s 被 %(userName)s 看到",
     "Tagged as: ": "标记为： ",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "验证码将发送至 +%(msisdn)s，请输入收到的验证码",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 接受了 %(displayName)s 的邀请。",
     "Active call (%(roomName)s)": "当前通话 (来自聊天室 %(roomName)s)",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 将级别调整到%(powerLevelDiffText)s 。",
     "Changes colour scheme of current room": "修改了样式",
     "Deops user with given id": "按照 ID 取消特定用户的管理员权限",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "通过 <voiceText>语言</voiceText> 或者 <videoText>视频</videoText>加入.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员，从他们被邀请开始.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员，从他们加入开始.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s 设定历史浏览功能为 任何人.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s 设定历史浏览功能为 未知的 (%(visibility)s).",
     "AM": "上午",
     "PM": "下午",
     "NOTE: Apps are not end-to-end encrypted": "提示：APP不支持端到端加密",
@@ -529,7 +502,6 @@
     " (unsupported)": " （不支持）",
     "Updates": "更新",
     "Check for update": "检查更新",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s 移除了聊天室头像。",
     "Something went wrong!": "出了点问题！",
     "If you already have a Matrix account you can <a>log in</a> instead.": "如果你已经有一个 Matrix 帐号，你可以<a>登录</a>。",
     "Do you want to set an email address?": "你要设置一个邮箱地址吗？",
@@ -540,7 +512,6 @@
     "Verification Pending": "验证等待中",
     "(unknown failure: %(reason)s)": "（未知错误：%(reason)s）",
     "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!": "警告：密钥验证失败！%(userId)s 和 device %(deviceId)s 的签名密钥是 \"%(fprint)s\"，和提供的咪呀 \"%(fingerprint)s\" 不匹配。这可能意味着你的通信正在被窃听！",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 收回了 %(targetName)s 的邀请。",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "你想要 <acceptText>接受</acceptText> 还是 <declineText>拒绝</declineText> 这个邀请？",
     "You already have existing direct chats with this user:": "你已经有和此用户的直接聊天：",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "你现在还不再任何聊天室！按下 <CreateRoomButton> 来创建一个聊天室或者 <RoomDirectoryButton> 来浏览目录",
@@ -591,11 +562,9 @@
     "Verifies a user, device, and pubkey tuple": "验证一个用户、设备和密钥元组",
     "Unknown devices": "未知设备",
     "Unknown Address": "未知地址",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 删除了他们的昵称 (%(oldDisplayName)s).",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "您提供的签名密钥和你从 %(userId)s 的设备 %(deviceId)s 收到的签名密钥匹配。设备被标记为已验证。",
     "These are experimental features that may break in unexpected ways": "这些是可能以意外的方式坏掉的实验性的特性",
     "The visibility of existing history will be unchanged": "现有历史记录的可见性不会改变",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).",
     "Unable to remove contact information": "无法移除联系人信息",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据来允许我们改善这个应用。",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" 包含你以前没见过的设备。",
@@ -609,7 +578,6 @@
     "Add an Integration": "添加一个集成",
     "Removed or unknown message type": "被移除或未知的消息类型",
     "Ongoing conference call%(supportedText)s.": "正在进行的会议通话 %(supportedText)s.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 修改了 %(roomName)s 的头像",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "这将会成为你在 <span></span> 主服务器上的账户名，或者你可以选择一个 <a>不同的服务器</a>。",
     "Your browser does not support the required cryptography extensions": "你的浏览器不支持 Riot 所需的密码学特性",
     "Authentication check failed: incorrect password?": "身份验证失败：密码错误？",
@@ -619,9 +587,6 @@
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "你的未经验证的设备 '%(displayName)s' 正在请求加密密钥。",
     "Encryption key request": "加密密钥请求",
     "Autocomplete Delay (ms):": "自动补全延迟（毫秒）：",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 添加",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 移除",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 修改",
     "Unpin Message": "取消置顶消息",
     "Add rooms to this community": "添加聊天室到此社区",
     "Call Failed": "呼叫失败",
@@ -638,9 +603,7 @@
     "You are now ignoring %(userId)s": "你正在忽视 %(userId)s",
     "Unignored user": "接触忽视用户",
     "You are no longer ignoring %(userId)s": "你不再忽视 %(userId)s",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除了 %(targetName)s 的封禁。",
     "(could not connect media)": "（无法连接媒体）",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 更改了聊天室的置顶消息。",
     "%(names)s and %(count)s others are typing|other": "%(names)s 和另外 %(count)s 个人正在输入",
     "%(names)s and %(count)s others are typing|one": "%(names)s 和另一个人正在输入",
     "Send": "发送",
@@ -794,7 +757,6 @@
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "你似乎没有将此邮箱地址同在此主服务器上的任何一个 Matrix 账号绑定。",
     "Restricted": "受限用户",
     "To use it, just wait for autocomplete results to load and tab through them.": "若要使用自动补全，只要等待自动补全结果加载完成，按 Tab 键切换即可。",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 将他们的昵称修改成了 %(displayName)s 。",
     "Hide avatars in user and room mentions": "隐藏头像",
     "Disable Community Filter Panel": "停用社区面板",
     "Stickerpack": "贴图集",
@@ -892,7 +854,6 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "新社区 ID（例子：+foo:%(localDomain)s）",
     "URL previews are enabled by default for participants in this room.": "此聊天室默认启用链接预览。",
     "URL previews are disabled by default for participants in this room.": "此聊天室默认禁用链接预览。",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s 将聊天室的头像更改为 <img/>",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "您也可以自定义身份认证服务器，但这通常会阻止基于邮箱地址的与用户的交互。",
     "Please enter the code it contains:": "请输入它包含的代码：",
     "Flair will appear if enabled in room settings": "如果在聊天室设置中启用， flair 将会显示",
@@ -1135,5 +1096,44 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "无法加载被回复的事件，它可能不存在，也可能是您没有权限查看它。",
     "And %(count)s more...|other": "和 %(count)s 个其他…",
     "Try using one of the following valid address types: %(validTypesList)s.": "请尝试使用以下的有效邮箱地址格式中的一种：%(validTypesList)s",
-    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot 使用 GitHub 追踪 bug：<a>在 GitHub 上创建新 Issue</a>"
+    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot 使用 GitHub 追踪 bug：<a>在 GitHub 上创建新 Issue</a>",
+    "<target> accepted the invitation for %(displayName)s.": "<target> 接受了 %(displayName)s 的邀请。",
+    "<target> accepted an invitation.": "<target> 已接受邀请。",
+    "<sender> requested a VoIP conference.": "<sender> 已请求发起 VoIP 会议。",
+    "<sender> invited <target>.": "<sender> 邀请了 <target>。",
+    "<sender> banned <target>.": "<sender> 封禁了 <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> 将他们的昵称修改成了 <displayName> 。",
+    "<sender> set their display name to <displayName>.": "<sender> 将昵称改为了 <displayName>。.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> 删除了他们的昵称 (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> 移除了他们的头像。",
+    "<sender> changed their profile picture.": "<sender> 修改了头像。",
+    "<sender> set a profile picture.": "<sender> 设置了头像。.",
+    "<target> joined the room.": "<target> 已加入聊天室。",
+    "<target> rejected the invitation.": "<target> 拒绝了邀请。",
+    "<target> left the room.": "<target> 退出了聊天室。",
+    "<sender> unbanned <target>.": "<sender> 解除了 <target> 的封禁。",
+    "<sender> kicked <target>.": "<sender> 把 <target> 踢出了聊天室。.",
+    "<sender> withdrew <target>'s invitation.": "<sender> 收回了 <target> 的邀请。",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> 将话题修改为 “%(topic)s”。",
+    "<sender> changed the room name to %(roomName)s.": "<sender> 将聊天室名称改为 %(roomName)s。",
+    "<sender> changed the avatar for %(roomName)s": "<sender> 修改了 %(roomName)s 的头像",
+    "<sender> changed the room avatar to <img/>": "<sender> 将聊天室的头像更改为 <img/>",
+    "<sender> removed the room name.": "<sender> 移除了聊天室名称。",
+    "<sender> removed the room avatar.": "<sender> 移除了聊天室头像。",
+    "<sender> answered the call.": "<sender> 接了通话。.",
+    "<sender> ended the call.": "<sender> 结束了通话。.",
+    "<sender> placed a %(callType)s call.": "<sender> 发起了一个 %(callType)s 通话。",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> 向 %(targetDisplayName)s 发了加入聊天室的邀请。.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> 设定历史浏览功能为 所有聊天室成员，从他们被邀请开始.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> 设定历史浏览功能为 所有聊天室成员，从他们加入开始.",
+    "<sender> made future room history visible to all room members.": "<sender> 设定历史浏览功能为 所有聊天室成员.",
+    "<sender> made future room history visible to anyone.": "<sender> 设定历史浏览功能为 任何人.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> 设定历史浏览功能为 未知的 (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> 打开了端到端加密 (算法 %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> 从 %(fromPowerLevel)s 变为 %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> 将级别调整到%(powerLevelDiffText)s 。",
+    "<sender> changed the pinned messages for the room.": "<sender> 更改了聊天室的置顶消息。",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s 小组建被 <sender> 修改",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s 小组建被 <sender> 添加",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s 小组建被 <sender> 移除"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index ebf329b45b..5ba9458c77 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -8,7 +8,6 @@
     "Are you sure you want to upload the following files?": "您確認要上傳以下文件嗎？",
     "Attachment": "附件",
     "Autoplay GIFs and videos": "自動播放 GIF 和影片",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封鎖了 %(targetName)s.",
     "Ban": "封鎖",
     "Banned users": "被封鎖的用戶",
     "Blacklisted": "已列入黑名單",
@@ -16,7 +15,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "當瀏覽器網址列裡有 HTTPS URL 時，不能使用 HTTP 連線到家伺服器。請採用 HTTPS 或者<a>允許不安全的指令稿</a>。",
     "Can't load user settings": "無法載入使用者設定",
     "Change Password": "變更密碼",
-    "%(targetName)s left the room.": "%(targetName)s 離開了聊天室。.",
     "Account": "帳號",
     "Access Token:": "取用令牌：",
     "Add email address": "添加郵件地址",
@@ -28,7 +26,6 @@
     "Authentication": "授權",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在打字",
-    "%(senderName)s answered the call.": "%(senderName)s 接了通話。.",
     "Clear Cache": "清理緩存",
     "Click here to fix": "點擊這里修復",
     "Confirm password": "確認密碼",
@@ -62,7 +59,6 @@
     "Enable encryption": "啟用加密",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "不支援加密的客戶端將看不到加密的訊息",
     "Encrypted room": "加密聊天室",
-    "%(senderName)s ended the call.": "%(senderName)s 結束了通話。.",
     "End-to-end encryption information": "端到端加密資訊",
     "End-to-end encryption is in beta and may not be reliable": "端到端加密現為測試版，不一定可靠",
     "Enter Code": "輸入代碼",
@@ -100,7 +96,6 @@
     "Forgot your password?": "忘記密碼？",
     "For security, this session has been signed out. Please sign in again.": "因為安全因素，此工作階段已被登出。請重新登入。",
     "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.": "因為安全因素，登出將會從此瀏覽器刪除任何端到端加密的金鑰。若您想要在未來的 Riot 工作階段中解密您的對話紀錄，請將您的聊天室金鑰匯出並好好存放。",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 從 %(fromPowerLevel)s 變為 %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主動邀請。.",
     "Hangup": "掛斷",
     "Hide read receipts": "隱藏已讀回執",
@@ -118,9 +113,7 @@
     "Invalid file%(extra)s": "非法文件%(extra)s",
     "Invite new room members": "邀請新的聊天室成員",
     "Join Room": "加入聊天室",
-    "%(targetName)s joined the room.": "%(targetName)s 加入了聊天室。.",
     "Jump to first unread message.": "跳到第一則未讀訊息。",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "離開聊天室",
     "New password": "新密碼",
     "Resetting 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.": "重設密碼目前會把所有裝置上的端到端加密金鑰重設，讓已加密的聊天歷史不可讀，除非您先匯出您的聊天室金鑰並在稍後重新匯入。這會在未來改進。",
@@ -141,7 +134,6 @@
     "Send Invites": "發送邀請",
     "Send Reset Email": "發送密碼重設郵件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 發了一張圖片。.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 發了加入聊天室的邀請。.",
     "Server error": "伺服器錯誤",
     "Server may be unavailable or overloaded": "服務器可能不可用或者超載",
     "Server may be unavailable, overloaded, or search timed out :(": "服務器可能不可用、超載，或者搜索超時 :(",
@@ -149,8 +141,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "服務器可能不可用、超載，或者你遇到了一個漏洞.",
     "Server unavailable, overloaded, or something else went wrong.": "伺服器可能不可用、超載，或者其他東西出錯了.",
     "Session ID": "會話 ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s 設置了頭像。.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將他的暱稱改成 %(displayName)s。.",
     "Settings": "設定",
     "Show panel": "顯示側邊欄",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小時制顯示時間戳 （如：下午 2:30）",
@@ -172,7 +162,6 @@
     "The file '%(fileName)s' failed to upload": "文件 '%(fileName)s' 上傳失敗",
     "Turn Markdown off": "關閉Markdown 語法",
     "Turn Markdown on": "啟用Markdown 語法",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 啟用端對端加密 (algorithm %(algorithm)s).",
     "Unable to add email address": "無法加入電郵地址",
     "Unable to capture screen": "無法截取畫面",
     "Unable to enable Notifications": "無法啟用通知功能",
@@ -186,9 +175,6 @@
     "Online": "線上",
     "Idle": "閒置",
     "Offline": "下線",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s 更改了聊天室的圖像為 <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s 移除了聊天室圖片。",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 更改了聊天室 %(roomName)s　圖像",
     "Cancel": "取消",
     "Custom Server Options": "自訂伺服器選項",
     "Dismiss": "關閉",
@@ -233,8 +219,6 @@
     "Start chat": "開始聊天",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "文字訊息將會傳送到 +%(msisdn)s。請輸入其中包含的驗證碼",
     "Accept": "接受",
-    "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀請。",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 已接受 %(displayName)s 的邀請。",
     "Active call (%(roomName)s)": "活躍的通話（%(roomName)s）",
     "Add": "新增",
     "Admin Tools": "管理員工具",
@@ -248,11 +232,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "您確定您要想要離開房間 '%(roomName)s' 嗎？",
     "Bans user with given id": "禁止有指定 ID 的使用者",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "無法連線到家伺服器 - 請檢查您的連線，確保您的<a>家伺服器的 SSL 憑證</a>可被信任，而瀏覽器擴充套件也沒有阻擋請求。",
-    "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他的基本資料圖片。",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 變更了 %(powerLevelDiffText)s 權限等級。",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 將房間名稱變更為 %(roomName)s。",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 已經移除了房間名稱。",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 已經變更主題為「%(topic)s」。",
     "Changes to who can read history will only apply to future messages in this room": "變更誰可以讀取歷史紀錄的設定僅套用於此房間未來的訊息",
     "Changes your display nickname": "變更您的顯示暱稱",
     "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.": "目前變更密碼將會重設在所有裝置上的端對端加密金鑰，讓加密的聊天歷史無法讀取，除非您先匯出您的房間金鑰，並在稍後重新匯入它們。這會在未來改進。",
@@ -301,7 +280,6 @@
     "Incoming video call from %(name)s": "從 %(name)s 而來的視訊來電",
     "Incoming voice call from %(name)s": "從 %(name)s 而來的語音來電",
     "Incorrect username and/or password.": "不正確的使用者名稱和／或密碼。",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s 邀請了 %(targetName)s。",
     "Invited": "已邀請",
     "Invites": "邀請",
     "Invites user with given id to current room": "邀請指定 ID 的使用者到目前的房間",
@@ -320,11 +298,6 @@
     "Logged in as:": "登入為：",
     "Logout": "登出",
     "Low priority": "低優先度",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s 讓未來的房間歷史紀錄可見於 所有聊天室成員，從他們被邀請開始.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s 讓未來的房間歷史紀錄可見於 所有聊天室成員，從他們加入開始.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s 讓未來的房間歷史紀錄可見於 所有聊天室成員.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s 讓未來的房間歷史紀錄可見於 任何人.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s 讓未來的房間歷史紀錄可見於 未知 (%(visibility)s).",
     "Manage Integrations": "管裡整合",
     "Markdown is disabled": "Markdown 已停用",
     "Markdown is enabled": "Markdown 已啟用",
@@ -361,7 +334,6 @@
     "People": "夥伴",
     "Permissions": "權限",
     "Phone": "電話",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s 打了 %(callType)s 通話。",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "請檢查您的電子郵件並點選其中包含的連結。只要這個完成了，就點選選繼續。",
     "Power level must be positive integer.": "權限等級必需為正整數。",
     "Press <StartChatButton> to start a chat with someone": "按下 <StartChatButton> 以開始與某人聊天",
@@ -373,15 +345,11 @@
     "Reason: %(reasonText)s": "理由：%(reasonText)s",
     "Revoke Moderator": "撤回仲裁者",
     "Refer a friend to Riot:": "推薦 Riot 給朋友：",
-    "%(targetName)s rejected the invitation.": "%(targetName)s 拒絕了邀請。",
     "Reject invitation": "拒絕邀請",
     "Rejoin": "重新加入",
     "Remote addresses for this room:": "此房間的遠端地址：",
     "Remove Contact Information?": "移除聯絡人資訊？",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他的顯示名稱 (%(oldDisplayName)s)。",
-    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他的基本資料圖片。",
     "Remove %(threePid)s?": "移除 %(threePid)s？",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s 請求了一次 VoIP 會議。",
     "Results from DuckDuckGo": "DuckDuckGo 的結果",
     "Room contains unknown devices": "包含了未知裝置的房間",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
@@ -415,7 +383,6 @@
     "Unable to remove contact information": "無法移除聯絡人資訊",
     "Unable to verify email address.": "無法驗證電子郵件。",
     "Unban": "解除禁止",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除禁止 %(targetName)s。",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "無法確定此邀請是傳送到與您的帳號相關聯的電子郵件地址。",
     "Unable to load device list": "無法載入裝置清單",
     "Undecryptable": "無法解密",
@@ -469,7 +436,6 @@
     "Who can read history?": "誰可以讀取歷史紀錄？",
     "Who would you like to add to this room?": "您想要新增誰到此房間？",
     "Who would you like to communicate with?": "您想與誰通訊？",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 撤回了 %(targetName)s 的邀請。",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "您想要<acceptText>接受</acceptText>或<declineText>拒絕</declineText>此邀請？",
     "You already have existing direct chats with this user:": "您已與此使用者直接聊天：",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "您尚未在任何房間！按下<CreateRoomButton> 來建立房間或 <RoomDirectoryButton> 來瀏覽目錄",
@@ -663,10 +629,7 @@
     "Automatically replace plain text Emoji": "自動取代純文字為顏文字",
     "Failed to upload image": "上傳圖片失敗",
     "Hide avatars in user and room mentions": "在使用者與聊天室提及中隱藏大頭貼",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s 由 %(senderName)s 所新增",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s 由 %(senderName)s 所移除",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "機器人檢查目前在桌面端不可用 ── 請使用<a>網路瀏覽器</a>",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小工具已被 %(senderName)s 修改",
     "Copied!": "已複製！",
     "Failed to copy": "複製失敗",
     "Add rooms to this community": "新增聊天室到此社群",
@@ -696,7 +659,6 @@
     "You are now ignoring %(userId)s": "您忽略了 %(userId)s",
     "Unignored user": "未忽略的使用者",
     "You are no longer ignoring %(userId)s": "您不再忽略 %(userId)s",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 變更了聊天室的釘選訊息。",
     "%(names)s and %(count)s others are typing|other": "%(names)s 與其他 %(count)s 個人正在輸入",
     "%(names)s and %(count)s others are typing|one": "%(names)s 與另一個人正在輸入",
     "Send": "傳送",
@@ -955,7 +917,6 @@
     "Community IDs cannot not be empty.": "社群 ID 不能為空。",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
     "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。",
     "Failed to set direct chat tag": "設定直接聊天標籤失敗",
     "Failed to remove tag %(tagName)s from room": "從聊天室移除標籤 %(tagName)s 失敗",
     "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗",
@@ -1195,5 +1156,44 @@
     "Share Room Message": "分享聊天室訊息",
     "Link to selected message": "連結到選定的訊息",
     "COPY": "複製",
-    "Share Message": "分享訊息"
+    "Share Message": "分享訊息",
+    "<target> accepted the invitation for %(displayName)s.": "<target> 已接受 %(displayName)s 的邀請。",
+    "<target> accepted an invitation.": "<target> 已接受邀請。",
+    "<sender> requested a VoIP conference.": "<sender> 請求了一次 VoIP 會議。",
+    "<sender> invited <target>.": "<sender> 邀請了 <target>。",
+    "<sender> banned <target>.": "<sender> 封鎖了 <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> 變更了他的顯示名稱為 <displayName> 。",
+    "<sender> set their display name to <displayName>.": "<sender> 將他的暱稱改成 <displayName>。.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> 移除了他的顯示名稱 (<oldDisplayName>)。",
+    "<sender> removed their profile picture.": "<sender> 移除了他的基本資料圖片。",
+    "<sender> changed their profile picture.": "<sender> 已經變更了他的基本資料圖片。",
+    "<sender> set a profile picture.": "<sender> 設置了頭像。.",
+    "<target> joined the room.": "<target> 加入了聊天室。.",
+    "<target> rejected the invitation.": "<target> 拒絕了邀請。",
+    "<target> left the room.": "<target> 離開了聊天室。.",
+    "<sender> unbanned <target>.": "<sender> 解除禁止 <target>。",
+    "<sender> kicked <target>.": "<sender> 把 <target> 踢出了聊天室。.",
+    "<sender> withdrew <target>'s invitation.": "<sender> 撤回了 <target> 的邀請。",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> 已經變更主題為「%(topic)s」。",
+    "<sender> changed the room avatar to <img/>": "<sender> 更改了聊天室的圖像為 <img/>",
+    "<sender> changed the avatar for %(roomName)s": "<sender> 更改了聊天室 %(roomName)s　圖像",
+    "<sender> changed the room name to %(roomName)s.": "<sender> 將房間名稱變更為 %(roomName)s。",
+    "<sender> removed the room avatar.": "<sender> 移除了聊天室圖片。",
+    "<sender> removed the room name.": "<sender> 已經移除了房間名稱。",
+    "<sender> answered the call.": "<sender> 接了通話。.",
+    "<sender> ended the call.": "<sender> 結束了通話。.",
+    "<sender> placed a %(callType)s call.": "<sender> 打了 %(callType)s 通話。",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> 向 %(targetDisplayName)s 發了加入聊天室的邀請。.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> 讓未來的房間歷史紀錄可見於 所有聊天室成員，從他們被邀請開始.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> 讓未來的房間歷史紀錄可見於 所有聊天室成員，從他們加入開始.",
+    "<sender> made future room history visible to all room members.": "<sender> 讓未來的房間歷史紀錄可見於 所有聊天室成員.",
+    "<sender> made future room history visible to anyone.": "<sender> 讓未來的房間歷史紀錄可見於 任何人.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> 讓未來的房間歷史紀錄可見於 未知 (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> 啟用端對端加密 (algorithm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> 從 %(fromPowerLevel)s 變為 %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> 變更了 %(powerLevelDiffText)s 權限等級。",
+    "<sender> changed the pinned messages for the room.": "<sender> 變更了聊天室的釘選訊息。",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s 小工具已被 <sender> 修改",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s 由 <sender> 所新增",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s 由 <sender> 所移除"
 }

From 2c537a8dff16077635060e45c2f4589b1f86e45e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 Jun 2018 15:28:36 +0100
Subject: [PATCH 510/702] update styling

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/elements/_TextForEvent.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/res/css/views/elements/_TextForEvent.scss b/res/css/views/elements/_TextForEvent.scss
index 8d46cbf84c..bb3aacfc88 100644
--- a/res/css/views/elements/_TextForEvent.scss
+++ b/res/css/views/elements/_TextForEvent.scss
@@ -17,3 +17,8 @@ limitations under the License.
 .mx_TextForEvent_username {
     cursor: pointer;
 }
+
+.mx_TextForEvent_username:hover {
+    text-decoration: none;
+    color: inherit;
+}

From 85a0736c78f62fb7f6947c57da1979d449972c1a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 Jun 2018 19:16:56 +0100
Subject: [PATCH 511/702] update wording as per D4ve's feedback

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MemberInfo.js | 10 ++--
 src/i18n/strings/en_EN.json              | 69 ++++++++++++------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 6680e7d02c..e8a7d14bae 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -336,16 +336,14 @@ module.exports = withMatrixClient(React.createClass({
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         return new Promise((resolve) => {
             Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
-                title: _t("Warning!"),
+                title: _t("Demote yourself?"),
                 description:
                     <div>
                         { _t("You will not be able to undo this change as you are demoting yourself, " +
                             "if you are the last privileged user in the room it will be impossible " +
                             "to regain privileges.") }
-                        <br />
-                        { _t("Are you sure?") }
                     </div>,
-                button: _t("Continue"),
+                button: _t("Demote"),
                 onFinished: resolve,
             });
         });
@@ -361,7 +359,7 @@ module.exports = withMatrixClient(React.createClass({
         // if muting self, warn as it may be irreversible
         if (target === this.props.matrixClient.getUserId()) {
             try {
-                if (!await this._warnSelfDemote()) return;
+                if (!(await this._warnSelfDemote())) return;
             } catch (e) {
                 console.error("Failed to warn about self demotion: ", e);
                 return;
@@ -485,7 +483,7 @@ module.exports = withMatrixClient(React.createClass({
         // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
         if (myUserId === target) {
             try {
-                if (!await this._warnSelfDemote()) return;
+                if (!(await this._warnSelfDemote())) return;
                 this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
             } catch (e) {
                 console.error("Failed to warn about self demotion: ", e);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f182ecdbad..c8aedfd493 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,6 +85,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -104,7 +109,6 @@
     "You need to be logged in.": "You need to be logged in.",
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "Unable to create widget.": "Unable to create widget.",
-    "Reload widget": "Reload widget",
     "Missing roomId.": "Missing roomId.",
     "Failed to send request.": "Failed to send request.",
     "This room is not recognised.": "This room is not recognised.",
@@ -180,11 +184,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -298,6 +297,29 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -334,12 +356,14 @@
     "Unban this user?": "Unban this user?",
     "Ban this user?": "Ban this user?",
     "Failed to ban user": "Failed to ban user",
+    "Demote yourself?": "Demote yourself?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
+    "Demote": "Demote",
     "Failed to mute user": "Failed to mute user",
     "Failed to toggle moderator status": "Failed to toggle moderator status",
     "Failed to change power level": "Failed to change power level",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
-    "Are you sure?": "Are you sure?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
+    "Are you sure?": "Are you sure?",
     "No devices with registered encryption keys": "No devices with registered encryption keys",
     "Devices": "Devices",
     "Unignore": "Unignore",
@@ -394,11 +418,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -531,29 +555,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -664,6 +665,7 @@
     "Delete widget": "Delete widget",
     "Revoke widget access": "Revoke widget access",
     "Minimize apps": "Minimize apps",
+    "Reload widget": "Reload widget",
     "Popout widget": "Popout widget",
     "Picture": "Picture",
     "Edit": "Edit",
@@ -743,6 +745,7 @@
     "Room directory": "Room directory",
     "Start chat": "Start chat",
     "And %(count)s more...|other": "And %(count)s more...",
+    "Share Link to User": "Share Link to User",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
     "Matrix ID": "Matrix ID",

From 12ed25534ad1fca840d4eb21f536a973bc2aa141 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 27 Jun 2018 05:52:57 +0000
Subject: [PATCH 512/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 024166b37c..958d90b2b2 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1205,5 +1205,6 @@
     "The email field must not be blank.": "Имейл полето не може да бъде празно.",
     "The user name field must not be blank.": "Полето за потребителско име не може да е празно.",
     "The phone number field must not be blank.": "Полето за телефонен номер не може да е празно.",
-    "The password field must not be blank.": "Полето за парола не може да е празно."
+    "The password field must not be blank.": "Полето за парола не може да е празно.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Не можете да изпращате съобщения докато не прегледате и се съгласите с <consentLink>нашите правила и условия</consentLink>."
 }

From ca83f1e8c89ed1028bcac2c9c9ca267fae13fd7c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 30 Jun 2018 17:06:33 +0100
Subject: [PATCH 513/702] allow RoomSubList to use old behaviour of not hiding
 even if empty

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 63 +++++++++++++++---------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 0c78043a42..d798070659 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -27,6 +27,7 @@ import * as RoomNotifs from '../../RoomNotifs';
 import * as FormattingUtils from '../../utils/FormattingUtils';
 import { KeyCode } from '../../Keyboard';
 import { Group } from 'matrix-js-sdk';
+import PropTypes from 'prop-types';
 
 
 // turn this on for drop & drag console debugging galore
@@ -40,27 +41,28 @@ const RoomSubList = React.createClass({
     debug: debug,
 
     propTypes: {
-        list: React.PropTypes.arrayOf(React.PropTypes.object).isRequired,
-        label: React.PropTypes.string.isRequired,
-        tagName: React.PropTypes.string,
-        editable: React.PropTypes.bool,
+        list: PropTypes.arrayOf(PropTypes.object).isRequired,
+        label: PropTypes.string.isRequired,
+        tagName: PropTypes.string,
+        editable: PropTypes.bool,
 
-        order: React.PropTypes.string.isRequired,
+        order: PropTypes.string.isRequired,
 
         // passed through to RoomTile and used to highlight room with `!` regardless of notifications count
-        isInvite: React.PropTypes.bool,
+        isInvite: PropTypes.bool,
 
-        startAsHidden: React.PropTypes.bool,
-        showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded
-        collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed?
-        onHeaderClick: React.PropTypes.func,
-        alwaysShowHeader: React.PropTypes.bool,
-        incomingCall: React.PropTypes.object,
-        onShowMoreRooms: React.PropTypes.func,
-        searchFilter: React.PropTypes.string,
-        emptyContent: React.PropTypes.node, // content shown if the list is empty
-        headerItems: React.PropTypes.node, // content shown in the sublist header
-        extraTiles: React.PropTypes.arrayOf(React.PropTypes.node), // extra elements added beneath tiles
+        startAsHidden: PropTypes.bool,
+        showSpinner: PropTypes.bool, // true to show a spinner if 0 elements when expanded
+        collapsed: PropTypes.bool.isRequired, // is LeftPanel collapsed?
+        onHeaderClick: PropTypes.func,
+        alwaysShowHeader: PropTypes.bool,
+        incomingCall: PropTypes.object,
+        onShowMoreRooms: PropTypes.func,
+        searchFilter: PropTypes.string,
+        emptyContent: PropTypes.node, // content shown if the list is empty
+        headerItems: PropTypes.node, // content shown in the sublist header
+        extraTiles: PropTypes.arrayOf(PropTypes.node), // extra elements added beneath tiles
+        showEmpty: PropTypes.bool,
     },
 
     getInitialState: function() {
@@ -79,6 +81,7 @@ const RoomSubList = React.createClass({
             }, // NOP
             extraTiles: [],
             isInvite: false,
+            showEmpty: true,
         };
     },
 
@@ -392,17 +395,29 @@ const RoomSubList = React.createClass({
         const TruncatedList = sdk.getComponent('elements.TruncatedList');
 
         let content;
-        if (this.state.sortedList.length === 0 && this.props.extraTiles.length === 0) {
-            // if no search filter is applied and there is a placeholder defined then show it, otherwise show nothing
-            if (!this.props.searchFilter && this.props.emptyContent) {
+
+        if (this.props.showEmpty) {
+            // this is new behaviour with still controversial UX in that in hiding RoomSubLists the drop zones for DnD
+            // are also gone so when filtering users can't DnD rooms to some tags but is a lot cleaner otherwise.
+            if (this.state.sortedList.length === 0 && !this.props.searchFilter && this.props.extraTiles.length === 0) {
                 content = this.props.emptyContent;
             } else {
-                // don't show an empty sublist
-                return null;
+                content = this.makeRoomTiles();
+                content.push(...this.props.extraTiles);
             }
         } else {
-            content = this.makeRoomTiles();
-            content.push(...this.props.extraTiles);
+            if (this.state.sortedList.length === 0 && this.props.extraTiles.length === 0) {
+                // if no search filter is applied and there is a placeholder defined then show it, otherwise show nothing
+                if (!this.props.searchFilter && this.props.emptyContent) {
+                    content = this.props.emptyContent;
+                } else {
+                    // don't show an empty sublist
+                    return null;
+                }
+            } else {
+                content = this.makeRoomTiles();
+                content.push(...this.props.extraTiles);
+            }
         }
 
         if (this.state.sortedList.length > 0 || this.props.extraTiles.length > 0 || this.props.editable) {

From 37a8e7f2e2ad96a4aa4377f85b384a07ac879bb0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 30 Jun 2018 17:07:28 +0100
Subject: [PATCH 514/702] add setting to throw new RoomSubList hide behaviour
 behind an opt-in

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js |  1 +
 src/components/views/rooms/RoomList.js    | 26 +++++++++++++++++------
 src/settings/Settings.js                  |  5 +++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 6397e73434..d02d8b23e5 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -81,6 +81,7 @@ const SIMPLE_SETTINGS = [
     { id: "VideoView.flipVideoHorizontally" },
     { id: "TagPanel.disableTagPanel" },
     { id: "enableWidgetScreenshots" },
+    { id: "RoomSubList.showEmpty" },
 ];
 
 // These settings must be defined in SettingsStore
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 62ae96f47f..8533e3f61a 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -16,6 +16,8 @@ limitations under the License.
 */
 
 'use strict';
+import SettingsStore from "../../../settings/SettingsStore";
+
 const React = require("react");
 const ReactDOM = require("react-dom");
 import PropTypes from 'prop-types';
@@ -608,6 +610,10 @@ module.exports = React.createClass({
         const RoomSubList = sdk.getComponent('structures.RoomSubList');
         const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
+        // XXX: we can't detect device-level (localStorage) settings onChange as the SettingsStore does not notify
+        // so checking on every render is the sanest thing at this time.
+        const showEmpty = SettingsStore.getValue('RoomSubList.showEmpty');
+
         const self = this;
         return (
             <GeminiScrollbarWrapper className="mx_RoomList_scrollbar"
@@ -623,6 +629,7 @@ module.exports = React.createClass({
                              searchFilter={self.props.searchFilter}
                              onHeaderClick={self.onSubListHeaderClick}
                              onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty}
                 />
 
                 <RoomSubList list={self.state.lists['im.vector.fake.invite']}
@@ -635,6 +642,7 @@ module.exports = React.createClass({
                              searchFilter={self.props.searchFilter}
                              onHeaderClick={self.onSubListHeaderClick}
                              onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty}
                 />
 
                 <RoomSubList list={self.state.lists['m.favourite']}
@@ -647,7 +655,8 @@ module.exports = React.createClass({
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
                              onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
 
                 <RoomSubList list={self.state.lists['im.vector.fake.direct']}
                              label={_t('People')}
@@ -661,7 +670,8 @@ module.exports = React.createClass({
                              alwaysShowHeader={true}
                              searchFilter={self.props.searchFilter}
                              onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
 
                 <RoomSubList list={self.state.lists['im.vector.fake.recent']}
                              label={_t('Rooms')}
@@ -673,7 +683,8 @@ module.exports = React.createClass({
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
                              onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
 
                 { Object.keys(self.state.lists).map((tagName) => {
                     if (!tagName.match(STANDARD_TAGS_REGEX)) {
@@ -688,7 +699,8 @@ module.exports = React.createClass({
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
                              onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />;
+                             onShowMoreRooms={self.onShowMoreRooms}
+                                            showEmpty={showEmpty} />;
                     }
                 }) }
 
@@ -702,7 +714,8 @@ module.exports = React.createClass({
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
                              onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
 
                 <RoomSubList list={self.state.lists['im.vector.fake.archived']}
                              emptyContent={self.props.collapsed ? null :
@@ -722,7 +735,8 @@ module.exports = React.createClass({
                              onHeaderClick={self.onArchivedHeaderClick}
                              incomingCall={self.state.incomingCall}
                              searchFilter={self.props.searchFilter}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                             onShowMoreRooms={self.onShowMoreRooms}
+                             showEmpty={showEmpty} />
             </div>
             </GeminiScrollbarWrapper>
         );
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 84178e2673..022fabc739 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -284,4 +284,9 @@ export const SETTINGS = {
         supportedLevels: ['room-device'],
         default: false,
     },
+    "RoomSubList.showEmpty": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Show empty room list headings'),
+        default: true,
+    },
 };

From 1b003ca39f21b51d98e921390c2e78a12a631e04 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 30 Jun 2018 17:07:35 +0100
Subject: [PATCH 515/702] gen-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 65 +++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7717d45aa5..4c43f08e11 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -44,6 +44,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -83,6 +87,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -196,11 +201,6 @@
     "%(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",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -234,6 +234,7 @@
     "Enable URL previews by default for participants in this room": "Enable URL previews by default for participants in this room",
     "Room Colour": "Room Colour",
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
+    "Show empty room list headings": "Show empty room list headings",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -313,6 +314,31 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -412,11 +438,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -550,31 +576,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
-    "URL Previews": "URL Previews",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",

From 0a638cd5458b17e81f210d5f2b50551b74953a55 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 1 Jul 2018 23:48:00 +0100
Subject: [PATCH 516/702] move nag bar clear statement to any desktop notif
 toggle not just 0->1

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Notifier.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Notifier.js b/src/Notifier.js
index b823c4df05..80e8be1084 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -170,15 +170,15 @@ const Notifier = {
                     value: true,
                 });
             });
-            // clear the notifications_hidden flag, so that if notifications are
-            // disabled again in the future, we will show the banner again.
-            this.setToolbarHidden(true);
         } else {
             dis.dispatch({
                 action: "notifier_enabled",
                 value: false,
             });
         }
+        // set the notifications_hidden flag, as the user has knowingly interacted
+        // with the setting we shouldn't nag them any further
+        this.setToolbarHidden(true);
     },
 
     isEnabled: function() {

From 0dd3a774327d404359d35ae17df7f84f4b6a2b01 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 2 Jul 2018 09:45:32 +0100
Subject: [PATCH 517/702] Track an event name when tracking a decryption
 failure

Otherwise piwik will not agregate the failures correctly for all views.
---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 293b0130d0..9ea0cb42c8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1306,7 +1306,7 @@ export default React.createClass({
 
         const dft = new DecryptionFailureTracker((total) => {
             // TODO: Pass reason for failure as third argument to trackEvent
-            Analytics.trackEvent('E2E', 'Decryption failure', null, total);
+            Analytics.trackEvent('E2E', 'Decryption failure', 'unspecified_error', total);
         });
 
         // Shelved for later date when we have time to think about persisting history of

From 7225f7372c626d3d2d465e7a30a08022aef7d88f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 3 Jul 2018 10:30:08 +0100
Subject: [PATCH 518/702] Revert " make click to insert nick work on
 join/parts, /me's etc"

---
 res/css/_components.scss                  |   1 -
 res/css/views/elements/_TextForEvent.scss |  24 ---
 scripts/map-i18n.js                       |  69 ---------
 src/TextForEvent.js                       | 172 ++++++++--------------
 src/i18n/strings/bg.json                  |  80 +++++-----
 src/i18n/strings/ca.json                  |  80 +++++-----
 src/i18n/strings/cs.json                  |  78 +++++-----
 src/i18n/strings/da.json                  |  48 +++---
 src/i18n/strings/de_DE.json               |  80 +++++-----
 src/i18n/strings/el.json                  |  80 +++++-----
 src/i18n/strings/en_EN.json               |  80 +++++-----
 src/i18n/strings/en_US.json               |  76 +++++-----
 src/i18n/strings/eo.json                  |  80 +++++-----
 src/i18n/strings/es.json                  |  64 ++++----
 src/i18n/strings/eu.json                  |  80 +++++-----
 src/i18n/strings/fi.json                  |  78 +++++-----
 src/i18n/strings/fr.json                  |  80 +++++-----
 src/i18n/strings/gl.json                  |  80 +++++-----
 src/i18n/strings/hu.json                  |  80 +++++-----
 src/i18n/strings/id.json                  |  20 +--
 src/i18n/strings/is.json                  |  10 +-
 src/i18n/strings/it.json                  |  80 +++++-----
 src/i18n/strings/ja.json                  |   4 +-
 src/i18n/strings/ko.json                  |  70 ++++-----
 src/i18n/strings/lv.json                  |  80 +++++-----
 src/i18n/strings/nl.json                  |  80 +++++-----
 src/i18n/strings/pl.json                  |  80 +++++-----
 src/i18n/strings/pt.json                  |  76 +++++-----
 src/i18n/strings/pt_BR.json               |  80 +++++-----
 src/i18n/strings/ru.json                  |  80 +++++-----
 src/i18n/strings/sk.json                  |  80 +++++-----
 src/i18n/strings/sr.json                  |  80 +++++-----
 src/i18n/strings/sv.json                  |  80 +++++-----
 src/i18n/strings/te.json                  |  10 +-
 src/i18n/strings/th.json                  |  48 +++---
 src/i18n/strings/tr.json                  |  70 ++++-----
 src/i18n/strings/uk.json                  |  20 +--
 src/i18n/strings/zh_Hans.json             |  80 +++++-----
 src/i18n/strings/zh_Hant.json             |  80 +++++-----
 39 files changed, 1241 insertions(+), 1377 deletions(-)
 delete mode 100644 res/css/views/elements/_TextForEvent.scss
 delete mode 100644 scripts/map-i18n.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 8f290337e3..173939e143 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -60,7 +60,6 @@
 @import "./views/elements/_RoleButton.scss";
 @import "./views/elements/_Spinner.scss";
 @import "./views/elements/_SyntaxHighlight.scss";
-@import "./views/elements/_TextForEvent.scss";
 @import "./views/elements/_ToolTipButton.scss";
 @import "./views/globals/_MatrixToolbar.scss";
 @import "./views/groups/_GroupPublicityToggle.scss";
diff --git a/res/css/views/elements/_TextForEvent.scss b/res/css/views/elements/_TextForEvent.scss
deleted file mode 100644
index bb3aacfc88..0000000000
--- a/res/css/views/elements/_TextForEvent.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_TextForEvent_username {
-    cursor: pointer;
-}
-
-.mx_TextForEvent_username:hover {
-    text-decoration: none;
-    color: inherit;
-}
diff --git a/scripts/map-i18n.js b/scripts/map-i18n.js
deleted file mode 100644
index 32f81d5e82..0000000000
--- a/scripts/map-i18n.js
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env node
-
-/*
-Copyright 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
- * Looks through all the translation files and maps matches of fromRegex
- * in both key and value of the i18n translation to toStr where i18nKeyRegex
- * matches. Simplifies changing from text to react replacements.
- * e.g:
- * node scripts\map-i18n.js "%\(targetName\)s accepted the invitation for %\(displayName\)s\." "%\(targetName\)s" "<target>"
- */
-
-const fs = require('fs');
-const path = require('path');
-
-const I18NDIR = 'src/i18n/strings';
-
-if (process.argv.length !== 5) {
-    console.error("Required exactly 3 arguments");
-    console.info("Usage: <i18n_key> <fromStr> <toStr>");
-    return;
-}
-
-const [, , i18nKey, fromStr, toStr] = process.argv;
-const i18nKeyRegex = new RegExp(i18nKey, 'i');
-const fromRegex = new RegExp(fromStr, 'i');
-
-console.info(`Replacing instances of "${fromRegex}" with "${toStr}" in keys and values where key matches "${i18nKey}"`);
-
-for (const filename of fs.readdirSync(I18NDIR)) {
-    if (!filename.endsWith('.json')) continue;
-
-    let numChanged = 0;
-
-    const trs = JSON.parse(fs.readFileSync(path.join(I18NDIR, filename)));
-    for (const tr of Object.keys(trs)) {
-        if (i18nKeyRegex.test(tr) && (fromRegex.test(tr) || fromRegex.test(tr))) {
-            const v = trs[tr];
-            delete trs[tr];
-
-            trs[tr.replace(fromRegex, toStr)] = v.replace(fromRegex, toStr);
-            numChanged++;
-        }
-    }
-
-    if (numChanged > 0) {
-        console.log(`${filename}: transformed ${numChanged} translations`);
-        // XXX: This is totally relying on the impl serialising the JSON object in the
-        // same order as they were parsed from the file. JSON.stringify() has a specific argument
-        // that can be used to control the order, but JSON.parse() lacks any kind of equivalent.
-        // Empirically this does maintain the order on my system, so I'm going to leave it like
-        // this for now.
-        fs.writeFileSync(path.join(I18NDIR, filename), JSON.stringify(trs, undefined, 4) + "\n");
-    }
-}
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 3d2e3c1fb5..712150af4d 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -17,42 +17,11 @@ import MatrixClientPeg from './MatrixClientPeg';
 import CallHandler from './CallHandler';
 import { _t } from './languageHandler';
 import * as Roles from './Roles';
-import dis from "./dispatcher";
-import React from 'react';
-import PropTypes from 'prop-types';
-
-class ClickableUsername extends React.PureComponent {
-    static propTypes = {
-        mxid: PropTypes.string.isRequired,
-        text: PropTypes.string.isRequired,
-    };
-
-    constructor(props) {
-        super(props);
-        this.onClick = this.onClick.bind(this);
-    }
-
-    onClick() {
-        dis.dispatch({
-            action: 'insert_mention',
-            user_id: this.props.mxid,
-        });
-    }
-
-    render() {
-        const {mxid, text} = this.props;
-        return <a className="mx_TextForEvent_username" dir="auto" onClick={this.onClick} data-mxid={mxid}>{ text }</a>;
-    }
-}
 
 function textForMemberEvent(ev) {
     // XXX: SYJS-16 "sender is sometimes null for join messages"
     const senderName = ev.sender ? ev.sender.name : ev.getSender();
     const targetName = ev.target ? ev.target.name : ev.getStateKey();
-
-    const sender = <ClickableUsername mxid={ev.getSender()} text={senderName} />;
-    const target = <ClickableUsername mxid={ev.getStateKey()} text={targetName} />;
-
     const prevContent = ev.getPrevContent();
     const content = ev.getContent();
 
@@ -63,48 +32,47 @@ function textForMemberEvent(ev) {
             const threePidContent = content.third_party_invite;
             if (threePidContent) {
                 if (threePidContent.display_name) {
-                    return _t('<target> accepted the invitation for %(displayName)s.', {
+                    return _t('%(targetName)s accepted the invitation for %(displayName)s.', {
+                        targetName,
                         displayName: threePidContent.display_name,
-                    }, {
-                        target,
                     });
                 } else {
-                    return _t('<target> accepted an invitation.', {}, {target});
+                    return _t('%(targetName)s accepted an invitation.', {targetName});
                 }
             } else {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
-                    return _t('<sender> requested a VoIP conference.', {}, {sender});
+                    return _t('%(senderName)s requested a VoIP conference.', {senderName});
                 } else {
-                    return _t('<sender> invited <target>.', {}, {sender, target});
+                    return _t('%(senderName)s invited %(targetName)s.', {senderName, targetName});
                 }
             }
         }
         case 'ban':
-            return _t('<sender> banned <target>.', {}, {sender, target}) + ' ' + reason;
+            return _t('%(senderName)s banned %(targetName)s.', {senderName, targetName}) + ' ' + reason;
         case 'join':
             if (prevContent && prevContent.membership === 'join') {
                 if (prevContent.displayname && content.displayname && prevContent.displayname !== content.displayname) {
-                    return _t('<oldDisplayName> changed their display name to <displayName>.', {}, {
-                        oldDisplayName: <ClickableUsername mxid={ev.getStateKey()} text={prevContent.displayname} />,
-                        displayName: <ClickableUsername mxid={ev.getStateKey()} text={content.displayname} />,
+                    return _t('%(oldDisplayName)s changed their display name to %(displayName)s.', {
+                        oldDisplayName: prevContent.displayname,
+                        displayName: content.displayname,
                     });
                 } else if (!prevContent.displayname && content.displayname) {
-                    return _t('<sender> set their display name to <displayName>.', {}, {
-                        sender,
-                        displayName: <ClickableUsername mxid={ev.getSender()} text={content.displayname} />,
+                    return _t('%(senderName)s set their display name to %(displayName)s.', {
+                        senderName: ev.getSender(),
+                        displayName: content.displayname,
                     });
                 } else if (prevContent.displayname && !content.displayname) {
-                    return _t('<sender> removed their display name (<oldDisplayName>).', {
-                        sender,
-                        oldDisplayName: <ClickableUsername mxid={ev.getSender()} text={prevContent.displayname} />,
+                    return _t('%(senderName)s removed their display name (%(oldDisplayName)s).', {
+                        senderName,
+                        oldDisplayName: prevContent.displayname,
                     });
                 } else if (prevContent.avatar_url && !content.avatar_url) {
-                    return _t('<sender> removed their profile picture.', {}, {sender});
+                    return _t('%(senderName)s removed their profile picture.', {senderName});
                 } else if (prevContent.avatar_url && content.avatar_url &&
                     prevContent.avatar_url !== content.avatar_url) {
-                    return _t('<sender> changed their profile picture.', {}, {sender});
+                    return _t('%(senderName)s changed their profile picture.', {senderName});
                 } else if (!prevContent.avatar_url && content.avatar_url) {
-                    return _t('<sender> set a profile picture.', {}, {sender});
+                    return _t('%(senderName)s set a profile picture.', {senderName});
                 } else {
                     // suppress null rejoins
                     return '';
@@ -114,7 +82,7 @@ function textForMemberEvent(ev) {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
                     return _t('VoIP conference started.');
                 } else {
-                    return _t('<target> joined the room.', {}, {target});
+                    return _t('%(targetName)s joined the room.', {targetName});
                 }
             }
         case 'leave':
@@ -122,42 +90,42 @@ function textForMemberEvent(ev) {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
                     return _t('VoIP conference finished.');
                 } else if (prevContent.membership === "invite") {
-                    return _t('<target> rejected the invitation.', {}, {target});
+                    return _t('%(targetName)s rejected the invitation.', {targetName});
                 } else {
-                    return _t('<target> left the room.', {}, {target});
+                    return _t('%(targetName)s left the room.', {targetName});
                 }
             } else if (prevContent.membership === "ban") {
-                return _t('<sender> unbanned <target>.', {}, {sender, target});
+                return _t('%(senderName)s unbanned %(targetName)s.', {senderName, targetName});
             } else if (prevContent.membership === "join") {
-                return _t('<sender> kicked <target>.', {}, {sender, target}) + ' ' + reason;
+                return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason;
             } else if (prevContent.membership === "invite") {
-                return _t('<sender> withdrew <target>\'s invitation.', {}, {sender, target}) + ' ' + reason;
+                return _t('%(senderName)s withdrew %(targetName)s\'s invitation.', {
+                    senderName,
+                    targetName,
+                }) + ' ' + reason;
             } else {
-                return _t('<target> left the room.', {}, {target});
+                return _t('%(targetName)s left the room.', {targetName});
             }
     }
 }
 
 function textForTopicEvent(ev) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    return _t('<sender> changed the topic to "%(topic)s".', {
+    return _t('%(senderDisplayName)s changed the topic to "%(topic)s".', {
+        senderDisplayName,
         topic: ev.getContent().topic,
-    }, {
-        sender: <ClickableUsername mxid={ev.getSender()} text={senderDisplayName} />,
     });
 }
 
 function textForRoomNameEvent(ev) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    const sender = <ClickableUsername mxid={ev.getSender()} text={senderDisplayName} />;
 
     if (!ev.getContent().name || ev.getContent().name.trim().length === 0) {
-        return _t('<sender> removed the room name.', {}, {sender});
+        return _t('%(senderDisplayName)s removed the room name.', {senderDisplayName});
     }
-    return _t('<sender> changed the room name to %(roomName)s.', {
+    return _t('%(senderDisplayName)s changed the room name to %(roomName)s.', {
+        senderDisplayName,
         roomName: ev.getContent().name,
-    }, {
-        sender,
     });
 }
 
@@ -167,9 +135,7 @@ function textForMessageEvent(ev) {
     if (ev.getContent().msgtype === "m.emote") {
         message = "* " + senderDisplayName + " " + message;
     } else if (ev.getContent().msgtype === "m.image") {
-        message = _t('<sender> sent an image.', {}, {
-            sender: <ClickableUsername mxid={ev.getSender()} text={senderDisplayName} />,
-        });
+        message = _t('%(senderDisplayName)s sent an image.', {senderDisplayName});
     }
     return message;
 }
@@ -177,9 +143,7 @@ function textForMessageEvent(ev) {
 function textForCallAnswerEvent(event) {
     const senderName = event.sender ? event.sender.name : _t('Someone');
     const supported = MatrixClientPeg.get().supportsVoip() ? '' : _t('(not supported by this browser)');
-    return _t('<sender> answered the call.', {}, {
-        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
-    }) + ' ' + supported;
+    return _t('%(senderName)s answered the call.', {senderName}) + ' ' + supported;
 }
 
 function textForCallHangupEvent(event) {
@@ -197,14 +161,11 @@ function textForCallHangupEvent(event) {
             reason = _t('(unknown failure: %(reason)s)', {reason: eventContent.reason});
         }
     }
-    return _t('<sender> ended the call.', {}, {
-        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
-    }) + ' ' + reason;
+    return _t('%(senderName)s ended the call.', {senderName}) + ' ' + reason;
 }
 
 function textForCallInviteEvent(event) {
     const senderName = event.sender ? event.sender.name : _t('Someone');
-    const sender = <ClickableUsername mxid={event.getSender()} text={senderName} />;
     // FIXME: Find a better way to determine this from the event?
     let callType = "voice";
     if (event.getContent().offer && event.getContent().offer.sdp &&
@@ -212,47 +173,43 @@ function textForCallInviteEvent(event) {
         callType = "video";
     }
     const supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
-    return _t('<sender> placed a %(callType)s call.', {callType}, {sender}) + ' ' + supported;
+    return _t('%(senderName)s placed a %(callType)s call.', {senderName, callType}) + ' ' + supported;
 }
 
 function textForThreePidInviteEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    return _t('<sender> sent an invitation to %(targetDisplayName)s to join the room.', {
+    return _t('%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.', {
+        senderName,
         targetDisplayName: event.getContent().display_name,
-    }, {
-        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
     });
 }
 
 function textForHistoryVisibilityEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    const sender = <ClickableUsername mxid={event.getSender()} text={senderName} />;
     switch (event.getContent().history_visibility) {
         case 'invited':
-            return _t('<sender> made future room history visible to all room members, '
-                + 'from the point they are invited.', {}, {sender});
+            return _t('%(senderName)s made future room history visible to all room members, '
+                + 'from the point they are invited.', {senderName});
         case 'joined':
-            return _t('<sender> made future room history visible to all room members, '
-                + 'from the point they joined.', {}, {sender});
+            return _t('%(senderName)s made future room history visible to all room members, '
+                + 'from the point they joined.', {senderName});
         case 'shared':
-            return _t('<sender> made future room history visible to all room members.', {}, {sender});
+            return _t('%(senderName)s made future room history visible to all room members.', {senderName});
         case 'world_readable':
-            return _t('<sender> made future room history visible to anyone.', {}, {sender});
+            return _t('%(senderName)s made future room history visible to anyone.', {senderName});
         default:
-            return _t('<sender> made future room history visible to unknown (%(visibility)s).', {
+            return _t('%(senderName)s made future room history visible to unknown (%(visibility)s).', {
+                senderName,
                 visibility: event.getContent().history_visibility,
-            }, {
-                sender,
             });
     }
 }
 
 function textForEncryptionEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    return _t('<sender> turned on end-to-end encryption (algorithm %(algorithm)s).', {
+    return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).', {
+        senderName,
         algorithm: event.getContent().algorithm,
-    }, {
-        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
     });
 }
 
@@ -284,11 +241,10 @@ function textForPowerEvent(event) {
         const to = event.getContent().users[userId];
         if (to !== from) {
             diff.push(
-                _t('<user> from %(fromPowerLevel)s to %(toPowerLevel)s', {
+                _t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {
+                    userId,
                     fromPowerLevel: Roles.textualPowerLevel(from, userDefault),
                     toPowerLevel: Roles.textualPowerLevel(to, userDefault),
-                }, {
-                    user: <ClickableUsername mxid={userId} text={userId} />,
                 }),
             );
         }
@@ -296,23 +252,19 @@ function textForPowerEvent(event) {
     if (!diff.length) {
         return '';
     }
-    return _t('<sender> changed the power level of %(powerLevelDiffText)s.', {
+    return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
+        senderName,
         powerLevelDiffText: diff.join(", "),
-    }, {
-        sender: <ClickableUsername mxid={event.getSender()} text={senderName} />,
     });
 }
 
 function textForPinnedEvent(event) {
-    const senderName = event.sender ? event.sender.name : event.getSender();
-    const sender = <ClickableUsername mxid={event.getSender()} text={senderName} />;
-    return _t("<sender> changed the pinned messages for the room.", {}, {sender});
+    const senderName = event.getSender();
+    return _t("%(senderName)s changed the pinned messages for the room.", {senderName});
 }
 
 function textForWidgetEvent(event) {
-    const senderName = event.sender ? event.sender.name : event.getSender();
-    const sender = <ClickableUsername mxid={event.getSender()} text={senderName} />;
-
+    const senderName = event.getSender();
     const {name: prevName, type: prevType, url: prevUrl} = event.getPrevContent();
     const {name, type, url} = event.getContent() || {};
 
@@ -326,12 +278,18 @@ function textForWidgetEvent(event) {
     // equivalent to that condition.
     if (url) {
         if (prevUrl) {
-            return _t('%(widgetName)s widget modified by <sender>', {widgetName}, {sender});
+            return _t('%(widgetName)s widget modified by %(senderName)s', {
+                widgetName, senderName,
+            });
         } else {
-            return _t('%(widgetName)s widget added by <sender>', {widgetName}, {sender});
+            return _t('%(widgetName)s widget added by %(senderName)s', {
+                widgetName, senderName,
+            });
         }
     } else {
-        return _t('%(widgetName)s widget removed by <sender>', {widgetName}, {sender});
+        return _t('%(widgetName)s widget removed by %(senderName)s', {
+            widgetName, senderName,
+        });
     }
 }
 
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index cd5cf5058e..5ec9a93bc5 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -148,13 +148,49 @@
     "Verified key": "Потвърден ключ",
     "Unrecognised command:": "Неразпозната команда:",
     "Reason": "Причина",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прие поканата за %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s прие поканата.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s заяви VoIP групов разговор.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s покани %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s блокира %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s смени своето име на %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s си сложи име %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s премахна своето име (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s премахна своята профилна снимка.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s промени своята профилна снимка.",
+    "%(senderName)s set a profile picture.": "%(senderName)s зададе снимка на профила си.",
     "VoIP conference started.": "Започна VoIP групов разговор.",
+    "%(targetName)s joined the room.": "%(targetName)s се присъедини към стаята.",
     "VoIP conference finished.": "Груповият разговор приключи.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s отхвърли поканата.",
+    "%(targetName)s left the room.": "%(targetName)s напусна стаята.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s отблокира %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s изгони %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s оттегли поканата си за %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s смени темата на \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s премахна името на стаята.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s промени името на стаята на %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s изпрати снимка.",
     "Someone": "Някой",
     "(not supported by this browser)": "(не се поддържа от този браузър)",
+    "%(senderName)s answered the call.": "%(senderName)s отговори на повикването.",
     "(no answer)": "(няма отговор)",
     "(unknown failure: %(reason)s)": "(неизвестна грешка: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s прекрати разговора.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s започна %(callType)s разговор.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s изпрати покана на %(targetDisplayName)s да се присъедини към стаята.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s направи бъдещата история на стаята видима за всички членове, от момента на поканването им в нея.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s направи бъдещата история на стаята видима за всички членове, от момента на присъединяването им в нея.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s направи бъдещата история на стаята видима за всички членове в нея.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s направи бъдещата история на стаята видима за всеки.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s направи бъдещата история на стаята видима по непознат начин (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включи шифроване от край до край (алгоритъм %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s от %(fromPowerLevel)s на %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s смени нивото на достъп на %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s смени закачените съобщения за стаята.",
+    "%(widgetName)s widget modified by %(senderName)s": "Приспособлението %(widgetName)s беше променено от %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Приспособлението %(widgetName)s беше добавено от %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Приспособлението %(widgetName)s беше премахнато от %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s пише",
     "%(names)s and %(count)s others are typing|other": "%(names)s и %(count)s други пишат",
     "%(names)s and %(count)s others are typing|one": "%(names)s и още един човек пишат",
@@ -490,6 +526,9 @@
     "Invalid file%(extra)s": "Невалиден файл%(extra)s",
     "Error decrypting image": "Грешка при разшифроване на снимка",
     "Error decrypting video": "Грешка при разшифроване на видео",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s промени аватара на %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s премахна аватара на стаята.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s промени аватара на стаята на <img/>",
     "Copied!": "Копирано!",
     "Failed to copy": "Неуспешно копиране",
     "Add an Integration": "Добавяне на интеграция",
@@ -1142,44 +1181,5 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.",
     "Review terms and conditions": "Прегледай правилата и условията",
     "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта",
-    "Try the app first": "Първо пробвайте приложението",
-    "<target> accepted the invitation for %(displayName)s.": "<target> прие поканата за %(displayName)s.",
-    "<target> accepted an invitation.": "<target> прие поканата.",
-    "<sender> requested a VoIP conference.": "<sender> заяви VoIP групов разговор.",
-    "<sender> invited <target>.": "<sender> покани <target>.",
-    "<sender> banned <target>.": "<sender> блокира <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> смени своето име на <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> си сложи име <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> премахна своето име (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> премахна своята профилна снимка.",
-    "<sender> changed their profile picture.": "<sender> промени своята профилна снимка.",
-    "<sender> set a profile picture.": "<sender> зададе снимка на профила си.",
-    "<target> joined the room.": "<target> се присъедини към стаята.",
-    "<target> rejected the invitation.": "<target> отхвърли поканата.",
-    "<target> left the room.": "<target> напусна стаята.",
-    "<sender> unbanned <target>.": "<sender> отблокира <target>.",
-    "<sender> kicked <target>.": "<sender> изгони <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> оттегли поканата си за <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> смени темата на \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> промени името на стаята на %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> промени аватара на %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> промени аватара на стаята на <img/>",
-    "<sender> removed the room name.": "<sender> премахна името на стаята.",
-    "<sender> removed the room avatar.": "<sender> премахна аватара на стаята.",
-    "<sender> answered the call.": "<sender> отговори на повикването.",
-    "<sender> ended the call.": "<sender> прекрати разговора.",
-    "<sender> placed a %(callType)s call.": "<sender> започна %(callType)s разговор.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> изпрати покана на %(targetDisplayName)s да се присъедини към стаята.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> направи бъдещата история на стаята видима за всички членове, от момента на поканването им в нея.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> направи бъдещата история на стаята видима за всички членове, от момента на присъединяването им в нея.",
-    "<sender> made future room history visible to all room members.": "<sender> направи бъдещата история на стаята видима за всички членове в нея.",
-    "<sender> made future room history visible to anyone.": "<sender> направи бъдещата история на стаята видима за всеки.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> направи бъдещата история на стаята видима по непознат начин (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> включи шифроване от край до край (алгоритъм %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> от %(fromPowerLevel)s на %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> смени нивото на достъп на %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> смени закачените съобщения за стаята.",
-    "%(widgetName)s widget modified by <sender>": "Приспособлението %(widgetName)s беше променено от <sender>",
-    "%(widgetName)s widget added by <sender>": "Приспособлението %(widgetName)s беше добавено от <sender>",
-    "%(widgetName)s widget removed by <sender>": "Приспособлението %(widgetName)s беше премахнато от <sender>"
+    "Try the app first": "Първо пробвайте приложението"
 }
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 2e84e60e4c..98d51e99ac 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -153,14 +153,49 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clau de signatura que heu proporcionat coincideix amb la clau de signatura que heu rebut del dispositiu %(deviceId)s de l'usuari %(userId)s. S'ha marcat el dispositiu com a dispositiu verificat.",
     "Unrecognised command:": "Ordre no reconegut:",
     "Reason": "Raó",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha acceptat la invitació de %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s ha acceptat una invitació.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha sol·licitat una conferència VoIP.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha convidat a %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha expulsat a %(targetName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha establert %(displayName)s com el seu nom visible.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha retirat el seu nom visible %(oldDisplayName)s.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s ha retirat la seva foto de perfil.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ha canviat la seva foto de perfil.",
+    "%(senderName)s set a profile picture.": "%(senderName)s ha establert una foto de perfil.",
     "VoIP conference started.": "S'ha iniciat la conferència VoIP.",
+    "%(targetName)s joined the room.": "%(targetName)s ha entrat a la sala.",
     "VoIP conference finished.": "S'ha finalitzat la conferència VoIP.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s ha rebutjat la invitació.",
+    "%(targetName)s left the room.": "%(targetName)s ha sortir de la sala.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha readmès a %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha fet fora a %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirat la invitació per a %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha canviat el tema a \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha eliminat el nom de la sala.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha canviat el nom de la sala a %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ha enviat una imatge.",
     "Someone": "Algú",
     "(not supported by this browser)": "(no és compatible amb aquest navegador)",
+    "%(senderName)s answered the call.": "%(senderName)s ha contestat la trucada.",
     "(could not connect media)": "(no s'ha pogut connectar el medi)",
     "(no answer)": "(sense resposta)",
     "(unknown failure: %(reason)s)": "(error desconegut: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s ha penjat.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha col·locat una trucada de %(callType)s.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha enviat una invitació a %(targetDisplayName)s a entrar a aquesta sala.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha fet visible l'històric futur de la sala per a tots els membres, a partir de que hi són convidats.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres, des de que entren a la sala.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres de la sala.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha fet visible l´historial de la sala per a tothom.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha fet visible l'històric de la sala per a desconeguts (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activat l'encriptació d'extrem a extrem (algoritme %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s fins %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de potència de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha canviat els missatges fixats de la sala.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s ha modificat el giny %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s ha afegit el giny %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s ha eliminat el giny %(widgetName)s",
     "%(displayName)s is typing": "%(displayName)s està escrivint",
     "%(names)s and %(count)s others are typing|other": "%(names)s i %(count)s més estan escrivint",
     "%(names)s and %(count)s others are typing|one": "%(names)s i algú altre està escrivint",
@@ -460,6 +495,9 @@
     "Invalid file%(extra)s": "Fitxer invàlid%(extra)s",
     "Error decrypting image": "S'ha produït un error en desencriptar la imatge",
     "Error decrypting video": "S'ha produït un error en desencriptar el vídeo",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha canviat el seu avatar per a la sala %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s ha eliminat l'avatar de la sala.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha canviat l'avatar de la sala per aquest <img/>",
     "Copied!": "Copiat!",
     "Failed to copy": "No s'ha pogut copiar",
     "Add an Integration": "Afegeix una integració",
@@ -813,6 +851,7 @@
     "Your homeserver's URL": "URL del teu homeserver",
     "Your identity server's URL": "URL del teu servidor d'identitat",
     "Analytics": "Analítiques",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha canviat el seu nom visible a %(displayName)s.",
     "Server may be unavailable or overloaded": "El servidor pot estar inaccessible o sobrecarregat",
     "Display name": "Nom visible",
     "Identity Server is": "El servidor d'identitat es",
@@ -977,44 +1016,5 @@
     "Collapse panel": "Col·lapsa el tauler",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Amb el vostre navegador actual, l'aparença de l'aplicació pot ser completament incorrecta i algunes o totes les funcions poden no funcionar correctament. Si voleu provar-ho de totes maneres, podeu continuar, però esteu sols pel que fa als problemes que pugueu trobar!",
     "Checking for an update...": "Comprovant si hi ha actualitzacions...",
-    "There are advanced notifications which are not shown here": "Hi ha notificacions avançades que no es mostren aquí",
-    "<target> accepted the invitation for %(displayName)s.": "<target> ha acceptat la invitació de %(displayName)s.",
-    "<target> accepted an invitation.": "<target> ha acceptat una invitació.",
-    "<sender> requested a VoIP conference.": "<sender> ha sol·licitat una conferència VoIP.",
-    "<sender> invited <target>.": "<sender> ha convidat a <target>.",
-    "<sender> banned <target>.": "<sender> ha expulsat a <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> ha canviat el seu nom visible a <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> ha establert <displayName> com el seu nom visible.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> ha retirat el seu nom visible <oldDisplayName>.",
-    "<sender> removed their profile picture.": "<sender> ha retirat la seva foto de perfil.",
-    "<sender> changed their profile picture.": "<sender> ha canviat la seva foto de perfil.",
-    "<sender> set a profile picture.": "<sender> ha establert una foto de perfil.",
-    "<target> joined the room.": "<target> ha entrat a la sala.",
-    "<target> rejected the invitation.": "<target> ha rebutjat la invitació.",
-    "<target> left the room.": "<target> ha sortir de la sala.",
-    "<sender> unbanned <target>.": "<sender> ha readmès a <target>.",
-    "<sender> kicked <target>.": "<sender> ha fet fora a <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> ha retirat la invitació per a <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> ha canviat el tema a \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> ha canviat el nom de la sala a %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> ha canviat el seu avatar per a la sala %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> ha canviat l'avatar de la sala per aquest <img/>",
-    "<sender> removed the room name.": "<sender> ha eliminat el nom de la sala.",
-    "<sender> removed the room avatar.": "<sender> ha eliminat l'avatar de la sala.",
-    "<sender> answered the call.": "<sender> ha contestat la trucada.",
-    "<sender> ended the call.": "<sender> ha penjat.",
-    "<sender> placed a %(callType)s call.": "<sender> ha col·locat una trucada de %(callType)s.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> ha enviat una invitació a %(targetDisplayName)s a entrar a aquesta sala.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> ha fet visible l'històric futur de la sala per a tots els membres, a partir de que hi són convidats.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> ha fet visible l'històric futur de la sala a tots els membres, des de que entren a la sala.",
-    "<sender> made future room history visible to all room members.": "<sender> ha fet visible l'històric futur de la sala a tots els membres de la sala.",
-    "<sender> made future room history visible to anyone.": "<sender> ha fet visible l´historial de la sala per a tothom.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> ha fet visible l'històric de la sala per a desconeguts (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ha activat l'encriptació d'extrem a extrem (algoritme %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s fins %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ha canviat el nivell de potència de %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> ha canviat els missatges fixats de la sala.",
-    "%(widgetName)s widget modified by <sender>": "<sender> ha modificat el giny %(widgetName)s",
-    "%(widgetName)s widget added by <sender>": "<sender> ha afegit el giny %(widgetName)s",
-    "%(widgetName)s widget removed by <sender>": "<sender> ha eliminat el giny %(widgetName)s"
+    "There are advanced notifications which are not shown here": "Hi ha notificacions avançades que no es mostren aquí"
 }
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index a2646300a7..b7298f80ab 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -61,6 +61,7 @@
     "Custom Server Options": "Vlastní serverové volby",
     "Add a widget": "Přidat widget",
     "Accept": "Přijmout",
+    "%(targetName)s accepted an invitation.": "%(targetName)s přijal/a pozvání.",
     "Account": "Účet",
     "Access Token:": "Přístupový žeton:",
     "Add": "Přidat",
@@ -99,6 +100,10 @@
     "Can't load user settings": "Nelze načíst uživatelské nastavení",
     "Cannot add any more widgets": "Nelze přidat žádné další widgety",
     "Change Password": "Změnit heslo",
+    "%(senderName)s changed their profile picture.": "%(senderName)s změnil/a svůj profilový obrázek.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s změnil/a název místnosti na %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstranil/a název místnosti.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s změnil/a téma na „%(topic)s“.",
     "Changes to who can read history will only apply to future messages in this room": "Změny viditelnosti historie budou platné až pro budoucí zprávy v této místnosti",
     "Changes your display nickname": "Změní vaši zobrazovanou přezdívku",
     "Changes colour scheme of current room": "Změní barevné schéma aktuální místnosti",
@@ -160,6 +165,7 @@
     "Encrypted room": "Zašifrovaná místnost",
     "Encryption is enabled in this room": "V této místnosti je zapnuto šifrování",
     "Encryption is not enabled in this room": "V této místnosti není zapnuto šifrování",
+    "%(senderName)s ended the call.": "%(senderName)s ukončil/a hovor.",
     "End-to-end encryption information": "Informace o end-to-end šifrování",
     "End-to-end encryption is in beta and may not be reliable": "End-to-end šifrování je v raném vývoji a nemusí být spolehlivé",
     "Enter Code": "Zadejte kód",
@@ -192,8 +198,12 @@
     "For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s a %(lastPerson)s píší",
     "and %(count)s others...|other": "a %(count)s další...",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget upravil/a %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget odstranil/a %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget přidal/a %(senderName)s",
     "Automatically replace plain text Emoji": "Automaticky nahrazovat textové emodži",
     "Failed to upload image": "Obrázek se nepodařilo nahrát",
+    "%(senderName)s answered the call.": "%(senderName)s přijal/a hovor.",
     "Click to mute audio": "Kliknutím ztlumíte zvuk",
     "Failed to verify email address: make sure you clicked the link in the email": "E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste kliknul/a na zaslaný odkaz",
     "Guest access is disabled on this Home Server.": "Na tomto domovském serveru je hostům vstup odepřen.",
@@ -213,12 +223,15 @@
     "Invalid alias format": "Neplaný formát aliasu",
     "Invalid address format": "Neplatný formát adresy",
     "Invalid Email Address": "Neplatná e-mailová adresa",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval/a %(targetName)s.",
     "Invite new room members": "Pozvat do místnosti nové členy",
     "Invites": "Pozvánky",
     "Invites user with given id to current room": "Pozve do aktuální místnosti uživatele s daným id",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' není platný formát adresy",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' není platný formát aliasu",
     "Join Room": "Vstoupit do místnosti",
+    "%(targetName)s joined the room.": "%(targetName)s vstoupil/a do místnosti.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopnul/a %(targetName)s.",
     "Kick": "Vykopnout",
     "Kicks user with given id": "Vykopne uživatele s daným id",
     "Last seen": "Naposledy viděn/a",
@@ -253,6 +266,7 @@
     "Passwords can't be empty": "Hesla nemohou být prázdná",
     "Permissions": "Oprávnění",
     "Phone": "Telefon",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s změnil/a úroveň moci o %(powerLevelDiffText)s.",
     "Define the power level of a user": "Stanovte úroveň moci uživatele",
     "Failed to change power level": "Nepodařilo se změnit úroveň moci",
     "Power level must be positive integer.": "Úroveň moci musí být kladné celé číslo.",
@@ -276,6 +290,7 @@
     "Sender device information": "Informace o odesilatelově zařízení",
     "Send Reset Email": "Poslat resetovací e-mail",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal/a obrázek.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s poslal/a %(targetDisplayName)s pozvánku ke vstupu do místnosti.",
     "Server error": "Chyba serveru",
     "Server may be unavailable or overloaded": "Server může být nedostupný nebo přetížený",
     "Server may be unavailable, overloaded, or search timed out :(": "Server může být nedostupný, přetížený nebo vyhledávání vypršelo :(",
@@ -283,6 +298,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server může být nedostupný, přetížený nebo jste narazili na chybu.",
     "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, přetížený nebo se pokazilo něco jiného.",
     "Session ID": "ID sezení",
+    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil/a profilový obrázek.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si změnil/a zobrazované jméno na %(displayName)s.",
     "Sets the room topic": "Nastavuje téma místnosti",
     "Show panel": "Zobrazit panel",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zobrazovat časové značky v 12hodinovém formátu (např. 2:30 odp.)",
@@ -332,7 +349,9 @@
     "Start chatting": "Zahájit rozhovor",
     "Start Chatting": "Začít chatovat",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Textová zpráva byla odeslána na +%(msisdn)s. Prosím vložte ověřovací kód z dané zprávy",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s přijal/a pozvánku pro %(displayName)s.",
     "Active call (%(roomName)s)": "Probíhající hovor (%(roomName)s)",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s vykázal/a %(targetName)s.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nelze se připojit k domovskému serveru přes HTTP, pokud je v adresním řádku HTTPS. Buď použijte HTTPS, nebo <a>povolte nebezpečné scripty</a>.",
     "Click here to fix": "Klikněte zde pro opravu",
     "Click to mute video": "Klikněte pro zakázání videa",
@@ -344,6 +363,7 @@
     "Do you want to load widget from URL:": "Chcete načíst widget z URL:",
     "Ed25519 fingerprint": "Ed25519 otisk",
     "Fill screen": "Vyplnit obrazovku",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "This doesn't appear to be a valid email address": "Tato e-mailová adresa se zdá být neplatná",
     "This is a preview of this room. Room interactions have been disabled": "Toto je náhled místnosti. Interakce byly zakázány",
     "This phone number is already in use": "Toto číslo se již používá",
@@ -355,12 +375,14 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Zpráva v daném časovém úseku nenalezena.",
     "Turn Markdown off": "Vypnout Markdown",
     "Turn Markdown on": "Zapnout Markdown",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s zapnul/a end-to-end šifrování (algoritmus %(algorithm)s).",
     "Unable to add email address": "Nepodařilo se přidat e-mailovou adresu",
     "Unable to create widget.": "Nepodařilo se vytvořit widget.",
     "Unable to remove contact information": "Nepodařilo se smazat kontaktní údaje",
     "Unable to verify email address.": "Nepodařilo se ověřit e-mailovou adresu.",
     "Unban": "Přijmout zpět",
     "Unbans user with given id": "Přijme zpět uživatele s daným id",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s přijal/a zpět %(targetName)s.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Nepodařilo se prokázat, že adresa, na kterou byla tato pozvánka odeslána, se shoduje s adresou přidruženou k vašemu účtu.",
     "Unable to capture screen": "Nepodařilo se zachytit obrazovku",
     "Unable to enable Notifications": "Nepodařilo se povolit upozornění",
@@ -434,7 +456,11 @@
     "Reason": "Důvod",
     "VoIP conference started.": "VoIP konference započata.",
     "VoIP conference finished.": "VoIP konference ukončena.",
+    "%(targetName)s left the room.": "%(targetName)s opustil/a místnost.",
     "You are already in a call.": "Již máte probíhající hovor.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s požádal/a o VoIP konferenci.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s odstranil/a svůj profilový obrázek.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s odmítl/a pozvání.",
     "Communities": "Skupiny",
     "Message Pinning": "Připíchnutí zprávy",
     "Your browser does not support the required cryptography extensions": "Váš prohlížeč nepodporuje požadovaná kryptografická rozšíření",
@@ -454,12 +480,21 @@
     "numbullet": "číselný seznam",
     "No pinned messages.": "Žádné připíchnuté zprávy.",
     "Pinned Messages": "Připíchnuté zprávy",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstranil/a svoje zobrazované jméno (%(oldDisplayName)s).",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s odvolal/a pozvánku pro %(targetName)s.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich pozvání.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich vstupu do místnosti.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou komukoliv.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s změnil/a připíchnuté zprávy této místnosti.",
     "%(names)s and %(count)s others are typing|other": "%(names)s a %(count)s další píší",
     "Authentication check failed: incorrect password?": "Kontrola ověření selhala: špatné heslo?",
     "You need to be able to invite users to do that.": "Pro tuto akci musíte mít právo zvát uživatele.",
     "Delete Widget": "Smazat widget",
     "Error decrypting image": "Chyba při dešifrování obrázku",
     "Error decrypting video": "Chyba při dešifrování videa",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odstranil/a avatar místnosti.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s změnil/a avatar místnosti na <img/>",
     "Copied!": "Zkopírováno!",
     "Failed to copy": "Nepodařilo se zkopírovat",
     "Removed or unknown message type": "Zpráva odstraněna nebo neznámého typu",
@@ -579,6 +614,7 @@
     "You have <a>disabled</a> URL previews by default.": "<a>Vypnul/a</a> jste automatické náhledy webových adres.",
     "You have <a>enabled</a> URL previews by default.": "<a>Zapnul/a</a> jste automatické náhledy webových adres.",
     "URL Previews": "Náhledy webových adres",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s změnil/a avatar místnosti %(roomName)s",
     "Add an Integration": "Přidat začlenění",
     "Message removed": "Zpráva odstraněna",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Ochrana před roboty není aktuálně na desktopu dostupná. Použijte prosím <a>webový prohlížeč</a>",
@@ -598,6 +634,8 @@
     "Missing room_id in request": "V zadání chybí room_id",
     "Missing user_id in request": "V zadání chybí user_id",
     "(could not connect media)": "(média se nepodařilo spojit)",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s uskutečnil %(callType)s hovor.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).",
     "Not a valid Riot keyfile": "Neplatný soubor s klíčem Riot",
     "Disable Emoji suggestions while typing": "Zakázat návrhy Emoji během psaní",
     "Hide avatar changes": "Skrýt změny avatara",
@@ -1038,43 +1076,5 @@
     "Collapse panel": "Sbalit panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Vzhled a chování aplikace může být ve vašem aktuální prohlížeči nesprávné a některé nebo všechny funkce mohou být chybné. Chcete-li i přes to pokračovat, nebudeme vám bránit, ale se všemi problémy, na které narazíte, si musíte poradit sami!",
     "Checking for an update...": "Kontrola aktualizací...",
-    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena",
-    "<target> accepted the invitation for %(displayName)s.": "<target> přijal/a pozvánku pro %(displayName)s.",
-    "<target> accepted an invitation.": "<target> přijal/a pozvání.",
-    "<sender> requested a VoIP conference.": "<sender> požádal/a o VoIP konferenci.",
-    "<sender> invited <target>.": "<sender> pozval/a <target>.",
-    "<sender> banned <target>.": "<sender> vykázal/a <target>.",
-    "<sender> set their display name to <displayName>.": "<sender> si změnil/a zobrazované jméno na <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> odstranil/a svoje zobrazované jméno (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> odstranil/a svůj profilový obrázek.",
-    "<sender> changed their profile picture.": "<sender> změnil/a svůj profilový obrázek.",
-    "<sender> set a profile picture.": "<sender> si nastavil/a profilový obrázek.",
-    "<target> joined the room.": "<target> vstoupil/a do místnosti.",
-    "<target> rejected the invitation.": "<target> odmítl/a pozvání.",
-    "<target> left the room.": "<target> opustil/a místnost.",
-    "<sender> unbanned <target>.": "<sender> přijal/a zpět <target>.",
-    "<sender> kicked <target>.": "<sender> vykopnul/a <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> odvolal/a pozvánku pro <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> změnil/a téma na „%(topic)s“.",
-    "<sender> changed the room name to %(roomName)s.": "<sender> změnil/a název místnosti na %(roomName)s.",
-    "<sender> changed the room avatar to <img/>": "<sender> změnil/a avatar místnosti na <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> změnil/a avatar místnosti %(roomName)s",
-    "<sender> removed the room name.": "<sender> odstranil/a název místnosti.",
-    "<sender> removed the room avatar.": "<sender> odstranil/a avatar místnosti.",
-    "<sender> answered the call.": "<sender> přijal/a hovor.",
-    "<sender> ended the call.": "<sender> ukončil/a hovor.",
-    "<sender> placed a %(callType)s call.": "<sender> uskutečnil %(callType)s hovor.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> poslal/a %(targetDisplayName)s pozvánku ke vstupu do místnosti.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich pozvání.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich vstupu do místnosti.",
-    "<sender> made future room history visible to all room members.": "<sender> učinil/a budoucí historii místnosti viditelnou všem členům.",
-    "<sender> made future room history visible to anyone.": "<sender> učinil/a budoucí historii místnosti viditelnou komukoliv.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> zapnul/a end-to-end šifrování (algoritmus %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> z %(fromPowerLevel)s na %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> změnil/a úroveň moci o %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> změnil/a připíchnuté zprávy této místnosti.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s widget upravil/a <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget odstranil/a <sender>",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget přidal/a <sender>"
+    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena"
 }
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 9f2e3f5b59..e90de5edfc 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -87,7 +87,10 @@
     "Remove": "Fjern",
     "Settings": "Indstillinger",
     "unknown error code": "Ukendt fejlkode",
+    "%(targetName)s accepted an invitation.": "%(targetName)s accepterede en invitation.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepterede invitationen til %(displayName)s.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s og %(lastPerson)s er ved at skrive",
+    "%(senderName)s answered the call.": "%(senderName)s besvarede opkaldet.",
     "Add a widget": "Tilføj en widget",
     "OK": "OK",
     "Search": "Søg",
@@ -208,14 +211,34 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signaturnøglen du oplste passer med nøglen fra %(userId)ss enhed %(deviceId)s. Enheden er markeret som verificeret.",
     "Unrecognised command:": "Ukendt kommando:",
     "Reason": "Årsag",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s forespurgte en VoIP konference.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterede %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannede %(targetName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s satte deres viste navn til %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjernede deres viste navn (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s fjernede deres profilbillede.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ændrede deres profilbillede.",
+    "%(senderName)s set a profile picture.": "%(senderName)s indstillede deres profilbillede.",
     "VoIP conference started.": "VoIP konference startet.",
+    "%(targetName)s joined the room.": "%(targetName)s forbandt til rummet.",
     "VoIP conference finished.": "VoIP konference afsluttet.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s afviste invitationen.",
+    "%(targetName)s left the room.": "%(targetName)s forlod rummet.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbannede %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickede %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trak %(targetName)ss invitation tilbage.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ændrede emnet til \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjernede rumnavnet.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ændrede rumnavnet til %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendte et billed.",
     "Someone": "Nogen",
     "(not supported by this browser)": "(Ikke understøttet af denne browser)",
     "(could not connect media)": "(kunne ikke forbinde til mediet)",
     "(no answer)": "(intet svar)",
     "(unknown failure: %(reason)s)": "(ukendt fejl: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s afsluttede opkaldet.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s startede et %(callType)s opkald.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s inviterede %(targetDisplayName)s til rummet.",
     "Submit debug logs": "Indsend debug-logfiler",
     "Online": "Online",
     "Fetching third party location failed": "Hentning af tredjeparts placering mislykkedes",
@@ -374,28 +397,5 @@
     "View Community": "Vis community",
     "%(count)s Members|one": "%(count)s medlem",
     "Notes:": "Noter:",
-    "Preparing to send logs": "Forbereder afsendelse af logfiler",
-    "<target> accepted the invitation for %(displayName)s.": "<target> accepterede invitationen til %(displayName)s.",
-    "<target> accepted an invitation.": "<target> accepterede en invitation.",
-    "<sender> requested a VoIP conference.": "<sender> forespurgte en VoIP konference.",
-    "<sender> invited <target>.": "<sender> inviterede <target>.",
-    "<sender> banned <target>.": "<sender> bannede <target>.",
-    "<sender> set their display name to <displayName>.": "<sender> satte deres viste navn til <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> fjernede deres viste navn (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> fjernede deres profilbillede.",
-    "<sender> changed their profile picture.": "<sender> ændrede deres profilbillede.",
-    "<sender> set a profile picture.": "<sender> indstillede deres profilbillede.",
-    "<target> joined the room.": "<target> forbandt til rummet.",
-    "<target> rejected the invitation.": "<target> afviste invitationen.",
-    "<target> left the room.": "<target> forlod rummet.",
-    "<sender> unbanned <target>.": "<sender> unbannede <target>.",
-    "<sender> kicked <target>.": "<sender> kickede <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> trak <target>s invitation tilbage.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> ændrede emnet til \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> ændrede rumnavnet til %(roomName)s.",
-    "<sender> removed the room name.": "<sender> fjernede rumnavnet.",
-    "<sender> answered the call.": "<sender> besvarede opkaldet.",
-    "<sender> ended the call.": "<sender> afsluttede opkaldet.",
-    "<sender> placed a %(callType)s call.": "<sender> startede et %(callType)s opkald.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> inviterede %(targetDisplayName)s til rummet."
+    "Preparing to send logs": "Forbereder afsendelse af logfiler"
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 72d6570ec9..9b1c5acb8d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -239,21 +239,51 @@
     "Share message history with new users": "Bisherigen Chatverlauf mit neuen Nutzern teilen",
     "Encrypt room": "Raum verschlüsseln",
     "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
+    "%(targetName)s accepted an invitation.": "%(targetName)s hat eine Einladung angenommen.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hat die Einladung für %(displayName)s akzeptiert.",
+    "%(senderName)s answered the call.": "%(senderName)s hat den Anruf angenommen.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s verbannt.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s hat den Raumnamen geändert zu %(roomName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".",
     "/ddg is not a command": "/ddg ist kein Kommando",
+    "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.",
     "Failed to send request.": "Anfrage konnte nicht gesendet werden.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s hat %(targetName)s eingeladen.",
     "%(displayName)s is typing": "%(displayName)s schreibt",
+    "%(targetName)s joined the room.": "%(targetName)s hat den Raum betreten.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s hat %(targetName)s gekickt.",
+    "%(targetName)s left the room.": "%(targetName)s hat den Raum verlassen.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind).",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für Alle.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für unbekannt (%(visibility)s).",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
     "Missing user_id in request": "Fehlende user_id in Anfrage",
     "(not supported by this browser)": "(wird von diesem Browser nicht unterstützt)",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s startete einen %(callType)s-Anruf.",
     "Power level must be positive integer.": "Berechtigungslevel muss eine positive ganze Zahl sein.",
     "Reason": "Grund",
+    "%(targetName)s rejected the invitation.": "%(targetName)s hat die Einladung abgelehnt.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s hat den Anzeigenamen entfernt (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s hat das Profilbild gelöscht.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s möchte eine VoIP-Konferenz beginnen.",
     "Room %(roomId)s not visible": "Raum %(roomId)s ist nicht sichtbar",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s hat ein Bild gesendet.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s hat %(targetDisplayName)s in diesen Raum eingeladen.",
+    "%(senderName)s set a profile picture.": "%(senderName)s hat ein Profilbild gesetzt.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s hat den Anzeigenamen geändert in %(displayName)s.",
     "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
     "These are experimental features that may break in unexpected ways": "Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können",
     "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte einfach auf die Autovervollständigungsergebnisse und benutze dann die TAB-Taste zum durchblättern.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s hat die Ende-zu-Ende-Verschlüsselung aktiviert (Algorithmus: %(algorithm)s).",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.",
     "Usage": "Verwendung",
     "Use with caution": "Mit Vorsicht zu verwenden",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
     "You need to be able to invite users to do that.": "Du musst die Berechtigung haben, Benutzer einzuladen, um diese Aktion ausführen zu können.",
     "You need to be logged in.": "Du musst angemeldet sein.",
     "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
@@ -376,6 +406,7 @@
     "Invalid file%(extra)s": "Ungültige Datei%(extra)s",
     "Remove %(threePid)s?": "%(threePid)s entfernen?",
     "Please select the destination room for this message": "Bitte den Raum auswählen, an den diese Nachricht gesendet werden soll",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s hat den Raum-Namen entfernt.",
     "Passphrases must match": "Passphrases müssen übereinstimmen",
     "Passphrase must not be empty": "Passphrase darf nicht leer sein",
     "Export room keys": "Raum-Schlüssel exportieren",
@@ -455,6 +486,7 @@
     "Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.",
     "Options": "Optionen",
     "Invited": "Eingeladen",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raum-Bild entfernt.",
     "VoIP": "VoIP",
     "No Webcams detected": "Keine Webcam erkannt",
     "Missing Media Permissions, click here to request.": "Fehlende Medienberechtigungen. Hier klicken, um Berechtigungen zu beantragen.",
@@ -496,6 +528,8 @@
     "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!": "WARNUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signatur-Schlüssel für %(userId)s und das Gerät %(deviceId)s ist \"%(fprint)s\", welcher nicht mit dem bereitgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Dies kann bedeuten, dass deine Kommunikation abgehört wird!",
     "You have <a>disabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>deaktiviert</a>.",
     "You have <a>enabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>aktiviert</a>.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s hat das Raum-Bild geändert zu <img/>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raum-Bild für %(roomName)s geändert",
     "Hide removed messages": "Gelöschte Nachrichten verbergen",
     "Start new chat": "Neuen Chat starten",
     "Add": "Hinzufügen",
@@ -630,7 +664,10 @@
     "Do you want to load widget from URL:": "Möchtest du das Widget von folgender URL laden:",
     "Integrations Error": "Integrations-Error",
     "NOTE: Apps are not end-to-end encrypted": "BEACHTE: Apps sind nicht Ende-zu-Ende-verschlüsselt",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s hinzugefügt",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s entfernt",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "In der Desktop-Version kann derzeit nicht geprüft werden, ob ein Benutzer ein Roboter ist. Bitte einen <a>Webbrowser</a> verwenden",
+    "%(widgetName)s widget modified by %(senderName)s": "Das Widget '%(widgetName)s' wurde von %(senderName)s bearbeitet",
     "Copied!": "Kopiert!",
     "Failed to copy": "Kopieren fehlgeschlagen",
     "Ignored Users": "Ignorierte Benutzer",
@@ -697,6 +734,7 @@
     "Remove avatar": "Profilbild entfernen",
     "Disable big emoji in chat": "Große Emojis im Chat deaktiveren",
     "Pinned Messages": "Angeheftete Nachrichten",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s hat die angehefteten Nachrichten für diesen Raum geändert.",
     "Jump to read receipt": "Zur Lesebestätigung springen",
     "Message Pinning": "Anheften von Nachrichten",
     "Long Description (HTML)": "Lange Beschreibung (HTML)",
@@ -917,6 +955,7 @@
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
     "<a>In reply to</a> <pill>": "<a>Antwort zu</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
     "Failed to remove tag %(tagName)s from room": "Fehler beim Entfernen des \"%(tagName)s\"-Tags von dem Raum",
     "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum",
@@ -1156,44 +1195,5 @@
     "Share Message": "Teile Nachricht",
     "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt",
     "Audio Output": "Ton-Ausgabe",
-    "Try the app first": "App erst ausprobieren",
-    "<target> accepted the invitation for %(displayName)s.": "<target> hat die Einladung für %(displayName)s akzeptiert.",
-    "<target> accepted an invitation.": "<target> hat eine Einladung angenommen.",
-    "<sender> requested a VoIP conference.": "<sender> möchte eine VoIP-Konferenz beginnen.",
-    "<sender> invited <target>.": "<sender> hat <target> eingeladen.",
-    "<sender> banned <target>.": "<sender> hat <target> verbannt.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> änderte den Anzeigenamen auf <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> hat den Anzeigenamen geändert in <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> hat den Anzeigenamen entfernt (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> hat das Profilbild gelöscht.",
-    "<sender> changed their profile picture.": "<sender> hat das Profilbild geändert.",
-    "<sender> set a profile picture.": "<sender> hat ein Profilbild gesetzt.",
-    "<target> joined the room.": "<target> hat den Raum betreten.",
-    "<target> rejected the invitation.": "<target> hat die Einladung abgelehnt.",
-    "<target> left the room.": "<target> hat den Raum verlassen.",
-    "<sender> unbanned <target>.": "<sender> hat die Verbannung von <target> aufgehoben.",
-    "<sender> kicked <target>.": "<sender> hat <target> gekickt.",
-    "<sender> withdrew <target>'s invitation.": "<sender> hat die Einladung für <target> zurückgezogen.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> hat das Thema geändert in \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> hat den Raumnamen geändert zu %(roomName)s.",
-    "<sender> changed the room avatar to <img/>": "<sender> hat das Raum-Bild geändert zu <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> hat das Raum-Bild für %(roomName)s geändert",
-    "<sender> removed the room name.": "<sender> hat den Raum-Namen entfernt.",
-    "<sender> removed the room avatar.": "<sender> hat das Raum-Bild entfernt.",
-    "<sender> answered the call.": "<sender> hat den Anruf angenommen.",
-    "<sender> ended the call.": "<sender> hat den Anruf beendet.",
-    "<sender> placed a %(callType)s call.": "<sender> startete einen %(callType)s-Anruf.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> hat %(targetDisplayName)s in diesen Raum eingeladen.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind).",
-    "<sender> made future room history visible to all room members.": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.",
-    "<sender> made future room history visible to anyone.": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für Alle.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> hat den zukünftigen Chatverlauf sichtbar gemacht für unbekannt (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> hat die Ende-zu-Ende-Verschlüsselung aktiviert (Algorithmus: %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> von %(fromPowerLevel)s zu %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
-    "<sender> changed the pinned messages for the room.": "<sender> hat die angehefteten Nachrichten für diesen Raum geändert.",
-    "%(widgetName)s widget modified by <sender>": "Das Widget '%(widgetName)s' wurde von <sender> bearbeitet",
-    "%(widgetName)s widget added by <sender>": "<sender> hat das Widget %(widgetName)s hinzugefügt",
-    "%(widgetName)s widget removed by <sender>": "<sender> hat das Widget %(widgetName)s entfernt"
+    "Try the app first": "App erst ausprobieren"
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 1bc4972dac..c4514f629b 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -8,6 +8,8 @@
     "Search": "Αναζήτηση",
     "Settings": "Ρυθμίσεις",
     "unknown error code": "άγνωστος κωδικός σφάλματος",
+    "%(targetName)s accepted an invitation.": "%(targetName)s δέχτηκε την πρόσκληση.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s δέχτηκες την πρόσκληση για %(displayName)s.",
     "Account": "Λογαριασμός",
     "Add a topic": "Προσθήκη θέματος",
     "Add email address": "Προσθήκη διεύθυνσης ηλ. αλληλογραφίας",
@@ -24,6 +26,7 @@
     "Hide removed messages": "Απόκρυψη διαγραμμένων μηνυμάτων",
     "Authentication": "Πιστοποίηση",
     "A new password must be entered.": "Ο νέος κωδικός πρόσβασης πρέπει να εισαχθεί.",
+    "%(senderName)s answered the call.": "Ο χρήστης %(senderName)s απάντησε την κλήση.",
     "An error has occurred.": "Παρουσιάστηκε ένα σφάλμα.",
     "Anyone": "Oποιοσδήποτε",
     "Are you sure?": "Είστε σίγουροι;",
@@ -31,6 +34,7 @@
     "Are you sure you want to reject the invitation?": "Είστε σίγουροι ότι θέλετε να απορρίψετε την πρόσκληση;",
     "Are you sure you want to upload the following files?": "Είστε σίγουροι ότι θέλετε να αποστείλετε τα ακόλουθα αρχεία;",
     "Attachment": "Επισύναψη",
+    "%(senderName)s banned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Autoplay GIFs and videos": "Αυτόματη αναπαραγωγή GIFs και βίντεο",
     "Anyone who knows the room's link, apart from guests": "Oποιοσδήποτε",
     "%(items)s and %(lastItem)s": "%(items)s  %(lastItem)s",
@@ -44,9 +48,13 @@
     "Blacklisted": "Στη μαύρη λίστα",
     "Can't load user settings": "Δεν είναι δυνατή η φόρτωση των ρυθμίσεων χρήστη",
     "Change Password": "Αλλαγή κωδικού πρόσβασης",
+    "%(senderName)s changed their profile picture.": "Ο %(senderName)s άλλαξε τη φωτογραφία του προφίλ του.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "Ο %(senderDisplayName)s άλλαξε το όνομα του δωματίου σε %(roomName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Ο %(senderDisplayName)s άλλαξε το θέμα σε \"%(topic)s\".",
     "Clear Cache and Reload": "Εκκαθάριση μνήμης και ανανέωση",
     "Clear Cache": "Εκκαθάριση μνήμης",
     "Bans user with given id": "Αποκλεισμός χρήστη με το συγκεκριμένο αναγνωριστικό",
+    "%(senderDisplayName)s removed the room name.": "Ο %(senderDisplayName)s διέγραψε το όνομα του δωματίου.",
     "Changes your display nickname": "Αλλάζει το ψευδώνυμο χρήστη",
     "Conference call failed.": "Η κλήση συνδιάσκεψης απέτυχε.",
     "powered by Matrix": "βασισμένο στο Matrix",
@@ -84,6 +92,7 @@
     "Emoji": "Εικονίδια",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Τα κρυπτογραφημένα μηνύματα δεν θα είναι ορατά σε εφαρμογές που δεν παρέχουν τη δυνατότητα κρυπτογράφησης",
     "Encrypted room": "Κρυπτογραφημένο δωμάτιο",
+    "%(senderName)s ended the call.": "%(senderName)s τερμάτισε την κλήση.",
     "End-to-end encryption information": "Πληροφορίες σχετικά με τη κρυπτογράφηση από άκρο σε άκρο (End-to-end encryption)",
     "Error decrypting attachment": "Σφάλμα κατά την αποκρυπτογράφηση της επισύναψης",
     "Event information": "Πληροφορίες συμβάντος",
@@ -123,11 +132,14 @@
     "Invites": "Προσκλήσεις",
     "%(displayName)s is typing": "Ο χρήστης %(displayName)s γράφει",
     "Sign in with": "Συνδεθείτε με",
+    "%(targetName)s joined the room.": "ο %(targetName)s συνδέθηκε στο δωμάτιο.",
     "Jump to first unread message.": "Πηγαίνετε στο πρώτο μη αναγνωσμένο μήνυμα.",
+    "%(senderName)s kicked %(targetName)s.": "Ο %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Kick": "Απομάκρυνση",
     "Kicks user with given id": "Διώχνει χρήστες με το συγκεκριμένο id",
     "Labs": "Πειραματικά",
     "Leave room": "Αποχώρηση από το δωμάτιο",
+    "%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
     "Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
     "Logged in as:": "Συνδεθήκατε ως:",
     "Logout": "Αποσύνδεση",
@@ -242,6 +254,7 @@
     "Reason": "Αιτία",
     "Reason: %(reasonText)s": "Αιτία: %(reasonText)s",
     "Revoke Moderator": "Ανάκληση συντονιστή",
+    "%(targetName)s rejected the invitation.": "Ο %(targetName)s απέρριψε την πρόσκληση.",
     "Reject invitation": "Απόρριψη πρόσκλησης",
     "Remote addresses for this room:": "Απομακρυσμένες διευθύνσεις για το δωμάτιο:",
     "Remove Contact Information?": "Αφαίρεση πληροφοριών επαφής;",
@@ -258,6 +271,7 @@
     "%(senderDisplayName)s sent an image.": "Ο %(senderDisplayName)s έστειλε μια φωτογραφία.",
     "Server may be unavailable or overloaded": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος ή υπερφορτωμένος",
     "Session ID": "Αναγνωριστικό συνεδρίας",
+    "%(senderName)s set a profile picture.": "Ο %(senderName)s όρισε τη φωτογραφία του προφίλ του.",
     "Start authentication": "Έναρξη πιστοποίησης",
     "Submit": "Υποβολή",
     "Tagged as: ": "Με ετικέτα: ",
@@ -275,6 +289,7 @@
     "Unable to remove contact information": "Αδυναμία αφαίρεσης πληροφοριών επαφής",
     "Unable to verify email address.": "Αδυναμία επιβεβαίωσης διεύθυνσης ηλεκτρονικής αλληλογραφίας.",
     "Unban": "Άρση αποκλεισμού",
+    "%(senderName)s unbanned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Unable to enable Notifications": "Αδυναμία ενεργοποίησης των ειδοποιήσεων",
     "Unable to load device list": "Αδυναμία φόρτωσης της λίστας συσκευών",
     "Unencrypted room": "Μη κρυπτογραφημένο δωμάτιο",
@@ -395,6 +410,8 @@
     "Start chatting": "Έναρξη συνομιλίας",
     "Start Chatting": "Έναρξη συνομιλίας",
     "Click on the button below to start chatting!": "Κάντε κλικ στο κουμπί παρακάτω για να ξεκινήσετε μια συνομιλία!",
+    "%(senderDisplayName)s removed the room avatar.": "Ο %(senderDisplayName)s διέγραψε την προσωπική εικόνα του δωματίου.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "Ο %(senderDisplayName)s άλλαξε την προσωπική εικόνα του %(roomName)s",
     "Username available": "Διαθέσιμο όνομα χρήστη",
     "Username not available": "Μη διαθέσιμο όνομα χρήστη",
     "Something went wrong!": "Κάτι πήγε στραβά!",
@@ -408,6 +425,7 @@
     "Failed to change power level": "Δεν ήταν δυνατή η αλλαγή του επιπέδου δύναμης",
     "Failed to fetch avatar URL": "Δεν ήταν δυνατή η ανάκτηση της διεύθυνσης εικόνας",
     "Failed to unban": "Δεν ήταν δυνατή η άρση του αποκλεισμού",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s από %(fromPowerLevel)s σε %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Έχει απενεργοποιηθεί η πρόσβαση στους επισκέπτες σε αυτόν τον διακομιστή.",
     "Guests cannot join this room even if explicitly invited.": "Οι επισκέπτες δεν μπορούν να συνδεθούν στο δωμάτιο ακόμη και αν έχουν καλεστεί.",
     "Hide Text Formatting Toolbar": "Απόκρυψη εργαλειοθήκης μορφοποίησης κειμένου",
@@ -417,9 +435,15 @@
     "Invalid alias format": "Μη έγκυρη μορφή ψευδώνυμου",
     "Invalid address format": "Μη έγκυρη μορφή διεύθυνσης",
     "Invalid file%(extra)s": "Μη έγκυρο αρχείο %(extra)s",
+    "%(senderName)s invited %(targetName)s.": "Ο %(senderName)s προσκάλεσε τον %(targetName)s.",
     "Invites user with given id to current room": "Προσκαλεί τον χρήστη με το δοσμένο αναγνωριστικό στο τρέχον δωμάτιο",
     "'%(alias)s' is not a valid format for an address": "Το '%(alias)s' δεν είναι μια έγκυρη μορφή διεύθυνσης",
     "'%(alias)s' is not a valid format for an alias": "Το '%(alias)s' δεν είναι μια έγκυρη μορφή ψευδώνυμου",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που προσκλήθηκαν.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που συνδέθηκαν.",
+    "%(senderName)s made future room history visible to all room members.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη.",
+    "%(senderName)s made future room history visible to anyone.": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο οποιοσδήποτε.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο άγνωστο (%(visibility)s).",
     "Missing user_id in request": "Λείπει το user_id στο αίτημα",
     "Mobile phone number (optional)": "Αριθμός κινητού τηλεφώνου (προαιρετικό)",
     "Never send encrypted messages to unverified devices from this device": "Να μη γίνει ποτέ αποστολή κρυπτογραφημένων μηνυμάτων σε ανεπιβεβαίωτες συσκευές από αυτή τη συσκευή",
@@ -432,9 +456,12 @@
     "No users have specific privileges in this room": "Κανένας χρήστης δεν έχει συγκεκριμένα δικαιώματα σε αυτό το δωμάτιο",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Μόλις ενεργοποιηθεί η κρυπτογράφηση για ένα δωμάτιο, δεν μπορεί να απενεργοποιηθεί ξανά (για τώρα)",
     "Only people who have been invited": "Μόνο άτομα που έχουν προσκληθεί",
+    "%(senderName)s placed a %(callType)s call.": "Ο %(senderName)s πραγματοποίησε μια %(callType)s κλήση.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Παρακαλούμε ελέγξτε την ηλεκτρονική σας αλληλογραφία και κάντε κλικ στον σύνδεσμο που περιέχει. Μόλις γίνει αυτό, κάντε κλίκ στο κουμπί συνέχεια.",
     "Refer a friend to Riot:": "Πείτε για το Riot σε έναν φίλο σας:",
     "Rejoin": "Επανασύνδεση",
+    "%(senderName)s removed their profile picture.": "Ο %(senderName)s αφαίρεσε τη φωτογραφία του προφίλ του.",
+    "%(senderName)s requested a VoIP conference.": "Ο %(senderName)s αιτήθηκε μια συνδιάσκεψη VoIP.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Το Riot δεν έχει δικαιώματα για αποστολή ειδοποιήσεων - παρακαλούμε ελέγξτε τις ρυθμίσεις του περιηγητή σας",
     "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα αποστολής ειδοποιήσεων στο Riot - παρακαλούμε προσπαθήστε ξανά",
     "Room contains unknown devices": "Το δωμάτιο περιέχει άγνωστες συσκευές",
@@ -468,6 +495,7 @@
     "Who can access this room?": "Ποιος μπορεί να προσπελάσει αυτό το δωμάτιο;",
     "Who can read history?": "Ποιος μπορεί να διαβάσει το ιστορικό;",
     "Who would you like to add to this room?": "Ποιον θέλετε να προσθέσετε σε αυτό το δωμάτιο;",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "Ο %(senderName)s ανακάλεσε την πρόσκληση του %(targetName)s.",
     "You cannot place a call with yourself.": "Δεν μπορείτε να καλέσετε τον ευατό σας.",
     "You cannot place VoIP calls in this browser.": "Δεν μπορείτε να πραγματοποιήσετε κλήσεις VoIP με αυτόν τον περιηγητή.",
     "You do not have permission to post to this room": "Δεν έχετε δικαιώματα για να δημοσιεύσετε σε αυτό το δωμάτιο",
@@ -494,14 +522,19 @@
     "You are registering with %(SelectedTeamName)s": "Εγγραφείτε με %(SelectedTeamName)s",
     "Removed or unknown message type": "Αφαιρέθηκε ή άγνωστος τύπος μηνύματος",
     " (unsupported)": " (μη υποστηριζόμενο)",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "Ο %(senderDisplayName)s άλλαξε την εικόνα του δωματίου σε <img/>",
     "Missing Media Permissions, click here to request.": "Λείπουν τα δικαιώματα πολύμεσων, κάντε κλικ για να ζητήσετε.",
     "You may need to manually permit Riot to access your microphone/webcam": "Μπορεί να χρειαστεί να ορίσετε χειροκίνητα την πρόσβαση του Riot στο μικρόφωνο/κάμερα",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή - παρακαλούμε ελέγξτε την συνδεσιμότητα, βεβαιωθείτε ότι το <a>πιστοποιητικό SSL</a> του διακομιστή είναι έμπιστο και ότι κάποιο πρόσθετο περιηγητή δεν αποτρέπει τα αιτήματα.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή μέσω HTTP όταν μια διεύθυνση HTTPS βρίσκεται στην μπάρα του περιηγητή. Είτε χρησιμοποιήστε HTTPS ή <a>ενεργοποιήστε τα μη ασφαλή σενάρια εντολών</a>.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Ο %(senderName)s άλλαξε το επίπεδο δύναμης του %(powerLevelDiffText)s.",
     "Changes to who can read history will only apply to future messages in this room": "Οι αλλαγές που αφορούν την ορατότητα του ιστορικού θα εφαρμοστούν μόνο στα μελλοντικά μηνύματα του δωματίου",
     "Conference calling is in development and may not be reliable.": "Η κλήση συνδιάσκεψης είναι υπό ανάπτυξη και μπορεί να μην είναι αξιόπιστη.",
     "Devices will not yet be able to decrypt history from before they joined the room": "Οι συσκευές δεν θα είναι σε θέση να αποκρυπτογραφήσουν το ιστορικό πριν από την είσοδο τους στο δωμάτιο",
     "End-to-end encryption is in beta and may not be reliable": "Η κρυπτογράφηση από άκρο σε άκρο είναι σε δοκιμαστικό στάδιο και μπορεί να μην είναι αξιόπιστη",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "Ο %(senderName)s αφαίρεσε το όνομα εμφάνισης του (%(oldDisplayName)s).",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Ο %(senderName)s έστειλε μια πρόσκληση στον %(targetDisplayName)s για να συνδεθεί στο δωμάτιο.",
+    "%(senderName)s set their display name to %(displayName)s.": "Ο %(senderName)s όρισε το όνομα του σε %(displayName)s.",
     "The phone number entered looks invalid": "Ο αριθμός που καταχωρίσατε δεν είναι έγκυρος",
     "The email address linked to your account must be entered.": "Πρέπει να εισηχθεί η διεύθυνση ηλ. αλληλογραφίας που είναι συνδεδεμένη με τον λογαριασμό σας.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Το αρχείο '%(fileName)s' υπερβαίνει το όριο μεγέθους του διακομιστή για αποστολές",
@@ -513,6 +546,7 @@
     "This is a preview of this room. Room interactions have been disabled": "Αυτή είναι μια προεπισκόπηση του δωματίου. Οι αλληλεπιδράσεις δωματίου έχουν απενεργοποιηθεί",
     "This room is not accessible by remote Matrix servers": "Αυτό το δωμάτιο δεν είναι προσβάσιμο από απομακρυσμένους διακομιστές Matrix",
     "To reset your password, enter the email address linked to your account": "Για να επαναφέρετε τον κωδικό πρόσβασης σας, πληκτρολογήστε τη διεύθυνση ηλ. αλληλογραφίας όπου είναι συνδεδεμένη με τον λογαριασμό σας",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Ο %(senderName)s ενεργοποίησε την από άκρο σε άκρο κρυπτογράφηση (algorithm %(algorithm)s).",
     "Undecryptable": "Μη αποκρυπτογραφημένο",
     "Uploading %(filename)s and %(count)s others|one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Θα θέλατε να <acceptText>δεχθείτε</acceptText> ή να <declineText>απορρίψετε</declineText> την πρόσκληση;",
@@ -769,6 +803,11 @@
     "You do not have permission to do that in this room.": "Δεν έχετε την άδεια να το κάνετε αυτό σε αυτό το δωμάτιο.",
     "You are now ignoring %(userId)s": "Τώρα αγνοείτε τον/την %(userId)s",
     "You are no longer ignoring %(userId)s": "Δεν αγνοείτε πια τον/την %(userId)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "Ο/Η %(oldDisplayName)s άλλαξε το εμφανιζόμενο όνομά του/της σε %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "Ο/Η %(senderName)s άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.",
+    "%(widgetName)s widget modified by %(senderName)s": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Προστέθηκε το widget %(widgetName)s από τον/την %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
     "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
@@ -810,44 +849,5 @@
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Διαβάστηκε από τον/την %(displayName)s (%(userName)s) στις %(dateTime)s",
     "Room Notification": "Ειδοποίηση Δωματίου",
     "Notify the whole room": "Ειδοποιήστε όλο το δωμάτιο",
-    "Sets the room topic": "Ορίζει το θέμα του δωματίου",
-    "<target> accepted the invitation for %(displayName)s.": "<target> δέχτηκες την πρόσκληση για %(displayName)s.",
-    "<target> accepted an invitation.": "<target> δέχτηκε την πρόσκληση.",
-    "<sender> requested a VoIP conference.": "Ο <sender> αιτήθηκε μια συνδιάσκεψη VoIP.",
-    "<sender> invited <target>.": "Ο <sender> προσκάλεσε τον <target>.",
-    "<sender> banned <target>.": "Ο χρήστης <sender> έδιωξε τον χρήστη <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "Ο/Η <oldDisplayName> άλλαξε το εμφανιζόμενο όνομά του/της σε <displayName>.",
-    "<sender> set their display name to <displayName>.": "Ο <sender> όρισε το όνομα του σε <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "Ο <sender> αφαίρεσε το όνομα εμφάνισης του (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "Ο <sender> αφαίρεσε τη φωτογραφία του προφίλ του.",
-    "<sender> changed their profile picture.": "Ο <sender> άλλαξε τη φωτογραφία του προφίλ του.",
-    "<sender> set a profile picture.": "Ο <sender> όρισε τη φωτογραφία του προφίλ του.",
-    "<target> joined the room.": "ο <target> συνδέθηκε στο δωμάτιο.",
-    "<target> rejected the invitation.": "Ο <target> απέρριψε την πρόσκληση.",
-    "<target> left the room.": "Ο χρήστης <target> έφυγε από το δωμάτιο.",
-    "<sender> unbanned <target>.": "Ο χρήστης <sender> έδιωξε τον χρήστη <target>.",
-    "<sender> kicked <target>.": "Ο <sender> έδιωξε τον χρήστη <target>.",
-    "<sender> withdrew <target>'s invitation.": "Ο <sender> ανακάλεσε την πρόσκληση του <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "Ο <sender> άλλαξε το θέμα σε \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "Ο <sender> άλλαξε το όνομα του δωματίου σε %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "Ο <sender> άλλαξε την προσωπική εικόνα του %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "Ο <sender> άλλαξε την εικόνα του δωματίου σε <img/>",
-    "<sender> removed the room name.": "Ο <sender> διέγραψε το όνομα του δωματίου.",
-    "<sender> removed the room avatar.": "Ο <sender> διέγραψε την προσωπική εικόνα του δωματίου.",
-    "<sender> answered the call.": "Ο χρήστης <sender> απάντησε την κλήση.",
-    "<sender> ended the call.": "<sender> τερμάτισε την κλήση.",
-    "<sender> placed a %(callType)s call.": "Ο <sender> πραγματοποίησε μια %(callType)s κλήση.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "Ο <sender> έστειλε μια πρόσκληση στον %(targetDisplayName)s για να συνδεθεί στο δωμάτιο.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που προσκλήθηκαν.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη, από τη στιγμή που συνδέθηκαν.",
-    "<sender> made future room history visible to all room members.": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο όλα τα μέλη.",
-    "<sender> made future room history visible to anyone.": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο οποιοσδήποτε.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "Ο <sender> έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο άγνωστο (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "Ο <sender> ενεργοποίησε την από άκρο σε άκρο κρυπτογράφηση (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> από %(fromPowerLevel)s σε %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "Ο <sender> άλλαξε το επίπεδο δύναμης του %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "Ο/Η <sender> άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.",
-    "%(widgetName)s widget modified by <sender>": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την <sender>",
-    "%(widgetName)s widget added by <sender>": "Προστέθηκε το widget %(widgetName)s από τον/την <sender>",
-    "%(widgetName)s widget removed by <sender>": "Το widget %(widgetName)s αφαιρέθηκε από τον/την <sender>"
+    "Sets the room topic": "Ορίζει το θέμα του δωματίου"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d02ab8ff29..d697fbc7bd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -153,14 +153,50 @@
     "Displays action": "Displays action",
     "Unrecognised command:": "Unrecognised command:",
     "Reason": "Reason",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
+    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
     "VoIP conference started.": "VoIP conference started.",
+    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
     "VoIP conference finished.": "VoIP conference finished.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
+    "%(targetName)s left the room.": "%(targetName)s left the room.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
     "Someone": "Someone",
     "(not supported by this browser)": "(not supported by this browser)",
+    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
     "(could not connect media)": "(could not connect media)",
     "(no answer)": "(no answer)",
     "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s placed a %(callType)s call.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s made future room history visible to all room members, from the point they joined.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s is typing",
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
@@ -580,6 +616,9 @@
     "Invalid file%(extra)s": "Invalid file%(extra)s",
     "Error decrypting image": "Error decrypting image",
     "Error decrypting video": "Error decrypting video",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
     "Copied!": "Copied!",
     "Failed to copy": "Failed to copy",
     "Add an Integration": "Add an Integration",
@@ -1193,44 +1232,5 @@
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-    "<target> accepted the invitation for %(displayName)s.": "<target> accepted the invitation for %(displayName)s.",
-    "<target> accepted an invitation.": "<target> accepted an invitation.",
-    "<sender> requested a VoIP conference.": "<sender> requested a VoIP conference.",
-    "<sender> invited <target>.": "<sender> invited <target>.",
-    "<sender> banned <target>.": "<sender> banned <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> changed their display name to <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> set their display name to <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> removed their display name (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> removed their profile picture.",
-    "<sender> changed their profile picture.": "<sender> changed their profile picture.",
-    "<sender> set a profile picture.": "<sender> set a profile picture.",
-    "<target> joined the room.": "<target> joined the room.",
-    "<target> rejected the invitation.": "<target> rejected the invitation.",
-    "<target> left the room.": "<target> left the room.",
-    "<sender> unbanned <target>.": "<sender> unbanned <target>.",
-    "<sender> kicked <target>.": "<sender> kicked <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> withdrew <target>'s invitation.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> changed the topic to \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> changed the room name to %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> changed the avatar for %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> changed the room avatar to <img/>",
-    "<sender> removed the room name.": "<sender> removed the room name.",
-    "<sender> removed the room avatar.": "<sender> removed the room avatar.",
-    "<sender> answered the call.": "<sender> answered the call.",
-    "<sender> ended the call.": "<sender> ended the call.",
-    "<sender> placed a %(callType)s call.": "<sender> placed a %(callType)s call.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sent an invitation to %(targetDisplayName)s to join the room.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> made future room history visible to all room members, from the point they are invited.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> made future room history visible to all room members, from the point they joined.",
-    "<sender> made future room history visible to all room members.": "<sender> made future room history visible to all room members.",
-    "<sender> made future room history visible to anyone.": "<sender> made future room history visible to anyone.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> made future room history visible to unknown (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> from %(fromPowerLevel)s to %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> changed the power level of %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> changed the pinned messages for the room.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s widget modified by <sender>",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget added by <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget removed by <sender>"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index e1b91cfa81..6f0708f0c2 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -3,6 +3,8 @@
     "AM": "AM",
     "PM": "PM",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
+    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
     "Account": "Account",
     "Access Token:": "Access Token:",
     "Add a topic": "Add a topic",
@@ -28,6 +30,7 @@
     "and %(count)s others...|one": "and one other...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
     "A new password must be entered.": "A new password must be entered.",
+    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
     "An error has occurred.": "An error has occurred.",
     "Anyone": "Anyone",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -38,6 +41,7 @@
     "Are you sure you want to upload the following files?": "Are you sure you want to upload the following files?",
     "Attachment": "Attachment",
     "Autoplay GIFs and videos": "Autoplay GIFs and videos",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
     "Ban": "Ban",
     "Banned users": "Banned users",
     "Bans user with given id": "Bans user with given id",
@@ -47,6 +51,11 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Can't load user settings": "Can't load user settings",
     "Change Password": "Change Password",
+    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
     "Changes your display nickname": "Changes your display nickname",
     "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.": "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.",
@@ -108,6 +117,7 @@
     "Enable encryption": "Enable encryption",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
     "Encrypted room": "Encrypted room",
+    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
     "End-to-end encryption information": "End-to-end encryption information",
     "End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
     "Enter Code": "Enter Code",
@@ -147,6 +157,7 @@
     "Forgot your password?": "Forgot your password?",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
     "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.": "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.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Hangup": "Hangup",
@@ -165,6 +176,7 @@
     "Invalid address format": "Invalid address format",
     "Invalid Email Address": "Invalid Email Address",
     "Invalid file%(extra)s": "Invalid file%(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
     "Invite new room members": "Invite new room members",
     "Invited": "Invited",
     "Invites": "Invites",
@@ -174,8 +186,10 @@
     "%(displayName)s is typing": "%(displayName)s is typing",
     "Sign in with": "Sign in with",
     "Join Room": "Join Room",
+    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
     "Joins room with given alias": "Joins room with given alias",
     "Jump to first unread message.": "Jump to first unread message.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
     "Kick": "Kick",
     "Kicks user with given id": "Kicks user with given id",
     "Labs": "Labs",
@@ -190,11 +204,17 @@
     "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
     "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
     "Leave room": "Leave room",
+    "%(targetName)s left the room.": "%(targetName)s left the room.",
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "Local addresses for this room:": "Local addresses for this room:",
     "Logged in as:": "Logged in as:",
     "Logout": "Logout",
     "Low priority": "Low priority",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s made future room history visible to all room members, from the point they joined.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
     "Manage Integrations": "Manage Integrations",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
@@ -236,6 +256,7 @@
     "People": "People",
     "Permissions": "Permissions",
     "Phone": "Phone",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s placed a %(callType)s call.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
     "Power level must be positive integer.": "Power level must be positive integer.",
     "Privacy warning": "Privacy warning",
@@ -246,11 +267,15 @@
     "Revoke widget access": "Revoke widget access",
     "Refer a friend to Riot:": "Refer a friend to Riot:",
     "Register": "Register",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
     "Reject invitation": "Reject invitation",
     "Remote addresses for this room:": "Remote addresses for this room:",
     "Remove Contact Information?": "Remove Contact Information?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
     "Remove": "Remove",
     "Remove %(threePid)s?": "Remove %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
     "Resetting 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.": "Resetting 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.",
     "Results from DuckDuckGo": "Results from DuckDuckGo",
     "Return to login screen": "Return to login screen",
@@ -271,6 +296,7 @@
     "Send Invites": "Send Invites",
     "Send Reset Email": "Send Reset Email",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
     "Server error": "Server error",
     "Server may be unavailable or overloaded": "Server may be unavailable or overloaded",
     "Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
@@ -278,6 +304,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
     "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
     "Session ID": "Session ID",
+    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
     "Settings": "Settings",
     "Show panel": "Show panel",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
@@ -316,10 +344,12 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Turn Markdown off": "Turn Markdown off",
     "Turn Markdown on": "Turn Markdown on",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
     "Unable to add email address": "Unable to add email address",
     "Unable to remove contact information": "Unable to remove contact information",
     "Unable to verify email address.": "Unable to verify email address.",
     "Unban": "Unban",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
     "Unable to capture screen": "Unable to capture screen",
     "Unable to enable Notifications": "Unable to enable Notifications",
     "Unable to load device list": "Unable to load device list",
@@ -363,6 +393,7 @@
     "Who can read history?": "Who can read history?",
     "Who would you like to add to this room?": "Who would you like to add to this room?",
     "Who would you like to communicate with?": "Who would you like to communicate with?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
     "You are already in a call.": "You are already in a call.",
     "You are trying to access %(roomName)s.": "You are trying to access %(roomName)s.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
@@ -530,6 +561,9 @@
     "Online": "Online",
     "Idle": "Idle",
     "Offline": "Offline",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "Active call (%(roomName)s)": "Active call (%(roomName)s)",
     "Accept": "Accept",
     "Add": "Add",
@@ -656,8 +690,11 @@
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Failed to upload image": "Failed to upload image",
     "Hide avatars in user and room mentions": "Hide avatars in user and room mentions",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
     "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
     "Fetching third party location failed": "Fetching third party location failed",
     "A new version of Riot is available.": "A new version of Riot is available.",
     "Couldn't load home page": "Couldn't load home page",
@@ -791,42 +828,5 @@
     "Collapse panel": "Collapse panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
     "Checking for an update...": "Checking for an update...",
-    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
-    "<target> accepted the invitation for %(displayName)s.": "<target> accepted the invitation for %(displayName)s.",
-    "<target> accepted an invitation.": "<target> accepted an invitation.",
-    "<sender> requested a VoIP conference.": "<sender> requested a VoIP conference.",
-    "<sender> invited <target>.": "<sender> invited <target>.",
-    "<sender> banned <target>.": "<sender> banned <target>.",
-    "<sender> set their display name to <displayName>.": "<sender> set their display name to <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> removed their display name (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> removed their profile picture.",
-    "<sender> changed their profile picture.": "<sender> changed their profile picture.",
-    "<sender> set a profile picture.": "<sender> set a profile picture.",
-    "<target> joined the room.": "<target> joined the room.",
-    "<target> rejected the invitation.": "<target> rejected the invitation.",
-    "<target> left the room.": "<target> left the room.",
-    "<sender> unbanned <target>.": "<sender> unbanned <target>.",
-    "<sender> kicked <target>.": "<sender> kicked <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> withdrew <target>'s invitation.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> changed the topic to \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> changed the room name to %(roomName)s.",
-    "<sender> changed the room avatar to <img/>": "<sender> changed the room avatar to <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> changed the avatar for %(roomName)s",
-    "<sender> removed the room name.": "<sender> removed the room name.",
-    "<sender> removed the room avatar.": "<sender> removed the room avatar.",
-    "<sender> answered the call.": "<sender> answered the call.",
-    "<sender> ended the call.": "<sender> ended the call.",
-    "<sender> placed a %(callType)s call.": "<sender> placed a %(callType)s call.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sent an invitation to %(targetDisplayName)s to join the room.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> made future room history visible to all room members, from the point they are invited.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> made future room history visible to all room members, from the point they joined.",
-    "<sender> made future room history visible to all room members.": "<sender> made future room history visible to all room members.",
-    "<sender> made future room history visible to anyone.": "<sender> made future room history visible to anyone.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> made future room history visible to unknown (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> from %(fromPowerLevel)s to %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> changed the power level of %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> changed the pinned messages for the room.",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget added by <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget removed by <sender>"
+    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here"
 }
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 9e606ea90a..abcbcd636a 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -108,14 +108,49 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La donita subskriba ŝlosilo kongruas kun la ŝlosilo ricevita de %(userId)s por ĝia aparato %(deviceId)s. Aparato markita kiel kontrolita.",
     "Unrecognised command:": "Nerekonita komando:",
     "Reason": "Kialo",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akceptis la inviton por %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s akceptis inviton.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s petis rettelefonan vokon.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s invitis uzanton %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s forbaris uzanton %(targetName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s agordis sian vidigan nomon al %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s forigis sian vidigan nomon (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s forigis sian profilbildon.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ŝanĝis sian profilbildon.",
+    "%(senderName)s set a profile picture.": "%(senderName)s agordis profilbildon.",
     "VoIP conference started.": "Rettelefona voko komenciĝis.",
+    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambron.",
     "VoIP conference finished.": "Rettelefona voko finiĝis.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rifuzis la inviton.",
+    "%(targetName)s left the room.": "%(targetName)s forlasis la ĉambron.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s malbaris uzanton %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s forpelis uzanton %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s nuligis inviton por %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ŝanĝis la temon al «%(topic)s».",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s forigis nomon de la ĉambro.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro al %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendis bildon.",
     "Someone": "Iu",
     "(not supported by this browser)": "(nesubtenata de tiu ĉi foliumilo)",
+    "%(senderName)s answered the call.": "%(senderName)s akceptis la vokon.",
     "(could not connect media)": "(aŭdvidaĵoj ne kunigeblis)",
     "(no answer)": "(sen respondo)",
     "(unknown failure: %(reason)s)": "(nekonata eraro: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s finis la vokon.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s faris vokon de speco: %(callType)s.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendis ĉambran inviton al %(targetDisplayName)s.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de invito.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de aliĝo.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s videbligis estontan historion de la ĉambro al nekonatoj (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ŝaltis ĝiscelan ĉifradon (algoritmo: %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s al %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
+    "%(widgetName)s widget modified by %(senderName)s": "Fenestraĵon %(widgetName)s ŝanĝis %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Fenestraĵon %(widgetName)s aldonis %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Fenestraĵon %(widgetName)s forigis %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s tajpas",
     "%(names)s and %(count)s others are typing|other": "%(names)s kaj %(count)s aliaj tajpas",
     "%(names)s and %(count)s others are typing|one": "%(names)s kaj unu alia tajpas",
@@ -241,6 +276,7 @@
     "Unignore": "Reatenti",
     "Ignore": "Malatenti",
     "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.": "Ŝanĝo de pasvorto nuntempe nuligos ĉiujn ĝiscele ĉifrajn ŝlosilojn sur ĉiuj viaj aparatoj. Tio faros ĉifritajn babilajn historiojn nelegeblaj, krom se vi unue elportos viajn ĉambrajn ŝlosilojn kaj reenportos ilin poste. Estontece ĉi tio pliboniĝos.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ŝanĝis la profilbildon de %(roomName)s",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vi estas direktota al ekstera retejo por aŭtentigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?",
     "Jump to read receipt": "Salti al legokonfirmo",
     "Mention": "Mencio",
@@ -436,6 +472,8 @@
     "Invalid file%(extra)s": "Malvalida dosiero%(extra)s",
     "Error decrypting image": "Eraro malĉifrante bildon",
     "Error decrypting video": "Eraro malĉifrante videon",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s forigis la ĉambran profilbildon.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s agordis la ĉambran profilbildon al <img/>",
     "Copied!": "Kopiita!",
     "Failed to copy": "Malsukcesis kopii",
     "Add an Integration": "Aldoni integron",
@@ -887,6 +925,7 @@
     "Whether or not you're logged in (we don't record your user name)": "Ĉu vi salutis aŭ ne (ni ne registras vian salutnomon)",
     "Your language of choice": "Via preferata lingvo",
     "The information being sent to us to help make Riot.im better includes:": "Informoj sendataj al ni por plibonigi la servon Riot.im inkluzivas:",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ŝanĝis sian vidigan nomon al %(displayName)s.",
     "Send an encrypted reply…": "Sendi ĉifritan respondon…",
     "Send a reply (unencrypted)…": "Sendi respondon (neĉifritan)…",
     "Send an encrypted message…": "Sendi ĉifritan mesaĝon…",
@@ -1057,44 +1096,5 @@
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Sencimigaj protokoloj enhavas informojn pri uzo de aplikaĵo, inkluzive vian salutnomon, la identigilojn aŭ nomojn de la ĉambroj aŭ grupoj kiujn vi vizitis, kaj la salutnomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
     "Failed to send logs: ": "Malsukcesis sendi protokolon: ",
     "Notes:": "Rimarkoj:",
-    "Preparing to send logs": "Pretiganta sendon de protokolo",
-    "<target> accepted the invitation for %(displayName)s.": "<target> akceptis la inviton por %(displayName)s.",
-    "<target> accepted an invitation.": "<target> akceptis inviton.",
-    "<sender> requested a VoIP conference.": "<sender> petis rettelefonan vokon.",
-    "<sender> invited <target>.": "<sender> invitis uzanton <target>.",
-    "<sender> banned <target>.": "<sender> forbaris uzanton <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> ŝanĝis sian vidigan nomon al <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> agordis sian vidigan nomon al <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> forigis sian vidigan nomon (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> forigis sian profilbildon.",
-    "<sender> changed their profile picture.": "<sender> ŝanĝis sian profilbildon.",
-    "<sender> set a profile picture.": "<sender> agordis profilbildon.",
-    "<target> joined the room.": "<target> venis en la ĉambron.",
-    "<target> rejected the invitation.": "<target> rifuzis la inviton.",
-    "<target> left the room.": "<target> forlasis la ĉambron.",
-    "<sender> unbanned <target>.": "<sender> malbaris uzanton <target>.",
-    "<sender> kicked <target>.": "<sender> forpelis uzanton <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> nuligis inviton por <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> ŝanĝis la temon al «%(topic)s».",
-    "<sender> changed the room name to %(roomName)s.": "<sender> ŝanĝis nomon de la ĉambro al %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> ŝanĝis la profilbildon de %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> agordis la ĉambran profilbildon al <img/>",
-    "<sender> removed the room name.": "<sender> forigis nomon de la ĉambro.",
-    "<sender> removed the room avatar.": "<sender> forigis la ĉambran profilbildon.",
-    "<sender> answered the call.": "<sender> akceptis la vokon.",
-    "<sender> ended the call.": "<sender> finis la vokon.",
-    "<sender> placed a %(callType)s call.": "<sender> faris vokon de speco: %(callType)s.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sendis ĉambran inviton al %(targetDisplayName)s.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de invito.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de aliĝo.",
-    "<sender> made future room history visible to all room members.": "<sender> videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj.",
-    "<sender> made future room history visible to anyone.": "<sender> videbligis estontan historion de la ĉambro al ĉiuj.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> videbligis estontan historion de la ĉambro al nekonatoj (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ŝaltis ĝiscelan ĉifradon (algoritmo: %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s al %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
-    "%(widgetName)s widget modified by <sender>": "Fenestraĵon %(widgetName)s ŝanĝis <sender>",
-    "%(widgetName)s widget added by <sender>": "Fenestraĵon %(widgetName)s aldonis <sender>",
-    "%(widgetName)s widget removed by <sender>": "Fenestraĵon %(widgetName)s forigis <sender>"
+    "Preparing to send logs": "Pretiganta sendon de protokolo"
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 8b010d70b3..5434c570f7 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1,5 +1,7 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un mensaje de texto ha sido enviado a +%(msisdn)s. Por favor ingrese el código de verificación que lo contiene",
+    "%(targetName)s accepted an invitation.": "%(targetName)s ha aceptado una invitación.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha aceptado la invitación para %(displayName)s.",
     "Account": "Cuenta",
     "Access Token:": "Token de Acceso:",
     "Add email address": "Agregar correo eléctronico",
@@ -14,6 +16,7 @@
     "and %(count)s others...|one": "y otro...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s y %(lastPerson)s están escribiendo",
     "A new password must be entered.": "Una nueva clave debe ser ingresada.",
+    "%(senderName)s answered the call.": "%(senderName)s atendió la llamada.",
     "An error has occurred.": "Un error ha ocurrido.",
     "Anyone who knows the room's link, apart from guests": "Cualquiera que sepa el enlace de la sala, salvo invitados",
     "Anyone who knows the room's link, including guests": "Cualquiera que sepa del enlace de la sala, incluyendo los invitados",
@@ -21,6 +24,7 @@
     "Are you sure you want to reject the invitation?": "¿Estás seguro que quieres rechazar la invitación?",
     "Attachment": "Adjunto",
     "Autoplay GIFs and videos": "Reproducir automáticamente GIFs y videos",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha bloqueado a %(targetName)s.",
     "Ban": "Bloquear",
     "Banned users": "Usuarios bloqueados",
     "Bans user with given id": "Bloquear usuario por ID",
@@ -30,6 +34,10 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "No se puede conectar al servidor via HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o <a>habilitando los scripts inseguros</a>.",
     "Can't load user settings": "No se puede cargar las configuraciones del usuario",
     "Change Password": "Cambiar clave",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ha cambiado su foto de perfil.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha cambiado el nivel de acceso de %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha cambiado el nombre de la sala a %(roomName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha cambiado el tema de la sala a \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Cambios para quien pueda leer el historial solo serán aplicados a futuros mensajes en la sala",
     "Changes your display nickname": "Cambia la visualización de tu apodo",
     "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.": "El cambio de contraseña restablecerá actualmente todas las claves de cifrado de extremo a extremo de todos los dispositivos, haciendo que el historial de chat cifrado sea ilegible, a menos que primero exporte las claves de la habitación y vuelva a importarlas después. En el futuro esto será mejorado.",
@@ -83,6 +91,7 @@
     "Enable encryption": "Habilitar encriptación",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Los mensajes encriptados no serán visibles en navegadores que no han implementado aun la encriptación",
     "Encrypted room": "Sala encriptada",
+    "%(senderName)s ended the call.": "%(senderName)s terminó la llamada.",
     "End-to-end encryption information": "Información de encriptación de extremo a extremo",
     "End-to-end encryption is in beta and may not be reliable": "El cifrado de extremo a extremo está en pruebas, podría no ser fiable",
     "Enter Code": "Ingresar Código",
@@ -121,6 +130,7 @@
     "Forgot your password?": "¿Olvidaste tu clave?",
     "For security, this session has been signed out. Please sign in again.": "Por seguridad, esta sesión ha sido cerrada. Por favor inicia sesión nuevamente.",
     "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.": "Por seguridad, al cerrar la sesión borrará cualquier clave de encriptación de extremo a extremo en este navegador. Si quieres ser capaz de descifrar tu historial de conversación, para las futuras sesiones en Riot, por favor exporta las claves de la sala para protegerlas.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Invitados no pueden unirse a esta sala aun cuando han sido invitados explícitamente.",
     "Hangup": "Colgar",
     "Hide read receipts": "Ocultar mensajes leídos",
@@ -136,6 +146,7 @@
     "Invalid address format": "Formato de dirección inválida",
     "Invalid Email Address": "Dirección de correo electrónico inválida",
     "Invalid file%(extra)s": "Archivo inválido %(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha invitado a %(targetName)s.",
     "Invite new room members": "Invitar nuevos miembros a la sala",
     "Invites": "Invitar",
     "Invites user with given id to current room": "Invitar a usuario con ID dado a esta sala",
@@ -144,11 +155,14 @@
     "%(displayName)s is typing": "%(displayName)s está escribiendo",
     "Sign in with": "Quiero iniciar sesión con",
     "Join Room": "Unirte a la sala",
+    "%(targetName)s joined the room.": "%(targetName)s se ha unido a la sala.",
     "Joins room with given alias": "Unirse a la sala con el alias dado",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha expulsado a %(targetName)s.",
     "Kick": "Expulsar",
     "Kicks user with given id": "Expulsar usuario con ID dado",
     "Labs": "Laboratorios",
     "Leave room": "Dejar sala",
+    "%(targetName)s left the room.": "%(targetName)s ha dejado la sala.",
     "Local addresses for this room:": "Direcciones locales para esta sala:",
     "Logged in as:": "Sesión iniciada como:",
     "Logout": "Cerrar Sesión",
@@ -198,6 +212,11 @@
     "Jump to first unread message.": "Ir al primer mensaje sin leer.",
     "Last seen": "Visto por última vez",
     "Level:": "Nivel:",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que son invitados.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que se han unido.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha configurado el historial de la sala visible para nadie.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha configurado el historial de la sala visible para desconocido (%(visibility)s).",
     "Something went wrong!": "¡Algo ha fallado!",
     "Please select the destination room for this message": "Por favor, seleccione la sala destino para este mensaje",
     "Create new room": "Crear nueva sala",
@@ -244,12 +263,15 @@
     "Send Invites": "Enviar invitaciones",
     "Send Reset Email": "Enviar e-mail de reinicio",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s envió una imagen.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.",
     "Server error": "Error del servidor",
     "Server may be unavailable, overloaded, or search timed out :(": "El servidor podría estar saturado o desconectado, o la búsqueda caducó :(",
     "Server may be unavailable, overloaded, or the file too big": "El servidor podría estar saturado o desconectado, o el fichero ser demasiado grande",
     "Server may be unavailable, overloaded, or you hit a bug.": "El servidor podría estar saturado o desconectado, o encontraste un fallo.",
     "Server unavailable, overloaded, or something else went wrong.": "Servidor saturado, desconectado, o alguien ha roto algo.",
     "Session ID": "ID de sesión",
+    "%(senderName)s set a profile picture.": "%(senderName)s puso una foto de perfil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s cambió su nombre a %(displayName)s.",
     "Settings": "Configuración",
     "Show panel": "Mostrar panel",
     "Show Text Formatting Toolbar": "Mostrar la barra de formato de texto",
@@ -275,6 +297,7 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "¿Está seguro de que desea abandonar la sala '%(roomName)s'?",
     "Are you sure you want to upload the following files?": "¿Está seguro que desea enviar los siguientes archivos?",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "No se puede conectar al servidor - compruebe su conexión, asegúrese de que el <a>certificado SSL del servidor</a> es de confiaza, y compruebe que no hay extensiones del navegador bloqueando las peticiones.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha quitado el nombre de la sala.",
     "Device key:": "Clave del dispositivo:",
     "Drop File Here": "Deje el fichero aquí",
     "Guest access is disabled on this Home Server.": "El acceso de invitados está desactivado en este servidor.",
@@ -321,6 +344,7 @@
     "People": "Gente",
     "Permissions": "Permisos",
     "Phone": "Teléfono",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha hecho una llamada de tipo %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor, compruebe su e-mail y pulse el enlace que contiene. Una vez esté hecho, pulse continuar.",
     "Power level must be positive integer.": "El nivel debe ser un entero positivo.",
     "Privacy warning": "Alerta de privacidad",
@@ -333,12 +357,16 @@
     "Revoke Moderator": "Eliminar Moderador",
     "Refer a friend to Riot:": "Informar a un amigo sobre Riot:",
     "Register": "Registro",
+    "%(targetName)s rejected the invitation.": "%(targetName)s ha rechazado la invitación.",
     "Reject invitation": "Rechazar invitación",
     "Rejoin": "Volver a unirse",
     "Remote addresses for this room:": "Dirección remota de esta sala:",
     "Remove Contact Information?": "¿Eliminar información del contacto?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha suprimido su nombre para mostar (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s ha eliminado su foto de perfil.",
     "Remove": "Eliminar",
     "Remove %(threePid)s?": "¿Eliminar %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha solicitado una conferencia Voz-IP.",
     "Resetting 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.": "Reiniciar la contraseña también reiniciará las claves de cifrado extremo-a-extremo, haciendo ilegible el historial de las conversaciones, salvo que exporte previamente las claves de sala, y las importe posteriormente. Esto será mejorado en futuras versiones.",
     "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
     "Return to login screen": "Volver a la pantalla de inicio de sesión",
@@ -399,6 +427,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no se ha podido encontrarlo.",
     "Turn Markdown off": "Desactivar markdown",
     "Turn Markdown on": "Activar markdown",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activado el cifrado de extremo-a-extremo (algorithm %(algorithm)s).",
     "Unable to add email address": "No se ha podido añadir la dirección de correo electrónico",
     "Unable to create widget.": "No se ha podido crear el widget.",
     "Unable to remove contact information": "No se ha podido eliminar la información de contacto",
@@ -454,6 +483,7 @@
     "Who can read history?": "¿Quién puede leer el historial?",
     "Who would you like to add to this room?": "¿A quién quiere añadir a esta sala?",
     "Who would you like to communicate with?": "¿Con quién quiere comunicar?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirado la invitación de %(targetName)s.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "¿Quiere <acceptText>aceptar</acceptText> o <declineText>rechazar</declineText> esta invitación?",
     "You already have existing direct chats with this user:": "Ya tiene chats directos con este usuario:",
     "You are already in a call.": "Ya está participando en una llamada.",
@@ -472,6 +502,7 @@
     "Revoke widget access": "Revocar acceso del widget",
     "The maximum permitted number of widgets have already been added to this room.": "La cantidad máxima de widgets permitida ha sido alcanzada en esta sala.",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar, solo espere a que carguen los resultados de auto-completar y navegue entre ellos.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s levanto la suspensión de %(targetName)s.",
     "unencrypted": "no cifrado",
     "Unmute": "desactivar el silencio",
     "Unrecognised command:": "comando no reconocido:",
@@ -705,36 +736,5 @@
     "Collapse panel": "Colapsar panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
     "Checking for an update...": "Comprobando actualizaciones...",
-    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí",
-    "<target> accepted the invitation for %(displayName)s.": "<target> ha aceptado la invitación para %(displayName)s.",
-    "<target> accepted an invitation.": "<target> ha aceptado una invitación.",
-    "<sender> requested a VoIP conference.": "<sender> ha solicitado una conferencia Voz-IP.",
-    "<sender> invited <target>.": "<sender> ha invitado a <target>.",
-    "<sender> banned <target>.": "<sender> ha bloqueado a <target>.",
-    "<sender> set their display name to <displayName>.": "<sender> cambió su nombre a <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> ha suprimido su nombre para mostar (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> ha eliminado su foto de perfil.",
-    "<sender> changed their profile picture.": "<sender> ha cambiado su foto de perfil.",
-    "<sender> set a profile picture.": "<sender> puso una foto de perfil.",
-    "<target> joined the room.": "<target> se ha unido a la sala.",
-    "<target> rejected the invitation.": "<target> ha rechazado la invitación.",
-    "<target> left the room.": "<target> ha dejado la sala.",
-    "<sender> unbanned <target>.": "<sender> levanto la suspensión de <target>.",
-    "<sender> kicked <target>.": "<sender> ha expulsado a <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> ha retirado la invitación de <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> ha cambiado el tema de la sala a \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> ha cambiado el nombre de la sala a %(roomName)s.",
-    "<sender> removed the room name.": "<sender> ha quitado el nombre de la sala.",
-    "<sender> answered the call.": "<sender> atendió la llamada.",
-    "<sender> ended the call.": "<sender> terminó la llamada.",
-    "<sender> placed a %(callType)s call.": "<sender> ha hecho una llamada de tipo %(callType)s.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> invitó a %(targetDisplayName)s a unirse a la sala.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que son invitados.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> ha configurado el historial de la sala visible para Todos los miembros de la sala, desde el momento en que se han unido.",
-    "<sender> made future room history visible to all room members.": "<sender> ha configurado el historial de la sala visible para Todos los miembros de la sala.",
-    "<sender> made future room history visible to anyone.": "<sender> ha configurado el historial de la sala visible para nadie.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> ha configurado el historial de la sala visible para desconocido (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ha activado el cifrado de extremo-a-extremo (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s a %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ha cambiado el nivel de acceso de %(powerLevelDiffText)s."
+    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí"
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index d48798c222..1abaec65c7 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1,6 +1,7 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Mezu bat bidali da +%(msisdn)s zenbakira. Sartu hemen mezuko egiaztaketa kodea",
     "Accept": "Onartu",
+    "%(targetName)s accepted an invitation.": "%(targetName)s erabiltzaileak gonbidapena onartu du.",
     "Close": "Itxi",
     "Create new room": "Sortu gela berria",
     "Continue": "Jarraitu",
@@ -165,6 +166,7 @@
     "Are you sure you want to upload the following files?": "Ziur hurrengo fitxategiak igo nahi dituzula?",
     "Attachment": "Eranskina",
     "Autoplay GIFs and videos": "Automatikoki erreproduzitu GIFak eta bideoa",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s debekatu du.",
     "Bans user with given id": "Debekatu ID zehatz bat duen erabiltzailea",
     "Call Timeout": "Deiaren denbora-muga",
     "Change Password": "Aldatu pasahitza",
@@ -208,7 +210,10 @@
     "Displays action": "Ekintza bistaratzen du",
     "Drop File Here": "Jaregin fitxategia hona",
     "%(items)s and %(lastItem)s": "%(items)s eta %(lastItem)s",
+    "%(senderName)s answered the call.": "%(senderName)s erabiltzaileak deia erantzun du.",
     "Can't load user settings": "Ezin izan dira erabiltzailearen ezarpenak kargatu",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s erabiltzaileak gelaren izena kendu du.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s erabiltzaileak mintzagaia aldatu du beste honetara: \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Historiala irakurtzeko baimenen aldaketak gela honetara hemendik aurrera heldutako mezuei aplikatuko zaizkie",
     "Clear Cache and Reload": "Garbitu cachea eta birkargatu",
     "Devices will not yet be able to decrypt history from before they joined the room": "Gailuek ezin izango dute taldera elkartu aurretiko historiala deszifratu",
@@ -224,6 +229,7 @@
     "Encrypted room": "Zifratutako gela",
     "Encryption is enabled in this room": "Zifratzea gaitu da gela honetan",
     "Encryption is not enabled in this room": "Ez da zifratzea gaitu gela honetan",
+    "%(senderName)s ended the call.": "%(senderName)s erabiltzaileak deia amaitu du.",
     "End-to-end encryption is in beta and may not be reliable": "Muturretik muturrerako zifratzea beta egoeran dago eta agian ez dabil guztiz ondo",
     "Enter Code": "Sartu kodea",
     "Error decrypting attachment": "Errorea eranskina deszifratzean",
@@ -253,13 +259,18 @@
     "Fill screen": "Bete pantaila",
     "Forget room": "Ahaztu gela",
     "Forgot your password?": "Pasahitza ahaztu duzu?",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s %(fromPowerLevel)s mailatik %(toPowerLevel)s mailara",
     "Guest access is disabled on this Home Server.": "Bisitarien sarbidea desgaituta dago hasiera zerbitzari honetan.",
     "Hide Text Formatting Toolbar": "Ezkutatu testu-formatuaren tresna-barra",
     "Incoming call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
     "Incoming video call from %(name)s": "%(name)s erabiltzailearen bideo deia jasotzen",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s erabiltzaileak %(displayName)s erabiltzailearen gonbidapena onartu du.",
     "Bulk Options": "Aukera masiboak",
     "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.": "Ezin da hasiera zerbitzarira konektatu, egiaztatu zure konexioa, ziurtatu zure <a>hasiera zerbitzariaren SSL ziurtagiria</a> fidagarritzat jotzen duela zure gailuak, eta nabigatzailearen pluginen batek ez dituela eskaerak blokeatzen.",
     "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>.": "Ezin zara hasiera zerbitzarira HTTP bidez konektatu zure nabigatzailearen barran dagoen URLa HTTS bada. Erabili HTTPS edo <a>gaitu script ez seguruak</a>.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia aldatu du.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s erabiltzaileak botere mailaz aldatu du %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s erabiltzaileak gelaren izena aldatu du, orain %(roomName)s da.",
     "Drop here to tag %(section)s": "Jaregin hona %(section)s atalari etiketa jartzeko",
     "Incoming voice call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
     "Incorrect username and/or password.": "Erabiltzaile-izen edo pasahitz okerra.",
@@ -267,6 +278,7 @@
     "Invalid address format": "Helbide formatu baliogabea",
     "Invalid Email Address": "E-mail helbide baliogabea",
     "Invalid file%(extra)s": "Fitxategi %(extra)s baliogabea",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s gonbidatu du.",
     "Invite new room members": "Gonbidatu kide berriak gelara",
     "Invited": "Gonbidatuta",
     "Invites user with given id to current room": "Emandako ID-a duen erabiltzailea gonbidatzen du gelara",
@@ -275,12 +287,20 @@
     "%(displayName)s is typing": "%(displayName)s idazten ari da",
     "Sign in with": "Hasi saioa hau erabilita:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Elkartu <voiceText>ahotsa</voiceText> edo <videoText>bideoa</videoText> erabiliz.",
+    "%(targetName)s joined the room.": "%(targetName)s erabiltzailea gelara elkartu da.",
     "Joins room with given alias": "Gelara emandako ezizenarekin elkartu da",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s kanporatu du.",
     "Kick": "Kanporatu",
     "Kicks user with given id": "Kanporatu emandako ID-a duen erabiltzailea",
+    "%(targetName)s left the room.": "%(targetName)s erabiltzailea gelatik atera da.",
     "Level:": "Maila:",
     "Local addresses for this room:": "Gela honen tokiko helbideak:",
     "Logged in as:": "Saioa hasteko erabiltzailea:",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du edonorentzat.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du ezezagunentzat (%(visibility)s).",
     "Manage Integrations": "Kudeatu interakzioak",
     "Markdown is disabled": "Markdown desgaituta dago",
     "Markdown is enabled": "Markdown gaituta dago",
@@ -309,6 +329,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.": "Segurtasunagatik, saioa amaitzeak nabigatzaile honetako muturretik muturrerako zifratze gako guztiak ezabatuko ditu. Zure elkarrizketen historiala deszifratzeko gai izan nahi baduzu etorkizuneko Riot saioetan, esportatu zure gelako gakoen babes-kopia bat.",
     "Passwords can't be empty": "Pasahitzak ezin dira hutsik egon",
     "Permissions": "Baimenak",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s erabiltzaileak %(callType)s dei bat hasi du.",
     "Power level must be positive integer.": "Botere maila osoko zenbaki positibo bat izan behar da.",
     "Press <StartChatButton> to start a chat with someone": "Sakatu <StartChatButton> norbaitekin txat bat hasteko",
     "Privacy warning": "Pribatutasun abisua",
@@ -320,12 +341,16 @@
     "Reason: %(reasonText)s": "Arrazoia: %(reasonText)s",
     "Revoke Moderator": "Kendu moderatzaile baimena",
     "Refer a friend to Riot:": "Aipatu Riot lagun bati:",
+    "%(targetName)s rejected the invitation.": "%(targetName)s erabiltzaileak gonbidapena baztertu du.",
     "Reject invitation": "Baztertu gonbidapena",
     "Reject all %(invitedRooms)s invites": "Baztertu %(invitedRooms)s gelarako gonbidapen guztiak",
     "Rejoin": "Berriro elkartu",
     "Remote addresses for this room:": "Gela honen urruneko helbideak:",
     "Remove Contact Information?": "Kendu kontaktuaren informazioa?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s erabiltzaileak bere pantaila-izena kendu du (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia kendu du.",
     "Remove %(threePid)s?": "Kendu %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s erabiltzaileak VoIP konferentzia bat eskatu du.",
     "Resetting 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.": "Oraingoz pasahitza aldatzeak gailu guztietako muturretik muturrerako zifratze-gakoak berrezarriko ditu, eta ezin izango dituzu zifratutako txatetako historialak irakurri ez badituzu aurretik zure gelako gakoak esportatzen eta aldaketa eta gero berriro inportatzen.",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Une honetan egiaztatu gabeko gailuak blokeatzen ari zara, gailu hauetara mezuak bidali ahal izateko egiaztatu behar dituzu.",
     "Results from DuckDuckGo": "DuckDuckGo bilatzaileko emaitzak",
@@ -345,11 +370,14 @@
     "Send anyway": "Bidali hala ere",
     "Send Invites": "Bidali gonbidapenak",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s erabiltzaileak irudi bat bidali du.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %(targetDisplayName)s erbiltzaileari.",
     "Server error": "Zerbitzari-errorea",
     "Server may be unavailable or overloaded": "Zerbitzaria eskuraezin edo gainezka egon daiteke",
     "Server may be unavailable, overloaded, or search timed out :(": "Zerbitzaria eskuraezin edo gainezka egon daiteke, edo bilaketaren denbora muga gainditu da :(",
     "Server may be unavailable, overloaded, or the file too big": "Zerbitzaria eskuraezin edo gainezka egon daiteke edo fitxategia handiegia da",
     "Server unavailable, overloaded, or something else went wrong.": "Zerbitzaria eskuraezin edo gainezka egon daiteke edo zerbaitek huts egin du.",
+    "%(senderName)s set a profile picture.": "%(senderName)s erabiltzaileak profileko argazkia ezarri du.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s erabiltzaileak %(displayName)s ezarri du pantaila izen gisa.",
     "Show panel": "Erakutsi panela",
     "Show Text Formatting Toolbar": "Erakutsi testu-formatuaren tresna-barra",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Erakutsi denbora-zigiluak 12 ordutako formatuan (adib. 2:30pm)",
@@ -382,9 +410,11 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu da, baina ezin izan da aurkitu.",
     "Turn Markdown off": "Desaktibatu Markdown",
     "Turn Markdown on": "Aktibatu Markdown",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s erabiltzaileak muturretik muturrerako (%(algorithm)s algoritmoa) zifratzea aktibatu du.",
     "Unable to add email address": "Ezin izan da e-mail helbidea gehitu",
     "Unable to remove contact information": "Ezin izan da kontaktuaren informazioa kendu",
     "Unable to verify email address.": "Ezin izan da e-mail helbidea egiaztatu.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s erabiltzaileak debekua kendu dio %(targetName)s erabiltzaileari.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Ezin izan da ziurtatu gonbidapen hau zure kontuarekin lotutako helbide batera bidali zela.",
     "Unable to capture screen": "Ezin izan da pantaila-argazkia atera",
     "Unable to enable Notifications": "Ezin izan dira jakinarazpenak gaitu",
@@ -432,6 +462,7 @@
     "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!": "ABISUA: GAKOEN EGIAZTAKETAK HUTS EGIN DU! %(userId)s erabiltzailearen %(deviceId)s gailuaren sinadura-gakoa \"%(fprint)s\" da, eta ez dator bat emandako \"%(fingerprint)s\" gakoarekin. Honek inor komunikazioa antzematen ari dela esan nahi lezake!",
     "Who would you like to add to this room?": "Nor gehitu nahi duzu gela honetara?",
     "Who would you like to communicate with?": "Norekin komunikatu nahi duzu?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s erabiltzaileak atzera bota du %(targetName)s erabiltzailearen gonbidapena.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Gonbidapen hau <acceptText>onartu</acceptText> ala <declineText>ukatu</declineText> nahi duzu?",
     "You already have existing direct chats with this user:": "Baduzu jada txat zuzen bat erabiltzaile honekin:",
     "You are already in a call.": "Bazaude dei batean.",
@@ -572,6 +603,9 @@
     "Start chatting": "Hasi txateatzen",
     "Start Chatting": "Hasi txateatzen",
     "Click on the button below to start chatting!": "Egin klik beheko botoian txateatzen hasteko!",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s erabiltzaileak gelaren abatarra aldatu du beste honetara: <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s erabiltzaileak gelaren abatarra ezabatu du.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s erabiltzaileak %(roomName)s gelaren abatarra aldatu du",
     "Username available": "Erabiltzaile-izena eskuragarri dago",
     "Username not available": "Erabiltzaile-izena ez dago eskuragarri",
     "Something went wrong!": "Zerk edo zerk huts egin du!",
@@ -627,8 +661,11 @@
     "Automatically replace plain text Emoji": "Automatikoki ordezkatu Emoji testu soila",
     "Failed to upload image": "Irudia igotzeak huts egin du",
     "Hide avatars in user and room mentions": "Ezkutatu abatarrak erabiltzaile eta gelen aipamenetan",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s trepeta gehitu du %(senderName)s erabiltzaileak",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s trepeta kendu du %(senderName)s erabiltzaileak",
     "Verifies a user, device, and pubkey tuple": "Erabiltzaile, gailu eta gako publiko multzoa egiaztatzen du",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot egiaztaketa orain ez dago eskuragarri mahaigainean - erabili <a>web nabigatzailea</a>",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s trepeta aldatu du %(senderName)s erabiltzaileak",
     "Copied!": "Kopiatuta!",
     "Failed to copy": "Kopiak huts egin du",
     "Cancel": "Utzi",
@@ -678,6 +715,7 @@
     "Failed to invite users to %(groupId)s": "Huts egin du erabiltzaileak %(groupId)s komunitatera gonbidatzean",
     "Failed to add the following rooms to %(groupId)s:": "Huts egin du honako gela hauek %(groupId)s komunitatera gehitzean:",
     "Restricted": "Mugatua",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s erabiltzaileak gelan finkatutako mezuak aldatu ditu.",
     "%(names)s and %(count)s others are typing|other": "%(names)s eta beste %(count)s idazten ari dira",
     "%(names)s and %(count)s others are typing|one": "%(names)s eta beste bat idazten ari dira",
     "Send": "Bidali",
@@ -917,6 +955,7 @@
     "Community IDs cannot not be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>bidali hala ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
     "<a>In reply to</a> <pill>": "<a>honi erantzunez:</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s erabiltzaileak bere pantaila izena aldatu du %(displayName)s izatera.",
     "Failed to set direct chat tag": "Huts egin du txat zuzenarenaren etiketa jartzean",
     "Failed to remove tag %(tagName)s from room": "Huts egin du %(tagName)s etiketa gelatik kentzean",
     "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean",
@@ -1156,44 +1195,5 @@
     "COPY": "KOPIATU",
     "Share Message": "Partekatu mezua",
     "No Audio Outputs detected": "Ez da audio irteerarik antzeman",
-    "Audio Output": "Audio irteera",
-    "<target> accepted the invitation for %(displayName)s.": "<target> erabiltzaileak %(displayName)s erabiltzailearen gonbidapena onartu du.",
-    "<target> accepted an invitation.": "<target> erabiltzaileak gonbidapena onartu du.",
-    "<sender> requested a VoIP conference.": "<sender> erabiltzaileak VoIP konferentzia bat eskatu du.",
-    "<sender> invited <target>.": "<sender> erabiltzaileak <target> gonbidatu du.",
-    "<sender> banned <target>.": "<sender> erabiltzaileak <target> debekatu du.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> erabiltzaileak bere pantaila izena aldatu du <displayName> izatera.",
-    "<sender> set their display name to <displayName>.": "<sender> erabiltzaileak <displayName> ezarri du pantaila izen gisa.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> erabiltzaileak bere pantaila-izena kendu du (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> erabiltzaileak bere profileko argazkia kendu du.",
-    "<sender> changed their profile picture.": "<sender> erabiltzaileak bere profileko argazkia aldatu du.",
-    "<sender> set a profile picture.": "<sender> erabiltzaileak profileko argazkia ezarri du.",
-    "<target> joined the room.": "<target> erabiltzailea gelara elkartu da.",
-    "<target> rejected the invitation.": "<target> erabiltzaileak gonbidapena baztertu du.",
-    "<target> left the room.": "<target> erabiltzailea gelatik atera da.",
-    "<sender> unbanned <target>.": "<sender> erabiltzaileak debekua kendu dio <target> erabiltzaileari.",
-    "<sender> kicked <target>.": "<sender> erabiltzaileak <target> kanporatu du.",
-    "<sender> withdrew <target>'s invitation.": "<sender> erabiltzaileak atzera bota du <target> erabiltzailearen gonbidapena.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> erabiltzaileak mintzagaia aldatu du beste honetara: \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> erabiltzaileak gelaren izena aldatu du, orain %(roomName)s da.",
-    "<sender> changed the room avatar to <img/>": "<sender> erabiltzaileak gelaren abatarra aldatu du beste honetara: <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> erabiltzaileak %(roomName)s gelaren abatarra aldatu du",
-    "<sender> removed the room name.": "<sender> erabiltzaileak gelaren izena kendu du.",
-    "<sender> removed the room avatar.": "<sender> erabiltzaileak gelaren abatarra ezabatu du.",
-    "<sender> answered the call.": "<sender> erabiltzaileak deia erantzun du.",
-    "<sender> ended the call.": "<sender> erabiltzaileak deia amaitu du.",
-    "<sender> placed a %(callType)s call.": "<sender> erabiltzaileak %(callType)s dei bat hasi du.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %(targetDisplayName)s erbiltzaileari.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
-    "<sender> made future room history visible to all room members.": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
-    "<sender> made future room history visible to anyone.": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du edonorentzat.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du ezezagunentzat (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> erabiltzaileak muturretik muturrerako (%(algorithm)s algoritmoa) zifratzea aktibatu du.",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> %(fromPowerLevel)s mailatik %(toPowerLevel)s mailara",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> erabiltzaileak botere mailaz aldatu du %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> erabiltzaileak gelan finkatutako mezuak aldatu ditu.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s trepeta aldatu du <sender> erabiltzaileak",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s trepeta gehitu du <sender> erabiltzaileak",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s trepeta kendu du <sender> erabiltzaileak"
+    "Audio Output": "Audio irteera"
 }
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 0c207bb505..d39091b619 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -46,6 +46,7 @@
     "%(items)s and %(lastItem)s": "%(items)s ja %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s ja %(lastPerson)s kirjoittavat",
     "A new password must be entered.": "Sinun täytyy syöttää uusi salasana.",
+    "%(senderName)s answered the call.": "%(senderName)s vastasi puheluun.",
     "An error has occurred.": "Virhe.",
     "Anyone": "Kaikki",
     "Anyone who knows the room's link, apart from guests": "Kaikki jotka tietävät huoneen osoitteen, paitsi vieraat",
@@ -56,10 +57,14 @@
     "Are you sure you want to upload the following files?": "Oletko varma että haluat ladata seuraavat tiedostot?",
     "Attachment": "Liite",
     "Autoplay GIFs and videos": "Toista automaattisesti GIF-animaatiot ja videot",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s antoi porttikiellon käyttäjälle %(targetName)s.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Yhdistäminen kotipalvelimeen epäonnistui. Ole hyvä ja tarkista verkkoyhteytesi ja varmista että <a>kotipalvelimen SSL-sertifikaatti</a> on luotettu, ja että jokin selaimen lisäosa ei estä pyyntöjen lähettämisen.",
     "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>.": "Yhdistäminen kotipalveluun HTTP:n avulla ei ole mahdollista kun selaimen osoitepalkissa on HTTPS URL. Käytä joko HTTPS tai <a>salli turvattomat skriptit</a>.",
     "Can't load user settings": "Käyttäjäasetusten lataaminen epäonnistui",
     "Change Password": "Muuta salasana",
+    "%(senderName)s changed their profile picture.": "%(senderName)s muutti profiilikuvansa.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s hyväksyi kutsun.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hyväksyi kutsun käyttäjän %(displayName)s puolesta.",
     "Account": "Tili",
     "and %(count)s others...|other": "ja %(count)s lisää...",
     "and %(count)s others...|one": "ja yksi lisää...",
@@ -289,9 +294,11 @@
     "Uploading %(filename)s and %(count)s others|zero": "Ladataan %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Ladataan %(filename)s ja %(count)s muuta",
     "Blacklisted": "Estetyt",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s muuti huoneen nimeksi %(roomName)s.",
     "Drop here to tag %(section)s": "Pudota tähän tägätäksesi %(section)s",
     "Enable automatic language detection for syntax highlighting": "Ota automaattinen kielentunnistus käyttöön koodin väritystä varten",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Salatut viestit eivät näy ohjelmissa joissa salaus ei ole vielä implementoitu",
+    "%(senderName)s ended the call.": "%(senderName)s lopetti puhelun.",
     "Guest access is disabled on this Home Server.": "Vierailijat on estetty tällä kotipalvelimella.",
     "Guests cannot join this room even if explicitly invited.": "Vierailijat eivät voi liittyä tähän huoneeseen vaikka heidät on eksplisiittisesti kutsuttu.",
     "Hangup": "Lopeta",
@@ -299,11 +306,15 @@
     "Historical": "Vanhat",
     "Home": "Etusivu",
     "Invalid file%(extra)s": "Virheellinen tiedosto%(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsui käyttäjän %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s kirjoittaa",
     "none": "Ei mikään",
     "No devices with registered encryption keys": "Ei laitteita joilla rekisteröityjä salausavaimia",
     "No users have specific privileges in this room": "Kellään käyttäjällä ei ole erityisiä oikeuksia",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s soitti %(callType)spuhelun.",
     "Remove %(threePid)s?": "Poista %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s pyysi VoIP konferenssia.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s asetti näyttönimekseen %(displayName)s.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Tiedosto ‘%(fileName)s’ ylittää tämän kotipalvelimen maksimitiedostokoon",
     "The file '%(fileName)s' failed to upload": "Tiedoston ‘%(fileName)s’ lataaminen epäonnistui",
     "This Home Server does not support login using email address.": "Kotipalvelin ei tue kirjatumista sähköpostiosoitteen avulla.",
@@ -316,6 +327,7 @@
     "To link to a room it must have <a>an address</a>.": "Linkittääksesi tähän huoneseen sillä on oltava <a>osoite</a>.",
     "Turn Markdown off": "Ota Markdown pois käytöstä",
     "Turn Markdown on": "Ota Markdown käyttöön",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s otti päästä päähän-salauksen käyttöön (algoritmi %(algorithm)s).",
     "Username invalid: %(errMessage)s": "Virheellinen käyttäjänimi: %(errMessage)s",
     "Users": "Käyttäjät",
     "Verification": "Varmennus",
@@ -425,6 +437,7 @@
     "Verify device": "Varmenna laite",
     "I verify that the keys match": "Totean että avaimet vastaavat toisiaan",
     "Unable to restore session": "Istunnon palautus epäonnistui",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s poisti huoneen nimen.",
     "Changes to who can read history will only apply to future messages in this room": "Muutokset koskien ketkä voivat lukea historian koskevat vain uusia viestejä",
     "<a>Click here</a> to join the discussion!": "<a>Paina tästä</a> liittyäksesi keskusteluun",
     "%(count)s new messages|one": "%(count)s uusi viesti",
@@ -438,6 +451,9 @@
     "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen.",
     "Existing Call": "Käynnissä oleva puhelu",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liity käyttäen <voiceText>ääntä</voiceText> tai <videoText>videota</videoText>.",
+    "%(targetName)s joined the room.": "%(targetName)s liittyi huoneeseen.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s poisti käyttäjän %(targetName)s huoneesta.",
+    "%(targetName)s left the room.": "%(targetName)s poistui huoneesta.",
     "Publish this room to the public in %(domain)s's room directory?": "Julkaise tämä huone domainin %(domain)s huoneluettelossa?",
     "Missing room_id in request": "room_id puuttuu kyselystä",
     "Missing user_id in request": "user_id puuttuu kyselystä",
@@ -447,7 +463,9 @@
     "Press <StartChatButton> to start a chat with someone": "Paina <StartChatButton>",
     "Revoke Moderator": "Poista moderaattorioikeudet",
     "Refer a friend to Riot:": "Suosittele Riot ystävälle:",
+    "%(targetName)s rejected the invitation.": "%(targetName)s hylkäsi kutsun.",
     "Remote addresses for this room:": "Tämän huoneen etäosoitteet:",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s poisti näyttönimensä (%(oldDisplayName)s).",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riotilla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset",
     "Riot was not given permission to send notifications - please try again": "Riotilla ei saannut oikeuksia lähettää ilmoituksia. Ole hyvä ja yritä uudelleen",
     "Room %(roomId)s not visible": "Huone %(roomId)s ei ole näkyvissä",
@@ -456,6 +474,7 @@
     "Seen by %(userName)s at %(dateTime)s": "Käyttäjän %(userName)s näkemä %(dateTime)s",
     "Send Reset Email": "Lähetä salasanan palautusviesti",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s lähetti kuvan.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s lähetti kutsun käyttäjälle %(targetDisplayName)s liittyäkseen huoneeseen.",
     "Server may be unavailable or overloaded": "Palvelin saattaa olla saavuttamattomissa tai ylikuormitettu",
     "Show Text Formatting Toolbar": "Näytä tekstinmuotoilupalkki",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Näytä aikaleimat 12h muodossa (esim. 2:30pm)",
@@ -471,6 +490,7 @@
     "Unable to remove contact information": "Yhteystietojen poistaminen epäonnistui",
     "Unable to verify email address.": "Sähköpostin varmentaminen epäonnistui.",
     "Unbans user with given id": "Poistaa porttikiellon annetun ID:n omaavalta käyttäjältä",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s poisti porttikiellon käyttäjältä %(targetName)s.",
     "Unable to capture screen": "Ruudun kaappaus epäonnistui",
     "Unable to enable Notifications": "Ilmoitusten käyttöönotto epäonnistui",
     "Unable to load device list": "Laitelistan lataaminen epäonnistui",
@@ -485,6 +505,7 @@
     "User ID": "Käyttäjätunniste",
     "User Interface": "Käyttöliittymä",
     "User name": "Käyttäjänimi",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s asetti aiheeksi \"%(topic)s\".",
     "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.": "Salasanan muuttaminen uudelleenalustaa myös päästä päähän-salausavaimet kaikilla laitteilla, jolloin vanhojen viestien lukeminen ei ole enään mahdollista, ellet ensin vie huoneavaimet ja tuo ne takaisin jälkeenpäin. Tämä tulee muuttumaan tulevaisuudessa.",
     "Define the power level of a user": "Määritä käyttäjän oikeustaso",
     "Failed to change power level": "Oikeustason muuttaminen epäonnistui",
@@ -510,6 +531,7 @@
     "(could not connect media)": "(mediaa ei voitu yhdistää)",
     "WARNING: Device already verified, but keys do NOT MATCH!": "VAROITUS: Laite on jo varmennettu mutta avaimet eivät vastaa toisiaan!",
     "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!": "VAROITUS: AVAIMEN VARMENNUS EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s allekirjoitusavain on \"%(fprint)s\" joka ei vastaa annettua avainta \"%(fingerprint)s\". Tämä saattaa tarkoittaa että viestintäsi siepataan!",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s veti takaisin käyttäjän %(targetName)s kutsun.",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Et ole vielä missään huoneessa! Paina <CreateRoomButton> luodaksesi huoneen tai <RoomDirectoryButton> selatakseski hakemistoa",
     "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": "Sinut on kirjattu ulos kaikista laitteista etkä enää saa Push-ilmoituksia. Jotta saisit jälleen ilmoituksia pitää sinun jälleen kirjautua sisään jokaisella laitteella",
     "You may wish to login with a different account, or add this email to this account.": "Haluat ehkä kirjautua toiseen tiliin tai lisätä tämä sähköpostiosoite tähän tiliin.",
@@ -608,6 +630,14 @@
     "Restricted": "Rajoitettu",
     "You are now ignoring %(userId)s": "Et enää huomioi käyttäjää %(userId)s",
     "You are no longer ignoring %(userId)s": "Huomioit jälleen käyttäjän %(userId)s",
+    "%(senderName)s removed their profile picture.": "%(senderName)s poisti profiilikuvansa.",
+    "%(senderName)s set a profile picture.": "%(senderName)s asetti profiilikuvan.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s muutti tulevat viestit näkyviksi kaikille huoneen jäsenille, alkaen kutsusta huoneeseen.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, liittymisestä asti.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s teki tulevan huonehistorian näkyväksi tuntemattomalle (%(visibility)s).",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s muutti tämän huoneen kiinnitetyt viestit.",
     "%(names)s and %(count)s others are typing|other": "%(names)s ja %(count)s muuta kirjoittavat",
     "%(names)s and %(count)s others are typing|one": "%(names)s ja yksi muu kirjoittvat",
     "Message Pinning": "Kiinnitetyt viestit",
@@ -672,6 +702,9 @@
     "Invalid community ID": "Virheellinen yhteistötunniste",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' on virheellinen yhteisötunniste",
     "New community ID (e.g. +foo:%(localDomain)s)": "Uusi yhteisötunniste (esim. +foo:%(localDomain)s)",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutti huoneen %(roomName)s avatarin",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s poisti huoneen avatarin.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s vaihtoi huoneen kuvaksi <img/>",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Sinut ohjataan kolmannen osapuolen sivustolle jotta voit autentikoida tilisi käyttääksesi %(integrationsUrl)s. Haluatko jatkaa?",
     "Message removed by %(userId)s": "Käyttäjän %(userId)s poistama viesti",
     "Message removed": "Viesti poistettu",
@@ -781,6 +814,11 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "Ignored user": "Estetyt käyttäjät",
     "Unignored user": "Sallitut käyttäjät",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s tasolta %(fromPowerLevel)s tasolle %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s muutettiin tehotasoa %(powerLevelDiffText)s.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s pienoisohjelmaa muokannut %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s pienoisohjelman lisännyt %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s pienoisohjelman poistanut %(senderName)s",
     "Send": "Lähetä",
     "Delete %(count)s devices|other": "Poista %(count)s laitetta",
     "Delete %(count)s devices|one": "Poista laite",
@@ -1027,43 +1065,5 @@
     "Collapse panel": "Piilota paneeli",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Nykyisellä selaimellasi ohjelman ulkonäkö voi olla aivan virheellinen, ja jotkut ominaisuudet eivät saata toimia. Voit jatkaa jos haluat kokeilla mutta et voi odottaa saavasi apua mahdollisesti ilmeneviin ongelmiin!",
     "Checking for an update...": "Tarkistetaan päivityksen saatavuutta...",
-    "There are advanced notifications which are not shown here": "On kehittyneitä ilmoituksia joita ei näytetä tässä",
-    "<target> accepted the invitation for %(displayName)s.": "<target> hyväksyi kutsun käyttäjän %(displayName)s puolesta.",
-    "<target> accepted an invitation.": "<target> hyväksyi kutsun.",
-    "<sender> requested a VoIP conference.": "<sender> pyysi VoIP konferenssia.",
-    "<sender> invited <target>.": "<sender> kutsui käyttäjän <target>.",
-    "<sender> banned <target>.": "<sender> antoi porttikiellon käyttäjälle <target>.",
-    "<sender> set their display name to <displayName>.": "<sender> asetti näyttönimekseen <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> poisti näyttönimensä (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> poisti profiilikuvansa.",
-    "<sender> changed their profile picture.": "<sender> muutti profiilikuvansa.",
-    "<sender> set a profile picture.": "<sender> asetti profiilikuvan.",
-    "<target> joined the room.": "<target> liittyi huoneeseen.",
-    "<target> rejected the invitation.": "<target> hylkäsi kutsun.",
-    "<target> left the room.": "<target> poistui huoneesta.",
-    "<sender> unbanned <target>.": "<sender> poisti porttikiellon käyttäjältä <target>.",
-    "<sender> kicked <target>.": "<sender> poisti käyttäjän <target> huoneesta.",
-    "<sender> withdrew <target>'s invitation.": "<sender> veti takaisin käyttäjän <target> kutsun.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> asetti aiheeksi \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> muuti huoneen nimeksi %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> muutti huoneen %(roomName)s avatarin",
-    "<sender> changed the room avatar to <img/>": "<sender> vaihtoi huoneen kuvaksi <img/>",
-    "<sender> removed the room name.": "<sender> poisti huoneen nimen.",
-    "<sender> removed the room avatar.": "<sender> poisti huoneen avatarin.",
-    "<sender> answered the call.": "<sender> vastasi puheluun.",
-    "<sender> ended the call.": "<sender> lopetti puhelun.",
-    "<sender> placed a %(callType)s call.": "<sender> soitti %(callType)spuhelun.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> lähetti kutsun käyttäjälle %(targetDisplayName)s liittyäkseen huoneeseen.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> muutti tulevat viestit näkyviksi kaikille huoneen jäsenille, alkaen kutsusta huoneeseen.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, liittymisestä asti.",
-    "<sender> made future room history visible to all room members.": "<sender> teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
-    "<sender> made future room history visible to anyone.": "<sender> teki tulevan huonehistorian näkyväksi kaikille.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> teki tulevan huonehistorian näkyväksi tuntemattomalle (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> otti päästä päähän-salauksen käyttöön (algoritmi %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> tasolta %(fromPowerLevel)s tasolle %(toPowerLevel)s",
-    "<sender> changed the pinned messages for the room.": "<sender> muutti tämän huoneen kiinnitetyt viestit.",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> muutettiin tehotasoa %(powerLevelDiffText)s.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s pienoisohjelmaa muokannut <sender>",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s pienoisohjelman lisännyt <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s pienoisohjelman poistanut <sender>"
+    "There are advanced notifications which are not shown here": "On kehittyneitä ilmoituksia joita ei näytetä tässä"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8c6e6c2998..8843ad89ca 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -12,6 +12,7 @@
     "Enable encryption": "Activer le chiffrement",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Les messages chiffrés ne seront pas visibles dans les clients qui n’implémentent pas encore le chiffrement",
     "Encrypted room": "Salon chiffré",
+    "%(senderName)s ended the call.": "%(senderName)s a terminé l’appel.",
     "End-to-end encryption information": "Informations sur le chiffrement de bout en bout",
     "End-to-end encryption is in beta and may not be reliable": "Le chiffrement de bout en bout est en bêta et risque de ne pas être fiable",
     "Enter Code": "Saisir le code",
@@ -32,6 +33,7 @@
     "Notifications": "Notifications",
     "Settings": "Paramètres",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un SMS a été envoyé à +%(msisdn)s. Merci de saisir le code de vérification qu'il contient",
+    "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
     "Account": "Compte",
     "Add email address": "Ajouter une adresse e-mail",
     "Add phone number": "Ajouter un numéro de téléphone",
@@ -50,6 +52,7 @@
     "Are you sure you want to upload the following files?": "Voulez-vous vraiment envoyer les fichiers suivants ?",
     "Attachment": "Pièce jointe",
     "Autoplay GIFs and videos": "Jouer automatiquement les GIFs et les vidéos",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.",
     "Ban": "Bannir",
     "Banned users": "Utilisateurs bannis",
     "Bans user with given id": "Bannit l'utilisateur à partir de son identifiant",
@@ -58,6 +61,10 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Impossible de se connecter au serveur d'accueil en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou <a>activez le support des scripts non-vérifiés</a>.",
     "Can't load user settings": "Impossible de charger les paramètres de l'utilisateur",
     "Change Password": "Changer le mot de passe",
+    "%(senderName)s changed their profile picture.": "%(senderName)s a changé son image de profil.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le rang de %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Les changements de visibilité de l’historique de ce salon ne s’appliquent qu’aux futurs messages",
     "Changes your display nickname": "Change votre nom affiché",
     "Claimed Ed25519 fingerprint key": "Clé d'empreinte Ed25519 déclarée",
@@ -107,9 +114,11 @@
     "Failed to set display name": "Échec de l'enregistrement du nom affiché",
     "Failed to set up conference call": "Échec de l’établissement de la téléconférence",
     "Failed to toggle moderator status": "Échec de l’activation du statut de modérateur",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté l’invitation de %(displayName)s.",
     "Access Token:": "Jeton d’accès :",
     "Always show message timestamps": "Toujours afficher l'heure des messages",
     "Authentication": "Authentification",
+    "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.",
     "An error has occurred.": "Une erreur est survenue.",
     "Email": "E-mail",
     "Failed to unban": "Échec de la révocation du bannissement",
@@ -122,6 +131,7 @@
     "Forget room": "Oublier le salon",
     "Forgot your password?": "Mot de passe oublié ?",
     "For security, this session has been signed out. Please sign in again.": "Par mesure de sécurité, la session a expiré. Merci de vous authentifier à nouveau.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s à %(toPowerLevel)s",
     "Hangup": "Raccrocher",
     "Hide read receipts": "Cacher les accusés de lecture",
     "Hide Text Formatting Toolbar": "Cacher la barre de formatage de texte",
@@ -135,6 +145,7 @@
     "Invalid alias format": "Format d'alias non valide",
     "Invalid address format": "Format d'adresse non valide",
     "Invalid Email Address": "Adresse e-mail non valide",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s a invité %(targetName)s.",
     "Invite new room members": "Inviter de nouveaux membres",
     "Invited": "Invités",
     "Invites": "Invitations",
@@ -144,15 +155,23 @@
     "%(displayName)s is typing": "%(displayName)s écrit",
     "Sign in with": "Se connecter avec",
     "Join Room": "Rejoindre le salon",
+    "%(targetName)s joined the room.": "%(targetName)s a rejoint le salon.",
     "Joins room with given alias": "Rejoint le salon avec l'alias renseigné",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s a exclu %(targetName)s.",
     "Kick": "Exclure",
     "Kicks user with given id": "Exclut l'utilisateur à partir de son identifiant",
     "Labs": "Laboratoire",
     "Leave room": "Quitter le salon",
+    "%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
     "Local addresses for this room:": "Adresses locales pour ce salon :",
     "Logged in as:": "Identifié en tant que :",
     "Logout": "Se déconnecter",
     "Low priority": "Priorité basse",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont rejoint.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s a rendu l'historique visible à tous les membres du salon.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s a rendu l'historique visible à n'importe qui.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s a rendu l'historique visible à inconnu (%(visibility)s).",
     "Manage Integrations": "Gestion des intégrations",
     "Markdown is disabled": "Le formatage Markdown est désactivé",
     "Markdown is enabled": "Le formatage Markdown est activé",
@@ -201,6 +220,7 @@
     "Mute": "Mettre en sourdine",
     "No users have specific privileges in this room": "Aucun utilisateur n’a de privilège spécifique dans ce salon",
     "olm version:": "version de olm :",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s a passé un appel %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez vérifier vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
     "Power level must be positive integer.": "Le niveau d'autorité doit être un entier positif.",
     "Privacy warning": "Alerte de confidentialité",
@@ -209,9 +229,13 @@
     "Reason": "Raison",
     "Revoke Moderator": "Révoquer le modérateur",
     "Refer a friend to Riot:": "Recommander Riot à un ami :",
+    "%(targetName)s rejected the invitation.": "%(targetName)s a rejeté l’invitation.",
     "Reject invitation": "Rejeter l'invitation",
     "Remove Contact Information?": "Supprimer les informations du contact ?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s a supprimé son nom affiché (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s a supprimé son image de profil.",
     "Remove %(threePid)s?": "Supprimer %(threePid)s ?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s a demandé une téléconférence audio.",
     "Resetting 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.": "Pour le moment, réinitialiser le mot de passe va réinitialiser les clés de chiffrement sur tous les appareils, rendant l’historique des salons chiffrés illisible, à moins que vous exportiez d'abord les clés de salon puis que vous les ré-importiez après. Cela sera amélioré prochainement.",
     "Return to login screen": "Retourner à l’écran de connexion",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot n’a pas la permission de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
@@ -230,6 +254,7 @@
     "Send Invites": "Envoyer des invitations",
     "Send Reset Email": "Envoyer l'e-mail de réinitialisation",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s a envoyé une image.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s a invité %(targetDisplayName)s à rejoindre le salon.",
     "Server error": "Erreur du serveur",
     "Server may be unavailable or overloaded": "Le serveur semble être inaccessible ou surchargé",
     "Server may be unavailable, overloaded, or search timed out :(": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
@@ -237,6 +262,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé ou vous avez rencontré un problème.",
     "Server unavailable, overloaded, or something else went wrong.": "Le serveur semble être inaccessible, surchargé ou quelque chose s'est mal passé.",
     "Session ID": "Identifiant de session",
+    "%(senderName)s set a profile picture.": "%(senderName)s a défini une image de profil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a défini son nom affiché comme %(displayName)s.",
     "Show panel": "Dévoiler le panneau",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Afficher l’heure au format am/pm (par ex. 2:30pm)",
     "Signed Out": "Déconnecté",
@@ -271,10 +298,12 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Un instant donné de la chronologie n’a pu être chargé car il n’a pas pu être trouvé.",
     "Turn Markdown off": "Désactiver le formatage ’Markdown’",
     "Turn Markdown on": "Activer le formatage ’Markdown’",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout-en-bout (algorithme %(algorithm)s).",
     "Unable to add email address": "Impossible d'ajouter l'adresse e-mail",
     "Unable to remove contact information": "Impossible de supprimer les informations du contact",
     "Unable to verify email address.": "Impossible de vérifier l’adresse e-mail.",
     "Unban": "Révoquer le bannissement",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s a révoqué le bannissement de %(targetName)s.",
     "Unable to capture screen": "Impossible de capturer l'écran",
     "Unable to enable Notifications": "Impossible d'activer les notifications",
     "Unable to load device list": "Impossible de charger la liste des appareils",
@@ -307,6 +336,7 @@
     "Who can read history?": "Qui peut lire l'historique ?",
     "Who would you like to add to this room?": "Qui voulez-vous ajouter à ce salon ?",
     "Who would you like to communicate with?": "Avec qui voulez-vous communiquer ?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a annulé l’invitation de %(targetName)s.",
     "You are already in a call.": "Vous avez déjà un appel en cours.",
     "You are trying to access %(roomName)s.": "Vous essayez d'accéder à %(roomName)s.",
     "You cannot place a call with yourself.": "Vous ne pouvez pas passer d'appel avec vous-même.",
@@ -375,6 +405,7 @@
     "bullet": "liste à puces",
     "numbullet": "liste numérotée",
     "Please select the destination room for this message": "Merci de sélectionner le salon de destination pour ce message",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s a supprimé le nom du salon.",
     "Analytics": "Collecte de données",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collecte des données anonymes qui nous permettent d’améliorer l’application.",
     "Passphrases must match": "Les phrases de passe doivent être identiques",
@@ -454,6 +485,9 @@
     "Options": "Options",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez-vous continuer ?",
     "Removed or unknown message type": "Type de message inconnu ou supprimé",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s a changé l’avatar du salon en <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l'avatar du salon.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’avatar de %(roomName)s",
     "Device already verified!": "Appareil déjà vérifié !",
     "Export": "Exporter",
     "Guest access is disabled on this Home Server.": "L’accès en tant que visiteur est désactivé sur ce serveur d'accueil.",
@@ -621,6 +655,8 @@
     "Failed to upload image": "Impossible d'envoyer l'image",
     "Hide avatars in user and room mentions": "Masquer les avatars dans les mentions d'utilisateur et de salon",
     "Do you want to load widget from URL:": "Voulez-vous charger le widget depuis l’URL :",
+    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s ajouté par %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s supprimé par %(senderName)s",
     "Publish this room to the public in %(domain)s's room directory?": "Publier ce salon dans le répertoire de salons public de %(domain)s ?",
     "Integrations Error": "Erreur d'intégration",
     "Cannot add any more widgets": "Impossible d'ajouter plus de widgets",
@@ -631,6 +667,7 @@
     "Copied!": "Copié !",
     "Failed to copy": "Échec de la copie",
     "Verifies a user, device, and pubkey tuple": "Vérifie un utilisateur, un appareil et une clé publique",
+    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modifié par %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "La vérification robot n'est pas encore disponible pour le bureau - veuillez utiliser un <a>navigateur</a>",
     "Who would you like to add to this community?": "Qui souhaitez-vous ajouter à cette communauté ?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Attention : toute personne ajoutée à une communauté sera visible par tous ceux connaissant l'identifiant de la communauté",
@@ -675,6 +712,7 @@
     "To modify widgets in the room, you must be a": "Pour modifier les widgets, vous devez être un",
     "Banned by %(displayName)s": "Banni par %(displayName)s",
     "To send messages, you must be a": "Pour envoyer des messages, vous devez être un(e)",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s a changé les messages épinglés du salon.",
     "%(names)s and %(count)s others are typing|other": "%(names)s et %(count)s autres écrivent",
     "Jump to read receipt": "Aller à l'accusé de lecture",
     "World readable": "Lisible publiquement",
@@ -917,6 +955,7 @@
     "Community IDs cannot not be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
     "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom affiché en %(displayName)s.",
     "Failed to set direct chat tag": "Échec de l'ajout de l'étiquette discussion directe",
     "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l'étiquette %(tagName)s du salon",
     "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon",
@@ -1156,44 +1195,5 @@
     "Share Room Message": "Partager le message du salon",
     "Link to selected message": "Lien vers le message sélectionné",
     "COPY": "COPIER",
-    "Share Message": "Partager le message",
-    "<target> accepted the invitation for %(displayName)s.": "<target> a accepté l’invitation de %(displayName)s.",
-    "<target> accepted an invitation.": "<target> a accepté une invitation.",
-    "<sender> requested a VoIP conference.": "<sender> a demandé une téléconférence audio.",
-    "<sender> invited <target>.": "<sender> a invité <target>.",
-    "<sender> banned <target>.": "<sender> a banni <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> a changé son nom affiché en <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> a défini son nom affiché comme <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> a supprimé son nom affiché (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> a supprimé son image de profil.",
-    "<sender> changed their profile picture.": "<sender> a changé son image de profil.",
-    "<sender> set a profile picture.": "<sender> a défini une image de profil.",
-    "<target> joined the room.": "<target> a rejoint le salon.",
-    "<target> rejected the invitation.": "<target> a rejeté l’invitation.",
-    "<target> left the room.": "<target> a quitté le salon.",
-    "<sender> unbanned <target>.": "<sender> a révoqué le bannissement de <target>.",
-    "<sender> kicked <target>.": "<sender> a exclu <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> a annulé l’invitation de <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> a changé le sujet du salon en \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> a changé le nom du salon en %(roomName)s.",
-    "<sender> changed the room avatar to <img/>": "<sender> a changé l’avatar du salon en <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> a changé l’avatar de %(roomName)s",
-    "<sender> removed the room name.": "<sender> a supprimé le nom du salon.",
-    "<sender> removed the room avatar.": "<sender> a supprimé l'avatar du salon.",
-    "<sender> answered the call.": "<sender> a répondu à l’appel.",
-    "<sender> ended the call.": "<sender> a terminé l’appel.",
-    "<sender> placed a %(callType)s call.": "<sender> a passé un appel %(callType)s.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> a invité %(targetDisplayName)s à rejoindre le salon.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont rejoint.",
-    "<sender> made future room history visible to all room members.": "<sender> a rendu l'historique visible à tous les membres du salon.",
-    "<sender> made future room history visible to anyone.": "<sender> a rendu l'historique visible à n'importe qui.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> a rendu l'historique visible à inconnu (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> a activé le chiffrement de bout-en-bout (algorithme %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s à %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> a changé le rang de %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> a changé les messages épinglés du salon.",
-    "%(widgetName)s widget modified by <sender>": "Widget %(widgetName)s modifié par <sender>",
-    "%(widgetName)s widget added by <sender>": "Widget %(widgetName)s ajouté par <sender>",
-    "%(widgetName)s widget removed by <sender>": "Widget %(widgetName)s supprimé par <sender>"
+    "Share Message": "Partager le message"
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index f61389ad9b..57d8301df6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -111,14 +111,49 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibiu do  dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.",
     "Unrecognised command:": "Orde non recoñecida:",
     "Reason": "Razón",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptou o convite para %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s aceptou o convite.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s solicitou unha conferencia VoIP.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou a %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s bloqueou a %(targetName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableceu o seu nome público a %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminou o seu nome público (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s eliminou a súa imaxe de perfil.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s cambiou a súa imaxe de perfil.",
+    "%(senderName)s set a profile picture.": "%(senderName)s estableceu a imaxe de perfil.",
     "VoIP conference started.": "Comezou a conferencia VoIP.",
+    "%(targetName)s joined the room.": "%(targetName)s uniuse a sala.",
     "VoIP conference finished.": "Rematou a conferencia VoIP.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rexeitou a invitación.",
+    "%(targetName)s left the room.": "%(targetName)s deixou a sala.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desbloqueou a %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s expulsou a %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s rexeitou o convite de %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambiou o asunto a \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminou o nome da sala.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambiou o nome da sala a %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou unha imaxe.",
     "Someone": "Alguén",
     "(not supported by this browser)": "(non soportado por este navegador)",
+    "%(senderName)s answered the call.": "%(senderName)s respondeu a chamada.",
     "(could not connect media)": "(non puido conectar os medios)",
     "(no answer)": "(sen resposta)",
     "(unknown failure: %(reason)s)": "(fallo descoñecido: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s rematou a chamada.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s estableceu unha chamada %(callType)s.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou un convite a %(targetDisplayName)s para unirse a sala.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para todos os participantes, desde o punto en que foron convidadas.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a todos os participantes, desde o punto en que se uniron.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para todos participantes o historial futuro da sala.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s fixo visible para calquera o historial futuro da sala.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado de par-a-par (algoritmo %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s desde %(fromPowerLevel)s a %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s cambiou o nivel de autoridade a %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambiou as mensaxes fixadas para a sala.",
+    "%(widgetName)s widget modified by %(senderName)s": "O trebello %(widgetName)s modificado por %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "O trebello %(widgetName)s engadido por %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s eliminado por %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s está a escribir",
     "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras están a escribir",
     "%(names)s and %(count)s others are typing|one": "%(names)s e outra está a escribir",
@@ -437,6 +472,9 @@
     "Invalid file%(extra)s": "Ficheiro non válido %(extra)s",
     "Error decrypting image": "Fallo ao descifrar a imaxe",
     "Error decrypting video": "Fallo descifrando vídeo",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s cambiou o avatar para %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eliminou o avatar da sala.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s cambiou o avatar da sala a <img/>",
     "Copied!": "Copiado!",
     "Failed to copy": "Fallo ao copiar",
     "Add an Integration": "Engadir unha integración",
@@ -911,6 +949,7 @@
     "<a>In reply to</a> <pill>": "<a>En resposta a</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá volver a ela sen un convite.",
     "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambiou o seu nome mostrado a %(displayName)s.",
     "Clear filter": "Quitar filtro",
     "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
@@ -1156,44 +1195,5 @@
     "Review terms and conditions": "Revise os termos e condicións",
     "No Audio Outputs detected": "Non se detectou unha saída de audio",
     "Audio Output": "Saída de audio",
-    "Try the app first": "Probe a aplicación primeiro",
-    "<target> accepted the invitation for %(displayName)s.": "<target> aceptou o convite para %(displayName)s.",
-    "<target> accepted an invitation.": "<target> aceptou o convite.",
-    "<sender> requested a VoIP conference.": "<sender> solicitou unha conferencia VoIP.",
-    "<sender> invited <target>.": "<sender> convidou a <target>.",
-    "<sender> banned <target>.": "<sender> bloqueou a <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> cambiou o seu nome mostrado a <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> estableceu o seu nome público a <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> eliminou o seu nome público (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> eliminou a súa imaxe de perfil.",
-    "<sender> changed their profile picture.": "<sender> cambiou a súa imaxe de perfil.",
-    "<sender> set a profile picture.": "<sender> estableceu a imaxe de perfil.",
-    "<target> joined the room.": "<target> uniuse a sala.",
-    "<target> rejected the invitation.": "<target> rexeitou a invitación.",
-    "<target> left the room.": "<target> deixou a sala.",
-    "<sender> unbanned <target>.": "<sender> desbloqueou a <target>.",
-    "<sender> kicked <target>.": "<sender> expulsou a <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> rexeitou o convite de <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> cambiou o asunto a \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> cambiou o nome da sala a %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> cambiou o avatar para %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> cambiou o avatar da sala a <img/>",
-    "<sender> removed the room name.": "<sender> eliminou o nome da sala.",
-    "<sender> removed the room avatar.": "<sender> eliminou o avatar da sala.",
-    "<sender> answered the call.": "<sender> respondeu a chamada.",
-    "<sender> ended the call.": "<sender> rematou a chamada.",
-    "<sender> placed a %(callType)s call.": "<sender> estableceu unha chamada %(callType)s.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> enviou un convite a %(targetDisplayName)s para unirse a sala.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> fixo o historial da sala visible para todos os participantes, desde o punto en que foron convidadas.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> estableceu o historial futuro visible a todos os participantes, desde o punto en que se uniron.",
-    "<sender> made future room history visible to all room members.": "<sender> fixo visible para todos participantes o historial futuro da sala.",
-    "<sender> made future room history visible to anyone.": "<sender> fixo visible para calquera o historial futuro da sala.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> activou o cifrado de par-a-par (algoritmo %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> desde %(fromPowerLevel)s a %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> cambiou o nivel de autoridade a %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> cambiou as mensaxes fixadas para a sala.",
-    "%(widgetName)s widget modified by <sender>": "O trebello %(widgetName)s modificado por <sender>",
-    "%(widgetName)s widget added by <sender>": "O trebello %(widgetName)s engadido por <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s eliminado por <sender>"
+    "Try the app first": "Probe a aplicación primeiro"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d0a87414d1..2aea205a15 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -16,6 +16,8 @@
     "unknown error code": "ismeretlen hibakód",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Elküldtük a szöveges üzenetet ide: +%(msisdn)s. Kérlek add meg az ellenőrző kódot ami benne van",
     "Accept": "Elfogad",
+    "%(targetName)s accepted an invitation.": "%(targetName)s elfogadta a meghívást.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s elfogadta a meghívást ide: %(displayName)s.",
     "Account": "Fiók",
     "Access Token:": "Elérési kulcs:",
     "Active call (%(roomName)s)": "Hívás folyamatban (%(roomName)s)",
@@ -51,6 +53,7 @@
     "and %(count)s others...|one": "és még egy...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s és %(lastPerson)s írnak",
     "A new password must be entered.": "Új jelszót kell megadni.",
+    "%(senderName)s answered the call.": "%(senderName)s felvette a telefont.",
     "An error has occurred.": "Hiba történt.",
     "Anyone": "Bárki",
     "Anyone who knows the room's link, apart from guests": "A vendégeken kívül bárki aki ismeri a szoba link-jét",
@@ -61,6 +64,7 @@
     "Are you sure you want to upload the following files?": "Biztos feltöltöd ezeket a fájlokat?",
     "Attachment": "Csatolmány",
     "Autoplay GIFs and videos": "GIF-ek és videók automatikus lejátszása",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s kitiltotta őt: %(targetName)s.",
     "Ban": "Kitilt",
     "Banned users": "Kitiltott felhasználók",
     "Bans user with given id": "Kitiltja a felhasználót a megadott ID-vel",
@@ -71,6 +75,11 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nem lehet csatlakozni a saját szerverhez HTTP-n keresztül ha HTTPS van a böngésző címsorában. Vagy használj HTTPS-t vagy <a>engedélyezd a nem biztonságos script-et</a>.",
     "Can't load user settings": "A felhasználói beállítások nem tölthetők be",
     "Change Password": "Jelszó megváltoztatása",
+    "%(senderName)s changed their profile picture.": "%(senderName)s megváltoztatta a profil képét.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s megváltoztatta a hozzáférési szintjét erre: %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s megváltoztatta a szoba nevét erre: %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s törölte a szoba nevét.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s megváltoztatta a témát erre \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Változtatások a napló olvasási jogosultságon csak a szoba új üzeneteire fog vonatkozni",
     "Changes your display nickname": "Becenév megváltoztatása",
     "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.": "Jelszó megváltoztatása jelenleg alaphelyzetbe állítja a titkosításnál használt kulcsokat minden készüléken, ezzel a régi titkosított üzenetek olvashatatlanok lesznek hacsak először nem mented ki a kulcsokat és újra betöltöd. A jövőben ezen javítunk.",
@@ -141,6 +150,7 @@
     "Encrypted room": "Titkosított szoba",
     "Encryption is enabled in this room": "Ebben a szobában a titkosítás be van kapcsolva",
     "Encryption is not enabled in this room": "Ebben a szobában a titkosítás nincs bekapcsolva",
+    "%(senderName)s ended the call.": "%(senderName)s befejezte a hívást.",
     "End-to-end encryption information": "Ponttól pontig való titkosítási információk",
     "End-to-end encryption is in beta and may not be reliable": "Ponttól pontig tartó titkosítás béta állapotú és lehet, hogy nem megbízható",
     "Enter Code": "Kód megadása",
@@ -180,6 +190,7 @@
     "Forgot your password?": "Elfelejtetted a jelszavad?",
     "For security, this session has been signed out. Please sign in again.": "A biztonság érdekében ez a kapcsolat le lesz bontva. Légy szíves jelentkezz be újra.",
     "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.": "A biztonság érdekében a kilépéskor a ponttól pontig való (E2E) titkosításhoz szükséges kulcsok törlésre kerülnek a böngészőből. Ha a régi üzeneteket továbbra is el szeretnéd olvasni, kérlek mentsed ki a szobákhoz tartozó kulcsot.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s : %(fromPowerLevel)s -> %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Vendég belépés tiltva van a Saját szerveren.",
     "Guests cannot join this room even if explicitly invited.": "Vendégek akkor sem csatlakozhatnak ehhez a szobához ha külön meghívók kaptak.",
     "Hangup": "Megszakít",
@@ -202,6 +213,7 @@
     "Invalid address format": "Hibás cím formátum",
     "Invalid Email Address": "Hibás e-mail cím",
     "Invalid file%(extra)s": "Hibás fájl%(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s meghívta: %(targetName)s.",
     "Invite new room members": "Új tagok meghívása",
     "Invited": "Meghívva",
     "Invites": "Meghívók",
@@ -212,18 +224,26 @@
     "Sign in with": "Belépés ezzel:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Csatlakozás <voiceText>hang</voiceText>gal vagy <videoText>videó</videoText>val.",
     "Join Room": "Belépés a szobába",
+    "%(targetName)s joined the room.": "%(targetName)s belépett a szobába.",
     "Joins room with given alias": "A megadott becenévvel belépett a szobába",
     "Jump to first unread message.": "Ugrás az első olvasatlan üzenetre.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kizárta: %(targetName)s.",
     "Kick": "Kirúg",
     "Kicks user with given id": "Az adott azonosítójú felhasználó kirúgása",
     "Labs": "Labor",
     "Last seen": "Utoljára láttuk",
     "Leave room": "Szoba elhagyása",
+    "%(targetName)s left the room.": "%(targetName)s elhagyta a szobát.",
     "Level:": "Szint:",
     "Local addresses for this room:": "A szoba helyi címe:",
     "Logged in as:": "Bejelentkezve mint:",
     "Logout": "Kilép",
     "Low priority": "Alacsony prioritás",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta csatlakozott.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden szoba tagság.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik bárki.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik ismeretlen (%(visibility)s).",
     "Manage Integrations": "Integrációk kezelése",
     "Markdown is disabled": "Markdown kikapcsolva",
     "Markdown is enabled": "Markdown engedélyezett",
@@ -262,6 +282,7 @@
     "People": "Emberek",
     "Permissions": "Jogosultságok",
     "Phone": "Telefon",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s  %(callType)s hívást kezdeményezett.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ellenőrizd az e-mail-edet és kattints a benne lévő linkre. Ha ez megvan, kattints a folytatásra.",
     "Power level must be positive integer.": "A szintnek pozitív egésznek kell lennie.",
     "Private Chat": "Privát csevegés",
@@ -273,11 +294,15 @@
     "Revoke Moderator": "Moderátor visszahívása",
     "Refer a friend to Riot:": "Ismerős meghívása a Riotba:",
     "Register": "Regisztráció",
+    "%(targetName)s rejected the invitation.": "%(targetName)s elutasította a meghívót.",
     "Reject invitation": "Meghívó elutasítása",
     "Rejoin": "Újracsatlakozás",
     "Remote addresses for this room:": "A szoba távoli címei:",
     "Remove Contact Information?": "Kapcsolat információk törlése?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s törölte a megjelenítési nevet (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s törölte a profil képét.",
     "Remove %(threePid)s?": "Töröl: %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konferenciát kezdeményez.",
     "Results from DuckDuckGo": "Eredmények a DuckDuckGo-ból",
     "Return to login screen": "Vissza a bejelentkezési képernyőre",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riotnak nincs jogosultsága értesítést küldeni neked - ellenőrizd  a böngésző beállításait",
@@ -301,6 +326,7 @@
     "Send Invites": "Meghívók elküldése",
     "Send Reset Email": "Visszaállítási e-mail küldése",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s képet küldött.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s meghívót küldött %(targetDisplayName)s felhasználónak, hogy lépjen be a szobába.",
     "Server error": "Szerver hiba",
     "Server may be unavailable or overloaded": "A szerver elérhetetlen vagy túlterhelt",
     "Server may be unavailable, overloaded, or search timed out :(": "A szerver elérhetetlen, túlterhelt vagy a keresés túllépte az időkorlátot :(",
@@ -308,6 +334,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "A szerver elérhetetlen, túlterhelt vagy hibára futott.",
     "Server unavailable, overloaded, or something else went wrong.": "A szerver elérhetetlen, túlterhelt vagy valami más probléma van.",
     "Session ID": "Kapcsolat azonosító",
+    "%(senderName)s set a profile picture.": "%(senderName)s profil képet állított be.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a megjelenítési nevét megváltoztatta erre: %(displayName)s.",
     "Show panel": "Panel megjelenítése",
     "Show Text Formatting Toolbar": "Szöveg formázási eszköztár megjelenítése",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Az időbélyegek 12 órás formátumban mutatása (pl.: 2:30pm)",
@@ -353,10 +381,12 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nem találom.",
     "Turn Markdown off": "Markdown kikapcsolása",
     "Turn Markdown on": "Markdown bekapcsolása",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a  titkosítást ponttól pontig (algoritmus %(algorithm)s).",
     "Unable to add email address": "Az e-mail címet nem sikerült hozzáadni",
     "Unable to remove contact information": "A névjegy információkat nem sikerült törölni",
     "Unable to verify email address.": "Az e-mail cím ellenőrzése sikertelen.",
     "Unban": "Kitiltás visszavonása",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s visszaengedte %(targetName)s felhasználót.",
     "Unable to capture screen": "A képernyő felvétele sikertelen",
     "Unable to enable Notifications": "Az értesítések engedélyezése sikertelen",
     "Unable to load device list": "Az eszközlista betöltése sikertelen",
@@ -410,6 +440,7 @@
     "Who can read history?": "Ki olvashatja a régi üzeneteket?",
     "Who would you like to add to this room?": "Kit szeretnél hozzáadni ehhez a szobához?",
     "Who would you like to communicate with?": "Kivel szeretnél beszélgetni?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s visszavonta %(targetName)s meghívóját.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Ezt a meghívót szeretnéd <acceptText>elfogadni</acceptText> vagy <declineText>elutasítani</declineText>?",
     "You already have existing direct chats with this user:": "Már van közvetlen csevegésed ezzel a felhasználóval:",
     "You are already in a call.": "Már hívásban vagy.",
@@ -559,6 +590,9 @@
     "Start chatting": "Csevegés indítása",
     "Start Chatting": "Csevegés indítása",
     "Click on the button below to start chatting!": "Csevegés indításához kattints a gombra alább!",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s megváltoztatta a szoba avatar képét: <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s törölte a szoba avatar képét.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s megváltoztatta %(roomName)s szoba avatar képét",
     "Username available": "Szabad felhasználói név",
     "Username not available": "A felhasználói név foglalt",
     "Something went wrong!": "Valami tönkrement!",
@@ -630,7 +664,10 @@
     "Publish this room to the public in %(domain)s's room directory?": "Publikálod a szobát a(z) %(domain)s szoba listájába?",
     "NOTE: Apps are not end-to-end encrypted": "Megjegyzés: Az alkalmazások nem végponttól végpontig titkosítottak",
     "The maximum permitted number of widgets have already been added to this room.": "A maximálisan megengedett számú kisalkalmazás már hozzá van adva a szobához.",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s hozzáadta",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s eltávolította",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot ellenőrzés az asztali verzióban nem érhető el - használd a <a>web böngészőt</a>",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s kisalkalmazást %(senderName)s módosította",
     "Copied!": "Lemásolva!",
     "Failed to copy": "Sikertelen másolás",
     "Advanced options": "További beállítások",
@@ -699,6 +736,7 @@
     "Message Pinning": "Üzenet kitűzése",
     "Remove avatar": "Avatar törlése",
     "Pinned Messages": "Kitűzött üzenetek",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s megváltoztatta a szoba kitűzött szövegeit.",
     "Who would you like to add to this community?": "Kit szeretnél hozzáadni ehhez a közösséghez?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Figyelem: minden személy akit hozzáadsz a közösséghez mindenki számára látható lesz aki ismeri a közösség azonosítóját",
     "Invite new community members": "Új tagok meghívása a közösségbe",
@@ -917,6 +955,7 @@
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>.",
     "Community IDs cannot not be empty.": "A közösségi azonosító nem lehet üres.",
     "<a>In reply to</a> <pill>": "<a>Válaszolva neki</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s.",
     "Failed to set direct chat tag": "Nem sikerült a közvetlen beszélgetés jelzést beállítani",
     "Failed to remove tag %(tagName)s from room": "Nem sikerült a szobáról eltávolítani ezt: %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s",
@@ -1156,44 +1195,5 @@
     "Share Room Message": "Szoba üzenet megosztás",
     "Link to selected message": "Hivatkozás a kijelölt üzenetre",
     "COPY": "Másol",
-    "Share Message": "Üzenet megosztása",
-    "<target> accepted the invitation for %(displayName)s.": "<target> elfogadta a meghívást ide: %(displayName)s.",
-    "<target> accepted an invitation.": "<target> elfogadta a meghívást.",
-    "<sender> requested a VoIP conference.": "<sender> VoIP konferenciát kezdeményez.",
-    "<sender> invited <target>.": "<sender> meghívta: <target>.",
-    "<sender> banned <target>.": "<sender> kitiltotta őt: <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> megváltoztatta a nevét erre: <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> a megjelenítési nevét megváltoztatta erre: <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> törölte a megjelenítési nevet (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> törölte a profil képét.",
-    "<sender> changed their profile picture.": "<sender> megváltoztatta a profil képét.",
-    "<sender> set a profile picture.": "<sender> profil képet állított be.",
-    "<target> joined the room.": "<target> belépett a szobába.",
-    "<target> rejected the invitation.": "<target> elutasította a meghívót.",
-    "<target> left the room.": "<target> elhagyta a szobát.",
-    "<sender> unbanned <target>.": "<sender> visszaengedte <target> felhasználót.",
-    "<sender> kicked <target>.": "<sender> kizárta: <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> visszavonta <target> meghívóját.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> megváltoztatta a témát erre \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> megváltoztatta a szoba nevét erre: %(roomName)s.",
-    "<sender> changed the room avatar to <img/>": "<sender> megváltoztatta a szoba avatar képét: <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> megváltoztatta %(roomName)s szoba avatar képét",
-    "<sender> removed the room name.": "<sender> törölte a szoba nevét.",
-    "<sender> removed the room avatar.": "<sender> törölte a szoba avatar képét.",
-    "<sender> answered the call.": "<sender> felvette a telefont.",
-    "<sender> ended the call.": "<sender> befejezte a hívást.",
-    "<sender> placed a %(callType)s call.": "<sender>  %(callType)s hívást kezdeményezett.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> meghívót küldött %(targetDisplayName)s felhasználónak, hogy lépjen be a szobába.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta csatlakozott.",
-    "<sender> made future room history visible to all room members.": "<sender> elérhetővé tette a szoba új üzeneteit nekik minden szoba tagság.",
-    "<sender> made future room history visible to anyone.": "<sender> elérhetővé tette a szoba új üzeneteit nekik bárki.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> elérhetővé tette a szoba új üzeneteit nekik ismeretlen (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> bekapcsolta a  titkosítást ponttól pontig (algoritmus %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> : %(fromPowerLevel)s -> %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> megváltoztatta a hozzáférési szintjét erre: %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> megváltoztatta a szoba kitűzött szövegeit.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s kisalkalmazást <sender> módosította",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s kisalkalmazást <sender> hozzáadta",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s kisalkalmazást <sender> eltávolította"
+    "Share Message": "Üzenet megosztása"
 }
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index a57b337acf..86605c1d41 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -146,6 +146,8 @@
     "Nov": "Nov",
     "Dec": "Des",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Sebuah pesan sudah dikirim ke +%(msisdn)s. Mohon masukkan kode verifikasi pada pesan tersebut",
+    "%(targetName)s accepted an invitation.": "%(targetName)s telah menerima undangan.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s menerima undangan untuk %(displayName)s.",
     "Access Token:": "Token Akses:",
     "Active call (%(roomName)s)": "Panggilan aktif (%(roomName)s)",
     "Admin": "Admin",
@@ -163,15 +165,22 @@
     "A new password must be entered.": "Password baru harus diisi.",
     "%(items)s and %(lastItem)s": "%(items)s dan %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s dan %(lastPerson)s sedang mengetik",
+    "%(senderName)s answered the call.": "%(senderName)s telah menjawab panggilan.",
     "Anyone who knows the room's link, including guests": "Siapa pun yang tahu tautan ruang, termasuk tamu",
     "Anyone who knows the room's link, apart from guests": "Siapa pun yang tahu tautan ruang, selain tamu",
     "Are you sure you want to upload the following files?": "Anda yakin akan mengunggah berkas-berkas berikut?",
     "Blacklisted": "Didaftarhitamkan",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s telah memblokir %(targetName)s.",
     "Banned users": "Pengguna yang diblokir",
     "Bulk Options": "Opsi Massal",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Tidak dapat terhubung ke server Home - harap cek koneksi anda, pastikan <a>sertifikat SSL server Home</a> Anda terpercaya, dan ekstensi dari browser tidak memblokir permintaan.",
     "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>.": "Tidak dapat terhubung ke server Home melalui HTTP ketika URL di browser berupa HTTPS. Pilih gunakan HTTPS atau <a>aktifkan skrip yang tidak aman</a>.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s telah mengubah foto profilnya.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s telah mengubah tingkat kekuatan dari %(powerLevelDiffText)s.",
     "Changes your display nickname": "Ubah tampilan nama panggilan Anda",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s telah menghapus nama ruang.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s telah mengubah nama ruang menjadi %(roomName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s telah mengubah topik menjadi \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Pengubahan siapa yang dapat membaca sejarah akan berlaku untuk pesan selanjutnya di ruang ini",
     "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.": "Mengubah password saat ini akan mengatur ulang semua kunci enkripsi end-to-end di semua perangkat, menyebabkan sejarah obrolan yang terenkripsi menjadi tidak dapat dibaca, kecuali sebelumnya Anda ekspor dahulu kunci ruang lalu kemudian impor ulang setelahnya. Ke depan hal ini akan diperbaiki.",
     "<a>Click here</a> to join the discussion!": "<a>Klik di sini</a> untuk gabung diskusi!",
@@ -332,14 +341,5 @@
     "Collapse panel": "Lipat panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Dengan browser ini, tampilan dari aplikasi mungkin tidak sesuai, dan beberapa atau bahkan semua fitur mungkin tidak berjalan. Jika Anda ingin tetap mencobanya, Anda bisa melanjutkan, tapi Anda tanggung sendiri jika muncul masalah yang terjadi!",
     "Checking for an update...": "Cek pembaruan...",
-    "There are advanced notifications which are not shown here": "Ada notifikasi lanjutan yang tidak ditampilkan di sini",
-    "<target> accepted the invitation for %(displayName)s.": "<target> menerima undangan untuk %(displayName)s.",
-    "<target> accepted an invitation.": "<target> telah menerima undangan.",
-    "<sender> banned <target>.": "<sender> telah memblokir <target>.",
-    "<sender> changed their profile picture.": "<sender> telah mengubah foto profilnya.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> telah mengubah topik menjadi \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> telah mengubah nama ruang menjadi %(roomName)s.",
-    "<sender> removed the room name.": "<sender> telah menghapus nama ruang.",
-    "<sender> answered the call.": "<sender> telah menjawab panggilan.",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> telah mengubah tingkat kekuatan dari %(powerLevelDiffText)s."
+    "There are advanced notifications which are not shown here": "Ada notifikasi lanjutan yang tidak ditampilkan di sini"
 }
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 28d2faedf7..6770a0ea25 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -535,7 +535,11 @@
     "Device already verified!": "Tæki er þegar sannreynt!",
     "Verified key": "Staðfestur dulritunarlykill",
     "Unrecognised command:": "Óþekkt skipun:",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s breytti umræðuefninu í \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjarlægði heiti spjallrásarinnar.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s breytti heiti spjallrásarinnar í %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendi mynd.",
+    "%(senderName)s answered the call.": "%(senderName)s svaraði símtalinu.",
     "Disinvite": "Taka boð til baka",
     "Unknown Address": "Óþekkt vistfang",
     "Delete Widget": "Eyða viðmótshluta",
@@ -637,9 +641,5 @@
     "Notify the whole room": "Tilkynna öllum á spjallrásinni",
     "Room Notification": "Tilkynning á spjallrás",
     "Passphrases must match": "Lykilfrasar verða að stemma",
-    "Passphrase must not be empty": "Lykilfrasi má ekki vera auður",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> breytti umræðuefninu í \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> breytti heiti spjallrásarinnar í %(roomName)s.",
-    "<sender> removed the room name.": "<sender> fjarlægði heiti spjallrásarinnar.",
-    "<sender> answered the call.": "<sender> svaraði símtalinu."
+    "Passphrase must not be empty": "Lykilfrasi má ekki vera auður"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 4506b20f9f..0957bc156d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -20,6 +20,8 @@
     "OK": "OK",
     "Failed to change password. Is your password correct?": "Modifica password fallita. La tua password è corretta?",
     "Continue": "Continua",
+    "%(targetName)s accepted an invitation.": "%(targetName)s ha accettato un invito.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha accettato l'invito per %(displayName)s.",
     "Account": "Account",
     "Access Token:": "Token di Accesso:",
     "Add": "Aggiungi",
@@ -111,6 +113,7 @@
     "Conference calling is in development and may not be reliable.": "Le chiamate di gruppo sono in sviluppo e potrebbero essere inaffidabili.",
     "Failed to set up conference call": "Impostazione della chiamata di gruppo fallita",
     "Conference call failed.": "Chiamata di gruppo fallita.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha richiesto una conferenza VoIP.",
     "VoIP conference started.": "Conferenza VoIP iniziata.",
     "VoIP conference finished.": "Conferenza VoIP terminata.",
     "Ongoing conference call%(supportedText)s.": "Chiamata di gruppo in corso%(supportedText)s.",
@@ -175,12 +178,44 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La chiave che hai fornito corrisponde alla chiave che hai ricevuto dal dispositivo %(deviceId)s di %(userId)s . Dispositivo segnato come verificato.",
     "Unrecognised command:": "Comando non riconosciuto:",
     "Reason": "Motivo",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha invitato %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha bandito %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha modificato il proprio nome in %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha impostato il proprio nome a %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha rimosso il proprio nome visibile (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s ha rimosso la propria immagine del profilo.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ha cambiato la propria immagine del profilo.",
+    "%(senderName)s set a profile picture.": "%(senderName)s ha impostato un'immagine del profilo.",
+    "%(targetName)s joined the room.": "%(targetName)s è entrato nella stanza.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s ha rifiutato l'invito.",
+    "%(targetName)s left the room.": "%(targetName)s è uscito dalla stanza.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha rimosso il ban a %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha cacciato %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha revocato l'invito per %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha modificato l'argomento in \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha rimosso il nome della stanza.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha modificato il nome della stanza in %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ha inviato un'immagine.",
     "Someone": "Qualcuno",
     "(not supported by this browser)": "(non supportato da questo browser)",
+    "%(senderName)s answered the call.": "%(senderName)s ha risposto alla chiamata.",
     "(could not connect media)": "(connessione del media non riuscita)",
     "(no answer)": "(nessuna risposta)",
     "(unknown failure: %(reason)s)": "(errore sconosciuto: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s ha terminato la chiamata.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha avviato una chiamata %(callType)s .",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha mandato un invito a %(targetDisplayName)s per unirsi alla stanza.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento del loro invito.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento in cui sono entrati.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha reso visibile la futura cronologia della stanza a (%(visibility)s) sconosciuto.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha attivato la crottografia end-to-end (algoritmo %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s da %(fromPowerLevel)s a %(toPowerLevel)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha cambiato il messaggio ancorato della stanza.",
+    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificato da %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s aggiunto da %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s rimosso da %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s sta scrivendo",
     "%(names)s and %(count)s others are typing|other": "%(names)s e altri %(count)s stanno scrivendo",
     "%(names)s and %(count)s others are typing|one": "%(names)s e un altro stanno scrivendo",
@@ -381,6 +416,7 @@
     "Historical": "Cronologia",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Impossibile verificare che l'indirizzo al quale questo invito è stato inviato corrisponda a uno associato al tuo account.",
     "Power level must be positive integer.": "Il livello di poteri deve essere un intero positivo.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha modificato il livello di poteri di %(powerLevelDiffText)s.",
     "Jump to read receipt": "Salta alla ricevuta di lettura",
     "This invitation was sent to an email address which is not associated with this account:": "Questo invito è stato mandato a un indirizzo email non associato a questo account:",
     "You may wish to login with a different account, or add this email to this account.": "Dovresti accedere con un account diverso, o aggiungere questa email all'account.",
@@ -482,6 +518,9 @@
     "Invalid file%(extra)s": "File non valido %(extra)s",
     "Error decrypting image": "Errore decifratura immagine",
     "Error decrypting video": "Errore decifratura video",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha cambiato l'avatar per %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s ha rimosso l'avatar della stanza.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha cambiato l'avatar della stanza a <img/>",
     "Copied!": "Copiato!",
     "Failed to copy": "Copia fallita",
     "Add an Integration": "Aggiungi un'integrazione",
@@ -1141,44 +1180,5 @@
     "Replying": "Rispondere",
     "Popout widget": "Oggetto a comparsa",
     "Failed to indicate account erasure": "Impossibile indicare la cancellazione dell'account",
-    "Bulk Options": "Opzioni applicate in massa",
-    "<target> accepted the invitation for %(displayName)s.": "<target> ha accettato l'invito per %(displayName)s.",
-    "<target> accepted an invitation.": "<target> ha accettato un invito.",
-    "<sender> requested a VoIP conference.": "<sender> ha richiesto una conferenza VoIP.",
-    "<sender> invited <target>.": "<sender> ha invitato <target>.",
-    "<sender> banned <target>.": "<sender> ha bandito <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> ha modificato il proprio nome in <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> ha impostato il proprio nome a <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> ha rimosso il proprio nome visibile (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> ha rimosso la propria immagine del profilo.",
-    "<sender> changed their profile picture.": "<sender> ha cambiato la propria immagine del profilo.",
-    "<sender> set a profile picture.": "<sender> ha impostato un'immagine del profilo.",
-    "<target> joined the room.": "<target> è entrato nella stanza.",
-    "<target> rejected the invitation.": "<target> ha rifiutato l'invito.",
-    "<target> left the room.": "<target> è uscito dalla stanza.",
-    "<sender> unbanned <target>.": "<sender> ha rimosso il ban a <target>.",
-    "<sender> kicked <target>.": "<sender> ha cacciato <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> ha revocato l'invito per <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> ha modificato l'argomento in \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> ha modificato il nome della stanza in %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> ha cambiato l'avatar per %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> ha cambiato l'avatar della stanza a <img/>",
-    "<sender> removed the room name.": "<sender> ha rimosso il nome della stanza.",
-    "<sender> removed the room avatar.": "<sender> ha rimosso l'avatar della stanza.",
-    "<sender> answered the call.": "<sender> ha risposto alla chiamata.",
-    "<sender> ended the call.": "<sender> ha terminato la chiamata.",
-    "<sender> placed a %(callType)s call.": "<sender> ha avviato una chiamata %(callType)s .",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> ha mandato un invito a %(targetDisplayName)s per unirsi alla stanza.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento del loro invito.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento in cui sono entrati.",
-    "<sender> made future room history visible to all room members.": "<sender> ha reso visibile la futura cronologia della stanza a tutti i membri della stanza.",
-    "<sender> made future room history visible to anyone.": "<sender> ha reso visibile la futura cronologia della stanza a tutti.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> ha reso visibile la futura cronologia della stanza a (%(visibility)s) sconosciuto.",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ha attivato la crottografia end-to-end (algoritmo %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> da %(fromPowerLevel)s a %(toPowerLevel)s",
-    "<sender> changed the pinned messages for the room.": "<sender> ha cambiato il messaggio ancorato della stanza.",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ha modificato il livello di poteri di %(powerLevelDiffText)s.",
-    "%(widgetName)s widget modified by <sender>": "Widget %(widgetName)s modificato da <sender>",
-    "%(widgetName)s widget added by <sender>": "Widget %(widgetName)s aggiunto da <sender>",
-    "%(widgetName)s widget removed by <sender>": "Widget %(widgetName)s rimosso da <sender>"
+    "Bulk Options": "Opzioni applicate in massa"
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 233430978f..741de4b551 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -17,6 +17,7 @@
     "Hide read receipts": "発言を読んでも既読状態にしない",
     "Invited": "招待中",
     "%(displayName)s is typing": "%(displayName)s 文字入力中",
+    "%(targetName)s joined the room.": "%(targetName)s 部屋に参加しました。",
     "Low priority": "低優先度",
     "Mute": "通知しない",
     "New password": "新しいパスワード",
@@ -239,6 +240,5 @@
     "Checking for an update...": "アップデートを確認しています…",
     "There are advanced notifications which are not shown here": "ここに表示されない詳細な通知があります",
     "Call": "通話",
-    "Answer": "応答",
-    "<target> joined the room.": "<target> 部屋に参加しました。"
+    "Answer": "応答"
 }
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 2fb6649f09..23b7efd97d 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -74,6 +74,8 @@
     "Operation failed": "작업 실패",
     "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했어요. 이 비밀번호가 정말 맞으세요?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "+%(msisdn)s로 문자 메시지를 보냈어요. 인증 번호를 입력해주세요",
+    "%(targetName)s accepted an invitation.": "%(targetName)s님이 초대를 수락했어요.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s님이 %(displayName)s님에게서 초대를 수락했어요.",
     "Access Token:": "접근 토큰:",
     "Active call (%(roomName)s)": "(%(roomName)s)에서 전화를 걸고 받을 수 있어요",
     "Add a topic": "주제 추가",
@@ -83,14 +85,21 @@
     "and %(count)s others...|one": "그리고 다른 하나...",
     "and %(count)s others...|other": "그리고 %(count)s...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s님과 %(lastPerson)s님이 입력중",
+    "%(senderName)s answered the call.": "%(senderName)s님이 전화를 받았어요.",
     "Anyone who knows the room's link, apart from guests": "손님을 제외하고, 방의 주소를 아는 누구나",
     "Anyone who knows the room's link, including guests": "손님을 포함하여, 방의 주소를 아는 누구나",
     "Are you sure you want to reject the invitation?": "초대를 거절하시겠어요?",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 차단하셨어요.",
     "Bans user with given id": "받은 ID로 사용자 차단하기",
     "Bulk Options": "대규모 설정",
     "Call Timeout": "전화 대기 시간 초과",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "홈 서버에 연결할 수 없어요 - 연결을 확인해주시고, <a>홈 서버의 SSL 인증서</a>가 믿을 수 있는지 확인하시고, 브라우저 확장기능이 요청을 차단하고 있는지 확인해주세요.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "주소창에 HTTPS URL이 있을 때는 HTTP로 홈 서버를 연결할 수 없어요. HTTPS를 쓰거나 <a>안전하지 않은 스크립트를 허용해주세요</a>.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s님이 자기 소개 사진을 바꾸셨어요.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s님이 %(powerLevelDiffText)s의 권한 등급을 바꾸셨어요.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s님이 방 이름을 %(roomName)s로 바꾸셨어요.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s님이 방 이름을 지우셨어요.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s님이 주제를 \"%(topic)s\"로 바꾸셨어요.",
     "Changes to who can read history will only apply to future messages in this room": "방의 이후 메시지부터 기록을 읽을 수 있는 조건의 변화가 적용되어요",
     "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.": "비밀번호를 바꾸면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
     "Claimed Ed25519 fingerprint key": "Ed25519 지문 키가 필요",
@@ -142,6 +151,7 @@
     "Encrypted room": "암호화한 방",
     "Encryption is enabled in this room": "이 방은 암호화중이에요",
     "Encryption is not enabled in this room": "이 방은 암호화하고 있지 않아요",
+    "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었어요.",
     "End-to-end encryption information": "종단간 암호화 정보",
     "End-to-end encryption is in beta and may not be reliable": "종단간 암호화는 시험중이며 믿을 수 없어요",
     "Enter Code": "코드를 입력하세요",
@@ -181,6 +191,7 @@
     "Forgot your password?": "비밀번호를 잊어버리셨어요?",
     "For security, this session has been signed out. Please sign in again.": "보안을 위해서, 이 세션에서 로그아웃했어요. 다시 로그인해주세요.",
     "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.": "보안을 위해서, 로그아웃하면 이 브라우저에서 모든 종단간 암호화 키를 없앨 거에요. 이후 라이엇에서 이야기를 해독하고 싶으시면, 방 키를 내보내서 안전하게 보관하세요.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s를 %(fromPowerLevel)s에서 %(toPowerLevel)s로",
     "Guest access is disabled on this Home Server.": "손님은 이 홈 서버에 접근하실 수 없어요.",
     "Guests cannot join this room even if explicitly invited.": "손님은 분명하게 초대받았어도 이 방에 들어가실 수 없어요.",
     "Hangup": "전화 끊기",
@@ -204,6 +215,7 @@
     "Invalid address format": "주소 형식이 맞지 않아요",
     "Invalid Email Address": "이메일 주소가 맞지 않아요",
     "Invalid file%(extra)s": "파일%(extra)s이 맞지 않아요",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 초대하셨어요.",
     "Invite new room members": "새 구성원 초대하기",
     "Invited": "초대받기",
     "Invites": "초대하기",
@@ -214,18 +226,26 @@
     "Sign in with": "로그인",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText>음성</voiceText> 또는 <videoText>영상</videoText>으로 참여하세요.",
     "Join Room": "방에 들어가기",
+    "%(targetName)s joined the room.": "%(targetName)s님이 방에 들어오셨어요.",
     "Joins room with given alias": "받은 가명으로 방에 들어가기",
     "Jump to first unread message.": "읽지 않은 첫 메시지로 이동할래요.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s님이 %(targetName)s을 내쫓았어요.",
     "Kick": "내쫓기",
     "Kicks user with given id": "받은 ID로 사용자 내쫓기",
     "Labs": "실험실",
     "Last seen": "마지막으로 본 곳",
     "Leave room": "방 떠나기",
+    "%(targetName)s left the room.": "%(targetName)s님이 방을 떠나셨어요.",
     "Level:": "등급:",
     "Local addresses for this room:": "이 방의 로컬 주소:",
     "Logged in as:": "로그인:",
     "Logout": "로그아웃",
     "Low priority": "낮은 우선순위",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 방에 들어온 시점부터.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 누구나.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 알 수 없음 (%(visibility)s).",
     "Manage Integrations": "통합 관리",
     "Markdown is disabled": "마크다운이 꺼져있어요",
     "Markdown is enabled": "마크다운이 켜져있어요",
@@ -263,6 +283,7 @@
     "Phone": "전화",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "방을 암호화하면 암호화를 도중에 끌 수 없어요. (현재로서는)",
     "Only people who have been invited": "초대받은 사람만",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s님이 %(callType)s 전화를 걸었어요.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "이메일을 확인하시고 그 안에 있는 주소를 누르세요. 이 일을 하고 나서, 계속하기를 누르세요.",
     "Power level must be positive integer.": "권한 등급은 양의 정수여야만 해요.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (권한 %(powerLevelNumber)s)",
@@ -271,17 +292,22 @@
     "Private Chat": "비공개 이야기",
     "Privileged Users": "권한 있는 사용자",
     "Profile": "자기 소개",
+    "%(senderName)s removed their profile picture.": "%(senderName)s님이 자기 소개 사진을 지우셨어요.",
+    "%(senderName)s set a profile picture.": "%(senderName)s님이 자기 소개 사진을 설정하셨어요.",
     "Public Chat": "공개 이야기",
     "Reason": "이유",
     "Reason: %(reasonText)s": "이유: %(reasonText)s",
     "Revoke Moderator": "조정자 철회",
     "Refer a friend to Riot:": "라이엇을 친구에게 추천해주세요:",
     "Register": "등록",
+    "%(targetName)s rejected the invitation.": "%(targetName)s님이 초대를 거절하셨어요.",
     "Reject invitation": "초대 거절",
     "Rejoin": "다시 들어가기",
     "Remote addresses for this room:": "이 방의 원격 주소:",
     "Remove Contact Information?": "연락처를 지우시겠어요?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s님이 별명 (%(oldDisplayName)s)을 지우셨어요.",
     "Remove %(threePid)s?": "%(threePid)s 지우시겠어요?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s님이 인터넷전화 회의를 요청하셨어요.",
     "Resetting 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.": "비밀번호를 다시 설정하면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
     "Results from DuckDuckGo": "덕덕고에서 검색한 결과",
     "Return to login screen": "로그인 화면으로 돌아가기",
@@ -306,6 +332,7 @@
     "Send Invites": "초대 보내기",
     "Send Reset Email": "재설정 이메일 보내기",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈어요.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s님이 %(targetDisplayName)s님에게 들어오라는 초대를 보냈어요.",
     "Server error": "서버 오류",
     "Server may be unavailable or overloaded": "서버를 쓸 수 없거나 과부하일 수 있어요",
     "Server may be unavailable, overloaded, or search timed out :(": "서버를 쓸 수 없거나 과부하거나, 검색 시간을 초과했어요 :(",
@@ -313,6 +340,7 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "서버를 쓸 수 없거나 과부하거나, 오류에요.",
     "Server unavailable, overloaded, or something else went wrong.": "서버를 쓸 수 없거나 과부하거나, 다른 문제가 있어요.",
     "Session ID": "세션 ID",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s님이 별명을 %(displayName)s로 바꾸셨어요.",
     "Show panel": "패널 보이기",
     "Show Text Formatting Toolbar": "문자 서식 도구 보이기",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "시간을 12시간제로 보이기 (예. 오후 2:30)",
@@ -356,10 +384,12 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었어요.",
     "Turn Markdown off": "마크다운 끄기",
     "Turn Markdown on": "마크다운 켜기",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s님이 종단간 암호화를 켜셨어요 (알고리즘 %(algorithm)s).",
     "Unable to add email address": "이메일 주소를 추가할 수 없어요",
     "Unable to remove contact information": "연락처를 지울 수 없어요",
     "Unable to verify email address.": "이메일 주소를 인증할 수 없어요.",
     "Unban": "차단풀기",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님의 차단을 푸셨어요.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "이 이매알 주소가 초대를 받은 계정과 연결된 주소가 맞는지 확인할 수 없어요.",
     "Unable to capture screen": "화면을 찍을 수 없어요",
     "Unable to enable Notifications": "알림을 켤 수 없어요",
@@ -413,6 +443,7 @@
     "Who can read history?": "누가 기록을 읽을 수 있나요?",
     "Who would you like to add to this room?": "이 방에 누구를 초대하고 싶으세요?",
     "Who would you like to communicate with?": "누구와 이야기하고 싶으세요?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s님이 %(targetName)s니의 초대를 취소하셨어요.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "초대를 <acceptText>받아들이거나</acceptText> <declineText>거절</declineText>하시겠어요?",
     "You already have existing direct chats with this user:": "이미 이 사용자와 직접 이야기하는 중이에요:",
     "You are already in a call.": "이미 자신이 통화 중이네요.",
@@ -577,6 +608,9 @@
     "Start chatting": "이야기하기",
     "Start Chatting": "이야기하기",
     "Click on the button below to start chatting!": "이야기하려면 아래 버튼을 누르세요!",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s님이 방 아바타를 <img/>로 바꾸셨어요",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s님이 방 아바타를 지우셨어요.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s가 %(roomName)s 방의 아바타를 바꾸셨어요",
     "Username available": "쓸 수 있는 사용자 이름",
     "Username not available": "쓸 수 없는 사용자 이름",
     "Something went wrong!": "문제가 생겼어요!",
@@ -733,39 +767,5 @@
     "Collapse panel": "패널 접기",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "현재 브라우저에서는, 응용 프로그램의 모양과 기능이 완벽하게 맞지 않거나, 일부 혹은 모든 기능이 작동하지 않을 수 있어요. 계속할 수는 있지만, 맞닥뜨리는 모든 문제는 직접 해결하셔야해요!",
     "Checking for an update...": "업데이트를 확인하는 중...",
-    "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요",
-    "<target> accepted the invitation for %(displayName)s.": "<target>님이 %(displayName)s님에게서 초대를 수락했어요.",
-    "<target> accepted an invitation.": "<target>님이 초대를 수락했어요.",
-    "<sender> requested a VoIP conference.": "<sender>님이 인터넷전화 회의를 요청하셨어요.",
-    "<sender> invited <target>.": "<sender>님이 <target>님을 초대하셨어요.",
-    "<sender> banned <target>.": "<sender>님이 <target>님을 차단하셨어요.",
-    "<sender> set their display name to <displayName>.": "<sender>님이 별명을 <displayName>로 바꾸셨어요.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender>님이 별명 (<oldDisplayName>)을 지우셨어요.",
-    "<sender> removed their profile picture.": "<sender>님이 자기 소개 사진을 지우셨어요.",
-    "<sender> changed their profile picture.": "<sender>님이 자기 소개 사진을 바꾸셨어요.",
-    "<sender> set a profile picture.": "<sender>님이 자기 소개 사진을 설정하셨어요.",
-    "<target> joined the room.": "<target>님이 방에 들어오셨어요.",
-    "<target> rejected the invitation.": "<target>님이 초대를 거절하셨어요.",
-    "<target> left the room.": "<target>님이 방을 떠나셨어요.",
-    "<sender> unbanned <target>.": "<sender>님이 <target>님의 차단을 푸셨어요.",
-    "<sender> kicked <target>.": "<sender>님이 <target>을 내쫓았어요.",
-    "<sender> withdrew <target>'s invitation.": "<sender>님이 <target>니의 초대를 취소하셨어요.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender>님이 주제를 \"%(topic)s\"로 바꾸셨어요.",
-    "<sender> changed the room name to %(roomName)s.": "<sender>님이 방 이름을 %(roomName)s로 바꾸셨어요.",
-    "<sender> changed the room avatar to <img/>": "<sender>님이 방 아바타를 <img/>로 바꾸셨어요",
-    "<sender> changed the avatar for %(roomName)s": "<sender>가 %(roomName)s 방의 아바타를 바꾸셨어요",
-    "<sender> removed the room name.": "<sender>님이 방 이름을 지우셨어요.",
-    "<sender> removed the room avatar.": "<sender>님이 방 아바타를 지우셨어요.",
-    "<sender> answered the call.": "<sender>님이 전화를 받았어요.",
-    "<sender> ended the call.": "<sender>님이 전화를 끊었어요.",
-    "<sender> placed a %(callType)s call.": "<sender>님이 %(callType)s 전화를 걸었어요.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender>님이 %(targetDisplayName)s님에게 들어오라는 초대를 보냈어요.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 방에 들어온 시점부터.",
-    "<sender> made future room history visible to all room members.": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두.",
-    "<sender> made future room history visible to anyone.": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 누구나.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender>님이 이후 방의 기록을 볼 수 있게 하셨어요 알 수 없음 (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender>님이 종단간 암호화를 켜셨어요 (알고리즘 %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user>를 %(fromPowerLevel)s에서 %(toPowerLevel)s로",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender>님이 %(powerLevelDiffText)s의 권한 등급을 바꾸셨어요."
+    "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요"
 }
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index b1552f91e7..0c6bcb0977 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1,6 +1,8 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Teksta ziņa tika nosūtīta +%(msisdn)s. Lūdzu ievadi tajā atrodamo verifikācijas kodu",
     "Accept": "Pieņemt",
+    "%(targetName)s accepted an invitation.": "%(targetName)s apstiprināja uzaicinājumu.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s apstiprināja uzaicinājumu no %(displayName)s.",
     "Account": "Konts",
     "Access Token:": "Pieejas tokens:",
     "Active call (%(roomName)s)": "Aktīvs zvans (%(roomName)s)",
@@ -28,6 +30,7 @@
     "%(items)s and %(lastItem)s": "%(items)s un %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s un %(lastPerson)s raksta",
     "A new password must be entered.": "Nepieciešams ievadīt jauno paroli.",
+    "%(senderName)s answered the call.": "%(senderName)s atbildēja zvanam.",
     "An error has occurred.": "Notikusi kļūda.",
     "Anyone": "Ikviens",
     "Anyone who knows the room's link, apart from guests": "Ikviens, kurš zina adreses saiti uz istabu, izņemot viesus",
@@ -38,6 +41,7 @@
     "Are you sure you want to upload the following files?": "Vai tiešām vēlies augšuplādēt sekojošos failus?",
     "Attachment": "Pielikums",
     "Autoplay GIFs and videos": "Automātiski rādīt GIF animācijas un video",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s liedza pieeju %(targetName)s.",
     "Ban": "Nobanot/liegt pieeju",
     "Banned users": "Banotie/bloķētie lietotāji (kuriem liegta pieeja)",
     "Bans user with given id": "Bloķē (liedz pieeju) lietotāju pēc uzdotā ID (nobano)",
@@ -48,6 +52,11 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdodas savienoties ar bāzes serveri izmantojot HTTP protokolu, kad Tava pārlūka adreses laukā norādīts HTTPS protokols. Tā vietā izmanto HTTPS vai <a>iespējo nedrošos skriptus</a>.",
     "Can't load user settings": "Neizdevās ielādēt lietotāja iestatījumus",
     "Change Password": "Paroles maiņa",
+    "%(senderName)s changed their profile picture.": "%(senderName)s nomainīja profila attēlu.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s nomainīja statusa līmeni %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s nomainīja istabas nosaukumu uz %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s dzēsa istabas nosaukumu.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s nomainīja tēmas nosaukumu uz \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Izmaiņas attiecībā uz to, kurš varēs lasīt vēstures ziņas, stāsies spēkā tikai uz ziņām,kuras vēl tiks pievienotas šajā istabā",
     "Changes your display nickname": "Nomaina Tavu publisko segvārdu (niku)",
     "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.": "Paroles maiņa dzēsīs pašreizējās šifrēšanas atslēgas visās savstarpēji saistītajās ierīcēs, padarot čata vēsturi neizlasāmu, ja vien vien istabas atslēgas nav tikušas iepriekš eksportētas un no jauna importētas atpakaļ. Nākotnē to plānojam uzlabot.",
@@ -121,6 +130,7 @@
     "Encrypted room": "Šifrēta istaba",
     "Encryption is enabled in this room": "Šajā istabā šifrēšana ir ieslēgta",
     "Encryption is not enabled in this room": "Šajā istabā šifrēšana ir izslēgta",
+    "%(senderName)s ended the call.": "%(senderName)s beidza zvanu.",
     "End-to-end encryption information": "\"End-to-End\" (ierīce-ierīce) šifrēšanas informācija",
     "End-to-end encryption is in beta and may not be reliable": "\"End-to-end\" (ierīce-ierīce) šifrēšana šobrīd ir beta stadijā, un var nebūt stabila",
     "Enter Code": "Ievadi kodu",
@@ -166,6 +176,7 @@
     "Forgot your password?": "Aizmirsi paroli?",
     "For security, this session has been signed out. Please sign in again.": "Drošības nolūkos, šī sesija ir beigusies. Lūdzu, pieraksties par jaunu.",
     "For security, 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.": "Drošības nolūkos, izrakstīšanās dzēsīs jebkādas ierīce-ierīce šifrēšanas atslēgas no šī pārlūka. Ja Tu vēlies  saglabāt iespēju atšifrēt tavu saziņas vēsturi no Riot nākotnes sesijām, lūdzu eksportē tavas istabas atslēgas, saglabājot tās drošā vietā.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s no %(fromPowerLevel)s uz %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Šajā Bāzes serverī viesu pierakstīšanās nav iespējama.",
     "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai, pat ja ir uzaicināti.",
     "Hangup": "Beigt zvanu",
@@ -188,6 +199,7 @@
     "Invalid address format": "Nepareizs adreses formāts",
     "Invalid Email Address": "Nepareiza epasta adrese",
     "Invalid file%(extra)s": "Nederīgs fails %(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s uzaicināja %(targetName)s.",
     "Invite new room members": "Uzaicināt jaunus istabas biedrus",
     "Invited": "Uzaicināts/a",
     "Invites": "Uzaicinājumi",
@@ -198,18 +210,26 @@
     "Sign in with": "Pierakstīties ar",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>AUDIO</voiceText> vai <videoText>VIDEO</videoText>.",
     "Join Room": "Pievienoties istabai",
+    "%(targetName)s joined the room.": "%(targetName)s pievienojās istabai.",
     "Joins room with given alias": "Pievienojas istabai ar minēto aliasi (pseidonīmu)",
     "Jump to first unread message.": "Pāriet uz pirmo neizlasīto ziņu.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s iespēra (kick) %(targetName)s.",
     "Kick": "Izspert/padzīt no istabas (kick)",
     "Kicks user with given id": "Padzen (kick) lietotāju ar norādīto Id",
     "Labs": "Izmēģinājumu lauciņš",
     "Last seen": "Pēdējo reizi redzēts/a",
     "Leave room": "Doties prom no istabas",
+    "%(targetName)s left the room.": "%(targetName)s devās prom no istabas.",
     "Level:": "Līmenis:",
     "Local addresses for this room:": "Šīs istabas lokālās adreses:",
     "Logged in as:": "Pierakstījās kā:",
     "Logout": "Izrakstīties",
     "Low priority": "Zemas prioritātes",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem ar brīdi, kad tie pievienojās.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
     "Manage Integrations": "Pārvaldīt integrācijas",
     "Markdown is disabled": "\"Markdown\" formatēšana izslēgta",
     "Markdown is enabled": "\"Markdown\" formatēšana ieslēgta",
@@ -255,6 +275,7 @@
     "People": "Cilvēki",
     "Permissions": "Atļaujas",
     "Phone": "Telefons",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s veica %(callType)s zvanu.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lūdzu pārbaudi savu epastu un noklikšķini tajā esošo saiti. Tiklīdz tas ir izdarīts, klikšķini \"turpināt\".",
     "Press <StartChatButton> to start a chat with someone": "Nospied <StartChatButton>, lai ar kādu uzsāktu čalošanu",
     "Privacy warning": "Privātuma brīdinājums",
@@ -267,12 +288,16 @@
     "Revoke Moderator": "Atcelt moderatoru",
     "Refer a friend to Riot:": "Rekomendēt draugam Riot:",
     "Register": "Reģistrēties",
+    "%(targetName)s rejected the invitation.": "%(targetName)s noraidīja uzaicinājumu.",
     "Reject invitation": "Noraidīt uzaicinājumu",
     "Rejoin": "Pievienoties atkārtoti",
     "Remote addresses for this room:": "Attālinātā adrese šai istabai:",
     "Remove Contact Information?": "Dzēst kontaktinformāciju?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s dzēsa attēlojamo/redzamo vārdu (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s dzēsa profila attēlu.",
     "Remove": "Dzēst",
     "Remove %(threePid)s?": "Dzēst %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s vēlas VoIP konferenci.",
     "Resetting 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.": "Paroles atiestatīšana atiestatīs visas ierīce-ierīce šifrēšanas atslēgas visās ierīcēs, padarot čata šifrēto ziņu vēsturi nelasāmu, ja vien Tu pirms tam neesi eksportējis savas istabas atslēgas un atkārtoti importējis tās atpakaļ. Nākotnē šo ir plānots uzlabot.",
     "Results from DuckDuckGo": "Rezultāti no DuckDuckGo",
     "Return to login screen": "Atgriezties uz pierakstīšanās lapu",
@@ -289,9 +314,14 @@
     "%(roomName)s is not accessible at this time.": "%(roomName)s šobrīd nav pieejama.",
     "Seen by %(userName)s at %(dateTime)s": "Redzējis %(userName)s %(dateTime)s",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s nosūtīja attēlu.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
+    "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nomainīja attēlojamo/redzamo vārdu uz: %(displayName)s.",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Tevis uzdotā pierakstīšanās atslēga sakrīt ar atslēgu, kuru Tu saņēmi no %(userId)s ierīces %(deviceId)s. Ierīce tika atzīmēta kā verificēta.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Faila '%(fileName)s' izmērs pārsniedz šī Bāzes servera augšupielādes lieluma ierobežojumu",
     "The file '%(fileName)s' failed to upload": "Failu '%(fileName)s' neizdevās nosūtīt (augšuplādēt)",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza \"end-to-end\" (ierīce-ierīce) šifrēšanu (algorithm %(algorithm)s).",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas ierobežojumu (atbanoja) %(targetName)s.",
     "Unknown room %(roomId)s": "Nezināma istaba %(roomId)s",
     "Uploading %(filename)s and %(count)s others|zero": "Tiek augšuplādēts %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Tiek augšuplādēts %(filename)s un %(count)s citi",
@@ -300,6 +330,7 @@
     "Username invalid: %(errMessage)s": "Neatbilstošs lietotājvārds: %(errMessage)s",
     "(unknown failure: %(reason)s)": "(nezināma kļūda: %(reason)s)",
     "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!": "BRĪDINĀJUMS: NEIZDEVĀS VERIFICĒT ATSLĒGU! Pierakstīšanās atslēga priekš %(userId)s un ierīces %(deviceId)s ir \"%(fprint)s\", kura nesakrīt ar ievadīto atslēgu \"%(fingerprint)s\". Tas var nozīmēt, ka Tava saziņa var tikt pārtverta!",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s atsauca %(targetName)s uzaicinājumu.",
     "You are trying to access %(roomName)s.": "Tu mēģini piekļūt %(roomName)s.",
     "You have been banned from %(roomName)s by %(userName)s.": "Tev ir liegta pieeja istabai %(roomName)s no %(userName)s.",
     "You have been invited to join this room by %(inviterName)s": "%(inviterName)s Tevi uzaicināja pievienoties šai istabai",
@@ -317,6 +348,8 @@
     "You are registering with %(SelectedTeamName)s": "Tu reģistrējies ar %(SelectedTeamName)s",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Notiek Tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
     "Ongoing conference call%(supportedText)s.": "Notiekošs konferences zvans %(supportedText)s.",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas avataru.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja istabas avataru %(roomName)s",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "Tu pievienoji jaunu ierīci '%(displayName)s', kas prasa šifrēšanas atslēgas.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Tava neverificētā ierīce '%(displayName)s' pieprasa šifrēšanas atslēgas.",
     "Room Colour": "Istabas krāsa",
@@ -477,6 +510,7 @@
     "Nov": "Nov.",
     "Dec": "Dec.",
     "Set a display name:": "Iestatīt attēloto vārdu:",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s nomainīja istabas avataru uz <img/>",
     "Upload an avatar:": "Augšuplādē avataru (profila attēlu):",
     "This server does not support authentication with a phone number.": "Šis serveris neatbalsta autentifikāciju pēc telefona numura.",
     "Missing password.": "Trūkst parole.",
@@ -629,6 +663,8 @@
     "Automatically replace plain text Emoji": "Automātiski aizvietot tekstu ar emocīšiem (emoji)",
     "Failed to upload image": "Neizdevās augšupielādēt attēlu",
     "Hide avatars in user and room mentions": "Slēpt profila attēlus lietotāja un istabas pieminējumos",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pievienoja %(widgetName)s vidžetu",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s dzēsa vidžetu %(widgetName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robotu pārbaude šobrīd nav pieejama darbvirsmas versijā. Lūdzu izmanto <a>web pārlūku</a>",
     "Revoke widget access": "Atsaukt vidžeta piekļuvi",
     "Unpin Message": "Atkabināt ziņu",
@@ -676,6 +712,9 @@
     "You are now ignoring %(userId)s": "Tagad Tu ignorē %(userId)s",
     "Unignored user": "Atignorēts lietotājs",
     "You are no longer ignoring %(userId)s": "Tu vairāk neignorē %(userId)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s nomainīja savu attēlojamo/redzamo vārdu uz %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s šai istabai nomainīja piestiprinātās ziņas.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s un %(count)s citi raksta",
     "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta",
     "Message Pinning": "Ziņu piekabināšana",
@@ -1087,44 +1126,5 @@
     "Collapse panel": "Sakļaut (saritināt) paneli",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Tavā pašreizējā pārlūkā aplikācijas izskats un uzvedība var būt pilnīgi neatbilstoša, kā arī dažas no visām funkcijām var nedarboties. Ja vēlies turpināt izmantot šo pārlūku, Tu vari arī turpināt, apzinoties, ka šajā gadījumā esi viens/a ar iespējamo problēmu!",
     "Checking for an update...": "Lūkojos pēc aktualizācijas...",
-    "There are advanced notifications which are not shown here": "Pastāv papildus paziņojumi, kuri šeit netiek rādīti",
-    "<target> accepted the invitation for %(displayName)s.": "<target> apstiprināja uzaicinājumu no %(displayName)s.",
-    "<target> accepted an invitation.": "<target> apstiprināja uzaicinājumu.",
-    "<sender> requested a VoIP conference.": "<sender> vēlas VoIP konferenci.",
-    "<sender> invited <target>.": "<sender> uzaicināja <target>.",
-    "<sender> banned <target>.": "<sender> liedza pieeju <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> nomainīja savu attēlojamo/redzamo vārdu uz <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> nomainīja attēlojamo/redzamo vārdu uz: <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> dzēsa attēlojamo/redzamo vārdu (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> dzēsa profila attēlu.",
-    "<sender> changed their profile picture.": "<sender> nomainīja profila attēlu.",
-    "<sender> set a profile picture.": "<sender> uzstādīja profila attēlu.",
-    "<target> joined the room.": "<target> pievienojās istabai.",
-    "<target> rejected the invitation.": "<target> noraidīja uzaicinājumu.",
-    "<target> left the room.": "<target> devās prom no istabas.",
-    "<sender> unbanned <target>.": "<sender> atcēla pieejas ierobežojumu (atbanoja) <target>.",
-    "<sender> kicked <target>.": "<sender> iespēra (kick) <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> atsauca <target> uzaicinājumu.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> nomainīja tēmas nosaukumu uz \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> nomainīja istabas nosaukumu uz %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> nomainīja istabas avataru %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> nomainīja istabas avataru uz <img/>",
-    "<sender> removed the room name.": "<sender> dzēsa istabas nosaukumu.",
-    "<sender> removed the room avatar.": "<sender> dzēsa istabas avataru.",
-    "<sender> answered the call.": "<sender> atbildēja zvanam.",
-    "<sender> ended the call.": "<sender> beidza zvanu.",
-    "<sender> placed a %(callType)s call.": "<sender> veica %(callType)s zvanu.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem ar brīdi, kad tie pievienojās.",
-    "<sender> made future room history visible to all room members.": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
-    "<sender> made future room history visible to anyone.": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> padarīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ieslēdza \"end-to-end\" (ierīce-ierīce) šifrēšanu (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> no %(fromPowerLevel)s uz %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> nomainīja statusa līmeni %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> šai istabai nomainīja piestiprinātās ziņas.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s vidžets, kuru mainīja <sender>",
-    "%(widgetName)s widget added by <sender>": "<sender> pievienoja %(widgetName)s vidžetu",
-    "%(widgetName)s widget removed by <sender>": "<sender> dzēsa vidžetu %(widgetName)s"
+    "There are advanced notifications which are not shown here": "Pastāv papildus paziņojumi, kuri šeit netiek rādīti"
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 90c9bf799e..1ba068daa0 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1,5 +1,7 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Voer alsjeblieft de verificatiecode in die is verstuurd naar +%(msisdn)s",
+    "%(targetName)s accepted an invitation.": "%(targetName)s heeft een uitnodiging geaccepteerd.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s heeft de uitnodiging voor %(displayName)s geaccepteerd.",
     "Account": "Account",
     "Access Token:": "Toegangstoken:",
     "Add email address": "Voeg een e-mailadres toe",
@@ -14,6 +16,7 @@
     "and %(count)s others...|one": "en één andere...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s en %(lastPerson)s zijn aan het typen",
     "A new password must be entered.": "Er moet een nieuw wachtwoord worden ingevoerd.",
+    "%(senderName)s answered the call.": "%(senderName)s heeft deelgenomen aan het audiogesprek.",
     "An error has occurred.": "Er is een fout opgetreden.",
     "Anyone who knows the room's link, apart from guests": "Iedereen die de link van de ruimte weet, behalve gasten",
     "Anyone who knows the room's link, including guests": "Iedereen die link van de ruimte weet, inclusief gasten",
@@ -21,6 +24,7 @@
     "Are you sure you want to reject the invitation?": "Weet je zeker dat je de uitnodiging wilt weigeren?",
     "Attachment": "Bijlage",
     "Autoplay GIFs and videos": "Start GIFs en videos automatisch",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s heeft %(targetName)s verbannen.",
     "Ban": "Verban",
     "Banned users": "Verbannen gebruikers",
     "Bans user with given id": "Verbant de gebruiker met het gegeven ID",
@@ -30,6 +34,10 @@
     "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 niet met de thuisserver verbinden via HTTP wanneer er een HTTPS-URL in je browser balk staat. Gebruik HTTPS of <a>activeer onveilige scripts</a>.",
     "Can't load user settings": "Kan de gebruikersinstellingen niet laden",
     "Change Password": "Wachtwoord veranderen",
+    "%(senderName)s changed their profile picture.": "%(senderName)s heeft zijn of haar profielfoto veranderd.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de ruimtenaam van %(roomName)s gewijzigd.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s heeft het onderwerp gewijzigd naar \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Veranderingen aan wie de geschiedenis kan lezen worden alleen maar toegepast op toekomstige berichten in deze ruimte",
     "Changes your display nickname": "Verandert jouw weergavenaam",
     "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.": "Het veranderen van het wachtwoord zal op het moment alle eind-tot-eind encryptie sleutels resetten, wat alle versleutelde gespreksgeschiedenis onleesbaar zou maken, behalve als je eerst je ruimtesleutels exporteert en achteraf opnieuw importeert. Dit zal worden verbeterd in de toekomst.",
@@ -114,6 +122,7 @@
     "People": "Mensen",
     "Permissions": "Toestemmingen",
     "Phone": "Telefoonnummer",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s heeft een %(callType)s-gesprek gestart.",
     "Privacy warning": "Privacywaarschuwing",
     "Private Chat": "Privégesprek",
     "Privileged Users": "Gebruikers met rechten",
@@ -124,6 +133,7 @@
     "Revoke Moderator": "Beheerder terugtrekken",
     "Refer a friend to Riot:": "Laat een vriend weten over Riot:",
     "Register": "Registreer",
+    "%(targetName)s rejected the invitation.": "%(targetName)s heeft de uitnodiging geweigerd.",
     "Reject invitation": "Uitnodiging weigeren",
     "Rejoin": "Opnieuw toetreden",
     "Remote addresses for this room:": "Adres op afstand voor deze ruimte:",
@@ -164,6 +174,7 @@
     "Create an account": "Open een account",
     "Cryptography": "Cryptografie",
     "Current password": "Huidig wachtwoord",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de naam van de ruimte verwijderd.",
     "Create a new chat or reuse an existing one": "Maak een nieuw gesprek aan of hergebruik een al bestaand gesprek",
     "Create Room": "Maak een ruimte aan",
     "Curve25519 identity key": "Curve25519-identiteitssleutel",
@@ -209,6 +220,7 @@
     "Encrypted room": "Versleutelde ruimte",
     "Encryption is enabled in this room": "Versleuteling is ingeschakeld in deze ruimte",
     "Encryption is not enabled in this room": "Versleuteling is niet ingeschakeld in deze ruimte",
+    "%(senderName)s ended the call.": "%(senderName)s heeft opgehangen.",
     "End-to-end encryption information": "end-to-endbeveiligingsinformatie",
     "End-to-end encryption is in beta and may not be reliable": "End-to-endbeveiliging is nog in bèta en kan onbetrouwbaar zijn",
     "Enter Code": "Voer code in",
@@ -247,6 +259,7 @@
     "Forgot your password?": "Wachtwoord vergeten?",
     "For security, this session has been signed out. Please sign in again.": "Voor veiligheidsredenen is deze sessie uitgelogd. Log alsjeblieft opnieuw in.",
     "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 deze ruimte toetreden, zelfs als ze expliciet uitgenodigd zijn.",
     "Hangup": "Ophangen",
@@ -269,6 +282,7 @@
     "Invalid address format": "Ongeldig adresformaat",
     "Invalid Email Address": "Ongeldig e-mailadres",
     "Invalid file%(extra)s": "Ongeldig bestand%(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s heeft %(targetName)s uitgenodigd.",
     "Invite new room members": "Nieuwe ruimte leden uitnodigen",
     "Invited": "Uitgenodigd",
     "Invites": "Uitnodigingen",
@@ -279,16 +293,23 @@
     "Sign in with": "Inloggen met",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Toetreden als <voiceText>spraak</voiceText> of <videoText>video</videoText>.",
     "Join Room": "Ruimte toetreden",
+    "%(targetName)s joined the room.": "%(targetName)s is tot de ruimte toegetreden.",
     "Joins room with given alias": "Treed de ruimte toe met een gegeven naam",
     "Jump to first unread message.": "Spring naar het eerste ongelezen bericht.",
     "Labs": "Labs",
     "Last seen": "Laatst gezien",
     "Leave room": "Ruimte verlaten",
+    "%(targetName)s left the room.": "%(targetName)s heeft de ruimte verlaten.",
     "Level:": "Niveau:",
     "Local addresses for this room:": "Lokale adressen voor deze ruimte:",
     "Logged in as:": "Ingelogd als:",
     "Logout": "Uitloggen",
     "Low priority": "Lage prioriteit",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze uitgenodigd zijn.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze toegetreden zijn.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor iedereen.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
     "Manage Integrations": "Integraties beheren",
     "Markdown is disabled": "Markdown is uitgeschakeld",
     "Markdown is enabled": "Markdown ingeschakeld",
@@ -307,9 +328,12 @@
     "Only people who have been invited": "Alleen personen die zijn uitgenodigd",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bekijk je e-mail en klik op de link die het bevat. Zodra dit klaar is, klik op verder gaan.",
     "Power level must be positive integer.": "Machtsniveau moet een positief geheel getal zijn.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s heeft zijn of haar weergavenaam (%(oldDisplayName)s) verwijderd.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s heeft zijn of haar profielfoto verwijderd.",
     "Failed to kick": "Niet gelukt om te er uit te zetten",
     "Press <StartChatButton> to start a chat with someone": "Druk op <StartChatButton> om een gesprek met iemand te starten",
     "Remove %(threePid)s?": "%(threePid)s verwijderen?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s heeft een VoIP-gesprek aangevraagd.",
     "Resetting 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.": "Het wachtwoord veranderen betekent momenteel dat alle end-to-endbeveiligingssleutels op alle apparaten veranderen waardoor versleutelde gespreksgeschiedenis onleesbaar wordt, behalve als je eerst de ruimte sleutels exporteert en daarna opnieuw importeert. Dit zal in de toekomst verbeterd worden.",
     "Results from DuckDuckGo": "Resultaten van DuckDuckGo",
     "Return to login screen": "Naar het inlogscherm terugkeren",
@@ -333,6 +357,7 @@
     "Sender device information": "Afzenderapparaatinformatie",
     "Send Reset Email": "Stuur Reset-E-mail",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s stuurde een afbeelding.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s stuurde een uitnodiging naar %(targetDisplayName)s om tot de ruimte toe te treden.",
     "Server error": "Serverfout",
     "Server may be unavailable or overloaded": "De server kan onbereikbaar of overbelast zijn",
     "Server may be unavailable, overloaded, or search timed out :(": "De server is misschien onbereikbaar, overbelast of het zoeken duurde te lang :(",
@@ -340,8 +365,11 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "De server is misschien onbereikbaar, overbelast of je bent tegen een fout aangelopen.",
     "Server unavailable, overloaded, or something else went wrong.": "De server is onbereikbaar, overbelast of iets anders ging fout.",
     "Session ID": "Sessie-ID",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s heeft %(targetName)s de ruimte uitgestuurd.",
     "Kick": "Er uit sturen",
     "Kicks user with given id": "Stuurt de gebruiker met het gegeven ID er uit",
+    "%(senderName)s set a profile picture.": "%(senderName)s heeft een profielfoto ingesteld.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s heeft zijn of haar weergavenaam naar %(displayName)s veranderd.",
     "Show panel": "Paneel weergeven",
     "Show Text Formatting Toolbar": "Tekstopmaakwerkbalk Weergeven",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Laat de tijd in twaalf uur formaat zien (bijv. 2:30pm)",
@@ -379,10 +407,12 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Het is niet gelukt om een specifiek punt in de tijdlijn van deze ruimte te laden.",
     "Turn Markdown off": "Zet Markdown uit",
     "Turn Markdown on": "Zet Markdown aan",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft end-to-endbeveiliging aangezet (algoritme %(algorithm)s).",
     "Unable to add email address": "Niet mogelijk om e-mailadres toe te voegen",
     "Unable to remove contact information": "Niet mogelijk om contactinformatie te verwijderen",
     "Unable to verify email address.": "Niet mogelijk om het e-mailadres te verifiëren.",
     "Unban": "Ontbannen",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ontbande %(targetName)s.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Niet mogelijk om vast te stellen dat het adres waar deze uitnodiging naartoe was verstuurd overeenkomt met het adres dat is geassocieerd met je account.",
     "Unable to capture screen": "Niet mogelijk om het scherm vast te leggen",
     "Unable to enable Notifications": "Niet mogelijk om notificaties aan te zetten",
@@ -438,6 +468,7 @@
     "Who can read history?": "Wie kan de geschiedenis lezen?",
     "Who would you like to add to this room?": "Wie wil je aan deze ruimte toevoegen?",
     "Who would you like to communicate with?": "Met wie zou je willen communiceren?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trok %(targetName)s's uitnodiging terug.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Wil je deze uitnodiging <acceptText>accepteren</acceptText> of <declineText>afwijzen</declineText>?",
     "You already have existing direct chats with this user:": "Je hebt al bestaande privé-gesprekken met deze gebruiker:",
     "You are already in a call.": "Je bent al in gesprek.",
@@ -578,6 +609,9 @@
     "Start chatting": "Start met praten",
     "Start Chatting": "Start Met Praten",
     "Click on the button below to start chatting!": "Klik op de knop hieronder om te starten met praten!",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s heeft de ruimte avatar aangepast naar <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s heeft de ruimte avatar verwijderd.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s veranderde de avatar voor %(roomName)s",
     "Username available": "Gebruikersnaam beschikbaar",
     "Username not available": "Gebruikersnaam niet beschikbaar",
     "Something went wrong!": "Iets ging niet goed!",
@@ -630,7 +664,10 @@
     "Automatically replace plain text Emoji": "Automatisch normale tekst vervangen met Emoji",
     "Failed to upload image": "Het is niet gelukt om de afbeelding te uploaden",
     "Hide avatars in user and room mentions": "Avatars in gebruiker- en ruimte-vermeldingen verbergen",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget toegevoegd door %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget verwijderd door %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot-check is momenteel niet beschikbaar op de desktop - gebruik in plaats daarvan een <a>webbrowser</a>",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget aangepast door %(senderName)s",
     "Copied!": "Gekopieerd!",
     "Failed to copy": "Kopiëren mislukt",
     "Unpin Message": "Maak pin los",
@@ -663,6 +700,7 @@
     "You are now ignoring %(userId)s": "Je bent nu %(userId)s aan het negeren",
     "Unignored user": "Niet genegeerde gebruiker",
     "You are no longer ignoring %(userId)s": "Je bent %(userId)s niet meer aan het negeren",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s heeft de gepinde boodschappen voor de ruimte gewijzigd.",
     "%(names)s and %(count)s others are typing|other": "%(names)s en %(count)s andere gebruikers zijn aan het typen",
     "%(names)s and %(count)s others are typing|one": "%(names)s en iemand anders is aan het typen",
     "Send": "Verstuur",
@@ -918,6 +956,7 @@
     "<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.": "Deze ruimte is niet publiekelijk. Je zal niet opnieuw kunnen toetreden zonder een uitnodiging.",
     "were unbanned %(count)s times|one": "waren ontbant",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s heeft zijn/haar weergavenaam veranderd naar %(displayName)s.",
     "Disable Community Filter Panel": "Gemeenschapsfilterpaneel uitzetten",
     "Your key share request has been sent - please check your other devices for key share requests.": "Je verzoek om sleutels te delen is verzonden - controleer je andere apparaten voor het verzoek.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Verzoeken om sleutels te delen worden automatisch naar andere apparaten verstuurd. Als je het verzoek hebt afgewezen of weg hebt geklikt, klik dan hier voor een nieuwe verzoek voor de sleutels van deze sessie.",
@@ -1141,44 +1180,5 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Deze ruimte wordt gebruikt voor belangrijke berichten van de thuisserver, dus je kan het niet verlaten.",
     "Terms and Conditions": "Voorwaarden",
     "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 zal je de voorwaarden moeten lezen en ermee akkoord moeten gaan.",
-    "Review terms and conditions": "Voorwaarden lezen",
-    "<target> accepted the invitation for %(displayName)s.": "<target> heeft de uitnodiging voor %(displayName)s geaccepteerd.",
-    "<target> accepted an invitation.": "<target> heeft een uitnodiging geaccepteerd.",
-    "<sender> requested a VoIP conference.": "<sender> heeft een VoIP-gesprek aangevraagd.",
-    "<sender> invited <target>.": "<sender> heeft <target> uitgenodigd.",
-    "<sender> banned <target>.": "<sender> heeft <target> verbannen.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> heeft zijn/haar weergavenaam veranderd naar <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> heeft zijn of haar weergavenaam naar <displayName> veranderd.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> heeft zijn of haar weergavenaam (<oldDisplayName>) verwijderd.",
-    "<sender> removed their profile picture.": "<sender> heeft zijn of haar profielfoto verwijderd.",
-    "<sender> changed their profile picture.": "<sender> heeft zijn of haar profielfoto veranderd.",
-    "<sender> set a profile picture.": "<sender> heeft een profielfoto ingesteld.",
-    "<target> joined the room.": "<target> is tot de ruimte toegetreden.",
-    "<target> rejected the invitation.": "<target> heeft de uitnodiging geweigerd.",
-    "<target> left the room.": "<target> heeft de ruimte verlaten.",
-    "<sender> unbanned <target>.": "<sender> ontbande <target>.",
-    "<sender> kicked <target>.": "<sender> heeft <target> de ruimte uitgestuurd.",
-    "<sender> withdrew <target>'s invitation.": "<sender> trok <target>'s uitnodiging terug.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> heeft het onderwerp gewijzigd naar \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> heeft de ruimtenaam van %(roomName)s gewijzigd.",
-    "<sender> changed the room avatar to <img/>": "<sender> heeft de ruimte avatar aangepast naar <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> veranderde de avatar voor %(roomName)s",
-    "<sender> removed the room name.": "<sender> heeft de naam van de ruimte verwijderd.",
-    "<sender> removed the room avatar.": "<sender> heeft de ruimte avatar verwijderd.",
-    "<sender> answered the call.": "<sender> heeft deelgenomen aan het audiogesprek.",
-    "<sender> ended the call.": "<sender> heeft opgehangen.",
-    "<sender> placed a %(callType)s call.": "<sender> heeft een %(callType)s-gesprek gestart.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> stuurde een uitnodiging naar %(targetDisplayName)s om tot de ruimte toe te treden.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze uitgenodigd zijn.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze toegetreden zijn.",
-    "<sender> made future room history visible to all room members.": "<sender> heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor alle ruimte deelnemers.",
-    "<sender> made future room history visible to anyone.": "<sender> heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor iedereen.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> heeft de toekomstige ruimte geschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> heeft end-to-endbeveiliging aangezet (algoritme %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> van %(fromPowerLevel)s naar %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
-    "<sender> changed the pinned messages for the room.": "<sender> heeft de gepinde boodschappen voor de ruimte gewijzigd.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s-widget aangepast door <sender>",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s-widget toegevoegd door <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s-widget verwijderd door <sender>"
+    "Review terms and conditions": "Voorwaarden lezen"
 }
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index c70f1c6e22..0088028aed 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -99,6 +99,8 @@
     "Failed to change password. Is your password correct?": "Zmiana hasła nie powiodła się. Czy Twoje hasło jest poprawne?",
     "Add a topic": "Dodaj temat",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Wysłano wiadomość tekstową do +%(msisdn)s. Proszę wprowadzić kod w niej zawarty",
+    "%(targetName)s accepted an invitation.": "%(targetName)s zaakceptował(a) zaproszenie.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s zaakceptował(a) zaproszenie dla %(displayName)s.",
     "Access Token:": "Jednorazowy kod dostępu:",
     "Active call (%(roomName)s)": "Aktywne połączenie (%(roomName)s)",
     "Add email address": "Dodaj adres e-mail",
@@ -117,6 +119,7 @@
     "%(items)s and %(lastItem)s": "%(items)s i %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s i %(lastPerson)s piszą",
     "A new password must be entered.": "Musisz wprowadzić nowe hasło.",
+    "%(senderName)s answered the call.": "%(senderName)s odebrał połączenie.",
     "An error has occurred.": "Wystąpił błąd.",
     "Anyone": "Każdy",
     "Anyone who knows the room's link, apart from guests": "Każdy kto posiada łącze do pokoju, poza gośćmi",
@@ -125,6 +128,7 @@
     "Are you sure you want to reject the invitation?": "Czy na pewno chcesz odrzucić zaproszenie?",
     "Are you sure you want to upload the following files?": "Czy na pewno chcesz przesłać następujące pliki?",
     "Autoplay GIFs and videos": "Automatycznie odtwarzaj GIFy i filmiki",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s zbanował %(targetName)s.",
     "Ban": "Zbanuj",
     "Bans user with given id": "Blokuje użytkownika o podanym ID",
     "Blacklisted": "Umieszczono na czarnej liście",
@@ -139,6 +143,11 @@
     "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>.": "Nie można nawiązać połączenia z serwerem przy użyciu HTTP podczas korzystania z HTTPS dla bieżącej strony. Użyj HTTPS lub <a>włącz niebezpieczne skrypty</a>.",
     "Can't load user settings": "Nie można załadować ustawień użytkownika",
     "Cannot add any more widgets": "Nie można dodać już więcej widżetów",
+    "%(senderName)s changed their profile picture.": "%(senderName)s zmienił swoje zdjęcie profilowe.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmienił poziom mocy %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmienił nazwę pokoju na %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s usunął nazwę pokoju.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmienił temat na \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Zmiany w dostępie do historii będą dotyczyć tylko przyszłych wiadomości w tym pokoju",
     "Changes your display nickname": "Zmień swój pseudonim",
     "Changes colour scheme of current room": "Zmień schemat kolorystyczny bieżącego pokoju",
@@ -205,6 +214,7 @@
     "Encrypted room": "Pokój szyfrowany",
     "Encryption is enabled in this room": "Szyfrowanie jest włączone w tym pokoju",
     "Encryption is not enabled in this room": "Szyfrowanie nie jest włączone w tym pokoju",
+    "%(senderName)s ended the call.": "%(senderName)s zakończył połączenie.",
     "End-to-end encryption information": "Informacje o szyfrowaniu końcówka-do-końcówki",
     "End-to-end encryption is in beta and may not be reliable": "Szyfrowanie końcówka-do-końcówki jest w fazie beta i może nie być dopracowane",
     "Enter Code": "Wpisz kod",
@@ -244,6 +254,7 @@
     "Forgot your password?": "Zapomniałeś hasła?",
     "For security, this session has been signed out. Please sign in again.": "Ze względów bezpieczeństwa ta sesja została wylogowana. Zaloguj się jeszcze raz.",
     "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.": "Ze względów bezpieczeństwa, wylogowanie skasuje z tej przeglądarki wszystkie klucze szyfrowania końcówka-do-końcówki. Jeśli chcesz móc odszyfrować swoje historie konwersacji z przyszłych sesji Riot-a, proszę wyeksportuj swoje klucze pokojów do bezpiecznego miejsca.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Dostęp dla gości jest wyłączony na tym serwerze.",
     "Deops user with given id": "Usuwa prawa administratora użytkownikowi o danym ID",
     "Guests cannot join this room even if explicitly invited.": "Goście nie mogą dołączać do tego pokoju, nawet jeśli zostali specjalnie zaproszeni.",
@@ -266,6 +277,7 @@
     "Invalid address format": "Nieprawidłowy format adresu",
     "Invalid Email Address": "Nieprawidłowy adres e-mail",
     "Invalid file%(extra)s": "Nieprawidłowy plik %(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s zaprosił %(targetName)s.",
     "Invite new room members": "Zaproś nowych członków do pokoju",
     "Invited": "Zaproszony",
     "Invites": "Zaproszenia",
@@ -276,19 +288,27 @@
     "Sign in with": "Zaloguj się używając",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Dołącz <voiceText>głosowo</voiceText> lub przez <videoText>wideo</videoText>.",
     "Join Room": "Dołącz do pokoju",
+    "%(targetName)s joined the room.": "%(targetName)s dołączył do pokoju.",
     "Joins room with given alias": "Dołącz do pokoju o podanym aliasie",
     "Jump to first unread message.": "Przeskocz do pierwszej nieprzeczytanej wiadomości.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s wyrzucił %(targetName)s.",
     "Kick": "Wyrzuć",
     "Kicks user with given id": "Wyrzuca użytkownika o danym ID",
     "Labs": "Laboratoria",
     "Last seen": "Ostatnio widziany",
     "Leave room": "Opuść pokój",
+    "%(targetName)s left the room.": "%(targetName)s opuścił pokój.",
     "Level:": "Poziom:",
     "Publish this room to the public in %(domain)s's room directory?": "Czy opublikować ten pokój dla ogółu w spisie pokojów domeny %(domain)s?",
     "Local addresses for this room:": "Lokalne adresy dla tego pokoju:",
     "Logged in as:": "Zalogowany jako:",
     "Logout": "Wyloguj",
     "Low priority": "Niski priorytet",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich dołączenia.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla kazdego.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
     "Manage Integrations": "Zarządzaj integracjami",
     "Markdown is disabled": "Markdown jest wyłączony",
     "Markdown is enabled": "Markdown jest włączony",
@@ -330,6 +350,7 @@
     "People": "Ludzie",
     "Permissions": "Uprawnienia",
     "Phone": "Telefon",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s rozpoczął połączenie %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Sprawdź swój e-mail i kliknij link w nim zawarty. Kiedy już to zrobisz, kliknij \"kontynuuj\".",
     "Power level must be positive integer.": "Poziom uprawnień musi być liczbą dodatnią.",
     "Press <StartChatButton> to start a chat with someone": "Naciśnij <StartChatButton>, by rozpocząć rozmowę z kimś",
@@ -344,11 +365,15 @@
     "Revoke widget access": "Usuń dostęp do widżetów",
     "Refer a friend to Riot:": "Zaproś znajomego do Riota:",
     "Register": "Rejestracja",
+    "%(targetName)s rejected the invitation.": "%(targetName)s odrzucił zaproszenie.",
     "Reject invitation": "Odrzuć zaproszenie",
     "Rejoin": "Dołącz ponownie",
     "Remote addresses for this room:": "Adresy zdalne dla tego pokoju:",
     "Remove Contact Information?": "Usunąć dane kontaktowe?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s usunął swoją nazwę ekranową (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s usunął swoje zdjęcie profilowe.",
     "Remove %(threePid)s?": "Usunąć %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s zażądał grupowego połączenia głosowego VoIP.",
     "Results from DuckDuckGo": "Wyniki z DuckDuckGo",
     "Return to login screen": "Wróć do ekranu logowania",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot nie ma uprawnień, by wysyłać ci powiadomienia - sprawdź ustawienia swojej przeglądarki",
@@ -376,6 +401,7 @@
     "Send Invites": "Wyślij zaproszenie",
     "Send Reset Email": "Wyślij e-mail resetujący hasło",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s wysłał obraz.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
     "Server error": "Błąd serwera",
     "Server may be unavailable or overloaded": "Serwer może być niedostępny lub przeciążony",
     "Server may be unavailable, overloaded, or search timed out :(": "Serwer może być niedostępny, przeciążony, lub upłynął czas wyszukiwania :(",
@@ -383,6 +409,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Serwer może być niedostępny, przeciążony, lub trafiłeś na błąd.",
     "Server unavailable, overloaded, or something else went wrong.": "Serwer może być niedostępny, przeciążony, lub coś innego poszło źle.",
     "Session ID": "Identyfikator sesji",
+    "%(senderName)s set a profile picture.": "%(senderName)s ustawił zdjęcie profilowe.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ustawił swoją nazwę na %(displayName)s.",
     "Sets the room topic": "Ustaw temat pokoju",
     "Show panel": "Pokaż panel",
     "Show Text Formatting Toolbar": "Pokaż pasek narzędzi formatowania tekstu",
@@ -423,10 +451,12 @@
     "To reset your password, enter the email address linked to your account": "Aby zresetować swoje hasło, wpisz adres e-mail powiązany z twoim kontem",
     "Turn Markdown off": "Wyłącz Markdown",
     "Turn Markdown on": "Włącz Markdown",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s włączył szyfrowanie użytkownik-użytkownik (algorithm %(algorithm)s).",
     "Unable to add email address": "Nie można dodać adresu e-mail",
     "Unable to create widget.": "Nie można utworzyć widżetu.",
     "Unable to remove contact information": "Nie można usunąć informacji kontaktowych",
     "Unable to verify email address.": "Weryfikacja adresu e-mail nie powiodła się.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s odblokował/a %(targetName)s.",
     "Unable to capture screen": "Nie można zrobić zrzutu ekranu",
     "Unable to enable Notifications": "Nie można włączyć powiadomień",
     "Unable to load device list": "Nie można załadować listy urządzeń",
@@ -473,6 +503,7 @@
     "Who can access this room?": "Kto może uzyskać dostęp do tego pokoju?",
     "Who would you like to add to this room?": "Kogo chciał(a)byś dodać do tego pokoju?",
     "Who would you like to communicate with?": "Z kim chciał(a)byś się komunikować?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s wycofał(a) zaproszenie %(targetName)s.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Czy chcesz <acceptText>zaakceptować</acceptText> czy <declineText>odrzucić</declineText> to zaproszenie?",
     "You already have existing direct chats with this user:": "Masz już istniejącą bezpośrednią konwersację z tym użytkownikiem:",
     "You are already in a call.": "Jesteś już w trakcie połączenia.",
@@ -598,6 +629,9 @@
     " (unsupported)": " (niewspierany)",
     "Idle": "Bezczynny",
     "Check for update": "Sprawdź aktualizacje",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s zmienił awatar pokoju na <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s usunął awatar pokoju.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s zmienił awatar %(roomName)s",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "To będzie twoja nazwa konta na <span></span> serwerze domowym; możesz też wybrać <a>inny serwer</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jeśli już posiadasz konto Matrix możesz się <a>zalogować</a>.",
     "Not a valid Riot keyfile": "Niepoprawny plik klucza Riot",
@@ -630,6 +664,9 @@
     "Featured Rooms:": "Wyróżnione pokoje:",
     "Featured Users:": "Wyróżnieni użytkownicy:",
     "Hide avatars in user and room mentions": "Ukryj awatary we wzmiankach użytkowników i pokoi",
+    "%(widgetName)s widget added by %(senderName)s": "Widżet %(widgetName)s został dodany przez %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Widżet %(widgetName)s został usunięty przez %(senderName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "Widżet %(widgetName)s został zmodyfikowany przez %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Sprawdzanie człowieczeństwa jest obecnie niedostępne na aplikacji klienckiej desktop - proszę użyć <a>przeglądarki internetowej</a>",
     "Unpin Message": "Odepnij Wiadomość",
     "Add rooms to this community": "Dodaj pokoje do tej społeczności",
@@ -663,6 +700,8 @@
     "Ignored user": "Użytkownik ignorowany",
     "You are now ignoring %(userId)s": "Ignorujesz teraz %(userId)s",
     "You are no longer ignoring %(userId)s": "Nie ignorujesz już %(userId)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s zmienił swoją wyświetlaną nazwę na %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s zmienił przypiętą wiadomość dla tego pokoju.",
     "Message Pinning": "Przypinanie wiadomości",
     "%(names)s and %(count)s others are typing|other": "%(names)s oraz %(count)s innych piszą",
     "%(names)s and %(count)s others are typing|one": "%(names)s oraz jedna inna osoba piszą",
@@ -916,44 +955,5 @@
     "Advanced options": "Opcje zaawansowane",
     "To continue, please enter your password:": "Aby kontynuować, proszę wprowadzić swoje hasło:",
     "password": "hasło",
-    "Refresh": "Odśwież",
-    "<target> accepted the invitation for %(displayName)s.": "<target> zaakceptował(a) zaproszenie dla %(displayName)s.",
-    "<target> accepted an invitation.": "<target> zaakceptował(a) zaproszenie.",
-    "<sender> requested a VoIP conference.": "<sender> zażądał grupowego połączenia głosowego VoIP.",
-    "<sender> invited <target>.": "<sender> zaprosił <target>.",
-    "<sender> banned <target>.": "<sender> zbanował <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> zmienił swoją wyświetlaną nazwę na <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> ustawił swoją nazwę na <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> usunął swoją nazwę ekranową (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> usunął swoje zdjęcie profilowe.",
-    "<sender> changed their profile picture.": "<sender> zmienił swoje zdjęcie profilowe.",
-    "<sender> set a profile picture.": "<sender> ustawił zdjęcie profilowe.",
-    "<target> joined the room.": "<target> dołączył do pokoju.",
-    "<target> rejected the invitation.": "<target> odrzucił zaproszenie.",
-    "<target> left the room.": "<target> opuścił pokój.",
-    "<sender> unbanned <target>.": "<sender> odblokował/a <target>.",
-    "<sender> kicked <target>.": "<sender> wyrzucił <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> wycofał(a) zaproszenie <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> zmienił temat na \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> zmienił nazwę pokoju na %(roomName)s.",
-    "<sender> changed the room avatar to <img/>": "<sender> zmienił awatar pokoju na <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> zmienił awatar %(roomName)s",
-    "<sender> removed the room name.": "<sender> usunął nazwę pokoju.",
-    "<sender> removed the room avatar.": "<sender> usunął awatar pokoju.",
-    "<sender> answered the call.": "<sender> odebrał połączenie.",
-    "<sender> ended the call.": "<sender> zakończył połączenie.",
-    "<sender> placed a %(callType)s call.": "<sender> rozpoczął połączenie %(callType)s.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich dołączenia.",
-    "<sender> made future room history visible to all room members.": "<sender> uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju.",
-    "<sender> made future room history visible to anyone.": "<sender> uczynił przyszłą historię pokoju widoczną dla kazdego.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> uczynił przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> włączył szyfrowanie użytkownik-użytkownik (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> z %(fromPowerLevel)s na %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> zmienił poziom mocy %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> zmienił przypiętą wiadomość dla tego pokoju.",
-    "%(widgetName)s widget modified by <sender>": "Widżet %(widgetName)s został zmodyfikowany przez <sender>",
-    "%(widgetName)s widget added by <sender>": "Widżet %(widgetName)s został dodany przez <sender>",
-    "%(widgetName)s widget removed by <sender>": "Widżet %(widgetName)s został usunięty przez <sender>"
+    "Refresh": "Odśwież"
 }
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 1f3e83c14c..7cc80cfc78 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -16,6 +16,7 @@
     "Blacklisted": "Bloqueado",
     "Bulk Options": "Opcões de Batelada",
     "Can't load user settings": "Não é possível carregar configurações de usuário",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "As mudanças sobre quem pode ler o histórico da sala só serão aplicadas às mensagens futuras nesta sala",
     "Changes your display nickname": "Troca o seu apelido",
     "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
@@ -197,8 +198,15 @@
     "Dec": "Dez",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s às %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
+    "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s estão escrevendo",
+    "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
+    "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "click to reveal": "clique para ver",
     "Conference call failed.": "Chamada de conferência falhou.",
     "Conference calling is in development and may not be reliable.": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar.",
@@ -206,22 +214,41 @@
     "Conference calls are not supported in this client": "Chamadas de conferência não são possíveis neste navegador",
     "/ddg is not a command": "/ddg não é um comando",
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
+    "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
     "Existing Call": "Chamada em andamento",
     "Failed to send email": "Falha ao enviar email",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to set up conference call": "Não foi possível montar a chamada de conferência",
     "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
     "Failure to create room": "Não foi possível criar a sala",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
+    "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
+    "%(targetName)s left the room.": "%(targetName)s saiu da sala.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s deixou o histórico futuro da sala visível para todas as pessoas da sala.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s deixou o histórico futuro da sala visível para qualquer pessoa.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
     "(not supported by this browser)": "(não é compatível com este navegador)",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.",
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Reason": "Razão",
+    "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
+    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma imagem de perfil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu seu nome público para %(displayName)s.",
     "This email address is already in use": "Este endereço de email já está sendo usado",
     "This email address was not found": "Este endereço de email não foi encontrado",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O arquivo '%(fileName)s' ultrapassa o limite de tamanho que nosso servidor permite enviar",
@@ -231,12 +258,15 @@
     "These are experimental features that may break in unexpected ways": "Estas são funcionalidades experimentais que podem apresentar falhas",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
     "You are already in a call.": "Você já está em  uma chamada.",
     "You are trying to access %(roomName)s.": "Você está tentando acessar a sala %(roomName)s.",
     "You cannot place a call with yourself.": "Você não pode iniciar uma chamada.",
@@ -376,6 +406,7 @@
     "Warning!": "Atenção!",
     "You need to enter a user name.": "Você precisa inserir um nome de usuária(o).",
     "Please select the destination room for this message": "Por favor, escolha a sala para onde quer encaminhar esta mensagem",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s apagou o nome da sala.",
     "Analytics": "Análise",
     "Options": "Opções",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot coleta informações anônimas de uso para nos permitir melhorar o sistema.",
@@ -470,6 +501,9 @@
     "Verified key": "Chave verificada",
     "WARNING: Device already verified, but keys do NOT MATCH!": "ATENÇÃO: O dispositivo já foi verificado, mas as chaves NÃO SÃO IGUAIS!",
     "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!": "ATENÇÃO: VERIFICAÇÃO DE CHAVE FALHOU! A chave de assinatura para a(o) usuária(o) %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\", que não é igual à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estão sendo interceptadas!",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
     "Missing Media Permissions, click here to request.": "Faltam permissões para uso de mídia no seu computador. Clique aqui para solicitá-las.",
     "No Microphones detected": "Não foi detetado nenhum microfone",
     "No Webcams detected": "Não foi detetada nenhuma Webcam",
@@ -631,6 +665,9 @@
     "Automatically replace plain text Emoji": "Substituir Emoji em texto automaticamente",
     "Failed to upload image": "Falha ao carregar imagem",
     "Hide avatars in user and room mentions": "Ocultar avatares nas menções de utilizadores e salas",
+    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s adicionado por %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s removido por %(senderName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificado por %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "A verificação através de robot está atualmente indisponível na versão desktop - utilize um <a>navegador web</a>",
     "Advanced options": "Opções avançadas",
     "This setting cannot be changed later!": "Esta definição não pode ser alterada mais tarde!",
@@ -805,42 +842,5 @@
     "Collapse panel": "Colapsar o painel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e algumas das funcionalidades poderão não funcionar. Se quiser tentar de qualquer maneira pode continuar, mas  está por sua conta com algum problema que possa encontrar!",
     "Checking for an update...": "A procurar uma atualização...",
-    "There are advanced notifications which are not shown here": "Existem notificações avançadas que não são exibidas aqui",
-    "<target> accepted the invitation for %(displayName)s.": "<target> aceitou o convite para %(displayName)s.",
-    "<target> accepted an invitation.": "<target> aceitou um convite.",
-    "<sender> requested a VoIP conference.": "<sender> está solicitando uma conferência de voz.",
-    "<sender> invited <target>.": "<sender> convidou <target>.",
-    "<sender> banned <target>.": "<sender> removeu <target> da sala.",
-    "<sender> set their display name to <displayName>.": "<sender> definiu seu nome público para <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> removeu o seu nome público (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> removeu sua imagem de perfil.",
-    "<sender> changed their profile picture.": "<sender> alterou sua imagem de perfil.",
-    "<sender> set a profile picture.": "<sender> definiu uma imagem de perfil.",
-    "<target> joined the room.": "<target> entrou na sala.",
-    "<target> rejected the invitation.": "<target> recusou o convite.",
-    "<target> left the room.": "<target> saiu da sala.",
-    "<sender> unbanned <target>.": "<sender> desfez o banimento de <target>.",
-    "<sender> kicked <target>.": "<sender> removeu <target> da sala.",
-    "<sender> withdrew <target>'s invitation.": "<sender> desfez o convite a <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> mudou o tópico para \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> alterou o nome da sala para %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> alterou a imagem da sala %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> alterou a imagem da sala para <img/>",
-    "<sender> removed the room name.": "<sender> apagou o nome da sala.",
-    "<sender> removed the room avatar.": "<sender> removeu a imagem da sala.",
-    "<sender> answered the call.": "<sender> atendeu à chamada.",
-    "<sender> ended the call.": "<sender> finalizou a chamada.",
-    "<sender> placed a %(callType)s call.": "<sender> fez uma chamada de %(callType)s.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
-    "<sender> made future room history visible to all room members.": "<sender> deixou o histórico futuro da sala visível para todas as pessoas da sala.",
-    "<sender> made future room history visible to anyone.": "<sender> deixou o histórico futuro da sala visível para qualquer pessoa.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s para %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> alterou o nível de permissões de %(powerLevelDiffText)s.",
-    "%(widgetName)s widget modified by <sender>": "Widget %(widgetName)s modificado por <sender>",
-    "%(widgetName)s widget added by <sender>": "Widget %(widgetName)s adicionado por <sender>",
-    "%(widgetName)s widget removed by <sender>": "Widget %(widgetName)s removido por <sender>"
+    "There are advanced notifications which are not shown here": "Existem notificações avançadas que não são exibidas aqui"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index e07b51ea79..c583e795cb 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -16,6 +16,7 @@
     "Blacklisted": "Bloqueado",
     "Bulk Options": "Opcões de Batelada",
     "Can't load user settings": "Não é possível carregar configurações de usuário",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "As mudanças sobre quem pode ler o histórico da sala só serão aplicadas às mensagens futuras nesta sala",
     "Changes your display nickname": "Troca o seu apelido",
     "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
@@ -197,8 +198,15 @@
     "Dec": "Dez",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s às %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
+    "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s estão escrevendo",
+    "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
+    "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "click to reveal": "clique para ver",
     "Conference call failed.": "Chamada de conferência falhou.",
     "Conference calling is in development and may not be reliable.": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar.",
@@ -206,23 +214,42 @@
     "Conference calls are not supported in this client": "Chamadas de conferência não são possíveis neste navegador",
     "/ddg is not a command": "/ddg não é um comando",
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
+    "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
     "Existing Call": "Chamada em andamento",
     "Failed to send email": "Não foi possível enviar email",
     "Failed to send request.": "Não foi possível mandar requisição.",
     "Failed to set up conference call": "Não foi possível montar a chamada de conferência",
     "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
     "Failure to create room": "Não foi possível criar a sala",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
+    "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
+    "%(targetName)s left the room.": "%(targetName)s saiu da sala.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s deixou o histórico futuro da sala visível para todas as pessoas da sala.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s deixou o histórico futuro da sala visível para qualquer pessoa.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
     "(not supported by this browser)": "(não é compatível com este navegador)",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.",
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press <StartChatButton> to start a chat with someone": "Clique em <StartChatButton> para iniciar a conversa com alguém",
     "Reason": "Razão",
+    "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
+    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma imagem de perfil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu seu nome público para %(displayName)s.",
     "This email address is already in use": "Este endereço de email já está sendo usado",
     "This email address was not found": "Este endereço de email não foi encontrado",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O arquivo '%(fileName)s' ultrapassa o limite de tamanho que nosso servidor permite enviar",
@@ -232,12 +259,15 @@
     "These are experimental features that may break in unexpected ways": "Estas são funcionalidades experimentais que podem apresentar falhas",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
     "You are already in a call.": "Você já está em uma chamada.",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Você ainda não está em nenhuma sala! Clique em <CreateRoomButton> para criar uma sala ou em <RoomDirectoryButton> para navegar pela lista pública de salas",
     "You are trying to access %(roomName)s.": "Você está tentando acessar a sala %(roomName)s.",
@@ -378,6 +408,7 @@
     "Warning!": "Atenção!",
     "You need to enter a user name.": "Você precisa inserir um nome de usuária(o).",
     "Please select the destination room for this message": "Por favor, escolha a sala para onde quer encaminhar esta mensagem",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s apagou o nome da sala.",
     "Analytics": "Análise",
     "Options": "Opções",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot coleta informações anônimas de uso para nos permitir melhorar o sistema.",
@@ -472,6 +503,9 @@
     "Verified key": "Chave verificada",
     "WARNING: Device already verified, but keys do NOT MATCH!": "ATENÇÃO: O dispositivo já foi verificado, mas as chaves NÃO SÃO IGUAIS!",
     "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!": "ATENÇÃO: VERIFICAÇÃO DE CHAVE FALHOU! A chave de assinatura para a(o) usuária(o) %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\", que não é igual à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estão sendo interceptadas!",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
     "Missing Media Permissions, click here to request.": "Faltam permissões para uso de mídia no seu computador. Clique aqui para solicitá-las.",
     "No Microphones detected": "Não foi detectado nenhum microfone",
     "No Webcams detected": "Não foi detectada nenhuma Webcam",
@@ -639,6 +673,11 @@
     "Unable to create widget.": "Não foi possível criar o widget.",
     "You are now ignoring %(userId)s": "Você está agora ignorando %(userId)s",
     "Unignored user": "Usuária/o não está sendo mais ignorada/o",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s alterou o seu nome público para %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s alterou as mensagens fixas da sala.",
+    "%(widgetName)s widget modified by %(senderName)s": "O widget %(widgetName)s foi modificado por %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "O widget %(widgetName)s foi criado por %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "O widget %(widgetName)s foi removido por %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras pessoas estão escrevendo",
     "%(names)s and %(count)s others are typing|one": "%(names)s e uma outra pessoa estão escrevendo",
     "Send": "Enviar",
@@ -1075,44 +1114,5 @@
     "Collapse panel": "Colapsar o painel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e algumas das funcionalidades poderão não funcionar. Se você quiser tentar de qualquer maneira, pode continuar, mas aí vai ter que se virar sozinho(a) com os problemas que porventura encontrar!",
     "Checking for an update...": "Verificando se há atualizações...",
-    "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui",
-    "<target> accepted the invitation for %(displayName)s.": "<target> aceitou o convite para %(displayName)s.",
-    "<target> accepted an invitation.": "<target> aceitou um convite.",
-    "<sender> requested a VoIP conference.": "<sender> está solicitando uma conferência de voz.",
-    "<sender> invited <target>.": "<sender> convidou <target>.",
-    "<sender> banned <target>.": "<sender> removeu <target> da sala.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> alterou o seu nome público para <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> definiu seu nome público para <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> removeu o seu nome público (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> removeu sua imagem de perfil.",
-    "<sender> changed their profile picture.": "<sender> alterou sua imagem de perfil.",
-    "<sender> set a profile picture.": "<sender> definiu uma imagem de perfil.",
-    "<target> joined the room.": "<target> entrou na sala.",
-    "<target> rejected the invitation.": "<target> recusou o convite.",
-    "<target> left the room.": "<target> saiu da sala.",
-    "<sender> unbanned <target>.": "<sender> desfez o banimento de <target>.",
-    "<sender> kicked <target>.": "<sender> removeu <target> da sala.",
-    "<sender> withdrew <target>'s invitation.": "<sender> desfez o convite a <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> mudou o tópico para \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> alterou o nome da sala para %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> alterou a imagem da sala %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> alterou a imagem da sala para <img/>",
-    "<sender> removed the room name.": "<sender> apagou o nome da sala.",
-    "<sender> removed the room avatar.": "<sender> removeu a imagem da sala.",
-    "<sender> answered the call.": "<sender> atendeu à chamada.",
-    "<sender> ended the call.": "<sender> finalizou a chamada.",
-    "<sender> placed a %(callType)s call.": "<sender> fez uma chamada de %(callType)s.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando foram convidados.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> deixou o histórico futuro da sala visível para todos os membros da sala, a partir de quando entraram.",
-    "<sender> made future room history visible to all room members.": "<sender> deixou o histórico futuro da sala visível para todas as pessoas da sala.",
-    "<sender> made future room history visible to anyone.": "<sender> deixou o histórico futuro da sala visível para qualquer pessoa.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> de %(fromPowerLevel)s para %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> alterou o nível de permissões de %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> alterou as mensagens fixas da sala.",
-    "%(widgetName)s widget modified by <sender>": "O widget %(widgetName)s foi modificado por <sender>",
-    "%(widgetName)s widget added by <sender>": "O widget %(widgetName)s foi criado por <sender>",
-    "%(widgetName)s widget removed by <sender>": "O widget %(widgetName)s foi removido por <sender>"
+    "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 68483ab4ff..ae889c5677 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -136,22 +136,41 @@
     "Your password has been reset": "Ваш пароль был сброшен",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Пароль успешно изменен. До повторной авторизации вы не будете получать push-уведомления на других устройствах",
     "You should not yet trust it to secure data": "На данный момент не следует полагаться на то, что ваша переписка будет надежно зашифрована",
+    "%(targetName)s accepted an invitation.": "%(targetName)s принял приглашение.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
     "Active call": "Активный вызов",
     "%(names)s and %(lastPerson)s are typing": "%(names)s и %(lastPerson)s печатают",
+    "%(senderName)s answered the call.": "%(senderName)s ответил(а) на звонок.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокировал(а) %(targetName)s.",
     "Call Timeout": "Нет ответа",
+    "%(senderName)s changed their profile picture.": "%(senderName)s изменил(а) свой аватар.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s изменил(а) уровни прав %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s изменил(а) название комнаты на %(roomName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\".",
     "Conference call failed.": "Сбой конференц-звонка.",
     "Conference calling is in development and may not be reliable.": "Конференц-связь находится в разработке и может не работать.",
     "Conference calls are not supported in encrypted rooms": "Конференц-связь не поддерживается в зашифрованных комнатах",
     "Conference calls are not supported in this client": "Конференц-связь в этом клиенте не поддерживается",
     "/ddg is not a command": "/ddg — это не команда",
     "Drop here to tag %(section)s": "Перетащите сюда, чтобы пометить как %(section)s",
+    "%(senderName)s ended the call.": "%(senderName)s завершил(а) звонок.",
     "Existing Call": "Текущий вызов",
     "Failed to send request.": "Не удалось отправить запрос.",
     "Failed to set up conference call": "Не удалось сделать конференц-звонок",
     "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить email: убедитесь, что вы перешли по ссылке в письме",
     "Failure to create room": "Не удалось создать комнату",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "click to reveal": "нажмите для открытия",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s печатает",
+    "%(targetName)s joined the room.": "%(targetName)s вошел(-ла) в комнату.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s выгнал(а) %(targetName)s.",
+    "%(targetName)s left the room.": "%(targetName)s покинул(а) комнату.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их входа в комнату.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s сделал(а) историю разговора видимой для всех.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s сделал(а) историю комнаты видимой в неизвестном режиме (%(visibility)s).",
     "Missing room_id in request": "Отсутствует room_id в запросе",
     "Missing user_id in request": "Отсутствует user_id в запросе",
     "(not supported by this browser)": "(не поддерживается этим браузером)",
@@ -181,6 +200,7 @@
     "You are already in a call.": "Идет разговор.",
     "You are trying to access %(roomName)s.": "Вы пытаетесь войти в %(roomName)s.",
     "You cannot place a call with yourself.": "Вы не можете позвонить самому себе.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s отозвал(а) свое приглашение %(targetName)s.",
     "Sep": "Сен",
     "Jan": "Янв",
     "Feb": "Фев",
@@ -203,6 +223,8 @@
     "Sat": "Сб",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш email не связан ни с одним пользователем на этом сервере.",
     "To use it, just wait for autocomplete results to load and tab through them.": "Чтобы воспользоваться этой функцией, дождитесь загрузки результатов в окне автодополнения, а затем используйте Tab для прокрутки.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включил(а) в комнате сквозное шифрование (алгоритм %(algorithm)s).",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s разблокировал(а) %(targetName)s.",
     "Unable to capture screen": "Не удается сделать снимок экрана",
     "Unable to enable Notifications": "Не удалось включить уведомления",
     "Upload Failed": "Сбой отправки файла",
@@ -276,12 +298,17 @@
     "OK": "OK",
     "Only people who have been invited": "Только приглашенные участники",
     "Passwords can't be empty": "Пароли не могут быть пустыми",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s начал(а) %(callType)s-звонок.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Проверьте свою электронную почту и нажмите на содержащуюся ссылку. После этого нажмите кнопку Продолжить.",
     "Power level must be positive integer.": "Уровень прав должен быть положительным целым числом.",
     "Profile": "Профиль",
     "Reason": "Причина",
+    "%(targetName)s rejected the invitation.": "%(targetName)s отклонил(а) приглашение.",
     "Reject invitation": "Отклонить приглашение",
     "Remove Contact Information?": "Удалить контактную информацию?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удалил(а) свое отображаемое имя (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s удалил(а) свой аватар.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s хочет начать конференц-звонок.",
     "Resetting 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.": "Сброс пароля на данный момент сбрасывает ключи шифрования на всех устройствах, делая зашифрованную историю чатов нечитаемой. Чтобы избежать этого, экспортируйте ключи комнат и импортируйте их после сброса пароля. В будущем это будет исправлено.",
     "Riot does not have permission to send you notifications - please check your browser settings": "У Riot нет разрешения на отправку уведомлений — проверьте настройки браузера",
     "Riot was not given permission to send notifications - please try again": "Riot не получил разрешение на отправку уведомлений, пожалуйста, попробуйте снова",
@@ -297,6 +324,7 @@
     "Sender device information": "Информация об устройстве отправителя",
     "Send Invites": "Отправить приглашения",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s отправил(а) изображение.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s пригласил(а) %(targetDisplayName)s в комнату.",
     "Show panel": "Показать панель",
     "Sign in": "Войти",
     "Sign out": "Выйти",
@@ -365,6 +393,7 @@
     "You may need to manually permit Riot to access your microphone/webcam": "Вам необходимо предоставить Riot доступ к микрофону или веб-камере вручную",
     "Anyone": "Все",
     "Are you sure you want to leave the room '%(roomName)s'?": "Вы уверены, что хотите покинуть '%(roomName)s'?",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s удалил(а) имя комнаты.",
     "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.": "Смена пароля на данный момент сбрасывает ключи сквозного шифрования на всех устройствах, делая историю зашифрованных чатов нечитаемой. Чтобы избежать этого, экспортируйте ключи сквозного шифрования и импортируйте их после смены пароля. В будущем это будет исправлено.",
     "Custom level": "Специальные права",
     "Device already verified!": "Устройство уже проверено!",
@@ -401,6 +430,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Возможно, сервер недоступен, перегружен или случилась ошибка.",
     "Server unavailable, overloaded, or something else went wrong.": "Возможно, сервер недоступен, перегружен или что-то еще пошло не так.",
     "Session ID": "ID сессии",
+    "%(senderName)s set a profile picture.": "%(senderName)s установил(а) себе аватар.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Signed Out": "Выполнен выход",
     "Tagged as: ": "Метки: ",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Предоставленный вами ключ совпадает с ключом, полученным от %(userId)s с устройства %(deviceId)s. Это устройство помечено как проверенное.",
@@ -495,6 +526,9 @@
     "Online": "Онлайн",
     "Idle": "Неактивен",
     "Offline": "Не в сети",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s сменил(а) аватар комнаты на <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s удалил(а) аватар комнаты.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s сменил(а) аватар %(roomName)s",
     "Create new room": "Создать комнату",
     "Room directory": "Каталог комнат",
     "Start chat": "Начать чат",
@@ -629,8 +663,11 @@
     "Automatically replace plain text Emoji": "Автоматически заменять текстовые смайлики на Emoji",
     "Failed to upload image": "Не удалось загрузить изображение",
     "Hide avatars in user and room mentions": "Скрывать аватары в упоминаниях пользователей и комнат",
+    "%(widgetName)s widget added by %(senderName)s": "Виджет %(widgetName)s был добавлен %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Виджет %(widgetName)s был удален %(senderName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "CAPTCHA-тест в настоящее время недоступен в Desktop-клиенте - пожалуйста, используйте <a>браузер</a>",
     "Publish this room to the public in %(domain)s's room directory?": "Опубликовать эту комнату в каталоге комнат %(domain)s?",
+    "%(widgetName)s widget modified by %(senderName)s": "Виджет %(widgetName)s был изменен %(senderName)s",
     "Copied!": "Скопировано!",
     "Failed to copy": "Не удалось скопировать",
     "Advanced options": "Дополнительные параметры",
@@ -685,6 +722,7 @@
     "Which rooms would you like to add to this summary?": "Какие комнаты вы хотите добавить в эту сводку?",
     "Room name or alias": "Название или идентификатор комнаты",
     "Pinned Messages": "Закрепленные сообщения",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s изменил(а) закрепленные в этой комнате сообщения.",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Не удалось добавить следующие комнаты в сводку %(groupId)s:",
     "Failed to remove the room from the summary of %(groupId)s": "Не удалось удалить комнату из сводки %(groupId)s",
     "The room '%(roomName)s' could not be removed from the summary.": "Комнату '%(roomName)s' не удалось удалить из сводки.",
@@ -917,6 +955,7 @@
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>.",
     "Community IDs cannot not be empty.": "ID сообществ не могут быть пустыми.",
     "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
     "Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
@@ -1152,44 +1191,5 @@
     "Share User": "Поделиться пользователем",
     "Share Community": "Поделиться сообществом",
     "Link to selected message": "Ссылка на выбранное сообщение",
-    "COPY": "КОПИРОВАТЬ",
-    "<target> accepted the invitation for %(displayName)s.": "<target> принял приглашение от %(displayName)s.",
-    "<target> accepted an invitation.": "<target> принял приглашение.",
-    "<sender> requested a VoIP conference.": "<sender> хочет начать конференц-звонок.",
-    "<sender> invited <target>.": "<sender> приглашает <target>.",
-    "<sender> banned <target>.": "<sender> заблокировал(а) <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> изменил(а) отображаемое имя на <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> изменил(а) отображаемое имя на <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> удалил(а) свое отображаемое имя (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> удалил(а) свой аватар.",
-    "<sender> changed their profile picture.": "<sender> изменил(а) свой аватар.",
-    "<sender> set a profile picture.": "<sender> установил(а) себе аватар.",
-    "<target> joined the room.": "<target> вошел(-ла) в комнату.",
-    "<target> rejected the invitation.": "<target> отклонил(а) приглашение.",
-    "<target> left the room.": "<target> покинул(а) комнату.",
-    "<sender> unbanned <target>.": "<sender> разблокировал(а) <target>.",
-    "<sender> kicked <target>.": "<sender> выгнал(а) <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> отозвал(а) свое приглашение <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> изменил(а) тему комнаты на \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> изменил(а) название комнаты на %(roomName)s.",
-    "<sender> changed the room avatar to <img/>": "<sender> сменил(а) аватар комнаты на <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> сменил(а) аватар %(roomName)s",
-    "<sender> removed the room name.": "<sender> удалил(а) имя комнаты.",
-    "<sender> removed the room avatar.": "<sender> удалил(а) аватар комнаты.",
-    "<sender> answered the call.": "<sender> ответил(а) на звонок.",
-    "<sender> ended the call.": "<sender> завершил(а) звонок.",
-    "<sender> placed a %(callType)s call.": "<sender> начал(а) %(callType)s-звонок.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> пригласил(а) %(targetDisplayName)s в комнату.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> сделал(а) историю разговора видимой для всех собеседников с момента их входа в комнату.",
-    "<sender> made future room history visible to all room members.": "<sender> сделал(а) историю разговора видимой для всех собеседников.",
-    "<sender> made future room history visible to anyone.": "<sender> сделал(а) историю разговора видимой для всех.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> сделал(а) историю комнаты видимой в неизвестном режиме (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> включил(а) в комнате сквозное шифрование (алгоритм %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "для <user> с %(fromPowerLevel)s на %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> изменил(а) уровни прав %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> изменил(а) закрепленные в этой комнате сообщения.",
-    "%(widgetName)s widget modified by <sender>": "Виджет %(widgetName)s был изменен <sender>",
-    "%(widgetName)s widget added by <sender>": "Виджет %(widgetName)s был добавлен <sender>",
-    "%(widgetName)s widget removed by <sender>": "Виджет %(widgetName)s был удален <sender>"
+    "COPY": "КОПИРОВАТЬ"
 }
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index eae28ee1fa..b1f3f4260d 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -102,14 +102,49 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Podpisovací kľúč, ktorý ste poskytli súhlasí s podpisovacím kľúčom, ktorý ste dostali zo zariadenia %(deviceId)s používateľa %(userId)s's. Zariadenie je považované za overené.",
     "Unrecognised command:": "Nerozpoznaný príkaz:",
     "Reason": "Dôvod",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s prijal pozvanie do %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s prijal pozvanie.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s požiadal o VoIP konferenciu.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s zakázal vstup %(targetName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si nastavil zobrazované meno %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstránil svoje zobrazované meno (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s si z profilu odstránil obrázok.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s si zmenil obrázok v profile.",
+    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil obrázok v profile.",
     "VoIP conference started.": "Začala VoIP konferencia.",
+    "%(targetName)s joined the room.": "%(targetName)s vstúpil do miestnosti.",
     "VoIP conference finished.": "Skončila VoIP konferencia.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s odmietol pozvanie.",
+    "%(targetName)s left the room.": "%(targetName)s opustil miestnosť.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s povolil vstup %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopol %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s stiahol pozvanie %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmenil tému na \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstránil názov miestnosti.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmenil názov miestnosti na %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal obrázok.",
     "Someone": "Niekto",
     "(not supported by this browser)": "(Nepodporované v tomto prehliadači)",
+    "%(senderName)s answered the call.": "%(senderName)s prijal hovor.",
     "(could not connect media)": "(nie je možné spojiť médiá)",
     "(no answer)": "(žiadna odpoveď)",
     "(unknown failure: %(reason)s)": "(neznáma chyba: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s ukončil hovor.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s uskutočnil %(callType)s hovor.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s pozval %(targetDisplayName)s vstúpiť do miestnosti.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy boli pozvaní.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy vstúpili.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre každého.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s sprístupnil budúcu históriu miestnosti neznámym (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s povolil E2E šifrovanie (algoritmus %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmenil úroveň moci pre %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s zmenil pripnuté správy pre túto miestnosť.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s zmenil widget %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pridal widget %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s odstránil widget %(widgetName)s",
     "Communities": "Komunity",
     "Message Pinning": "Pripnutie správ",
     "%(displayName)s is typing": "%(displayName)s píše",
@@ -387,6 +422,9 @@
     "Invalid file%(extra)s": "Neplatný súbor%(extra)s",
     "Error decrypting image": "Chyba pri dešifrovaní obrázka",
     "Error decrypting video": "Chyba pri dešifrovaní videa",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s zmenil obrázok miestnosti %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odstránil obrázok miestnosti.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s zmenil obrázok miestnosti <img/>",
     "Copied!": "Skopírované!",
     "Failed to copy": "Nepodarilo sa skopírovať",
     "Add an Integration": "Pridať integráciu",
@@ -914,6 +952,7 @@
     "Your homeserver's URL": "URL adresa vami používaného domovského servera",
     "Your identity server's URL": "URL adresa vami používaného servera totožností",
     "This room is not public. You will not be able to rejoin without an invite.": "Toto nie je verejne dostupná miestnosť. Bez pozvánky nebudete do nej môcť vstúpiť znovu.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si zmenil zobrazované meno na %(displayName)s.",
     "Failed to set direct chat tag": "Nepodarilo sa nastaviť značku priama konverzácia",
     "Failed to remove tag %(tagName)s from room": "Z miestnosti sa nepodarilo odstrániť značku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
@@ -1141,44 +1180,5 @@
     "Terms and Conditions": "Zmluvné podmienky",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Ak chcete aj naďalej používať domovský server %(homeserverDomain)s, mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.",
     "Review terms and conditions": "Prečítať zmluvné podmienky",
-    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť",
-    "<target> accepted the invitation for %(displayName)s.": "<target> prijal pozvanie do %(displayName)s.",
-    "<target> accepted an invitation.": "<target> prijal pozvanie.",
-    "<sender> requested a VoIP conference.": "<sender> požiadal o VoIP konferenciu.",
-    "<sender> invited <target>.": "<sender> pozval <target>.",
-    "<sender> banned <target>.": "<sender> zakázal vstup <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> si zmenil zobrazované meno na <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> si nastavil zobrazované meno <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> odstránil svoje zobrazované meno (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> si z profilu odstránil obrázok.",
-    "<sender> changed their profile picture.": "<sender> si zmenil obrázok v profile.",
-    "<sender> set a profile picture.": "<sender> si nastavil obrázok v profile.",
-    "<target> joined the room.": "<target> vstúpil do miestnosti.",
-    "<target> rejected the invitation.": "<target> odmietol pozvanie.",
-    "<target> left the room.": "<target> opustil miestnosť.",
-    "<sender> unbanned <target>.": "<sender> povolil vstup <target>.",
-    "<sender> kicked <target>.": "<sender> vykopol <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> stiahol pozvanie <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> zmenil tému na \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> zmenil názov miestnosti na %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> zmenil obrázok miestnosti %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> zmenil obrázok miestnosti <img/>",
-    "<sender> removed the room name.": "<sender> odstránil názov miestnosti.",
-    "<sender> removed the room avatar.": "<sender> odstránil obrázok miestnosti.",
-    "<sender> answered the call.": "<sender> prijal hovor.",
-    "<sender> ended the call.": "<sender> ukončil hovor.",
-    "<sender> placed a %(callType)s call.": "<sender> uskutočnil %(callType)s hovor.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> pozval %(targetDisplayName)s vstúpiť do miestnosti.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy boli pozvaní.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy vstúpili.",
-    "<sender> made future room history visible to all room members.": "<sender> sprístupnil budúcu históriu miestnosti pre všetkých členov.",
-    "<sender> made future room history visible to anyone.": "<sender> sprístupnil budúcu históriu miestnosti pre každého.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> sprístupnil budúcu históriu miestnosti neznámym (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> povolil E2E šifrovanie (algoritmus %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> z %(fromPowerLevel)s na %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> zmenil úroveň moci pre %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> zmenil pripnuté správy pre túto miestnosť.",
-    "%(widgetName)s widget modified by <sender>": "<sender> zmenil widget %(widgetName)s",
-    "%(widgetName)s widget added by <sender>": "<sender> pridal widget %(widgetName)s",
-    "%(widgetName)s widget removed by <sender>": "<sender> odstránil widget %(widgetName)s"
+    "To notify everyone in the room, you must be a": "Aby ste mohli upozorňovať všetkých členov v miestnosti, musíte byť"
 }
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 350338a908..6d217d5349 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -110,16 +110,51 @@
     "Verified key": "Проверени кључ",
     "Unrecognised command:": "Непрепозната наредба:",
     "Reason": "Разлог",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s је прихватио позивницу за %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s је прихватио позивницу.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s је затражио VoIP конференцију.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s је позвао %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s.",
     "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!": "УПОЗОРЕЊЕ: ПРОВЕРА КЉУЧА НИЈЕ УСПЕЛА! Кључ потписивања за корисника %(userId)s и уређај %(deviceId)s је „%(fprint)s“ а то се не подудара са достављеним кључем „%(fingerprint)s“. Ово можда значи да се ваши разговори прате!",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Кључ за потписивање који сте доставили се подудара са кључем за потписивање од корисника %(userId)s и уређаја %(deviceId)s. Уређај је означен као проверен.",
+    "%(senderName)s set their display name to %(displayName)s.": "Корисник %(senderName)s је себи поставио приказно име %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "Корисник %(senderName)s је себи уклонио приказно име %(oldDisplayName)s.",
+    "%(senderName)s removed their profile picture.": "Корисник %(senderName)s је себи уклонио профилну слику.",
+    "%(senderName)s changed their profile picture.": "Корисник %(senderName)s је себи променио профилну слику.",
+    "%(senderName)s set a profile picture.": "Корисник %(senderName)s је себи поставио профилну слику.",
     "VoIP conference started.": "VoIP конференција је започета.",
+    "%(targetName)s joined the room.": "Корисник %(targetName)s је ушао у собу.",
     "VoIP conference finished.": "VoIP конференција је завршена.",
+    "%(targetName)s rejected the invitation.": "Корисник %(targetName)s је одбацио позивницу.",
+    "%(targetName)s left the room.": "Корисник %(targetName)s је напустио собу.",
+    "%(senderName)s unbanned %(targetName)s.": "Корисник %(senderName)s је скинуо забрану приступа са %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "Корисник %(senderName)s је избацио %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "Пошиљалац %(senderName)s је повукао позивницу за %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Корисник %(senderDisplayName)s је променио тему у „%(topic)s“.",
+    "%(senderDisplayName)s removed the room name.": "Корисник %(senderDisplayName)s је уклонио назив собе.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "Корисник %(senderDisplayName)s је променио назив собе у %(roomName)s.",
     "%(senderDisplayName)s sent an image.": "Корисник %(senderDisplayName)s је послао слику.",
     "Someone": "Неко",
     "(not supported by this browser)": "(није подржано од стране овог прегледача)",
+    "%(senderName)s answered the call.": "Корисник %(senderName)s се јавио.",
     "(could not connect media)": "(не могу да повежем медије)",
     "(no answer)": "(нема одговора)",
     "(unknown failure: %(reason)s)": "(непозната грешка: %(reason)s)",
+    "%(senderName)s ended the call.": "Корисник %(senderName)s је окончао позив.",
+    "%(senderName)s placed a %(callType)s call.": "Корисник %(senderName)s је направио %(callType)s позив.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Корисник %(senderName)s је послао позивницу за приступ соби ка %(targetDisplayName)s.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе, од тренутка позивања у собу.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе, од тренутка приступања соби.",
+    "%(senderName)s made future room history visible to all room members.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе.",
+    "%(senderName)s made future room history visible to anyone.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свима.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Корисник %(senderName)s је учинио будући историјат собе непознатим (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Корисник %(senderName)s је укључио шифровање с краја на крај (алгоритам %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s са %(fromPowerLevel)s на %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Корисник %(senderName)s је променио ниво моћи од %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "Корисник %(senderName)s је променио закачене поруке у соби.",
+    "%(widgetName)s widget modified by %(senderName)s": "Корисник %(senderName)s је променио виџет %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Корисник %(senderName)s је додао виџет %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Корисник %(senderName)s је уклонио виџет %(widgetName)s",
     "%(displayName)s is typing": "%(displayName)s куца",
     "%(names)s and %(count)s others are typing|other": "%(names)s и %(count)s корисник(а) куцају",
     "%(names)s and %(count)s others are typing|one": "%(names)s и још један куцају",
@@ -441,6 +476,9 @@
     "Invalid file%(extra)s": "Неисправна датотека %(extra)s",
     "Error decrypting image": "Грешка при дешифровању слике",
     "Error decrypting video": "Грешка при дешифровању видеа",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "Корисник %(senderDisplayName)s је променио аватара собе %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "Корисник %(senderDisplayName)s је уклонио аватара собе.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "Корисник %(senderDisplayName)s је променио аватара собе у <img/>",
     "Copied!": "Копирано!",
     "Failed to copy": "Нисам успео да ископирам",
     "Add an Integration": "Додај уградњу",
@@ -724,6 +762,7 @@
     "Analytics": "Аналитика",
     "The information being sent to us to help make Riot.im better includes:": "У податке које нам шаљете зарад побољшавања Riot.im-а спадају:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ако страница садржи поверљиве податке (као што је назив собе, корисника или ИБ-ја групе), ти подаци се уклањају пре слања на сервер.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "Корисник %(oldDisplayName)s је променио приказно име у %(displayName)s.",
     "Failed to set direct chat tag": "Нисам успео да поставим ознаку директног ћаскања",
     "Failed to remove tag %(tagName)s from room": "Нисам успео да скинем ознаку %(tagName)s са собе",
     "Failed to add tag %(tagName)s to room": "Нисам успео да додам ознаку %(tagName)s на собу",
@@ -1138,44 +1177,5 @@
     "Terms and Conditions": "Услови коришћења",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да бисте наставили са коришћењем Кућног сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.",
     "Review terms and conditions": "Погледај услове коришћења",
-    "Try the app first": "Пробајте прво апликацију",
-    "<target> accepted the invitation for %(displayName)s.": "<target> је прихватио позивницу за %(displayName)s.",
-    "<target> accepted an invitation.": "<target> је прихватио позивницу.",
-    "<sender> requested a VoIP conference.": "<sender> је затражио VoIP конференцију.",
-    "<sender> invited <target>.": "<sender> је позвао <target>.",
-    "<sender> banned <target>.": "<sender> је бановао <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "Корисник <oldDisplayName> је променио приказно име у <displayName>.",
-    "<sender> set their display name to <displayName>.": "Корисник <sender> је себи поставио приказно име <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "Корисник <sender> је себи уклонио приказно име <oldDisplayName>.",
-    "<sender> removed their profile picture.": "Корисник <sender> је себи уклонио профилну слику.",
-    "<sender> changed their profile picture.": "Корисник <sender> је себи променио профилну слику.",
-    "<sender> set a profile picture.": "Корисник <sender> је себи поставио профилну слику.",
-    "<target> joined the room.": "Корисник <target> је ушао у собу.",
-    "<target> rejected the invitation.": "Корисник <target> је одбацио позивницу.",
-    "<target> left the room.": "Корисник <target> је напустио собу.",
-    "<sender> unbanned <target>.": "Корисник <sender> је скинуо забрану приступа са <target>.",
-    "<sender> kicked <target>.": "Корисник <sender> је избацио <target>.",
-    "<sender> withdrew <target>'s invitation.": "Пошиљалац <sender> је повукао позивницу за <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "Корисник <sender> је променио тему у „%(topic)s“.",
-    "<sender> changed the room name to %(roomName)s.": "Корисник <sender> је променио назив собе у %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "Корисник <sender> је променио аватара собе %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "Корисник <sender> је променио аватара собе у <img/>",
-    "<sender> removed the room name.": "Корисник <sender> је уклонио назив собе.",
-    "<sender> removed the room avatar.": "Корисник <sender> је уклонио аватара собе.",
-    "<sender> answered the call.": "Корисник <sender> се јавио.",
-    "<sender> ended the call.": "Корисник <sender> је окончао позив.",
-    "<sender> placed a %(callType)s call.": "Корисник <sender> је направио %(callType)s позив.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "Корисник <sender> је послао позивницу за приступ соби ка %(targetDisplayName)s.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "Корисник <sender> је учинио будући историјат собе видљивим свим члановима собе, од тренутка позивања у собу.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "Корисник <sender> је учинио будући историјат собе видљивим свим члановима собе, од тренутка приступања соби.",
-    "<sender> made future room history visible to all room members.": "Корисник <sender> је учинио будући историјат собе видљивим свим члановима собе.",
-    "<sender> made future room history visible to anyone.": "Корисник <sender> је учинио будући историјат собе видљивим свима.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "Корисник <sender> је учинио будући историјат собе непознатим (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "Корисник <sender> је укључио шифровање с краја на крај (алгоритам %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> са %(fromPowerLevel)s на %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "Корисник <sender> је променио ниво моћи од %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "Корисник <sender> је променио закачене поруке у соби.",
-    "%(widgetName)s widget modified by <sender>": "Корисник <sender> је променио виџет %(widgetName)s",
-    "%(widgetName)s widget added by <sender>": "Корисник <sender> је додао виџет %(widgetName)s",
-    "%(widgetName)s widget removed by <sender>": "Корисник <sender> је уклонио виџет %(widgetName)s"
+    "Try the app first": "Пробајте прво апликацију"
 }
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 986f48c81e..0e26125c30 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1,5 +1,7 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Ett SMS har skickats till +%(msisdn)s. Vänligen ange verifieringskoden ur meddelandet",
+    "%(targetName)s accepted an invitation.": "%(targetName)s accepterade en inbjudan.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepterade inbjudan för %(displayName)s.",
     "Account": "Konto",
     "Add a topic": "Lägg till ett ämne",
     "Add email address": "Lägg till en epostadress",
@@ -24,6 +26,7 @@
     "and %(count)s others...|one": "och en annan...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s och %(lastPerson)s skriver",
     "A new password must be entered.": "Ett nytt lösenord måste anges.",
+    "%(senderName)s answered the call.": "%(senderName)s svarade på samtalet.",
     "Anyone who knows the room's link, including guests": "Alla som har rummets adress, inklusive gäster",
     "Anyone": "Vem som helst",
     "Anyone who knows the room's link, apart from guests": "Alla som har rummets adress, förutom gäster",
@@ -35,6 +38,7 @@
     "Are you sure you want to reject the invitation?": "Är du säker på att du vill avböja inbjudan?",
     "Bulk Options": "Volymhandlingar",
     "Blacklisted": "Svartlistad",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
     "Banned users": "Bannade användare",
     "Bans user with given id": "Bannar användare med givet id",
     "Ban": "Banna",
@@ -43,6 +47,10 @@
     "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>.": "Det går inte att ansluta till en hemserver via HTTP då adressen i webbläsaren är HTTPS. Använd HTTPS, eller <a>sätt på osäkra skript</a>.",
     "Can't load user settings": "Det gick inte att ladda användarinställningar",
     "Change Password": "Byt lösenord",
+    "%(senderName)s changed their profile picture.": "%(senderName)s bytte sin profilbild.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s bytte rummets namn till %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s tog bort rummets namn.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s bytte rummets ämne till \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Ändringar till vem som kan läsa meddelandehistorik tillämpas endast till framtida meddelanden i det här rummet",
     "Changes your display nickname": "Byter ditt synliga namn",
     "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.": "Om du byter lösenord kommer för tillfället alla krypteringsnycklar på alla enheter att nollställas, vilket gör all krypterad meddelandehistorik omöjligt att läsa, om du inte först exporterar rumsnycklarna och sedan importerar dem efteråt. I framtiden kommer det här att förbättras.",
@@ -102,6 +110,7 @@
     "Enable encryption": "Aktivera kryptering",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Krypterade meddelanden syns inte på klienter som inte ännu stöder kryptering",
     "Encrypted room": "Krypterat rum",
+    "%(senderName)s ended the call.": "%(senderName)s avslutade samtalet.",
     "End-to-end encryption information": "Krypteringsinformation",
     "End-to-end encryption is in beta and may not be reliable": "Kryptering är i beta och är inte nödvändigtvis pålitligt",
     "Enter Code": "Skriv in kod",
@@ -140,6 +149,7 @@
     "Admin Tools": "Admin-verktyg",
     "Alias (optional)": "Alias (valfri)",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till hemservern - kontrollera anslutningen, se till att <a>hemserverns SSL-certifikat</a> är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.",
     "<a>Click here</a> to join the discussion!": "<a>Klicka här</a> för att gå med i diskussionen!",
     "Close": "Stäng",
     "%(count)s new messages|one": "%(count)s nytt meddelande",
@@ -166,6 +176,7 @@
     "Forgot your password?": "Glömt lösenord?",
     "For security, this session has been signed out. Please sign in again.": "Av säkerhetsskäl har den här sessionen loggats ut. Vänligen logga in igen.",
     "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.": "Av säkerhetsskäl kommer alla krypteringsnycklar att raderas från den här webbläsaren om du loggar ut. Om du vill läsa din krypterade meddelandehistorik från framtida Riot-sessioner, exportera nycklarna till förvar.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s från %(fromPowerLevel)s till %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Gäståtkomst är inte aktiverat på den här hemservern.",
     "Guests cannot join this room even if explicitly invited.": "Gäster kan inte gå med i det här rummet fastän de är uttryckligen inbjudna.",
     "Hangup": "Lägg på",
@@ -188,6 +199,7 @@
     "Invalid address format": "Fel adressformat",
     "Invalid Email Address": "Ogiltig epostadress",
     "Invalid file%(extra)s": "Fel fil%(extra)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s bjöd in %(targetName)s.",
     "Invite new room members": "Bjud in nya rumsmedlemmar",
     "Invited": "Inbjuden",
     "Invites": "Inbjudningar",
@@ -198,18 +210,25 @@
     "Sign in with": "Logga in med",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Gå med som <voiceText>röst</voiceText> eller <videoText>video</videoText>.",
     "Join Room": "Gå med i rum",
+    "%(targetName)s joined the room.": "%(targetName)s gick med i rummet.",
     "Joins room with given alias": "Går med i rummet med givet alias",
     "Jump to first unread message.": "Hoppa till första olästa meddelande.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickade %(targetName)s.",
     "Kick": "Kicka",
     "Kicks user with given id": "Kickar användaren med givet id",
     "Labs": "Labb",
     "Last seen": "Senast sedd",
     "Leave room": "Lämna rummet",
+    "%(targetName)s left the room.": "%(targetName)s lämnade rummet.",
     "Level:": "Nivå:",
     "Local addresses for this room:": "Lokala adresser för rummet:",
     "Logged in as:": "Inloggad som:",
     "Logout": "Logga ut",
     "Low priority": "Låg prioritet",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde framtida rumshistorik synligt för alla.",
     "Manage Integrations": "Hantera integrationer",
     "Markdown is disabled": "Markdown är inaktiverat",
     "Markdown is enabled": "Markdown är aktiverat",
@@ -252,6 +271,7 @@
     "People": "Personer",
     "Permissions": "Behörigheter",
     "Phone": "Telefon",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s startade ett %(callType)ssamtal.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Öppna meddelandet i din epost och klicka på länken i meddelandet. När du har gjort detta, klicka vidare.",
     "Power level must be positive integer.": "Behörighetsnivå måste vara ett positivt heltal.",
     "Press <StartChatButton> to start a chat with someone": "Tryck på <StartChatButton> för att starta en chatt med någon",
@@ -265,12 +285,16 @@
     "Revoke Moderator": "Degradera moderator",
     "Refer a friend to Riot:": "Hänvisa en vän till Riot:",
     "Register": "Registrera",
+    "%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.",
     "Reject invitation": "Avböj inbjudan",
     "Rejoin": "Gå med igen",
     "Remote addresses for this room:": "Fjärradresser för det här rummet:",
     "Remove Contact Information?": "Ta bort kontaktuppgifter?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s tog bort sitt visningsnamn (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s tog bort sin profilbild.",
     "Remove": "Ta bort",
     "Remove %(threePid)s?": "Ta bort %(threePid)s?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s begärde en VoIP-konferens.",
     "Resetting 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.": "Om du återställer ditt lösenord kommer alla krypteringsnycklar på alla enheter att återställas, vilket gör krypterad meddelandehistorik oläsbar om du inte först exporterar dina rumsnycklar och sedan importerar dem igen. I framtiden kommer det här att förbättras.",
     "Results from DuckDuckGo": "Resultat från DuckDuckGo",
     "Return to login screen": "Tillbaka till login-skärmen",
@@ -296,6 +320,7 @@
     "Send Invites": "Skicka inbjudningar",
     "Send Reset Email": "Skicka återställningsmeddelande",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s skickade en bild.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s bjöd in %(targetDisplayName)s med i rummet.",
     "Server error": "Serverfel",
     "Server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad",
     "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så tog sökningen för lång tid :(",
@@ -303,6 +328,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Servern kan vara otillgänglig, överbelastad, eller så stötte du på en bugg.",
     "Server unavailable, overloaded, or something else went wrong.": "Servern är otillgänglig, överbelastad, eller så gick något annat fel.",
     "Session ID": "Sessions-ID",
+    "%(senderName)s set a profile picture.": "%(senderName)s satte en profilbild.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s bytte sitt visningnamn till %(displayName)s.",
     "Settings": "Inställningar",
     "Show panel": "Visa panel",
     "Show Text Formatting Toolbar": "Visa textformatteringsverktygsfält",
@@ -564,7 +591,13 @@
     "You are now ignoring %(userId)s": "Du ignorerar nu %(userId)s",
     "Unignored user": "Oignorerad användare",
     "You are no longer ignoring %(userId)s": "Du ignorerar inte längre %(userId)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s bytte sitt visningsnamn till %(displayName)s.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s avbannade %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s drog tillbaka inbjudan för %(targetName)s.",
     "(no answer)": "(inget svar)",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget har modifierats av %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget har lagts till av %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget har tagits bort av %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s och %(count)s andra skriver",
     "%(names)s and %(count)s others are typing|one": "%(names)s och en till skriver",
     "Unnamed Room": "Namnlöst rum",
@@ -730,6 +763,9 @@
     "Always show encryption icons": "Visa alltid krypteringsikoner",
     "Disable big emoji in chat": "Inaktivera stor emoji i chatt",
     "Hide avatars in user and room mentions": "Dölj avatarer i användar- och rumsnämningar",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s bytte avatar för %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s tog bort rummets avatar.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ändrade rummets avatar till <img/>",
     "Automatically replace plain text Emoji": "Ersätt text-emojis automatiskt",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
@@ -913,6 +949,7 @@
     "Verifies a user, device, and pubkey tuple": "Verifierar en användare, enhet och nycklar",
     "VoIP conference started.": "VoIP-konferens startad.",
     "VoIP conference finished.": "VoIP-konferens avslutad.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern.",
     "The remote side failed to pick up": "Mottagaren kunde inte svara",
     "Room name or alias": "Rumsnamn eller alias",
@@ -932,6 +969,7 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie (se vår <PolicyLink>Cookiepolicy</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie.",
     "Yes, I want to help!": "Ja, jag vill hjälpa till!",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s aktiverade kryptering (algoritm %(algorithm)s).",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)slämnade och gick med igen %(count)s gånger",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)slämnade och gick med igen",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)slämnade och gick med igen %(count)s gånger",
@@ -1128,6 +1166,7 @@
     "Passphrases must match": "Passfraser måste matcha",
     "Passphrase must not be empty": "Lösenfras får inte vara tom",
     "Confirm passphrase": "Bekräfta lösenfrasen",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ändrade fastnålade meddelanden för rummet.",
     "Message Pinning": "Nåla fast meddelanden",
     "Unpin Message": "Ta bort fastnålning",
     "No pinned messages.": "Inga fastnålade meddelanden.",
@@ -1141,44 +1180,5 @@
     "This room is not showing flair for any communities": "Detta rum visar inte emblem för några communityn",
     "Flair will appear if enabled in room settings": "Emblem kommer visas om det är aktiverat i rumsinställningarna",
     "Flair will not appear": "Emblem kommer inte att visas",
-    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det.",
-    "<target> accepted the invitation for %(displayName)s.": "<target> accepterade inbjudan för %(displayName)s.",
-    "<target> accepted an invitation.": "<target> accepterade en inbjudan.",
-    "<sender> requested a VoIP conference.": "<sender> begärde en VoIP-konferens.",
-    "<sender> invited <target>.": "<sender> bjöd in <target>.",
-    "<sender> banned <target>.": "<sender> bannade <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> bytte sitt visningsnamn till <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> bytte sitt visningnamn till <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> tog bort sitt visningsnamn (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> tog bort sin profilbild.",
-    "<sender> changed their profile picture.": "<sender> bytte sin profilbild.",
-    "<sender> set a profile picture.": "<sender> satte en profilbild.",
-    "<target> joined the room.": "<target> gick med i rummet.",
-    "<target> rejected the invitation.": "<target> avvisade inbjudan.",
-    "<target> left the room.": "<target> lämnade rummet.",
-    "<sender> unbanned <target>.": "<sender> avbannade <target>.",
-    "<sender> kicked <target>.": "<sender> kickade <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> drog tillbaka inbjudan för <target>.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> bytte rummets ämne till \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> bytte rummets namn till %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> bytte avatar för %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> ändrade rummets avatar till <img/>",
-    "<sender> removed the room name.": "<sender> tog bort rummets namn.",
-    "<sender> removed the room avatar.": "<sender> tog bort rummets avatar.",
-    "<sender> answered the call.": "<sender> svarade på samtalet.",
-    "<sender> ended the call.": "<sender> avslutade samtalet.",
-    "<sender> placed a %(callType)s call.": "<sender> startade ett %(callType)ssamtal.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> bjöd in %(targetDisplayName)s med i rummet.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> gjorde framtida rumshistorik synligt för alla rumsmedlemmar fr.o.m. att de gick med som medlem.",
-    "<sender> made future room history visible to all room members.": "<sender> gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
-    "<sender> made future room history visible to anyone.": "<sender> gjorde framtida rumshistorik synligt för alla.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> aktiverade kryptering (algoritm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> från %(fromPowerLevel)s till %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> ändrade behörighetsnivå för %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> ändrade fastnålade meddelanden för rummet.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s-widget har modifierats av <sender>",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s-widget har lagts till av <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s-widget har tagits bort av <sender>"
+    "Display your community flair in rooms configured to show it.": "Visa ditt community-emblem i rum som är konfigurerade för att visa det."
 }
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index 301651a13d..b6102a5eb5 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -1,6 +1,7 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "ఒక టెక్స్ట్ సందేశం +%(msisdn)s కు పంపబడింది. దయచేసి దీనిలో ఉన్న ధృవీకరణ కోడ్ను నమోదు చేయండి",
     "Accept": "అంగీకరించు",
+    "%(targetName)s accepted an invitation.": "%(targetName)s ఆహ్వానాన్ని అంగీకరించింది.",
     "Account": "ఖాతా",
     "Access Token:": "యాక్సెస్ టోకెన్:",
     "Add": "చేర్చు",
@@ -28,6 +29,7 @@
     "You have been invited to join this room by %(inviterName)s": "%(inviterName)s ఈ గదిలో చేరడానికి మీరు ఆహ్వానించబడ్డారు",
     "Active call (%(roomName)s)": "క్రియాశీల కాల్ల్ (%(roomName)s)",
     "A new password must be entered.": "కొత్త పాస్ వర్డ్ ను తప్పక నమోదు చేయాలి.",
+    "%(senderName)s answered the call.": "%(senderName)s కు సమాధానం ఇచ్చారు.",
     "An error has occurred.": "ఒక లోపము సంభవించినది.",
     "Anyone": "ఎవరైనా",
     "Anyone who knows the room's link, apart from guests": "అతిథులు కాకుండా గది యొక్క లింక్ తెలిసిన వారు ఎవరైనా",
@@ -47,6 +49,8 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "గృహనిర్వాహకులకు కనెక్ట్ చేయలేరు - దయచేసి మీ కనెక్టివిటీని తనిఖీ చేయండి, మీ <a> 1 హోమరుసు యొక్క ఎస్ఎస్ఎల్ సర్టిఫికేట్ </a> 2 ని విశ్వసనీయపరుచుకొని, బ్రౌజర్ పొడిగింపు అభ్యర్థనలను నిరోధించబడదని నిర్ధారించుకోండి.",
     "Can't load user settings": "వినియోగదారు సెట్టింగ్లను లోడ్ చేయలేరు",
     "Change Password": "పాస్వర్డ్ మార్చండి",
+    "%(senderName)s changed their profile picture.": "%(senderName)s వారి ప్రొఫైల్ చిత్రాన్ని మార్చారు.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s గది పేరు తొలగించబడింది.",
     "Changes to who can read history will only apply to future messages in this room": "చరిత్ర చదివేవారికి మార్పులు ఈ గదిలో భవిష్య సందేశాలకు మాత్రమే వర్తిస్తాయి",
     "Changes your display nickname": "మీ ప్రదర్శన మారుపేరుని మారుస్తుంది",
     "You cannot place a call with yourself.": "మీరు మీతో కాల్ చేయలేరు.",
@@ -271,9 +275,5 @@
     "#example": "#ఉదాహరణ",
     "Collapse panel": "ప్యానెల్ కుదించు",
     "Checking for an update...": "నవీకరణ కోసం చూస్తోంది...",
-    "Saturday": "శనివారం",
-    "<target> accepted an invitation.": "<target> ఆహ్వానాన్ని అంగీకరించింది.",
-    "<sender> changed their profile picture.": "<sender> వారి ప్రొఫైల్ చిత్రాన్ని మార్చారు.",
-    "<sender> removed the room name.": "<sender> గది పేరు తొలగించబడింది.",
-    "<sender> answered the call.": "<sender> కు సమాధానం ఇచ్చారు."
+    "Saturday": "శనివారం"
 }
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 878d5eaaee..3fe7bf8f98 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -11,6 +11,8 @@
     "Delete": "ลบ",
     "Default": "ค่าเริ่มต้น",
     "Default Device": "อุปกรณ์เริ่มต้น",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s แบน %(targetName)s แล้ว",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s เปลี่ยนหัวข้อเป็น \"%(topic)s\"",
     "Decrypt %(text)s": "ถอดรหัส %(text)s",
     "Device ID": "ID อุปกรณ์",
     "Device ID:": "ID อุปกรณ์:",
@@ -49,6 +51,8 @@
     "Custom Server Options": "กำหนดเซิร์ฟเวอร์เอง",
     "Favourite": "รายการโปรด",
     "Failed to forget room %(errCode)s": "การลืมห้องล้มเหลว %(errCode)s",
+    "%(targetName)s accepted an invitation.": "%(targetName)s ตอบรับคำเชิญแล้ว",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ตอบรับคำเชิญสำหรับ %(displayName)s แล้ว",
     "Add a topic": "เพิ่มหัวข้อ",
     "Add email address": "เพิ่มที่อยู่อีเมล",
     "Admin": "ผู้ดูแล",
@@ -62,6 +66,7 @@
     "and %(count)s others...|one": "และอีกหนึ่งผู้ใช้...",
     "and %(count)s others...|other": "และอีก %(count)s ผู้ใช้...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s และ %(lastPerson)s กำลังพิมพ์",
+    "%(senderName)s answered the call.": "%(senderName)s รับสายแล้ว",
     "An error has occurred.": "เกิดข้อผิดพลาด",
     "Anyone": "ทุกคน",
     "Anyone who knows the room's link, apart from guests": "ทุกคนที่มีลิงก์ ยกเว้นแขก",
@@ -76,6 +81,9 @@
     "Bans user with given id": "ผู้ใช้และ id ที่ถูกแบน",
     "Blacklisted": "ขึ้นบัญชีดำ",
     "Can't load user settings": "ไม่สามารถโหลดการตั้งค่าผู้ใช้ได้",
+    "%(senderName)s changed their profile picture.": "%(senderName)s เปลี่ยนรูปโปรไฟล์ของเขา",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s เปลี่ยนชื่อห้องไปเป็น %(roomName)s",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ลบชื่อห้อง",
     "Changes your display nickname": "เปลี่ยนชื่อเล่นที่แสดงของคุณ",
     "Clear Cache and Reload": "ล้างแคชแล้วโหลดใหม่",
     "Clear Cache": "ล้างแคช",
@@ -115,6 +123,7 @@
     "Email address (optional)": "ที่อยู่อีเมล (ไม่ใส่ก็ได้)",
     "Email, name or matrix ID": "อีเมล ชื่อ หรือ ID matrix",
     "Encrypted room": "ห้องที่ถูกเข้ารหัส",
+    "%(senderName)s ended the call.": "%(senderName)s จบการโทร",
     "Enter Code": "กรอกรหัส",
     "Error decrypting attachment": "การถอดรหัสไฟล์แนบผิดพลาด",
     "Export": "ส่งออก",
@@ -138,6 +147,7 @@
     "Filter room members": "กรองสมาชิกห้อง",
     "Forget room": "ลืมห้อง",
     "Forgot your password?": "ลิมรหัสผ่าน?",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s จาก %(fromPowerLevel)s ไปเป็น %(toPowerLevel)s",
     "Hangup": "วางสาย",
     "Historical": "ประวัติแชทเก่า",
     "Homeserver is": "เซิร์ฟเวอร์บ้านคือ",
@@ -151,6 +161,7 @@
     "Invalid address format": "รูปแบบที่อยู่ไม่ถูกต้อง",
     "Invalid Email Address": "ที่อยู่อีเมลไม่ถูกต้อง",
     "Invalid file%(extra)s": "ไฟล์ %(extra)s ไม่ถูกต้อง",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s เชิญ %(targetName)s แล้ว",
     "Invite new room members": "เชิญสมาชิกใหม่",
     "Invited": "เชิญแล้ว",
     "Invites": "คำเชิญ",
@@ -159,9 +170,12 @@
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ไม่ใช่รูปแบบที่ถูกต้องสำหรับนามแฝง",
     "Sign in with": "เข้าสู่ระบบด้วย",
     "Join Room": "เข้าร่วมห้อง",
+    "%(targetName)s joined the room.": "%(targetName)s เข้าร่วมห้องแล้ว",
     "Jump to first unread message.": "ข้ามไปยังข้อความแรกที่ยังไม่ได้อ่าน",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s เตะ %(targetName)s แล้ว",
     "Labs": "ห้องทดลอง",
     "Leave room": "ออกจากห้อง",
+    "%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
     "Logged in as:": "เข้าสู่ระบบในชื่อ:",
     "Logout": "ออกจากระบบ",
     "Markdown is disabled": "ปิดใช้งาน Markdown แล้ว",
@@ -184,12 +198,16 @@
     "People": "บุคคล",
     "Permissions": "สิทธิ์",
     "Phone": "โทรศัพท์",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ได้เริ่มการโทรแบบ%(callType)s",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "กรุณาเช็คอีเมลและคลิกลิงก์ข้างใน หลังจากนั้น คลิกดำเนินการต่อ",
     "Privacy warning": "คำเตือนเกี่ยวกับความเป็นส่วนตัว",
     "Privileged Users": "ผู้ใช้ที่มีสิทธิพิเศษ",
     "Revoke Moderator": "เพิกถอนผู้ช่วยดูแล",
     "Refer a friend to Riot:": "แนะนำเพื่อนให้รู้จัก Riot:",
+    "%(targetName)s rejected the invitation.": "%(targetName)s ปฏิเสธคำเชิญแล้ว",
     "Reject invitation": "ปฏิเสธคำเชิญ",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ลบชื่อที่แสดงแล้ว (%(oldDisplayName)s)",
+    "%(senderName)s removed their profile picture.": "%(senderName)s ลบรูปโปรไฟล์ของเขาแล้ว",
     "Remove %(threePid)s?": "ลบ %(threePid)s?",
     "Return to login screen": "กลับไปยังหน้าลงชื่อเข้าใช้",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot ไม่มีสิทธิ์ส่งการแจ้งเตือน - กรุณาตรวจสอบการตั้งค่าเบราว์เซอร์ของคุณ",
@@ -204,12 +222,15 @@
     "Searches DuckDuckGo for results": "ค้นหาบน DuckDuckGo",
     "Send Invites": "ส่งคำเชิญ",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ได้ส่งรูป",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ได้ส่งคำเชิญให้ %(targetDisplayName)s เข้าร่วมห้อง",
     "Server error": "เซิร์ฟเวอร์ผิดพลาด",
     "Server may be unavailable or overloaded": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งานหรือทำงานหนักเกินไป",
     "Server may be unavailable, overloaded, or search timed out :(": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือการค้นหาหมดเวลา :(",
     "Server may be unavailable, overloaded, or the file too big": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือไฟล์ใหญ่เกินไป",
     "Server may be unavailable, overloaded, or you hit a bug.": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือเจอจุดบกพร่อง",
     "Server unavailable, overloaded, or something else went wrong.": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือบางอย่างผิดปกติ",
+    "%(senderName)s set a profile picture.": "%(senderName)s ตั้งรูปโปรไฟล์",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ตั้งชื่อที่แสดงเป็น %(displayName)s",
     "Show panel": "แสดงหน้าต่าง",
     "Signed Out": "ออกจากระบบแล้ว",
     "Sign in": "เข้าสู่ระบบ",
@@ -248,9 +269,11 @@
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "ไฟล์ '%(fileName)s' มีขนาดใหญ่เกินจำกัดของเซิร์ฟเวอร์บ้าน",
     "Turn Markdown off": "ปิด markdown",
     "Turn Markdown on": "เปิด markdown",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ได้เปิดใช้งานการเข้ารหัสจากปลายทางถึงปลายทาง (อัลกอริทึม%(algorithm)s).",
     "Unable to add email address": "ไมาสามารถเพิ่มที่อยู่อีเมล",
     "Unable to verify email address.": "ไม่สามารถยืนยันที่อยู่อีเมล",
     "Unban": "ปลดแบน",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ปลดแบน %(targetName)s แล้ว",
     "Unable to capture screen": "ไม่สามารถจับภาพหน้าจอ",
     "Unable to enable Notifications": "ไม่สามารถเปิดใช้งานการแจ้งเตือน",
     "Unable to load device list": "ไม่สามารถโหลดรายชื่ออุปกรณ์",
@@ -535,28 +558,5 @@
     "Collapse panel": "ซ่อนหน้าต่าง",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "การแสดงผลของโปรแกรมอาจผิดพลาด ฟังก์ชันบางอย่างหรือทั้งหมดอาจไม่ทำงานในเบราว์เซอร์ปัจจุบันของคุณ หากคุณต้องการลองดำเนินการต่อ คุณต้องรับมือกับปัญหาที่อาจจะเกิดขึ้นด้วยตัวคุณเอง!",
     "Checking for an update...": "กำลังตรวจหาอัปเดต...",
-    "There are advanced notifications which are not shown here": "มีการแจ้งเตือนขั้นสูงที่ไม่ได้แสดงที่นี่",
-    "<target> accepted the invitation for %(displayName)s.": "<target> ตอบรับคำเชิญสำหรับ %(displayName)s แล้ว",
-    "<target> accepted an invitation.": "<target> ตอบรับคำเชิญแล้ว",
-    "<sender> invited <target>.": "<sender> เชิญ <target> แล้ว",
-    "<sender> banned <target>.": "<sender> แบน <target> แล้ว",
-    "<sender> set their display name to <displayName>.": "<sender> ตั้งชื่อที่แสดงเป็น <displayName>",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> ลบชื่อที่แสดงแล้ว (<oldDisplayName>)",
-    "<sender> removed their profile picture.": "<sender> ลบรูปโปรไฟล์ของเขาแล้ว",
-    "<sender> changed their profile picture.": "<sender> เปลี่ยนรูปโปรไฟล์ของเขา",
-    "<sender> set a profile picture.": "<sender> ตั้งรูปโปรไฟล์",
-    "<target> joined the room.": "<target> เข้าร่วมห้องแล้ว",
-    "<target> rejected the invitation.": "<target> ปฏิเสธคำเชิญแล้ว",
-    "<target> left the room.": "<target> ออกจากห้องแล้ว",
-    "<sender> unbanned <target>.": "<sender> ปลดแบน <target> แล้ว",
-    "<sender> kicked <target>.": "<sender> เตะ <target> แล้ว",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> เปลี่ยนหัวข้อเป็น \"%(topic)s\"",
-    "<sender> changed the room name to %(roomName)s.": "<sender> เปลี่ยนชื่อห้องไปเป็น %(roomName)s",
-    "<sender> removed the room name.": "<sender> ลบชื่อห้อง",
-    "<sender> answered the call.": "<sender> รับสายแล้ว",
-    "<sender> ended the call.": "<sender> จบการโทร",
-    "<sender> placed a %(callType)s call.": "<sender> ได้เริ่มการโทรแบบ%(callType)s",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> ได้ส่งคำเชิญให้ %(targetDisplayName)s เข้าร่วมห้อง",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> ได้เปิดใช้งานการเข้ารหัสจากปลายทางถึงปลายทาง (อัลกอริทึม%(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> จาก %(fromPowerLevel)s ไปเป็น %(toPowerLevel)s"
+    "There are advanced notifications which are not shown here": "มีการแจ้งเตือนขั้นสูงที่ไม่ได้แสดงที่นี่"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 9bedd16ccb..04f78dc1ee 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1,6 +1,8 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "+%(msisdn)s 'ye bir kısa mesaj gönderildi . Lütfen içerdiği doğrulama kodunu girin",
     "Accept": "Kabul Et",
+    "%(targetName)s accepted an invitation.": "%(targetName)s bir davetiyeyi kabul etti.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s %(displayName)s için davetiyeyi kabul etti.",
     "Account": "Hesap",
     "Access Token:": "Erişim Anahtarı:",
     "Active call (%(roomName)s)": "Aktif çağrı (%(roomName)s)",
@@ -30,6 +32,7 @@
     "and %(count)s others...|other": "ve %(count)s diğerleri...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s ve %(lastPerson)s yazıyorlar",
     "A new password must be entered.": "Yeni bir şifre girilmelidir.",
+    "%(senderName)s answered the call.": "%(senderName)s aramayı cevapladı.",
     "An error has occurred.": "Bir hata oluştu.",
     "Anyone": "Kimse",
     "Anyone who knows the room's link, apart from guests": "Misafirler dışında odanın bağlantısını bilen herkes",
@@ -40,6 +43,7 @@
     "Are you sure you want to upload the following files?": "Aşağıdaki dosyaları yüklemek istediğinizden emin misiniz ?",
     "Attachment": "Ek Dosya",
     "Autoplay GIFs and videos": "GIF'leri ve Videoları otomatik olarak oynat",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s %(targetName)s'i banladı.",
     "Ban": "Yasak",
     "Banned users": "Yasaklanan(Banlanan) Kullanıcılar",
     "Bans user with given id": "Yasaklanan(Banlanan) Kullanıcılar , ID'leri ile birlikte",
@@ -50,6 +54,11 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Tarayıcı çubuğunuzda bir HTTPS URL'si olduğunda Ana Sunusuna HTTP üzerinden bağlanılamıyor . Ya HTTPS kullanın veya  <a> güvensiz komut dosyalarını</a> etkinleştirin.",
     "Can't load user settings": "Kullanıcı ayarları yüklenemiyor",
     "Change Password": "Şifre Değiştir",
+    "%(senderName)s changed their profile picture.": "%(senderName)s profil resmini değiştirdi.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s %(powerLevelDiffText)s'nin güç düzeyini değiştirdi.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s odanın ismini  %(roomName)s olarak değiştirdi.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s oda adını kaldırdı.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s konuyu \"%(topic)s\" olarak değiştirdi.",
     "Changes to who can read history will only apply to future messages in this room": "Geçmişi kimlerin okuyabileceğine ait değişiklikler yalnızca bu odada gelecekteki iletiler için geçerli olur",
     "Changes your display nickname": "Görünen takma adınızı değiştirir",
     "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.": "Şifre değiştirme eğer oda anahtarlarınızı dışa aktarmaz ve daha sonra tekrar içe aktarmazsanız , şu anda tüm cihazlarda uçtan uca şifreleme anahtarlarını sıfırlayacak ve geçmişi okunamaz hale getirecek . Gelecekte bu geliştirilecek.",
@@ -123,6 +132,7 @@
     "Encrypted room": "Şifrelenmiş Oda",
     "Encryption is enabled in this room": "Şifreleme bu oda için etkin",
     "Encryption is not enabled in this room": "Şifreleme bu oda için etkin değil",
+    "%(senderName)s ended the call.": "%(senderName)s çağrıyı bitirdi.",
     "End-to-end encryption information": "Uçtan-uca şifreleme bilgileri",
     "End-to-end encryption is in beta and may not be reliable": "Uçtan uca şifreleme beta sürümünde ve güvenilir olmayabilir",
     "Enter Code": "Kodu Girin",
@@ -166,6 +176,7 @@
     "Forgot your password?": "Şifrenizi mi unuttunuz ?",
     "For security, this session has been signed out. Please sign in again.": "Güvenlik için , bu oturuma çıkış yapıldı . Lütfen tekrar oturum açın.",
     "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.": "Güvenlik için , çıkış yaparsanız bu tarayıcıdan tüm uçtan uca şifreleme anahtarları silinecek . Konuşma geçmişinizi çözebilmek isterseniz gelecekteki Riot oturumlarında  , lütfen Oda Anahtarlarını güvenlik amaçlı Dışa Aktarın.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s %(fromPowerLevel)s den %(toPowerLevel)s ' ye",
     "Guest access is disabled on this Home Server.": "Misafir erişimi bu Ana Sunucu için devre dışı.",
     "Guests cannot join this room even if explicitly invited.": "Misafirler açıkca davet edilseler bile bu odaya katılamazlar.",
     "Hangup": "Sorun",
@@ -188,6 +199,7 @@
     "Invalid address format": "Geçersiz adres formatı",
     "Invalid Email Address": "Geçersiz E-posta Adresi",
     "Invalid file%(extra)s": "Geçersiz dosya %(extra)s'ı",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s %(targetName)s ' ı davet etti.",
     "Invite new room members": "Yeni oda üyelerini davet et",
     "Invited": "Davet Edildi",
     "Invites": "Davetler",
@@ -198,18 +210,26 @@
     "Sign in with": "Şununla giriş yap",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText> ses </voiceText> veya <videoText> video </videoText> olarak katılın.",
     "Join Room": "Odaya Katıl",
+    "%(targetName)s joined the room.": "%(targetName)s odaya katıldı.",
     "Joins room with given alias": "Verilen takma ad (nick name) ile odaya katıl",
     "Jump to first unread message.": "İlk okunmamış iletiye atla.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s %(targetName)s' ı attı.",
     "Kick": "Atmak (Odadan atmak vs.)",
     "Kicks user with given id": "Verilen ID ' li kullanıcıyı at",
     "Labs": "Laboratuarlar",
     "Last seen": "Son görülme",
     "Leave room": "Odadan ayrıl",
+    "%(targetName)s left the room.": "%(targetName)s odadan ayrıldı.",
     "Level:": "Seviye :",
     "Local addresses for this room:": "Bu oda için yerel adresler :",
     "Logged in as:": "Olarak giriş yaptı :",
     "Logout": "Çıkış Yap",
     "Low priority": "Düşük öncelikli",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , katıldıkları noktalardan.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s gelecekte oda geçmişini görünür yaptı herhangi biri.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gelecekte oda geçmişini görünür yaptı bilinmeyen (%(visibility)s).",
     "Manage Integrations": "Entegrasyonları Yönet",
     "Markdown is disabled": "Markdown devre dışı",
     "Markdown is enabled": "Markdown aktif",
@@ -251,6 +271,7 @@
     "People": "İnsanlar",
     "Permissions": "İzinler",
     "Phone": "Telefon",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s bir %(callType)s çağrısı yerleştirdi.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lütfen e-postanızı kontrol edin ve içerdiği bağlantıya tıklayın . Bu işlem tamamlandıktan sonra , 'devam et' e tıklayın .",
     "Power level must be positive integer.": "Güç seviyesi pozitif tamsayı olmalıdır.",
     "Press <StartChatButton> to start a chat with someone": "Birisiyle sohbet başlatmak için <StartChatButton> tuşuna basın",
@@ -264,12 +285,16 @@
     "Revoke Moderator": "Moderatörü İptal Et",
     "Refer a friend to Riot:": "Riot'tan bir arkadaşa bakın :",
     "Register": "Kaydolun",
+    "%(targetName)s rejected the invitation.": "%(targetName)s daveti reddetti.",
     "Reject invitation": "Daveti Reddet",
     "Rejoin": "Yeniden Katıl",
     "Remote addresses for this room:": "Bu oda için uzak adresler:",
     "Remove Contact Information?": "İletişim Bilgilerini Kaldır ?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s görünen adı (%(oldDisplayName)s) kaldırdı.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s profil resmini kaldırdı.",
     "Remove": "Kaldır",
     "Remove %(threePid)s?": "%(threePid)s 'i  kaldır ?",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s bir VoIP konferansı talep etti.",
     "Resetting 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.": "Şifrenizi sıfırlamak , eğer Oda Anahtarlarınızı dışa aktarmaz ve daha sonra içe aktarmaz iseniz , şu anda tüm cihazlarda uçtan uca şifreleme anahtarlarını sıfırlayarak şifreli sohbetleri okunamaz hale getirecek . Gelecekte bu iyileştirilecek.",
     "Results from DuckDuckGo": "DuckDuckGo Sonuçları",
     "Return to login screen": "Giriş ekranına dön",
@@ -295,6 +320,7 @@
     "Send Invites": "Davetiye Gönder",
     "Send Reset Email": "E-posta Sıfırlama Gönder",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s bir resim gönderdi.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s %(targetDisplayName)s' a odaya katılması için bir davet gönderdi.",
     "Server error": "Sunucu Hatası",
     "Server may be unavailable or overloaded": "Sunucu kullanılamıyor veya aşırı yüklenmiş olabilir",
     "Server may be unavailable, overloaded, or search timed out :(": "Sunucu kullanılamıyor , aşırı yüklenmiş veya arama zaman aşımına uğramış olabilir :(",
@@ -302,6 +328,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Sunucu kullanılamıyor , aşırı yüklenmiş , veya bir hatayla karşılaşmış olabilirsiniz.",
     "Server unavailable, overloaded, or something else went wrong.": "Sunucu kullanılamıyor , aşırı yüklenmiş veya başka bir şey ters gitmiş olabilir.",
     "Session ID": "Oturum ID",
+    "%(senderName)s set a profile picture.": "%(senderName)s bir profil resmi ayarladı.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s görünür ismini %(displayName)s ' a ayarladı.",
     "Settings": "Ayarlar",
     "Show panel": "Paneli göster",
     "Show Text Formatting Toolbar": "Metin Biçimlendirme Araç Çubuğunu Göster",
@@ -346,10 +374,12 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Bu odanın akışında belirli bir noktaya yüklemeye çalışıldı , ancak bulunamadı.",
     "Turn Markdown off": "Markdown'u kapat",
     "Turn Markdown on": "Markdown'u Aç",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s uçtanuca şifrelemeyi açtı (algoritma -> %(algorithm)s).",
     "Unable to add email address": "E-posta adresi eklenemiyor",
     "Unable to remove contact information": "Kişi bilgileri kaldırılamıyor",
     "Unable to verify email address.": "E-posta adresi doğrulanamıyor.",
     "Unban": "Yasağı Kaldır",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s %(targetName)s 'in yasağını kaldırdı.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Bu davetiyenin gönderildiği adresin hesabınızla ilişkili bir adresle eşleştiğini tespit etmek mümkün değil.",
     "Unable to capture screen": "Ekran yakalanamadı",
     "Unable to enable Notifications": "Bildirimler aktif edilemedi",
@@ -406,6 +436,7 @@
     "Who can read history?": "Geçmişi kimler okuyabilir ?",
     "Who would you like to add to this room?": "Bu odaya kimi eklemek istersiniz ?",
     "Who would you like to communicate with?": "Kimlerle iletişim kurmak istersiniz ?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s %(targetName)s'nin davetinden çekildi.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Bu daveti <acceptText> kabul etmek </acceptText> veya <declineText> reddetmek </declineText> ister misiniz ?",
     "You already have existing direct chats with this user:": "Bu kullanıcıyla var olan doğrudan sohbetleriniz var :",
     "You are already in a call.": "Zaten bir çağrıdasınız.",
@@ -575,6 +606,9 @@
     "Start chatting": "Sohbeti başlat",
     "Start Chatting": "Sohbeti Başlat",
     "Click on the button below to start chatting!": "Sohbeti başlatmak için aşağıdaki butona tıklayın!",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s odanın avatarını <img/> olarak çevirdi",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odanın avatarını kaldırdı.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s  %(roomName)s için avatarı değiştirdi",
     "Username available": "Kullanıcı ismi uygun",
     "Username not available": "Kullanıcı ismi uygun değil",
     "Something went wrong!": "Bir şeyler yanlış gitti!",
@@ -717,39 +751,5 @@
     "View Source": "Kaynağı Görüntüle",
     "Collapse panel": "Katlanır panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
-    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
-    "<target> accepted the invitation for %(displayName)s.": "<target> %(displayName)s için davetiyeyi kabul etti.",
-    "<target> accepted an invitation.": "<target> bir davetiyeyi kabul etti.",
-    "<sender> requested a VoIP conference.": "<sender> bir VoIP konferansı talep etti.",
-    "<sender> invited <target>.": "<sender> <target> ' ı davet etti.",
-    "<sender> banned <target>.": "<sender> <target>'i banladı.",
-    "<sender> set their display name to <displayName>.": "<sender> görünür ismini <displayName> ' a ayarladı.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> görünen adı (<oldDisplayName>) kaldırdı.",
-    "<sender> removed their profile picture.": "<sender> profil resmini kaldırdı.",
-    "<sender> changed their profile picture.": "<sender> profil resmini değiştirdi.",
-    "<sender> set a profile picture.": "<sender> bir profil resmi ayarladı.",
-    "<target> joined the room.": "<target> odaya katıldı.",
-    "<target> rejected the invitation.": "<target> daveti reddetti.",
-    "<target> left the room.": "<target> odadan ayrıldı.",
-    "<sender> unbanned <target>.": "<sender> <target> 'in yasağını kaldırdı.",
-    "<sender> kicked <target>.": "<sender> <target>' ı attı.",
-    "<sender> withdrew <target>'s invitation.": "<sender> <target>'nin davetinden çekildi.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> konuyu \"%(topic)s\" olarak değiştirdi.",
-    "<sender> changed the room name to %(roomName)s.": "<sender> odanın ismini  %(roomName)s olarak değiştirdi.",
-    "<sender> changed the room avatar to <img/>": "<sender> odanın avatarını <img/> olarak çevirdi",
-    "<sender> changed the avatar for %(roomName)s": "<sender>  %(roomName)s için avatarı değiştirdi",
-    "<sender> removed the room name.": "<sender> oda adını kaldırdı.",
-    "<sender> removed the room avatar.": "<sender> odanın avatarını kaldırdı.",
-    "<sender> answered the call.": "<sender> aramayı cevapladı.",
-    "<sender> ended the call.": "<sender> çağrıyı bitirdi.",
-    "<sender> placed a %(callType)s call.": "<sender> bir %(callType)s çağrısı yerleştirdi.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> %(targetDisplayName)s' a odaya katılması için bir davet gönderdi.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , katıldıkları noktalardan.",
-    "<sender> made future room history visible to all room members.": "<sender> gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri.",
-    "<sender> made future room history visible to anyone.": "<sender> gelecekte oda geçmişini görünür yaptı herhangi biri.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> gelecekte oda geçmişini görünür yaptı bilinmeyen (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> uçtanuca şifrelemeyi açtı (algoritma -> %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> %(fromPowerLevel)s den %(toPowerLevel)s ' ye",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> %(powerLevelDiffText)s'nin güç düzeyini değiştirdi."
+    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var"
 }
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 09158411fc..5e7cc75f8a 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -23,6 +23,8 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Текстове повідомлення було надіслано +%(msisdn)s. Введіть, будь ласка, код підтвердження з цього повідомлення",
     "Accept": "Прийняти",
     "Account": "Обліковка",
+    "%(targetName)s accepted an invitation.": "%(targetName)s прийняв запрошення.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прийняв запрошення від %(displayName)s.",
     "Access Token:": "Токен доступу:",
     "Active call (%(roomName)s)": "Активний виклик (%(roomName)s)",
     "Add": "Додати",
@@ -55,6 +57,7 @@
     "A new password must be entered.": "Має бути введений новий пароль.",
     "Add a widget": "Добавити віджет",
     "Allow": "Принюти",
+    "%(senderName)s answered the call.": "%(senderName)s відповіла на дзвінок.",
     "An error has occurred.": "Трапилась помилка.",
     "Anyone": "Кожний",
     "Anyone who knows the room's link, apart from guests": "Кожний, хто знає посилання на кімнату, окрім гостей",
@@ -65,6 +68,7 @@
     "Are you sure you want to upload the following files?": "Ви впевнені, що ви хочете відправити наступний файл?",
     "Attachment": "Прикріплення",
     "Autoplay GIFs and videos": "Автовідтворення GIF і відео",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокував(ла) %(targetName)s.",
     "Ban": "Заблокувати",
     "Banned users": "Заблоковані користувачі",
     "Bans user with given id": "Блокує користувача з заданим ID",
@@ -75,6 +79,11 @@
     "Can't load user settings": "Неможливо завантажити настройки користувача",
     "Cannot add any more widgets": "Неможливо додати більше віджетів",
     "Change Password": "Поміняти пароль",
+    "%(senderName)s changed their profile picture.": "%(senderName)s змінив зображення профіля.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінив(ла) рівень доступу для %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінив(ла) назву кімнати на %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s видалив ім'я кімнати.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінив тему на %(topic)s.",
     "Email": "е-пошта",
     "Email address": "Адреса е-почти",
     "Email address (optional)": "Адреса е-почти (не обов'язково)",
@@ -270,14 +279,5 @@
     "Your User Agent": "Ваш користувацький агент",
     "Your device resolution": "Роздільність вашого пристрою",
     "Analytics": "Аналітика",
-    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:",
-    "<target> accepted the invitation for %(displayName)s.": "<target> прийняв запрошення від %(displayName)s.",
-    "<target> accepted an invitation.": "<target> прийняв запрошення.",
-    "<sender> banned <target>.": "<sender> заблокував(ла) <target>.",
-    "<sender> changed their profile picture.": "<sender> змінив зображення профіля.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> змінив тему на %(topic)s.",
-    "<sender> changed the room name to %(roomName)s.": "<sender> змінив(ла) назву кімнати на %(roomName)s.",
-    "<sender> removed the room name.": "<sender> видалив ім'я кімнати.",
-    "<sender> answered the call.": "<sender> відповіла на дзвінок.",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> змінив(ла) рівень доступу для %(powerLevelDiffText)s."
+    "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:"
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index e1c9dbe953..56d5c1e4dc 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -26,6 +26,7 @@
     "Enable encryption": "启用加密",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "不支持加密的客户端将看不到加密的消息",
     "Encrypted room": "加密聊天室",
+    "%(senderName)s ended the call.": "%(senderName)s 结束了通话。.",
     "End-to-end encryption information": "端到端加密信息",
     "End-to-end encryption is in beta and may not be reliable": "端到端加密现为 beta 版，不一定可靠",
     "Enter Code": "输入验证码",
@@ -63,6 +64,7 @@
     "Forgot your password?": "忘记密码？",
     "For security, this session has been signed out. Please sign in again.": "出于安全考虑，此会话已被注销。请重新登录。.",
     "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.": "出于安全考虑，用户注销时会清除浏览器里的端到端加密密钥。如果你想要下次登录 Riot 时能解密过去的聊天记录，请导出你的聊天室密钥。",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 从 %(fromPowerLevel)s 变为 %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主动邀请。.",
     "Hangup": "挂断",
     "Hide read receipts": "隐藏已读回执",
@@ -96,6 +98,7 @@
     "Send Invites": "发送邀请",
     "Send Reset Email": "发送密码重设邮件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 发了一张图片。.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 发了加入聊天室的邀请。.",
     "Server error": "服务器错误",
     "Server may be unavailable or overloaded": "服务器可能不可用或者超载",
     "Server may be unavailable, overloaded, or search timed out :(": "服务器可能不可用、超载，或者搜索超时 :(",
@@ -103,6 +106,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "服务器可能不可用、超载，或者你遇到了一个 bug。",
     "Server unavailable, overloaded, or something else went wrong.": "服务器可能不可用、超载，或者其他东西出错了.",
     "Session ID": "会话 ID",
+    "%(senderName)s set a profile picture.": "%(senderName)s 设置了头像。.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 将昵称改为了 %(displayName)s。.",
     "Settings": "设置",
     "Show panel": "显示侧边栏",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小时制显示时间戳 （如：下午 2:30）",
@@ -129,9 +134,11 @@
     "Always show message timestamps": "总是显示消息时间戳",
     "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在输入",
     "A new password must be entered.": "一个新的密码必须被输入。.",
+    "%(senderName)s answered the call.": "%(senderName)s 接了通话。.",
     "An error has occurred.": "一个错误出现了。",
     "Attachment": "附件",
     "Autoplay GIFs and videos": "自动播放GIF和视频",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s.",
     "Ban": "封禁",
     "Banned users": "被封禁的用户",
     "Click here to fix": "点击这里修复",
@@ -141,7 +148,9 @@
     "Ed25519 fingerprint": "Ed25519指纹",
     "Invite new room members": "邀请新的聊天室成员",
     "Join Room": "加入聊天室",
+    "%(targetName)s joined the room.": "%(targetName)s 已加入聊天室。",
     "Jump to first unread message.": "跳到第一条未读消息。",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "退出聊天室",
     "New password": "新密码",
     "Add a topic": "添加一个主题",
@@ -177,6 +186,10 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "当浏览器地址栏里有 HTTPS 的 URL 时，不能使用 HTTP 连接主服务器。请使用 HTTPS 或者<a>允许不安全的脚本</a>。",
     "Can't load user settings": "无法加载用户设置",
     "Change Password": "修改密码",
+    "%(senderName)s changed their profile picture.": "%(senderName)s 修改了头像。",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 将聊天室名称改为 %(roomName)s。",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 移除了聊天室名称。",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 将话题修改为 “%(topic)s”。",
     "Changes to who can read history will only apply to future messages in this room": "修改阅读历史的权限仅对此聊天室以后的消息有效",
     "Changes your display nickname": "修改昵称",
     "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.": "目前，修改密码会导致所有设备上的端到端密钥被重置，使得加密的聊天记录不再可读。除非你事先导出聊天室密钥，修改密码后再导入。这个问题未来会改善。",
@@ -225,6 +238,7 @@
     "Incoming video call from %(name)s": "来自 %(name)s 的视频通话",
     "Incoming voice call from %(name)s": "来自 %(name)s 的语音通话",
     "Incorrect username and/or password.": "用户名或密码错误。",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s 邀请了 %(targetName)s。",
     "Invited": "已邀请",
     "Invites": "邀请",
     "Invites user with given id to current room": "按照 ID 邀请指定用户加入当前聊天室",
@@ -277,6 +291,7 @@
     "Edit": "编辑",
     "Joins room with given alias": "以指定的别名加入聊天室",
     "Labs": "实验室",
+    "%(targetName)s left the room.": "%(targetName)s 退出了聊天室。",
     "Logged in as:": "登录为：",
     "Logout": "登出",
     "Low priority": "低优先级",
@@ -291,6 +306,7 @@
     "Privileged Users": "特权用户",
     "Reason": "理由",
     "Register": "注册",
+    "%(targetName)s rejected the invitation.": "%(targetName)s 拒绝了邀请。",
     "Reject invitation": "拒绝邀请",
     "Rejoin": "重新加入",
     "Users": "用户",
@@ -429,21 +445,32 @@
     "I already have an account": "我已经有一个帐号",
     "Unblacklist": "移出黑名单",
     "Not a valid Riot keyfile": "不是一个有效的 Riot 密钥文件",
+    "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀请。",
     "Do you want to load widget from URL:": "你想从此 URL 加载小组件吗：",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "隐藏加入/退出消息（邀请/踢出/封禁不受影响）",
     "Integrations Error": "集成错误",
     "Publish this room to the public in %(domain)s's room directory?": "把这个聊天室发布到 %(domain)s 的聊天室目录吗？",
     "Manage Integrations": "管理集成",
     "No users have specific privileges in this room": "没有用户在这个聊天室有特殊权限",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s 发起了一个 %(callType)s 通话。",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "请检查你的电子邮箱并点击里面包含的链接。完成时请点击继续。",
     "Press <StartChatButton> to start a chat with someone": "按下 <StartChatButton> 来开始和某个人聊天",
+    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他们的头像。",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s 已请求发起 VoIP 会议。",
     "Seen by %(userName)s at %(dateTime)s": "在 %(dateTime)s 被 %(userName)s 看到",
     "Tagged as: ": "标记为： ",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "验证码将发送至 +%(msisdn)s，请输入收到的验证码",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 接受了 %(displayName)s 的邀请。",
     "Active call (%(roomName)s)": "当前通话 (来自聊天室 %(roomName)s)",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 将级别调整到%(powerLevelDiffText)s 。",
     "Changes colour scheme of current room": "修改了样式",
     "Deops user with given id": "按照 ID 取消特定用户的管理员权限",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "通过 <voiceText>语言</voiceText> 或者 <videoText>视频</videoText>加入.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员，从他们被邀请开始.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员，从他们加入开始.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s 设定历史浏览功能为 所有聊天室成员.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s 设定历史浏览功能为 任何人.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s 设定历史浏览功能为 未知的 (%(visibility)s).",
     "AM": "上午",
     "PM": "下午",
     "NOTE: Apps are not end-to-end encrypted": "提示：APP不支持端到端加密",
@@ -502,6 +529,7 @@
     " (unsupported)": " （不支持）",
     "Updates": "更新",
     "Check for update": "检查更新",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s 移除了聊天室头像。",
     "Something went wrong!": "出了点问题！",
     "If you already have a Matrix account you can <a>log in</a> instead.": "如果你已经有一个 Matrix 帐号，你可以<a>登录</a>。",
     "Do you want to set an email address?": "你要设置一个邮箱地址吗？",
@@ -512,6 +540,7 @@
     "Verification Pending": "验证等待中",
     "(unknown failure: %(reason)s)": "（未知错误：%(reason)s）",
     "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!": "警告：密钥验证失败！%(userId)s 和 device %(deviceId)s 的签名密钥是 \"%(fprint)s\"，和提供的咪呀 \"%(fingerprint)s\" 不匹配。这可能意味着你的通信正在被窃听！",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 收回了 %(targetName)s 的邀请。",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "你想要 <acceptText>接受</acceptText> 还是 <declineText>拒绝</declineText> 这个邀请？",
     "You already have existing direct chats with this user:": "你已经有和此用户的直接聊天：",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "你现在还不再任何聊天室！按下 <CreateRoomButton> 来创建一个聊天室或者 <RoomDirectoryButton> 来浏览目录",
@@ -562,9 +591,11 @@
     "Verifies a user, device, and pubkey tuple": "验证一个用户、设备和密钥元组",
     "Unknown devices": "未知设备",
     "Unknown Address": "未知地址",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 删除了他们的昵称 (%(oldDisplayName)s).",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "您提供的签名密钥和你从 %(userId)s 的设备 %(deviceId)s 收到的签名密钥匹配。设备被标记为已验证。",
     "These are experimental features that may break in unexpected ways": "这些是可能以意外的方式坏掉的实验性的特性",
     "The visibility of existing history will be unchanged": "现有历史记录的可见性不会改变",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).",
     "Unable to remove contact information": "无法移除联系人信息",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据来允许我们改善这个应用。",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" 包含你以前没见过的设备。",
@@ -578,6 +609,7 @@
     "Add an Integration": "添加一个集成",
     "Removed or unknown message type": "被移除或未知的消息类型",
     "Ongoing conference call%(supportedText)s.": "正在进行的会议通话 %(supportedText)s.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 修改了 %(roomName)s 的头像",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "这将会成为你在 <span></span> 主服务器上的账户名，或者你可以选择一个 <a>不同的服务器</a>。",
     "Your browser does not support the required cryptography extensions": "你的浏览器不支持 Riot 所需的密码学特性",
     "Authentication check failed: incorrect password?": "身份验证失败：密码错误？",
@@ -587,6 +619,9 @@
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "你的未经验证的设备 '%(displayName)s' 正在请求加密密钥。",
     "Encryption key request": "加密密钥请求",
     "Autocomplete Delay (ms):": "自动补全延迟（毫秒）：",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 添加",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 移除",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 修改",
     "Unpin Message": "取消置顶消息",
     "Add rooms to this community": "添加聊天室到此社区",
     "Call Failed": "呼叫失败",
@@ -603,7 +638,9 @@
     "You are now ignoring %(userId)s": "你正在忽视 %(userId)s",
     "Unignored user": "接触忽视用户",
     "You are no longer ignoring %(userId)s": "你不再忽视 %(userId)s",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除了 %(targetName)s 的封禁。",
     "(could not connect media)": "（无法连接媒体）",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 更改了聊天室的置顶消息。",
     "%(names)s and %(count)s others are typing|other": "%(names)s 和另外 %(count)s 个人正在输入",
     "%(names)s and %(count)s others are typing|one": "%(names)s 和另一个人正在输入",
     "Send": "发送",
@@ -757,6 +794,7 @@
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "你似乎没有将此邮箱地址同在此主服务器上的任何一个 Matrix 账号绑定。",
     "Restricted": "受限用户",
     "To use it, just wait for autocomplete results to load and tab through them.": "若要使用自动补全，只要等待自动补全结果加载完成，按 Tab 键切换即可。",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 将他们的昵称修改成了 %(displayName)s 。",
     "Hide avatars in user and room mentions": "隐藏头像",
     "Disable Community Filter Panel": "停用社区面板",
     "Stickerpack": "贴图集",
@@ -854,6 +892,7 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "新社区 ID（例子：+foo:%(localDomain)s）",
     "URL previews are enabled by default for participants in this room.": "此聊天室默认启用链接预览。",
     "URL previews are disabled by default for participants in this room.": "此聊天室默认禁用链接预览。",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s 将聊天室的头像更改为 <img/>",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "您也可以自定义身份认证服务器，但这通常会阻止基于邮箱地址的与用户的交互。",
     "Please enter the code it contains:": "请输入它包含的代码：",
     "Flair will appear if enabled in room settings": "如果在聊天室设置中启用， flair 将会显示",
@@ -1096,44 +1135,5 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "无法加载被回复的事件，它可能不存在，也可能是您没有权限查看它。",
     "And %(count)s more...|other": "和 %(count)s 个其他…",
     "Try using one of the following valid address types: %(validTypesList)s.": "请尝试使用以下的有效邮箱地址格式中的一种：%(validTypesList)s",
-    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot 使用 GitHub 追踪 bug：<a>在 GitHub 上创建新 Issue</a>",
-    "<target> accepted the invitation for %(displayName)s.": "<target> 接受了 %(displayName)s 的邀请。",
-    "<target> accepted an invitation.": "<target> 已接受邀请。",
-    "<sender> requested a VoIP conference.": "<sender> 已请求发起 VoIP 会议。",
-    "<sender> invited <target>.": "<sender> 邀请了 <target>。",
-    "<sender> banned <target>.": "<sender> 封禁了 <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> 将他们的昵称修改成了 <displayName> 。",
-    "<sender> set their display name to <displayName>.": "<sender> 将昵称改为了 <displayName>。.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> 删除了他们的昵称 (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> 移除了他们的头像。",
-    "<sender> changed their profile picture.": "<sender> 修改了头像。",
-    "<sender> set a profile picture.": "<sender> 设置了头像。.",
-    "<target> joined the room.": "<target> 已加入聊天室。",
-    "<target> rejected the invitation.": "<target> 拒绝了邀请。",
-    "<target> left the room.": "<target> 退出了聊天室。",
-    "<sender> unbanned <target>.": "<sender> 解除了 <target> 的封禁。",
-    "<sender> kicked <target>.": "<sender> 把 <target> 踢出了聊天室。.",
-    "<sender> withdrew <target>'s invitation.": "<sender> 收回了 <target> 的邀请。",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> 将话题修改为 “%(topic)s”。",
-    "<sender> changed the room name to %(roomName)s.": "<sender> 将聊天室名称改为 %(roomName)s。",
-    "<sender> changed the avatar for %(roomName)s": "<sender> 修改了 %(roomName)s 的头像",
-    "<sender> changed the room avatar to <img/>": "<sender> 将聊天室的头像更改为 <img/>",
-    "<sender> removed the room name.": "<sender> 移除了聊天室名称。",
-    "<sender> removed the room avatar.": "<sender> 移除了聊天室头像。",
-    "<sender> answered the call.": "<sender> 接了通话。.",
-    "<sender> ended the call.": "<sender> 结束了通话。.",
-    "<sender> placed a %(callType)s call.": "<sender> 发起了一个 %(callType)s 通话。",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> 向 %(targetDisplayName)s 发了加入聊天室的邀请。.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> 设定历史浏览功能为 所有聊天室成员，从他们被邀请开始.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> 设定历史浏览功能为 所有聊天室成员，从他们加入开始.",
-    "<sender> made future room history visible to all room members.": "<sender> 设定历史浏览功能为 所有聊天室成员.",
-    "<sender> made future room history visible to anyone.": "<sender> 设定历史浏览功能为 任何人.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> 设定历史浏览功能为 未知的 (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> 打开了端到端加密 (算法 %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> 从 %(fromPowerLevel)s 变为 %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> 将级别调整到%(powerLevelDiffText)s 。",
-    "<sender> changed the pinned messages for the room.": "<sender> 更改了聊天室的置顶消息。",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s 小组建被 <sender> 修改",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s 小组建被 <sender> 添加",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s 小组建被 <sender> 移除"
+    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot 使用 GitHub 追踪 bug：<a>在 GitHub 上创建新 Issue</a>"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 5ba9458c77..ebf329b45b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -8,6 +8,7 @@
     "Are you sure you want to upload the following files?": "您確認要上傳以下文件嗎？",
     "Attachment": "附件",
     "Autoplay GIFs and videos": "自動播放 GIF 和影片",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封鎖了 %(targetName)s.",
     "Ban": "封鎖",
     "Banned users": "被封鎖的用戶",
     "Blacklisted": "已列入黑名單",
@@ -15,6 +16,7 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "當瀏覽器網址列裡有 HTTPS URL 時，不能使用 HTTP 連線到家伺服器。請採用 HTTPS 或者<a>允許不安全的指令稿</a>。",
     "Can't load user settings": "無法載入使用者設定",
     "Change Password": "變更密碼",
+    "%(targetName)s left the room.": "%(targetName)s 離開了聊天室。.",
     "Account": "帳號",
     "Access Token:": "取用令牌：",
     "Add email address": "添加郵件地址",
@@ -26,6 +28,7 @@
     "Authentication": "授權",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在打字",
+    "%(senderName)s answered the call.": "%(senderName)s 接了通話。.",
     "Clear Cache": "清理緩存",
     "Click here to fix": "點擊這里修復",
     "Confirm password": "確認密碼",
@@ -59,6 +62,7 @@
     "Enable encryption": "啟用加密",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "不支援加密的客戶端將看不到加密的訊息",
     "Encrypted room": "加密聊天室",
+    "%(senderName)s ended the call.": "%(senderName)s 結束了通話。.",
     "End-to-end encryption information": "端到端加密資訊",
     "End-to-end encryption is in beta and may not be reliable": "端到端加密現為測試版，不一定可靠",
     "Enter Code": "輸入代碼",
@@ -96,6 +100,7 @@
     "Forgot your password?": "忘記密碼？",
     "For security, this session has been signed out. Please sign in again.": "因為安全因素，此工作階段已被登出。請重新登入。",
     "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.": "因為安全因素，登出將會從此瀏覽器刪除任何端到端加密的金鑰。若您想要在未來的 Riot 工作階段中解密您的對話紀錄，請將您的聊天室金鑰匯出並好好存放。",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 從 %(fromPowerLevel)s 變為 %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主動邀請。.",
     "Hangup": "掛斷",
     "Hide read receipts": "隱藏已讀回執",
@@ -113,7 +118,9 @@
     "Invalid file%(extra)s": "非法文件%(extra)s",
     "Invite new room members": "邀請新的聊天室成員",
     "Join Room": "加入聊天室",
+    "%(targetName)s joined the room.": "%(targetName)s 加入了聊天室。.",
     "Jump to first unread message.": "跳到第一則未讀訊息。",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "離開聊天室",
     "New password": "新密碼",
     "Resetting 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.": "重設密碼目前會把所有裝置上的端到端加密金鑰重設，讓已加密的聊天歷史不可讀，除非您先匯出您的聊天室金鑰並在稍後重新匯入。這會在未來改進。",
@@ -134,6 +141,7 @@
     "Send Invites": "發送邀請",
     "Send Reset Email": "發送密碼重設郵件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 發了一張圖片。.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 發了加入聊天室的邀請。.",
     "Server error": "伺服器錯誤",
     "Server may be unavailable or overloaded": "服務器可能不可用或者超載",
     "Server may be unavailable, overloaded, or search timed out :(": "服務器可能不可用、超載，或者搜索超時 :(",
@@ -141,6 +149,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "服務器可能不可用、超載，或者你遇到了一個漏洞.",
     "Server unavailable, overloaded, or something else went wrong.": "伺服器可能不可用、超載，或者其他東西出錯了.",
     "Session ID": "會話 ID",
+    "%(senderName)s set a profile picture.": "%(senderName)s 設置了頭像。.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將他的暱稱改成 %(displayName)s。.",
     "Settings": "設定",
     "Show panel": "顯示側邊欄",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小時制顯示時間戳 （如：下午 2:30）",
@@ -162,6 +172,7 @@
     "The file '%(fileName)s' failed to upload": "文件 '%(fileName)s' 上傳失敗",
     "Turn Markdown off": "關閉Markdown 語法",
     "Turn Markdown on": "啟用Markdown 語法",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 啟用端對端加密 (algorithm %(algorithm)s).",
     "Unable to add email address": "無法加入電郵地址",
     "Unable to capture screen": "無法截取畫面",
     "Unable to enable Notifications": "無法啟用通知功能",
@@ -175,6 +186,9 @@
     "Online": "線上",
     "Idle": "閒置",
     "Offline": "下線",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s 更改了聊天室的圖像為 <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s 移除了聊天室圖片。",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 更改了聊天室 %(roomName)s　圖像",
     "Cancel": "取消",
     "Custom Server Options": "自訂伺服器選項",
     "Dismiss": "關閉",
@@ -219,6 +233,8 @@
     "Start chat": "開始聊天",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "文字訊息將會傳送到 +%(msisdn)s。請輸入其中包含的驗證碼",
     "Accept": "接受",
+    "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀請。",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 已接受 %(displayName)s 的邀請。",
     "Active call (%(roomName)s)": "活躍的通話（%(roomName)s）",
     "Add": "新增",
     "Admin Tools": "管理員工具",
@@ -232,6 +248,11 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "您確定您要想要離開房間 '%(roomName)s' 嗎？",
     "Bans user with given id": "禁止有指定 ID 的使用者",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "無法連線到家伺服器 - 請檢查您的連線，確保您的<a>家伺服器的 SSL 憑證</a>可被信任，而瀏覽器擴充套件也沒有阻擋請求。",
+    "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他的基本資料圖片。",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 變更了 %(powerLevelDiffText)s 權限等級。",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 將房間名稱變更為 %(roomName)s。",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 已經移除了房間名稱。",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 已經變更主題為「%(topic)s」。",
     "Changes to who can read history will only apply to future messages in this room": "變更誰可以讀取歷史紀錄的設定僅套用於此房間未來的訊息",
     "Changes your display nickname": "變更您的顯示暱稱",
     "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.": "目前變更密碼將會重設在所有裝置上的端對端加密金鑰，讓加密的聊天歷史無法讀取，除非您先匯出您的房間金鑰，並在稍後重新匯入它們。這會在未來改進。",
@@ -280,6 +301,7 @@
     "Incoming video call from %(name)s": "從 %(name)s 而來的視訊來電",
     "Incoming voice call from %(name)s": "從 %(name)s 而來的語音來電",
     "Incorrect username and/or password.": "不正確的使用者名稱和／或密碼。",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s 邀請了 %(targetName)s。",
     "Invited": "已邀請",
     "Invites": "邀請",
     "Invites user with given id to current room": "邀請指定 ID 的使用者到目前的房間",
@@ -298,6 +320,11 @@
     "Logged in as:": "登入為：",
     "Logout": "登出",
     "Low priority": "低優先度",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s 讓未來的房間歷史紀錄可見於 所有聊天室成員，從他們被邀請開始.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s 讓未來的房間歷史紀錄可見於 所有聊天室成員，從他們加入開始.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s 讓未來的房間歷史紀錄可見於 所有聊天室成員.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s 讓未來的房間歷史紀錄可見於 任何人.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s 讓未來的房間歷史紀錄可見於 未知 (%(visibility)s).",
     "Manage Integrations": "管裡整合",
     "Markdown is disabled": "Markdown 已停用",
     "Markdown is enabled": "Markdown 已啟用",
@@ -334,6 +361,7 @@
     "People": "夥伴",
     "Permissions": "權限",
     "Phone": "電話",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s 打了 %(callType)s 通話。",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "請檢查您的電子郵件並點選其中包含的連結。只要這個完成了，就點選選繼續。",
     "Power level must be positive integer.": "權限等級必需為正整數。",
     "Press <StartChatButton> to start a chat with someone": "按下 <StartChatButton> 以開始與某人聊天",
@@ -345,11 +373,15 @@
     "Reason: %(reasonText)s": "理由：%(reasonText)s",
     "Revoke Moderator": "撤回仲裁者",
     "Refer a friend to Riot:": "推薦 Riot 給朋友：",
+    "%(targetName)s rejected the invitation.": "%(targetName)s 拒絕了邀請。",
     "Reject invitation": "拒絕邀請",
     "Rejoin": "重新加入",
     "Remote addresses for this room:": "此房間的遠端地址：",
     "Remove Contact Information?": "移除聯絡人資訊？",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他的顯示名稱 (%(oldDisplayName)s)。",
+    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他的基本資料圖片。",
     "Remove %(threePid)s?": "移除 %(threePid)s？",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s 請求了一次 VoIP 會議。",
     "Results from DuckDuckGo": "DuckDuckGo 的結果",
     "Room contains unknown devices": "包含了未知裝置的房間",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
@@ -383,6 +415,7 @@
     "Unable to remove contact information": "無法移除聯絡人資訊",
     "Unable to verify email address.": "無法驗證電子郵件。",
     "Unban": "解除禁止",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除禁止 %(targetName)s。",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "無法確定此邀請是傳送到與您的帳號相關聯的電子郵件地址。",
     "Unable to load device list": "無法載入裝置清單",
     "Undecryptable": "無法解密",
@@ -436,6 +469,7 @@
     "Who can read history?": "誰可以讀取歷史紀錄？",
     "Who would you like to add to this room?": "您想要新增誰到此房間？",
     "Who would you like to communicate with?": "您想與誰通訊？",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 撤回了 %(targetName)s 的邀請。",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "您想要<acceptText>接受</acceptText>或<declineText>拒絕</declineText>此邀請？",
     "You already have existing direct chats with this user:": "您已與此使用者直接聊天：",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "您尚未在任何房間！按下<CreateRoomButton> 來建立房間或 <RoomDirectoryButton> 來瀏覽目錄",
@@ -629,7 +663,10 @@
     "Automatically replace plain text Emoji": "自動取代純文字為顏文字",
     "Failed to upload image": "上傳圖片失敗",
     "Hide avatars in user and room mentions": "在使用者與聊天室提及中隱藏大頭貼",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s 由 %(senderName)s 所新增",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s 由 %(senderName)s 所移除",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "機器人檢查目前在桌面端不可用 ── 請使用<a>網路瀏覽器</a>",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小工具已被 %(senderName)s 修改",
     "Copied!": "已複製！",
     "Failed to copy": "複製失敗",
     "Add rooms to this community": "新增聊天室到此社群",
@@ -659,6 +696,7 @@
     "You are now ignoring %(userId)s": "您忽略了 %(userId)s",
     "Unignored user": "未忽略的使用者",
     "You are no longer ignoring %(userId)s": "您不再忽略 %(userId)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 變更了聊天室的釘選訊息。",
     "%(names)s and %(count)s others are typing|other": "%(names)s 與其他 %(count)s 個人正在輸入",
     "%(names)s and %(count)s others are typing|one": "%(names)s 與另一個人正在輸入",
     "Send": "傳送",
@@ -917,6 +955,7 @@
     "Community IDs cannot not be empty.": "社群 ID 不能為空。",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
     "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。",
     "Failed to set direct chat tag": "設定直接聊天標籤失敗",
     "Failed to remove tag %(tagName)s from room": "從聊天室移除標籤 %(tagName)s 失敗",
     "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗",
@@ -1156,44 +1195,5 @@
     "Share Room Message": "分享聊天室訊息",
     "Link to selected message": "連結到選定的訊息",
     "COPY": "複製",
-    "Share Message": "分享訊息",
-    "<target> accepted the invitation for %(displayName)s.": "<target> 已接受 %(displayName)s 的邀請。",
-    "<target> accepted an invitation.": "<target> 已接受邀請。",
-    "<sender> requested a VoIP conference.": "<sender> 請求了一次 VoIP 會議。",
-    "<sender> invited <target>.": "<sender> 邀請了 <target>。",
-    "<sender> banned <target>.": "<sender> 封鎖了 <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> 變更了他的顯示名稱為 <displayName> 。",
-    "<sender> set their display name to <displayName>.": "<sender> 將他的暱稱改成 <displayName>。.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> 移除了他的顯示名稱 (<oldDisplayName>)。",
-    "<sender> removed their profile picture.": "<sender> 移除了他的基本資料圖片。",
-    "<sender> changed their profile picture.": "<sender> 已經變更了他的基本資料圖片。",
-    "<sender> set a profile picture.": "<sender> 設置了頭像。.",
-    "<target> joined the room.": "<target> 加入了聊天室。.",
-    "<target> rejected the invitation.": "<target> 拒絕了邀請。",
-    "<target> left the room.": "<target> 離開了聊天室。.",
-    "<sender> unbanned <target>.": "<sender> 解除禁止 <target>。",
-    "<sender> kicked <target>.": "<sender> 把 <target> 踢出了聊天室。.",
-    "<sender> withdrew <target>'s invitation.": "<sender> 撤回了 <target> 的邀請。",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> 已經變更主題為「%(topic)s」。",
-    "<sender> changed the room avatar to <img/>": "<sender> 更改了聊天室的圖像為 <img/>",
-    "<sender> changed the avatar for %(roomName)s": "<sender> 更改了聊天室 %(roomName)s　圖像",
-    "<sender> changed the room name to %(roomName)s.": "<sender> 將房間名稱變更為 %(roomName)s。",
-    "<sender> removed the room avatar.": "<sender> 移除了聊天室圖片。",
-    "<sender> removed the room name.": "<sender> 已經移除了房間名稱。",
-    "<sender> answered the call.": "<sender> 接了通話。.",
-    "<sender> ended the call.": "<sender> 結束了通話。.",
-    "<sender> placed a %(callType)s call.": "<sender> 打了 %(callType)s 通話。",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> 向 %(targetDisplayName)s 發了加入聊天室的邀請。.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> 讓未來的房間歷史紀錄可見於 所有聊天室成員，從他們被邀請開始.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> 讓未來的房間歷史紀錄可見於 所有聊天室成員，從他們加入開始.",
-    "<sender> made future room history visible to all room members.": "<sender> 讓未來的房間歷史紀錄可見於 所有聊天室成員.",
-    "<sender> made future room history visible to anyone.": "<sender> 讓未來的房間歷史紀錄可見於 任何人.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> 讓未來的房間歷史紀錄可見於 未知 (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> 啟用端對端加密 (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> 從 %(fromPowerLevel)s 變為 %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> 變更了 %(powerLevelDiffText)s 權限等級。",
-    "<sender> changed the pinned messages for the room.": "<sender> 變更了聊天室的釘選訊息。",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s 小工具已被 <sender> 修改",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s 由 <sender> 所新增",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s 由 <sender> 所移除"
+    "Share Message": "分享訊息"
 }

From 8b64ddcbe83598de0d2cd568ca333bc861a8a8a8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Jul 2018 11:16:44 +0100
Subject: [PATCH 519/702] Do some level of local echo for widgets

 * Show a spinner while we wait for widgets to be deleted
 * Hide widgets while they're pending deletion
 * Don't put another jitsi widget into the room if there's already
   one pending
---
 src/CallHandler.js                       |  25 +++--
 src/actions/MatrixActionCreators.js      |  15 +++
 src/components/structures/RoomView.js    |  15 ++-
 src/components/views/rooms/AppsDrawer.js |  23 ++++-
 src/i18n/strings/en_EN.json              | 121 +++++++++--------------
 src/stores/RoomViewStore.js              |   2 +-
 src/stores/WidgetEchoStore.js            | 112 +++++++++++++++++++++
 src/utils/WidgetUtils.js                 |   6 ++
 8 files changed, 237 insertions(+), 82 deletions(-)
 create mode 100644 src/stores/WidgetEchoStore.js

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 7403483e36..abbd407e7f 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -62,6 +62,7 @@ import dis from './dispatcher';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import SettingsStore from "./settings/SettingsStore";
 import WidgetUtils from './utils/WidgetUtils';
+import WidgetEchoStore from './stores/WidgetEchoStore';
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -402,18 +403,30 @@ function _onAction(payload) {
 }
 
 function _startCallApp(roomId, type) {
-    dis.dispatch({
-        action: 'appsDrawer',
-        show: true,
-    });
-
     const room = MatrixClientPeg.get().getRoom(roomId);
     if (!room) {
         console.error("Attempted to start conference call widget in unknown room: " + roomId);
         return;
     }
 
-    const currentJitsiWidgets = WidgetUtils.getRoomWidgets(room).filter((ev) => {
+    dis.dispatch({
+        action: 'appsDrawer',
+        show: true,
+    });
+
+    const currentRoomWidgets = WidgetUtils.getRoomWidgets(room);
+
+    if (WidgetEchoStore.roomHasPendingWidgetsOfType(room, currentRoomWidgets, 'jitsi')) {
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+        Modal.createTrackedDialog('Already have pending Jitsi Widget', '', ErrorDialog, {
+            title: _t('Call in Progress'),
+            description: _t('A call is currently being placed!'),
+        });
+        return;
+    }
+
+    const currentJitsiWidgets = currentRoomWidgets.filter((ev) => {
         return ev.getContent().type === 'jitsi';
     });
     if (currentJitsiWidgets.length > 0) {
diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 6e1d52a88f..d8c315f505 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -183,6 +183,20 @@ function createEventDecryptedAction(matrixClient, event) {
     return { action: 'MatrixActions.Event.decrypted', event };
 }
 
+/**
+ * Create a MatrixActions.RoomState.vents action that represents
+ * a MatrixClient `RoomState.events` matrix event, emitted when the
+ * state events in a room change.
+ *
+ * @param {MatrixClient} matrixClient the matrix client.
+ * @param {MatrixEvent} event matrix event which caused this event to fire.
+ * @param {RoomState} state room state whose RoomState.events dictionary was updated.
+ * @returns {EventDecryptedAction} an action of type `MatrixActions.Event.decrypted`.
+ */
+function createRoomStateEventsAction(matrixClient, event, state) {
+    return { action: 'MatrixActions.RoomState.events', event, state };
+}
+
 /**
  * This object is responsible for dispatching actions when certain events are emitted by
  * the given MatrixClient.
@@ -204,6 +218,7 @@ export default {
         this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
         this._addMatrixClientListener(matrixClient, 'RoomMember.membership', createRoomMembershipAction);
         this._addMatrixClientListener(matrixClient, 'Event.decrypted', createEventDecryptedAction);
+        this._addMatrixClientListener(matrixClient, 'RoomState.events', createRoomStateEventsAction);
     },
 
     /**
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 98d700e0a0..5c97b5c29a 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -45,6 +45,7 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 
 import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
+import WidgetEchoStore from '../../stores/WidgetEchoStore';
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import WidgetUtils from '../../utils/WidgetUtils';
 
@@ -153,6 +154,8 @@ module.exports = React.createClass({
         // Start listening for RoomViewStore updates
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._onRoomViewStoreUpdate(true);
+
+        WidgetEchoStore.on('updateRoomWidgetEcho', this._onWidgetEchoStoreUpdate);
     },
 
     _onRoomViewStoreUpdate: function(initial) {
@@ -243,6 +246,12 @@ module.exports = React.createClass({
         }
     },
 
+    _onWidgetEchoStoreUpdate: function() {
+        this.setState({
+            showApps: this._shouldShowApps(this.state.room),
+        });
+    },
+
     _setupRoom: function(room, roomId, joining, shouldPeek) {
         // if this is an unknown room then we're in one of three states:
         // - This is a room we can peek into (search engine) (we can /peek)
@@ -319,7 +328,9 @@ module.exports = React.createClass({
             return false;
         }
 
-        return WidgetUtils.getRoomWidgets(room).length > 0;
+        const widgets = WidgetEchoStore.getEchoedRoomWidgets(room, WidgetUtils.getRoomWidgets(room));
+
+        return widgets.length > 0 || WidgetEchoStore.roomHasPendingWidgets(room, WidgetUtils.getRoomWidgets(room));
     },
 
     componentDidMount: function() {
@@ -414,6 +425,8 @@ module.exports = React.createClass({
             this._roomStoreToken.remove();
         }
 
+        WidgetEchoStore.removeListener('updateRoomWidgetEcho', this._onWidgetEchoStoreUpdate);
+
         // cancel any pending calls to the rate_limited_funcs
         this._updateRoomMembers.cancelPendingCall();
 
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 04e47f0f9f..64aa8fadc8 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -29,6 +29,7 @@ import ScalarMessaging from '../../../ScalarMessaging';
 import { _t } from '../../../languageHandler';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import SettingsStore from "../../../settings/SettingsStore";
+import WidgetEchoStore from "../../../stores/WidgetEchoStore";
 
 // The maximum number of widgets that can be added in a room
 const MAX_WIDGETS = 2;
@@ -57,6 +58,7 @@ module.exports = React.createClass({
     componentWillMount: function() {
         ScalarMessaging.startListening();
         MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
+        WidgetEchoStore.on('updateRoomWidgetEcho', this._updateApps);
     },
 
     componentDidMount: function() {
@@ -82,6 +84,7 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
         }
+        WidgetEchoStore.removeListener('updateRoomWidgetEcho', this._updateApps);
         dis.unregister(this.dispatcherRef);
     },
 
@@ -163,7 +166,10 @@ module.exports = React.createClass({
     },
 
     _getApps: function() {
-        return WidgetUtils.getRoomWidgets(this.props.room).map((ev) => {
+        const widgets = WidgetEchoStore.getEchoedRoomWidgets(
+            this.props.room, WidgetUtils.getRoomWidgets(this.props.room),
+        );
+        return widgets.map((ev) => {
             return this._initAppConfig(ev.getStateKey(), ev.getContent(), ev.sender);
         });
     },
@@ -231,7 +237,8 @@ module.exports = React.createClass({
                     waitForIframeLoad={app.waitForIframeLoad}
                     whitelistCapabilities={enableScreenshots ? ["m.capability.screenshot"] : []}
                 />);
-            });
+            },
+        );
 
         let addWidget;
         if (this.props.showApps &&
@@ -250,10 +257,22 @@ module.exports = React.createClass({
             </div>;
         }
 
+        let spinner;
+        if (
+            apps.length === 0 && WidgetEchoStore.roomHasPendingWidgets(
+                this.props.room,
+                WidgetUtils.getRoomWidgets(this.props.room),
+            )
+        ) {
+            const Loader = sdk.getComponent("elements.Spinner");
+            spinner = <Loader />;
+        }
+
         return (
             <div className={'mx_AppsDrawer' + (this.props.hide ? ' mx_AppsDrawer_hidden' : '')}>
                 <div id='apps' className='mx_AppsContainer'>
                     { apps }
+                    { spinner }
                 </div>
                 { this._canUserModify() && addWidget }
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d02ab8ff29..ae4ca74085 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -40,14 +40,11 @@
     "Failed to set up conference call": "Failed to set up conference call",
     "Conference call failed.": "Conference call failed.",
     "Call in Progress": "Call in Progress",
+    "A call is currently being placed!": "A call is currently being placed!",
     "A call is already in progress!": "A call is already in progress!",
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -87,7 +84,6 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -153,18 +149,59 @@
     "Displays action": "Displays action",
     "Unrecognised command:": "Unrecognised command:",
     "Reason": "Reason",
+    "<target> accepted the invitation for %(displayName)s.": "<target> accepted the invitation for %(displayName)s.",
+    "<target> accepted an invitation.": "<target> accepted an invitation.",
+    "<sender> requested a VoIP conference.": "<sender> requested a VoIP conference.",
+    "<sender> invited <target>.": "<sender> invited <target>.",
+    "<sender> banned <target>.": "<sender> banned <target>.",
+    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> changed their display name to <displayName>.",
+    "<sender> set their display name to <displayName>.": "<sender> set their display name to <displayName>.",
+    "<sender> removed their display name (<oldDisplayName>).": "<sender> removed their display name (<oldDisplayName>).",
+    "<sender> removed their profile picture.": "<sender> removed their profile picture.",
+    "<sender> changed their profile picture.": "<sender> changed their profile picture.",
+    "<sender> set a profile picture.": "<sender> set a profile picture.",
     "VoIP conference started.": "VoIP conference started.",
+    "<target> joined the room.": "<target> joined the room.",
     "VoIP conference finished.": "VoIP conference finished.",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+    "<target> rejected the invitation.": "<target> rejected the invitation.",
+    "<target> left the room.": "<target> left the room.",
+    "<sender> unbanned <target>.": "<sender> unbanned <target>.",
+    "<sender> kicked <target>.": "<sender> kicked <target>.",
+    "<sender> withdrew <target>'s invitation.": "<sender> withdrew <target>'s invitation.",
+    "<sender> changed the topic to \"%(topic)s\".": "<sender> changed the topic to \"%(topic)s\".",
+    "<sender> removed the room name.": "<sender> removed the room name.",
+    "<sender> changed the room name to %(roomName)s.": "<sender> changed the room name to %(roomName)s.",
+    "<sender> sent an image.": "<sender> sent an image.",
     "Someone": "Someone",
     "(not supported by this browser)": "(not supported by this browser)",
+    "<sender> answered the call.": "<sender> answered the call.",
     "(could not connect media)": "(could not connect media)",
     "(no answer)": "(no answer)",
     "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
+    "<sender> ended the call.": "<sender> ended the call.",
+    "<sender> placed a %(callType)s call.": "<sender> placed a %(callType)s call.",
+    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sent an invitation to %(targetDisplayName)s to join the room.",
+    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> made future room history visible to all room members, from the point they are invited.",
+    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> made future room history visible to all room members, from the point they joined.",
+    "<sender> made future room history visible to all room members.": "<sender> made future room history visible to all room members.",
+    "<sender> made future room history visible to anyone.": "<sender> made future room history visible to anyone.",
+    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> made future room history visible to unknown (%(visibility)s).",
+    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).",
+    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> from %(fromPowerLevel)s to %(toPowerLevel)s",
+    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> changed the power level of %(powerLevelDiffText)s.",
+    "<sender> changed the pinned messages for the room.": "<sender> changed the pinned messages for the room.",
+    "%(widgetName)s widget modified by <sender>": "%(widgetName)s widget modified by <sender>",
+    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget added by <sender>",
+    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget removed by <sender>",
     "%(displayName)s is typing": "%(displayName)s is typing",
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(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",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -277,29 +314,6 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -401,11 +415,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -580,6 +594,9 @@
     "Invalid file%(extra)s": "Invalid file%(extra)s",
     "Error decrypting image": "Error decrypting image",
     "Error decrypting video": "Error decrypting video",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
     "Copied!": "Copied!",
     "Failed to copy": "Failed to copy",
     "Add an Integration": "Add an Integration",
@@ -755,7 +772,6 @@
     "Room directory": "Room directory",
     "Start chat": "Start chat",
     "And %(count)s more...|other": "And %(count)s more...",
-    "Share Link to User": "Share Link to User",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
     "Matrix ID": "Matrix ID",
@@ -1193,44 +1209,5 @@
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-    "<target> accepted the invitation for %(displayName)s.": "<target> accepted the invitation for %(displayName)s.",
-    "<target> accepted an invitation.": "<target> accepted an invitation.",
-    "<sender> requested a VoIP conference.": "<sender> requested a VoIP conference.",
-    "<sender> invited <target>.": "<sender> invited <target>.",
-    "<sender> banned <target>.": "<sender> banned <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> changed their display name to <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> set their display name to <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> removed their display name (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> removed their profile picture.",
-    "<sender> changed their profile picture.": "<sender> changed their profile picture.",
-    "<sender> set a profile picture.": "<sender> set a profile picture.",
-    "<target> joined the room.": "<target> joined the room.",
-    "<target> rejected the invitation.": "<target> rejected the invitation.",
-    "<target> left the room.": "<target> left the room.",
-    "<sender> unbanned <target>.": "<sender> unbanned <target>.",
-    "<sender> kicked <target>.": "<sender> kicked <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> withdrew <target>'s invitation.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> changed the topic to \"%(topic)s\".",
-    "<sender> changed the room name to %(roomName)s.": "<sender> changed the room name to %(roomName)s.",
-    "<sender> changed the avatar for %(roomName)s": "<sender> changed the avatar for %(roomName)s",
-    "<sender> changed the room avatar to <img/>": "<sender> changed the room avatar to <img/>",
-    "<sender> removed the room name.": "<sender> removed the room name.",
-    "<sender> removed the room avatar.": "<sender> removed the room avatar.",
-    "<sender> answered the call.": "<sender> answered the call.",
-    "<sender> ended the call.": "<sender> ended the call.",
-    "<sender> placed a %(callType)s call.": "<sender> placed a %(callType)s call.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sent an invitation to %(targetDisplayName)s to join the room.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> made future room history visible to all room members, from the point they are invited.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> made future room history visible to all room members, from the point they joined.",
-    "<sender> made future room history visible to all room members.": "<sender> made future room history visible to all room members.",
-    "<sender> made future room history visible to anyone.": "<sender> made future room history visible to anyone.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> made future room history visible to unknown (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> from %(fromPowerLevel)s to %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> changed the power level of %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> changed the pinned messages for the room.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s widget modified by <sender>",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget added by <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget removed by <sender>"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 35cfe69086..fed0d7b4a1 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
new file mode 100644
index 0000000000..26d24c0563
--- /dev/null
+++ b/src/stores/WidgetEchoStore.js
@@ -0,0 +1,112 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EventEmitter from 'events';
+
+import WidgetUtils from '../utils/WidgetUtils';
+import MatrixClientPeg from '../MatrixClientPeg';
+
+/**
+ * Acts as a place to get & set widget state, storing local echo state and
+ * proxying through state from the js-sdk.
+ */
+class WidgetEchoStore extends EventEmitter {
+    constructor() {
+        super();
+
+        this._roomWidgetEcho = {
+            // roomId: {
+            //     widgetId: [object]
+            // }
+        };
+    }
+
+    /**
+     * Gets the widgets for a room, substracting those that are pending deletion.
+     * Widgets that are pending addition are not included, since widgets are
+     * represted as MatrixEvents, so to do this we'd have to create fake MatrixEvents,
+     * and we don't really need the actual widget events anyway since we just want to
+     * show a spinner / prevent widgets being added twice.
+     */
+    getEchoedRoomWidgets(room, currentRoomWidgets) {
+        const echoedWidgets = [];
+
+        const roomEchoState = Object.assign({}, this._roomWidgetEcho[room.roomId]);
+
+        for (const w of currentRoomWidgets) {
+            const widgetId = w.getStateKey();
+            if (roomEchoState && roomEchoState[widgetId] && Object.keys(roomEchoState[widgetId]).length === 0) {
+                // delete locally so don't copy it
+            // we don't include widgets that have changed for the same rason we don't include new ones,
+            // so fall into the 'else' case and use the old one
+            //} else if (roomEchoState && roomEchoState[widgetId]) {
+            //    echoedWidgets.push(roomEchoState[widgetId]);
+            } else {
+                echoedWidgets.push(w);
+            }
+            delete roomEchoState[widgetId];
+        }
+
+        // any remining in roomEchoState are extra that need to be added
+        // We don't do this for the reasons above
+        /*for (const widgetId of Object.keys(roomEchoState)) {
+            echoedWidgets.push(roomEchoState[widgetId]);
+        }*/
+
+        return echoedWidgets;
+    }
+
+    roomHasPendingWidgetsOfType(room, currentRoomWidgets, type) {
+        const roomEchoState = Object.assign({}, this._roomWidgetEcho[room.roomId]);
+        if (roomEchoState === undefined) return false;
+
+        for (const w of currentRoomWidgets) {
+            const widgetId = w.getStateKey();
+            delete roomEchoState[widgetId];
+        }
+
+        if (type === undefined) {
+            return Object.keys(roomEchoState).length > 0;
+        } else {
+            return Object.values(roomEchoState).some((widget) => {
+                return widget.type === type; 
+            });
+        }
+    }
+
+    roomHasPendingWidgets(room, currentRoomWidgets) {
+        return this.roomHasPendingWidgetsOfType(room, currentRoomWidgets);
+    }
+
+    setRoomWidgetEcho(room, widgetId, state) {
+        if (this._roomWidgetEcho[room.roomId] === undefined) this._roomWidgetEcho[room.roomId] = {};
+
+        this._roomWidgetEcho[room.roomId][widgetId] = state;
+        this.emit('updateRoomWidgetEcho');
+    }
+
+    removeRoomWidgetEcho(room, widgetId) {
+        delete this._roomWidgetEcho[room.roomId][widgetId];
+        if (this._roomWidgetEcho[room.roomId] === {}) delete this._roomWidgetEcho[room.roomId];
+        this.emit('updateRoomWidgetEcho');
+    }
+}
+
+let singletonWidgetEchoStore = null;
+if (!singletonWidgetEchoStore) {
+    singletonWidgetEchoStore = new WidgetEchoStore();
+}
+module.exports = singletonWidgetEchoStore;
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index ab5b5b0130..43ca20e886 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -19,6 +19,7 @@ import MatrixClientPeg from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
 import dis from '../dispatcher';
 import * as url from "url";
+import WidgetEchoStore from '../stores/WidgetEchoStore';
 
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
@@ -250,11 +251,16 @@ export default class WidgetUtils {
             content = {};
         }
 
+        const room = MatrixClientPeg.get().getRoom(roomId);
+        WidgetEchoStore.setRoomWidgetEcho(room, widgetId, content);
+
         const client = MatrixClientPeg.get();
         // TODO - Room widgets need to be moved to 'm.widget' state events
         // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
         return client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
             return WidgetUtils.waitForRoomWidget(widgetId, roomId, addingWidget);
+        }).finally(() => {
+            WidgetEchoStore.removeRoomWidgetEcho(room, widgetId);
         });
     }
 

From f7b84a412a863fea1ba25f6d875e5e1da494178d Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 3 Jul 2018 10:19:01 +0000
Subject: [PATCH 520/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f6bb85b0c7..72558c5873 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1206,5 +1206,7 @@
     "Call in Progress": "Hívás folyamatban",
     "A call is already in progress!": "A hívás már folyamatban van!",
     "You have no historical rooms": "Nincsenek archív szobáid",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nem tudsz üzenetet küldeni amíg nem olvasod el és nem fogadod el a <consentLink>felhasználási feltételeket</consentLink>."
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nem tudsz üzenetet küldeni amíg nem olvasod el és nem fogadod el a <consentLink>felhasználási feltételeket</consentLink>.",
+    "Demote yourself?": "Lefokozod magad?",
+    "Demote": "Lefokozás"
 }

From 3199e6857876aa9d269bc8064ef90eddf8320b59 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Jul 2018 11:22:19 +0100
Subject: [PATCH 521/702] Lint

---
 src/stores/WidgetEchoStore.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index 26d24c0563..f117b37e95 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -16,9 +16,6 @@ limitations under the License.
 
 import EventEmitter from 'events';
 
-import WidgetUtils from '../utils/WidgetUtils';
-import MatrixClientPeg from '../MatrixClientPeg';
-
 /**
  * Acts as a place to get & set widget state, storing local echo state and
  * proxying through state from the js-sdk.
@@ -40,6 +37,10 @@ class WidgetEchoStore extends EventEmitter {
      * represted as MatrixEvents, so to do this we'd have to create fake MatrixEvents,
      * and we don't really need the actual widget events anyway since we just want to
      * show a spinner / prevent widgets being added twice.
+     *
+     * @param {Room} room The room object to get widgets for
+     * @param {MatrixEvent[]} currentRoomWidgets Current widgets for the room
+     * @returns {MatrixEvent[]} List of widgets in the room, minus any pending removal
      */
     getEchoedRoomWidgets(room, currentRoomWidgets) {
         const echoedWidgets = [];
@@ -82,7 +83,7 @@ class WidgetEchoStore extends EventEmitter {
             return Object.keys(roomEchoState).length > 0;
         } else {
             return Object.values(roomEchoState).some((widget) => {
-                return widget.type === type; 
+                return widget.type === type;
             });
         }
     }

From 9d41b87678c49cd999b9668071fe10c9ff78ca15 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Jul 2018 11:27:15 +0100
Subject: [PATCH 522/702] i18n

---
 src/i18n/strings/en_EN.json | 74 ++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ae4ca74085..b73cf037c8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -149,50 +149,50 @@
     "Displays action": "Displays action",
     "Unrecognised command:": "Unrecognised command:",
     "Reason": "Reason",
-    "<target> accepted the invitation for %(displayName)s.": "<target> accepted the invitation for %(displayName)s.",
-    "<target> accepted an invitation.": "<target> accepted an invitation.",
-    "<sender> requested a VoIP conference.": "<sender> requested a VoIP conference.",
-    "<sender> invited <target>.": "<sender> invited <target>.",
-    "<sender> banned <target>.": "<sender> banned <target>.",
-    "<oldDisplayName> changed their display name to <displayName>.": "<oldDisplayName> changed their display name to <displayName>.",
-    "<sender> set their display name to <displayName>.": "<sender> set their display name to <displayName>.",
-    "<sender> removed their display name (<oldDisplayName>).": "<sender> removed their display name (<oldDisplayName>).",
-    "<sender> removed their profile picture.": "<sender> removed their profile picture.",
-    "<sender> changed their profile picture.": "<sender> changed their profile picture.",
-    "<sender> set a profile picture.": "<sender> set a profile picture.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
+    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
     "VoIP conference started.": "VoIP conference started.",
-    "<target> joined the room.": "<target> joined the room.",
+    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
     "VoIP conference finished.": "VoIP conference finished.",
-    "<target> rejected the invitation.": "<target> rejected the invitation.",
-    "<target> left the room.": "<target> left the room.",
-    "<sender> unbanned <target>.": "<sender> unbanned <target>.",
-    "<sender> kicked <target>.": "<sender> kicked <target>.",
-    "<sender> withdrew <target>'s invitation.": "<sender> withdrew <target>'s invitation.",
-    "<sender> changed the topic to \"%(topic)s\".": "<sender> changed the topic to \"%(topic)s\".",
-    "<sender> removed the room name.": "<sender> removed the room name.",
-    "<sender> changed the room name to %(roomName)s.": "<sender> changed the room name to %(roomName)s.",
-    "<sender> sent an image.": "<sender> sent an image.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
+    "%(targetName)s left the room.": "%(targetName)s left the room.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
     "Someone": "Someone",
     "(not supported by this browser)": "(not supported by this browser)",
-    "<sender> answered the call.": "<sender> answered the call.",
+    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
     "(could not connect media)": "(could not connect media)",
     "(no answer)": "(no answer)",
     "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
-    "<sender> ended the call.": "<sender> ended the call.",
-    "<sender> placed a %(callType)s call.": "<sender> placed a %(callType)s call.",
-    "<sender> sent an invitation to %(targetDisplayName)s to join the room.": "<sender> sent an invitation to %(targetDisplayName)s to join the room.",
-    "<sender> made future room history visible to all room members, from the point they are invited.": "<sender> made future room history visible to all room members, from the point they are invited.",
-    "<sender> made future room history visible to all room members, from the point they joined.": "<sender> made future room history visible to all room members, from the point they joined.",
-    "<sender> made future room history visible to all room members.": "<sender> made future room history visible to all room members.",
-    "<sender> made future room history visible to anyone.": "<sender> made future room history visible to anyone.",
-    "<sender> made future room history visible to unknown (%(visibility)s).": "<sender> made future room history visible to unknown (%(visibility)s).",
-    "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).": "<sender> turned on end-to-end encryption (algorithm %(algorithm)s).",
-    "<user> from %(fromPowerLevel)s to %(toPowerLevel)s": "<user> from %(fromPowerLevel)s to %(toPowerLevel)s",
-    "<sender> changed the power level of %(powerLevelDiffText)s.": "<sender> changed the power level of %(powerLevelDiffText)s.",
-    "<sender> changed the pinned messages for the room.": "<sender> changed the pinned messages for the room.",
-    "%(widgetName)s widget modified by <sender>": "%(widgetName)s widget modified by <sender>",
-    "%(widgetName)s widget added by <sender>": "%(widgetName)s widget added by <sender>",
-    "%(widgetName)s widget removed by <sender>": "%(widgetName)s widget removed by <sender>",
+    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s placed a %(callType)s call.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s made future room history visible to all room members, from the point they joined.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s is typing",
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",

From c665ab8a22f02458a611bd41fb9b524d8f5f32de Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Jul 2018 11:55:41 +0100
Subject: [PATCH 523/702] Add error dialog if widget remove fails

Also up the timeout because matrix.org is that slow
---
 src/components/views/elements/AppTile.js | 6 ++++++
 src/i18n/strings/en_EN.json              | 2 ++
 src/utils/WidgetUtils.js                 | 7 +++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 7b69057e3e..1eaa1837ed 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -325,6 +325,12 @@ export default class AppTile extends React.Component {
                             this.props.id,
                         ).catch((e) => {
                             console.error('Failed to delete widget', e);
+                            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+                            Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
+                                title: _t('Failed to remove widget'),
+                                description: _t('An error ocurred whilst trying to remove the widget from the room'),
+                            });
                         }).finally(() => {
                             this.setState({deleting: false});
                         });
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b73cf037c8..2cab44fafb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -205,6 +205,8 @@
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
+    "Failed to remove widget": "Failed to remove widget",
+    "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
     "Failed to join room": "Failed to join room",
     "Message Pinning": "Message Pinning",
     "Jitsi Conference Calling": "Jitsi Conference Calling",
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 43ca20e886..4effa21fd6 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -21,6 +21,9 @@ import dis from '../dispatcher';
 import * as url from "url";
 import WidgetEchoStore from '../stores/WidgetEchoStore';
 
+// How long we wait for the state event echo to come back from the server
+const WIDGET_WAIT_TIME = 20000;
+
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
      * (Does not apply to non-room-based / user widgets)
@@ -135,7 +138,7 @@ export default class WidgetUtils {
             const timerId = setTimeout(() => {
                 MatrixClientPeg.get().removeListener('accountData', onAccountData);
                 reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
-            }, 10000);
+            }, WIDGET_WAIT_TIME);
             MatrixClientPeg.get().on('accountData', onAccountData);
         });
     }
@@ -188,7 +191,7 @@ export default class WidgetUtils {
             const timerId = setTimeout(() => {
                 MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
                 reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
-            }, 10000);
+            }, WIDGET_WAIT_TIME);
             MatrixClientPeg.get().on('RoomState.events', onRoomStateEvents);
         });
     }

From 0ad8d5ed79a0ae54d745fc9ff61712dacc63f682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 3 Jul 2018 11:27:00 +0000
Subject: [PATCH 524/702] Translated using Weblate (French)

Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index b0062c0d90..ea4b9e37fd 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1206,5 +1206,7 @@
     "Call in Progress": "Appel en cours",
     "A call is already in progress!": "Un appel est déjà en cours !",
     "You have no historical rooms": "Vous n'avez aucun salon historique",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vous ne pouvez voir aucun message tant que vous ne lisez et n'acceptez pas nos <consentLink>conditions générales</consentLink>."
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vous ne pouvez voir aucun message tant que vous ne lisez et n'acceptez pas nos <consentLink>conditions générales</consentLink>.",
+    "Demote yourself?": "Vous rétrograder ?",
+    "Demote": "Rétrograder"
 }

From 3f88721bc1f36021a4a67bc788b50cf3fb071bd1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Jul 2018 14:43:27 +0100
Subject: [PATCH 525/702] Give PersistedElement a key

So there can be more than one on a page
---
 .../views/elements/PersistedElement.js          | 17 +++++++++++------
 src/components/views/rooms/Stickerpicker.js     |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 8115a36eeb..389a1458d2 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -16,19 +16,18 @@ limitations under the License.
 
 const React = require('react');
 const ReactDOM = require('react-dom');
+const PropTypes = require('prop-types');
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
 // pass in a custom control as the actual body.
 
-const ContainerId = "mx_PersistedElement";
-
-function getOrCreateContainer() {
-    let container = document.getElementById(ContainerId);
+function getOrCreateContainer(containerId) {
+    let container = document.getElementById(containerId);
 
     if (!container) {
         container = document.createElement("div");
-        container.id = ContainerId;
+        container.id = containerId;
         document.body.appendChild(container);
     }
 
@@ -106,9 +105,15 @@ export default class PersistedElement extends React.Component {
             {this.props.children}
         </div>;
 
-        ReactDOM.render(content, getOrCreateContainer());
+        ReactDOM.render(content, getOrCreateContainer('mx_persistedElement_'+this.props.persistKey));
 
         return <div ref={this.collectChildContainer}></div>;
     }
 }
 
+PersistedElement.propTypes = {
+    // Unique identifier for this PersistedElement instance
+    // Any PersistedElements with the same persistKey will use
+    // the same DOM container.
+    persistKey: PropTypes.string.isRequired,
+};
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 4cb7c59ce6..343d04d24b 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -211,7 +211,7 @@ export default class Stickerpicker extends React.Component {
                             width: this.popoverWidth,
                         }}
                     >
-                    <PersistedElement>
+                    <PersistedElement persistKey="stickerPicker">
                         <AppTile
                             collectWidgetMessaging={this._collectWidgetMessaging}
                             id={stickerpickerWidget.id}

From 74f2d0a36021cf22195a699d5190017fbb64fa91 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Jul 2018 14:54:43 +0100
Subject: [PATCH 526/702] Use inline class field for PropTypes

---
 src/components/views/elements/PersistedElement.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 389a1458d2..23dea3499c 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -49,6 +49,14 @@ const PE_Z_INDEX = 5000;
  * bounding rect as the parent of PE.
  */
 export default class PersistedElement extends React.Component {
+
+    static propTypes = {
+        // Unique identifier for this PersistedElement instance
+        // Any PersistedElements with the same persistKey will use
+        // the same DOM container.
+        persistKey: PropTypes.string.isRequired,
+    };
+
     constructor() {
         super();
         this.collectChildContainer = this.collectChildContainer.bind(this);
@@ -110,10 +118,3 @@ export default class PersistedElement extends React.Component {
         return <div ref={this.collectChildContainer}></div>;
     }
 }
-
-PersistedElement.propTypes = {
-    // Unique identifier for this PersistedElement instance
-    // Any PersistedElements with the same persistKey will use
-    // the same DOM container.
-    persistKey: PropTypes.string.isRequired,
-};

From c0aa1f11967a29f7ba47e04fd1a4db6d1c5b03d3 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 3 Jul 2018 14:35:08 +0000
Subject: [PATCH 527/702] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 958d90b2b2..58a7de93b5 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1206,5 +1206,7 @@
     "The user name field must not be blank.": "Полето за потребителско име не може да е празно.",
     "The phone number field must not be blank.": "Полето за телефонен номер не може да е празно.",
     "The password field must not be blank.": "Полето за парола не може да е празно.",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Не можете да изпращате съобщения докато не прегледате и се съгласите с <consentLink>нашите правила и условия</consentLink>."
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Не можете да изпращате съобщения докато не прегледате и се съгласите с <consentLink>нашите правила и условия</consentLink>.",
+    "Demote yourself?": "Понижете себе си?",
+    "Demote": "Понижение"
 }

From b69eb8fc8852b79b1f80a6923ff670eb9f782134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Kozio=C5=82?=
 <translate.riot.im@www.koziolek.biz>
Date: Tue, 3 Jul 2018 17:15:28 +0000
Subject: [PATCH 528/702] Translated using Weblate (Polish)

Currently translated at 92.8% (1124 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 1fffff1b87..9fa51294ff 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -650,7 +650,7 @@
     "Automatically replace plain text Emoji": "Automatycznie zastępuj tekstowe emotikony",
     "Failed to upload image": "Przesyłanie obrazka nie powiodło się",
     "%(count)s new messages|one": "%(count)s nowa wiadomość",
-    "%(count)s new messages|other": "%(count)s nowe wiadomości",
+    "%(count)s new messages|other": "%(count)s nowych wiadomości",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Zalecamy Ci przejście przez proces weryfikacyjny dla każdego urządzenia aby potwierdzić, że należy ono do ich prawdziwego właściciela. Możesz jednak wysłać tę wiadomość bez potwierdzania.",
     "Unblacklist": "Usuń z czarnej listy",
     "Blacklist": "Dodaj do czarnej listy",

From ad35fbf208370940e0809c607809b15442955b36 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 3 Jul 2018 18:25:33 +0100
Subject: [PATCH 529/702] Pull out z-index to the sticker picker

As it's not a thing that's necessary for other PersistedElements,
only the sticker picker because it has to sit above the ContextMenu
it sits in.
---
 src/components/views/elements/PersistedElement.js | 6 +-----
 src/components/views/rooms/Stickerpicker.js       | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 23dea3499c..6816b4dab3 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -34,9 +34,6 @@ function getOrCreateContainer(containerId) {
     return container;
 }
 
-// Greater than that of the ContextualMenu
-const PE_Z_INDEX = 5000;
-
 /*
  * Class of component that renders its children in a separate ReactDOM virtual tree
  * in a container element appended to document.body.
@@ -104,12 +101,11 @@ export default class PersistedElement extends React.Component {
             left: parentRect.left + 'px',
             width: parentRect.width + 'px',
             height: parentRect.height + 'px',
-            zIndex: PE_Z_INDEX,
         });
     }
 
     render() {
-        const content = <div ref={this.collectChild}>
+        const content = <div ref={this.collectChild} style={this.props.style}>
             {this.props.children}
         </div>;
 
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 343d04d24b..d6afc28dad 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -27,6 +27,10 @@ import WidgetUtils from '../../../utils/WidgetUtils';
 
 const widgetType = 'm.stickerpicker';
 
+// We sit in a context menu, so the persisted element container needs to float
+// above it, so it needs a greater z-index than the ContextMenu
+const STICKERPICKER_Z_INDEX = 5000;
+
 export default class Stickerpicker extends React.Component {
     constructor(props) {
         super(props);
@@ -211,7 +215,7 @@ export default class Stickerpicker extends React.Component {
                             width: this.popoverWidth,
                         }}
                     >
-                    <PersistedElement persistKey="stickerPicker">
+                    <PersistedElement containerId="mx_persisted_stickerPicker" style={{zIndex: STICKERPICKER_Z_INDEX}}>
                         <AppTile
                             collectWidgetMessaging={this._collectWidgetMessaging}
                             id={stickerpickerWidget.id}

From 2ddcb83e8d7b8ab0976367b556c51e0d3e1ab421 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Wed, 4 Jul 2018 10:55:56 +0900
Subject: [PATCH 530/702] Import react as React in src/GroupAddressPicker.js

Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
---
 src/GroupAddressPicker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 91380b6eed..532ee23c25 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import Modal from './Modal';
 import sdk from './';
 import MultiInviter from './utils/MultiInviter';

From 537e8da553a2f0d51db4879c0310e0168688da0a Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Wed, 4 Jul 2018 06:03:48 +0000
Subject: [PATCH 531/702] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.5% (1144 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 140 ++++++++++++++++++----------------
 1 file changed, 75 insertions(+), 65 deletions(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 56d5c1e4dc..e2475e6f05 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -35,7 +35,7 @@
     "Event information": "事件信息",
     "Existing Call": "当前通话",
     "Export E2E room keys": "导出聊天室的端到端加密密钥",
-    "Failed to ban user": "封禁用户失败",
+    "Failed to ban user": "封禁失败",
     "Failed to change password. Is your password correct?": "修改密码失败。确认原密码输入正确吗？",
     "Failed to forget room %(errCode)s": "忘记聊天室失败，错误代码： %(errCode)s",
     "Failed to join room": "无法加入聊天室",
@@ -103,7 +103,7 @@
     "Server may be unavailable or overloaded": "服务器可能不可用或者超载",
     "Server may be unavailable, overloaded, or search timed out :(": "服务器可能不可用、超载，或者搜索超时 :(",
     "Server may be unavailable, overloaded, or the file too big": "服务器可能不可用、超载，或者文件过大",
-    "Server may be unavailable, overloaded, or you hit a bug.": "服务器可能不可用、超载，或者你遇到了一个 bug。",
+    "Server may be unavailable, overloaded, or you hit a bug.": "当前服务器可能处于不可用或过载状态，或者您遇到了一个 bug。",
     "Server unavailable, overloaded, or something else went wrong.": "服务器可能不可用、超载，或者其他东西出错了.",
     "Session ID": "会话 ID",
     "%(senderName)s set a profile picture.": "%(senderName)s 设置了头像。.",
@@ -179,7 +179,7 @@
     "Are you sure you want to reject the invitation?": "你确定要拒绝邀请吗？",
     "Are you sure you want to upload the following files?": "你确定要上传这些文件吗？",
     "Bans user with given id": "按照 ID 封禁指定的用户",
-    "Blacklisted": "已列入黑名单",
+    "Blacklisted": "已拉黑",
     "Bulk Options": "批量操作",
     "Call Timeout": "通话超时",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "无法连接主服务器 - 请检查网络连接，确保你的<a>主服务器 SSL 证书</a>被信任，且没有浏览器插件拦截请求。",
@@ -192,7 +192,7 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 将话题修改为 “%(topic)s”。",
     "Changes to who can read history will only apply to future messages in this room": "修改阅读历史的权限仅对此聊天室以后的消息有效",
     "Changes your display nickname": "修改昵称",
-    "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.": "目前，修改密码会导致所有设备上的端到端密钥被重置，使得加密的聊天记录不再可读。除非你事先导出聊天室密钥，修改密码后再导入。这个问题未来会改善。",
+    "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.": "目前，修改密码会导致所有设备上的端到端密钥被重置，使得加密的聊天记录不再可读。除非事先导出你的密钥，并在密码修改后导入回去。此问题将会在未来得到改善。",
     "Clear Cache and Reload": "清除缓存并刷新",
     "Clear Cache": "清除缓存",
     "<a>Click here</a> to join the discussion!": "<a>点此</a> 加入讨论！",
@@ -222,8 +222,8 @@
     "Drop File Here": "把文件拖拽到这里",
     "Email address (optional)": "邮箱地址 (可选)",
     "Enable Notifications": "启用消息通知",
-    "Encrypted by a verified device": "由一个已验证的设备加密",
-    "Encrypted by an unverified device": "由一个未经验证的设备加密",
+    "Encrypted by a verified device": "由已验证设备加密",
+    "Encrypted by an unverified device": "由未验证设备加密",
     "Encryption is enabled in this room": "此聊天室启用了加密",
     "Encryption is not enabled in this room": "此聊天室未启用加密",
     "Enter passphrase": "输入密码",
@@ -254,7 +254,7 @@
     "Moderator": "协管员",
     "Mute": "静音",
     "Name": "姓名",
-    "Never send encrypted messages to unverified devices from this device": "在此设备上不向未经验证的设备发送消息",
+    "Never send encrypted messages to unverified devices from this device": "在此设备上，从不对未经验证的设备发送消息",
     "New passwords don't match": "两次输入的新密码不符",
     "none": "无",
     "not set": "未设置",
@@ -320,7 +320,7 @@
     "VoIP conference started.": "VoIP 会议开始。",
     "VoIP is unsupported": "不支持 VoIP",
     "Warning!": "警告！",
-    "You must <a>register</a> to use this functionality": "你必须<a>注册</a>以使用这个功能",
+    "You must <a>register</a> to use this functionality": "你必须 <a>注册</a> 以使用此功能",
     "You need to be logged in.": "你需要登录。",
     "You need to enter a user name.": "你需要输入一个用户名。",
     "Your password has been reset": "你的密码已被重置",
@@ -394,29 +394,29 @@
     "Kicks user with given id": "按照 ID 移除特定的用户",
     "Last seen": "最近一次上线",
     "Level:": "级别：",
-    "Local addresses for this room:": "这个聊天室的本地地址：",
+    "Local addresses for this room:": "此聊天室的本地地址：",
     "New passwords must match each other.": "新密码必须互相匹配。",
     "Power level must be positive integer.": "权限级别必须是正整数。",
     "Reason: %(reasonText)s": "理由： %(reasonText)s",
     "Revoke Moderator": "撤销主持人",
     "Revoke widget access": "撤销小部件的访问",
-    "Remote addresses for this room:": "这个聊天室的远程地址：",
+    "Remote addresses for this room:": "此聊天室的远程地址：",
     "Remove Contact Information?": "移除联系人信息？",
     "Remove %(threePid)s?": "移除 %(threePid)s?",
     "Results from DuckDuckGo": "来自 DuckDuckGo 的结果",
     "Room contains unknown devices": "聊天室包含未知设备",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
     "Save": "保存",
-    "Send anyway": "无论任何都发送",
+    "Send anyway": "仍然发送",
     "Sets the room topic": "设置聊天室主题",
     "Show Text Formatting Toolbar": "显示文字格式工具栏",
-    "This room has no local addresses": "这个聊天室没有本地地址",
+    "This room has no local addresses": "此聊天室没有本地地址",
     "This doesn't appear to be a valid email address": "这看起来不是一个合法的邮箱地址",
-    "This is a preview of this room. Room interactions have been disabled": "这是这个聊天室的一个预览。聊天室交互已禁用",
+    "This is a preview of this room. Room interactions have been disabled": "这是此聊天室的预览。交互操作已被禁用",
     "This phone number is already in use": "此手机号码已被使用",
-    "This room": "这个聊天室",
-    "This room is not accessible by remote Matrix servers": "这个聊天室无法被远程 Matrix 服务器访问",
-    "This room's internal ID is": "这个聊天室的内部 ID 是",
+    "This room": "此聊天室",
+    "This room is not accessible by remote Matrix servers": "此聊天室无法被远程 Matrix 服务器访问",
+    "This room's internal ID is": "此聊天室的内部 ID 为",
     "Turn Markdown off": "禁用 Markdown",
     "Turn Markdown on": "启用 Markdown",
     "Unable to create widget.": "无法创建小部件。",
@@ -427,7 +427,7 @@
     "Undecryptable": "无法解密的",
     "Unencrypted room": "未加密的聊天室",
     "unencrypted": "未加密的",
-    "Unencrypted message": "未加密的消息",
+    "Unencrypted message": "未加密消息",
     "unknown caller": "未知呼叫者",
     "unknown device": "未知设备",
     "Unnamed Room": "未命名的聊天室",
@@ -438,7 +438,7 @@
     "Upload file": "上传文件",
     "Usage": "用法",
     "Who can read history?": "谁可以阅读历史消息？",
-    "You are not in this room.": "你不在这个聊天室。",
+    "You are not in this room.": "您不在此聊天室中。",
     "You have no visible notifications": "你没有可见的通知",
     "Missing password.": "缺少密码。",
     "Passwords don't match.": "密码不匹配。",
@@ -449,9 +449,9 @@
     "Do you want to load widget from URL:": "你想从此 URL 加载小组件吗：",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "隐藏加入/退出消息（邀请/踢出/封禁不受影响）",
     "Integrations Error": "集成错误",
-    "Publish this room to the public in %(domain)s's room directory?": "把这个聊天室发布到 %(domain)s 的聊天室目录吗？",
+    "Publish this room to the public in %(domain)s's room directory?": "是否将此聊天室发布至 %(domain)s 的聊天室目录中？",
     "Manage Integrations": "管理集成",
-    "No users have specific privileges in this room": "没有用户在这个聊天室有特殊权限",
+    "No users have specific privileges in this room": "此聊天室中没有用户有特殊权限",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s 发起了一个 %(callType)s 通话。",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "请检查你的电子邮箱并点击里面包含的链接。完成时请点击继续。",
     "Press <StartChatButton> to start a chat with someone": "按下 <StartChatButton> 来开始和某个人聊天",
@@ -480,7 +480,7 @@
     "Refer a friend to Riot:": "介绍朋友加入Riot：",
     "%(roomName)s is not accessible at this time.": "%(roomName)s 此时无法访问。",
     "Start authentication": "开始认证",
-    "The maximum permitted number of widgets have already been added to this room.": "小部件的最大允许数量已经添加到这个聊天室了。",
+    "The maximum permitted number of widgets have already been added to this room.": "此聊天室可拥有的小部件数量已达到上限。",
     "The phone number entered looks invalid": "输入的手机号码看起来无效",
     "The remote side failed to pick up": "对方未能接听",
     "This Home Server does not support login using email address.": "HS不支持使用邮箱地址登陆。",
@@ -501,15 +501,15 @@
     "(no answer)": "（没有回答）",
     "(warning: cannot be disabled again!)": "（警告：无法再被禁用！）",
     "WARNING: Device already verified, but keys do NOT MATCH!": "警告：设备已经验证，但密钥不匹配！",
-    "Who can access this room?": "谁可以访问这个聊天室？",
-    "Who would you like to add to this room?": "你想把谁加入这个聊天室？",
+    "Who can access this room?": "谁有权访问此聊天室？",
+    "Who would you like to add to this room?": "你想把谁添加到此聊天室？",
     "Who would you like to communicate with?": "你想和谁交流？",
     "You are already in a call.": "您正在通话。",
-    "You do not have permission to do that in this room.": "你没有权限在这个聊天室里面做那件事。",
+    "You do not have permission to do that in this room.": "您没有进行此操作的权限。",
     "You are trying to access %(roomName)s.": "你正在尝试访问 %(roomName)s.",
-    "You cannot place VoIP calls in this browser.": "你不能在这个浏览器中发起 VoIP 通话。",
-    "You do not have permission to post to this room": "你没有发送到这个聊天室的权限",
-    "You have been invited to join this room by %(inviterName)s": "您已被 %(inviterName)s 邀请加入这个聊天室",
+    "You cannot place VoIP calls in this browser.": "无法在此浏览器中发起 VoIP 通话。",
+    "You do not have permission to post to this room": "您没有在此聊天室发送消息的权限",
+    "You have been invited to join this room by %(inviterName)s": "您已被 %(inviterName)s 邀请加入此聊天室",
     "You seem to be in a call, are you sure you want to quit?": "您似乎正在进行通话，确定要退出吗？",
     "You seem to be uploading files, are you sure you want to quit?": "您似乎正在上传文件，确定要退出吗？",
     "You should not yet trust it to secure data": "你不应该相信它来保护你的数据",
@@ -520,7 +520,7 @@
     "An unknown error occurred.": "一个未知错误出现了。",
     "An error occurred: %(error_string)s": "一个错误出现了： %(error_string)s",
     "Encrypt room": "加密聊天室",
-    "There are no visible files in this room": "这个聊天室里面没有可见的文件",
+    "There are no visible files in this room": "此聊天室中没有可见的文件",
     "Active call": "当前通话",
     "Verify...": "验证...",
     "Error decrypting audio": "解密音频时出错",
@@ -544,34 +544,34 @@
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "你想要 <acceptText>接受</acceptText> 还是 <declineText>拒绝</declineText> 这个邀请？",
     "You already have existing direct chats with this user:": "你已经有和此用户的直接聊天：",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "你现在还不再任何聊天室！按下 <CreateRoomButton> 来创建一个聊天室或者 <RoomDirectoryButton> 来浏览目录",
-    "You cannot place a call with yourself.": "你不能和你自己发起一个通话。",
+    "You cannot place a call with yourself.": "你怎么寂寞到要和自己打电话，不支持的啦。",
     "You have been kicked from %(roomName)s by %(userName)s.": "您已被 %(userName)s 从聊天室 %(roomName)s 中移除。",
     "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": "你已经登出了所有的设备并不再接收推送通知。要重新启用通知，请再在每个设备上登录",
     "You have <a>disabled</a> URL previews by default.": "你已经默认 <a>禁用</a> 链接预览。",
     "You have <a>enabled</a> URL previews by default.": "你已经默认 <a>启用</a> 链接预览。",
     "Your home server does not support device management.": "你的 home server 不支持设备管理。",
     "Set a display name:": "设置一个昵称：",
-    "This server does not support authentication with a phone number.": "这个服务器不支持用手机号码认证。",
+    "This server does not support authentication with a phone number.": "此服务器不支持使用手机号码认证。",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "密码过短（最短为 %(MIN_PASSWORD_LENGTH)s）。",
-    "Make this room private": "使这个聊天室私密",
+    "Make this room private": "将此聊天室转为私密聊天室",
     "Share message history with new users": "和新用户共享消息历史",
     "Copied!": "已复制！",
     "Failed to copy": "复制失败",
     "Sent messages will be stored until your connection has returned.": "已发送的消息会被保存直到你的连接回来。",
     "(~%(count)s results)|one": "（~%(count)s 个结果）",
     "(~%(count)s results)|other": "（~%(count)s 个结果）",
-    "Please select the destination room for this message": "请选择这条消息的目标聊天室",
+    "Please select the destination room for this message": "请选择此消息的目标聊天室",
     "Start automatically after system login": "在系统登录后自动启动",
     "Analytics": "统计分析服务",
     "Reject all %(invitedRooms)s invites": "拒绝所有 %(invitedRooms)s 邀请",
-    "You may wish to login with a different account, or add this email to this account.": "你可能希望用另外一个账户登录，或者添加这个电子邮件到这个账户上。",
-    "Sun": "星期日",
-    "Mon": "星期一",
-    "Tue": "星期二",
-    "Wed": "星期三",
-    "Thu": "星期四",
-    "Fri": "星期五",
-    "Sat": "星期六",
+    "You may wish to login with a different account, or add this email to this account.": "您可能是想要用另一个账户登录，或是将此电子邮件关联至当前账户。",
+    "Sun": "周日",
+    "Mon": "周一",
+    "Tue": "周二",
+    "Wed": "周三",
+    "Thu": "周四",
+    "Fri": "周五",
+    "Sat": "周六",
     "Jan": "一月",
     "Feb": "二月",
     "Mar": "三月",
@@ -597,10 +597,10 @@
     "The visibility of existing history will be unchanged": "现有历史记录的可见性不会改变",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).",
     "Unable to remove contact information": "无法移除联系人信息",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据来允许我们改善这个应用。",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据以允许我们改善它。",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" 包含你以前没见过的设备。",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "你可以使用自定义的服务器选项来通过指定一个不同的主服务器 URL 来登录其他 Matrix 服务器。",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "这允许你用一个已有在不同主服务器的 Matrix 账户使用这个应用。",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "这允许你使用其他主服务器上的 Matrix 帐号。",
     "Please check your email to continue registration.": "请查看你的电子邮件以继续注册。",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "如果你不指定一个邮箱地址，你将不能重置你的密码。你确定吗？",
     "Home server URL": "主服务器 URL",
@@ -650,9 +650,9 @@
     "Hide avatar changes": "隐藏头像修改",
     "Hide display name changes": "隐藏昵称修改",
     "Disable big emoji in chat": "禁用聊天中的大Emoji",
-    "Never send encrypted messages to unverified devices in this room from this device": "在此设备上，在此聊天室中不向未经验证的设备发送加密的消息",
-    "Enable URL previews for this room (only affects you)": "在此聊天室启用链接预览（只影响你）",
-    "Enable URL previews by default for participants in this room": "对这个聊天室的参与者默认启用 链接预览",
+    "Never send encrypted messages to unverified devices in this room from this device": "在此设备上、此聊天室中，从不对未经验证的设备发送加密的消息",
+    "Enable URL previews for this room (only affects you)": "在此聊天室中启用链接预览（仅影响你）",
+    "Enable URL previews by default for participants in this room": "对此聊天室的所有成员默认启用链接预览",
     "Delete %(count)s devices|other": "删除了 %(count)s 个设备",
     "Delete %(count)s devices|one": "删除设备",
     "Select devices": "选择设备",
@@ -729,24 +729,24 @@
     "Your homeserver's URL": "您的主服务器的链接",
     "Your identity server's URL": "您的身份认证服务器的链接",
     "The information being sent to us to help make Riot.im better includes:": "将要为帮助 Riot.im 发展而发送的信息包含：",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "这个页面中含有可能能用于识别您身份的信息，比如聊天室、用户或群组 ID，在它们发送到服务器上之前，这些数据会被移除。",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "此页面中含有可用于识别您身份的信息，比如聊天室、用户或群组 ID，这些数据会在发送到服务器前被移除。",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s，%(monthName)s %(day)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s，%(monthName)s %(day)s %(fullYear)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s，%(monthName)s %(day)s %(fullYear)s %(time)s",
-    "Who would you like to add to this community?": "您想把谁添加到这个社区内？",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s %(time)s, %(weekDayName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s %(monthName)s %(day)s, %(weekDayName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s %(monthName)s %(day)s %(time)s, %(weekDayName)s",
+    "Who would you like to add to this community?": "你想把谁添加到此社区中？",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "警告：您添加的一切用户都将会对一切知道此社区的 ID 的人公开",
     "Name or matrix ID": "名称或 Matrix ID",
-    "Which rooms would you like to add to this community?": "您想把哪个聊天室添加到这个社区中？",
+    "Which rooms would you like to add to this community?": "您想把哪个聊天室添加到此社区中？",
     "Add rooms to the community": "添加聊天室到社区",
     "Add to community": "添加到社区",
     "Failed to invite users to community": "邀请用户到社区失败",
     "Disable Peer-to-Peer for 1:1 calls": "在一对一通话中禁用 P2P 对等网络",
-    "Enable inline URL previews by default": "默认启用网址预览",
-    "Disinvite this user?": "取消邀请此用户？",
-    "Kick this user?": "移除此用户？",
-    "Unban this user?": "解除此用户的封禁？",
-    "Ban this user?": "封紧此用户？",
+    "Enable inline URL previews by default": "默认启用链接预览",
+    "Disinvite this user?": "是否不再邀请此用户？",
+    "Kick this user?": "是否移除此用户？",
+    "Unban this user?": "是否解封此用户？",
+    "Ban this user?": "是否封禁此用户？",
     "Send an encrypted reply…": "发送加密的回复…",
     "Send a reply (unencrypted)…": "发送回复（未加密）…",
     "Send an encrypted message…": "发送加密消息…",
@@ -766,7 +766,7 @@
     "%(user)s is a %(userRole)s": "%(user)s 是一个 %(userRole)s",
     "To link to a room it must have <a>an address</a>.": "要链接一个聊天室，它必须有一个<a>地址</a>。",
     "To send events of type <eventType/>, you must be a": "要发送类型为 <eventType/> 的事件，你必须是",
-    "Members only (since the point in time of selecting this option)": "只有成员（从选择这个选项的时间开始）",
+    "Members only (since the point in time of selecting this option)": "仅成员（从选中此选项时开始）",
     "Members only (since they were invited)": "只有成员（从他们被邀请开始）",
     "Members only (since they joined)": "只有成员（从他们加入开始）",
     "Invalid community ID": "无效的社区 ID",
@@ -803,8 +803,8 @@
     "Your key share request has been sent - please check your other devices for key share requests.": "已请求共享密钥 - 请在您的其他设备上进行确认。",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "密钥共享请求将会自动发送到您的其他设备上。如果您在其他设备上拒绝了请求，请点击此处以再次请求此会话的密钥。",
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "如果您的其他设备上没有此消息的密钥，您将依然无法解密。",
-    "Key request sent.": "已请求共享密钥。",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "在您的其他设备上 <requestLink>重新请求加密密钥</requestLink>。",
+    "Key request sent.": "已发送密钥共享请求。",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "从其他设备上 <requestLink>重新请求密钥</requestLink>。",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "如果您是房间中最后一位有权限的用户，在您降低自己的权限等级后将无法撤回此修改，因为你将无法重新获得权限。",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "你将无法撤回此修改，因为您正在将此用户的权限提升至和你相同的级别。",
     "No devices with registered encryption keys": "没有设备有已注册的加密密钥",
@@ -901,7 +901,7 @@
     "Block users on other matrix homeservers from joining this room": "禁止其他 Matrix 主服务器上的用户加入此聊天室",
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "为验证此设备是否可信，请通过其他方式（例如面对面交换或拨打电话）与其拥有者联系，并询问他们该设备的用户设置中的密钥是否与以下密钥匹配：",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "如果匹配，请点击下面的验证按钮。 如果不匹配，那么这可能说明其他人正在盗用此设备，而您应当点击黑名单按钮。",
-    "In future this verification process will be more sophisticated.": "未来，这个验证过程将会变得更加精致、巧妙一些。",
+    "In future this verification process will be more sophisticated.": "未来，此验证过程将更为精致、巧妙一些。",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "我们建议您对每台设备进行验证以保证它们属于其合法所有者，但是您可以在不验证它们的情况下重新发送消息。",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>社区页面的 HTML 代码</h1>\n<p>\n    你可以给社区的新成员们写些长长的社区简介来引导他们，或者放置\n    一些重要的<a href=\"foo\">链接</a>\n</p>\n<p>\n    你甚至可以使用 <img> 标签\n</p>\n",
     "Add rooms to the community summary": "将聊天室添加到社区简介",
@@ -946,13 +946,13 @@
     "Opens the Developer Tools dialog": "打开开发者工具窗口",
     "Notify the whole room": "通知聊天室全体成员",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "此操作允许您将加密聊天室中收到的消息的密钥导出为本地文件。您可以将文件导入其他 Matrix 客户端，以便让别的客户端在未收到密钥的情况下解密这些消息。",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "导出的文件将允许任何可以读取它的人解密任何他们可以看到的加密消息，因此您应该小心以确保其安全。为了解决这个问题，您应该在下面输入一个密码，用于加密导出的数据。只有输入相同的密码才能导入数据。",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "导出的文件将允许任何可以读取它的人解密任何他们可以看到的加密消息，因此您应该小心以确保其安全。为解决此问题，您应该在下面输入密码以加密导出的数据。只有输入相同的密码才能导入数据。",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "导出文件有密码保护。你需要在此输入密码以解密此文件。",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "此操作允许您导入之前从另一个 Matrix 客户端中导出的加密密钥文件。导入完成后，您将能够解密那个客户端可以解密的加密消息。",
     "Ignores a user, hiding their messages from you": "忽略用户，隐藏他们的消息",
     "Stops ignoring a user, showing their messages going forward": "解除忽略用户，显示他们的消息",
     "To return to your account in future you need to set a password": "如果你想再次使用账号，您得为它设置一个密码",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "如果你在 GitHub 提交了一个 bug，调试日志可以帮助我们追踪这个问题。 调试日志包含应用程序使用数据，这包括您的用户名、您访问的房间或社区的 ID 或名称以及其他用户的用户名，不包扩聊天记录。",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "如果你在 GitHub 提交了一个 bug，调试日志可以帮助我们追踪这个问题。 调试日志包含应用程序使用数据，也就包括您的用户名、您访问的房间或社区的 ID 或名称，以及其他用户的用户名，但不包括聊天记录。",
     "Debug Logs Submission": "发送调试日志",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "密码修改成功。在您在其他设备上重新登录之前，其他设备不会收到推送通知",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "尝试加载此房间的时间线的特定时间点，但是无法找到。",
@@ -960,7 +960,7 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "現在 <resendText>重新发送消息</resendText> 或 <cancelText>取消发送</cancelText> 。你也可以单独选择消息以重新发送或取消。",
     "Visibility in Room List": "是否在聊天室目录中可见",
     "Something went wrong when trying to get your communities.": "获取你加入的社区时发生错误。",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "删除小部件后，此聊天室中的所有用户的这个小部件都会被删除。你确定要删除这个小部件吗？",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "删除小部件时将为聊天室中的所有成员删除。您确定要删除此小部件吗？",
     "Fetching third party location failed": "获取第三方位置失败",
     "A new version of Riot is available.": "Riot 有更新可用。",
     "Couldn't load home page": "不能加载首页",
@@ -990,7 +990,7 @@
     "Forget": "忘记",
     "#example": "#例子",
     "Hide panel": "隐藏面板",
-    "You cannot delete this image. (%(code)s)": "您不能删除这个图片。(%(code)s)",
+    "You cannot delete this image. (%(code)s)": "无法删除此图片。(%(code)s)",
     "Cancel Sending": "取消发送",
     "This Room": "此聊天室",
     "The Home Server may be too old to support third party networks": "主服务器可能太老旧无法支持第三方网络",
@@ -1135,5 +1135,15 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "无法加载被回复的事件，它可能不存在，也可能是您没有权限查看它。",
     "And %(count)s more...|other": "和 %(count)s 个其他…",
     "Try using one of the following valid address types: %(validTypesList)s.": "请尝试使用以下的有效邮箱地址格式中的一种：%(validTypesList)s",
-    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot 使用 GitHub 追踪 bug：<a>在 GitHub 上创建新 Issue</a>"
+    "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Riot 使用 GitHub 追踪 bug：<a>在 GitHub 上创建新 Issue</a>",
+    "e.g. %(exampleValue)s": "例如：%(exampleValue)s",
+    "Call in Progress": "正在通话",
+    "A call is already in progress!": "您已在通话中！",
+    "Jitsi Conference Calling": "Jitsi 电话会议",
+    "Send analytics data": "发送统计数据",
+    "Enable widget screenshots on supported widgets": "对支持的小部件启用小部件截图",
+    "Encrypting": "正在加密",
+    "Encrypted, not sent": "已加密，未发送",
+    "Demote yourself?": "是否降低您自己的权限？",
+    "Demote": "降权"
 }

From 36d3c3952b2423cd4b4910c95a8570bb32c3eeec Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Tue, 3 Jul 2018 11:52:23 +0000
Subject: [PATCH 532/702] Translated using Weblate (Russian)

Currently translated at 99.8% (1208 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 2b75f9c443..e3147ed809 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1204,5 +1204,7 @@
     "You have no historical rooms": "У вас нет архивных комнат",
     "Share Room Message": "Обмен сообщениями в комнате",
     "Share Message": "Обмен сообщениями",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Вы не можете отправлять сообщения до тех пор, пока вы не примете <consentLink>наши правила и положения</consentLink>."
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Вы не можете отправлять сообщения до тех пор, пока вы не примете <consentLink>наши правила и положения</consentLink>.",
+    "Demote": "Понижение",
+    "Demote yourself?": "Понизить самого себя?"
 }

From f941c93322b1fd27aca58af109175179fe22f786 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Wed, 4 Jul 2018 18:27:03 +0900
Subject: [PATCH 533/702] Import react as React in
 src/components/views/messages/MStickerBody.js

Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
---
 src/components/views/messages/MStickerBody.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index d9ed668e42..82a530d503 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 'use strict';
 
+import React from 'react';
 import MImageBody from './MImageBody';
 import sdk from '../../../index';
 

From 8d54cbd09e8e81ae44de6613fa5b7dd139a80f12 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 4 Jul 2018 11:23:20 +0100
Subject: [PATCH 534/702] Prepare changelog for v0.12.9-rc.1

---
 CHANGELOG.md | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8483e2a0a2..2164110c45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,104 @@
+Changes in [0.12.9-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.9-rc.1) (2018-07-04)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8...v0.12.9-rc.1)
+
+ * Update from Weblate.
+   [\#2040](https://github.com/matrix-org/matrix-react-sdk/pull/2040)
+ * Import react as React in src/components/views/messages/MStickerBody.js
+   [\#2039](https://github.com/matrix-org/matrix-react-sdk/pull/2039)
+ * Import react as React in src/GroupAddressPicker.js
+   [\#2038](https://github.com/matrix-org/matrix-react-sdk/pull/2038)
+ * Give PersistedElement a key
+   [\#2036](https://github.com/matrix-org/matrix-react-sdk/pull/2036)
+ * Revert " make click to insert nick work on join/parts, /me's etc"
+   [\#2034](https://github.com/matrix-org/matrix-react-sdk/pull/2034)
+ * Track an event name when tracking a decryption failure
+   [\#2033](https://github.com/matrix-org/matrix-react-sdk/pull/2033)
+ * warn on self-mute
+   [\#1974](https://github.com/matrix-org/matrix-react-sdk/pull/1974)
+ *  make click to insert nick work on join/parts, /me's etc
+   [\#1945](https://github.com/matrix-org/matrix-react-sdk/pull/1945)
+ * Fix layout bug introduced by #2025
+   [\#2029](https://github.com/matrix-org/matrix-react-sdk/pull/2029)
+ * Fix room topics/names resetting when UserSetting re-renders
+   [\#2028](https://github.com/matrix-org/matrix-react-sdk/pull/2028)
+ * Improve tracking of UISIs
+   [\#2027](https://github.com/matrix-org/matrix-react-sdk/pull/2027)
+ * Replace share icons
+   [\#2026](https://github.com/matrix-org/matrix-react-sdk/pull/2026)
+ * Improve status bar errors (namely the consent error)
+   [\#2025](https://github.com/matrix-org/matrix-react-sdk/pull/2025)
+ * Fix incorrectly positioned copy button on `<pre>` blocks
+   [\#2023](https://github.com/matrix-org/matrix-react-sdk/pull/2023)
+ * Redact pathnames with origin `file://`
+   [\#2018](https://github.com/matrix-org/matrix-react-sdk/pull/2018)
+ * Update package-lock.json
+   [\#2022](https://github.com/matrix-org/matrix-react-sdk/pull/2022)
+ * on room sub list badge click goto first relevant room
+   [\#2021](https://github.com/matrix-org/matrix-react-sdk/pull/2021)
+ * improve linkifier AGAIN
+   [\#2020](https://github.com/matrix-org/matrix-react-sdk/pull/2020)
+ * fix historical section
+   [\#2016](https://github.com/matrix-org/matrix-react-sdk/pull/2016)
+ * Fix RoomSubList headers by re-commiting 1faecfd
+   [\#2014](https://github.com/matrix-org/matrix-react-sdk/pull/2014)
+ * don't fire share dialog when clicking timestamp of event,
+   [\#2017](https://github.com/matrix-org/matrix-react-sdk/pull/2017)
+ * Revert "affix copyButton so that it doesn't get scrolled horizontally"
+   [\#2013](https://github.com/matrix-org/matrix-react-sdk/pull/2013)
+ * when the user switches room, close room settings
+   [\#2019](https://github.com/matrix-org/matrix-react-sdk/pull/2019)
+ * Refactor widgets code
+   [\#2015](https://github.com/matrix-org/matrix-react-sdk/pull/2015)
+ * Login local errors for blank fields
+   [\#2009](https://github.com/matrix-org/matrix-react-sdk/pull/2009)
+ * Update lolex to 2.7.0
+   [\#1917](https://github.com/matrix-org/matrix-react-sdk/pull/1917)
+ * Improve Linkifier
+   [\#2011](https://github.com/matrix-org/matrix-react-sdk/pull/2011)
+ * use enum constants for EventStatus and correct isSent check
+   [\#2010](https://github.com/matrix-org/matrix-react-sdk/pull/2010)
+ * accent insensitive autocomplete
+   [\#2007](https://github.com/matrix-org/matrix-react-sdk/pull/2007)
+ * default to not showing url previews in e2ee rooms.
+   [\#2001](https://github.com/matrix-org/matrix-react-sdk/pull/2001)
+ * allow chaining right click contextmenus
+   [\#1999](https://github.com/matrix-org/matrix-react-sdk/pull/1999)
+ * hide empty roomsublists when filtering via search/tagpanel
+   [\#1954](https://github.com/matrix-org/matrix-react-sdk/pull/1954)
+ * prevent user,room,group autocomplete firing mid-word
+   [\#2012](https://github.com/matrix-org/matrix-react-sdk/pull/2012)
+ * fix instances of composer not getting/regaining focus
+   [\#2008](https://github.com/matrix-org/matrix-react-sdk/pull/2008)
+ * notif panel fixes
+   [\#2006](https://github.com/matrix-org/matrix-react-sdk/pull/2006)
+ * factor out conditional LanguageSelector as functional component
+   [\#2003](https://github.com/matrix-org/matrix-react-sdk/pull/2003)
+ * Autocomplete and Pillify Communities
+   [\#1993](https://github.com/matrix-org/matrix-react-sdk/pull/1993)
+ * Very basic Jitsi integration
+   [\#1971](https://github.com/matrix-org/matrix-react-sdk/pull/1971)
+ * add additional classes which protect the text from overflowing
+   [\#1994](https://github.com/matrix-org/matrix-react-sdk/pull/1994)
+ * Upload File confirmation modal steals focus, send it back to composer
+   [\#1992](https://github.com/matrix-org/matrix-react-sdk/pull/1992)
+ * delint MImageBody, fixes anonymous class and hyphenated style keys which
+   made react cry
+   [\#1991](https://github.com/matrix-org/matrix-react-sdk/pull/1991)
+ * allow using tab to navigate room list in a smarter way
+   [\#1977](https://github.com/matrix-org/matrix-react-sdk/pull/1977)
+ * fix no displayname usersettings
+   [\#1990](https://github.com/matrix-org/matrix-react-sdk/pull/1990)
+ * trigger TagTile context menu on right click
+   [\#1989](https://github.com/matrix-org/matrix-react-sdk/pull/1989)
+ * hide already chosen results from AddressPickerDialog
+   [\#2000](https://github.com/matrix-org/matrix-react-sdk/pull/2000)
+ * delint ChatCreateOrReuseDialog
+   [\#2002](https://github.com/matrix-org/matrix-react-sdk/pull/2002)
+ * fix set password & email flow possible to get stuck and onBlur murdering
+   your email
+   [\#1982](https://github.com/matrix-org/matrix-react-sdk/pull/1982)
+
 Changes in [0.12.8](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8) (2018-06-29)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8-rc.2...v0.12.8)

From 6e92cc3ea3235fdaa0bf3f379a653c919fe157bd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 4 Jul 2018 11:23:21 +0100
Subject: [PATCH 535/702] v0.12.9-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 47a8f2c47a..c762bed311 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.8",
+  "version": "0.12.9-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From edfe94383aafe3e689d9dd547cd14aa61ef81842 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 4 Jul 2018 10:51:42 +0000
Subject: [PATCH 536/702] Translated using Weblate (German)

Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b4e244f542..255a2213fd 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1206,5 +1206,8 @@
     "Call in Progress": "Gespräch läuft",
     "A call is already in progress!": "Ein Gespräch läuft bereits!",
     "You have no historical rooms": "Du hast keine historischen Räume",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kannst keine Nachrichten senden bis du die <consentLink>unsere Geschläftsbedingungen</consentLink> gelesen und akzeptiert hast."
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kannst keine Nachrichten senden bis du die <consentLink>unsere Geschläftsbedingungen</consentLink> gelesen und akzeptiert hast.",
+    "Show empty room list headings": "Zeite leere Raumlist-Köpfe",
+    "Demote yourself?": "Selbst zurückstufen?",
+    "Demote": "Zurückstufen"
 }

From 4d17dd2800da68e12baaf1e888262b7cddeb3de7 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 4 Jul 2018 11:00:06 +0000
Subject: [PATCH 537/702] Translated using Weblate (German)

Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 255a2213fd..c59e743bd7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -935,7 +935,7 @@
     "Replying": "Antwortet",
     "Minimize apps": "Apps minimieren",
     "%(count)s of your messages have not been sent.|one": "Deine Nachricht wurde nicht gesendet.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Jetzt alle erneut senden</resendText> oder <cancelText>alle abbrechen</cancelText>. Du kannst auch einzelne Nachrichten auswählen und erneut senden oder abbrechen.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Alle erneut senden</resendText> oder <cancelText>alle abbrechen</cancelText>. Du kannst auch einzelne Nachrichten erneut senden oder abbrechen.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Nachricht jetzt erneut senden</resendText> oder <cancelText>senden abbrechen</cancelText> now.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatsphäre ist uns wichtig, deshalb sammeln wir keine persönlichen oder identifizierbaren Daten für unsere Analysen.",
     "The information being sent to us to help make Riot.im better includes:": "Die Informationen, die an uns gesendet werden um Riot.im zu verbessern enthalten:",
@@ -953,7 +953,7 @@
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen sowie Raum, Nutzer oder Gruppen-ID enthalten, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
     "Whether or not you're logged in (we don't record your user name)": "Ob oder ob du nicht angemeldet bist (wir zeichnen deinen Benutzernamen nicht auf)",
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
-    "<a>In reply to</a> <pill>": "<a>Antwort zu</a> <pill>",
+    "<a>In reply to</a> <pill>": "<a>Als Antwort auf</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",

From e5392e2c00e8968d0aba01ed975b19a73f474875 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Jul 2018 12:57:22 +0100
Subject: [PATCH 538/702] use TruncatedList to prevent rendering
 hundreds/thousands of DOM nodes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DevtoolsDialog.js           | 58 +++++++++++++++----
 1 file changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 1566302e42..5e75d16455 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -242,6 +242,8 @@ class SendAccountData extends GenericEditor {
     }
 }
 
+const INITIAL_LOAD_TILES = 20;
+
 class FilteredList extends React.Component {
     static propTypes = {
         children: PropTypes.any,
@@ -249,31 +251,65 @@ class FilteredList extends React.Component {
         onChange: PropTypes.func,
     };
 
+    static filterChildren(children, query) {
+        if (!query) return children;
+        const lcQuery = query.toLowerCase();
+        return children.filter((child) => child.key.toLowerCase().includes(lcQuery));
+    }
+
     constructor(props, context) {
         super(props, context);
-        this.onQuery = this.onQuery.bind(this);
+
+        this.state = {
+            filteredChildren: FilteredList.filterChildren(this.props.children, this.props.query),
+            truncateAt: INITIAL_LOAD_TILES,
+        };
     }
 
-    onQuery(ev) {
+    componentWillReceiveProps(nextProps) {
+        if (this.props.children === nextProps.children && this.props.query === nextProps.query) return;
+        this.setState({
+            filteredChildren: FilteredList.filterChildren(nextProps.children, nextProps.query),
+            truncateAt: INITIAL_LOAD_TILES,
+        });
+    }
+
+    showAll = () => {
+        this.setState({
+            truncateAt: -1,
+        });
+    };
+
+    createOverflowElement = (overflowCount: number, totalCount: number) => {
+        return <button className="mx_DevTools_RoomStateExplorer_button" onClick={this.showAll}>
+            { _t("and %(count)s others...", { count: overflowCount }) }
+        </button>;
+    };
+
+    onQuery = (ev) => {
         if (this.props.onChange) this.props.onChange(ev.target.value);
-    }
+    };
 
-    filterChildren() {
-        if (this.props.query) {
-            const lowerQuery = this.props.query.toLowerCase();
-            return this.props.children.filter((child) => child.key.toLowerCase().includes(lowerQuery));
-        }
-        return this.props.children;
-    }
+    getChildren = (start: number, end: number) => {
+        return this.state.filteredChildren.slice(start, end);
+    };
+
+    getChildCount = (): number => {
+        return this.state.filteredChildren.length;
+    };
 
     render() {
+        const TruncatedList = sdk.getComponent("elements.TruncatedList");
         return <div>
             <input size="64"
                    onChange={this.onQuery}
                    value={this.props.query}
                    placeholder={_t('Filter results')}
                    className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query" />
-            { this.filterChildren() }
+            <TruncatedList getChildren={this.getChildren}
+                           getChildCount={this.getChildCount}
+                           truncateAt={this.state.truncateAt}
+                           createOverflowElement={this.createOverflowElement} />
         </div>;
     }
 }

From dc6b3cb081e8819e80d0e82d6b926998ec9d5bdd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Jul 2018 13:07:57 +0100
Subject: [PATCH 539/702] showing all is pretty slow, show an additional 50
 instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/DevtoolsDialog.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 5e75d16455..3078944b62 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -243,6 +243,7 @@ class SendAccountData extends GenericEditor {
 }
 
 const INITIAL_LOAD_TILES = 20;
+const LOAD_TILES_STEP_SIZE = 50;
 
 class FilteredList extends React.Component {
     static propTypes = {
@@ -276,7 +277,7 @@ class FilteredList extends React.Component {
 
     showAll = () => {
         this.setState({
-            truncateAt: -1,
+            truncateAt: this.state.truncateAt + LOAD_TILES_STEP_SIZE,
         });
     };
 

From 39103a350a7f897d18d6781f4fce70f69c91ba4b Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 3 Jul 2018 10:19:08 +0000
Subject: [PATCH 540/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 72558c5873..af8dde9745 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1208,5 +1208,6 @@
     "You have no historical rooms": "Nincsenek archív szobáid",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nem tudsz üzenetet küldeni amíg nem olvasod el és nem fogadod el a <consentLink>felhasználási feltételeket</consentLink>.",
     "Demote yourself?": "Lefokozod magad?",
-    "Demote": "Lefokozás"
+    "Demote": "Lefokozás",
+    "Show empty room list headings": "Üres szobalista fejléc mutatása"
 }

From 1811d3f148ef463ae4e6628f4488075c3ef30910 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 5 Jul 2018 01:48:28 +0200
Subject: [PATCH 541/702] encrypt for invited users if history visibility
 allows.

fixes https://github.com/vector-im/riot-web/issues/2713. requires equivalent branch in js-sdk
---
 src/cryptodevices.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index d11aa47cda..92237ce7f5 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -44,7 +44,7 @@ export function markAllDevicesKnown(matrixClient, devices) {
  * module:crypto~DeviceInfo|DeviceInfo}.
  */
 export function getUnknownDevicesForRoom(matrixClient, room) {
-    const roomMembers = room.getJoinedMembers().map((m) => {
+    const roomMembers = room.getEncryptionTargetMembers().map((m) => {
         return m.userId;
     });
     return matrixClient.downloadKeys(roomMembers, false).then((devices) => {

From 34d234fa30484cee58cdbdd3f0f174738316f954 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 5 Jul 2018 03:20:36 +0000
Subject: [PATCH 542/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index d5d43fa2a0..7c20120297 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1206,5 +1206,8 @@
     "Call in Progress": "進行中的通話",
     "A call is already in progress!": "已有一通電話進行中！",
     "You have no historical rooms": "您沒有過去的聊天室",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "您在審閱並同意<consentLink>我們的條款與條件</consentLink>前無法傳送訊息。"
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "您在審閱並同意<consentLink>我們的條款與條件</consentLink>前無法傳送訊息。",
+    "Show empty room list headings": "顯示空聊天室清單標題",
+    "Demote yourself?": "將自己降級？",
+    "Demote": "降級"
 }

From 7f9ef37bcaeaca4eaeebf4afc7633117775fd2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 3 Jul 2018 11:27:07 +0000
Subject: [PATCH 543/702] Translated using Weblate (French)

Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ea4b9e37fd..c9f4e1c2b3 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1208,5 +1208,6 @@
     "You have no historical rooms": "Vous n'avez aucun salon historique",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vous ne pouvez voir aucun message tant que vous ne lisez et n'acceptez pas nos <consentLink>conditions générales</consentLink>.",
     "Demote yourself?": "Vous rétrograder ?",
-    "Demote": "Rétrograder"
+    "Demote": "Rétrograder",
+    "Show empty room list headings": "Afficher les en-têtes de la liste des salons vides"
 }

From d53c836fd7740cc3a3035b294514ff4bf5383b58 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 5 Jul 2018 13:54:44 +0100
Subject: [PATCH 544/702] Implement aggregation by error type for tracked
 decryption failures

---
 src/DecryptionFailureTracker.js         |  82 +++++++++++------
 src/components/structures/MatrixChat.js |  19 +++-
 test/DecryptionFailureTracker-test.js   | 115 +++++++++++++++++-------
 3 files changed, 156 insertions(+), 60 deletions(-)

diff --git a/src/DecryptionFailureTracker.js b/src/DecryptionFailureTracker.js
index e7809d2f6c..b02a5e937b 100644
--- a/src/DecryptionFailureTracker.js
+++ b/src/DecryptionFailureTracker.js
@@ -14,22 +14,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-class DecryptionFailure {
-    constructor(failedEventId) {
+export class DecryptionFailure {
+    constructor(failedEventId, errorCode) {
         this.failedEventId = failedEventId;
+        this.errorCode = errorCode;
         this.ts = Date.now();
     }
 }
 
-export default class DecryptionFailureTracker {
+export class DecryptionFailureTracker {
     // Array of items of type DecryptionFailure. Every `CHECK_INTERVAL_MS`, this list
     // is checked for failures that happened > `GRACE_PERIOD_MS` ago. Those that did
-    // are added to `failuresToTrack`.
+    // are accumulated in `failureCounts`.
     failures = [];
 
-    // Every TRACK_INTERVAL_MS (so as to spread the number of hits done on Analytics),
-    // one DecryptionFailure of this FIFO is removed and tracked.
-    failuresToTrack = [];
+    // A histogram of the number of failures that will be tracked at the next tracking
+    // interval, split by failure error code.
+    failureCounts = {
+        // [errorCode]: 42
+    };
 
     // Event IDs of failures that were tracked previously
     trackedEventHashMap = {
@@ -46,16 +49,35 @@ export default class DecryptionFailureTracker {
     // Call `checkFailures` every `CHECK_INTERVAL_MS`.
     static CHECK_INTERVAL_MS = 5000;
 
-    // Give events a chance to be decrypted by waiting `GRACE_PERIOD_MS` before moving
-    // the failure to `failuresToTrack`.
+    // Give events a chance to be decrypted by waiting `GRACE_PERIOD_MS` before counting
+    // the failure in `failureCounts`.
     static GRACE_PERIOD_MS = 60000;
 
-    constructor(fn) {
+    /**
+     * Create a new DecryptionFailureTracker.
+     *
+     * Call `eventDecrypted(event, err)` on this instance when an event is decrypted.
+     *
+     * Call `start()` to start the tracker, and `stop()` to stop tracking.
+     *
+     * @param {function} fn The tracking function, which will be called when failures
+     * are tracked. The function should have a signature `(count, trackedErrorCode) => {...}`,
+     * where `count` is the number of failures and `errorCode` matches the `.code` of
+     * provided DecryptionError errors (by default, unless `errorCodeMapFn` is specified.
+     * @param {function?} errorCodeMapFn The function used to map error codes to the
+     * trackedErrorCode. If not provided, the `.code` of errors will be used.
+     */
+    constructor(fn, errorCodeMapFn) {
         if (!fn || typeof fn !== 'function') {
             throw new Error('DecryptionFailureTracker requires tracking function');
         }
 
-        this.trackDecryptionFailure = fn;
+        if (errorCodeMapFn && typeof errorCodeMapFn !== 'function') {
+            throw new Error('DecryptionFailureTracker second constructor argument should be a function');
+        }
+
+        this._trackDecryptionFailure = fn;
+        this._mapErrorCode = errorCodeMapFn;
     }
 
     // loadTrackedEventHashMap() {
@@ -66,17 +88,17 @@ export default class DecryptionFailureTracker {
     //     localStorage.setItem('mx-decryption-failure-event-id-hashes', JSON.stringify(this.trackedEventHashMap));
     // }
 
-    eventDecrypted(e) {
-        if (e.isDecryptionFailure()) {
-            this.addDecryptionFailureForEvent(e);
+    eventDecrypted(e, err) {
+        if (err) {
+            this.addDecryptionFailure(new DecryptionFailure(e.getId(), err.code));
         } else {
             // Could be an event in the failures, remove it
             this.removeDecryptionFailuresForEvent(e);
         }
     }
 
-    addDecryptionFailureForEvent(e) {
-        this.failures.push(new DecryptionFailure(e.getId()));
+    addDecryptionFailure(failure) {
+        this.failures.push(failure);
     }
 
     removeDecryptionFailuresForEvent(e) {
@@ -93,7 +115,7 @@ export default class DecryptionFailureTracker {
         );
 
         this.trackInterval = setInterval(
-            () => this.trackFailure(),
+            () => this.trackFailures(),
             DecryptionFailureTracker.TRACK_INTERVAL_MS,
         );
     }
@@ -106,7 +128,7 @@ export default class DecryptionFailureTracker {
         clearInterval(this.trackInterval);
 
         this.failures = [];
-        this.failuresToTrack = [];
+        this.failureCounts = {};
     }
 
     /**
@@ -153,20 +175,28 @@ export default class DecryptionFailureTracker {
 
         const dedupedFailures = dedupedFailuresMap.values();
 
-        this.failuresToTrack = [...this.failuresToTrack, ...dedupedFailures];
+        this._aggregateFailures(dedupedFailures);
+    }
+
+    _aggregateFailures(failures) {
+        for (const failure of failures) {
+            const errorCode = failure.errorCode;
+            this.failureCounts[errorCode] = (this.failureCounts[errorCode] || 0) + 1;
+        }
     }
 
     /**
      * If there are failures that should be tracked, call the given trackDecryptionFailure
      * function with the number of failures that should be tracked.
      */
-    trackFailure() {
-        if (this.failuresToTrack.length > 0) {
-            // Remove all failures, and expose the number of failures for now.
-            //
-            // TODO: Track a histogram of error types to cardinailty to allow for
-            // aggregation by error type.
-            this.trackDecryptionFailure(this.failuresToTrack.splice(0).length);
+    trackFailures() {
+        for (const errorCode of Object.keys(this.failureCounts)) {
+            if (this.failureCounts[errorCode] > 0) {
+                const trackedErrorCode = this._mapErrorCode ? this._mapErrorCode(errorCode) : errorCode;
+
+                this._trackDecryptionFailure(this.failureCounts[errorCode], trackedErrorCode);
+                this.failureCounts[errorCode] = 0;
+            }
         }
     }
 }
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 9ea0cb42c8..7150c661ed 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1304,9 +1304,20 @@ export default React.createClass({
             }
         });
 
-        const dft = new DecryptionFailureTracker((total) => {
-            // TODO: Pass reason for failure as third argument to trackEvent
-            Analytics.trackEvent('E2E', 'Decryption failure', 'unspecified_error', total);
+        const dft = new DecryptionFailureTracker((total, errorCode) => {
+            Analytics.trackEvent('E2E', 'Decryption failure', errorCode, total);
+        }, (errorCode) => {
+            // Map JS-SDK error codes to tracker codes for aggregation
+            switch (errorCode) {
+                case 'MEGOLM_UNKNOWN_INBOUND_SESSION_ID':
+                    return 'olm_keys_not_sent_error';
+                case 'OLM_UNKNOWN_MESSAGE_INDEX':
+                    return 'olm_index_error';
+                case undefined:
+                    return 'unexpected_error';
+                default:
+                    return 'unspecified_error';
+            }
         });
 
         // Shelved for later date when we have time to think about persisting history of
@@ -1317,7 +1328,7 @@ export default React.createClass({
 
         // When logging out, stop tracking failures and destroy state
         cli.on("Session.logged_out", () => dft.stop());
-        cli.on("Event.decrypted", (e) => dft.eventDecrypted(e));
+        cli.on("Event.decrypted", (e, err) => dft.eventDecrypted(e, err));
 
         const krh = new KeyRequestHandler(cli);
         cli.on("crypto.roomKeyRequest", (req) => {
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index 4979fb9bb4..99922276c5 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -16,10 +16,18 @@ limitations under the License.
 
 import expect from 'expect';
 
-import DecryptionFailureTracker from '../src/DecryptionFailureTracker';
+import { DecryptionFailure, DecryptionFailureTracker } from '../src/DecryptionFailureTracker';
 
 import { MatrixEvent } from 'matrix-js-sdk';
 
+class MockDecryptionError extends Error {
+    constructor(code) {
+        super();
+
+        this.code = code || 'MOCK_DECRYPTION_ERROR';
+    }
+}
+
 function createFailedDecryptionEvent() {
     const event = new MatrixEvent({
         event_id: "event-id-" + Math.random().toString(16).slice(2),
@@ -30,20 +38,21 @@ function createFailedDecryptionEvent() {
     return event;
 }
 
-describe('DecryptionFailureTracker', function() {
+describe.only('DecryptionFailureTracker', function() {
     it('tracks a failed decryption', function(done) {
         const failedDecryptionEvent = createFailedDecryptionEvent();
 
         let count = 0;
         const tracker = new DecryptionFailureTracker((total) => count += total);
 
-        tracker.eventDecrypted(failedDecryptionEvent);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(failedDecryptionEvent, err);
 
         // Pretend "now" is Infinity
         tracker.checkFailures(Infinity);
 
-        // Immediately track the newest failure, if there is one
-        tracker.trackFailure();
+        // Immediately track the newest failures
+        tracker.trackFailures();
 
         expect(count).toNotBe(0, 'should track a failure for an event that failed decryption');
 
@@ -56,17 +65,18 @@ describe('DecryptionFailureTracker', function() {
             expect(true).toBe(false, 'should not track an event that has since been decrypted correctly');
         });
 
-        tracker.eventDecrypted(decryptedEvent);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(decryptedEvent, err);
 
         // Indicate successful decryption: clear data can be anything where the msgtype is not m.bad.encrypted
         decryptedEvent._setClearData({});
-        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent, null);
 
         // Pretend "now" is Infinity
         tracker.checkFailures(Infinity);
 
-        // Immediately track the newest failure, if there is one
-        tracker.trackFailure();
+        // Immediately track the newest failures
+        tracker.trackFailures();
         done();
     });
 
@@ -78,23 +88,24 @@ describe('DecryptionFailureTracker', function() {
         const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Arbitrary number of failed decryptions for both events
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent);
-        tracker.eventDecrypted(decryptedEvent2);
-        tracker.eventDecrypted(decryptedEvent2);
-        tracker.eventDecrypted(decryptedEvent2);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent, err);
+        tracker.eventDecrypted(decryptedEvent2, err);
+        tracker.eventDecrypted(decryptedEvent2, err);
+        tracker.eventDecrypted(decryptedEvent2, err);
 
         // Pretend "now" is Infinity
         tracker.checkFailures(Infinity);
 
-        // Simulated polling of `trackFailure`, an arbitrary number ( > 2 ) times
-        tracker.trackFailure();
-        tracker.trackFailure();
-        tracker.trackFailure();
-        tracker.trackFailure();
+        // Simulated polling of `trackFailures`, an arbitrary number ( > 2 ) times
+        tracker.trackFailures();
+        tracker.trackFailures();
+        tracker.trackFailures();
+        tracker.trackFailures();
 
         expect(count).toBe(2, count + ' failures tracked, should only track a single failure per event');
 
@@ -108,17 +119,18 @@ describe('DecryptionFailureTracker', function() {
         const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Indicate decryption
-        tracker.eventDecrypted(decryptedEvent);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(decryptedEvent, err);
 
         // Pretend "now" is Infinity
         tracker.checkFailures(Infinity);
 
-        tracker.trackFailure();
+        tracker.trackFailures();
 
         // Indicate a second decryption, after having tracked the failure
-        tracker.eventDecrypted(decryptedEvent);
+        tracker.eventDecrypted(decryptedEvent, err);
 
-        tracker.trackFailure();
+        tracker.trackFailures();
 
         expect(count).toBe(1, 'should only track a single failure per event');
 
@@ -135,25 +147,68 @@ describe('DecryptionFailureTracker', function() {
         const tracker = new DecryptionFailureTracker((total) => count += total);
 
         // Indicate decryption
-        tracker.eventDecrypted(decryptedEvent);
+        const err = new MockDecryptionError();
+        tracker.eventDecrypted(decryptedEvent, err);
 
         // Pretend "now" is Infinity
         // NB: This saves to localStorage specific to DFT
         tracker.checkFailures(Infinity);
 
-        tracker.trackFailure();
+        tracker.trackFailures();
 
         // Simulate the browser refreshing by destroying tracker and creating a new tracker
         const secondTracker = new DecryptionFailureTracker((total) => count += total);
 
         //secondTracker.loadTrackedEventHashMap();
 
-        secondTracker.eventDecrypted(decryptedEvent);
+        secondTracker.eventDecrypted(decryptedEvent, err);
         secondTracker.checkFailures(Infinity);
-        secondTracker.trackFailure();
+        secondTracker.trackFailures();
 
         expect(count).toBe(1, count + ' failures tracked, should only track a single failure per event');
 
         done();
     });
+
+    it('should count different error codes separately for multiple failures with different error codes', () => {
+        const counts = {};
+        const tracker = new DecryptionFailureTracker(
+            (total, errorCode) => counts[errorCode] = (counts[errorCode] || 0) + total,
+        );
+
+        // One failure of ERROR_CODE_1, and effectively two for ERROR_CODE_2
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id1', 'ERROR_CODE_1'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id2', 'ERROR_CODE_2'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id2', 'ERROR_CODE_2'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id3', 'ERROR_CODE_2'));
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        tracker.trackFailures();
+
+        expect(counts['ERROR_CODE_1']).toBe(1, 'should track one ERROR_CODE_1');
+        expect(counts['ERROR_CODE_2']).toBe(2, 'should track two ERROR_CODE_2');
+    });
+
+    it('should map error codes correctly', () => {
+        const counts = {};
+        const tracker = new DecryptionFailureTracker(
+            (total, errorCode) => counts[errorCode] = (counts[errorCode] || 0) + total,
+            (errorCode) => 'MY_NEW_ERROR_CODE',
+        );
+
+        // One failure of ERROR_CODE_1, and effectively two for ERROR_CODE_2
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id1', 'ERROR_CODE_1'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id2', 'ERROR_CODE_2'));
+        tracker.addDecryptionFailure(new DecryptionFailure('$event_id3', 'ERROR_CODE_3'));
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        tracker.trackFailures();
+
+        expect(counts['MY_NEW_ERROR_CODE'])
+            .toBe(3, 'should track three MY_NEW_ERROR_CODE, got ' + counts['MY_NEW_ERROR_CODE']);
+    });
 });

From 15bd2e157faa4128d78872a8a5fa15e5f9869f35 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 5 Jul 2018 14:55:29 +0100
Subject: [PATCH 545/702] Test everything

---
 test/DecryptionFailureTracker-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index 99922276c5..617c9d5d68 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -38,7 +38,7 @@ function createFailedDecryptionEvent() {
     return event;
 }
 
-describe.only('DecryptionFailureTracker', function() {
+describe('DecryptionFailureTracker', function() {
     it('tracks a failed decryption', function(done) {
         const failedDecryptionEvent = createFailedDecryptionEvent();
 

From 5f2e2efce6afbc6372295986aeb3d9a195987268 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 18:22:05 +0100
Subject: [PATCH 546/702] Revert 8b64ddc for MatrixActionCreators

As it wasn't used in the end
---
 src/actions/MatrixActionCreators.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index d8c315f505..6e1d52a88f 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -183,20 +183,6 @@ function createEventDecryptedAction(matrixClient, event) {
     return { action: 'MatrixActions.Event.decrypted', event };
 }
 
-/**
- * Create a MatrixActions.RoomState.vents action that represents
- * a MatrixClient `RoomState.events` matrix event, emitted when the
- * state events in a room change.
- *
- * @param {MatrixClient} matrixClient the matrix client.
- * @param {MatrixEvent} event matrix event which caused this event to fire.
- * @param {RoomState} state room state whose RoomState.events dictionary was updated.
- * @returns {EventDecryptedAction} an action of type `MatrixActions.Event.decrypted`.
- */
-function createRoomStateEventsAction(matrixClient, event, state) {
-    return { action: 'MatrixActions.RoomState.events', event, state };
-}
-
 /**
  * This object is responsible for dispatching actions when certain events are emitted by
  * the given MatrixClient.
@@ -218,7 +204,6 @@ export default {
         this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
         this._addMatrixClientListener(matrixClient, 'RoomMember.membership', createRoomMembershipAction);
         this._addMatrixClientListener(matrixClient, 'Event.decrypted', createEventDecryptedAction);
-        this._addMatrixClientListener(matrixClient, 'RoomState.events', createRoomStateEventsAction);
     },
 
     /**

From eb552e5cefc39f46ae3429e25d3efd4efbbc877f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 18:43:20 +0100
Subject: [PATCH 547/702] Just pass the roomId into WidgetEchoStore

---
 src/CallHandler.js                       |  2 +-
 src/components/structures/RoomView.js    |  4 ++--
 src/components/views/rooms/AppsDrawer.js |  4 ++--
 src/stores/WidgetEchoStore.js            | 26 ++++++++++++------------
 src/utils/WidgetUtils.js                 |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index abbd407e7f..7529171aa2 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -416,7 +416,7 @@ function _startCallApp(roomId, type) {
 
     const currentRoomWidgets = WidgetUtils.getRoomWidgets(room);
 
-    if (WidgetEchoStore.roomHasPendingWidgetsOfType(room, currentRoomWidgets, 'jitsi')) {
+    if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, 'jitsi')) {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
         Modal.createTrackedDialog('Already have pending Jitsi Widget', '', ErrorDialog, {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5c97b5c29a..1850806520 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -328,9 +328,9 @@ module.exports = React.createClass({
             return false;
         }
 
-        const widgets = WidgetEchoStore.getEchoedRoomWidgets(room, WidgetUtils.getRoomWidgets(room));
+        const widgets = WidgetEchoStore.getEchoedRoomWidgets(room.roomId, WidgetUtils.getRoomWidgets(room));
 
-        return widgets.length > 0 || WidgetEchoStore.roomHasPendingWidgets(room, WidgetUtils.getRoomWidgets(room));
+        return widgets.length > 0 || WidgetEchoStore.roomHasPendingWidgets(room.roomId, WidgetUtils.getRoomWidgets(room));
     },
 
     componentDidMount: function() {
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 64aa8fadc8..cdaa2d2b1a 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -167,7 +167,7 @@ module.exports = React.createClass({
 
     _getApps: function() {
         const widgets = WidgetEchoStore.getEchoedRoomWidgets(
-            this.props.room, WidgetUtils.getRoomWidgets(this.props.room),
+            this.props.room.roomId, WidgetUtils.getRoomWidgets(this.props.room),
         );
         return widgets.map((ev) => {
             return this._initAppConfig(ev.getStateKey(), ev.getContent(), ev.sender);
@@ -260,7 +260,7 @@ module.exports = React.createClass({
         let spinner;
         if (
             apps.length === 0 && WidgetEchoStore.roomHasPendingWidgets(
-                this.props.room,
+                this.props.room.roomId,
                 WidgetUtils.getRoomWidgets(this.props.room),
             )
         ) {
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index f117b37e95..f50d0fd962 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -38,14 +38,14 @@ class WidgetEchoStore extends EventEmitter {
      * and we don't really need the actual widget events anyway since we just want to
      * show a spinner / prevent widgets being added twice.
      *
-     * @param {Room} room The room object to get widgets for
+     * @param {Room} roomId The ID of the room to get widgets for
      * @param {MatrixEvent[]} currentRoomWidgets Current widgets for the room
      * @returns {MatrixEvent[]} List of widgets in the room, minus any pending removal
      */
-    getEchoedRoomWidgets(room, currentRoomWidgets) {
+    getEchoedRoomWidgets(roomId, currentRoomWidgets) {
         const echoedWidgets = [];
 
-        const roomEchoState = Object.assign({}, this._roomWidgetEcho[room.roomId]);
+        const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
 
         for (const w of currentRoomWidgets) {
             const widgetId = w.getStateKey();
@@ -70,8 +70,8 @@ class WidgetEchoStore extends EventEmitter {
         return echoedWidgets;
     }
 
-    roomHasPendingWidgetsOfType(room, currentRoomWidgets, type) {
-        const roomEchoState = Object.assign({}, this._roomWidgetEcho[room.roomId]);
+    roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, type) {
+        const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
         if (roomEchoState === undefined) return false;
 
         for (const w of currentRoomWidgets) {
@@ -88,20 +88,20 @@ class WidgetEchoStore extends EventEmitter {
         }
     }
 
-    roomHasPendingWidgets(room, currentRoomWidgets) {
-        return this.roomHasPendingWidgetsOfType(room, currentRoomWidgets);
+    roomHasPendingWidgets(roomId, currentRoomWidgets) {
+        return this.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets);
     }
 
-    setRoomWidgetEcho(room, widgetId, state) {
-        if (this._roomWidgetEcho[room.roomId] === undefined) this._roomWidgetEcho[room.roomId] = {};
+    setRoomWidgetEcho(roomId, widgetId, state) {
+        if (this._roomWidgetEcho[roomId] === undefined) this._roomWidgetEcho[roomId] = {};
 
-        this._roomWidgetEcho[room.roomId][widgetId] = state;
+        this._roomWidgetEcho[roomId][widgetId] = state;
         this.emit('updateRoomWidgetEcho');
     }
 
-    removeRoomWidgetEcho(room, widgetId) {
-        delete this._roomWidgetEcho[room.roomId][widgetId];
-        if (this._roomWidgetEcho[room.roomId] === {}) delete this._roomWidgetEcho[room.roomId];
+    removeRoomWidgetEcho(roomId, widgetId) {
+        delete this._roomWidgetEcho[roomId][widgetId];
+        if (this._roomWidgetEcho[roomId] === {}) delete this._roomWidgetEcho[roomId];
         this.emit('updateRoomWidgetEcho');
     }
 }
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 4effa21fd6..7bd50d063b 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -255,7 +255,7 @@ export default class WidgetUtils {
         }
 
         const room = MatrixClientPeg.get().getRoom(roomId);
-        WidgetEchoStore.setRoomWidgetEcho(room, widgetId, content);
+        WidgetEchoStore.setRoomWidgetEcho(roomId, widgetId, content);
 
         const client = MatrixClientPeg.get();
         // TODO - Room widgets need to be moved to 'm.widget' state events
@@ -263,7 +263,7 @@ export default class WidgetUtils {
         return client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
             return WidgetUtils.waitForRoomWidget(widgetId, roomId, addingWidget);
         }).finally(() => {
-            WidgetEchoStore.removeRoomWidgetEcho(room, widgetId);
+            WidgetEchoStore.removeRoomWidgetEcho(roomId, widgetId);
         });
     }
 

From 1f2d279a0a8eee0beece47b5e154829de4088398 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 19:38:42 +0100
Subject: [PATCH 548/702] Consistency, redundant check & doc

---
 src/stores/WidgetEchoStore.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index f50d0fd962..3c2f79e951 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -25,6 +25,7 @@ class WidgetEchoStore extends EventEmitter {
         super();
 
         this._roomWidgetEcho = {
+            // Map as below. For widgets that have been deleted locally, the object is empty.
             // roomId: {
             //     widgetId: [object]
             // }
@@ -49,7 +50,7 @@ class WidgetEchoStore extends EventEmitter {
 
         for (const w of currentRoomWidgets) {
             const widgetId = w.getStateKey();
-            if (roomEchoState && roomEchoState[widgetId] && Object.keys(roomEchoState[widgetId]).length === 0) {
+            if (roomEchoState[widgetId] && Object.keys(roomEchoState[widgetId]).length === 0) {
                 // delete locally so don't copy it
             // we don't include widgets that have changed for the same rason we don't include new ones,
             // so fall into the 'else' case and use the old one
@@ -101,7 +102,7 @@ class WidgetEchoStore extends EventEmitter {
 
     removeRoomWidgetEcho(roomId, widgetId) {
         delete this._roomWidgetEcho[roomId][widgetId];
-        if (this._roomWidgetEcho[roomId] === {}) delete this._roomWidgetEcho[roomId];
+        if (Object.keys(this._roomWidgetEcho[roomId]).length === 0) delete this._roomWidgetEcho[roomId];
         this.emit('updateRoomWidgetEcho');
     }
 }

From fb7ce9dd7fb1e8f76d3b905e102faa7568df2b69 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 19:40:45 +0100
Subject: [PATCH 549/702] More doc

---
 src/stores/WidgetEchoStore.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index 3c2f79e951..493eee7181 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -25,7 +25,8 @@ class WidgetEchoStore extends EventEmitter {
         super();
 
         this._roomWidgetEcho = {
-            // Map as below. For widgets that have been deleted locally, the object is empty.
+            // Map as below. Object is the content of the widget state event,
+            // so for widgets that have been deleted locally, the object is empty.
             // roomId: {
             //     widgetId: [object]
             // }

From 7e2b559ccd9ca812d2c6e4955940016d044e067e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 19:46:37 +0100
Subject: [PATCH 550/702] Make if clearer

---
 src/stores/WidgetEchoStore.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index 493eee7181..e4fc6d755a 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -51,12 +51,9 @@ class WidgetEchoStore extends EventEmitter {
 
         for (const w of currentRoomWidgets) {
             const widgetId = w.getStateKey();
-            if (roomEchoState[widgetId] && Object.keys(roomEchoState[widgetId]).length === 0) {
-                // delete locally so don't copy it
-            // we don't include widgets that have changed for the same rason we don't include new ones,
-            // so fall into the 'else' case and use the old one
-            //} else if (roomEchoState && roomEchoState[widgetId]) {
-            //    echoedWidgets.push(roomEchoState[widgetId]);
+            // If there's no echo, or the echo still has a widget present, show the *old* widget
+            // we don't include widgets that have changed for the same rason we don't include new ones
+            if (!roomEchoState[widgetId] || Object.keys(roomEchoState[widgetId]).length !== 0) {
             } else {
                 echoedWidgets.push(w);
             }

From 8c10dc18607df68d0ec21e4932fd3e016330d406 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 19:50:11 +0100
Subject: [PATCH 551/702] Remove unhelpful commented code

---
 src/stores/WidgetEchoStore.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index e4fc6d755a..3d6f03c459 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -60,12 +60,6 @@ class WidgetEchoStore extends EventEmitter {
             delete roomEchoState[widgetId];
         }
 
-        // any remining in roomEchoState are extra that need to be added
-        // We don't do this for the reasons above
-        /*for (const widgetId of Object.keys(roomEchoState)) {
-            echoedWidgets.push(roomEchoState[widgetId]);
-        }*/
-
         return echoedWidgets;
     }
 

From 3f60300983b966a01d5158da4ae30f060f7c481c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 19:51:12 +0100
Subject: [PATCH 552/702] Remove redundant check

---
 src/stores/WidgetEchoStore.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index 3d6f03c459..2710f0a9a1 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -65,7 +65,6 @@ class WidgetEchoStore extends EventEmitter {
 
     roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, type) {
         const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
-        if (roomEchoState === undefined) return false;
 
         for (const w of currentRoomWidgets) {
             const widgetId = w.getStateKey();

From 658ac73064227f21eaf9b3037a3c402ba3846c31 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 19:57:24 +0100
Subject: [PATCH 553/702] comments

---
 src/stores/WidgetEchoStore.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index 2710f0a9a1..cce404662e 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -66,11 +66,14 @@ class WidgetEchoStore extends EventEmitter {
     roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, type) {
         const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
 
+        // any widget IDs that are already in the room are not pending, so
+        // echoes for them don't count as pending.
         for (const w of currentRoomWidgets) {
             const widgetId = w.getStateKey();
             delete roomEchoState[widgetId];
         }
 
+        // if there's anything left then there are pending widgets.
         if (type === undefined) {
             return Object.keys(roomEchoState).length > 0;
         } else {

From c26b300f301c9c414fe9887723c60010e81de77f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 19:58:10 +0100
Subject: [PATCH 554/702] more comments

---
 src/utils/WidgetUtils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 7bd50d063b..cf12a64329 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -22,6 +22,7 @@ import * as url from "url";
 import WidgetEchoStore from '../stores/WidgetEchoStore';
 
 // How long we wait for the state event echo to come back from the server
+// before the promise is rejected
 const WIDGET_WAIT_TIME = 20000;
 
 export default class WidgetUtils {

From 3f20eb96105e4f412b9fdb44228292e4e5ffea79 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 19:58:54 +0100
Subject: [PATCH 555/702] Use more helpful dialog tracking title

---
 src/CallHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 7529171aa2..d61ea93c02 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -419,7 +419,7 @@ function _startCallApp(roomId, type) {
     if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, 'jitsi')) {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
-        Modal.createTrackedDialog('Already have pending Jitsi Widget', '', ErrorDialog, {
+        Modal.createTrackedDialog('Call being placed', '', ErrorDialog, {
             title: _t('Call in Progress'),
             description: _t('A call is currently being placed!'),
         });

From b6f854abe494a33d1f369ca46abb2d48dd3cfa37 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Jul 2018 20:00:42 +0100
Subject: [PATCH 556/702] Simplify event name as it's the only one

---
 src/components/structures/RoomView.js    | 4 ++--
 src/components/views/rooms/AppsDrawer.js | 4 ++--
 src/stores/WidgetEchoStore.js            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 1850806520..6b183c2601 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -155,7 +155,7 @@ module.exports = React.createClass({
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._onRoomViewStoreUpdate(true);
 
-        WidgetEchoStore.on('updateRoomWidgetEcho', this._onWidgetEchoStoreUpdate);
+        WidgetEchoStore.on('update', this._onWidgetEchoStoreUpdate);
     },
 
     _onRoomViewStoreUpdate: function(initial) {
@@ -425,7 +425,7 @@ module.exports = React.createClass({
             this._roomStoreToken.remove();
         }
 
-        WidgetEchoStore.removeListener('updateRoomWidgetEcho', this._onWidgetEchoStoreUpdate);
+        WidgetEchoStore.removeListener('update', this._onWidgetEchoStoreUpdate);
 
         // cancel any pending calls to the rate_limited_funcs
         this._updateRoomMembers.cancelPendingCall();
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index cdaa2d2b1a..3b140729f1 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -58,7 +58,7 @@ module.exports = React.createClass({
     componentWillMount: function() {
         ScalarMessaging.startListening();
         MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
-        WidgetEchoStore.on('updateRoomWidgetEcho', this._updateApps);
+        WidgetEchoStore.on('update', this._updateApps);
     },
 
     componentDidMount: function() {
@@ -84,7 +84,7 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
         }
-        WidgetEchoStore.removeListener('updateRoomWidgetEcho', this._updateApps);
+        WidgetEchoStore.removeListener('update', this._updateApps);
         dis.unregister(this.dispatcherRef);
     },
 
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index cce404662e..f442baee6c 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -91,13 +91,13 @@ class WidgetEchoStore extends EventEmitter {
         if (this._roomWidgetEcho[roomId] === undefined) this._roomWidgetEcho[roomId] = {};
 
         this._roomWidgetEcho[roomId][widgetId] = state;
-        this.emit('updateRoomWidgetEcho');
+        this.emit('update');
     }
 
     removeRoomWidgetEcho(roomId, widgetId) {
         delete this._roomWidgetEcho[roomId][widgetId];
         if (Object.keys(this._roomWidgetEcho[roomId]).length === 0) delete this._roomWidgetEcho[roomId];
-        this.emit('updateRoomWidgetEcho');
+        this.emit('update');
     }
 }
 

From 5af8ddcf107b30ec1583648f4d2e5143aa8df3f1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Jul 2018 11:00:39 +0100
Subject: [PATCH 557/702] Fix import

---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 7150c661ed..e0bbf50d5a 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -23,7 +23,7 @@ import PropTypes from 'prop-types';
 import Matrix from "matrix-js-sdk";
 
 import Analytics from "../../Analytics";
-import DecryptionFailureTracker from "../../DecryptionFailureTracker";
+import { DecryptionFailureTracker } from "../../DecryptionFailureTracker";
 import MatrixClientPeg from "../../MatrixClientPeg";
 import PlatformPeg from "../../PlatformPeg";
 import SdkConfig from "../../SdkConfig";

From a6cff4a96923f99b132d700e9525097e3bbad994 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 10:18:31 +0100
Subject: [PATCH 558/702] Show server bans in the timeline

---
 src/TextForEvent.js                     | 62 +++++++++++++++++++++++++
 src/components/views/rooms/EventTile.js |  1 +
 2 files changed, 63 insertions(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 712150af4d..9a7c1b58ff 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -129,6 +129,67 @@ function textForRoomNameEvent(ev) {
     });
 }
 
+function textForServerACLEvent(ev) {
+    var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    let prev = ev.getPrevContent();
+    let current = ev.getContent();
+    let text = "";
+    let changes = [];
+    if (prev == undefined) {
+        text = `${senderDisplayName} set server ACLs for this room:`;
+        prev = {
+            deny: [],
+            allow: [],
+            allow_ip_literals: true
+        }
+    } else {
+        text = `${senderDisplayName} changed the server ACLs for this room:`
+        if (!Array.isArray(prev.allow)){
+            prev.allow = []
+        }
+    
+        if (!Array.isArray(prev.deny)){
+            prev.deny = []
+        }
+    }
+
+    if (!Array.isArray(current.allow)){
+        current.allow = []
+    }
+
+    if (!Array.isArray(current.deny)){
+        current.deny = []
+    }
+
+    const bannedServers = current.deny.filter((bannedSrv) => !prev.deny.includes(bannedSrv));
+    const unbannedServers = prev.deny.filter((bannedSrv) => !current.deny.includes(bannedSrv));
+    const allowedServers = current.allow.filter((bannedSrv) => !prev.allow.includes(bannedSrv));
+    const unallowedServers = prev.allow.filter((bannedSrv) => !current.allow.includes(bannedSrv));
+
+    if (bannedServers.length > 0) {
+        changes.push(`servers matching ${bannedServers.join(",")} are now banned`);
+    }
+
+    if (unbannedServers.length > 0) {
+        changes.push(`servers matching ${unbannedServers.join(",")} are no longer banned`);
+    }
+
+    if (allowedServers.length > 0) {
+        changes.push(`servers matching ${allowedServers.join(",")} are now allowed`);
+    }
+
+    if (unallowedServers.length > 0) {
+        changes.push(`servers matching ${unallowedServers.join(",")} are no longer allowed`);
+    }
+
+    if (prev.allow_ip_literals !== current.allow_ip_literals) {
+        const allowban = current.allow_ip_literals ? "allowed" : "banned";
+        changes.push(`Participating from a server using ip literals is now ${allowban}`);
+    }
+
+    return text + changes.join("\n");
+}
+
 function textForMessageEvent(ev) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     let message = senderDisplayName + ': ' + ev.getContent().body;
@@ -309,6 +370,7 @@ const stateHandlers = {
     'm.room.encryption': textForEncryptionEvent,
     'm.room.power_levels': textForPowerEvent,
     'm.room.pinned_events': textForPinnedEvent,
+    'm.room.server_acl': textForServerACLEvent,
 
     'im.vector.modular.widgets': textForWidgetEvent,
 };
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 7f376502d7..9ed73c39b1 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -56,6 +56,7 @@ const stateEventTileTypes = {
     'm.room.topic': 'messages.TextualEvent',
     'm.room.power_levels': 'messages.TextualEvent',
     'm.room.pinned_events': 'messages.TextualEvent',
+    'm.room.server_acl' : 'messages.TextualEvent',
 
     'im.vector.modular.widgets': 'messages.TextualEvent',
 };

From 526459a9e06ce4e9beb90c1a4cd5489115ad627f Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 10:19:11 +0100
Subject: [PATCH 559/702] Capitalise

---
 src/TextForEvent.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 9a7c1b58ff..42e065be1c 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -167,19 +167,19 @@ function textForServerACLEvent(ev) {
     const unallowedServers = prev.allow.filter((bannedSrv) => !current.allow.includes(bannedSrv));
 
     if (bannedServers.length > 0) {
-        changes.push(`servers matching ${bannedServers.join(",")} are now banned`);
+        changes.push(`Servers matching ${bannedServers.join(",")} are now banned`);
     }
 
     if (unbannedServers.length > 0) {
-        changes.push(`servers matching ${unbannedServers.join(",")} are no longer banned`);
+        changes.push(`Servers matching ${unbannedServers.join(",")} are no longer banned`);
     }
 
     if (allowedServers.length > 0) {
-        changes.push(`servers matching ${allowedServers.join(",")} are now allowed`);
+        changes.push(`Servers matching ${allowedServers.join(",")} are now allowed`);
     }
 
     if (unallowedServers.length > 0) {
-        changes.push(`servers matching ${unallowedServers.join(",")} are no longer allowed`);
+        changes.push(`Servers matching ${unallowedServers.join(",")} are no longer allowed`);
     }
 
     if (prev.allow_ip_literals !== current.allow_ip_literals) {

From db860441bc875206497153edd25160e9b7d42e22 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Wed, 4 Jul 2018 11:06:49 +0000
Subject: [PATCH 560/702] Translated using Weblate (German)

Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c59e743bd7..5719aed9ff 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -125,7 +125,7 @@
     "Return to login screen": "Zur Anmeldemaske zurückkehren",
     "Room Colour": "Raumfarbe",
     "Room name (optional)": "Raumname (optional)",
-    "Scroll to unread messages": "Zu den ungelesenen Nachrichten scrollen",
+    "Scroll to unread messages": "Zu den ungelesenen Nachrichten springen",
     "Send Invites": "Einladungen senden",
     "Send Reset Email": "E-Mail zum Zurücksetzen senden",
     "Server may be unavailable or overloaded": "Server ist eventuell nicht verfügbar oder überlastet",

From c4d66b6c5684336a2f18b7c5ed68075635e4de64 Mon Sep 17 00:00:00 2001
From: kR <krkkx@protonmail.com>
Date: Wed, 4 Jul 2018 14:50:50 +0000
Subject: [PATCH 561/702] Translated using Weblate (Polish)

Currently translated at 93.6% (1134 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 9fa51294ff..0854255e0b 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1122,5 +1122,15 @@
     "Try the app first": "Najpierw wypróbuj aplikację",
     "Sign in to get started": "Zaloguj się, aby rozpocząć",
     "Notify the whole room": "Powiadom cały pokój",
-    "Room Notification": "Powiadomienia pokoju"
+    "Room Notification": "Powiadomienia pokoju",
+    "Call Anyway": "Zadzwoń mimo to",
+    "Answer Anyway": "Odpowiedz mimo to",
+    "Demote yourself?": "Zdegradować siebie?",
+    "Demote": "Zdegraduj",
+    "Hide Stickers": "Ukryj Naklejki",
+    "Show Stickers": "Pokaż Naklejki",
+    "The email field must not be blank.": "Pole email 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."
 }

From 8b9fd7ddcb230271cd8b97187a7578289319f131 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 15:31:21 +0100
Subject: [PATCH 562/702] Clean up rules.

---
 src/TextForEvent.js | 49 ++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 42e065be1c..7368d0577b 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -131,26 +131,19 @@ function textForRoomNameEvent(ev) {
 
 function textForServerACLEvent(ev) {
     var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    let prev = ev.getPrevContent();
+    let prev_content = ev.getPrevContent();
     let current = ev.getContent();
     let text = "";
     let changes = [];
-    if (prev == undefined) {
-        text = `${senderDisplayName} set server ACLs for this room:`;
-        prev = {
-            deny: [],
-            allow: [],
-            allow_ip_literals: true
-        }
+    let prev = {
+        deny: Array.isArray(prev_content.deny) ? prev_content.deny : [],
+        allow: Array.isArray(prev_content.allow) ? prev_content.allow : [],
+        allow_ip_literals: !(prev_content.allow_ip_literals === false)
+    }
+    if (prev.deny.length === 0 && prev.allow.length === 0) {
+        text = `${senderDisplayName} set server ACLs for this room: `;
     } else {
-        text = `${senderDisplayName} changed the server ACLs for this room:`
-        if (!Array.isArray(prev.allow)){
-            prev.allow = []
-        }
-    
-        if (!Array.isArray(prev.deny)){
-            prev.deny = []
-        }
+        text = `${senderDisplayName} changed the server ACLs for this room: `;
     }
 
     if (!Array.isArray(current.allow)){
@@ -161,30 +154,36 @@ function textForServerACLEvent(ev) {
         current.deny = []
     }
 
-    const bannedServers = current.deny.filter((bannedSrv) => !prev.deny.includes(bannedSrv));
-    const unbannedServers = prev.deny.filter((bannedSrv) => !current.deny.includes(bannedSrv));
-    const allowedServers = current.allow.filter((bannedSrv) => !prev.allow.includes(bannedSrv));
-    const unallowedServers = prev.allow.filter((bannedSrv) => !current.allow.includes(bannedSrv));
+    const bannedServers = current.deny.filter((srv) => typeof(srv) === 'string' && !prev.deny.includes(srv));
+    const unbannedServers = prev.deny.filter((srv) => typeof(srv) === 'string' && !current.deny.includes(srv));
+    const allowedServers = current.allow.filter((srv) => typeof(srv) === 'string' && !prev.allow.includes(srv));
+    const unallowedServers = prev.allow.filter((srv) => typeof(srv) === 'string' && !current.allow.includes(srv));
+
+    console.log(bannedServers,unbannedServers,allowedServers,unallowedServers);
 
     if (bannedServers.length > 0) {
-        changes.push(`Servers matching ${bannedServers.join(",")} are now banned`);
+        changes.push(`Servers matching ${bannedServers.join(",")} are now banned.`);
     }
 
     if (unbannedServers.length > 0) {
-        changes.push(`Servers matching ${unbannedServers.join(",")} are no longer banned`);
+        changes.push(`Servers matching ${unbannedServers.join(",")} were removed from the ban list.`);
     }
 
     if (allowedServers.length > 0) {
-        changes.push(`Servers matching ${allowedServers.join(",")} are now allowed`);
+        changes.push(`Servers matching ${allowedServers.join(",")} are now allowed.`);
     }
 
     if (unallowedServers.length > 0) {
-        changes.push(`Servers matching ${unallowedServers.join(",")} are no longer allowed`);
+        changes.push(`Servers matching ${unallowedServers.join(",")} were removed from the allowed list.`);
     }
 
     if (prev.allow_ip_literals !== current.allow_ip_literals) {
         const allowban = current.allow_ip_literals ? "allowed" : "banned";
-        changes.push(`Participating from a server using ip literals is now ${allowban}`);
+        changes.push(`Participating from a server using an IP literal hostname is now ${allowban}.`);
+    }
+
+    if (current.allow.length  === 0) {
+        changes = ["Everyone is banned! 🎉"];
     }
 
     return text + changes.join("\n");

From 467423e0b448ae93128aa64bb769760d3120133c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 Jul 2018 15:44:09 +0100
Subject: [PATCH 563/702] js-sdk rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c762bed311..ec82512ec9 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.5",
+    "matrix-js-sdk": "0.10.6-rc.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 584adc35ef55679d8d11d94ee8422273d7dacdeb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 Jul 2018 15:52:10 +0100
Subject: [PATCH 564/702] Prepare changelog for v0.12.9-rc.2

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2164110c45..395bee9079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+Changes in [0.12.9-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.9-rc.2) (2018-07-06)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.9-rc.1...v0.12.9-rc.2)
+
+ * Implement aggregation by error type for tracked decryption failures
+   [\#2045](https://github.com/matrix-org/matrix-react-sdk/pull/2045)
+ * make new hiding of roomsublist behaviour opt-in
+   [\#2044](https://github.com/matrix-org/matrix-react-sdk/pull/2044)
+ * Implement aggregation by error type for tracked decryption failures
+   [\#2043](https://github.com/matrix-org/matrix-react-sdk/pull/2043)
+ * make new hiding of roomsublist behaviour opt-in
+   [\#2030](https://github.com/matrix-org/matrix-react-sdk/pull/2030)
+
 Changes in [0.12.9-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.9-rc.1) (2018-07-04)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.8...v0.12.9-rc.1)

From 64542da7cb2df76762b455dcdc5b03a65575f512 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 Jul 2018 15:52:10 +0100
Subject: [PATCH 565/702] v0.12.9-rc.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ec82512ec9..6a53a50a95 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.9-rc.1",
+  "version": "0.12.9-rc.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 12ce7839f3efb7cceb13647304ba92a37d72d157 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 16:36:26 +0100
Subject: [PATCH 566/702] Const things

---
 src/TextForEvent.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 7368d0577b..6fb9aa0d7b 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -130,11 +130,11 @@ function textForRoomNameEvent(ev) {
 }
 
 function textForServerACLEvent(ev) {
-    var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    let prev_content = ev.getPrevContent();
-    let current = ev.getContent();
+    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+    const prev_content = ev.getPrevContent();
+    const changes = [];
     let text = "";
-    let changes = [];
+    let current = ev.getContent();
     let prev = {
         deny: Array.isArray(prev_content.deny) ? prev_content.deny : [],
         allow: Array.isArray(prev_content.allow) ? prev_content.allow : [],

From 1ca164f1a9699ebff180e39599fa05cf3b38f6bf Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 16:36:44 +0100
Subject: [PATCH 567/702] Change all ban message and move further up

---
 src/TextForEvent.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 6fb9aa0d7b..5d4c14d1b2 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -146,6 +146,11 @@ function textForServerACLEvent(ev) {
         text = `${senderDisplayName} changed the server ACLs for this room: `;
     }
 
+    /* If we know for sure everyone is banned, don't bother showing the diff view */
+    if (current.allow.length  === 0) {
+        return text + "🎉 All servers are banned from participating! This room can no longer be used.";
+    }
+
     if (!Array.isArray(current.allow)){
         current.allow = []
     }
@@ -182,11 +187,6 @@ function textForServerACLEvent(ev) {
         changes.push(`Participating from a server using an IP literal hostname is now ${allowban}.`);
     }
 
-    if (current.allow.length  === 0) {
-        changes = ["Everyone is banned! 🎉"];
-    }
-
-    return text + changes.join("\n");
 }
 
 function textForMessageEvent(ev) {

From 1db803ccfcfe82be0c47fc0db216ae77864aa236 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 16:37:40 +0100
Subject: [PATCH 568/702] "/n" -> " "

---
 src/TextForEvent.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 5d4c14d1b2..f2ddae0e0a 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -187,6 +187,7 @@ function textForServerACLEvent(ev) {
         changes.push(`Participating from a server using an IP literal hostname is now ${allowban}.`);
     }
 
+    return text + changes.join(" ");
 }
 
 function textForMessageEvent(ev) {

From 52b1d946be0b599a2023f395c23a15eab00074b1 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 16:37:52 +0100
Subject: [PATCH 569/702] Remove unused console.log

---
 src/TextForEvent.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index f2ddae0e0a..cc8f48b2e0 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -164,8 +164,6 @@ function textForServerACLEvent(ev) {
     const allowedServers = current.allow.filter((srv) => typeof(srv) === 'string' && !prev.allow.includes(srv));
     const unallowedServers = prev.allow.filter((srv) => typeof(srv) === 'string' && !current.allow.includes(srv));
 
-    console.log(bannedServers,unbannedServers,allowedServers,unallowedServers);
-
     if (bannedServers.length > 0) {
         changes.push(`Servers matching ${bannedServers.join(",")} are now banned.`);
     }

From 9a4075c6370f087394eb26383c3e4cbdef95ca00 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 16:38:04 +0100
Subject: [PATCH 570/702] Semicolons

---
 src/TextForEvent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index cc8f48b2e0..bf8d09b06c 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -152,11 +152,11 @@ function textForServerACLEvent(ev) {
     }
 
     if (!Array.isArray(current.allow)){
-        current.allow = []
+        current.allow = [];
     }
 
     if (!Array.isArray(current.deny)){
-        current.deny = []
+        current.deny = [];
     }
 
     const bannedServers = current.deny.filter((srv) => typeof(srv) === 'string' && !prev.deny.includes(srv));

From 83221da7d7cdb5895519393f469a5d43ca5103da Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 16:54:28 +0100
Subject: [PATCH 571/702] Delint

---
 src/TextForEvent.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index bf8d09b06c..2be4e590ec 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -131,15 +131,15 @@ function textForRoomNameEvent(ev) {
 
 function textForServerACLEvent(ev) {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    const prev_content = ev.getPrevContent();
+    const prevContent = ev.getPrevContent();
     const changes = [];
+    const current = ev.getContent();
+    const prev = {
+        deny: Array.isArray(prevContent.deny) ? prevContent.deny : [],
+        allow: Array.isArray(prevContent.allow) ? prevContent.allow : [],
+        allow_ip_literals: !(prevContent.allow_ip_literals === false),
+    };
     let text = "";
-    let current = ev.getContent();
-    let prev = {
-        deny: Array.isArray(prev_content.deny) ? prev_content.deny : [],
-        allow: Array.isArray(prev_content.allow) ? prev_content.allow : [],
-        allow_ip_literals: !(prev_content.allow_ip_literals === false)
-    }
     if (prev.deny.length === 0 && prev.allow.length === 0) {
         text = `${senderDisplayName} set server ACLs for this room: `;
     } else {
@@ -147,15 +147,15 @@ function textForServerACLEvent(ev) {
     }
 
     /* If we know for sure everyone is banned, don't bother showing the diff view */
-    if (current.allow.length  === 0) {
+    if (current.allow.length === 0) {
         return text + "🎉 All servers are banned from participating! This room can no longer be used.";
     }
 
-    if (!Array.isArray(current.allow)){
+    if (!Array.isArray(current.allow)) {
         current.allow = [];
     }
 
-    if (!Array.isArray(current.deny)){
+    if (!Array.isArray(current.deny)) {
         current.deny = [];
     }
 

From 4044185cddcc51e662e6bb4608e23106047c20ee Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Fri, 6 Jul 2018 19:17:01 +0100
Subject: [PATCH 572/702] add space after commas

---
 src/TextForEvent.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 2be4e590ec..1f4fc68b07 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -165,19 +165,19 @@ function textForServerACLEvent(ev) {
     const unallowedServers = prev.allow.filter((srv) => typeof(srv) === 'string' && !current.allow.includes(srv));
 
     if (bannedServers.length > 0) {
-        changes.push(`Servers matching ${bannedServers.join(",")} are now banned.`);
+        changes.push(`Servers matching ${bannedServers.join(", ")} are now banned.`);
     }
 
     if (unbannedServers.length > 0) {
-        changes.push(`Servers matching ${unbannedServers.join(",")} were removed from the ban list.`);
+        changes.push(`Servers matching ${unbannedServers.join(", ")} were removed from the ban list.`);
     }
 
     if (allowedServers.length > 0) {
-        changes.push(`Servers matching ${allowedServers.join(",")} are now allowed.`);
+        changes.push(`Servers matching ${allowedServers.join(", ")} are now allowed.`);
     }
 
     if (unallowedServers.length > 0) {
-        changes.push(`Servers matching ${unallowedServers.join(",")} were removed from the allowed list.`);
+        changes.push(`Servers matching ${unallowedServers.join(", ")} were removed from the allowed list.`);
     }
 
     if (prev.allow_ip_literals !== current.allow_ip_literals) {

From 6e1f62d16a4aa619f6ff842e6e71cb928dcd4be0 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 6 Jul 2018 20:22:37 +0100
Subject: [PATCH 573/702] Fix stuff

---
 src/TextForEvent.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 1f4fc68b07..15c67526d9 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -146,15 +146,14 @@ function textForServerACLEvent(ev) {
         text = `${senderDisplayName} changed the server ACLs for this room: `;
     }
 
+    if (!Array.isArray(current.allow)) {
+        current.allow = [];
+    }
     /* If we know for sure everyone is banned, don't bother showing the diff view */
     if (current.allow.length === 0) {
         return text + "🎉 All servers are banned from participating! This room can no longer be used.";
     }
 
-    if (!Array.isArray(current.allow)) {
-        current.allow = [];
-    }
-
     if (!Array.isArray(current.deny)) {
         current.deny = [];
     }

From 0f1ae2b48d5d123d572b5816e5f2f9bb8f402c00 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 8 Jul 2018 08:54:48 +0000
Subject: [PATCH 574/702] Translated using Weblate (Basque)

Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9d46758420..f0d1c4fff2 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1206,5 +1206,8 @@
     "Call in Progress": "Deia abian",
     "A call is already in progress!": "Badago dei bat abian!",
     "You have no historical rooms": "Ez duzu gelen historialik",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Ezin duzu mezurik bidali <consentLink>gure termino eta baldintzak</consentLink> irakurri eta onartu arte."
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Ezin duzu mezurik bidali <consentLink>gure termino eta baldintzak</consentLink> irakurri eta onartu arte.",
+    "Show empty room list headings": "Erakutsi gela hutsen zerrenda-goiburuak",
+    "Demote yourself?": "Jaitsi zure burua mailaz?",
+    "Demote": "Jaitzi mailaz"
 }

From 6245d7858443c91a290af4ee1916ec79b1fb7709 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 9 Jul 2018 13:08:28 +0100
Subject: [PATCH 575/702] Released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6a53a50a95..c1524ebc91 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.6-rc.1",
+    "matrix-js-sdk": "0.10.6",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 788955aa348595cffecc97fb01b3521616b7aed7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 9 Jul 2018 13:11:01 +0100
Subject: [PATCH 576/702] Prepare changelog for v0.12.9

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 395bee9079..5e35c20d79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.12.9](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.9) (2018-07-09)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.9-rc.2...v0.12.9)
+
+ * No changes since rc.1
+
 Changes in [0.12.9-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.9-rc.2) (2018-07-06)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.9-rc.1...v0.12.9-rc.2)

From 487e3cb98822313b827fbee72008c230042d7ad3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 9 Jul 2018 13:11:02 +0100
Subject: [PATCH 577/702] v0.12.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c1524ebc91..8c0ec922f2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.9-rc.2",
+  "version": "0.12.9",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From c6837af398fcddfc8a409962ebb29ccb73ed5995 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 3 Jul 2018 21:36:31 +0100
Subject: [PATCH 578/702] import-type Change from slate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 85ed499)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index eed6b18aa4..f5b22fd481 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -22,6 +22,7 @@ import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 import { Editor } from 'slate-react';
 import { getEventTransfer } from 'slate-react';
 import { Value, Document, Event, Block, Inline, Text, Range, Node } from 'slate';
+import type { Change } from 'slate';
 
 import Html from 'slate-html-serializer';
 import Md from 'slate-md-serializer';

From 372fa29ad31820b8a96c221bffb222634310cfd9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 3 Jul 2018 23:36:59 +0100
Subject: [PATCH 579/702] take edge into consideration when moving focus region
 on arrow keys fixes: >Pressing right when the caret is immediately left of
 some entity (pill, emojione emoji, etc..) causes the caret to jump to the
 left of the next entity (or end of the message if there are no more entities)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0982617)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f5b22fd481..7ccee3ab16 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -449,13 +449,13 @@ export default class MessageComposerInput extends React.Component {
         if (this.direction !== '') {
             const focusedNode = editorState.focusInline || editorState.focusText;
             if (focusedNode.isVoid) {
+                const edge = this.direction === 'Previous' ? 'End' : 'Start';
                 if (editorState.isCollapsed) {
-                    change = change[`collapseToEndOf${ this.direction }Text`]();
-                }
-                else {
+                    change = change[`collapseTo${ edge }Of${ this.direction }Text`]();
+                } else {
                     const block = this.direction === 'Previous' ? editorState.previousText : editorState.nextText;
                     if (block) {
-                        change = change.moveFocusToEndOf(block)
+                        change = change[`moveFocusTo${ edge }Of`](block);
                     }
                 }
                 editorState = change.value;

From 483116fb0382d6e8710c9ea54e23e59e8c4ac232 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Jul 2018 00:04:56 +0100
Subject: [PATCH 580/702] add rule to slate-md-serializer: make underlined and
 removed work for CM

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b521efd)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 7ccee3ab16..6f2568d3b3 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -178,17 +178,27 @@ export default class MessageComposerInput extends React.Component {
             rules: [
                 {
                     serialize: (obj, children) => {
-                        if (obj.object === 'inline') {
-                            switch (obj.type) {
-                                case 'pill':
-                                    return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
-                                case 'emoji':
-                                    return obj.data.get('emojiUnicode');
-                            }
+                        if (obj.object !== 'inline') return;
+                        switch (obj.type) {
+                            case 'pill':
+                                return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
+                            case 'emoji':
+                                return obj.data.get('emojiUnicode');
                         }
-                    }
-                }
-            ]
+                    },
+                }, {
+                    serialize: (obj, children) => {
+                        if (obj.object !== 'mark') return;
+                        // XXX: slate-md-serializer consumes marks other than bold, italic, code, inserted, deleted
+                        switch (obj.type) {
+                            case 'underlined':
+                                return `<u>${ children }</u>`;
+                            case 'deleted':
+                                return `<del>${ children }</del>`;
+                        }
+                    },
+                },
+            ],
         });
 
         this.html = new Html({
@@ -633,6 +643,7 @@ export default class MessageComposerInput extends React.Component {
         // FIXME: this conversion loses pills (turning them into pure MD links).
         // We need to add a pill-aware deserialize method
         // to PlainWithPillsSerializer which recognises pills in raw MD and turns them into pills.
+        debugger;
         return Plain.deserialize(
             // FIXME: we compile the MD out of the RTE state using slate-md-serializer
             // which doesn't roundtrip symmetrically with commonmark, which we use for
@@ -688,7 +699,7 @@ export default class MessageComposerInput extends React.Component {
         return editorState.blocks.some(node => node.type == type)
     };
 
-    onKeyDown = (ev: Event, change: Change, editor: Editor) => {
+    onKeyDown = (ev: KeyboardEvent, change: Change, editor: Editor) => {
 
         this.suppressAutoComplete = false;
 
@@ -732,12 +743,21 @@ export default class MessageComposerInput extends React.Component {
                 return this.onTab(ev);
             case KeyCode.ESCAPE:
                 return this.onEscape(ev);
+            case KeyCode.SPACE:
+                return this.onSpace(ev, change);
             default:
                 // don't intercept it
                 return;
         }
     };
 
+    onSpace = (ev: KeyboardEvent, change: Change): Change => {
+        // drop a point in history so the user can undo a word
+        // XXX: this seems nasty but adding to history manually seems a no-go
+        ev.preventDefault();
+        return change.setOperationFlag("skip", false).setOperationFlag("merge", false).insertText(ev.key);
+    };
+
     onBackspace = (ev: Event, change: Change): Change => {
         if (ev.ctrlKey || ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
             return;

From faf17f06c6114cfd78e6573fb908654faac6cf42 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Jul 2018 00:15:36 +0100
Subject: [PATCH 581/702] remove debugger statement

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b6f7940)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 6f2568d3b3..67602e5f4a 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -643,7 +643,6 @@ export default class MessageComposerInput extends React.Component {
         // FIXME: this conversion loses pills (turning them into pure MD links).
         // We need to add a pill-aware deserialize method
         // to PlainWithPillsSerializer which recognises pills in raw MD and turns them into pills.
-        debugger;
         return Plain.deserialize(
             // FIXME: we compile the MD out of the RTE state using slate-md-serializer
             // which doesn't roundtrip symmetrically with commonmark, which we use for

From 43204ea1772e258efd70b74e81b5fffd36ee4e52 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Jul 2018 10:17:05 +0100
Subject: [PATCH 582/702] fix Control-Backspace after select-all

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0f32ec0)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 67602e5f4a..dc7cbf0b34 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -713,22 +713,6 @@ export default class MessageComposerInput extends React.Component {
             this.direction = '';
         }
 
-        if (isOnlyCtrlOrCmdKeyEvent(ev)) {
-            const ctrlCmdCommand = {
-                // C-m => Toggles between rich text and markdown modes
-                [KeyCode.KEY_M]: 'toggle-mode',
-                [KeyCode.KEY_B]: 'bold',
-                [KeyCode.KEY_I]: 'italic',
-                [KeyCode.KEY_U]: 'underlined',
-                [KeyCode.KEY_J]: 'inline-code',
-            }[ev.keyCode];
-
-            if (ctrlCmdCommand) {
-                return this.handleKeyCommand(ctrlCmdCommand);
-            }
-            return;
-        }
-
         switch (ev.keyCode) {
             case KeyCode.ENTER:
                 return this.handleReturn(ev, change);
@@ -744,9 +728,21 @@ export default class MessageComposerInput extends React.Component {
                 return this.onEscape(ev);
             case KeyCode.SPACE:
                 return this.onSpace(ev, change);
-            default:
-                // don't intercept it
-                return;
+        }
+
+        if (isOnlyCtrlOrCmdKeyEvent(ev)) {
+            const ctrlCmdCommand = {
+                // C-m => Toggles between rich text and markdown modes
+                [KeyCode.KEY_M]: 'toggle-mode',
+                [KeyCode.KEY_B]: 'bold',
+                [KeyCode.KEY_I]: 'italic',
+                [KeyCode.KEY_U]: 'underlined',
+                [KeyCode.KEY_J]: 'inline-code',
+            }[ev.keyCode];
+
+            if (ctrlCmdCommand) {
+                return this.handleKeyCommand(ctrlCmdCommand);
+            }
         }
     };
 
@@ -757,15 +753,22 @@ export default class MessageComposerInput extends React.Component {
         return change.setOperationFlag("skip", false).setOperationFlag("merge", false).insertText(ev.key);
     };
 
-    onBackspace = (ev: Event, change: Change): Change => {
-        if (ev.ctrlKey || ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
+    onBackspace = (ev: KeyboardEvent, change: Change): Change => {
+        if (ev.metaKey || ev.altKey || ev.shiftKey) {
             return;
         }
 
+        const { editorState } = this.state;
+
+        // Allow Ctrl/Cmd-Backspace when focus starts at the start of the composer (e.g select-all)
+        // for some reason if slate sees you Ctrl-backspace and your anchorOffset=0 it just resets your focus
+        if (!editorState.isCollapsed && editorState.anchorOffset === 0) {
+            return change.delete();
+        }
+
         if (this.state.isRichTextEnabled) {
             // let backspace exit lists
             const isList = this.hasBlock('list-item');
-            const { editorState } = this.state;
 
             if (isList && editorState.anchorOffset == 0) {
                 change

From 5b74c615ae8c8cfb4693795695e76c5bde9e05cc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Jul 2018 10:54:38 +0100
Subject: [PATCH 583/702] add missing import

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 47b6099)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index dc7cbf0b34..3ef10ca79e 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -55,7 +55,7 @@ import Markdown from '../../../Markdown';
 import ComposerHistoryManager from '../../../ComposerHistoryManager';
 import MessageComposerStore from '../../../stores/MessageComposerStore';
 
-import {MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-matrix';
+import {MATRIXTO_MD_LINK_PATTERN, MATRIXTO_URL_PATTERN} from '../../../linkify-matrix';
 const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g');
 
 import {asciiRegexp, unicodeRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort, toShort} from 'emojione';

From 5bd4104c9650434b87cffbf2681793551dd62ea7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Jul 2018 12:16:11 +0100
Subject: [PATCH 584/702] modify ComposerHistoryManager

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit d139dd6)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/ComposerHistoryManager.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index e78fbcdc3b..0164e6c4cd 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -51,8 +51,8 @@ class HistoryItem {
 export default class ComposerHistoryManager {
     history: Array<HistoryItem> = [];
     prefix: string;
-    lastIndex: number = 0;
-    currentIndex: number = 0;
+    lastIndex: number = 0; // used for indexing the storage
+    currentIndex: number = 0; // used for indexing the loaded validated history Array
 
     constructor(roomId: string, prefix: string = 'mx_composer_history_') {
         this.prefix = prefix + roomId;
@@ -69,18 +69,19 @@ export default class ComposerHistoryManager {
             }
         }
         this.lastIndex = this.currentIndex;
+        // reset currentIndex to account for any unserialisable history
+        this.currentIndex = this.history.length;
     }
 
     save(value: Value, format: MessageFormat) {
         const item = new HistoryItem(value, format);
         this.history.push(item);
-        this.currentIndex = this.lastIndex + 1;
+        this.currentIndex = this.history.length;
         sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item.toJSON()));
     }
 
     getItem(offset: number): ?HistoryItem {
-        this.currentIndex = _clamp(this.currentIndex + offset, 0, this.lastIndex - 1);
-        const item = this.history[this.currentIndex];
-        return item;
+        this.currentIndex = _clamp(this.currentIndex + offset, 0, this.history.length - 1);
+        return this.history[this.currentIndex];
     }
 }

From 8665f10f275f5b735e180fa781de53af801149ee Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 8 Jul 2018 23:08:02 +0100
Subject: [PATCH 585/702] pin slate to 0.33.4 to avoid
 https://github.com/ianstormtaylor/slate/pull/1958

(cherry picked from commit 445faca)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d639a4e51c..661febf6af 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^15.6.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
-    "slate": "^0.33.4",
+    "slate": "0.33.4",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
     "slate-md-serializer": "matrix-org/slate-md-serializer#f7c4ad3",

From 83f26149197b17ba3af77ec5b0263c16d6da6f3e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Jul 2018 00:51:48 +0100
Subject: [PATCH 586/702] add guide to slate's data formats and how we convert

(cherry picked from commit e7e4ee8)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 docs/slate-formats.md | 88 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 docs/slate-formats.md

diff --git a/docs/slate-formats.md b/docs/slate-formats.md
new file mode 100644
index 0000000000..b526109c1b
--- /dev/null
+++ b/docs/slate-formats.md
@@ -0,0 +1,88 @@
+Guide to data types used by the Slate-based Rich Text Editor
+------------------------------------------------------------
+
+We always store the Slate editor state in its Value form.
+
+The schema for the Value is the same whether the editor is in MD or rich text mode, and is currently (rather arbitrarily)
+dictated by the schema expected by slate-md-serializer, simply because it was the only bit of the pipeline which
+has opinions on the schema. (slate-html-serializer lets you define how to serialize whatever schema you like).
+
+The BLOCK_TAGS and MARK_TAGS give the mapping from HTML tags to the schema's node types (for blocks, which describe
+block content like divs, and marks, which describe inline formatted sections like spans).
+
+We use <p/> as the parent tag for the message (XXX: although some tags are technically not allowed to be nested within p's)
+
+Various conversions are performed as content is moved between HTML, MD, and plaintext representations of HTML and MD.
+
+The primitives used are:
+
+ * Markdown.js - models commonmark-formatted MD strings (as entered by the composer in MD mode)
+   * toHtml() - renders them to HTML suitable for sending on the wire
+   * isPlainText() - checks whether the parsed MD contains anything other than simple text.
+   * toPlainText() - renders MD to plain text in order to remove backslashes.  Only works if the MD is already plaintext (otherwise it just emits HTML)
+
+ * slate-html-serializer
+   * converts Values to HTML (serialising) using our schema rules
+   * converts HTML to Values (deserialising) using our schema rules
+
+ * slate-md-serializer
+   * converts rich Values to MD strings (serialising) but using a non-commonmark generic MD dialect.
+   * This should use commonmark, but we use the serializer here for expedience rather than writing a commonmark one.
+
+ * slate-plain-serializer
+  * converts Values to plain text strings (serialising them) by concatenating the strings together
+  * converts Values from plain text strings (deserialiasing them).
+  * Used to initialise the editor by deserializing "" into a Value. Apparently this is the idiomatic way to initialise a blank editor.
+  * Used (as a bodge) to turn a rich text editor into a MD editor, when deserialising the converted MD string of the editor into a value
+
+ * PlainWithPillsSerializer
+  * A fork of slate-plain-serializer which is aware of Pills (hence the name) and Emoji.
+  * It can be configured to output Pills as:
+    * "plain": Pills are rendered via their 'completion' text - e.g. 'Matthew'; used for sending messages)
+    * "md": Pills are rendered as MD, e.g. [Matthew](https://matrix.to/#/@matthew:matrix.org) )
+    * "id": Pills are rendered as IDs, e.g. '@matthew:matrix.org' (used for authoring / commands)
+  * Emoji nodes are converted to inline utf8 emoji.
+
+The actual conversion transitions are:
+
+ * Quoting:
+   * The message being quoted is taken as HTML
+   * ...and deserialised into a Value
+   * ...and then serialised into MD via slate-md-serializer if the editor is in MD mode
+
+ * Roundtripping between MD and rich text editor mode
+   * From MD to richtext (mdToRichEditorState):
+     * Serialise the MD-format Value to a MD string (converting pills to MD) with PlainWithPillsSerializer in 'md' mode
+     * Convert that MD string to HTML via Markdown.js
+     * Deserialise that Value to HTML via slate-html-serializer
+   * From richtext to MD (richToMdEditorState):
+     * Serialise the richtext-format Value to a MD string with slate-md-serializer (XXX: this should use commonmark)
+     * Deserialise that to a plain text value via slate-plain-serializer
+
+ * Loading history in one format into an editor which is in the other format
+   * Uses the same functions as for roundtripping
+
+ * Scanning the editor for a slash command
+   * If the editor is a single line node starting with /, then serialize it to a string with PlainWithPillsSerializer in 'id' mode
+     So that pills get converted to IDs suitable for commands being passed around
+
+ * Sending messages
+   * In RT mode:
+     * If there is rich content, serialize the RT-format Value to HTML body via slate-html-serializer
+     * Serialize the RT-format Value to the plain text fallback via PlainWithPillsSerializer in 'plain' mode
+   * In MD mode:
+     * Serialize the MD-format Value into an MD string with PlainWithPillsSerializer in 'md' mode
+     * Parse the string with Markdown.js
+     * If it contains no formatting:
+       * Send as plaintext (as taken from Markdown.toPlainText())
+     * Otherwise
+       * Send as HTML (as taken from Markdown.toHtml())
+       * Serialize the RT-format Value to the plain text fallback via PlainWithPillsSerializer in 'plain' mode
+
+ * Pasting HTML
+   * Deserialize HTML to a RT Value via slate-html-serializer
+   * In RT mode, insert it straight into the editor as a fragment
+   * In MD mode, serialise it to an MD string via slate-md-serializer and then insert the string into the editor as a fragment.
+
+The various scenarios and transitions could be drawn into a pretty diagram if one felt the urge, but hopefully the enough
+gives sufficient detail on how it's all meant to work.
\ No newline at end of file

From 021409aafe176d9783e5234f649e8f0414f6cd43 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Jul 2018 00:52:27 +0100
Subject: [PATCH 587/702] apply review feedback from @lukebarnard1

(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js                              | 36 -------
 src/Markdown.js                               |  8 --
 src/autocomplete/Autocompleter.js             |  6 +-
 src/autocomplete/UserProvider.js              |  2 +-
 .../views/rooms/MessageComposerInput.js       | 94 ++++++-------------
 .../views/rooms/MessageComposerInput-test.js  |  8 +-
 6 files changed, 38 insertions(+), 116 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index ccfecb8081..09ce1187d5 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -112,42 +112,6 @@ export function charactersToImageNode(alt, useSvg, ...unicode) {
     />;
 }
 
-/*
-export function processHtmlForSending(html: string): string {
-    const contentDiv = document.createElement('div');
-    contentDiv.innerHTML = html;
-
-    if (contentDiv.children.length === 0) {
-        return contentDiv.innerHTML;
-    }
-
-    let contentHTML = "";
-    for (let i=0; i < contentDiv.children.length; i++) {
-        const element = contentDiv.children[i];
-        if (element.tagName.toLowerCase() === 'p') {
-            contentHTML += element.innerHTML;
-            // Don't add a <br /> for the last <p>
-            if (i !== contentDiv.children.length - 1) {
-                contentHTML += '<br />';
-            }
-        } else if (element.tagName.toLowerCase() === 'pre') {
-            // Replace "<br>\n" with "\n" within `<pre>` tags because the <br> is
-            // redundant. This is a workaround for a bug in draft-js-export-html:
-            //   https://github.com/sstur/draft-js-export-html/issues/62
-            contentHTML += '<pre>' +
-                element.innerHTML.replace(/<br>\n/g, '\n').trim() +
-                '</pre>';
-        } else {
-            const temp = document.createElement('div');
-            temp.appendChild(element.cloneNode(true));
-            contentHTML += temp.innerHTML;
-        }
-    }
-
-    return contentHTML;
-}
-*/
-
 /*
  * Given an untrusted HTML string, return a React node with an sanitized version
  * of that HTML.
diff --git a/src/Markdown.js b/src/Markdown.js
index 9d9a8621c9..dc0d5962fd 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -180,14 +180,6 @@ export default class Markdown {
             if (is_multi_line(node) && node.next) this.lit('\n\n');
         };
 
-        // convert MD links into console-friendly ' < http://foo >' style links
-        // ...except given this function never gets called with links, it's useless.
-        // renderer.link = function(node, entering) {
-        //     if (!entering) {
-        //         this.lit(` < ${node.destination} >`);
-        //     }
-        // };
-
         return renderer.render(this.parsed);
     }
 }
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index b3c20a713c..7f91676cc3 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -29,9 +29,9 @@ import NotifProvider from './NotifProvider';
 import Promise from 'bluebird';
 
 export type SelectionRange = {
-    beginning: boolean,
-    start: number,
-    end: number
+    beginning: boolean, // whether the selection is in the first block of the editor or not
+    start: number, // byte offset relative to the start anchor of the current editor selection.
+    end: number, // byte offset relative to the end anchor of the current editor selection.
 };
 
 export type Completion = {
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 156aac2eb8..7998337e2e 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -111,7 +111,7 @@ export default class UserProvider extends AutocompleteProvider {
                     // relies on the length of the entity === length of the text in the decoration.
                     completion: user.rawDisplayName.replace(' (IRC)', ''),
                     completionId: user.userId,
-                    suffix: (selection.beginning && range.start === 0) ? ': ' : ' ',
+                    suffix: (selection.beginning && selection.start === 0) ? ': ' : ' ',
                     href: makeUserPermalink(user.userId),
                     component: (
                         <PillCompletion
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 3ef10ca79e..77cc3ca2de 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -21,7 +21,7 @@ import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
 import { Editor } from 'slate-react';
 import { getEventTransfer } from 'slate-react';
-import { Value, Document, Event, Block, Inline, Text, Range, Node } from 'slate';
+import { Value, Document, Block, Inline, Text, Range, Node } from 'slate';
 import type { Change } from 'slate';
 
 import Html from 'slate-html-serializer';
@@ -29,10 +29,6 @@ import Md from 'slate-md-serializer';
 import Plain from 'slate-plain-serializer';
 import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerializer";
 
-// import {Editor, EditorState, RichUtils, CompositeDecorator, Modifier,
-//     getDefaultKeyBinding, KeyBindingUtil, ContentState, ContentBlock, SelectionState,
-//     Entity} from 'draft-js';
-
 import classNames from 'classnames';
 import Promise from 'bluebird';
 
@@ -170,6 +166,16 @@ export default class MessageComposerInput extends React.Component {
 
         this.client = MatrixClientPeg.get();
 
+        // track whether we should be trying to show autocomplete suggestions on the current editor
+        // contents. currently it's only suppressed when navigating history to avoid ugly flashes
+        // of unexpected corrections as you navigate.
+        // XXX: should this be in state?
+        this.suppressAutoComplete = false;
+
+        // track whether we've just pressed an arrowkey left or right in order to skip void nodes.
+        // see https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
+        this.direction = '';
+
         this.plainWithMdPills    = new PlainWithPillsSerializer({ pillFormat: 'md' });
         this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
         this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
@@ -177,6 +183,8 @@ export default class MessageComposerInput extends React.Component {
         this.md = new Md({
             rules: [
                 {
+                    // if serialize returns undefined it falls through to the default hardcoded 
+                    // serialization rules
                     serialize: (obj, children) => {
                         if (obj.object !== 'inline') return;
                         switch (obj.type) {
@@ -288,9 +296,6 @@ export default class MessageComposerInput extends React.Component {
                 }
             ]
         });
-
-        this.suppressAutoComplete = false;
-        this.direction = '';
     }
 
     /*
@@ -298,7 +303,8 @@ export default class MessageComposerInput extends React.Component {
      * - whether we've got rich text mode enabled
      * - contentState was passed in
      */
-    createEditorState(richText: boolean, editorState: ?Value): Value {
+    createEditorState(richText: boolean, // eslint-disable-line no-unused-vars
+                      editorState: ?Value): Value { 
         if (editorState instanceof Value) {
             return editorState;
         }
@@ -371,7 +377,6 @@ export default class MessageComposerInput extends React.Component {
                     let fragmentChange = fragment.change();
                     fragmentChange.moveToRangeOf(fragment.document)
                                   .wrapBlock(quote);
-                                  //.setBlocks('block-quote');
 
                     // FIXME: handle pills and use commonmark rather than md-serialize
                     const md = this.md.serialize(fragmentChange.value);
@@ -459,6 +464,7 @@ export default class MessageComposerInput extends React.Component {
         if (this.direction !== '') {
             const focusedNode = editorState.focusInline || editorState.focusText;
             if (focusedNode.isVoid) {
+                // XXX: does this work in RTL?
                 const edge = this.direction === 'Previous' ? 'End' : 'Start';
                 if (editorState.isCollapsed) {
                     change = change[`collapseTo${ edge }Of${ this.direction }Text`]();
@@ -478,13 +484,6 @@ export default class MessageComposerInput extends React.Component {
             this.onFinishedTyping();
         }
 
-        /*
-        // XXX: what was this ever doing?
-        if (!state.hasOwnProperty('originalEditorState')) {
-            state.originalEditorState = null;
-        }
-        */
-
         if (editorState.startText !== null) {
             const text = editorState.startText.text;
             const currentStartOffset = editorState.startOffset;
@@ -512,9 +511,7 @@ export default class MessageComposerInput extends React.Component {
         }
 
         // emojioneify any emoji
-
-        // XXX: is getTextsAsArray a private API?
-        editorState.document.getTextsAsArray().forEach(node => {
+        editorState.document.getTexts().forEach(node => {
             if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) {
                 let match;
                 while ((match = EMOJI_REGEX.exec(node.text)) !== null) {
@@ -546,36 +543,6 @@ export default class MessageComposerInput extends React.Component {
             editorState = change.value;
         }
 
-/*
-        const currentBlock = editorState.getSelection().getStartKey();
-        const currentSelection = editorState.getSelection();
-        const currentStartOffset = editorState.getSelection().getStartOffset();
-
-        const block = editorState.getCurrentContent().getBlockForKey(currentBlock);
-        const text = block.getText();
-
-        const entityBeforeCurrentOffset = block.getEntityAt(currentStartOffset - 1);
-        const entityAtCurrentOffset = block.getEntityAt(currentStartOffset);
-
-        // If the cursor is on the boundary between an entity and a non-entity and the
-        // text before the cursor has whitespace at the end, set the entity state of the
-        // character before the cursor (the whitespace) to null. This allows the user to
-        // stop editing the link.
-        if (entityBeforeCurrentOffset && !entityAtCurrentOffset &&
-            /\s$/.test(text.slice(0, currentStartOffset))) {
-            editorState = RichUtils.toggleLink(
-                editorState,
-                currentSelection.merge({
-                    anchorOffset: currentStartOffset - 1,
-                    focusOffset: currentStartOffset,
-                }),
-                null,
-            );
-            // Reset selection
-            editorState = EditorState.forceSelection(editorState, currentSelection);
-        }
-*/
-
         if (this.props.onInputStateChanged && editorState.blocks.size > 0) {
             let blockType = editorState.blocks.first().type;
             // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
@@ -605,7 +572,6 @@ export default class MessageComposerInput extends React.Component {
             editor_state: editorState,
         });
 
-        /* Since a modification was made, set originalEditorState to null, since newState is now our original */
         this.setState({
             editorState,
             originalEditorState: originalEditorState || null
@@ -683,7 +649,7 @@ export default class MessageComposerInput extends React.Component {
 
     hasMark = type => {
         const { editorState } = this.state
-        return editorState.activeMarks.some(mark => mark.type == type)
+        return editorState.activeMarks.some(mark => mark.type === type)
     };
 
     /**
@@ -695,7 +661,7 @@ export default class MessageComposerInput extends React.Component {
 
     hasBlock = type => {
         const { editorState } = this.state
-        return editorState.blocks.some(node => node.type == type)
+        return editorState.blocks.some(node => node.type === type)
     };
 
     onKeyDown = (ev: KeyboardEvent, change: Change, editor: Editor) => {
@@ -828,7 +794,7 @@ export default class MessageComposerInput extends React.Component {
                     // Handle the extra wrapping required for list buttons.
                     const isList = this.hasBlock('list-item');
                     const isType = editorState.blocks.some(block => {
-                        return !!document.getClosest(block.key, parent => parent.type == type);
+                        return !!document.getClosest(block.key, parent => parent.type === type);
                     });
 
                     if (isList && isType) {
@@ -839,7 +805,7 @@ export default class MessageComposerInput extends React.Component {
                     } else if (isList) {
                         change
                             .unwrapBlock(
-                                type == 'bulleted-list' ? 'numbered-list' : 'bulleted-list'
+                                type === 'bulleted-list' ? 'numbered-list' : 'bulleted-list'
                             )
                             .wrapBlock(type);
                     } else {
@@ -1009,7 +975,7 @@ export default class MessageComposerInput extends React.Component {
         let contentHTML;
 
         // only look for commands if the first block contains simple unformatted text
-        // i.e. no pills or rich-text formatting.
+        // i.e. no pills or rich-text formatting and begins with a /.
         let cmd, commandText;
         const firstChild = editorState.document.nodes.get(0);
         const firstGrandChild = firstChild && firstChild.nodes.get(0);
@@ -1090,8 +1056,8 @@ export default class MessageComposerInput extends React.Component {
                 // didn't contain any formatting in the first place...
                 contentText = mdWithPills.toPlaintext();
             } else {
-                // to avoid ugliness clients which can't parse HTML we don't send pills
-                // in the plaintext body.
+                // to avoid ugliness on clients which ignore the HTML body we don't
+                // send pills in the plaintext body.
                 contentText = this.plainWithPlainPills.serialize(editorState);
                 contentHTML = mdWithPills.toHTML();
             }
@@ -1255,11 +1221,8 @@ export default class MessageComposerInput extends React.Component {
         // Move selection to the end of the selected history
         const change = editorState.change().collapseToEndOf(editorState.document);
 
-        // XXX: should we be calling this.onChange(change) now?
-        // Answer: yes, if we want it to do any of the fixups on stuff like emoji.
-        // however, this should already have been done and persisted in the history,
-        // so shouldn't be necessary.
-
+        // We don't call this.onChange(change) now, as fixups on stuff like emoji
+        // should already have been done and persisted in the history.
         editorState = change.value;
 
         this.suppressAutoComplete = true;
@@ -1362,6 +1325,8 @@ export default class MessageComposerInput extends React.Component {
                                 .insertText(suffix)
                                 .focus();
         }
+        // for good hygiene, keep editorState updated to track the result of the change
+        // even though we don't do anything subsequently with it
         editorState = change.value;
 
         this.onChange(change, activeEditorState);
@@ -1460,10 +1425,11 @@ export default class MessageComposerInput extends React.Component {
     };
 
     onFormatButtonClicked = (name, e) => {
-        e.preventDefault(); // don't steal focus from the editor!
+        e.preventDefault();
 
         // XXX: horrible evil hack to ensure the editor is focused so the act
         // of focusing it doesn't then cancel the format button being pressed
+        // FIXME: can we just tell handleKeyCommand's change to invoke .focus()?
         if (document.activeElement && document.activeElement.className !== 'mx_MessageComposer_editor') {
             this.refs.editor.focus();
             setTimeout(()=>{
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 708071df23..662fbc7104 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -10,7 +10,6 @@ const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput'
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 import RoomMember from 'matrix-js-sdk';
 
-/*
 function addTextToDraft(text) {
     const components = document.getElementsByClassName('public-DraftEditor-content');
     if (components && components.length) {
@@ -21,7 +20,9 @@ function addTextToDraft(text) {
     }
 }
 
-describe('MessageComposerInput', () => {
+// FIXME: These tests need to be updated from Draft to Slate.
+
+xdescribe('MessageComposerInput', () => {
     let parentDiv = null,
         sandbox = null,
         client = null,
@@ -300,5 +301,4 @@ describe('MessageComposerInput', () => {
         expect(spy.args[0][1].body).toEqual('[Click here](https://some.lovely.url)');
         expect(spy.args[0][1].formatted_body).toEqual('<a href="https://some.lovely.url">Click here</a>');
     });
-});
-*/
\ No newline at end of file
+});
\ No newline at end of file

From 0d0934add7d83d7b1eac6ca5f92c9b985eee58c9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Jul 2018 00:58:35 +0100
Subject: [PATCH 588/702] unbreak modifier+space (e.g. emoji insert on macOS)

(cherry picked from commit c490f87)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 77cc3ca2de..24834d01d7 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -713,6 +713,10 @@ export default class MessageComposerInput extends React.Component {
     };
 
     onSpace = (ev: KeyboardEvent, change: Change): Change => {
+        if (ev.metaKey || ev.altKey || ev.shiftKey || ev.ctrlKey) {
+            return;
+        }
+
         // drop a point in history so the user can undo a word
         // XXX: this seems nasty but adding to history manually seems a no-go
         ev.preventDefault();

From ffec1b5a953c8a41caf705b0d5cb80e52c1b162a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Jul 2018 20:11:17 +0100
Subject: [PATCH 589/702] fix lint

---
 src/components/structures/ContextualMenu.js | 3 ++-
 src/components/views/rooms/EventTile.js     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index adc8dfd11c..7295fd45d3 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -220,7 +220,8 @@ export default class ContextualMenu extends React.Component {
                 { chevron }
                 <ElementClass {...props} onFinished={props.closeMenu} onResize={props.windowResize} />
             </div>
-            { props.hasBackground && <div className="mx_ContextualMenu_background" onClick={props.closeMenu} onContextMenu={this.onContextMenu} /> }
+            { props.hasBackground && <div className="mx_ContextualMenu_background"
+                                          onClick={props.closeMenu} onContextMenu={this.onContextMenu} /> }
             <style>{ chevronCSS }</style>
         </div>;
     }
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 9ed73c39b1..fff04d476d 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -56,7 +56,7 @@ const stateEventTileTypes = {
     'm.room.topic': 'messages.TextualEvent',
     'm.room.power_levels': 'messages.TextualEvent',
     'm.room.pinned_events': 'messages.TextualEvent',
-    'm.room.server_acl' : 'messages.TextualEvent',
+    'm.room.server_acl': 'messages.TextualEvent',
 
     'im.vector.modular.widgets': 'messages.TextualEvent',
 };

From 8bcb987f507e485d84ec768d596a920d40fb6c6d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 9 Jul 2018 20:14:37 +0100
Subject: [PATCH 590/702] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 0377ff3395..850d97ab71 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -43,7 +43,7 @@ export default class CommandProvider extends AutocompleteProvider {
 
         let matches = [];
         // check if the full match differs from the first word (i.e. returns false if the command has args)
-        if (command[0] !== command[1]) { 
+        if (command[0] !== command[1]) {
             // The input looks like a command with arguments, perform exact match
             const name = command[1].substr(1); // strip leading `/`
             if (CommandMap[name]) {

From 51591a4d62ac056d3d730a212e6cb2bf666b1ed7 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Jul 2018 20:11:17 +0100
Subject: [PATCH 591/702] fix lint

---
 src/components/structures/ContextualMenu.js | 3 ++-
 src/components/views/rooms/EventTile.js     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index adc8dfd11c..7295fd45d3 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -220,7 +220,8 @@ export default class ContextualMenu extends React.Component {
                 { chevron }
                 <ElementClass {...props} onFinished={props.closeMenu} onResize={props.windowResize} />
             </div>
-            { props.hasBackground && <div className="mx_ContextualMenu_background" onClick={props.closeMenu} onContextMenu={this.onContextMenu} /> }
+            { props.hasBackground && <div className="mx_ContextualMenu_background"
+                                          onClick={props.closeMenu} onContextMenu={this.onContextMenu} /> }
             <style>{ chevronCSS }</style>
         </div>;
     }
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 9ed73c39b1..fff04d476d 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -56,7 +56,7 @@ const stateEventTileTypes = {
     'm.room.topic': 'messages.TextualEvent',
     'm.room.power_levels': 'messages.TextualEvent',
     'm.room.pinned_events': 'messages.TextualEvent',
-    'm.room.server_acl' : 'messages.TextualEvent',
+    'm.room.server_acl': 'messages.TextualEvent',
 
     'im.vector.modular.widgets': 'messages.TextualEvent',
 };

From 58301e5dd455e4f992a1a4feb107f1224f155329 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Jul 2018 10:28:17 +0100
Subject: [PATCH 592/702] navigateHistory only when at edges of document, to
 prevent Firefox bug

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 39 ++++---------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 24834d01d7..0f0d8787d6 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1140,41 +1140,18 @@ export default class MessageComposerInput extends React.Component {
 
         // Select history only if we are not currently auto-completing
         if (this.autocomplete.state.completionList.length === 0) {
+            const selection = this.state.editorState.selection;
 
-            // determine whether our cursor is at the top or bottom of the multiline
-            // input box by just looking at the position of the plain old DOM selection.
-            const selection = window.getSelection();
-            const range = selection.getRangeAt(0);
-            const cursorRect = range.getBoundingClientRect();
+            // selection must be collapsed
+            if (!selection.isCollapsed) return;
+            const document = this.state.editorState.document;
 
-            const editorNode = ReactDOM.findDOMNode(this.refs.editor);
-            const editorRect = editorNode.getBoundingClientRect();
-
-            // heuristic to handle tall emoji, pills, etc pushing the cursor away from the top
-            // or bottom of the page.
-            // XXX: is this going to break on large inline images or top-to-bottom scripts?
-            const EDGE_THRESHOLD = 15;
-
-            let navigateHistory = false;
+            // and we must be at the edge of the document (up=start, down=end)
             if (up) {
-                const scrollCorrection = editorNode.scrollTop;
-                const distanceFromTop = cursorRect.top - editorRect.top + scrollCorrection;
-                console.log(`Cursor distance from editor top is ${distanceFromTop}`);
-                if (distanceFromTop < EDGE_THRESHOLD) {
-                    navigateHistory = true;
-                }
+                if (!selection.isAtStartOf(document)) return;
+            } else {
+                if (!selection.isAtEndOf(document)) return;
             }
-            else {
-                const scrollCorrection =
-                    editorNode.scrollHeight - editorNode.clientHeight - editorNode.scrollTop;
-                const distanceFromBottom = editorRect.bottom - cursorRect.bottom + scrollCorrection;
-                console.log(`Cursor distance from editor bottom is ${distanceFromBottom}`);
-                if (distanceFromBottom < EDGE_THRESHOLD) {
-                    navigateHistory = true;
-                }
-            }
-
-            if (!navigateHistory) return;
 
             const selected = this.selectHistory(up);
             if (selected) {

From 100ecfe7cef57fda55d38e01d7c86160b09b608b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Jul 2018 10:29:52 +0100
Subject: [PATCH 593/702] remove trailing spaces to make linter happy
 (no-trailing-spaces)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 0f0d8787d6..fe2cf585ea 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -183,7 +183,7 @@ export default class MessageComposerInput extends React.Component {
         this.md = new Md({
             rules: [
                 {
-                    // if serialize returns undefined it falls through to the default hardcoded 
+                    // if serialize returns undefined it falls through to the default hardcoded
                     // serialization rules
                     serialize: (obj, children) => {
                         if (obj.object !== 'inline') return;
@@ -304,7 +304,7 @@ export default class MessageComposerInput extends React.Component {
      * - contentState was passed in
      */
     createEditorState(richText: boolean, // eslint-disable-line no-unused-vars
-                      editorState: ?Value): Value { 
+                      editorState: ?Value): Value {
         if (editorState instanceof Value) {
             return editorState;
         }
@@ -359,7 +359,7 @@ export default class MessageComposerInput extends React.Component {
                 // If so, what should be the format, and how do we differentiate it from replies?
 
                 const quote = Block.create('block-quote');
-                if (this.state.isRichTextEnabled) {    
+                if (this.state.isRichTextEnabled) {
                     let change = editorState.change();
                     if (editorState.anchorText.text === '' && editorState.anchorBlock.nodes.size === 1) {
                         // replace the current block rather than split the block

From 02c6f3d168826c98f2491952ece67f7a931c4ce7 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 10 Jul 2018 15:18:07 +0100
Subject: [PATCH 594/702] fix typo

---
 src/components/views/dialogs/CreateGroupDialog.js | 2 +-
 src/i18n/strings/bg.json                          | 2 +-
 src/i18n/strings/ca.json                          | 2 +-
 src/i18n/strings/de_DE.json                       | 2 +-
 src/i18n/strings/en_EN.json                       | 2 +-
 src/i18n/strings/eu.json                          | 2 +-
 src/i18n/strings/fr.json                          | 2 +-
 src/i18n/strings/gl.json                          | 2 +-
 src/i18n/strings/hu.json                          | 2 +-
 src/i18n/strings/it.json                          | 2 +-
 src/i18n/strings/lv.json                          | 2 +-
 src/i18n/strings/nl.json                          | 2 +-
 src/i18n/strings/pl.json                          | 2 +-
 src/i18n/strings/pt_BR.json                       | 2 +-
 src/i18n/strings/ru.json                          | 2 +-
 src/i18n/strings/sk.json                          | 2 +-
 src/i18n/strings/sr.json                          | 2 +-
 src/i18n/strings/sv.json                          | 2 +-
 src/i18n/strings/zh_Hans.json                     | 2 +-
 src/i18n/strings/zh_Hant.json                     | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 04f99a0e15..6e14d1cf66 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -56,7 +56,7 @@ export default React.createClass({
     _checkGroupId: function(e) {
         let error = null;
         if (!this.state.groupId) {
-            error = _t("Community IDs cannot not be empty.");
+            error = _t("Community IDs cannot be empty.");
         } else if (!/^[a-z0-9=_\-\.\/]*$/.test(this.state.groupId)) {
             error = _t("Community IDs may only contain characters a-z, 0-9, or '=_-./'");
         }
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 58a7de93b5..bdbab0812a 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -498,7 +498,7 @@
     "Failed to remove room from community": "Неуспешно премахване на стаята от общността",
     "Only visible to community members": "Видимо само за членове на общността",
     "Filter community rooms": "Филтрирай стаи на общността",
-    "Community IDs cannot not be empty.": "Идентификаторите на общността не могат да бъдат празни.",
+    "Community IDs cannot be empty.": "Идентификаторите на общността не могат да бъдат празни.",
     "Create Community": "Създай общност",
     "Community Name": "Име на общност",
     "Community ID": "Идентификатор на общност",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 98d51e99ac..3006063df7 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -654,7 +654,7 @@
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s han sortit %(count)s vegades",
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s ha sortit %(count)s vegades",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Les ID de les comunitats només poden contendre caràcters a-z, 0-9, o '=_-./'",
-    "Community IDs cannot not be empty.": "Les ID de les comunitats no poden estar buides.",
+    "Community IDs cannot be empty.": "Les ID de les comunitats no poden estar buides.",
     "Something went wrong whilst creating your community": "S'ha produït un error al crear la vostra comunitat",
     "Create Community": "Crea una comunitat",
     "Community Name": "Nom de la comunitat",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b4e244f542..71b7ffe1d1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -947,7 +947,7 @@
     "Your identity server's URL": "Die URL deines Identitätsservers",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
-    "Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.",
+    "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText>, <sendAnywayText>trotzdem senden</sendAnywayText> oder <cancelText>abbrechen</cancelText>.",
     "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen sowie Raum, Nutzer oder Gruppen-ID enthalten, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 486ecdf114..4b4989142f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -800,7 +800,7 @@
     "Start Chatting": "Start Chatting",
     "Confirm Removal": "Confirm Removal",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
-    "Community IDs cannot not be empty.": "Community IDs cannot not be empty.",
+    "Community IDs cannot be empty.": "Community IDs cannot be empty.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Something went wrong whilst creating your community",
     "Create Community": "Create Community",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9d46758420..309e6078a8 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -952,7 +952,7 @@
     "Your identity server's URL": "Zure identitate zerbitzariaren URL-a",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa",
     "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe.",
-    "Community IDs cannot not be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
+    "Community IDs cannot be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>bidali hala ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
     "<a>In reply to</a> <pill>": "<a>honi erantzunez:</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s erabiltzaileak bere pantaila izena aldatu du %(displayName)s izatera.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ea4b9e37fd..721cf1d9f1 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -952,7 +952,7 @@
     "Your identity server's URL": "L'URL de votre serveur d'identité",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
-    "Community IDs cannot not be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
+    "Community IDs cannot be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
     "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom affiché en %(displayName)s.",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 3fc7d3f735..b1d64a156d 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -633,7 +633,7 @@
     "Confirm Removal": "Confirme a retirada",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Está certa de que quere quitar (eliminar) este evento? Saiba que si elimina un nome de sala ou cambia o asunto, podería desfacer o cambio.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Os ID de comunidade só poden conter caracteres a-z, 0-9, or '=_-./'",
-    "Community IDs cannot not be empty.": "O ID de comunidade non pode quedar baldeiro.",
+    "Community IDs cannot be empty.": "O ID de comunidade non pode quedar baldeiro.",
     "Something went wrong whilst creating your community": "Algo fallou mentres se creaba a súa comunidade",
     "Create Community": "Crear comunidade",
     "Community Name": "Nome da comunidade",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 72558c5873..2cdd8219ad 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -953,7 +953,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>.",
-    "Community IDs cannot not be empty.": "A közösségi azonosító nem lehet üres.",
+    "Community IDs cannot be empty.": "A közösségi azonosító nem lehet üres.",
     "<a>In reply to</a> <pill>": "<a>Válaszolva neki</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s.",
     "Failed to set direct chat tag": "Nem sikerült a közvetlen beszélgetés jelzést beállítani",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 9a4e74fa14..07e030c061 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -674,7 +674,7 @@
     "Start Chatting": "Inizia a chattare",
     "Confirm Removal": "Conferma la rimozione",
     "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.": "Sei sicuro di volere rimuovere (eliminare) questo evento? Nota che se elimini il nome di una stanza o la modifica di un argomento, potrebbe annullare la modifica.",
-    "Community IDs cannot not be empty.": "Gli ID della comunità non possono essere vuoti.",
+    "Community IDs cannot be empty.": "Gli ID della comunità non possono essere vuoti.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Gli ID della comunità devono contenere solo caratteri a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Qualcosa è andato storto nella creazione della tua comunità",
     "Create Community": "Crea una comunità",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 0c6bcb0977..09182ed776 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -862,7 +862,7 @@
     "email address": "e-pasta adrese",
     "Try using one of the following valid address types: %(validTypesList)s.": "Mēģiniet izmantot vienu no sekojošiem pieļautajiem adrešu tipiem: %(validTypesList)s.",
     "You have entered an invalid address.": "Ievadīta nederīga adrese.",
-    "Community IDs cannot not be empty.": "Kopienu IDs nevar būt tukši.",
+    "Community IDs cannot be empty.": "Kopienu IDs nevar būt tukši.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Kopienas ID var saturēt tikai simbolus a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Radot Tavu kopienu kaut kas nogāja greizi",
     "Create Community": "Radīt kopienu",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 1ba068daa0..2c3771cafd 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -877,7 +877,7 @@
     "Try using one of the following valid address types: %(validTypesList)s.": "Probeer één van de volgende geldige adrestypes: %(validTypesList)s.",
     "You have entered an invalid address.": "Je hebt een ongeldig adres ingevoerd.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Een gemeenschaps-ID mag alleen de karakters a-z, 0-9, of '=_-./' bevatten.",
-    "Community IDs cannot not be empty.": "Een gemeenschaps-ID kan niet leeg zijn.",
+    "Community IDs cannot be empty.": "Een gemeenschaps-ID kan niet leeg zijn.",
     "Something went wrong whilst creating your community": "Er is iets fout gegaan tijdens het aanmaken van je gemeenschap",
     "Create Community": "Gemeenschap Aanmaken",
     "Community Name": "Gemeenschapsnaam",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 9fa51294ff..c5dd13c011 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1025,7 +1025,7 @@
     "You have entered an invalid address.": "Podałeś nieprawidłowy adres.",
     "Try using one of the following valid address types: %(validTypesList)s.": "Spróbuj użyć jednego z następujących poprawnych typów adresów: %(validTypesList)s.",
     "Riot bugs are tracked on GitHub: <a>create a GitHub issue</a>.": "Błędy Riot śledzone są na GitHubie: <a>utwórz nowe zgłoszenie</a>.",
-    "Community IDs cannot not be empty.": "ID społeczności nie może być puste.",
+    "Community IDs cannot be empty.": "ID społeczności nie może być puste.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID społeczności może zawierać tylko znaki a-z, 0-9 lub '=_-./'",
     "Something went wrong whilst creating your community": "Coś poszło nie tak podczas tworzenia Twojej społeczności",
     "Create Community": "Utwórz społeczność",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index c583e795cb..08ad8a4bd5 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -873,7 +873,7 @@
     "email address": "endereço de e-mail",
     "Try using one of the following valid address types: %(validTypesList)s.": "Tente usar um dos seguintes tipos de endereço válidos: %(validTypesList)s.",
     "You have entered an invalid address.": "Você entrou com um endereço inválido.",
-    "Community IDs cannot not be empty.": "IDs de comunidades não podem estar em branco.",
+    "Community IDs cannot be empty.": "IDs de comunidades não podem estar em branco.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "IDs de comunidade podem apenas ter os seguintes caracteres: a-z, 0-9, ou '=_-./'",
     "Something went wrong whilst creating your community": "Algo deu errado ao criar sua comunidade",
     "Create Community": "Criar comunidade",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e3147ed809..b0f6bd3d52 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -953,7 +953,7 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Используете ли вы режим Richtext в редакторе Rich Text Editor",
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>.",
-    "Community IDs cannot not be empty.": "ID сообществ не могут быть пустыми.",
+    "Community IDs cannot be empty.": "ID сообществ не могут быть пустыми.",
     "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 9043f86686..bf5d365dfe 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -957,7 +957,7 @@
     "Failed to remove tag %(tagName)s from room": "Z miestnosti sa nepodarilo odstrániť značku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
     "<a>In reply to</a> <pill>": "<a>Odpoveď na</a> <pill>",
-    "Community IDs cannot not be empty.": "ID komunity nemôže ostať prázdne.",
+    "Community IDs cannot be empty.": "ID komunity nemôže ostať prázdne.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText>, <sendAnywayText>napriek tomu odoslať</sendAnywayText> alebo <cancelText>zrušiť</cancelText>.",
     "Disable Community Filter Panel": "Zakázať panel Filter komunity",
     "Your key share request has been sent - please check your other devices for key share requests.": "Žiadosť o zdieľanie kľúčov bola odoslaná - Overte si zobrazenie žiadosti o zdieľanie kľúčov na vašich ostatných zariadeniach.",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index c32b4ac202..b9ccbe2089 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -641,7 +641,7 @@
     "Confirm Removal": "Потврди уклањање",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Да ли сте сигурни да желите уклонити (обрисати) овај догађај? Знајте да брисање назива собе или мењање теме може опозвати измену.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ИБ-јеви заједнице могу садржати само знакове a-z, 0-9, или '=_-./'",
-    "Community IDs cannot not be empty.": "ИБ-јеви заједнице не могу бити празни.",
+    "Community IDs cannot be empty.": "ИБ-јеви заједнице не могу бити празни.",
     "Something went wrong whilst creating your community": "Нешто је пошло наопако приликом стварања ваше заједнице",
     "Create Community": "Направи заједницу",
     "Community Name": "Назив заједнице",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 92c4163fbf..597c68c474 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1034,7 +1034,7 @@
     "Failed to remove room from community": "Det gick inte att ta bort rum från community",
     "Only visible to community members": "Endast synlig för community-medlemmar",
     "Filter community rooms": "Filtrera community-rum",
-    "Community IDs cannot not be empty.": "Community-ID kan inte vara tomt.",
+    "Community IDs cannot be empty.": "Community-ID kan inte vara tomt.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-ID får endast innehålla tecknen a-z, 0-9 och '=_-./'",
     "Something went wrong whilst creating your community": "Något gick fel när din community skapades",
     "Create Community": "Skapa community",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index e2475e6f05..b83873d207 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -877,7 +877,7 @@
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s 撤回了他们的邀请",
     "Custom of %(powerLevel)s": "",
     "<a>In reply to</a> <pill>": "<a>回复给</a> <pill>",
-    "Community IDs cannot not be empty.": "社区 ID 不能为空。",
+    "Community IDs cannot be empty.": "社区 ID 不能为空。",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "社区 ID 只能包含 a-z、0-9 或 “=_-./” 等字符",
     "Something went wrong whilst creating your community": "创建社区时出现问题",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "您目前默认将未经验证的设备列入黑名单；在发送消息到这些设备上之前，您必须先验证它们。",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index d5d43fa2a0..0a0ba8e9af 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -952,7 +952,7 @@
     "Your identity server's URL": "您的驗證伺服器 URL",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。",
-    "Community IDs cannot not be empty.": "社群 ID 不能為空。",
+    "Community IDs cannot be empty.": "社群 ID 不能為空。",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
     "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。",

From 25e453badd7cb6853e2346936000766bcfc9b8b5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 10 Jul 2018 17:29:39 +0100
Subject: [PATCH 595/702] Fix stickerpicker PersistedElement usage

Earlier PR changed the prop to persistKey in PersistedElement but
containerId here, so this was ending up as 'undefined'.
---
 src/components/views/rooms/Stickerpicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index d6afc28dad..ea3691fddc 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -215,7 +215,7 @@ export default class Stickerpicker extends React.Component {
                             width: this.popoverWidth,
                         }}
                     >
-                    <PersistedElement containerId="mx_persisted_stickerPicker" style={{zIndex: STICKERPICKER_Z_INDEX}}>
+                    <PersistedElement persistKey="stickerPicker" style={{zIndex: STICKERPICKER_Z_INDEX}}>
                         <AppTile
                             collectWidgetMessaging={this._collectWidgetMessaging}
                             id={stickerpickerWidget.id}

From abbb69dc3666997ec138a77677c052beb200be5e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Jul 2018 17:35:13 +0100
Subject: [PATCH 596/702] fix fn call, fixes usage of SlashCommands

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index fe2cf585ea..e7fbbae8a8 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -988,7 +988,7 @@ export default class MessageComposerInput extends React.Component {
             firstGrandChild.text[0] === '/')
         {
             commandText = this.plainWithIdPills.serialize(editorState);
-            cmd = SlashCommands.processInput(this.props.room.roomId, commandText);
+            cmd = processCommandInput(this.props.room.roomId, commandText);
         }
 
         if (cmd) {

From 88c74bae1f038e43d4df9953184a19f42fad9355 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 4 Jul 2018 16:36:01 +0000
Subject: [PATCH 597/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f870732b1f..46c8e6a92b 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1209,5 +1209,6 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nem tudsz üzenetet küldeni amíg nem olvasod el és nem fogadod el a <consentLink>felhasználási feltételeket</consentLink>.",
     "Demote yourself?": "Lefokozod magad?",
     "Demote": "Lefokozás",
-    "Show empty room list headings": "Üres szobalista fejléc mutatása"
+    "Show empty room list headings": "Üres szobalista fejléc mutatása",
+    "This event could not be displayed": "Az eseményt nem lehet megjeleníteni"
 }

From 3c39c537974232af1772d448fd5823f7ab21defa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 5 Jul 2018 07:50:07 +0000
Subject: [PATCH 598/702] Translated using Weblate (French)

Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 56f8a0e63f..e879ece8b4 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1209,5 +1209,6 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vous ne pouvez voir aucun message tant que vous ne lisez et n'acceptez pas nos <consentLink>conditions générales</consentLink>.",
     "Demote yourself?": "Vous rétrograder ?",
     "Demote": "Rétrograder",
-    "Show empty room list headings": "Afficher les en-têtes de la liste des salons vides"
+    "Show empty room list headings": "Afficher les en-têtes de la liste des salons vides",
+    "This event could not be displayed": "Cet événement n'a pas pu être affiché"
 }

From fd4f9679df7b035c0112dce135c47967713f9518 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Jul 2018 09:39:14 +0100
Subject: [PATCH 599/702] convert md<->rt if the stored editorState was in a
 different state

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 58 +++++++++++--------
 src/stores/MessageComposerStore.js            |  5 +-
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index e7fbbae8a8..c8d8c9d2f9 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -143,27 +143,6 @@ export default class MessageComposerInput extends React.Component {
 
         Analytics.setRichtextMode(isRichTextEnabled);
 
-        this.state = {
-            // whether we're in rich text or markdown mode
-            isRichTextEnabled,
-
-            // the currently displayed editor state (note: this is always what is modified on input)
-            editorState: this.createEditorState(
-                isRichTextEnabled,
-                MessageComposerStore.getEditorState(this.props.room.roomId),
-            ),
-
-            // the original editor state, before we started tabbing through completions
-            originalEditorState: null,
-
-            // the virtual state "above" the history stack, the message currently being composed that
-            // we want to persist whilst browsing history
-            currentlyComposedEditorState: null,
-
-            // whether there were any completions
-            someCompletions: null,
-        };
-
         this.client = MatrixClientPeg.get();
 
         // track whether we should be trying to show autocomplete suggestions on the current editor
@@ -296,19 +275,47 @@ export default class MessageComposerInput extends React.Component {
                 }
             ]
         });
+
+        const savedState = MessageComposerStore.getEditorState(this.props.room.roomId);
+        this.state = {
+            // whether we're in rich text or markdown mode
+            isRichTextEnabled,
+
+            // the currently displayed editor state (note: this is always what is modified on input)
+            editorState: this.createEditorState(
+                isRichTextEnabled,
+                savedState.editor_state,
+                savedState.rich_text,
+            ),
+
+            // the original editor state, before we started tabbing through completions
+            originalEditorState: null,
+
+            // the virtual state "above" the history stack, the message currently being composed that
+            // we want to persist whilst browsing history
+            currentlyComposedEditorState: null,
+
+            // whether there were any completions
+            someCompletions: null,
+        };
     }
 
     /*
      * "Does the right thing" to create an Editor value, based on:
      * - whether we've got rich text mode enabled
      * - contentState was passed in
+     * - whether the contentState that was passed in was rich text
      */
-    createEditorState(richText: boolean, // eslint-disable-line no-unused-vars
-                      editorState: ?Value): Value {
+    createEditorState(wantRichText: boolean, editorState: ?Value, wasRichText: ?boolean): Value {
         if (editorState instanceof Value) {
+            if (wantRichText && !wasRichText) {
+                return this.mdToRichEditorState(editorState);
+            }
+            if (wasRichText && !wantRichText) {
+                return this.richToMdEditorState(editorState);
+            }
             return editorState;
-        }
-        else {
+        } else {
             // ...or create a new one.
             return Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
         }
@@ -569,6 +576,7 @@ export default class MessageComposerInput extends React.Component {
         dis.dispatch({
             action: 'editor_state',
             room_id: this.props.room.roomId,
+            rich_text: this.state.isRichTextEnabled,
             editor_state: editorState,
         });
 
diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index 0e6c856e1b..e70714ff98 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -54,7 +54,10 @@ class MessageComposerStore extends Store {
 
     _editorState(payload) {
         const editorStateMap = this._state.editorStateMap;
-        editorStateMap[payload.room_id] = payload.editor_state;
+        editorStateMap[payload.room_id] = {
+            editor_state: payload.editor_state,
+            rich_text: payload.rich_text,
+        };
         localStorage.setItem('editor_state', JSON.stringify(editorStateMap));
         this._setState({
             editorStateMap: editorStateMap,

From c3aef6e3a0d153eb38eb5f1b8ac864896b753367 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Jul 2018 10:29:14 +0100
Subject: [PATCH 600/702] workaround for tommoor/slate-md-serializer#14

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c8d8c9d2f9..d0079309e3 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -182,6 +182,11 @@ export default class MessageComposerInput extends React.Component {
                                 return `<u>${ children }</u>`;
                             case 'deleted':
                                 return `<del>${ children }</del>`;
+                            case 'code':
+                                // XXX: we only ever get given `code` regardless of whether it was inline or block
+                                // XXX: workaround for https://github.com/tommoor/slate-md-serializer/issues/14
+                                // strip single backslashes from children, as they would have been escaped here
+                                return `\`${ children.split('\\').map((v) => v ? v : '\\').join('') }\``;
                         }
                     },
                 },

From 95909de446f141a01e3eeca56906e8ce69f22b7e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Jul 2018 11:39:55 +0100
Subject: [PATCH 601/702] fix MessageComposer not marking translatable strings.
 run gen-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposer.js | 36 ++++++++++++-------
 src/i18n/strings/en_EN.json                   | 17 +++++----
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 746f3909f2..657fd463fd 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
 import CallHandler from '../../../CallHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
@@ -26,6 +26,17 @@ import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import Stickerpicker from './Stickerpicker';
 
+const formatButtonList = [
+    _td("bold"),
+    _td("italic"),
+    _td("deleted"),
+    _td("underlined"),
+    _td("inline-code"),
+    _td("block-quote"),
+    _td("bulleted-list"),
+    _td("numbered-list"),
+];
+
 export default class MessageComposer extends React.Component {
     constructor(props, context) {
         super(props, context);
@@ -322,18 +333,17 @@ export default class MessageComposer extends React.Component {
         let formatBar;
         if (this.state.showFormatting && this.state.inputState.isRichTextEnabled) {
             const {marks, blockType} = this.state.inputState;
-            const formatButtons = ["bold", "italic", "deleted", "underlined", "inline-code", "block-quote", "bulleted-list", "numbered-list"].map(
-                (name) => {
-                    const active = marks.some(mark => mark.type === name) || blockType === name;
-                    const suffix = active ? '-on' : '';
-                    const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
-                    const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
-                    return <img className={className}
-                                title={_t(name)}
-                                onMouseDown={onFormatButtonClicked}
-                                key={name}
-                                src={`img/button-text-${name}${suffix}.svg`}
-                                height="17" />;
+            const formatButtons = formatButtonList.map((name) => {
+                const active = marks.some(mark => mark.type === name) || blockType === name;
+                const suffix = active ? '-on' : '';
+                const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
+                const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
+                return <img className={className}
+                            title={_t(name)}
+                            onMouseDown={onFormatButtonClicked}
+                            key={name}
+                            src={`img/button-text-${name}${suffix}.svg`}
+                            height="17" />;
                 },
             );
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 486ecdf114..2da820d751 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -406,6 +406,14 @@
     "Invited": "Invited",
     "Filter room members": "Filter room members",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
+    "bold": "bold",
+    "italic": "italic",
+    "deleted": "deleted",
+    "underlined": "underlined",
+    "inline-code": "inline-code",
+    "block-quote": "block-quote",
+    "bulleted-list": "bulleted-list",
+    "numbered-list": "numbered-list",
     "Attachment": "Attachment",
     "At this time it is not possible to reply with a file so this will be sent without being a reply.": "At this time it is not possible to reply with a file so this will be sent without being a reply.",
     "Upload Files": "Upload Files",
@@ -430,14 +438,6 @@
     "Command error": "Command error",
     "Unable to reply": "Unable to reply",
     "At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.",
-    "bold": "bold",
-    "italic": "italic",
-    "strike": "strike",
-    "underline": "underline",
-    "code": "code",
-    "quote": "quote",
-    "bullet": "bullet",
-    "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
     "No pinned messages.": "No pinned messages.",
@@ -772,7 +772,6 @@
     "Room directory": "Room directory",
     "Start chat": "Start chat",
     "And %(count)s more...|other": "And %(count)s more...",
-    "Share Link to User": "Share Link to User",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
     "Matrix ID": "Matrix ID",

From 3e05bf19c59a401efe53f39eed7be38aafb3b41f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Jul 2018 16:30:45 +0100
Subject: [PATCH 602/702] hide autocomplete when moving caret to match existing
 behaviour

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index d0079309e3..7b9fb89404 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -115,6 +115,15 @@ function onSendMessageFailed(err, room) {
     });
 }
 
+function rangeEquals(a: Range, b: Range): boolean {
+    return (a.anchorKey === b.anchorKey
+        && a.anchorOffset === b.anchorOffset
+        && a.focusKey === b.focusKey
+        && a.focusOffset === b.focusOffset
+        && a.isFocused === b.isFocused
+        && a.isBackward === b.isBackward);
+}
+
 /*
  * The textInput part of the MessageComposer
  */
@@ -469,8 +478,7 @@ export default class MessageComposerInput extends React.Component {
         }
     }
 
-    onChange = (change: Change, originalEditorState: value) => {
-
+    onChange = (change: Change, originalEditorState?: Value) => {
         let editorState = change.value;
 
         if (this.direction !== '') {
@@ -490,6 +498,11 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
+        // when selection changes hide the autocomplete
+        if (!rangeEquals(this.state.editorState.selection, editorState.selection)) {
+            this.autocomplete.hide();
+        }
+
         if (!editorState.document.isEmpty) {
             this.onTypingActivity();
         } else {

From b4bc09c3350dac7bdb867e0acb89e406ac6c9253 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Jul 2018 17:13:33 +0100
Subject: [PATCH 603/702] null-guard savedState since now we're accessing its
 props

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 7b9fb89404..f9395abe59 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -298,8 +298,8 @@ export default class MessageComposerInput extends React.Component {
             // the currently displayed editor state (note: this is always what is modified on input)
             editorState: this.createEditorState(
                 isRichTextEnabled,
-                savedState.editor_state,
-                savedState.rich_text,
+                savedState ? savedState.editor_state : undefined,
+                savedState ? savedState.rich_text : undefined,
             ),
 
             // the original editor state, before we started tabbing through completions

From 8f10ee01c6392c7d28d5586f235ee90df18e8419 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Jul 2018 18:07:32 +0100
Subject: [PATCH 604/702] Implement always-on-screen capability for widgets

As per https://github.com/matrix-org/matrix-doc/issues/1354

This is whitelisted to only jitsi widgets for now as per comment,
mostly because any widget that we may make always-on-screen we need
to preemptively put in a PersistedElement container, which is
unnecessary for any other widget.

Apologies that this does a bunch of refactoring which could have
been split out separately: I only discovered what needed to be
refactored in the process of doing this.

Fixes https://github.com/vector-im/riot-web/issues/6984
---
 res/css/views/rooms/_EventTile.scss           |  1 -
 src/CallHandler.js                            |  3 +-
 src/FromWidgetPostMessageApi.js               |  9 ++
 src/components/views/elements/AppTile.js      | 87 ++++++++++---------
 .../views/elements/PersistedElement.js        | 24 ++++-
 src/components/views/rooms/AppsDrawer.js      | 43 +++++----
 src/components/views/rooms/Stickerpicker.js   | 17 +---
 src/stores/ActiveWidgetStore.js               | 84 ++++++++++++++++++
 8 files changed, 194 insertions(+), 74 deletions(-)
 create mode 100644 src/stores/ActiveWidgetStore.js

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index d95ed2ded0..737f22a0ac 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -31,7 +31,6 @@ limitations under the License.
     top: 14px;
     left: 8px;
     cursor: pointer;
-    z-index: 2;
 }
 
 .mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
diff --git a/src/CallHandler.js b/src/CallHandler.js
index 7403483e36..6f95c31175 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -444,7 +444,8 @@ function _startCallApp(roomId, type) {
         'email=$matrix_user_id',
     ].join('&');
     const widgetUrl = (
-        'https://scalar.vector.im/api/widgets' +
+        //'https://scalar.vector.im/api/widgets' +
+        'http://localhost:8620' +
         '/jitsi.html?' +
         queryString
     );
diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index 792fd73733..ea7eeba756 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -18,6 +18,7 @@ import URL from 'url';
 import dis from './dispatcher';
 import IntegrationManager from './IntegrationManager';
 import WidgetMessagingEndpoint from './WidgetMessagingEndpoint';
+import ActiveWidgetStore from './stores/ActiveWidgetStore';
 
 const WIDGET_API_VERSION = '0.0.1'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
@@ -155,6 +156,14 @@ export default class FromWidgetPostMessageApi {
             const integType = (data && data.integType) ? data.integType : null;
             const integId = (data && data.integId) ? data.integId : null;
             IntegrationManager.open(integType, integId);
+        } else if (action === 'set_always_on_screen') {
+            // This is a new message: there is no reason to support the deprecated widgetData here
+            const data = event.data.data;
+            const val = data.value;
+
+            if (ActiveWidgetStore.widgetHasCapability(widgetId, 'm.always_on_screen')) {
+                ActiveWidgetStore.setWidgetPersistence(widgetId, val);
+            }
         } else {
             console.warn('Widget postMessage event unhandled');
             this.sendError(event, {message: 'The postMessage was unhandled'});
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 7b69057e3e..cf69727b15 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -1,5 +1,6 @@
 /**
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,6 +34,7 @@ import AppWarning from './AppWarning';
 import MessageSpinner from './MessageSpinner';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import dis from '../../../dispatcher';
+import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;
@@ -40,9 +42,13 @@ const ENABLE_REACT_PERF = false;
 export default class AppTile extends React.Component {
     constructor(props) {
         super(props);
+
+        // The key used for PersistedElement
+        this._persistKey = 'widget_' + this.props.id;
+
         this.state = this._getNewState(props);
 
-        this._onWidgetAction = this._onWidgetAction.bind(this);
+        this._onAction = this._onAction.bind(this);
         this._onMessage = this._onMessage.bind(this);
         this._onLoaded = this._onLoaded.bind(this);
         this._onEditClick = this._onEditClick.bind(this);
@@ -50,7 +56,6 @@ export default class AppTile extends React.Component {
         this._onSnapshotClick = this._onSnapshotClick.bind(this);
         this.onClickMenuBar = this.onClickMenuBar.bind(this);
         this._onMinimiseClick = this._onMinimiseClick.bind(this);
-        this._onInitialLoad = this._onInitialLoad.bind(this);
         this._grantWidgetPermission = this._grantWidgetPermission.bind(this);
         this._revokeWidgetPermission = this._revokeWidgetPermission.bind(this);
         this._onPopoutWidgetClick = this._onPopoutWidgetClick.bind(this);
@@ -66,9 +71,12 @@ export default class AppTile extends React.Component {
     _getNewState(newProps) {
         const widgetPermissionId = [newProps.room.roomId, encodeURIComponent(newProps.url)].join('_');
         const hasPermissionToLoad = localStorage.getItem(widgetPermissionId);
+
+        const PersistedElement = sdk.getComponent("elements.PersistedElement");
         return {
             initialising: true, // True while we are mangling the widget URL
-            loading: this.props.waitForIframeLoad, // True while the iframe content is loading
+            // True while the iframe content is loading
+            loading: this.props.waitForIframeLoad && !PersistedElement.isMounted(this._persistKey),
             widgetUrl: this._addWurlParams(newProps.url),
             widgetPermissionId: widgetPermissionId,
             // Assume that widget has permission to load if we are the user who
@@ -77,9 +85,6 @@ export default class AppTile extends React.Component {
             error: null,
             deleting: false,
             widgetPageTitle: newProps.widgetPageTitle,
-            allowedCapabilities: (this.props.whitelistCapabilities && this.props.whitelistCapabilities.length > 0) ?
-                this.props.whitelistCapabilities : [],
-            requestedCapabilities: [],
         };
     }
 
@@ -89,7 +94,7 @@ export default class AppTile extends React.Component {
      * @return {Boolean}            True if capability supported
      */
     _hasCapability(capability) {
-        return this.state.allowedCapabilities.some((c) => {return c === capability;});
+        return ActiveWidgetStore.widgetHasCapability(this.props.id, capability);
     }
 
     /**
@@ -142,30 +147,24 @@ export default class AppTile extends React.Component {
         window.addEventListener('message', this._onMessage, false);
 
         // Widget action listeners
-        this.dispatcherRef = dis.register(this._onWidgetAction);
-    }
-
-    componentDidUpdate() {
-        // Allow parents to access widget messaging
-        if (this.props.collectWidgetMessaging) {
-            this.props.collectWidgetMessaging(this.widgetMessaging);
-        }
+        this.dispatcherRef = dis.register(this._onAction);
     }
 
     componentWillUnmount() {
         // Widget action listeners
         dis.unregister(this.dispatcherRef);
 
-        // Widget postMessage listeners
-        try {
-            if (this.widgetMessaging) {
-                this.widgetMessaging.stop();
-            }
-        } catch (e) {
-            console.error('Failed to stop listening for widgetMessaging events', e.message);
-        }
         // Jitsi listener
         window.removeEventListener('message', this._onMessage);
+
+        // if it's not remaining on screen, get rid of the PersistedElement container
+        if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
+            // FIXME: ActiveWidgetStore should probably worry about this?
+            const PersistedElement = sdk.getComponent("elements.PersistedElement");
+            PersistedElement.destroyElement(this._persistKey);
+            ActiveWidgetStore.delWidgetMessaging(this.props.id);
+            ActiveWidgetStore.delWidgetCapabilities(this.props.id);
+        }
     }
 
     /**
@@ -286,7 +285,7 @@ export default class AppTile extends React.Component {
 
     _onSnapshotClick(e) {
         console.warn("Requesting widget snapshot");
-        this.widgetMessaging.getScreenshot()
+        ActiveWidgetStore.getWidgetMessaging(this.props.id).getScreenshot()
             .catch((err) => {
                 console.error("Failed to get screenshot", err);
             })
@@ -341,19 +340,19 @@ export default class AppTile extends React.Component {
      * Called when widget iframe has finished loading
      */
     _onLoaded() {
-        if (!this.widgetMessaging) {
-            this._onInitialLoad();
+        if (!ActiveWidgetStore.getWidgetMessaging(this.props.id)) {
+            this._setupWidgetMessaging();
         }
         this.setState({loading: false});
     }
 
-    /**
-     * Called on initial load of the widget iframe
-     */
-    _onInitialLoad() {
-        this.widgetMessaging = new WidgetMessaging(this.props.id, this.props.url, this.refs.appFrame.contentWindow);
-        this.widgetMessaging.getCapabilities().then((requestedCapabilities) => {
-            console.log(`Widget ${this.props.id} requested capabilities:`, requestedCapabilities);
+    _setupWidgetMessaging() {
+        // FIXME: There's probably no reason to do this here: it should probably be done entirely
+        // in ActiveWidgetStore.
+        const widgetMessaging = new WidgetMessaging(this.props.id, this.props.url, this.refs.appFrame.contentWindow);
+        ActiveWidgetStore.setWidgetMessaging(this.props.id, widgetMessaging);
+        widgetMessaging.getCapabilities().then((requestedCapabilities) => {
+            console.log(`Widget ${this.props.id} requested capabilities: ` + requestedCapabilities);
             requestedCapabilities = requestedCapabilities || [];
 
             // Allow whitelisted capabilities
@@ -365,16 +364,15 @@ export default class AppTile extends React.Component {
                 }, this.props.whitelistCapabilities);
 
                 if (requestedWhitelistCapabilies.length > 0 ) {
-                    console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties:`,
-                        requestedWhitelistCapabilies);
+                    console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties: ` +
+                        requestedWhitelistCapabilies,
+                    );
                 }
             }
 
             // TODO -- Add UI to warn about and optionally allow requested capabilities
-            this.setState({
-                requestedCapabilities,
-                allowedCapabilities: this.state.allowedCapabilities.concat(requestedWhitelistCapabilies),
-            });
+
+            ActiveWidgetStore.setWidgetCapabilities(this.props.id, requestedWhitelistCapabilies);
 
             if (this.props.onCapabilityRequest) {
                 this.props.onCapabilityRequest(requestedCapabilities);
@@ -384,7 +382,7 @@ export default class AppTile extends React.Component {
         });
     }
 
-    _onWidgetAction(payload) {
+    _onAction(payload) {
         if (payload.widgetId === this.props.id) {
             switch (payload.action) {
                 case 'm.sticker':
@@ -562,6 +560,15 @@ export default class AppTile extends React.Component {
                             ></iframe>
                         </div>
                     );
+                    // if the widget would be allowed to remian on screen, we must put it in
+                    // a PersistedElement from the get-go, otherwise the iframe will be
+                    // re-mounted later when we do.
+                    if (this.props.whitelistCapabilities.includes('m.always_on_screen')) {
+                        const PersistedElement = sdk.getComponent("elements.PersistedElement");
+                        appTileBody = <PersistedElement persistKey={this._persistKey}>
+                            {appTileBody}
+                        </PersistedElement>;
+                    }
                 }
             } else {
                 const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 6816b4dab3..6f4eb09898 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -22,8 +22,12 @@ const PropTypes = require('prop-types');
 // of doing reusable widgets like dialog boxes & menus where we go and
 // pass in a custom control as the actual body.
 
+function getContainer(containerId) {
+    return document.getElementById(containerId);
+}
+
 function getOrCreateContainer(containerId) {
-    let container = document.getElementById(containerId);
+    let container = getContainer(containerId);
 
     if (!container) {
         container = document.createElement("div");
@@ -60,6 +64,24 @@ export default class PersistedElement extends React.Component {
         this.collectChild = this.collectChild.bind(this);
     }
 
+    /**
+     * Removes the DOM elements created when a PersistedElement with the given
+     * persistKey was mounted. The DOM elements will be re-added if another
+     * PeristedElement is mounted in the future.
+     *
+     * @param {string} persistKey Key used to uniquely identify this PersistedElement
+     */
+    static destroyElement(persistKey) {
+        const container = getContainer('mx_persistedElement_' + persistKey);
+        if (container) {
+            container.remove();
+        }
+    }
+
+    static isMounted(persistKey) {
+        return Boolean(getContainer('mx_persistedElement_' + persistKey));
+    }
+
     collectChildContainer(ref) {
         this.childContainer = ref;
     }
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 04e47f0f9f..da8c558cb5 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -214,24 +215,30 @@ module.exports = React.createClass({
     render: function() {
         const enableScreenshots = SettingsStore.getValue("enableWidgetScreenshots", this.props.room.room_id);
 
-        const apps = this.state.apps.map(
-            (app, index, arr) => {
-                return (<AppTile
-                    key={app.id}
-                    id={app.id}
-                    url={app.url}
-                    name={app.name}
-                    type={app.type}
-                    fullWidth={arr.length<2 ? true : false}
-                    room={this.props.room}
-                    userId={this.props.userId}
-                    show={this.props.showApps}
-                    creatorUserId={app.creatorUserId}
-                    widgetPageTitle={(app.data && app.data.title) ? app.data.title : ''}
-                    waitForIframeLoad={app.waitForIframeLoad}
-                    whitelistCapabilities={enableScreenshots ? ["m.capability.screenshot"] : []}
-                />);
-            });
+        const apps = this.state.apps.map((app, index, arr) => {
+            const capWhitelist = enableScreenshots ? ["m.capability.screenshot"] : [];
+
+            // Obviously anyone that can add a widget can claim it's a jitsi widget,
+            // so this doesn't really offer much over the set of domains we load
+            // widgets from at all, but it probably makes sense for sanity.
+            if (app.type == 'jitsi') capWhitelist.push("m.always_on_screen");
+
+            return (<AppTile
+                key={app.id}
+                id={app.id}
+                url={app.url}
+                name={app.name}
+                type={app.type}
+                fullWidth={arr.length<2 ? true : false}
+                room={this.props.room}
+                userId={this.props.userId}
+                show={this.props.showApps}
+                creatorUserId={app.creatorUserId}
+                widgetPageTitle={(app.data && app.data.title) ? app.data.title : ''}
+                waitForIframeLoad={app.waitForIframeLoad}
+                whitelistCapabilities={capWhitelist}
+            />);
+        });
 
         let addWidget;
         if (this.props.showApps &&
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index d6afc28dad..45b89cbf62 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -24,6 +24,7 @@ import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
 import WidgetUtils from '../../../utils/WidgetUtils';
+import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 
 const widgetType = 'm.stickerpicker';
 
@@ -43,8 +44,6 @@ export default class Stickerpicker extends React.Component {
         this._onResize = this._onResize.bind(this);
         this._onFinished = this._onFinished.bind(this);
 
-        this._collectWidgetMessaging = this._collectWidgetMessaging.bind(this);
-
         this.popoverWidth = 300;
         this.popoverHeight = 300;
 
@@ -166,17 +165,10 @@ export default class Stickerpicker extends React.Component {
         );
     }
 
-    _collectWidgetMessaging(widgetMessaging) {
-        this._appWidgetMessaging = widgetMessaging;
-
-        // Do this now instead of in componentDidMount because we might not have had the
-        // reference to widgetMessaging when mounting
-        this._sendVisibilityToWidget(true);
-    }
-
     _sendVisibilityToWidget(visible) {
-        if (this._appWidgetMessaging && visible !== this._prevSentVisibility) {
-            this._appWidgetMessaging.sendVisibility(visible);
+        const widgetMessaging = ActiveWidgetStore.getWidgetMessaging(this.state.stickerpickerWidget.id);
+        if (widgetMessaging && visible !== this._prevSentVisibility) {
+            widgetMessaging.sendVisibility(visible);
             this._prevSentVisibility = visible;
         }
     }
@@ -217,7 +209,6 @@ export default class Stickerpicker extends React.Component {
                     >
                     <PersistedElement containerId="mx_persisted_stickerPicker" style={{zIndex: STICKERPICKER_Z_INDEX}}>
                         <AppTile
-                            collectWidgetMessaging={this._collectWidgetMessaging}
                             id={stickerpickerWidget.id}
                             url={stickerpickerWidget.content.url}
                             name={stickerpickerWidget.content.name}
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
new file mode 100644
index 0000000000..7c179aef84
--- /dev/null
+++ b/src/stores/ActiveWidgetStore.js
@@ -0,0 +1,84 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Stores information about the widgets active in the app right now:
+ *  * What widget is set to remain always-on-screen, if any
+ *    Only one widget may be 'always on screen' at any one time.
+ *  * Negotiated capabilities for active apps
+ */
+class ActiveWidgetStore {
+    constructor() {
+        this._persistentWidgetId = null;
+
+        // A list of negotiated capabilities for each widget, by ID
+        // {
+        //     widgetId: [caps...],
+        // }
+        this._capsByWidgetId = {};
+
+        // A WidgetMessaging instance for each widget ID
+        this._widgetMessagingByWidgetId = {};
+    }
+
+    setWidgetPersistence(widgetId, val) {
+        if (this._persistentWidgetId === widgetId && !val) {
+            this._persistentWidgetId = null;
+        } else if (this._persistentWidgetId !== widgetId && val) {
+            this._persistentWidgetId = widgetId;
+        }
+    }
+
+    getWidgetPersistence(widgetId) {
+        return this._persistentWidgetId === widgetId;
+    }
+
+    setWidgetCapabilities(widgetId, caps) {
+        this._capsByWidgetId[widgetId] = caps;
+    }
+
+    widgetHasCapability(widgetId, cap) {
+        return this._capsByWidgetId[widgetId] && this._capsByWidgetId[widgetId].includes(cap);
+    }
+
+    delWidgetCapabilities(widgetId) {
+        delete this._capsByWidgetId[widgetId];
+    }
+
+    setWidgetMessaging(widgetId, wm) {
+        this._widgetMessagingByWidgetId[widgetId] = wm;
+    }
+
+    getWidgetMessaging(widgetId) {
+        return this._widgetMessagingByWidgetId[widgetId];
+    }
+
+    delWidgetMessaging(widgetId) {
+        if (this._widgetMessagingByWidgetId[widgetId]) {
+            try {
+                this._widgetMessagingByWidgetId[widgetId].stop();
+            } catch (e) {
+                console.error('Failed to stop listening for widgetMessaging events', e.message);
+            }
+            delete this._widgetMessagingByWidgetId[widgetId];
+        }
+    }
+}
+
+if (global.singletonActiveWidgetStore === undefined) {
+    global.singletonActiveWidgetStore = new ActiveWidgetStore();
+}
+export default global.singletonActiveWidgetStore;

From f0dbd161b3dd4cee947c8ffa828017e8c8dd3a06 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Jul 2018 18:11:28 +0100
Subject: [PATCH 605/702] Obviously didn't mean to commit that change

---
 src/CallHandler.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 6f95c31175..7403483e36 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -444,8 +444,7 @@ function _startCallApp(roomId, type) {
         'email=$matrix_user_id',
     ].join('&');
     const widgetUrl = (
-        //'https://scalar.vector.im/api/widgets' +
-        'http://localhost:8620' +
+        'https://scalar.vector.im/api/widgets' +
         '/jitsi.html?' +
         queryString
     );

From b412b9e84d8023d2c4ba5cfac4a28f87b814c74c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 12 Jul 2018 15:19:25 +0200
Subject: [PATCH 606/702] Fix stopPeeking not being called at the right time

stopPeeking is currently not called when navigating to a joined room
after having peeked a room. This causes the /events endpoint for the
peeked room to be called until peeking another room, even when not
viewing the peeked room anymore.

The current code would only stop peeking if you joining were true (note the nesting),
e.g. when waiting for your join to be confirmed by /sync.

This change might make stopPeeking called also when not needed by there is a guard in
that method to do nothing if not currently peeking.
---
 src/components/structures/RoomView.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 98d700e0a0..b9d0843635 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -299,11 +299,11 @@ module.exports = React.createClass({
                         throw err;
                     }
                 });
+            } else if (room) {
+                // Stop peeking because we have joined this room previously
+                MatrixClientPeg.get().stopPeeking();
+                this.setState({isPeeking: false});
             }
-        } else if (room) {
-            // Stop peeking because we have joined this room previously
-            MatrixClientPeg.get().stopPeeking();
-            this.setState({isPeeking: false});
         }
     },
 

From 7405c5eff2f05d4a53633e936f515d70acc02924 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 12 Jul 2018 16:35:42 +0100
Subject: [PATCH 607/702] specify alternate history storage key to prevent
 conflicts with draft

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f9395abe59..89e4107a56 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -337,7 +337,7 @@ export default class MessageComposerInput extends React.Component {
 
     componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
-        this.historyManager = new ComposerHistoryManager(this.props.room.roomId);
+        this.historyManager = new ComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_');
     }
 
     componentWillUnmount() {

From 5a5e967262b749140e610fb87fe784426a6892aa Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Jul 2018 17:48:49 +0100
Subject: [PATCH 608/702] Fix avatars vanishing on hover

Turns out the z-index was to make the avatar appear above the
EventTile_line even though it comes before in the DOM (it's
absolutely positioned to overlap with it). Instead, just put
it afterwards in the DOM.
---
 src/components/views/rooms/EventTile.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index fff04d476d..0d8f2366ae 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -695,7 +695,6 @@ module.exports = withMatrixClient(React.createClass({
                         <div className="mx_EventTile_msgOption">
                             { readAvatars }
                         </div>
-                        { avatar }
                         { sender }
                         <div className="mx_EventTile_line">
                             <a href={permalink} onClick={this.onPermalinkClicked}>
@@ -712,6 +711,12 @@ module.exports = withMatrixClient(React.createClass({
                             { keyRequestInfo }
                             { editButton }
                         </div>
+                        {
+                            // The avatar goes after the event tile as it's absolutly positioned to be over the
+                            // event tile line, so needs to be later in the DOM so it appears on top (this avoids
+                            // the need for further z-indexing chaos)
+                        }
+                        { avatar }
                     </div>
                 );
             }

From 60a25b5263fd78b0ffaeaffb4cade5b24bffc1ee Mon Sep 17 00:00:00 2001
From: Aziz Ibrahimov <azizibragim@gmail.com>
Date: Thu, 12 Jul 2018 17:27:50 +0000
Subject: [PATCH 609/702] Translated using Weblate (Azerbaijani)

Currently translated at 33.0% (401 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
---
 src/i18n/strings/az.json | 377 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 376 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index 24f19a9ce6..954655019f 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -24,5 +24,380 @@
     "Notify me for anything else": "Bütün qalan hadisələrdə xəbər vermək",
     "Enable notifications for this account": "Bu hesab üçün xəbərdarlıqları qoşmaq",
     "All notifications are currently disabled for all targets.": "Bütün qurğular üçün bütün bildirişlər kəsilmişdir.",
-    "Add an email address above to configure email notifications": "Email-i bildirişlər üçün ünvanı əlavə edin"
+    "Add an email address above to configure email notifications": "Yuxarı email-i xəbərdarlıqların qurması üçün əlavə edin",
+    "Failed to verify email address: make sure you clicked the link in the email": "Email-i yoxlamağı bacarmadı: əmin olun ki, siz məktubda istinaddakı ünvana keçdiniz",
+    "The platform you're on": "İstifadə edilən platforma",
+    "The version of Riot.im": "Riot.im versiyası",
+    "Whether or not you're logged in (we don't record your user name)": "Siz sistemə girdiniz ya yox (biz sizin istifadəçinin adınızı saxlamırıq)",
+    "Your language of choice": "Seçilmiş dil",
+    "Which officially provided instance you are using, if any": "Hansı rəsmən dəstəklənən müştəri tərəfindən siz istifadə edirsiniz ( əgər istifadə edirsinizsə)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Siz Rich Text Editor redaktorunda Richtext rejimindən istifadə edirsinizmi",
+    "Your homeserver's URL": "Serverin URL-ünvanı",
+    "Your identity server's URL": "Eyniləşdirmənin serverinin URL-ünvanı",
+    "Every page you use in the app": "Hər səhifə, hansını ki, siz proqramda istifadə edirsiniz",
+    "e.g. <CurrentPageURL>": "məs. <CurrentPageURL>",
+    "Your User Agent": "Sizin istifadəçi agentiniz",
+    "Your device resolution": "Sizin cihazınızın qətnaməsi",
+    "The information being sent to us to help make Riot.im better includes:": "Riot.im'i daha yaxşı etmək üçün bizə göndərilən məlumatlar daxildir:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Əgər bu səhifədə şəxsi xarakterin məlumatları rast gəlinirsə, məsələn otağın, istifadəçinin adının və ya qrupun adı, onlar serverə göndərilmədən əvvəl silinirlər.",
+    "Call Timeout": "Cavab yoxdur",
+    "Unable to capture screen": "Ekranın şəkilini etməyə müvəffəq olmur",
+    "Existing Call": "Cari çağırış",
+    "You are already in a call.": "Danışıq gedir.",
+    "VoIP is unsupported": "Zənglər dəstəklənmir",
+    "You cannot place VoIP calls in this browser.": "Zənglər bu brauzerdə dəstəklənmir.",
+    "You cannot place a call with yourself.": "Siz özünə zəng vura bilmirsiniz.",
+    "Conference calls are not supported in encrypted rooms": "Konfrans-əlaqə şifrlənmiş otaqlarda dəstəklənmir",
+    "Conference calls are not supported in this client": "Bu müştəridə konfrans-əlaqə dəstəklənmir",
+    "Warning!": "Diqqət!",
+    "Conference calling is in development and may not be reliable.": "Konfrans-əlaqə hazırlamadadır və işləməyə bilər.",
+    "Failed to set up conference call": "Konfrans-zəngi etməyi bacarmadı",
+    "Conference call failed.": "Konfrans-zəngin nasazlığı.",
+    "Upload Failed": "Faylın göndərilməsinin nasazlığı",
+    "Failure to create room": "Otağı yaratmağı bacarmadı",
+    "Sun": "Baz",
+    "Mon": "Ber",
+    "Tue": "Çax",
+    "Wed": "Çər",
+    "Thu": "Cax",
+    "Fri": "Cüm",
+    "Sat": "Şən",
+    "Jan": "Yan",
+    "Feb": "Fev",
+    "Mar": "Mar",
+    "Apr": "Apr",
+    "May": "May",
+    "Jun": "Iyun",
+    "Jul": "Iyul",
+    "Aug": "Avg",
+    "Sep": "Sen",
+    "Oct": "Okt",
+    "Nov": "Noy",
+    "Dec": "Dek",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "Unable to enable Notifications": "Xəbərdarlıqları daxil qoşmağı bacarmadı",
+    "Default": "İştirakçı",
+    "Moderator": "Moderator",
+    "Admin": "Administrator",
+    "Start a chat": "Danışığa başlamaq",
+    "Who would you like to communicate with?": "Kimlə siz əlaqə saxlamaq istəyirdiniz?",
+    "Email, name or matrix ID": "Email, ad və ya ZT-ID",
+    "Start Chat": "Danışığa başlamaq",
+    "Invite new room members": "Yeni iştirakçıların otağına dəvət etmək",
+    "Who would you like to add to this room?": "Bu otaqa kimi dəvət etmək istərdiniz?",
+    "You need to be logged in.": "Siz sistemə girməlisiniz.",
+    "You need to be able to invite users to do that.": "Bunun üçün siz istifadəçiləri dəvət etmək imkanına malik olmalısınız.",
+    "Failed to send request.": "Sorğunu göndərməyi bacarmadı.",
+    "Power level must be positive integer.": "Hüquqların səviyyəsi müsbət tam ədəd olmalıdır.",
+    "Missing room_id in request": "Sorğuda room_id yoxdur",
+    "Missing user_id in request": "Sorğuda user_id yoxdur",
+    "Usage": "İstifadə",
+    "/ddg is not a command": "/ddg — bu komanda deyil",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Bu funksiyadan istifadə etmək üçün, avto-əlavənin pəncərəsində nəticələrin yükləməsini gözləyin, sonra burulma üçün Tab-dan istifadə edin.",
+    "Changes your display nickname": "Sizin təxəllüsünüz dəyişdirir",
+    "Invites user with given id to current room": "Verilmiş ID-lə istifadəçini cari otağa dəvət edir",
+    "Joins room with given alias": "Verilmiş təxəllüslə otağa daxil olur",
+    "Leave room": "Otağı tərk etmək",
+    "Kicks user with given id": "Verilmiş ID-lə istifadəçini çıxarır",
+    "Bans user with given id": "Verilmiş ID-lə istifadəçini bloklayır",
+    "Ignores a user, hiding their messages from you": "Sizdən mesajları gizlədərək istifadəçini bloklayır",
+    "Ignored user": "İstifadəçi blokun siyahısına əlavə edilmişdir",
+    "You are now ignoring %(userId)s": "Siz %(userId)s blokladınız",
+    "Stops ignoring a user, showing their messages going forward": "Onların gələcək mesajlarını göstərərək istifadəçinin bloku edilməsi durdurur",
+    "Unignored user": "İstifadəçi blokun siyahısından götürülmüşdür",
+    "You are no longer ignoring %(userId)s": "Siz %(userId)s blokdan çıxardınız",
+    "Deops user with given id": "Verilmiş ID-lə istifadəçidən operatorun səlahiyyətlərini çıxardır",
+    "Displays action": "Hərəkətlərin nümayişi",
+    "Reason": "Səbəb",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s  %(displayName)s-dən dəvəti qəbul etdi.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s dəvəti qəbul etdi.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s %(targetName)s-nı dəvət edir.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s  %(targetName)s-i blokladı.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s öz görünüş adını sildi (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s avatarını sildi.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s öz avatar-ı dəyişdirdi.",
+    "VoIP conference started.": "Konfrans-zəng başlandı.",
+    "%(targetName)s joined the room.": "%(targetName)s otağa girdi.",
+    "VoIP conference finished.": "Konfrans-zəng qurtarılmışdır.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s dəvəti rədd etdi.",
+    "%(targetName)s left the room.": "%(targetName)s otaqdan çıxdı.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s %(targetName)s blokdan çıxardı.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s %(targetName)s-nı qovdu.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s öz dəvətini sildi %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s otağın mövzusunu \"%(topic)s\" dəyişdirdi.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s otağın adını %(roomName)s dəyişdirdi.",
+    "(not supported by this browser)": "(bu brauzerlə dəstəklənmir)",
+    "%(senderName)s answered the call.": "%(senderName)s zəngə cavab verdi.",
+    "%(senderName)s ended the call.": "%(senderName)s zəng qurtardı.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ) %(callType)s-zəng başladı.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s dəvət edilmiş iştirakçılar üçün danışıqların tarixini açdı.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s girmiş iştirakçılar üçün danışıqların tarixini açdı.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s iştirakçılar üçün danışıqların tarixini açdı.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hamı üçün danışıqların tarixini açdı.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s naməlum rejimdə otağın tarixini açdı (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включил(а) в комнате сквозное шифрование (алгоритм %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s üçün  %(fromPowerLevel)s-dan %(toPowerLevel)s-lə",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hüquqların səviyyələrini dəyişdirdi %(powerLevelDiffText)s.",
+    "%(displayName)s is typing": "%(displayName)s çap edir",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s və %(lastPerson)s çap edirlər",
+    "Failed to join room": "Otağa girməyi bacarmadı",
+    "Disable Emoji suggestions while typing": "Mətnin yığılması vaxtı Emoji-i təklif etməmək",
+    "Hide read receipts": "Oxuma haqqında nişanları gizlətmək",
+    "Always show message timestamps": "Həmişə mesajların göndərilməsi vaxtını göstərmək",
+    "Autoplay GIFs and videos": "GIF animasiyalarını və videolarını avtomatik olaraq oynayır",
+    "Don't send typing notifications": "Nə vaxt ki, mən çap edirəm, o haqda bildirişləri göndərməmək",
+    "Never send encrypted messages to unverified devices from this device": "Heç vaxt (bu qurğudan) yoxlanılmamış qurğulara şifrlənmiş mesajları göndərməmək",
+    "Never send encrypted messages to unverified devices in this room from this device": "Heç vaxt (bu otaqda, bu qurğudan) yoxlanılmamış qurğulara şifrlənmiş mesajları göndərməmək",
+    "Accept": "Qəbul etmək",
+    "Error": "Səhv",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Mətn mesajı +%(msisdn)s-a göndərilmişdi. Mesajdan yoxlama kodunu daxil edin",
+    "Incorrect verification code": "Təsdiq etmənin səhv kodu",
+    "Enter Code": "Kodu daxil etmək",
+    "Phone": "Telefon",
+    "Add phone number": "Telefon nömrəsini əlavə etmək",
+    "New passwords don't match": "Yeni şifrlər uyğun gəlmir",
+    "Passwords can't be empty": "Şifrələr boş ola bilməz",
+    "Continue": "Davam etmək",
+    "Export E2E room keys": "Şifrləmənin açarlarının ixracı",
+    "Current password": "Cari şifrə",
+    "Password": "Şifrə",
+    "New Password": "Yeni şifrə",
+    "Confirm password": "Yeni şifrə təsdiq edin",
+    "Change Password": "Şifrəni dəyişdirin",
+    "Authentication": "Müəyyənləşdirilmə",
+    "Device ID": "Qurğunun ID-i",
+    "Failed to set display name": "Görünüş adını təyin etmək bacarmadı",
+    "Notification targets": "Xəbərdarlıqlar üçün qurğular",
+    "On": "Qoşmaq",
+    "Invalid alias format": "Adının yolverilməz formatı",
+    "'%(alias)s' is not a valid format for an alias": "Ad '%(alias)s' yolverilməz formata malikdir",
+    "Invalid address format": "Ünvanın yolverilməz formatı",
+    "'%(alias)s' is not a valid format for an address": "Ünvan '%(alias)s' yolverilməz formata malikdir",
+    "not specified": "qeyd edilmədi",
+    "not set": "qeyd edilmədi",
+    "Local addresses for this room:": "Sizin serverinizdə bu otağın ünvanları:",
+    "New address (e.g. #foo:%(localDomain)s)": "Yeni ünvan (məsələn, #nəsə:%(localDomain)s)",
+    "Blacklisted": "Qara siyahıda",
+    "Disinvite": "Dəvəti geri çağırmaq",
+    "Kick": "Qovmaq",
+    "Failed to kick": "Qovmağı bacarmadı",
+    "Unban": "Blokdan çıxarmaq",
+    "Ban": "Bloklamaq",
+    "Failed to ban user": "İstifadəçini bloklamağı bacarmadı",
+    "Failed to mute user": "İstifadəçini kəsməyi bacarmadı",
+    "Failed to toggle moderator status": "Moderatorun statusunu dəyişdirməyi bacarmadı",
+    "Failed to change power level": "Hüquqların səviyyəsini dəyişdirməyi bacarmadı",
+    "Are you sure?": "Siz əminsiniz?",
+    "No devices with registered encryption keys": "Şifrləmənin qeyd edilmiş açarlarıyla qurğu yoxdur",
+    "Devices": "Qurğular",
+    "Unignore": "Blokdan çıxarmaq",
+    "Ignore": "Bloklamaq",
+    "User Options": "Hərəkətlər",
+    "Direct chats": "Şəxsi çatlar",
+    "Level:": "Səviyyə:",
+    "Invited": "Dəvət edilmişdir",
+    "Filter room members": "İştirakçılara görə axtarış",
+    "Attachment": "Əlavə",
+    "Upload Files": "Faylların göndərilməsi",
+    "Are you sure you want to upload the following files?": "Siz əminsiniz ki, siz bu faylları göndərmək istəyirsiniz?",
+    "Encrypted room": "Şifrlənmiş otaq",
+    "Unencrypted room": "Şifrələnməyən otaq",
+    "Hangup": "Bitirmək",
+    "Voice call": "Səs çağırış",
+    "Video call": "Video çağırış",
+    "Upload file": "Faylı göndərmək",
+    "You do not have permission to post to this room": "Siz bu otağa yaza bilmirsiniz",
+    "Hide Text Formatting Toolbar": "Mətnin formatlaşdırılmasının alətlərini gizlətmək",
+    "Command error": "Komandanın səhvi",
+    "Markdown is disabled": "Markdown kəsilmişdir",
+    "Markdown is enabled": "Markdown qoşulmuşdur",
+    "Join Room": "Otağa girmək",
+    "Upload avatar": "Avatar-ı yükləmək",
+    "Settings": "Qurmalar",
+    "Forget room": "Otağı unutmaq",
+    "Drop here to tag %(section)s": "Bura daşıyın %(section)s nişan qoymaq üçün",
+    "Invites": "Dəvətlər",
+    "Favourites": "Seçilmişlər",
+    "People": "İnsanlar",
+    "Low priority": "Əhəmiyyətsizlər",
+    "Historical": "Arxiv",
+    "Rejoin": "Yenidən girmək",
+    "You are trying to access %(roomName)s.": "Siz %(roomName)s-a girməyə çalışırsınız.",
+    "You are trying to access a room.": "Siz otağa girməyə çalışırsınız.",
+    "<a>Click here</a> to join the discussion!": "<a>Qoşulmaq üçün</a> buraya basın!",
+    "Failed to unban": "Blokdan çıxarmağı bacarmadı",
+    "Banned by %(displayName)s": "%(displayName)s bloklanıb ",
+    "Changes to who can read history will only apply to future messages in this room": "Tarixə girişin qaydalarının dəyişikliyi yalnız bu otaqda gələcək mesajlara tətbiq ediləcək",
+    "unknown error code": "naməlum səhv kodu",
+    "Failed to forget room %(errCode)s": "Otağı unutmağı bacarmadı: %(errCode)s",
+    "End-to-end encryption is in beta and may not be reliable": "İki tərəfi açıq şifrləmə indi beta-testdə və işləməyə bilər",
+    "You should not yet trust it to secure data": "Hal-hazırda yazışmalarınızın şifrələnəcəyinə etibar etməməlisiniz",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Qurğular otağa girişinin anına qədər mesajların tarixinin şifrini aça bilməyəcək",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Otaqda şifrləmənin qoşmasından sonra siz o yenidən söndürə bilməyəcəksiniz  (müvəqqəti)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Şifrlənmiş mesajlar daha iki tərəfi açıq şifrləməni dəstəkləməyən müştərilərdə görülməyəcək",
+    "Enable encryption": "Şifrləməni qoşmaq",
+    "(warning: cannot be disabled again!)": "(xəbərdarlıq: dəyişdirmək mümkün olmayacaq!)",
+    "To send messages, you must be a": "Mesajların göndərilməsi üçün, olmaq lazımdır",
+    "To invite users into the room, you must be a": "Otağa iştirakçıları dəvət etmək üçün, olmaq lazımdır",
+    "No users have specific privileges in this room": "Heç bir istifadəçi bu otaqda xüsusi hüquqlara malik deyil",
+    "Banned users": "Bloklanmış istifadəçilər",
+    "Favourite": "Seçilmiş",
+    "Click here to fix": "Düzəltmək üçün, buraya basın",
+    "Who can access this room?": "Kim bu otağa girə bilər?",
+    "Only people who have been invited": "Yalnız dəvət edilmiş iştirakçılar",
+    "Anyone who knows the room's link, apart from guests": "Hamı, kimdə bu otağa istinad var, qonaqlardan başqa",
+    "Anyone who knows the room's link, including guests": "Hamı, kimdə bu otağa istinad var, qonaqlar daxil olmaqla",
+    "Who can read history?": "Kim tarixi oxuya bilər?",
+    "Permissions": "Girişin hüquqları",
+    "Advanced": "Təfərrüatlar",
+    "Close": "Bağlamaq",
+    "Sunday": "Bazar",
+    "Friday": "Cümə",
+    "Today": "Bu gün",
+    "Decrypt %(text)s": "Şifrini açmaq %(text)s",
+    "Download %(text)s": "Yükləmək %(text)s",
+    "Message removed by %(userId)s": "%(userId)s mesajı silinmişdir",
+    "Password:": "Şifrə:",
+    "Username on %(hs)s": "İstifadəçinin adı %(hs)s",
+    "User name": "İstifadəçinin adı",
+    "Mobile phone number": "Mobil telefonun nömrəsi",
+    "Forgot your password?": "Şifrənizi unutmusunuz?",
+    "Sign in with": "Seçmək:",
+    "Email address (optional)": "Email (qeyri-məcburi)",
+    "Mobile phone number (optional)": "Mobil telefonun (qeyri-məcburi) nömrəsi",
+    "Register": "Qeydiyyatdan keçmək",
+    "Remove": "Silmək",
+    "You are not receiving desktop notifications": "Siz sistem xəbərdarlıqlarını almırsınız",
+    "What's New": "Nə dəyişdi",
+    "Update": "Yeniləmək",
+    "Create new room": "Otağı yaratmaq",
+    "No results": "Nəticə yoxdur",
+    "Delete": "Silmək",
+    "Home": "Başlanğıc",
+    "Could not connect to the integration server": "İnteqrasiyanın serverinə qoşulmağ mümkün deyil",
+    "Manage Integrations": "İnteqrasiyaları idarə etmə",
+    "%(items)s and %(lastItem)s": "%(items)s və %(lastItem)s",
+    "Room directory": "Otaqların kataloqu",
+    "Start chat": "Çata başlamaq",
+    "Create Room": "Otağı yaratmaq",
+    "Advanced options": "Daha çox seçim",
+    "Block users on other matrix homeservers from joining this room": "Başqa serverlərdən bu otağa daxil olan istifadəçiləri bloklamaq",
+    "This setting cannot be changed later!": "Bu seçim sonra dəyişdirmək olmaz!",
+    "Deactivate Account": "Hesabı bağlamaq",
+    "Send Account Data": "Hesabın məlumatlarını göndərmək",
+    "An error has occurred.": "Səhv oldu.",
+    "Invalid Email Address": "Yanlış email",
+    "Verification Pending": "Gözləmə təsdiq etmələr",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Öz elektron poçtunu yoxlayın və olan istinadı basın. Bundan sonra düyməni Davam etməyə basın.",
+    "Unable to add email address": "Email-i əlavə etməyə müvəffəq olmur",
+    "Unable to verify email address.": "Email-i yoxlamağı bacarmadı.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "İstifadəçilərin adları yalnız hərfləri, rəqəmləri, nöqtələri, defisləri və altından xətt çəkmənin simvollarını özündə saxlaya bilər.",
+    "Username not available": "İstifadəçi adı mövcud deyil",
+    "An error occurred: %(error_string)s": "Səhv baş verdi: %(error_string)s",
+    "Username available": "İstifadəçi adı mövcuddur",
+    "Failed to change password. Is your password correct?": "Şifrəni əvəz etməyi bacarmadı. Siz cari şifrə düzgün daxil etdiniz?",
+    "Reject invitation": "Dəvəti rədd etmək",
+    "Are you sure you want to reject the invitation?": "Siz əminsiniz ki, siz dəvəti rədd etmək istəyirsiniz?",
+    "Name": "Ad",
+    "Topic": "Mövzu",
+    "Make this room private": "Bu otağı bağlanmış etmək",
+    "Share message history with new users": "Mesajların tarixinə girişi yeni istifadəçilərə icazə vermək",
+    "Encrypt room": "Otağın şifrələnməsi",
+    "There are no visible files in this room": "Bu otaqda görülən fayl yoxdur",
+    "Featured Users:": "Seçilmiş istifadəçilər:",
+    "Couldn't load home page": "Ana səhifəni yükləməyi bacarmadı",
+    "Failed to reject invitation": "Dəvəti rədd etməyi bacarmadı",
+    "Failed to leave room": "Otaqdan çıxmağı bacarmadı",
+    "For security, this session has been signed out. Please sign in again.": "Təhlükəsizliyin təmin olunması üçün sizin sessiyanız başa çatmışdır idi. Zəhmət olmasa, yenidən girin.",
+    "Logout": "Çıxmaq",
+    "You have no visible notifications": "Görülən xəbərdarlıq yoxdur",
+    "Files": "Fayllar",
+    "Notifications": "Xəbərdarlıqlar",
+    "Hide panel": "Paneli gizlətmək",
+    "#example": "#misal",
+    "Connectivity to the server has been lost.": "Serverlə əlaqə itirilmişdir.",
+    "Sent messages will be stored until your connection has returned.": "Hələ ki serverlə əlaqə bərpa olmayacaq, göndərilmiş mesajlar saxlanacaq.",
+    "Active call": "Aktiv çağırış",
+    "Failed to upload file": "Faylı göndərməyi bacarmadı",
+    "No more results": "Daha çox nəticə yoxdur",
+    "Failed to save settings": "Qurmaları saxlamağı bacarmadı",
+    "Failed to reject invite": "Dəvəti rədd etməyi bacarmadı",
+    "Fill screen": "Ekranı doldurmaq",
+    "Click to unmute video": "Klikləyin, videonu qoşmaq üçün",
+    "Click to mute video": "Klikləyin, videonu söndürmək üçün",
+    "Click to unmute audio": "Klikləyin, səsi qoşmaq üçün",
+    "Click to mute audio": "Klikləyin, səsi söndürmək üçün",
+    "Expand panel": "Paneli açmaq",
+    "Filter room names": "Otaqlar üzrə axtarış",
+    "Failed to load timeline position": "Xronologiyadan nişanı yükləməyi bacarmadı",
+    "Can't load user settings": "İstifadəçi qurmalarını yükləmək mümkün deyil",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Şifrə uğurla dəyişdirildi. Təkrar avtorizasiyaya qədər siz başqa cihazlarda push-xəbərdarlıqları almayacaqsınız",
+    "Remove Contact Information?": "Əlaqə məlumatı silinsin?",
+    "Unable to remove contact information": "Əlaqə məlumatlarının silməyi bacarmadı",
+    "Interface Language": "İnterfeysin dili",
+    "User Interface": "İstifadəçi interfeysi",
+    "<not supported>": "<dəstəklənmir>",
+    "Import E2E room keys": "Şifrləmənin açarlarının idxalı",
+    "Cryptography": "Kriptoqrafiya",
+    "Ignored Users": "Bloklanan istifadəçilər",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Məxfilik bizim üçün əhəmiyyətlidir, buna görə biz bizim analitikamız üçün heç bir şəxsi və ya müəyyən edən məlumat yığmırıq.",
+    "Learn more about how we use analytics.": "O haqda daha ətraflı, necə biz analitikadan istifadə edirik.",
+    "Labs": "Laboratoriya",
+    "Use with caution": "Ehtiyatlılıqla istifadə etmək",
+    "Deactivate my account": "Mənim hesabımı bağlamaq",
+    "Clear Cache": "Keşi təmizləmək",
+    "Clear Cache and Reload": "Keşi təmizləmək və yenidən yükləmək",
+    "Bulk Options": "Qrup parametrləri",
+    "Email": "E-poçt",
+    "Add email address": "Email-i əlavə etmək",
+    "Profile": "Profil",
+    "Display name": "Göstərilən ad",
+    "Account": "Hesab",
+    "Access Token:": "Girişin token-i:",
+    "click to reveal": "açılış üçün basın",
+    "Homeserver is": "Ev serveri bu",
+    "Identity Server is": "Eyniləşdirmənin serveri bu",
+    "matrix-react-sdk version:": "matrix-react-sdk versiyası:",
+    "olm version:": "Olm versiyası:",
+    "Failed to send email": "Email göndərilməsinin səhvi",
+    "A new password must be entered.": "Yeni parolu daxil edin.",
+    "New passwords must match each other.": "Yeni şifrələr uyğun olmalıdır.",
+    "I have verified my email address": "Mən öz email-i təsdiq etdim",
+    "Your password has been reset": "Sizin şifrə sıfırlandı",
+    "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": "Siz bütün qurğulardan çıxdınız və push-xəbərdarlıqları almayacaqsınız. Xəbərdarlıq aktivləşdirmək üçün hər cihaza yenidən daxil olun",
+    "Return to login screen": "Girişin ekranına qayıtmaq",
+    "New password": "Yeni şifrə",
+    "Confirm your new password": "Yeni Şifrə təsdiq edin",
+    "Send Reset Email": "Şifrənizi sıfırlamaq üçün istinadla məktubu göndərmək",
+    "Create an account": "Hesabı yaratmaq",
+    "Set a display name:": "Görünüş adını daxil edin:",
+    "Upload an avatar:": "Avatar yüklə:",
+    "This server does not support authentication with a phone number.": "Bu server telefon nömrəsinin köməyi ilə müəyyənləşdirilməni dəstəkləmir.",
+    "Missing password.": "Şifrə yoxdur.",
+    "Passwords don't match.": "Şifrələr uyğun gəlmir.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Şifrə çox qısa (min. %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Bu etibarlı bir e-poçt kimi görünmür.",
+    "This doesn't look like a valid phone number.": "Yanlış telefon nömrəsi.",
+    "An unknown error occurred.": "Bilinməyən bir səhv baş verdi.",
+    "I already have an account": "Məndə hesab var",
+    "Commands": "Komandalar",
+    "Emoji": "Smaylar",
+    "Users": "İstifadəçilər",
+    "unknown device": "naməlum cihaz",
+    "NOT verified": "Yoxlanmamışdır",
+    "verified": "yoxlanmış",
+    "Verification": "Yoxlama",
+    "Ed25519 fingerprint": "Ed25519 iz",
+    "User ID": "İstifadəçinin ID-i",
+    "Curve25519 identity key": "Kimlik açarı Curve25519",
+    "none": "heç kim",
+    "Claimed Ed25519 fingerprint key": "Ed25519-un rəqəmli izinin tələb edilən açarı",
+    "Algorithm": "Alqoritm",
+    "unencrypted": "şifrləməsiz",
+    "Decryption error": "Şifrələmə xətası",
+    "End-to-end encryption information": "İki tərəfi açıq şifrləmə haqqında məlumatlar",
+    "Event information": "Hadisə haqqında informasiya",
+    "Confirm passphrase": "Şifrəni təsdiqləyin"
 }

From e56feea9ec235c4d00afc82389a47ec3559c875f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Jul 2018 18:43:49 +0100
Subject: [PATCH 610/702] Put always-on-screen widgets in top left

always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.

Fixes https://github.com/vector-im/riot-web/issues/7007
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053
---
 package.json                                  |  1 +
 res/css/structures/_LeftPanel.scss            |  4 +
 res/css/views/rooms/_AppsDrawer.scss          |  6 ++
 src/components/views/elements/AppTile.js      | 15 +++-
 .../views/elements/PersistedElement.js        | 22 ++++-
 .../views/elements/PersistentApp.js           | 88 +++++++++++++++++++
 src/components/views/rooms/AppsDrawer.js      | 60 +------------
 src/components/views/voip/CallPreview.js      |  5 +-
 src/stores/ActiveWidgetStore.js               | 19 ++++
 src/utils/WidgetUtils.js                      | 64 ++++++++++++++
 10 files changed, 217 insertions(+), 67 deletions(-)
 create mode 100644 src/components/views/elements/PersistentApp.js

diff --git a/package.json b/package.json
index 8c0ec922f2..570f57abb5 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^15.6.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
+    "resize-observer-polyfill": "^1.5.0",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 96ed5878ac..bedec0e363 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -54,6 +54,10 @@ limitations under the License.
 
 }
 
+.mx_LeftPanel .mx_AppTileFullWidth  {
+    height: 132px;
+}
+
 .mx_LeftPanel .mx_RoomList_scrollbar {
     order: 1;
 
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 28d432686d..6431853672 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -126,6 +126,12 @@ limitations under the License.
     overflow: hidden;
 }
 
+.mx_AppTileBody_mini {
+    height: 132px;
+    width: 100%;
+    overflow: hidden;
+}
+
 .mx_AppTileBody iframe {
     width: 100%;
     height: 280px;
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index cf69727b15..e287abd07a 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -164,6 +164,7 @@ export default class AppTile extends React.Component {
             PersistedElement.destroyElement(this._persistKey);
             ActiveWidgetStore.delWidgetMessaging(this.props.id);
             ActiveWidgetStore.delWidgetCapabilities(this.props.id);
+            ActiveWidgetStore.delRoomId(this.props.id);
         }
     }
 
@@ -343,6 +344,7 @@ export default class AppTile extends React.Component {
         if (!ActiveWidgetStore.getWidgetMessaging(this.props.id)) {
             this._setupWidgetMessaging();
         }
+        ActiveWidgetStore.setRoomId(this.props.id, this.props.room.roomId);
         this.setState({loading: false});
     }
 
@@ -522,6 +524,8 @@ export default class AppTile extends React.Component {
         // (see - https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-permissions-in-cross-origin-iframes and https://wicg.github.io/feature-policy/)
         const iframeFeatures = "microphone; camera; encrypted-media;";
 
+        const appTileBodyClass = 'mx_AppTileBody' + (this.props.miniMode ? '_mini  ' : ' ');
+
         if (this.props.show) {
             const loadingElement = (
                 <div className="mx_AppLoading_spinner_fadeIn">
@@ -530,20 +534,20 @@ export default class AppTile extends React.Component {
             );
             if (this.state.initialising) {
                 appTileBody = (
-                    <div className={'mx_AppTileBody ' + (this.state.loading ? 'mx_AppLoading' : '')}>
+                    <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')}>
                         { loadingElement }
                     </div>
                 );
             } else if (this.state.hasPermissionToLoad == true) {
                 if (this.isMixedContent()) {
                     appTileBody = (
-                        <div className="mx_AppTileBody">
+                        <div className={appTileBodyClass}>
                             <AppWarning errorMsg="Error - Mixed content" />
                         </div>
                     );
                 } else {
                     appTileBody = (
-                        <div className={'mx_AppTileBody ' + (this.state.loading ? 'mx_AppLoading' : '')}>
+                        <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')}>
                             { this.state.loading && loadingElement }
                             { /*
                                 The "is" attribute in the following iframe tag is needed in order to enable rendering of the
@@ -573,7 +577,7 @@ export default class AppTile extends React.Component {
             } else {
                 const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
                 appTileBody = (
-                    <div className="mx_AppTileBody">
+                    <div className={appTileBodyClass}>
                         <AppPermission
                             isRoomEncrypted={isRoomEncrypted}
                             url={this.state.widgetUrl}
@@ -686,6 +690,8 @@ AppTile.propTypes = {
     // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
     // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
     fullWidth: PropTypes.bool,
+    // Optional. If set, renders a smaller view of the widget
+    miniMode: PropTypes.bool,
     // UserId of the current user
     userId: PropTypes.string.isRequired,
     // UserId of the entity that added / modified the widget
@@ -738,4 +744,5 @@ AppTile.defaultProps = {
     handleMinimisePointerEvents: false,
     whitelistCapabilities: [],
     userWidget: false,
+    miniMode: false,
 };
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 6f4eb09898..6a10fadeb3 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -14,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const React = require('react');
-const ReactDOM = require('react-dom');
-const PropTypes = require('prop-types');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import PropTypes from 'prop-types';
+
+import ResizeObserver from 'resize-observer-polyfill';
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
@@ -62,6 +64,9 @@ export default class PersistedElement extends React.Component {
         super();
         this.collectChildContainer = this.collectChildContainer.bind(this);
         this.collectChild = this.collectChild.bind(this);
+        this._onContainerResize = this._onContainerResize.bind(this);
+
+        this.resizeObserver = new ResizeObserver(this._onContainerResize);
     }
 
     /**
@@ -83,7 +88,13 @@ export default class PersistedElement extends React.Component {
     }
 
     collectChildContainer(ref) {
+        if (this.childContainer) {
+            this.resizeObserver.unobserve(this.childContainer);
+        }
         this.childContainer = ref;
+        if (ref) {
+            this.resizeObserver.observe(ref);
+        }
     }
 
     collectChild(ref) {
@@ -101,6 +112,11 @@ export default class PersistedElement extends React.Component {
 
     componentWillUnmount() {
         this.updateChildVisibility(this.child, false);
+        this.resizeObserver.disconnect();
+    }
+
+    _onContainerResize() {
+        this.updateChildPosition(this.child, this.childContainer);
     }
 
     updateChild() {
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
new file mode 100644
index 0000000000..0f419ab874
--- /dev/null
+++ b/src/components/views/elements/PersistentApp.js
@@ -0,0 +1,88 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import RoomViewStore from '../../../stores/RoomViewStore';
+import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
+import WidgetUtils from '../../../utils/WidgetUtils';
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+
+module.exports = React.createClass({
+    displayName: 'PersistentApp',
+
+    getInitialState: function() {
+        return {
+            roomId: RoomViewStore.getRoomId(),
+        };
+    },
+
+    componentWillMount: function() {
+        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+    },
+
+    componentWillUnmount: function() {
+        if (this._roomStoreToken) {
+            this._roomStoreToken.remove();
+        }
+    },
+
+    _onRoomViewStoreUpdate: function(payload) {
+        if (RoomViewStore.getRoomId() === this.state.roomId) return;
+        this.setState({
+            roomId: RoomViewStore.getRoomId(),
+        });
+    },
+
+    render: function() {
+        if (ActiveWidgetStore.getPersistentWidgetId()) {
+            const persistentWidgetInRoomId = ActiveWidgetStore.getRoomId(ActiveWidgetStore.getPersistentWidgetId());
+            if (this.state.roomId !== persistentWidgetInRoomId) {
+                const persistentWidgetInRoom = MatrixClientPeg.get().getRoom(persistentWidgetInRoomId);
+                // get the widget data
+                const appEvent = WidgetUtils.getRoomWidgets(persistentWidgetInRoom).find((ev) => {
+                    return ev.getStateKey() === ActiveWidgetStore.getPersistentWidgetId();
+                });
+                const app = WidgetUtils.makeAppConfig(
+                    appEvent.getStateKey(), appEvent.getContent(), appEvent.sender, persistentWidgetInRoomId,
+                );
+                const capWhitelist = WidgetUtils.getCapWhitelistForAppTypeInRoomId(app.type, persistentWidgetInRoomId);
+                const AppTile = sdk.getComponent('elements.AppTile');
+                return <AppTile
+                    key={app.id}
+                    id={app.id}
+                    url={app.url}
+                    name={app.name}
+                    type={app.type}
+                    fullWidth={true}
+                    room={persistentWidgetInRoom}
+                    userId={MatrixClientPeg.get().credentials.userId}
+                    show={true}
+                    creatorUserId={app.creatorUserId}
+                    widgetPageTitle={(app.data && app.data.title) ? app.data.title : ''}
+                    waitForIframeLoad={app.waitForIframeLoad}
+                    whitelistCapabilities={capWhitelist}
+                    showDelete={false}
+                    showMinimise={false}
+                    miniMode={true}
+                />;
+            }
+        }
+        return null;
+    },
+});
+
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index da8c558cb5..aa086f8260 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -107,55 +107,6 @@ module.exports = React.createClass({
         }
     },
 
-    /**
-     * Encodes a URI according to a set of template variables. Variables will be
-     * passed through encodeURIComponent.
-     * @param {string} pathTemplate The path with template variables e.g. '/foo/$bar'.
-     * @param {Object} variables The key/value pairs to replace the template
-     * variables with. E.g. { '$bar': 'baz' }.
-     * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
-     */
-    encodeUri: function(pathTemplate, variables) {
-        for (const key in variables) {
-            if (!variables.hasOwnProperty(key)) {
-                continue;
-            }
-            pathTemplate = pathTemplate.replace(
-                key, encodeURIComponent(variables[key]),
-            );
-        }
-        return pathTemplate;
-    },
-
-    _initAppConfig: function(appId, app, sender) {
-        const user = MatrixClientPeg.get().getUser(this.props.userId);
-        const params = {
-            '$matrix_user_id': this.props.userId,
-            '$matrix_room_id': this.props.room.roomId,
-            '$matrix_display_name': user ? user.displayName : this.props.userId,
-            '$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',
-
-            // TODO: Namespace themes through some standard
-            '$theme': SettingsStore.getValue("theme"),
-        };
-
-        app.id = appId;
-        app.name = app.name || app.type;
-
-        if (app.data) {
-            Object.keys(app.data).forEach((key) => {
-                params['$' + key] = app.data[key];
-            });
-
-            app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
-        }
-
-        app.url = this.encodeUri(app.url, params);
-        app.creatorUserId = (sender && sender.userId) ? sender.userId : null;
-
-        return app;
-    },
-
     onRoomStateEvents: function(ev, state) {
         if (ev.getRoomId() !== this.props.room.roomId || ev.getType() !== 'im.vector.modular.widgets') {
             return;
@@ -165,7 +116,7 @@ module.exports = React.createClass({
 
     _getApps: function() {
         return WidgetUtils.getRoomWidgets(this.props.room).map((ev) => {
-            return this._initAppConfig(ev.getStateKey(), ev.getContent(), ev.sender);
+            return WidgetUtils.makeAppConfig(ev.getStateKey(), ev.getContent(), ev.sender, this.props.room.roomId);
         });
     },
 
@@ -213,15 +164,8 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        const enableScreenshots = SettingsStore.getValue("enableWidgetScreenshots", this.props.room.room_id);
-
         const apps = this.state.apps.map((app, index, arr) => {
-            const capWhitelist = enableScreenshots ? ["m.capability.screenshot"] : [];
-
-            // Obviously anyone that can add a widget can claim it's a jitsi widget,
-            // so this doesn't really offer much over the set of domains we load
-            // widgets from at all, but it probably makes sense for sanity.
-            if (app.type == 'jitsi') capWhitelist.push("m.always_on_screen");
+            const capWhitelist = WidgetUtils.getCapWhitelistForAppTypeInRoomId(app.type, this.props.room.roomId);
 
             return (<AppTile
                 key={app.id}
diff --git a/src/components/views/voip/CallPreview.js b/src/components/views/voip/CallPreview.js
index 272e6feb37..5c0a1b4370 100644
--- a/src/components/views/voip/CallPreview.js
+++ b/src/components/views/voip/CallPreview.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -92,7 +92,8 @@ module.exports = React.createClass({
                 />
             );
         }
-        return null;
+        const PersistentApp = sdk.getComponent('elements.PersistentApp');
+        return <PersistentApp />;
     },
 });
 
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
index 7c179aef84..01d5f15601 100644
--- a/src/stores/ActiveWidgetStore.js
+++ b/src/stores/ActiveWidgetStore.js
@@ -32,6 +32,9 @@ class ActiveWidgetStore {
 
         // A WidgetMessaging instance for each widget ID
         this._widgetMessagingByWidgetId = {};
+
+        // What room ID each widget is associated with (if it's a room widget)
+        this._roomIdByWidgetId = {};
     }
 
     setWidgetPersistence(widgetId, val) {
@@ -46,6 +49,10 @@ class ActiveWidgetStore {
         return this._persistentWidgetId === widgetId;
     }
 
+    getPersistentWidgetId() {
+        return this._persistentWidgetId;
+    }
+
     setWidgetCapabilities(widgetId, caps) {
         this._capsByWidgetId[widgetId] = caps;
     }
@@ -76,6 +83,18 @@ class ActiveWidgetStore {
             delete this._widgetMessagingByWidgetId[widgetId];
         }
     }
+
+    getRoomId(widgetId) {
+        return this._roomIdByWidgetId[widgetId];
+    }
+
+    setRoomId(widgetId, roomId) {
+        this._roomIdByWidgetId[widgetId] = roomId;
+    }
+
+    delRoomId(widgetId) {
+        delete this._roomIdByWidgetId[widgetId];
+    }
 }
 
 if (global.singletonActiveWidgetStore === undefined) {
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index ab5b5b0130..98239b3cec 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -19,6 +19,27 @@ import MatrixClientPeg from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
 import dis from '../dispatcher';
 import * as url from "url";
+import SettingsStore from "../settings/SettingsStore";
+
+/**
+ * Encodes a URI according to a set of template variables. Variables will be
+ * passed through encodeURIComponent.
+ * @param {string} pathTemplate The path with template variables e.g. '/foo/$bar'.
+ * @param {Object} variables The key/value pairs to replace the template
+ * variables with. E.g. { '$bar': 'baz' }.
+ * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
+ */
+function encodeUri(pathTemplate, variables) {
+    for (const key in variables) {
+        if (!variables.hasOwnProperty(key)) {
+            continue;
+        }
+        pathTemplate = pathTemplate.replace(
+            key, encodeURIComponent(variables[key]),
+        );
+    }
+    return pathTemplate;
+}
 
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
@@ -324,4 +345,47 @@ export default class WidgetUtils {
         });
         return client.setAccountData('m.widgets', userWidgets);
     }
+
+    static makeAppConfig(appId, app, sender, roomId) {
+        const myUserId = MatrixClientPeg.get().credentials.userId;
+        const user = MatrixClientPeg.get().getUser(myUserId);
+        const params = {
+            '$matrix_user_id': myUserId,
+            '$matrix_room_id': roomId,
+            '$matrix_display_name': user ? user.displayName : myUserId,
+            '$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',
+
+            // TODO: Namespace themes through some standard
+            '$theme': SettingsStore.getValue("theme"),
+        };
+
+        app.id = appId;
+        app.name = app.name || app.type;
+
+        if (app.data) {
+            Object.keys(app.data).forEach((key) => {
+                params['$' + key] = app.data[key];
+            });
+
+            app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
+        }
+
+        app.url = encodeUri(app.url, params);
+        app.creatorUserId = (sender && sender.userId) ? sender.userId : null;
+
+        return app;
+    }
+
+    static getCapWhitelistForAppTypeInRoomId(appType, roomId) {
+        const enableScreenshots = SettingsStore.getValue("enableWidgetScreenshots", roomId);
+
+        const capWhitelist = enableScreenshots ? ["m.capability.screenshot"] : [];
+
+        // Obviously anyone that can add a widget can claim it's a jitsi widget,
+        // so this doesn't really offer much over the set of domains we load
+        // widgets from at all, but it probably makes sense for sanity.
+        if (appType == 'jitsi') capWhitelist.push("m.always_on_screen");
+
+        return capWhitelist;
+    }
 }

From ac8d9a4f20d5451269eb2915749f622a5660c128 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Wed, 4 Jul 2018 11:06:49 +0000
Subject: [PATCH 611/702] Translated using Weblate (German)

Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index fcbb1aa0ce..380769935b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1209,5 +1209,6 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kannst keine Nachrichten senden bis du die <consentLink>unsere Geschläftsbedingungen</consentLink> gelesen und akzeptiert hast.",
     "Show empty room list headings": "Zeite leere Raumlist-Köpfe",
     "Demote yourself?": "Selbst zurückstufen?",
-    "Demote": "Zurückstufen"
+    "Demote": "Zurückstufen",
+    "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden"
 }

From a463b6d8bbbf595015c69033f63f30c56a2101ac Mon Sep 17 00:00:00 2001
From: Aziz Ibrahimov <azizibragim@gmail.com>
Date: Thu, 12 Jul 2018 17:29:00 +0000
Subject: [PATCH 612/702] Translated using Weblate (Azerbaijani)

Currently translated at 33.0% (401 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
---
 src/i18n/strings/az.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index 954655019f..13fd49e149 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -228,7 +228,7 @@
     "You are trying to access a room.": "Siz otağa girməyə çalışırsınız.",
     "<a>Click here</a> to join the discussion!": "<a>Qoşulmaq üçün</a> buraya basın!",
     "Failed to unban": "Blokdan çıxarmağı bacarmadı",
-    "Banned by %(displayName)s": "%(displayName)s bloklanıb ",
+    "Banned by %(displayName)s": "%(displayName)s bloklanıb",
     "Changes to who can read history will only apply to future messages in this room": "Tarixə girişin qaydalarının dəyişikliyi yalnız bu otaqda gələcək mesajlara tətbiq ediləcək",
     "unknown error code": "naməlum səhv kodu",
     "Failed to forget room %(errCode)s": "Otağı unutmağı bacarmadı: %(errCode)s",
@@ -264,7 +264,7 @@
     "User name": "İstifadəçinin adı",
     "Mobile phone number": "Mobil telefonun nömrəsi",
     "Forgot your password?": "Şifrənizi unutmusunuz?",
-    "Sign in with": "Seçmək:",
+    "Sign in with": "Seçmək",
     "Email address (optional)": "Email (qeyri-məcburi)",
     "Mobile phone number (optional)": "Mobil telefonun (qeyri-məcburi) nömrəsi",
     "Register": "Qeydiyyatdan keçmək",

From 903bac3f4532b4ac59a2b8d1869c0b26599a077b Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 11 Jul 2018 14:27:59 +0000
Subject: [PATCH 613/702] Translated using Weblate (Russian)

Currently translated at 99.7% (1209 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index b0f6bd3d52..dbddc6f71b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1206,5 +1206,6 @@
     "Share Message": "Обмен сообщениями",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Вы не можете отправлять сообщения до тех пор, пока вы не примете <consentLink>наши правила и положения</consentLink>.",
     "Demote": "Понижение",
-    "Demote yourself?": "Понизить самого себя?"
+    "Demote yourself?": "Понизить самого себя?",
+    "This event could not be displayed": "Это событие отобразить невозможно"
 }

From 4850387ae03508865a347b237ed18e83d988bf41 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Jul 2018 14:24:29 +0100
Subject: [PATCH 614/702] add null-guard for stickerpickerWidget in
 StickerPicker

---
 src/components/views/rooms/Stickerpicker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 3452e27102..841cfb9b03 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -166,6 +166,7 @@ export default class Stickerpicker extends React.Component {
     }
 
     _sendVisibilityToWidget(visible) {
+        if (!this.state.stickerpickerWidget) return;
         const widgetMessaging = ActiveWidgetStore.getWidgetMessaging(this.state.stickerpickerWidget.id);
         if (widgetMessaging && visible !== this._prevSentVisibility) {
             widgetMessaging.sendVisibility(visible);

From b450d5be657450d0495600d397354d5c05080845 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 13 Jul 2018 11:32:18 +0000
Subject: [PATCH 615/702] Translated using Weblate (Bulgarian)

Currently translated at 99.9% (1211 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index bdbab0812a..89cb022adc 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1208,5 +1208,6 @@
     "The password field must not be blank.": "Полето за парола не може да е празно.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Не можете да изпращате съобщения докато не прегледате и се съгласите с <consentLink>нашите правила и условия</consentLink>.",
     "Demote yourself?": "Понижете себе си?",
-    "Demote": "Понижение"
+    "Demote": "Понижение",
+    "This event could not be displayed": "Това събитие не може да бъде показано"
 }

From 59a14f2c0b562eda6c75747551df1673aa1aa15c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 15 Jul 2018 20:28:41 +0100
Subject: [PATCH 616/702] re-hydrate Values which have been serialized into
 LocalStorage

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/MessageComposerStore.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index e70714ff98..1d37a7c9e5 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Vector Creations Ltd
+Copyright 2017, 2018 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@ limitations under the License.
 */
 import dis from '../dispatcher';
 import { Store } from 'flux/utils';
+import { Value } from 'slate';
 
 const INITIAL_STATE = {
     // a map of room_id to rich text editor composer state
@@ -65,7 +66,15 @@ class MessageComposerStore extends Store {
     }
 
     getEditorState(roomId) {
-        return this._state.editorStateMap[roomId];
+        const editorStateMap = this._state.editorStateMap;
+        // const entry = this._state.editorStateMap[roomId];
+        if (editorStateMap[roomId] && !Value.isValue(editorStateMap[roomId].editor_state)) {
+            // rehydrate lazily to prevent massive churn at launch and cache it
+            editorStateMap[roomId].editor_state = Value.fromJSON(editorStateMap[roomId].editor_state);
+        }
+        // explicitly don't setState here because the value didn't actually change, we just hydrated it,
+        // if a listener received an update they too would call this method and have a hydrated Value
+        return editorStateMap[roomId];
     }
 
     reset() {

From ff96537048dd940884f6a904479a0887a409f4d1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Jul 2018 11:49:53 +0100
Subject: [PATCH 617/702] lint

---
 src/components/views/elements/PersistentApp.js | 1 -
 src/components/views/rooms/AppsDrawer.js       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index 0f419ab874..bbb3b2a9c8 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import WidgetUtils from '../../../utils/WidgetUtils';
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index aa086f8260..80f899f8e6 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -29,7 +29,6 @@ import ScalarAuthClient from '../../../ScalarAuthClient';
 import ScalarMessaging from '../../../ScalarMessaging';
 import { _t } from '../../../languageHandler';
 import WidgetUtils from '../../../utils/WidgetUtils';
-import SettingsStore from "../../../settings/SettingsStore";
 
 // The maximum number of widgets that can be added in a room
 const MAX_WIDGETS = 2;

From d7ff7cd4ed1e00c695b811b17e5313b1c3d8cf77 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 16 Jul 2018 12:00:15 +0100
Subject: [PATCH 618/702] stupid thinkotypo

---
 docs/slate-formats.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/slate-formats.md b/docs/slate-formats.md
index b526109c1b..7bb2fc9c5f 100644
--- a/docs/slate-formats.md
+++ b/docs/slate-formats.md
@@ -84,5 +84,5 @@ The actual conversion transitions are:
    * In RT mode, insert it straight into the editor as a fragment
    * In MD mode, serialise it to an MD string via slate-md-serializer and then insert the string into the editor as a fragment.
 
-The various scenarios and transitions could be drawn into a pretty diagram if one felt the urge, but hopefully the enough
+The various scenarios and transitions could be drawn into a pretty diagram if one felt the urge, but hopefully the above
 gives sufficient detail on how it's all meant to work.
\ No newline at end of file

From 0f32c3a01852f228607ed3b586020fd3dffc1a6d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Jul 2018 13:18:10 +0100
Subject: [PATCH 619/702] PR feedback

---
 src/CallHandler.js            | 2 +-
 src/stores/WidgetEchoStore.js | 4 ++--
 src/utils/WidgetUtils.js      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index d61ea93c02..a9c36c8af2 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -419,7 +419,7 @@ function _startCallApp(roomId, type) {
     if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, 'jitsi')) {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
-        Modal.createTrackedDialog('Call being placed', '', ErrorDialog, {
+        Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
             title: _t('Call in Progress'),
             description: _t('A call is currently being placed!'),
         });
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index f442baee6c..0d14ed1d60 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -52,9 +52,9 @@ class WidgetEchoStore extends EventEmitter {
         for (const w of currentRoomWidgets) {
             const widgetId = w.getStateKey();
             // If there's no echo, or the echo still has a widget present, show the *old* widget
-            // we don't include widgets that have changed for the same rason we don't include new ones
+            // we don't include widgets that have changed for the same reason we don't include new ones,
+            // ie. we'd need to fake matrix events to do so and therte's currently no need.
             if (!roomEchoState[widgetId] || Object.keys(roomEchoState[widgetId]).length !== 0) {
-            } else {
                 echoedWidgets.push(w);
             }
             delete roomEchoState[widgetId];
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index cf12a64329..5d98e6f45c 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -22,7 +22,7 @@ import * as url from "url";
 import WidgetEchoStore from '../stores/WidgetEchoStore';
 
 // How long we wait for the state event echo to come back from the server
-// before the promise is rejected
+// before waitFor[Room/User]Widget rejects its promise
 const WIDGET_WAIT_TIME = 20000;
 
 export default class WidgetUtils {

From c857bf400ce9a5610f620ab3769e3217468db915 Mon Sep 17 00:00:00 2001
From: Hugues De Keyzer <matrix@hugues.info>
Date: Fri, 13 Jul 2018 20:40:15 +0000
Subject: [PATCH 620/702] Translated using Weblate (Esperanto)

Currently translated at 91.1% (1105 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index abcbcd636a..ceecc17236 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -360,7 +360,7 @@
     "Drop here to demote": "Demeti tien ĉi por malpligravigi",
     "Drop here to tag %(section)s": "Demeti tien ĉi por marki %(section)s",
     "Press <StartChatButton> to start a chat with someone": "Premu <StartChatButton> por komenci babilon kun iu",
-    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Vi ankoraŭ estas en neniuj ĉambroj! Premu <CreateRoomButton> por fari ĉambron aŭ <RoomDirectoryButton> por esplori la ĉambrujon",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Vi ankoraŭ estas en neniu ĉambro! Premu <CreateRoomButton> por krei ĉambron aŭ <RoomDirectoryButton> por esplori la ĉambrujon",
     "Community Invites": "Komunumaj invitoj",
     "Invites": "Invitoj",
     "Favourites": "Ŝatataj",
@@ -1096,5 +1096,12 @@
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Sencimigaj protokoloj enhavas informojn pri uzo de aplikaĵo, inkluzive vian salutnomon, la identigilojn aŭ nomojn de la ĉambroj aŭ grupoj kiujn vi vizitis, kaj la salutnomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
     "Failed to send logs: ": "Malsukcesis sendi protokolon: ",
     "Notes:": "Rimarkoj:",
-    "Preparing to send logs": "Pretiganta sendon de protokolo"
+    "Preparing to send logs": "Pretiganta sendon de protokolo",
+    "e.g. %(exampleValue)s": "ekz. %(exampleValue)s",
+    "Every page you use in the app": "Ĉiu paĝo kiun vi uzas en la aplikaĵo",
+    "e.g. <CurrentPageURL>": "ekz. <CurrentPageURL>",
+    "Your User Agent": "Via klienta aplikaĵo",
+    "Your device resolution": "La distingivo de via aparato",
+    "Call in Progress": "Voko farata",
+    "A call is already in progress!": "Voko estas jam farata!"
 }

From 88d688e56f71bff2ddc0a464e57421b10483c567 Mon Sep 17 00:00:00 2001
From: Hugues De Keyzer <matrix@hugues.info>
Date: Fri, 13 Jul 2018 20:20:24 +0000
Subject: [PATCH 621/702] Translated using Weblate (French)

Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e879ece8b4..ad8a87b15c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -857,7 +857,7 @@
     "This Home server does not support communities": "Ce serveur d'accueil ne prend pas en charge les communautés",
     "Failed to load %(groupId)s": "Échec du chargement de %(groupId)s",
     "Your Communities": "Vos communautés",
-    "You're not currently a member of any communities.": "Vous n'ếtes actuellement membre d'aucune communauté.",
+    "You're not currently a member of any communities.": "Vous n'êtes actuellement membre d'aucune communauté.",
     "Error whilst fetching joined communities": "Erreur lors de l'obtention des communautés rejointes",
     "Create a new community": "Créer une nouvelle communauté",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Créez une communauté pour grouper des utilisateurs et des salons ! Construisez une page d'accueil personnalisée pour distinguer votre espace dans l'univers Matrix.",
@@ -883,7 +883,7 @@
     "Show these rooms to non-members on the community page and room list?": "Afficher ces salons aux non-membres sur la page de communauté et la liste des salons ?",
     "Sign in to get started": "Connectez-vous pour commencer",
     "Status.im theme": "Thème Status.im",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Veuillez noter que vous vous connecter au serveur %(hs)s, pas à matrix.org.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Veuillez noter que vous vous connectez au serveur %(hs)s, pas à matrix.org.",
     "Username on %(hs)s": "Nom d'utilisateur sur %(hs)s",
     "Restricted": "Restreint",
     "Custom of %(powerLevel)s": "Personnalisé de %(powerLevel)s",
@@ -907,7 +907,7 @@
     "Delete %(count)s devices|other": "Supprimer %(count)s appareils",
     "Select devices": "Sélectionner les appareils",
     "Something went wrong when trying to get your communities.": "Une erreur est survenue lors de l'obtention de vos communautés.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucun flux compatible avec ce client.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucune méthode d'identification compatible avec ce client.",
     "Flair": "Badge",
     "Showing flair for these communities:": "Ce salon affichera les badges pour ces communautés :",
     "This room is not showing flair for any communities": "Ce salon n'affiche de badge pour aucune communauté",

From a17483971aa1d55b93e113f123797ce823661a5d Mon Sep 17 00:00:00 2001
From: Kyf Lee <coughingmouse@pm.me>
Date: Sat, 14 Jul 2018 11:10:54 +0000
Subject: [PATCH 622/702] Translated using Weblate (Korean)

Currently translated at 80.5% (976 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
---
 src/i18n/strings/ko.json | 532 +++++++++++++++++++++++++++------------
 1 file changed, 370 insertions(+), 162 deletions(-)

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 23b7efd97d..1be837261b 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -7,14 +7,14 @@
     "Error": "오류",
     "Mute": "알림 끄기",
     "Notifications": "알림",
-    "powered by Matrix": "매트릭스의 지원을 받고 있어요",
-    "Remove": "지우기",
+    "powered by Matrix": "Matrix의 지원을 받고 있어요",
+    "Remove": "삭제",
     "Room directory": "방 목록",
     "Search": "찾기",
     "Settings": "설정",
     "Start chat": "이야기하기",
     "unknown error code": "알 수 없는 오류 코드",
-    "OK": "알았어요",
+    "OK": "네",
     "Continue": "게속하기",
     "Accept": "수락",
     "Account": "계정",
@@ -23,17 +23,17 @@
     "Add phone number": "전화번호 추가하기",
     "Admin": "관리자",
     "Admin Tools": "관리 도구",
-    "VoIP": "인터넷전화",
+    "VoIP": "VoIP",
     "No Microphones detected": "마이크를 찾지 못했어요",
     "No Webcams detected": "카메라를 찾지 못했어요",
-    "No media permissions": "저장소 권한이 없어요",
-    "Default Device": "기본 장치",
+    "No media permissions": "미디어 권한이 없어요",
+    "Default Device": "기본 기기",
     "Microphone": "마이크",
     "Camera": "카메라",
     "Advanced": "고급",
     "Algorithm": "알고리즘",
-    "Hide removed messages": "지운 메시지 숨기기",
-    "Always show message timestamps": "항상 메시지에 시간을 보이기",
+    "Hide removed messages": "삭제된 메시지 숨기기",
+    "Always show message timestamps": "항상 메시지의 시간을 보여주기",
     "Authentication": "인증",
     "Alias (optional)": "별명 (선택)",
     "A new password must be entered.": "새 비밀번호를 입력해주세요.",
@@ -44,24 +44,24 @@
     "Attachment": "붙이기",
     "Are you sure you want to upload the following files?": "다음 파일들을 올리시겠어요?",
     "Autoplay GIFs and videos": "GIF와 동영상을 자동으로 재생하기",
-    "Ban": "차단",
-    "Banned users": "차단한 사용자",
+    "Ban": "차단하기",
+    "Banned users": "차단된 사용자",
     "Blacklisted": "요주의",
     "Can't load user settings": "사용사 설정을 불러올 수 없어요",
     "Change Password": "비밀번호 바꾸기",
-    "Changes your display nickname": "보여줄 별명을 바꾸기",
-    "Clear Cache and Reload": "캐시를 지우고 다시 불러오기",
+    "Changes your display nickname": "별명 바꾸기",
+    "Clear Cache and Reload": "캐시 지우고 다시 시작하기",
     "Clear Cache": "캐시 지우기",
     "Confirm password": "비밀번호 확인",
     "Confirm your new password": "새 비밀번호 확인",
     "Create Room": "방 만들기",
     "Create an account": "게정 만들기",
     "Custom": "사용자 지정",
-    "Device ID": "장치 ID",
+    "Device ID": "기기 ID",
     "Default": "기본",
-    "Device already verified!": "장치를 이미 확인했어요!",
-    "device id: ": "장치 id: ",
-    "Devices": "장치",
+    "Device already verified!": "기기를 이미 확인했어요!",
+    "device id: ": "기기 id: ",
+    "Devices": "기기",
     "Direct chats": "직접 여러 명에게 이야기하기",
     "Disable Notifications": "알림 끄기",
     "Display name": "별명",
@@ -75,33 +75,33 @@
     "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했어요. 이 비밀번호가 정말 맞으세요?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "+%(msisdn)s로 문자 메시지를 보냈어요. 인증 번호를 입력해주세요",
     "%(targetName)s accepted an invitation.": "%(targetName)s님이 초대를 수락했어요.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s님이 %(displayName)s님에게서 초대를 수락했어요.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s님이 %(displayName)s 초대를 수락했습니다.",
     "Access Token:": "접근 토큰:",
     "Active call (%(roomName)s)": "(%(roomName)s)에서 전화를 걸고 받을 수 있어요",
     "Add a topic": "주제 추가",
-    "Missing Media Permissions, click here to request.": "저장소 권한을 잃었어요, 여기를 눌러 다시 요청해주세요.",
-    "You may need to manually permit Riot to access your microphone/webcam": "수동으로 라이엇에 마이크와 카메라를 허용해야 할 수도 있어요",
+    "Missing Media Permissions, click here to request.": "미디어 권한이 없습니다. 여기를 눌러 다시 요청해주세요.",
+    "You may need to manually permit Riot to access your microphone/webcam": "수동으로 Riot에 마이크와 카메라를 허용할 수도 있습니다",
     "%(items)s and %(lastItem)s": "%(items)s과 %(lastItem)s",
     "and %(count)s others...|one": "그리고 다른 하나...",
     "and %(count)s others...|other": "그리고 %(count)s...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s님과 %(lastPerson)s님이 입력중",
-    "%(senderName)s answered the call.": "%(senderName)s님이 전화를 받았어요.",
+    "%(senderName)s answered the call.": "%(senderName)s님이 전화를 받았습니다.",
     "Anyone who knows the room's link, apart from guests": "손님을 제외하고, 방의 주소를 아는 누구나",
     "Anyone who knows the room's link, including guests": "손님을 포함하여, 방의 주소를 아는 누구나",
     "Are you sure you want to reject the invitation?": "초대를 거절하시겠어요?",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 차단하셨어요.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 차단했습니다.",
     "Bans user with given id": "받은 ID로 사용자 차단하기",
     "Bulk Options": "대규모 설정",
     "Call Timeout": "전화 대기 시간 초과",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "홈 서버에 연결할 수 없어요 - 연결을 확인해주시고, <a>홈 서버의 SSL 인증서</a>가 믿을 수 있는지 확인하시고, 브라우저 확장기능이 요청을 차단하고 있는지 확인해주세요.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "주소창에 HTTPS URL이 있을 때는 HTTP로 홈 서버를 연결할 수 없어요. HTTPS를 쓰거나 <a>안전하지 않은 스크립트를 허용해주세요</a>.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s님이 자기 소개 사진을 바꾸셨어요.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s님이 %(powerLevelDiffText)s의 권한 등급을 바꾸셨어요.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s님이 방 이름을 %(roomName)s로 바꾸셨어요.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s님이 방 이름을 지우셨어요.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s님이 주제를 \"%(topic)s\"로 바꾸셨어요.",
-    "Changes to who can read history will only apply to future messages in this room": "방의 이후 메시지부터 기록을 읽을 수 있는 조건의 변화가 적용되어요",
-    "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.": "비밀번호를 바꾸면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s님이 프로필 사진을 바꿨습니다.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s님이 %(powerLevelDiffText)s의 권한 등급을 바꿨습니다.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s님이 방 이름을 %(roomName)s(으)로 바꿨습니다.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s님이 방 이름을 삭제했습니다.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s님이 주제를 \"%(topic)s\"로 바꿨습니다.",
+    "Changes to who can read history will only apply to future messages in this room": "이제부터의 메시지에만 이 방에서 누가 기록을 읽을 수 있는지에 대한 변경 내역이 적용됩니다",
+    "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.": "비밀번호를 바꾸면 현재 모든 기기의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 부분은 발전할 겁니다.",
     "Claimed Ed25519 fingerprint key": "Ed25519 지문 키가 필요",
     "<a>Click here</a> to join the discussion!": "<a>여기</a>를 눌러서 같이 논의해요!",
     "Click here to fix": "해결하려면 여기를 누르세요",
@@ -113,9 +113,9 @@
     "Command error": "명령 오류",
     "Commands": "명령",
     "Conference call failed.": "전화 회의를 실패했어요.",
-    "Conference calling is in development and may not be reliable.": "전화 회의는 개발 중이며 믿을 수 없어요.",
-    "Conference calls are not supported in encrypted rooms": "암호화한 방에서는 전화 회의를 할 수 없어요",
-    "Conference calls are not supported in this client": "이 클라이언트에서는 전화 회의를 할 수 없어요",
+    "Conference calling is in development and may not be reliable.": "전화 회의는 개발 중이며 신뢰하기 힘들 수 있습니다.",
+    "Conference calls are not supported in encrypted rooms": "암호화된 방에서는 전화 회의가 지원되지 않습니다",
+    "Conference calls are not supported in this client": "이 클라이언트에서는 전화 회의가 지원되지 않습니다",
     "Could not connect to the integration server": "통합 서버에 연결할 수 없어요",
     "%(count)s new messages|one": "%(count)s 새 메시지",
     "%(count)s new messages|other": "%(count)s 새 메시지",
@@ -124,17 +124,17 @@
     "Current password": "현재 비밀번호",
     "Curve25519 identity key": "Curve25519 신원 키",
     "Custom level": "사용자 지정 단계",
-    "/ddg is not a command": "/ddg 는 없는 명령이에요",
+    "/ddg is not a command": "/ddg는 없는 명령입니다",
     "Deactivate Account": "계정 정지",
-    "Deactivate my account": "내 계정 정지하기",
+    "Deactivate my account": "계정 정지하기",
     "Decline": "거절",
     "Decrypt %(text)s": "해독 %(text)s",
     "Decryption error": "해독 오류",
     "Delete": "지우기",
     "Deops user with given id": "받은 ID로 사용자의 등급을 낮추기",
-    "Device ID:": "장치 ID:",
-    "Device key:": "장치 키:",
-    "Devices will not yet be able to decrypt history from before they joined the room": "방에 들어가기 전에는 장치에서 기록을 해독할 수 없어요",
+    "Device ID:": "기기 ID:",
+    "Device key:": "기기 키:",
+    "Devices will not yet be able to decrypt history from before they joined the room": "방에 들어가기 전에는 기기에서 기록을 해독할 수 없어요",
     "Disinvite": "초대 취소",
     "Displays action": "활동 보이기",
     "Download %(text)s": "%(text)s 받기",
@@ -145,13 +145,13 @@
     "Emoji": "이모지",
     "Enable encryption": "암호화 켜기",
     "Enable Notifications": "알림 켜기",
-    "Encrypted by a verified device": "인증한 장치로 암호화했어요",
-    "Encrypted by an unverified device": "인증하지 않은 장치로 암호화했어요",
+    "Encrypted by a verified device": "인증한 기기로 암호화했어요",
+    "Encrypted by an unverified device": "인증하지 않은 기기로 암호화했어요",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "암호화한 메시지는 아직 암호화를 구현하지 않은 클라이언트에서는 볼 수 없어요",
     "Encrypted room": "암호화한 방",
     "Encryption is enabled in this room": "이 방은 암호화중이에요",
     "Encryption is not enabled in this room": "이 방은 암호화하고 있지 않아요",
-    "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었어요.",
+    "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었습니다.",
     "End-to-end encryption information": "종단간 암호화 정보",
     "End-to-end encryption is in beta and may not be reliable": "종단간 암호화는 시험중이며 믿을 수 없어요",
     "Enter Code": "코드를 입력하세요",
@@ -162,12 +162,12 @@
     "Existing Call": "기존 전화",
     "Export": "내보내기",
     "Export E2E room keys": "종단간 암호화 방 키 내보내기",
-    "Failed to ban user": "사용자를 차단하지 못했어요",
+    "Failed to ban user": "사용자를 차단하지 못했습니다",
     "Failed to change power level": "권한 등급을 바꾸지 못했어요",
     "Failed to fetch avatar URL": "아바타 URL을 불러오지 못했어요",
-    "Failed to join room": "방에 들어가지 못했어요",
+    "Failed to join room": "방에 들어가지 못했습니다",
     "Failed to kick": "내쫓지 못했어요",
-    "Failed to leave room": "방을 떠나지 못했어요",
+    "Failed to leave room": "방을 떠나지 못했습니다",
     "Failed to load timeline position": "타임라인 위치를 불러오지 못했어요",
     "Failed to mute user": "사용자의 알림을 끄지 못했어요",
     "Failed to reject invite": "초대를 거절하지 못했어요",
@@ -176,17 +176,17 @@
     "Failed to send email": "이메일을 보내지 못했어요",
     "Failed to send request.": "요청을 보내지 못했어요.",
     "Failed to set avatar.": "아바타를 설정하지 못했어요.",
-    "Failed to set display name": "별명을 설정하지 못했어요",
+    "Failed to set display name": "별명을 설정하지 못했습니다",
     "Failed to set up conference call": "전화 회의를 시작하지 못했어요",
     "Failed to toggle moderator status": "조정자 상태를 설정하지 못했어요",
-    "Failed to unban": "차단을 풀지 못했어요",
+    "Failed to unban": "차단을 해제하지 못했습니다",
     "Failed to upload file": "파일을 올리지 못했어요",
-    "Failed to upload profile picture!": "자기 소개에 사진을 올리지 못했어요!",
-    "Failed to verify email address: make sure you clicked the link in the email": "이메일 주소를 확인하지 못했어요: 메일의 주소를 눌렀는지 확인해보세요",
-    "Failure to create room": "방을 만들지 못했어요",
+    "Failed to upload profile picture!": "프로필 사진을 올리지 못했어요!",
+    "Failed to verify email address: make sure you clicked the link in the email": "이메일 주소를 인증하지 못했습니다. 메일에 나온 주소를 눌렀는지 확인해 보세요",
+    "Failure to create room": "방을 만들지 못했습니다",
     "Favourites": "즐겨찾기",
     "Fill screen": "화면 채우기",
-    "Filter room members": "방 구성원 거르기",
+    "Filter room members": "방 구성원 찾기",
     "Forget room": "방 잊기",
     "Forgot your password?": "비밀번호를 잊어버리셨어요?",
     "For security, this session has been signed out. Please sign in again.": "보안을 위해서, 이 세션에서 로그아웃했어요. 다시 로그인해주세요.",
@@ -198,9 +198,9 @@
     "Hide read receipts": "읽음 확인 표시 숨기기",
     "Hide Text Formatting Toolbar": "문자 서식 도구 숨기기",
     "Historical": "보관",
-    "Home": "중심",
-    "Homeserver is": "홈 서버는",
-    "Identity Server is": "ID 서버는",
+    "Home": "홈",
+    "Homeserver is": "홈 서버:",
+    "Identity Server is": "ID 서버:",
     "I have verified my email address": "제 이메일 주소를 확인했어요",
     "Import": "불러오기",
     "Import E2E room keys": "종단간 암호화 방 키 불러오기",
@@ -211,10 +211,10 @@
     "Incorrect username and/or password.": "사용자 이름 혹은 비밀번호가 맞지 않아요.",
     "Incorrect verification code": "인증 번호가 맞지 않아요",
     "Interface Language": "인터페이스 언어",
-    "Invalid alias format": "가명 형식이 맞지 않아요",
-    "Invalid address format": "주소 형식이 맞지 않아요",
-    "Invalid Email Address": "이메일 주소가 맞지 않아요",
-    "Invalid file%(extra)s": "파일%(extra)s이 맞지 않아요",
+    "Invalid alias format": "잘못된 별칭 형식입니다",
+    "Invalid address format": "잘못된 주소 형식입니다",
+    "Invalid Email Address": "잘못된 이메일 주소입니다",
+    "Invalid file%(extra)s": "잘못된 %(extra)s 파일입니다.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 초대하셨어요.",
     "Invite new room members": "새 구성원 초대하기",
     "Invited": "초대받기",
@@ -222,43 +222,43 @@
     "Invites user with given id to current room": "받은 ID로 사용자를 현재 방에 초대하기",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s'는 주소에 맞는 형식이 아니에요",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s'는 가명에 맞는 형식이 아니에요",
-    "%(displayName)s is typing": "%(displayName)s님이 입력중",
+    "%(displayName)s is typing": "%(displayName)s님이 입력 중",
     "Sign in with": "로그인",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText>음성</voiceText> 또는 <videoText>영상</videoText>으로 참여하세요.",
     "Join Room": "방에 들어가기",
-    "%(targetName)s joined the room.": "%(targetName)s님이 방에 들어오셨어요.",
-    "Joins room with given alias": "받은 가명으로 방에 들어가기",
+    "%(targetName)s joined the room.": "%(targetName)s님이 방에 들어오셨습니다.",
+    "Joins room with given alias": "받은 별칭으로 방에 들어가기",
     "Jump to first unread message.": "읽지 않은 첫 메시지로 이동할래요.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s님이 %(targetName)s을 내쫓았어요.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 내쫓았습니다.",
     "Kick": "내쫓기",
     "Kicks user with given id": "받은 ID로 사용자 내쫓기",
     "Labs": "실험실",
     "Last seen": "마지막으로 본 곳",
     "Leave room": "방 떠나기",
-    "%(targetName)s left the room.": "%(targetName)s님이 방을 떠나셨어요.",
+    "%(targetName)s left the room.": "%(targetName)s님이 방을 떠났습니다.",
     "Level:": "등급:",
     "Local addresses for this room:": "이 방의 로컬 주소:",
-    "Logged in as:": "로그인:",
+    "Logged in as:": "아이디:",
     "Logout": "로그아웃",
     "Low priority": "낮은 우선순위",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 방에 들어온 시점부터.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 누구나.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 알 수 없음 (%(visibility)s).",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방 구성원 모두, 초대받은 시점부터 방의 기록을 볼 수 있게 했습니다.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s님이 이후 방 구성원 모두, 들어온 시점부터 방의 기록을 볼 수 있게 했습니다.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s님이 이후 방 구성원 모두 방의 기록을 볼 수 있게 했습니다.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s님이 이후 누구나 방의 기록을 볼 수 있게 했습니다.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s님이 이후 알 수 없음(%(visibility)s)이 방의 기록을 볼 수 있게 했습니다.",
     "Manage Integrations": "통합 관리",
     "Markdown is disabled": "마크다운이 꺼져있어요",
     "Markdown is enabled": "마크다운이 켜져있어요",
     "matrix-react-sdk version:": "matrix-react-sdk 버전:",
-    "Message not sent due to unknown devices being present": "알 수 없는 장치가 있어 메시지를 보내지 못했어요",
+    "Message not sent due to unknown devices being present": "알 수 없는 기기가 있어 메시지를 보내지 못했어요",
     "Missing room_id in request": "요청에서 방_id가 빠졌어요",
     "Missing user_id in request": "요청에서 사용자_id가 빠졌어요",
     "Mobile phone number": "휴대 전화번호",
     "Mobile phone number (optional)": "휴대 전화번호 (선택)",
     "Moderator": "조정자",
     "Name": "이름",
-    "Never send encrypted messages to unverified devices from this device": "이 장치에서 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요",
-    "Never send encrypted messages to unverified devices in this room from this device": "이 장치에서 이 방의 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요",
+    "Never send encrypted messages to unverified devices from this device": "이 기기에서는 절대 인증받지 않은 기기에게 암호화한 메시지를 보내지 않기",
+    "Never send encrypted messages to unverified devices in this room from this device": "이 기기에서 이 방의 인증받지 않은 기기로 암호화한 메시지를 보내지 마세요",
     "New address (e.g. #foo:%(localDomain)s)": "새 주소 (예. #foo:%(localDomain)s)",
     "New password": "새 비밀번호",
     "New passwords don't match": "새 비밀번호가 맞지 않아요",
@@ -266,10 +266,10 @@
     "none": "없음",
     "not set": "설정하지 않았어요",
     "not specified": "지정하지 않았어요",
-    "(not supported by this browser)": "(이 브라우저에서는 지원하지 않아요)",
+    "(not supported by this browser)": "(이 브라우저에서 지원하지 않습니다.)",
     "<not supported>": "<지원하지 않아요>",
     "NOT verified": "확인하지 않음",
-    "No devices with registered encryption keys": "등록한 암호화 키가 있는 장치가 없어요",
+    "No devices with registered encryption keys": "등록한 암호화 키가 있는 기기가 없어요",
     "No display name": "별명이 없어요",
     "No more results": "더 이상 결과가 없어요",
     "No results": "결과 없음",
@@ -281,9 +281,9 @@
     "Permissions": "권한",
     "People": "사람들",
     "Phone": "전화",
-    "Once encryption is enabled for a room it cannot be turned off again (for now)": "방을 암호화하면 암호화를 도중에 끌 수 없어요. (현재로서는)",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "(현재로서는) 방을 암호화하면 되돌릴 수 없습니다",
     "Only people who have been invited": "초대받은 사람만",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s님이 %(callType)s 전화를 걸었어요.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s님이 %(callType)s 전화를 걸었습니다.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "이메일을 확인하시고 그 안에 있는 주소를 누르세요. 이 일을 하고 나서, 계속하기를 누르세요.",
     "Power level must be positive integer.": "권한 등급은 양의 정수여야만 해요.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (권한 %(powerLevelNumber)s)",
@@ -291,9 +291,9 @@
     "Privacy warning": "개인정보 경고",
     "Private Chat": "비공개 이야기",
     "Privileged Users": "권한 있는 사용자",
-    "Profile": "자기 소개",
-    "%(senderName)s removed their profile picture.": "%(senderName)s님이 자기 소개 사진을 지우셨어요.",
-    "%(senderName)s set a profile picture.": "%(senderName)s님이 자기 소개 사진을 설정하셨어요.",
+    "Profile": "프로필",
+    "%(senderName)s removed their profile picture.": "%(senderName)s님이 프로필 사진을 삭제했습니다.",
+    "%(senderName)s set a profile picture.": "%(senderName)s님이 프로필 사진을 설정했습니다.",
     "Public Chat": "공개 이야기",
     "Reason": "이유",
     "Reason: %(reasonText)s": "이유: %(reasonText)s",
@@ -305,18 +305,18 @@
     "Rejoin": "다시 들어가기",
     "Remote addresses for this room:": "이 방의 원격 주소:",
     "Remove Contact Information?": "연락처를 지우시겠어요?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s님이 별명 (%(oldDisplayName)s)을 지우셨어요.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s님이 별명(%(oldDisplayName)s)을 삭제했습니다.",
     "Remove %(threePid)s?": "%(threePid)s 지우시겠어요?",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s님이 인터넷전화 회의를 요청하셨어요.",
-    "Resetting 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.": "비밀번호를 다시 설정하면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s님이 VoIP 회의를 요청했습니다.",
+    "Resetting 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.": "비밀번호를 다시 설정하면 현재 모든 기기의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
     "Results from DuckDuckGo": "덕덕고에서 검색한 결과",
     "Return to login screen": "로그인 화면으로 돌아가기",
-    "Riot does not have permission to send you notifications - please check your browser settings": "라이엇에게 알릴 권한이 없어요 - 브라우저 설정을 확인해주세요",
-    "Riot was not given permission to send notifications - please try again": "라이엇이 알릴 권한을 받지 못했어요 - 다시 해주세요",
-    "riot-web version:": "라이엇 웹 버전:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot은 알림을 보낼 권한을 가지고 있지 않습니다. 브라우저 설정을 확인해주세요",
+    "Riot was not given permission to send notifications - please try again": "Riot이 알림을 보낼 권한을 받지 못했습니다. 다시 해주세요",
+    "riot-web version:": "Riot 웹 버전:",
     "Room %(roomId)s not visible": "방 %(roomId)s은 보이지 않아요",
-    "Room Colour": "방 색상",
-    "Room contains unknown devices": "방에 알 수 없는 장치가 있어요",
+    "Room Colour": "방 색",
+    "Room contains unknown devices": "방에 알 수 없는 기기가 있어요",
     "Room name (optional)": "방 이름 (선택)",
     "%(roomName)s does not exist.": "%(roomName)s은 없는 방이에요.",
     "%(roomName)s is not accessible at this time.": "현재는 %(roomName)s에 들어갈 수 없어요.",
@@ -328,22 +328,22 @@
     "Searches DuckDuckGo for results": "덕덕고에서 검색",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s님이 %(dateTime)s에 확인",
     "Send anyway": "그래도 보내기",
-    "Sender device information": "보낸 장치의 정보",
+    "Sender device information": "보낸 기기의 정보",
     "Send Invites": "초대 보내기",
     "Send Reset Email": "재설정 이메일 보내기",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈어요.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s님이 %(targetDisplayName)s님에게 들어오라는 초대를 보냈어요.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈습니다.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "방에 들어오라고 %(senderName)s님이 %(targetDisplayName)s님에게 초대를 보냈습니다.",
     "Server error": "서버 오류",
     "Server may be unavailable or overloaded": "서버를 쓸 수 없거나 과부하일 수 있어요",
     "Server may be unavailable, overloaded, or search timed out :(": "서버를 쓸 수 없거나 과부하거나, 검색 시간을 초과했어요 :(",
     "Server may be unavailable, overloaded, or the file too big": "서버를 쓸 수 없거나 과부하거나, 파일이 너무 커요",
-    "Server may be unavailable, overloaded, or you hit a bug.": "서버를 쓸 수 없거나 과부하거나, 오류에요.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "서버를 쓸 수 없거나 과부하거나, 오류입니다.",
     "Server unavailable, overloaded, or something else went wrong.": "서버를 쓸 수 없거나 과부하거나, 다른 문제가 있어요.",
     "Session ID": "세션 ID",
-    "%(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로 설정했습니다.",
     "Show panel": "패널 보이기",
     "Show Text Formatting Toolbar": "문자 서식 도구 보이기",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "시간을 12시간제로 보이기 (예. 오후 2:30)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "시간을 12시간제로 보여 주기(예. 오후 2:30)",
     "Signed Out": "로그아웃함",
     "Sign in": "로그인",
     "Sign out": "로그아웃",
@@ -357,23 +357,23 @@
     "Tagged as: ": "지정함: ",
     "The default role for new room members is": "방 새 구성원의 기본 역할",
     "The main address for this room is": "이 방의 주요 주소",
-    "The phone number entered looks invalid": "입력한 전화번호가 잘못된 거 같아요",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "입력한 서명 키는 %(userId)s님의 장치 %(deviceId)s에서 받은 서명 키와 일치하네요. 인증한 장치로 표시할게요.",
-    "This email address is already in use": "이 이메일 주소는 사용중이에요",
+    "The phone number entered looks invalid": "입력된 전화번호가 잘못된 것 같습니다",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "입력한 서명 키는 %(userId)s님의 기기 %(deviceId)s에서 받은 서명 키와 일치하네요. 인증한 기기라고 표시했습니다.",
+    "This email address is already in use": "이 이메일 주소는 이미 사용 중입니다",
     "This email address was not found": "이 이메일 주소를 찾지 못했어요",
     "The email address linked to your account must be entered.": "계정에 연결한 이메일 주소를 입력해야 해요.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' 파일이 홈 서버에 올릴 수 있는 한계 크기를 초과했어요",
     "The file '%(fileName)s' failed to upload": "'%(fileName)s' 파일을 올리지 못했어요",
-    "The remote side failed to pick up": "원격 측에서 찾지 못했어요",
+    "The remote side failed to pick up": "상대방이 받지 못했습니다",
     "This Home Server does not support login using email address.": "이 홈 서버는 이메일 주소 로그인을 지원하지 않아요.",
     "This invitation was sent to an email address which is not associated with this account:": "이 초대는 이 계정과 연결되지 않은 이메일 주소로 보냈어요:",
     "This room has no local addresses": "이 방은 로컬 주소가 없어요",
     "This room is not recognised.": "이 방은 드러나지 않아요.",
-    "These are experimental features that may break in unexpected ways": "예상치 못한 방법으로 망가질 지도 모르는 실험 기능이에요",
-    "The visibility of existing history will be unchanged": "기존 기록은 볼 수 있는 대상이 바뀌지 않아요",
+    "These are experimental features that may break in unexpected ways": "예상치 못하게 망가질 수 있는 실험적인 기능입니다",
+    "The visibility of existing history will be unchanged": "기존 기록은 이전처럼 계속 볼 수 있습니다",
     "This doesn't appear to be a valid email address": "올바르지 않은 이메일 주소로 보여요",
-    "This is a preview of this room. Room interactions have been disabled": "방을 미리보는 거에요. 상호작용은 보이지 않아요",
-    "This phone number is already in use": "이 전화번호는 사용중이에요",
+    "This is a preview of this room. Room interactions have been disabled": "방 미리보기입니다. 아직 아무것도 할 수 없습니다",
+    "This phone number is already in use": "이 전화번호는 이미 사용 중입니다",
     "This room": "이 방",
     "This room is not accessible by remote Matrix servers": "이 방은 원격 매트릭스 서버에 접근할 수 없어요",
     "This room's internal ID is": "방의 내부 ID",
@@ -384,28 +384,28 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었어요.",
     "Turn Markdown off": "마크다운 끄기",
     "Turn Markdown on": "마크다운 켜기",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s님이 종단간 암호화를 켜셨어요 (알고리즘 %(algorithm)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s님이 종단 간 암호화를 켰습니다(%(algorithm)s 알고리즘).",
     "Unable to add email address": "이메일 주소를 추가할 수 없어요",
     "Unable to remove contact information": "연락처를 지울 수 없어요",
     "Unable to verify email address.": "이메일 주소를 인증할 수 없어요.",
-    "Unban": "차단풀기",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님의 차단을 푸셨어요.",
+    "Unban": "차단 해제",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님에 대한 차단을 해제했습니다.",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "이 이매알 주소가 초대를 받은 계정과 연결된 주소가 맞는지 확인할 수 없어요.",
-    "Unable to capture screen": "화면을 찍을 수 없어요",
+    "Unable to capture screen": "화면을 찍을 수 없습니다",
     "Unable to enable Notifications": "알림을 켤 수 없어요",
-    "Unable to load device list": "장치 목록을 불러올 수 없어요",
+    "Unable to load device list": "기기 목록을 불러올 수 없어요",
     "Undecryptable": "해독할 수 없는",
     "Unencrypted room": "암호화하지 않은 방",
     "unencrypted": "암호화하지 않음",
     "Unencrypted message": "암호화하지 않은 메시지",
     "unknown caller": "알 수 없는 발신자",
-    "unknown device": "알 수 없는 장치",
+    "unknown device": "알 수 없는 기기",
     "Unknown room %(roomId)s": "알 수 없는 방 %(roomId)s",
-    "Unknown (user, device) pair:": "알 수 없는 (사용자, 장치) 연결:",
+    "Unknown (user, device) pair:": "알 수 없는 (사용자, 기기) 연결:",
     "Unmute": "소리 켜기",
     "Unnamed Room": "이름 없는 방",
     "Unrecognised command:": "인식 할 수 없는 명령:",
-    "Unrecognised room alias:": "인식할 수 없는 방 가명:",
+    "Unrecognised room alias:": "인식할 수 없는 방 별칭:",
     "Unverified": "인증하지 않음",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s 올리는 중",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s 외 %(count)s 올리는 중",
@@ -421,7 +421,7 @@
     "User ID": "사용자 ID",
     "User Interface": "사용자 인터페이스",
     "User name": "사용자 이름",
-    "Username invalid: %(errMessage)s": "사용자 이름을 인식할 수 없어요: %(errMessage)s",
+    "Username invalid: %(errMessage)s": "잘못된 사용자 이름입니다: %(errMessage)s",
     "Users": "사용자들",
     "Verification Pending": "인증을 기다리는 중",
     "Verification": "인증",
@@ -430,34 +430,34 @@
     "Verified key": "인증한 키",
     "Video call": "영상통화",
     "Voice call": "음성통화",
-    "VoIP conference finished.": "인터넷전화 회의를 마쳤어요.",
-    "VoIP conference started.": "인터넷전화 회의를 시작했어요.",
-    "VoIP is unsupported": "인터넷전화를 지원하지 않아요",
-    "(could not connect media)": "(미디어에 연결할 수 없어요)",
+    "VoIP conference finished.": "VoIP 회의를 마쳤어요.",
+    "VoIP conference started.": "VoIP 회의를 시작했습니다.",
+    "VoIP is unsupported": "VoIP는 지원하지 않습니다",
+    "(could not connect media)": "(미디어에 연결할 수 없었습니다.)",
     "(no answer)": "(응답 없음)",
     "(unknown failure: %(reason)s)": "(알 수 없는 오류: %(reason)s)",
     "(warning: cannot be disabled again!)": "(주의: 다시 끌 수 없어요!)",
     "Warning!": "주의!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "주의: 장치는 이미 인증했지만, 키가 맞지 않아요!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "주의: 기기는 이미 인증했지만, 키가 맞지 않아요!",
     "Who can access this room?": "누가 이 방에 들어올 수 있나요?",
     "Who can read history?": "누가 기록을 읽을 수 있나요?",
     "Who would you like to add to this room?": "이 방에 누구를 초대하고 싶으세요?",
     "Who would you like to communicate with?": "누구와 이야기하고 싶으세요?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s님이 %(targetName)s니의 초대를 취소하셨어요.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s님이 %(targetName)s님의 초대를 거절했습니다.",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "초대를 <acceptText>받아들이거나</acceptText> <declineText>거절</declineText>하시겠어요?",
     "You already have existing direct chats with this user:": "이미 이 사용자와 직접 이야기하는 중이에요:",
-    "You are already in a call.": "이미 자신이 통화 중이네요.",
+    "You are already in a call.": "통화 이미 하고 계시잖아요.",
     "Press <StartChatButton> to start a chat with someone": "다른 사람과 이야기하려면 <StartChatButton>을 누르세요",
-    "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!": "주의: 키 확인 실패! %(userId)s와 장치 %(deviceId)s의 서명 키 \"%(fprint)s\"는 주어진 키 \"%(fingerprint)s\"와 맞지 않아요. 누가 이야기를 가로채는 중일 수도 있어요!",
-    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "어떤 방에도 들어가 있지 않으세요! <CreateRoomButton>을 눌러서 방을 만들거나 <RoomDirectoryButton>를 눌러 목록에서 방을 찾아보세요",
-    "You are trying to access %(roomName)s.": "%(roomName)s에 들어가려고 하는 중이에요.",
-    "You cannot place a call with yourself.": "자신에게 전화를 걸 수는 없어요.",
-    "You cannot place VoIP calls in this browser.": "이 브라우저에서는 인터넷전화를 걸 수 없어요.",
+    "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!": "주의: 키 확인 실패! %(userId)s와 %(deviceId)s 기기의 서명 키 \"%(fprint)s\"는 주어진 키 \"%(fingerprint)s\"와 맞지 않아요. 누가 이야기를 가로채는 중일 수도 있어요!",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "아직 어떤 방에도 들어가 있지 않아요! <CreateRoomButton>을 눌러서 방을 만들거나 <RoomDirectoryButton>을 눌러 목록에서 방을 찾아보세요",
+    "You are trying to access %(roomName)s.": "%(roomName)s에 들어가려고 하는 중입니다.",
+    "You cannot place a call with yourself.": "자기 자신에게는 전화를 걸 수 없습니다.",
+    "You cannot place VoIP calls in this browser.": "이 브라우저에서는 VoIP 전화를 걸 수 없습니다.",
     "You do not have permission to post to this room": "이 방에서 글을 올릴 권한이 없어요",
     "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s님이 %(roomName)s에서 차단하셨어요.",
     "You have been invited to join this room by %(inviterName)s": "%(inviterName)s님이 이 방에 초대하셨어요",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s님이 %(roomName)s에서 추방하셨어요.",
-    "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": "모든 장치에서 로그아웃되었고 더 이상 알림을 받지 않으실 거에요. 다시 알림을 받으시려면, 각 장치에 로그인해주세요",
+    "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": "모든 기기에서 로그아웃되었고 더 이상 알림을 받지 않으실 거에요. 다시 알림을 받으시려면, 각 기기에 로그인해주세요",
     "You have <a>disabled</a> URL previews by default.": "URL 미리보기 <a>쓰지 않기</a>를 기본으로 하셨어요.",
     "You have <a>enabled</a> URL previews by default.": "URL 미리보기 <a>쓰기</a>를 기본으로 하셨어요.",
     "You have no visible notifications": "보여드릴 알림이 없어요",
@@ -468,11 +468,11 @@
     "You need to enter a user name.": "사용자 이름을 입력하셔야 해요.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "이메일 주소가 이 홈 서버의 매트릭스 ID와 관련이 없어요.",
     "Your password has been reset": "비밀번호를 다시 설정했어요",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "비밀번호를 바꾸었어요. 다른 장치에서 다시 로그인할 때까지 알림을 받지 않을 거에요",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "비밀번호를 바꿨습니다. 다른 기기에서는 다시 로그인할 때까지 푸시 알림을 받지 않을 겁니다",
     "You seem to be in a call, are you sure you want to quit?": "전화 중인데, 끊으시겠어요?",
     "You seem to be uploading files, are you sure you want to quit?": "파일을 올리는 중인데, 그만두시겠어요?",
     "You should not yet trust it to secure data": "안전한 자료를 위해서는 아직 믿으시면 안돼요",
-    "Your home server does not support device management.": "홈 서버가 장치 관리를 지원하지 않아요.",
+    "Your home server does not support device management.": "홈 서버가 기기 관리를 지원하지 않아요.",
     "Sun": "일",
     "Mon": "월",
     "Tue": "화",
@@ -495,7 +495,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s일 %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s일 %(fullYear)s년 %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s, %(time)s",
-    "Set a display name:": "별명 설정:",
+    "Set a display name:": "별명 설정하기:",
     "Upload an avatar:": "아바타 올리기:",
     "This server does not support authentication with a phone number.": "이 서버는 전화번호 인증을 지원하지 않아요.",
     "Missing password.": "비밀번호를 틀렸어요.",
@@ -531,9 +531,9 @@
     "New Password": "새 비밀번호",
     "Start automatically after system login": "컴퓨터를 시작할 때 자동으로 실행하기",
     "Desktop specific": "컴퓨터 설정",
-    "Analytics": "정보 수집",
+    "Analytics": "정보 분석",
     "Options": "선택권",
-    "Riot collects anonymous analytics to allow us to improve the application.": "라이엇은 익명의 정보를 수집해 응용 프로그램을 개선한답니다.",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot은 이 앱을 발전시키기 위해 익명으로 정보 분석을 수집합니다.",
     "Passphrases must match": "암호가 일치해야 해요",
     "Passphrase must not be empty": "암호를 비우시면 안돼요",
     "Export room keys": "방 키를 내보내기",
@@ -554,25 +554,25 @@
     "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.": "이 과정으로 전에 다른 매트릭스 클라이언트에서 내보낸 암호화 키를 불러올 수 있어요. 그 다음에는 다른 클라이언트에서 해독할 수 있던 어떤 메시지라도 해독할 수 있을 거에요.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "내보낸 파일은 암호로 보호하고 있어요. 파일을 해독하려면, 여기에 암호를 입력해주세요.",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "이 사건을 지우길 (없애길) 원하세요? 방 이름을 지우거나 주제를 바꾸시면, 되돌릴 수 없다는 걸 명심해주세요.",
-    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "이 장치를 믿을 수 있는지 확인하시려면, 몇 가지 방법(예를 들자면 직접 만나거나 전화를 걸어서)으로 소유자에게 연락하시고 그들이 사용자 설정에서 보는 키와 아래 키가 같은지 물어보세요:",
-    "Device name": "장치 이름",
-    "Device Name": "장치 이름",
-    "Device key": "장치 키",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "맞다면, 아래 인증 버튼을 누르세요. 맞지 않다면, 다른 사람이 이 장치를 가로채고 있으니 요주의 버튼을 누르시고 싶으실 거 같네요.",
+    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "이 기기를 믿을 수 있는지 인증하시려면, 몇 가지 방법(예를 들자면 직접 만나거나 전화를 걸어서)으로 소유자에게 연락하시고 그들이 사용자 설정에서 보는 키와 아래 키가 같은지 물어보세요:",
+    "Device name": "기기 이름",
+    "Device Name": "기기 이름",
+    "Device key": "기기 키",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "맞다면, 아래 인증 버튼을 누르세요. 맞지 않다면, 다른 사람이 이 기기를 가로채고 있으니 요주의 버튼을 누르시고 싶으실 거 같네요.",
     "In future this verification process will be more sophisticated.": "앞으로는 이 확인 과정이 더 정교해질 거에요.",
-    "Verify device": "인증한 장치",
-    "I verify that the keys match": "키가 맞는 걸 확인했어요",
+    "Verify device": "인증한 기기",
+    "I verify that the keys match": "키가 맞다는 걸 인증했어요",
     "Unable to restore session": "세션을 복구할 수 없어요",
     "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "이전에 더 최근 버전의 라이엇을 쓰셨다면, 이 버전과 맞지 않을 거에요. 창을 닫고 더 최근 버전으로 돌아가세요.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "현재 인증하지 않은 장치를 요주의로 지정하셨어요. 이 장치들에 메시지를 보내려면 인증을 해야 해요.",
-    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "각 장치가 알맞은 소유자에게 속해 있는지 인증 과정을 거치길 추천하지만, 원하신다면 그러지 않고 메시지를 다시 보내실 수 있어요.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\"에 본 적 없는 장치가 있어요.",
-    "Unknown devices": "알 수 없는 장치",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "현재 인증하지 않은 기기를 요주의로 지정하셨어요. 이 기기들에 메시지를 보내려면 인증을 해야 해요.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "각 기기가 알맞은 소유자에게 속해 있는지 인증 과정을 거치길 추천하지만, 원하신다면 그러지 않고 메시지를 다시 보내실 수 있어요.",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\"에 본 적 없는 기기가 있어요.",
+    "Unknown devices": "알 수 없는 기기",
     "Unknown Address": "알 수 없는 주소",
     "Unblacklist": "요주의 취소",
     "Blacklist": "요주의",
-    "Unverify": "확인 취소",
-    "Verify...": "확인...",
+    "Unverify": "인증 취소",
+    "Verify...": "인증...",
     "ex. @bob:example.com": "예. @bob:example.com",
     "Add User": "사용자 추가",
     "This Home Server would like to make sure you are not a robot": "이 홈 서버는 당신이 로봇이 아닌지 확인하고 싶다네요",
@@ -595,7 +595,7 @@
     "Error decrypting video": "영상 해독 오류",
     "Add an Integration": "통합 추가",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "타사 사이트로 이동하는데 %(integrationsUrl)s에서 쓰도록 계정을 인증할 수 있어요. 계속하시겠어요?",
-    "Removed or unknown message type": "지웠거나 알 수 없는 메시지 유형",
+    "Removed or unknown message type": "삭제했거나 알 수 없는 메시지 유형",
     "URL Previews": "URL 미리보기",
     "Drop file here to upload": "올릴 파일을 여기에 놓으세요",
     " (unsupported)": " (지원하지 않음)",
@@ -608,18 +608,18 @@
     "Start chatting": "이야기하기",
     "Start Chatting": "이야기하기",
     "Click on the button below to start chatting!": "이야기하려면 아래 버튼을 누르세요!",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s님이 방 아바타를 <img/>로 바꾸셨어요",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s님이 방 아바타를 지우셨어요.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s가 %(roomName)s 방의 아바타를 바꾸셨어요",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s님이 방 아바타를 <img/>로 바꿨습니다",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s님이 방 아바타를 삭제했습니다.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s님이 %(roomName)s의 아바타를 바꿨습니다",
     "Username available": "쓸 수 있는 사용자 이름",
     "Username not available": "쓸 수 없는 사용자 이름",
     "Something went wrong!": "문제가 생겼어요!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "이건 <span></span> 홈 서버의 계정 이름이에요, <a>다른 서버</a>를 고를 수도 있다는 거죠.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "매트릭스 계정을 가지고 계시면 <a>로그인</a>하실 수도 있죠.",
-    "Your browser does not support the required cryptography extensions": "브라우저가 필요한 암호화 확장 기능을 지원하지 않아요",
-    "Not a valid Riot keyfile": "올바른 라이엇 키 파일이 아니에요",
-    "Authentication check failed: incorrect password?": "인증 확인 실패: 비밀번호를 틀리셨나요?",
-    "Disable Peer-to-Peer for 1:1 calls": "1:1 통화는 P2P 끄기",
+    "Your browser does not support the required cryptography extensions": "필요한 암호화 확장 기능을 브라우저가 지원하지 않습니다",
+    "Not a valid Riot keyfile": "올바른 Riot 키 파일이 아닙니다",
+    "Authentication check failed: incorrect password?": "검증 확인 실패: 비밀번호를 틀리셨나요?",
+    "Disable Peer-to-Peer for 1:1 calls": "1:1 통화할 때는 P2P 비활성화하기",
     "Do you want to set an email address?": "이메일 주소를 설정하시겠어요?",
     "This will allow you to reset your password and receive notifications.": "이렇게 하면 비밀번호를 다시 설정하고 알림을 받으실 수 있어요.",
     "To return to your account in future you need to set a password": "나중에 계정으로 돌아가려면 비밀번호를 설정하셔야 해요",
@@ -627,18 +627,18 @@
     "Start verification": "인증 시작",
     "Share without verifying": "인증하지 않고 공유하기",
     "Ignore request": "요청 무시하기",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "새 장치 '%(displayName)s'를 추가했고 암호화 키를 요청하고 있어요.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "인증하지 않은 장치 '%(displayName)s'가 암호화 키를 요청하고 있어요.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "새 기기 '%(displayName)s'를 추가했고, 이 기기는 암호화 키를 요청하고 있습니다.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "인증되지 않은 기기 '%(displayName)s'이(가) 암호화 키를 요청하고 있습니다.",
     "Encryption key request": "암호화 키 요청",
     "Edit": "수정하기",
     "Fetching third party location failed": "타사 위치를 불러오지 못했어요",
     "A new version of Riot is available.": "라이엇의 새 버전을 사용하실 수 있어요.",
-    "Couldn't load home page": "중심 화면을 불러올 수 없어요",
+    "Couldn't load home page": "홈 페이지를 불러올 수 없었습니다",
     "All notifications are currently disabled for all targets.": "현재 모든 알림이 모든 상대에게서 꺼졌어요.",
     "Uploading report": "보고를 올리는 중",
     "Sunday": "일요일",
     "Guests can join": "손님이 들어올 수 있어요",
-    "Messages sent by bot": "봇이 보낸 메시지",
+    "Messages sent by bot": "봇이 보낸 메시지를 받을 때",
     "Notification targets": "알림 대상",
     "Failed to set direct chat tag": "직접 이야기 지정을 설정하지 못했어요",
     "Today": "오늘",
@@ -650,7 +650,7 @@
     "Add an email address above to configure email notifications": "이메일 알림을 설정하기 위해 이메일 주소를 추가해주세요",
     "Expand panel": "확장 패널",
     "On": "켜기",
-    "Filter room names": "방 이름 거르기",
+    "Filter room names": "방 이름 찾기",
     "Changelog": "바뀐 점",
     "Waiting for response from server": "서버에서 응답을 기다리는 중",
     "Leave": "떠나기",
@@ -667,13 +667,13 @@
     "The Home Server may be too old to support third party networks": "타사 네트워크를 지원하기에는 홈 서버가 너무 오래된 걸 수 있어요",
     "Resend": "다시 보내기",
     "Error saving email notification preferences": "이메일 알림을 설정하는데 오류가 일어났어요",
-    "Messages containing my display name": "내 별명이 적힌 메시지",
-    "Messages in one-to-one chats": "1:1 이야기의 메시지",
+    "Messages containing my display name": "내 별명이 포함된 메시지를 받을 때",
+    "Messages in one-to-one chats": "1:1 대화 메시지 받을 때",
     "Unavailable": "이용할 수 없음",
     "View Decrypted Source": "해독된 출처 보기",
     "Send": "보내기",
     "remove %(name)s from the directory.": "목록에서 %(name)s을 지웠어요.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "여기 표시될 수 없는 규칙에 따라 다음 키워드는 알리지 않아요:",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "여기에 표시될 수 없는 규칙에 따르는 다음 키워드에 대한 알림:",
     "Please set a password!": "비밀번호를 설정해주세요!",
     "You have successfully set a password!": "비밀번호를 설정했어요!",
     "An error occurred whilst saving your email notification preferences.": "이메일 알림을 설정하다가 오류가 일어났어요.",
@@ -685,12 +685,12 @@
     "Files": "파일",
     "Collecting app version information": "앱 버전 정보를 수집하는 중",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "방 가명 %(alias)s 을 지우고 목록에서 %(name)s를 지우시겠어요?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 장치에서 로그인하실 수 있어요.",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 기기에서 로그인하실 수 있어요.",
     "Enable notifications for this account": "이 계정의 알림 받기",
     "Directory": "목록",
     "Search for a room": "방에서 찾기",
     "Messages containing <span>keywords</span>": "<span>키워드</span>가 적힌 메시지",
-    "Room not found": "방을 찾지 못했어요",
+    "Room not found": "방을 찾지 못했습니다",
     "Tuesday": "화요일",
     "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
     "Search…": "찾기…",
@@ -710,7 +710,7 @@
     "All messages (noisy)": "모든 메시지 (크게)",
     "Enable them now": "지금 켜기",
     "Forward Message": "메시지 전달",
-    "Messages containing my user name": "내 사용자 이름이 적힌 메시지",
+    "Messages containing my user name": "내 사용자 이름이 적힌 메시지를 받을 때",
     "Toolbox": "도구상자",
     "Collecting logs": "로그 수집 중",
     "more": "더 보기",
@@ -721,7 +721,7 @@
     "Failed to update keywords": "키워드를 갱신하지 못했어요",
     "Send logs": "로그 보내기",
     "All messages": "모든 메시지",
-    "Call invitation": "전화가 왔어요",
+    "Call invitation": "전화가 올 때",
     "Downloading update...": "업데이트를 받는 중...",
     "You have successfully set a password and an email address!": "비밀번호와 이메일 주소를 설정했어요!",
     "What's new?": "새로운 점은?",
@@ -731,7 +731,7 @@
     "Can't update user notification settings": "사용자 알림 설정을 갱신할 수 없어요",
     "Notify for all other messages/rooms": "다른 모든 메시지/방 알리기",
     "Unable to look up room ID from server": "서버에서 방 ID를 찾아볼 수 없어요",
-    "Couldn't find a matching Matrix room": "일치하는 매트릭스 방을 찾을 수 없어요",
+    "Couldn't find a matching Matrix room": "일치하는 매트릭스 방을 찾을 수 없었습니다",
     "Invite to this room": "이 방에 초대하기",
     "You cannot delete this message. (%(code)s)": "이 메시지를 지우실 수 없어요. (%(code)s)",
     "Thursday": "목요일",
@@ -744,7 +744,7 @@
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "라이엇이 아닌 다른 클라이언트에서 구성하셨을 수도 있어요. 라이엇에서 조정할 수는 없지만 여전히 적용되있을 거에요",
     "Sorry, your browser is <b>not</b> able to run Riot.": "죄송해요. 브라우저에서 라이엇을 켤 수가 <b>없어요</b>.",
     "Uploaded on %(date)s by %(user)s": "by %(user)s가 %(date)s에 올림",
-    "Messages in group chats": "이야기 모임의 메시지",
+    "Messages in group chats": "그룹 대화 메시지를 받을 때",
     "Yesterday": "어제",
     "Error encountered (%(errorDetail)s).": "오류가 일어났어요 (%(errorDetail)s).",
     "Low Priority": "낮은 우선순위",
@@ -756,7 +756,7 @@
     "Mentions only": "답만 하기",
     "Failed to remove tag %(tagName)s from room": "방에서 %(tagName)s 지정을 지우지 못했어요",
     "Wednesday": "수요일",
-    "You can now return to your account after signing out, and sign in on other devices.": "계정을 로그아웃하신 뒤에 계정으로 돌아가, 다른 장치에서 로그인하실 수 있어요.",
+    "You can now return to your account after signing out, and sign in on other devices.": "계정을 로그아웃하신 뒤에 계정으로 돌아가, 다른 기기에서 로그인하실 수 있어요.",
     "Enable email notifications": "이메일로 알림 받기",
     "Login": "로그인",
     "No rooms to show": "보여드릴 방이 없어요",
@@ -767,5 +767,213 @@
     "Collapse panel": "패널 접기",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "현재 브라우저에서는, 응용 프로그램의 모양과 기능이 완벽하게 맞지 않거나, 일부 혹은 모든 기능이 작동하지 않을 수 있어요. 계속할 수는 있지만, 맞닥뜨리는 모든 문제는 직접 해결하셔야해요!",
     "Checking for an update...": "업데이트를 확인하는 중...",
-    "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요"
+    "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s님이 별명을 %(displayName)s(으)로 바꿨습니다.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s가 방의 고정된 메시지를 바꿨습니다.",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s님이 이름을 %(count)s번 바꿨습니다",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s님이 이름을 바꿨습니다",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s님이 이름을 %(count)s번 바꿨습니다",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s님이 이름을 바꿨습니다",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s님이 아바타를 %(count)s번 바꿨습니다",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s님이 아바타를 바꿨습니다",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s님이 아바타를 %(count)s번 바꿨습니다",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s님이 아바타를 바꿨습니다",
+    "This setting cannot be changed later!": "이 설정은 나중에 바꿀 수 없습니다!",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "이전 버전 Riot의 데이터가 발견됐습니다. 이전 버전에서는 종단 간 암호화에 오작동을 일으켰을 겁니다. 이전 버전을 사용한 최근의 종단 간 암호화된 메시지는 이 버전에서 복호화가 불가능할 수 있습니다. 이 버전과 메시지를 주고받지 못할 수도 있습니다. 문제가 생긴다면 로그아웃하고 다시 로그인 해 보세요. 메시지 기록을 유지하고 싶다면 키를 내보냈다가 다시 불러오세요.",
+    "Hide display name changes": "별명 변경 내역 숨기기",
+    "This event could not be displayed": "이 이벤트는 표시될 수 없었습니다",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s(%(userName)s)님이 %(dateTime)s에 봄",
+    "Banned by %(displayName)s": "%(displayName)s님이 차단함",
+    "Display your community flair in rooms configured to show it.": "커뮤니티 재능이 보이도록 설정된 방에서 커뮤니티 재능을 표시할 수 있습니다.",
+    "The user '%(displayName)s' could not be removed from the summary.": "사용자 %(displayName)s님이 요약에서 제거되지 못했습니다.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "이 방들은 커뮤니티 페이지에서 커뮤니티 구성원에게 보여집니다. 커뮤니티 구성원은 방을 클릭해 들어갈 수 있습니다.",
+    "Pinned Messages": "고정된 메시지",
+    "You're not currently a member of any communities.": "지금은 어떤 커뮤니티에도 속해 있지 않습니다.",
+    "Flair": "재능",
+    "Showing flair for these communities:": "이 커뮤니티에 재능을 공개 중:",
+    "This room is not showing flair for any communities": "이 방은 어떤 커뮤니티에도 재능을 보여주지 않습니다",
+    "Flair will appear if enabled in room settings": "재능은 방 설정에서 활성화하면 나타날 겁니다",
+    "Flair will not appear": "재능은 나타나지 않을 겁니다",
+    "The platform you're on": "당신이 사용 중인 플랫폼",
+    "The version of Riot.im": "Riot 버전",
+    "Whether or not you're logged in (we don't record your user name)": "로그인 돼 있는지(사용자 이름을 기록)",
+    "Your language of choice": "선택한 언어",
+    "Which officially provided instance you are using, if any": "(만일 있다면) 사용하고 있는 공식 프로그램",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Rich Text Editor의 Richtext mode를 사용하고 있는지",
+    "Your homeserver's URL": "홈 서버의 URL",
+    "Your identity server's URL": "ID 서버의 URL",
+    "e.g. %(exampleValue)s": "예시: %(exampleValue)s",
+    "Every page you use in the app": "앱에서 이용하는 모든 페이지",
+    "e.g. <CurrentPageURL>": "예시: <CurrentPageURL>",
+    "Your User Agent": "사용자 에이전트",
+    "Your device resolution": "기기 해상도",
+    "The information being sent to us to help make Riot.im better includes:": "Riot을 발전시키기 위해 저희에게 보내는 정보는 다음을 포함합니다:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "이 페이지에서 방, 사용자, 혹은 그룹 ID와 같은 식별 가능한 정보를 포함하는 부분이 있는 데이터는 서버에 보내지기 전에 삭제됩니다.",
+    "Call Failed": "전화할 수 없었습니다",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "이 방에는 모르는 기기가 있습니다. 인증하지 않고 계속하면 전화를 도청할 수도 있을 겁니다.",
+    "Review Devices": "기기 검증하기",
+    "Call Anyway": "그냥 걸기",
+    "Answer Anyway": "그냥 받기",
+    "Call": "전화하기",
+    "Answer": "받기",
+    "Call in Progress": "전화 거는 중",
+    "A call is already in progress!": "이미 전화 걸고 계세요!",
+    "PM": "오후",
+    "AM": "오전",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s %(monthName)s %(day)s (%(weekDayName)s)",
+    "Who would you like to add to this community?": "이 커뮤니티에 누구를 추가하고 싶으세요?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "경고: 커뮤니티에 추가한 사람은 커뮤니티 ID를 아는 누구에게나 공개됩니다",
+    "Invite new community members": "새 커뮤니티 구성원 초대하기",
+    "Name or matrix ID": "이름이나 Matrix ID",
+    "Invite to Community": "커뮤니티에 초대하기",
+    "Which rooms would you like to add to this community?": "어떤 방을 이 커뮤니티에 추가하고 싶으세요?",
+    "Show these rooms to non-members on the community page and room list?": "이 방들을 구성원이 아닌 커뮤니티 페이지와 방 리스트에 공개할까요?",
+    "Add rooms to the community": "커뮤니티에 방 추가하기",
+    "Room name or alias": "방 이름 또는 별칭",
+    "Add to community": "커뮤니티에 추가하기",
+    "Failed to invite the following users to %(groupId)s:": "해당 사용자를 %(groupId)s에 초대하지 못했습니다:",
+    "Failed to invite users to community": "사용자를 커뮤니티에 초대하지 못했습니다",
+    "Failed to invite users to %(groupId)s": "%(groupId)s에 사용자를 초대하지 못했습니다",
+    "Failed to add the following rooms to %(groupId)s:": "%(groupId)s에 해당 방을 추가하지 못했습니다:",
+    "Restricted": "제한됨",
+    "Unable to create widget.": "위젯을 만들지 못합니다.",
+    "Missing roomId.": "roomID가 빠졌습니다.",
+    "You are not in this room.": "이 방의 구성원이 아닙니다.",
+    "You do not have permission to do that in this room.": "이 방에서 그걸 할 수 있는 권한이 없습니다.",
+    "Changes colour scheme of current room": "현재 방의 색 구성 바꾸기",
+    "Sets the room topic": "방 주제 설정하기",
+    "Unbans user with given id": "주어진 ID로 사용자 차단 해제하기",
+    "Ignores a user, hiding their messages from you": "사용자 무시하고, 메시지 보지 말기",
+    "Ignored user": "무시당한 사용자",
+    "You are now ignoring %(userId)s": "%(userId)s님을 이제 무시합니다",
+    "Stops ignoring a user, showing their messages going forward": "사용자를 그만 무시하고 이제부터 메시지 보기",
+    "Unignored user": "무시하지 않게 된 사용자",
+    "You are no longer ignoring %(userId)s": "%(userId)s님을 더 이상 무시하고 있지 않습니다",
+    "Define the power level of a user": "사용자의 권한 등급 정의하기",
+    "Opens the Developer Tools dialog": "개발자 도구 대화 열기",
+    "Verifies a user, device, and pubkey tuple": "사용자, 기기, 그리고 공개키 튜플 인증하기",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s님이 수정한 %(widgetName)s 위젯",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s님이 추가한 %(widgetName)s 위젯",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s님이 삭제한 %(widgetName)s 위젯",
+    "Remove avatar": "아바타 삭제하기",
+    "To remove other users' messages, you must be a": "다른 사용자의 메시지를 삭제하기 위해서, 당신은 -가 돼야 한다",
+    "Message removed by %(userId)s": "%(userId)s님에 의해 삭제된 메시지",
+    "Message removed": "메시지가 삭제됐습니다",
+    "Remove from community": "커뮤니티에서 삭제하기",
+    "Remove this user from community?": "이 사용자를 커뮤니티에서 삭제하시겠어요?",
+    "Failed to remove user from community": "유저를 커뮤니티에서 삭제하지 못했습니다",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "확실히 %(roomName)s를(을) %(groupId)s로부터 삭제하고 싶으세요?",
+    "Removing a room from the community will also remove it from the community page.": "방을 커뮤니티로부터 삭제하면 커뮤니티 페이지에서도 삭제됩니다.",
+    "Failed to remove room from community": "방을 커뮤니티로부터 삭제하지 못했습니다",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "%(roomName)s를(을) %(groupId)s로부터 삭제하지 못했습니다",
+    "%(names)s and %(count)s others are typing|other": "%(names)s님과 %(count)s명 더 입력하는 중",
+    "%(names)s and %(count)s others are typing|one": "%(names)s님 외 1명이 입력하는 중",
+    "Message Pinning": "메시지 고정",
+    "Jitsi Conference Calling": "Jitsi 회의 전화",
+    "Disable Emoji suggestions while typing": "입력 중에는 이모지 추천 비활성화하기",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "저희는 프라이버시를 중요하게 여기기 때문에, 그 어떤 개인적이거나 특정할 수 있는 정보도 정보 분석을 위해 수집하지 않습니다.",
+    "Send analytics data": "정보 분석 데이터 보내기",
+    "Learn more about how we use analytics.": "저희가 어떻게 정보 분석을 이용하는지 알아보세요.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "디버그 로그는 사용자 이름, 방문한 방이나 그룹의 ID나 별칭, 그리고 다른 사용자의 사용자 이름을 포함한 앱 이용 데이터를 포함합니다. 메시지는 포함하지 않습니다.",
+    "Debug Logs Submission": "디버그 로그 제출",
+    "Submit debug logs": "디버그 로그 전송하기",
+    "Select devices": "기기 선택하기",
+    "Enable inline URL previews by default": "기본으로 바로 URL 미리보기",
+    "Always show encryption icons": "암호화 아이콘을 언제나 보여주기",
+    "Enable automatic language detection for syntax highlighting": "구문 강조를 위해 자동 언어 감지하기",
+    "Hide avatars in user and room mentions": "사용자와 방 언급할 때 아바타 숨기기",
+    "Disable big emoji in chat": "대화에서 큰 이모지 비활성화하기",
+    "Automatically replace plain text Emoji": "일반 텍스트로 된 이모지 자동으로 변환하기",
+    "Mirror local video feed": "보고 있는 비디오 전송 상태 비추기",
+    "Disable Community Filter Panel": "커뮤니티 필터판 비활성화하기",
+    "Hide avatar changes": "아바타 변경 내역 숨기기",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "커뮤니티 <bold1>이름</bold1>과 <bold2>아바타</bold2> 변경 내역은 최장 30분까지 다른 사용자가 보지 못할 수 있습니다.",
+    "Delete %(count)s devices|one": "기기 지우기",
+    "Addresses": "주소",
+    "Invalid community ID": "잘못된 커뮤니티 ID입니다",
+    "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\"는 바른 커뮤니티 ID가 아닙니다",
+    "New community ID (e.g. +foo:%(localDomain)s)": "새 커뮤니티 ID(예시: +foo:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "이 방에 참여한 분에게는 URL 미리보기가 기본입니다.",
+    "URL previews are disabled by default for participants in this room.": "이 방에 참여한 분에게는 URL 미리보기가 기본으로 비활성화 돼 있습니다.",
+    "Cannot add any more widgets": "더 이상 위젯을 추가할 수 없습니다",
+    "The maximum permitted number of widgets have already been added to this room.": "이미 이 방에는 허용된 최대 수의 위젯이 추가됐습니다.",
+    "Add a widget": "위젯 추가하기",
+    "%(senderName)s sent an image": "%(senderName)s가 이미지를 보냈습니다",
+    "%(senderName)s sent a video": "%(senderName)s가 비디오를 보냈습니다",
+    "%(senderName)s uploaded a file": "%(senderName)s가 파일을 보냈습니다",
+    "Key request sent.": "키 요청을 보냈습니다.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "다른 기기에",
+    "Encrypting": "암호화 중",
+    "Encrypted, not sent": "암호화 됨, 보내지지 않음",
+    "Disinvite this user?": "이 사용자에 대한 초대를 취소할까요?",
+    "Kick this user?": "이 사용자를 내쫒을까요?",
+    "Unban this user?": "이 사용자를 차단 해제할까요?",
+    "%(duration)ss": "%(duration)s초",
+    "%(duration)sm": "%(duration)s분",
+    "%(duration)sh": "%(duration)s시간",
+    "%(duration)sd": "%(duration)s일",
+    "Online for %(duration)s": "%(duration)s 동안 온라인",
+    "Idle for %(duration)s": "%(duration)s 동안 대기 중",
+    "Offline for %(duration)s": "%(duration)s 동안 오프라인",
+    "Unknown for %(duration)s": "%(duration)s 동안 어떤지 모름",
+    "Unknown": "모름",
+    "Replying": "답장 중",
+    "Loading...": "로딩 중...",
+    "Unpin Message": "메시지 고정 해제하기",
+    "No pinned messages.": "고정된 메시지가 없습니다.",
+    "At this time it is not possible to reply with an emote.": "지금은 이모트로 답장할 수 없습니다.",
+    "Send a message (unencrypted)…": "(암호화 안 된)메시지를 보내세요…",
+    "Send an encrypted message…": "메시지를 보내세요…",
+    "Unable to reply": "답장할 수 없습니다",
+    "Send an encrypted reply…": "답장을 보내세요…",
+    "Send a reply (unencrypted)…": "(암호화 안 된)답장을 보내세요…",
+    "User Options": "사용자 옵션",
+    "Share Link to User": "사용자에게 링크 공유하기",
+    "Invite": "초대하기",
+    "Mention": "언급하기",
+    "Ignore": "무시하기",
+    "Unignore": "그만 무시하기",
+    "Ignored Users": "무시된 사용자",
+    "Demote": "강등하기",
+    "Demote yourself?": "자신을 강등하시겠어요?",
+    "Ban this user?": "이 사용자를 차단할까요?",
+    "To ban users, you must be a": "사용자를 차단하기 위해서, 당신은 -가 돼야 한다",
+    "were banned %(count)s times|other": "님은 %(count)s번 차단됐습니다",
+    "were banned %(count)s times|one": "님은 차단됐습니다",
+    "was banned %(count)s times|other": "님은 %(count)s번 차단됐습니다",
+    "was banned %(count)s times|one": "님은 차단됐습니다",
+    "were unbanned %(count)s times|other": "님은 %(count)s번 차단 해제됐습니다",
+    "were unbanned %(count)s times|one": "님은 차단 해제됐습니다",
+    "was unbanned %(count)s times|other": "님은 %(count)s번 차단 해제됐습니다",
+    "was unbanned %(count)s times|one": "는 차단 해제됐습니다",
+    "Delete %(count)s devices|other": "%(count)s개 기기 지우기",
+    "Drop here to restore": "복원하려면 여기에 떨어뜨리세요",
+    "Drop here to favourite": "즐겨찾기 하려면 여기에 떨어뜨리세요",
+    "Drop here to tag direct chat": "직접 대화를 태그하려면 여기에 떨어뜨리세요",
+    "You have entered an invalid address.": "잘못된 주소를 입력했습니다.",
+    "This room is not public. You will not be able to rejoin without an invite.": "이 방은 공개되지 않았습니다. 초대 없이는 다시 들어올 수 없습니다.",
+    "Enable URL previews for this room (only affects you)": "이 방에 대해 URL 미리보기",
+    "Enable URL previews by default for participants in this room": "이 방에 참여한 모두에게 기본으로 URL 미리보기 적용하기",
+    "Enable widget screenshots on supported widgets": "지원되는 위젯에 대해 위젯 스크린샷 허용하기",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "들어오거나 떠나는 메시지 숨기기(초대/추방/차단은 그대로)",
+    "Show empty room list headings": "빈 방 목록 표제 보이게 하기",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "누군가 메시지에 URL을 넣으면 URL 미리보기가 보여져 웹사이트에서 온 제목, 설명, 그리고 이미지 등 그 링크에 대해 더 알 수 있습니다.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "지금 이 방처럼, 암호화된 방에서는 홈서버(미리보기가 만들어지는 곳)에서 이 방에서 보여지는 링크에 대해 알 수 없도록 URL 미리보기가 기본적으로 비활성화돼 있습니다.",
+    "Your key share request has been sent - please check your other devices for key share requests.": "키 공유 요청이 보내졌습니다. 키 공유 요청을 다른 기기에서 받아주세요.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "자동으로 다른 기기에 키 공유 요청을 보냈습니다. 다른 기기에서 키 공유 요청을 거절하거나 묵살하셨으면, 여기를 눌러 이번 세션에 다시 키를 요청하세요.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "다른 기기로부터 <requestLink>암호화 키 재요청</requestLink>",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "자기 자신을 강등시키는 것은 다시 되돌릴 수 없고, 자신이 마지막으로 이 방에서 특권을 가진 사용자라면 다시 특권을 얻는 건 불가능합니다.",
+    "Jump to read receipt": "수신 확인으로 건너뛰기",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "현재로서는 파일을 답장할 수 없으므로 답장이 아닌 파일로 보내질 겁니다.",
+    "Jump to message": "메세지로 건너뛰기",
+    "Share room": "방 공유하기",
+    "Drop here to demote": "강등하려면 여기에 떨어뜨리세요",
+    "Community Invites": "커뮤니티 초대",
+    "You have no historical rooms": "오래된 방이 없습니다",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s님에 의해",
+    "You have been banned from this room by %(userName)s.": "%(userName)s님이 이 방에서 내쫒았습니다.",
+    "You are trying to access a room.": "방에 접근하고 있습니다.",
+    "To change the room's avatar, you must be a": "방의 아바타를 바꾸려면, -여야 합니다",
+    "To change the room's name, you must be a": "방 이름을 바꾸려면, -여야 합니다.",
+    "To change the room's main address, you must be a": "방의 매인 주소를 바꾸려면, -여야 합니다."
 }

From 33b6d0ab5f8389f382037b8288cbc3625209a949 Mon Sep 17 00:00:00 2001
From: Markel <wakutiteo@protonmail.com>
Date: Fri, 13 Jul 2018 23:18:05 +0000
Subject: [PATCH 623/702] Translated using Weblate (Spanish)

Currently translated at 61.2% (742 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
---
 src/i18n/strings/es.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 5434c570f7..121d5bed3d 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -736,5 +736,9 @@
     "Collapse panel": "Colapsar panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
     "Checking for an update...": "Comprobando actualizaciones...",
-    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí"
+    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí",
+    "Every page you use in the app": "Cada página  que usas en la aplicación",
+    "Your User Agent": "Tu Agente de Usuario",
+    "Your device resolution": "La resolución de tu dispositivo",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hay dispositivos desconocidos en esta sala: si procedes sin verificarlos, será posible que alguien escuche tu llamada."
 }

From 8fa2fa19aaa3cca9ccea455c2abf48785b96cb4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 16 Jul 2018 13:43:11 +0000
Subject: [PATCH 624/702] Translated using Weblate (French)

Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ad8a87b15c..80d6949e30 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1210,5 +1210,11 @@
     "Demote yourself?": "Vous rétrograder ?",
     "Demote": "Rétrograder",
     "Show empty room list headings": "Afficher les en-têtes de la liste des salons vides",
-    "This event could not be displayed": "Cet événement n'a pas pu être affiché"
+    "This event could not be displayed": "Cet événement n'a pas pu être affiché",
+    "deleted": "supprimé",
+    "underlined": "souligné",
+    "inline-code": "code en ligne",
+    "block-quote": "citation",
+    "bulleted-list": "liste à puces",
+    "numbered-list": "liste à numéros"
 }

From 19f0617052aa2788aced5f27931fffd1fc97a65e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Jul 2018 15:41:03 +0100
Subject: [PATCH 625/702] Jitsi: Error message on no permission

Fixes https://github.com/vector-im/riot-web/issues/7007
---
 src/CallHandler.js          |  8 +++++
 src/i18n/strings/en_EN.json | 66 +++++++++++++++++++------------------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 7403483e36..5349e628bb 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -461,6 +461,14 @@ function _startCallApp(roomId, type) {
     WidgetUtils.setRoomWidget(roomId, widgetId, 'jitsi', widgetUrl, 'Jitsi', widgetData).then(() => {
         console.log('Jitsi widget added');
     }).catch((e) => {
+        if (e.errcode === 'M_FORBIDDEN') {
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+            Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
+                title: _t('Permission Required'),
+                description: _t("You do not have permission to start a conference call in this room"),
+            });
+        }
         console.error(e);
     });
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 360e076bd8..39eba74519 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -41,13 +41,11 @@
     "Conference call failed.": "Conference call failed.",
     "Call in Progress": "Call in Progress",
     "A call is already in progress!": "A call is already in progress!",
+    "Permission Required": "Permission Required",
+    "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -87,7 +85,6 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -201,6 +198,11 @@
     "%(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",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -314,31 +316,6 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
-    "URL Previews": "URL Previews",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -441,11 +418,11 @@
     "At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -579,6 +556,31 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",

From 983dc3ad2e8902c0408b34df7eff5468d04a36fe Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Jul 2018 16:19:18 +0100
Subject: [PATCH 626/702] lint

---
 src/utils/WidgetUtils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 5d98e6f45c..c82bf25ed0 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -255,7 +255,6 @@ export default class WidgetUtils {
             content = {};
         }
 
-        const room = MatrixClientPeg.get().getRoom(roomId);
         WidgetEchoStore.setRoomWidgetEcho(roomId, widgetId, content);
 
         const client = MatrixClientPeg.get();

From e95a8e82bcbf9262af116f6c2e9c0713b784d160 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Jul 2018 16:35:45 +0100
Subject: [PATCH 627/702] Jitsi: Use integrations URL from config

---
 src/CallHandler.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 7403483e36..d9390310d6 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -59,6 +59,7 @@ import sdk from './index';
 import { _t } from './languageHandler';
 import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
+import SdkConfig from './SdkConfig';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import SettingsStore from "./settings/SettingsStore";
 import WidgetUtils from './utils/WidgetUtils';
@@ -444,8 +445,8 @@ function _startCallApp(roomId, type) {
         'email=$matrix_user_id',
     ].join('&');
     const widgetUrl = (
-        'https://scalar.vector.im/api/widgets' +
-        '/jitsi.html?' +
+        SdkConfig.get().integrations_rest_url +
+        '/widgets/jitsi.html?' +
         queryString
     );
 

From 850a4d8ec5bc64c63de658de3593ae730afad3d9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Jul 2018 16:54:25 +0100
Subject: [PATCH 628/702] Jitsi: Check integrations server before call

---
 src/CallHandler.js          | 25 +++++++++++++-
 src/i18n/strings/en_EN.json | 67 +++++++++++++++++++------------------
 2 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 7403483e36..c76cff9b2e 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -62,6 +62,7 @@ import dis from './dispatcher';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import SettingsStore from "./settings/SettingsStore";
 import WidgetUtils from './utils/WidgetUtils';
+import ScalarAuthClient from './ScalarAuthClient';
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -401,7 +402,29 @@ function _onAction(payload) {
     }
 }
 
-function _startCallApp(roomId, type) {
+async function _startCallApp(roomId, type) {
+    // check for a working intgrations manager. Technically we could put
+    // the state event in anyway, but the resulting widget would then not
+    // work for us. Better that the user knows before everyone else in the
+    // room sees it.
+    const scalarClient = new ScalarAuthClient();
+    let haveScalar = false;
+    try {
+        await scalarClient.connect();
+        haveScalar = scalarClient.hasCredentials();
+    } catch (e) {
+        // fall through
+    }
+    if (!haveScalar) {
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+        Modal.createTrackedDialog('Could not connect to the integration server', '', ErrorDialog, {
+            title: _t('Could not connect to the integration server'),
+            description: _t('A conference call could not be started because the intgrations server is not available'),
+        });
+        return;
+    }
+
     dis.dispatch({
         action: 'appsDrawer',
         show: true,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 360e076bd8..710e0b5ec8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -39,15 +39,13 @@
     "Conference calling is in development and may not be reliable.": "Conference calling is in development and may not be reliable.",
     "Failed to set up conference call": "Failed to set up conference call",
     "Conference call failed.": "Conference call failed.",
+    "Could not connect to the integration server": "Could not connect to the integration server",
+    "A conference call could not be started because the intgrations server is not available": "A conference call could not be started because the intgrations server is not available",
     "Call in Progress": "Call in Progress",
     "A call is already in progress!": "A call is already in progress!",
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -87,7 +85,6 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -201,6 +198,11 @@
     "%(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",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -314,31 +316,6 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
-    "URL Previews": "URL Previews",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -441,11 +418,11 @@
     "At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -579,6 +556,31 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -710,7 +712,6 @@
     "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
     "Download this file": "Download this file",
     "Integrations Error": "Integrations Error",
-    "Could not connect to the integration server": "Could not connect to the integration server",
     "Manage Integrations": "Manage Integrations",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times",

From 2f1779751ba2cf6fc2f5f15acc12b71e01a31de6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Jul 2018 16:56:08 +0100
Subject: [PATCH 629/702] make the MessageComposerStore stateless for better
 performance and inter-tab composition (by simplifying it. WIN-WIN)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 10 +--
 src/stores/MessageComposerStore.js            | 79 ++++++-------------
 2 files changed, 27 insertions(+), 62 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 89e4107a56..26e6ac8ab2 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -589,14 +589,8 @@ export default class MessageComposerInput extends React.Component {
             this.props.onInputStateChanged(inputState);
         }
 
-        // Record the editor state for this room so that it can be retrieved after
-        // switching to another room and back
-        dis.dispatch({
-            action: 'editor_state',
-            room_id: this.props.room.roomId,
-            rich_text: this.state.isRichTextEnabled,
-            editor_state: editorState,
-        });
+        // Record the editor state for this room so that it can be retrieved after switching to another room and back
+        MessageComposerStore.setEditorState(this.props.room.roomId, editorState, this.state.isRichTextEnabled);
 
         this.setState({
             editorState,
diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index 1d37a7c9e5..0b22057f3c 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -13,72 +13,43 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import dis from '../dispatcher';
-import { Store } from 'flux/utils';
 import { Value } from 'slate';
 
-const INITIAL_STATE = {
-    // a map of room_id to rich text editor composer state
-    editorStateMap: localStorage.getItem('editor_state') ?
-        JSON.parse(localStorage.getItem('editor_state')) : {},
-};
+const localStoragePrefix = 'editor_state_';
 
 /**
- * A class for storing application state to do with the message composer (specifically
- * in-progress message drafts). This is a simple
- * flux store that listens for actions and updates its state accordingly, informing any
- * listeners (views) of state changes.
+ * A class for storing application state to do with the message composer (specifically in-progress message drafts).
+ * It does not worry about cleaning up on log out as this is handled in Lifecycle.js by localStorage.clear()
  */
-class MessageComposerStore extends Store {
+class MessageComposerStore {
     constructor() {
-        super(dis);
-
-        // Initialise state
-        this._state = Object.assign({}, INITIAL_STATE);
+        this.prefix = localStoragePrefix;
     }
 
-    _setState(newState) {
-        this._state = Object.assign(this._state, newState);
-        this.__emitChange();
+    _getKey(roomId: string): string {
+        return this.prefix + roomId;
     }
 
-    __onDispatch(payload) {
-        switch (payload.action) {
-            case 'editor_state':
-                this._editorState(payload);
-                break;
-            case 'on_logged_out':
-                this.reset();
-                break;
+    setEditorState(roomId: string, editorState: Value, richText: boolean) {
+        localStorage.setItem(this._getKey(roomId), JSON.stringify({
+            editor_state: editorState,
+            rich_text: richText,
+        }));
+    }
+
+    getEditorState(roomId): {editor_state: Value, rich_text: boolean} {
+        const stateStr = localStorage.getItem(this._getKey(roomId));
+
+        let state;
+        if (stateStr) {
+            state = JSON.parse(stateStr);
+
+            // if it does not have the fields we expect then bail
+            if (!state || state.rich_text === undefined || state.editor_state === undefined) return;
+            state.editor_state = Value.fromJSON(state.editor_state);
         }
-    }
 
-    _editorState(payload) {
-        const editorStateMap = this._state.editorStateMap;
-        editorStateMap[payload.room_id] = {
-            editor_state: payload.editor_state,
-            rich_text: payload.rich_text,
-        };
-        localStorage.setItem('editor_state', JSON.stringify(editorStateMap));
-        this._setState({
-            editorStateMap: editorStateMap,
-        });
-    }
-
-    getEditorState(roomId) {
-        const editorStateMap = this._state.editorStateMap;
-        // const entry = this._state.editorStateMap[roomId];
-        if (editorStateMap[roomId] && !Value.isValue(editorStateMap[roomId].editor_state)) {
-            // rehydrate lazily to prevent massive churn at launch and cache it
-            editorStateMap[roomId].editor_state = Value.fromJSON(editorStateMap[roomId].editor_state);
-        }
-        // explicitly don't setState here because the value didn't actually change, we just hydrated it,
-        // if a listener received an update they too would call this method and have a hydrated Value
-        return editorStateMap[roomId];
-    }
-
-    reset() {
-        this._state = Object.assign({}, INITIAL_STATE);
+        return state;
     }
 }
 

From 74ad795d4a36aecb7438f9cc014b5b0ead81b6e0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Jul 2018 17:10:58 +0100
Subject: [PATCH 630/702] Fix read receipts on top of Jitsi

By removing z-index which, as far as I can see, does nothing.

Fixes https://github.com/vector-im/riot-web/issues/7021
---
 res/css/views/rooms/_EventTile.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index c69c66ac7e..2898fb7bb7 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -186,7 +186,6 @@ limitations under the License.
 .mx_EventTile_msgOption {
     float: right;
     text-align: right;
-    z-index: 1;
     position: relative;
     width: 90px;
 

From a449b8420d9473090321a9b3ca592592e9101c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 16 Jul 2018 13:44:49 +0000
Subject: [PATCH 631/702] Translated using Weblate (French)

Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 80d6949e30..4716fe02e9 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1211,9 +1211,9 @@
     "Demote": "Rétrograder",
     "Show empty room list headings": "Afficher les en-têtes de la liste des salons vides",
     "This event could not be displayed": "Cet événement n'a pas pu être affiché",
-    "deleted": "supprimé",
+    "deleted": "barré",
     "underlined": "souligné",
-    "inline-code": "code en ligne",
+    "inline-code": "code",
     "block-quote": "citation",
     "bulleted-list": "liste à puces",
     "numbered-list": "liste à numéros"

From 3daff00704bc98d79b64e086fa06db2b963843e9 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 16 Jul 2018 15:29:01 +0000
Subject: [PATCH 632/702] Translated using Weblate (Russian)

Currently translated at 99.4% (1205 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index dbddc6f71b..85bfa56616 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1207,5 +1207,7 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Вы не можете отправлять сообщения до тех пор, пока вы не примете <consentLink>наши правила и положения</consentLink>.",
     "Demote": "Понижение",
     "Demote yourself?": "Понизить самого себя?",
-    "This event could not be displayed": "Это событие отобразить невозможно"
+    "This event could not be displayed": "Это событие отобразить невозможно",
+    "deleted": "удален",
+    "underlined": "подчеркнут"
 }

From c7859fed1a49b452238e347f7740b5102b1f556e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Jul 2018 18:27:06 +0100
Subject: [PATCH 633/702] add heuristic to compare documents to prevent
 autocomplete flicker

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 26e6ac8ab2..26e66f25fc 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -498,8 +498,10 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
-        // when selection changes hide the autocomplete
-        if (!rangeEquals(this.state.editorState.selection, editorState.selection)) {
+        // when selection changes hide the autocomplete.
+        // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
+        const documentChanged = this.state.editorState.document.text !== editorState.document.text;
+        if (!documentChanged && !rangeEquals(this.state.editorState.selection, editorState.selection)) {
             this.autocomplete.hide();
         }
 

From bdbc2cbd38c1fabf4efe7b2a6de9d14a936a8a51 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Jul 2018 18:32:50 +0100
Subject: [PATCH 634/702] disable spellCheck when the placeholder is shown
 because "unencrypted"

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 26e66f25fc..84ee58925d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1543,7 +1543,8 @@ export default class MessageComposerInput extends React.Component {
                             onFocus={this.onFocus}
                             renderNode={this.renderNode}
                             renderMark={this.renderMark}
-                            spellCheck={true}
+                            // disable spell check for the placeholder because browsers don't like "unencrypted"
+                            spellCheck={!this.state.editorState.document.isEmpty}
                             />
                 </div>
             </div>

From 30000999913f0aee27fed99c7328a04c3bb7db8e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Jul 2018 21:27:52 +0100
Subject: [PATCH 635/702] add additional checks for hiding autocomplete to
 prevent `text` calculation

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 84ee58925d..38c544ce38 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -498,10 +498,12 @@ export default class MessageComposerInput extends React.Component {
             }
         }
 
-        // when selection changes hide the autocomplete.
+        // when in autocomplete mode and selection changes hide the autocomplete.
         // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
-        const documentChanged = this.state.editorState.document.text !== editorState.document.text;
-        if (!documentChanged && !rangeEquals(this.state.editorState.selection, editorState.selection)) {
+        if (this.autocomplete.state.completionList.length >= 0 && !this.autocomplete.state.hide &&
+            this.state.editorState.document.text !== editorState.document.text &&
+            !rangeEquals(this.state.editorState.selection, editorState.selection))
+        {
             this.autocomplete.hide();
         }
 

From f655e2eb8665f00011b13037828fde12335dc728 Mon Sep 17 00:00:00 2001
From: Hugues De Keyzer <matrix@hugues.info>
Date: Mon, 16 Jul 2018 16:53:30 +0000
Subject: [PATCH 636/702] Translated using Weblate (French)

Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 4716fe02e9..67a9b6835e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1175,7 +1175,7 @@
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)",
     "Reload widget": "Recharger le widget",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Veuillez aider Riot.im à s'améliorer en envoyant <UsageDataLink>des données d'utilisation anonymes</UsageDataLink>. Cela utilisear un cookie (veuillez voir notre <PolicyLink>politique de cookie</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Veuillez aider Riot.im à s'améliorer en envoyant <UsageDataLink>des données d'utilisation anonymes</UsageDataLink>. Cela utilisera un cookie (veuillez voir notre <PolicyLink>politique de cookie</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Veuillez aider Riot.im à s'améliorer en envoyant <UsageDataLink>des données d'utilisation anonymes</UsageDataLink>. Cela utilisera un cookie.",
     "Yes, I want to help!": "Oui, je veux aider !",
     "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",

From 547e0ed52c9be8b3e72462abdaf7244ba825b161 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Jul 2018 21:30:04 +0100
Subject: [PATCH 637/702] check if has some completions, not if >=0

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 38c544ce38..f4befa8c98 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -500,7 +500,7 @@ export default class MessageComposerInput extends React.Component {
 
         // when in autocomplete mode and selection changes hide the autocomplete.
         // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
-        if (this.autocomplete.state.completionList.length >= 0 && !this.autocomplete.state.hide &&
+        if (this.autocomplete.state.completionList.length > 0 && !this.autocomplete.state.hide &&
             this.state.editorState.document.text !== editorState.document.text &&
             !rangeEquals(this.state.editorState.selection, editorState.selection))
         {

From 1c24f1fd5a89f5021b30a43bbad41da6afb32fac Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Jul 2018 21:34:25 +0100
Subject: [PATCH 638/702] fix 2nd typo in one PR :(

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f4befa8c98..5d6b12f339 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -501,7 +501,7 @@ export default class MessageComposerInput extends React.Component {
         // when in autocomplete mode and selection changes hide the autocomplete.
         // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
         if (this.autocomplete.state.completionList.length > 0 && !this.autocomplete.state.hide &&
-            this.state.editorState.document.text !== editorState.document.text &&
+            this.state.editorState.document.text === editorState.document.text &&
             !rangeEquals(this.state.editorState.selection, editorState.selection))
         {
             this.autocomplete.hide();

From cbe5944ff0c2339253c175121ba8fcc80313e257 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Jul 2018 22:04:42 +0100
Subject: [PATCH 639/702] preserve selection and history between room changes
 and refreshes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/MessageComposerStore.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index 0b22057f3c..f180d931bf 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -32,7 +32,12 @@ class MessageComposerStore {
 
     setEditorState(roomId: string, editorState: Value, richText: boolean) {
         localStorage.setItem(this._getKey(roomId), JSON.stringify({
-            editor_state: editorState,
+            editor_state: editorState.toJSON({
+                preserveSelection: true,
+                preserveHistory: true,
+                // XXX: this seems like a workaround for selection.isSet being based on anchorKey instead of anchorPath
+                preserveKeys: true,
+            }),
             rich_text: richText,
         }));
     }

From 09a504ba0e3766440fb98bf2e26ddff372c50a49 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 17 Jul 2018 05:44:51 +0000
Subject: [PATCH 640/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 46c8e6a92b..0ed5a95ed7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1210,5 +1210,11 @@
     "Demote yourself?": "Lefokozod magad?",
     "Demote": "Lefokozás",
     "Show empty room list headings": "Üres szobalista fejléc mutatása",
-    "This event could not be displayed": "Az eseményt nem lehet megjeleníteni"
+    "This event could not be displayed": "Az eseményt nem lehet megjeleníteni",
+    "deleted": "törölt",
+    "underlined": "aláhúzott",
+    "inline-code": "kód",
+    "block-quote": "idézet",
+    "bulleted-list": "rendezetlen lista",
+    "numbered-list": "rendezett lista"
 }

From 23b6abf8b727e6c478f163087b3340aaf5e33314 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Jul 2018 22:25:41 +0100
Subject: [PATCH 641/702] no point saving history at this point, maybe future
 supported

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/MessageComposerStore.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index f180d931bf..ab2dbfedec 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -34,7 +34,8 @@ class MessageComposerStore {
         localStorage.setItem(this._getKey(roomId), JSON.stringify({
             editor_state: editorState.toJSON({
                 preserveSelection: true,
-                preserveHistory: true,
+                // XXX: re-hydrating history is not currently supported by fromJSON
+                // preserveHistory: true,
                 // XXX: this seems like a workaround for selection.isSet being based on anchorKey instead of anchorPath
                 preserveKeys: true,
             }),

From 5b79e3bcd52db91ac924f317850412140eee019f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Jul 2018 11:56:24 +0100
Subject: [PATCH 642/702] fix user autocomplete not adding `: ` if at the start

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/UserProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 7998337e2e..156aac2eb8 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -111,7 +111,7 @@ export default class UserProvider extends AutocompleteProvider {
                     // relies on the length of the entity === length of the text in the decoration.
                     completion: user.rawDisplayName.replace(' (IRC)', ''),
                     completionId: user.userId,
-                    suffix: (selection.beginning && selection.start === 0) ? ': ' : ' ',
+                    suffix: (selection.beginning && range.start === 0) ? ': ' : ' ',
                     href: makeUserPermalink(user.userId),
                     component: (
                         <PillCompletion

From ff76b6a981f99a2c4ffc6ee827658f0aeed46e9f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Jul 2018 12:30:22 +0100
Subject: [PATCH 643/702] allow user to break out of blockquote/etc by hitting
 enter twice

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 5d6b12f339..2fae59a1fe 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -990,15 +990,29 @@ export default class MessageComposerInput extends React.Component {
             return change.insertText('\n');
         }
 
-        if (this.state.editorState.blocks.some(
-            block => ['code', 'block-quote', 'list-item'].includes(block.type)
-        )) {
+        const editorState = this.state.editorState;
+
+        let inBlock = false;
+        let inEmptyBlock = false;
+
+        for (const block of editorState.blocks) {
+            if (['code', 'block-quote', 'list-item'].includes(block.type)) {
+                inBlock = true;
+                if (block.text === '') {
+                    inEmptyBlock = true;
+                }
+                break;
+            }
+        }
+
+        if (inEmptyBlock) {
+            // allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock`
+            return change.setBlocks(DEFAULT_NODE);
+        } else if (inBlock) {
             // allow the user to terminate blocks by hitting return rather than sending a msg
             return;
         }
 
-        const editorState = this.state.editorState;
-
         let contentText;
         let contentHTML;
 

From 8d4cead105a35a4ca23c3c5f281df6652f3ff551 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Jul 2018 13:24:28 +0100
Subject: [PATCH 644/702] special-case 'inline-code' button because mark is
 called 'code'

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 657fd463fd..a7e02d16ae 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -334,7 +334,9 @@ export default class MessageComposer extends React.Component {
         if (this.state.showFormatting && this.state.inputState.isRichTextEnabled) {
             const {marks, blockType} = this.state.inputState;
             const formatButtons = formatButtonList.map((name) => {
-                const active = marks.some(mark => mark.type === name) || blockType === name;
+                // special-case to match the md serializer and the special-case in MessageComposerInput.js
+                const markName = name === 'inline-code' ? 'code' : name;
+                const active = marks.some(mark => mark.type === markName) || blockType === name;
                 const suffix = active ? '-on' : '';
                 const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
                 const className = 'mx_MessageComposer_format_button mx_filterFlipColor';

From 688776bc10d43a1676921217126daa0e988c55c4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Jul 2018 13:29:40 +0100
Subject: [PATCH 645/702] allow enter to remove current block if its empty
 useful for lists

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 2fae59a1fe..841fcccf06 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -992,24 +992,25 @@ export default class MessageComposerInput extends React.Component {
 
         const editorState = this.state.editorState;
 
-        let inBlock = false;
-        let inEmptyBlock = false;
-
-        for (const block of editorState.blocks) {
-            if (['code', 'block-quote', 'list-item'].includes(block.type)) {
-                inBlock = true;
-                if (block.text === '') {
-                    inEmptyBlock = true;
-                }
-                break;
+        const lastBlock = editorState.blocks.last();
+        if (['code', 'block-quote', 'list-item'].includes(lastBlock.type)) {
+            const text = lastBlock.text;
+            if (text === '') {
+                // allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock`
+                return change
+                    .setBlocks(DEFAULT_NODE)
+                    .unwrapBlock('bulleted-list')
+                    .unwrapBlock('numbered-list');
             }
-        }
 
-        if (inEmptyBlock) {
-            // allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock`
-            return change.setBlocks(DEFAULT_NODE);
-        } else if (inBlock) {
-            // allow the user to terminate blocks by hitting return rather than sending a msg
+            // TODO strip trailing lines from blockquotes/list entries
+            // the below code seemingly works but doesn't account for edge cases like return with caret not at end
+            /* const trailingNewlines = text.match(/\n*$/);
+            if (trailingNewlines && trailingNewlines[0]) {
+                remove trailing newlines at the end of this block before making a new one
+                return change.deleteBackward(trailingNewlines[0].length);
+            }*/
+
             return;
         }
 

From 414908611d5d688488e2c9c8d9e23e483a217725 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Jul 2018 13:48:15 +0100
Subject: [PATCH 646/702] prevent exception if there is no text node at anchor

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 841fcccf06..e4bd21cdf0 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -382,7 +382,8 @@ export default class MessageComposerInput extends React.Component {
                 const quote = Block.create('block-quote');
                 if (this.state.isRichTextEnabled) {
                     let change = editorState.change();
-                    if (editorState.anchorText.text === '' && editorState.anchorBlock.nodes.size === 1) {
+                    const anchorText = editorState.anchorText;
+                    if ((!anchorText || anchorText.text === '') && editorState.anchorBlock.nodes.size === 1) {
                         // replace the current block rather than split the block
                         change = change.replaceNodeByKey(editorState.anchorBlock.key, quote);
                     }

From 1b467f6ca85185fc1d51bb029f80a0f6f6766d21 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Jul 2018 16:02:37 +0100
Subject: [PATCH 647/702] fix pasting of plaintext content (prevent loads of
 <p>s) Fixes vector-im/riot-web#7043

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index e4bd21cdf0..5885ae4e6a 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -970,19 +970,21 @@ export default class MessageComposerInput extends React.Component {
     onPaste = (event: Event, change: Change, editor: Editor): Change => {
         const transfer = getEventTransfer(event);
 
-        if (transfer.type === "files") {
-            return this.props.onFilesPasted(transfer.files);
-        }
-        else if (transfer.type === "html") {
-            // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
-            // that we will silently discard nested blocks (e.g. nested lists) :(
-            const fragment = this.html.deserialize(transfer.html);
-            if (this.state.isRichTextEnabled) {
-                return change.insertFragment(fragment.document);
-            }
-            else {
-                return change.insertText(this.md.serialize(fragment));
+        switch (transfer.type) {
+            case 'files':
+                return this.props.onFilesPasted(transfer.files);
+            case 'html': {
+                // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
+                // that we will silently discard nested blocks (e.g. nested lists) :(
+                const fragment = this.html.deserialize(transfer.html);
+                if (this.state.isRichTextEnabled) {
+                    return change.insertFragment(fragment.document);
+                } else {
+                    return change.insertText(this.md.serialize(fragment));
+                }
             }
+            case 'text':
+                return change.insertText(transfer.text);
         }
     };
 

From 720a728278a3eeac27f8732ad3a510dcfd832e9b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Jul 2018 16:13:33 +0100
Subject: [PATCH 648/702] workaround for placeholder being shown when empty
 text but block. Fixes vector-im/riot-web#7042

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 5885ae4e6a..1850601d8a 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1533,6 +1533,14 @@ export default class MessageComposerInput extends React.Component {
             mx_MessageComposer_input_error: this.state.someCompletions === false,
         });
 
+        const isEmpty = this.state.editorState.document.isEmpty;
+
+        let {placeholder} = this.props;
+        // XXX: workaround for placeholder being shown when there is a formatting block e.g blockquote but no text
+        if (isEmpty && this.state.editorState.startBlock.type !== DEFAULT_NODE) {
+            placeholder = undefined;
+        }
+
         return (
             <div className="mx_MessageComposer_input_wrapper" onClick={this.focusComposer}>
                 <div className="mx_MessageComposer_autocomplete_wrapper">
@@ -1554,7 +1562,7 @@ export default class MessageComposerInput extends React.Component {
                     <Editor ref="editor"
                             dir="auto"
                             className="mx_MessageComposer_editor"
-                            placeholder={this.props.placeholder}
+                            placeholder={placeholder}
                             value={this.state.editorState}
                             onChange={this.onChange}
                             onKeyDown={this.onKeyDown}
@@ -1564,7 +1572,7 @@ export default class MessageComposerInput extends React.Component {
                             renderNode={this.renderNode}
                             renderMark={this.renderMark}
                             // disable spell check for the placeholder because browsers don't like "unencrypted"
-                            spellCheck={!this.state.editorState.document.isEmpty}
+                            spellCheck={!isEmpty}
                             />
                 </div>
             </div>

From 01180273541ef31f5be08a9d86fce347d45a148d Mon Sep 17 00:00:00 2001
From: Miguel Branco <mgl.branco@gmail.com>
Date: Tue, 17 Jul 2018 18:58:35 +0000
Subject: [PATCH 649/702] Translated using Weblate (Galician)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index b1d64a156d..41ab6a54d0 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1196,5 +1196,28 @@
     "No Audio Outputs detected": "Non se detectou unha saída de audio",
     "Audio Output": "Saída de audio",
     "Try the app first": "Probe a aplicación primeiro",
-    "Jitsi Conference Calling": "Chamada para conferencia con Jitsi"
+    "Jitsi Conference Calling": "Chamada para conferencia con Jitsi",
+    "A conference call could not be started because the intgrations server is not available": "Non se puido comezar a chamada por mor de que o servidor de integración non está activo",
+    "Call in Progress": "Chamada en progreso",
+    "A call is already in progress!": "Xa hai unha chamada en progreso!",
+    "Permission Required": "Precísase de permisos",
+    "You do not have permission to start a conference call in this room": "Non ten permisos para comezar unha chamada de conferencia nesta sala",
+    "Show empty room list headings": "Amosar a cabeceira da lista de salas baleiras",
+    "This event could not be displayed": "Non se puido amosar este evento",
+    "Demote yourself?": "Baixarse a si mesmo de rango?",
+    "Demote": "Baixar de rango",
+    "deleted": "eliminado",
+    "underlined": "subliñado",
+    "inline-code": "código en liña",
+    "block-quote": "bloque de citas",
+    "bulleted-list": "lista de puntos",
+    "numbered-list": "lista numérica",
+    "You have no historical rooms": "Ton ten salas anteriores",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Nas salas cifradas, como é esta, está desactivado por defecto a previsualización das URL co fin de asegurarse de que o servidor local (que é onde se gardan as previsualizacións) non poida recoller información sobre das ligazóns que se ven nesta sala.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Cando alguén pon unha URL na mensaxe, esta previsualízarase para que así se coñezan xa cousas delas como o título, a descrición ou as imaxes que inclúe ese sitio web.",
+    "The email field must not be blank.": "Este campo de correo non pode quedar en branco.",
+    "The user name field must not be blank.": "O campo de nome de usuario non pode quedar en branco.",
+    "The phone number field must not be blank.": "O número de teléfono non pode quedar en branco.",
+    "The password field must not be blank.": "O campo do contrasinal non pode quedar en branco.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non vai poder enviar mensaxes ata que revise e acepte  <consentLink>os nosos termos e condicións</consentLink>."
 }

From c4caaecfb3c791fdee04b9296bcfa6e1656a2ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Wed, 18 Jul 2018 07:02:23 +0000
Subject: [PATCH 650/702] Translated using Weblate (French)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 67a9b6835e..b192bdf836 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1216,5 +1216,8 @@
     "inline-code": "code",
     "block-quote": "citation",
     "bulleted-list": "liste à puces",
-    "numbered-list": "liste à numéros"
+    "numbered-list": "liste à numéros",
+    "A conference call could not be started because the intgrations server is not available": "L'appel en téléconférence n'a pas pu aboutir car le serveur d'intégrations n'est pas disponible",
+    "Permission Required": "Permission requise",
+    "You do not have permission to start a conference call in this room": "Vous n'avez pas l'autorisation de lancer un appel en téléconférence dans ce salon"
 }

From 8bb08b1b75c6f38f472269fc452800eeec079c27 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 10:10:11 +0100
Subject: [PATCH 651/702] fix focus on new editorState as it didn't have focus
 so broke when alt tab

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 1850601d8a..c5aafaa587 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -330,8 +330,9 @@ export default class MessageComposerInput extends React.Component {
             }
             return editorState;
         } else {
-            // ...or create a new one.
-            return Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
+            // ...or create a new one. and explicitly focus it otherwise tab in-out issues
+            const base = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
+            return base.change().focus().value;
         }
     }
 

From 19e5dc579981fadb53c28f88ef4c2b771a1403e2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 10:10:42 +0100
Subject: [PATCH 652/702] do less rewriting for composer quote to prevent
 breaking pills

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js                              | 213 +++++++++---------
 .../views/rooms/MessageComposerInput.js       |   1 +
 2 files changed, 113 insertions(+), 101 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 09ce1187d5..e07c6eb72b 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -141,6 +141,99 @@ export function isUrlPermitted(inputUrl) {
     }
 }
 
+const transformTags = { // custom to matrix
+    // add blank targets to all hyperlinks except vector URLs
+    'a': function(tagName, attribs) {
+        if (attribs.href) {
+            attribs.target = '_blank'; // by default
+
+            let m;
+            // FIXME: horrible duplication with linkify-matrix
+            m = attribs.href.match(linkifyMatrix.VECTOR_URL_PATTERN);
+            if (m) {
+                attribs.href = m[1];
+                delete attribs.target;
+            } else {
+                m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN);
+                if (m) {
+                    const entity = m[1];
+                    switch (entity[0]) {
+                        case '@':
+                            attribs.href = '#/user/' + entity;
+                            break;
+                        case '+':
+                            attribs.href = '#/group/' + entity;
+                            break;
+                        case '#':
+                        case '!':
+                            attribs.href = '#/room/' + entity;
+                            break;
+                    }
+                    delete attribs.target;
+                }
+            }
+        }
+        attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/
+        return { tagName, attribs };
+    },
+    'img': function(tagName, attribs) {
+        // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
+        // because transformTags is used _before_ we filter by allowedSchemesByTag and
+        // we don't want to allow images with `https?` `src`s.
+        if (!attribs.src || !attribs.src.startsWith('mxc://')) {
+            return { tagName, attribs: {}};
+        }
+        attribs.src = MatrixClientPeg.get().mxcUrlToHttp(
+            attribs.src,
+            attribs.width || 800,
+            attribs.height || 600,
+        );
+        return { tagName, attribs };
+    },
+    'code': function(tagName, attribs) {
+        if (typeof attribs.class !== 'undefined') {
+            // Filter out all classes other than ones starting with language- for syntax highlighting.
+            const classes = attribs.class.split(/\s+/).filter(function(cl) {
+                return cl.startsWith('language-');
+            });
+            attribs.class = classes.join(' ');
+        }
+        return { tagName, attribs };
+    },
+    '*': function(tagName, attribs) {
+        // Delete any style previously assigned, style is an allowedTag for font and span
+        // because attributes are stripped after transforming
+        delete attribs.style;
+
+        // Sanitise and transform data-mx-color and data-mx-bg-color to their CSS
+        // equivalents
+        const customCSSMapper = {
+            'data-mx-color': 'color',
+            'data-mx-bg-color': 'background-color',
+            // $customAttributeKey: $cssAttributeKey
+        };
+
+        let style = "";
+        Object.keys(customCSSMapper).forEach((customAttributeKey) => {
+            const cssAttributeKey = customCSSMapper[customAttributeKey];
+            const customAttributeValue = attribs[customAttributeKey];
+            if (customAttributeValue &&
+                typeof customAttributeValue === 'string' &&
+                COLOR_REGEX.test(customAttributeValue)
+            ) {
+                style += cssAttributeKey + ":" + customAttributeValue + ";";
+                delete attribs[customAttributeKey];
+            }
+        });
+
+        if (style) {
+            attribs.style = style;
+        }
+
+        return { tagName, attribs };
+    },
+};
+
 const sanitizeHtmlParams = {
     allowedTags: [
         'font', // custom to matrix for IRC-style font coloring
@@ -164,102 +257,14 @@ const sanitizeHtmlParams = {
     allowedSchemes: PERMITTED_URL_SCHEMES,
 
     allowProtocolRelative: false,
+    transformTags,
+};
 
-    transformTags: { // custom to matrix
-        // add blank targets to all hyperlinks except vector URLs
-        'a': function(tagName, attribs) {
-            if (attribs.href) {
-                attribs.target = '_blank'; // by default
-
-                let m;
-                // FIXME: horrible duplication with linkify-matrix
-                m = attribs.href.match(linkifyMatrix.VECTOR_URL_PATTERN);
-                if (m) {
-                    attribs.href = m[1];
-                    delete attribs.target;
-                } else {
-                    m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN);
-                    if (m) {
-                        const entity = m[1];
-                        switch (entity[0]) {
-                            case '@':
-                                attribs.href = '#/user/' + entity;
-                                break;
-                            case '+':
-                                attribs.href = '#/group/' + entity;
-                                break;
-                            case '#':
-                            case '!':
-                                attribs.href = '#/room/' + entity;
-                                break;
-                        }
-                        delete attribs.target;
-                    }
-                }
-            }
-            attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/
-            return { tagName: tagName, attribs: attribs };
-        },
-        'img': function(tagName, attribs) {
-            // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
-            // because transformTags is used _before_ we filter by allowedSchemesByTag and
-            // we don't want to allow images with `https?` `src`s.
-            if (!attribs.src || !attribs.src.startsWith('mxc://')) {
-                return { tagName, attribs: {}};
-            }
-            attribs.src = MatrixClientPeg.get().mxcUrlToHttp(
-                attribs.src,
-                attribs.width || 800,
-                attribs.height || 600,
-            );
-            return { tagName: tagName, attribs: attribs };
-        },
-        'code': function(tagName, attribs) {
-            if (typeof attribs.class !== 'undefined') {
-                // Filter out all classes other than ones starting with language- for syntax highlighting.
-                const classes = attribs.class.split(/\s+/).filter(function(cl) {
-                    return cl.startsWith('language-');
-                });
-                attribs.class = classes.join(' ');
-            }
-            return {
-                tagName: tagName,
-                attribs: attribs,
-            };
-        },
-        '*': function(tagName, attribs) {
-            // Delete any style previously assigned, style is an allowedTag for font and span
-            // because attributes are stripped after transforming
-            delete attribs.style;
-
-            // Sanitise and transform data-mx-color and data-mx-bg-color to their CSS
-            // equivalents
-            const customCSSMapper = {
-                'data-mx-color': 'color',
-                'data-mx-bg-color': 'background-color',
-                // $customAttributeKey: $cssAttributeKey
-            };
-
-            let style = "";
-            Object.keys(customCSSMapper).forEach((customAttributeKey) => {
-                const cssAttributeKey = customCSSMapper[customAttributeKey];
-                const customAttributeValue = attribs[customAttributeKey];
-                if (customAttributeValue &&
-                    typeof customAttributeValue === 'string' &&
-                    COLOR_REGEX.test(customAttributeValue)
-                ) {
-                    style += cssAttributeKey + ":" + customAttributeValue + ";";
-                    delete attribs[customAttributeKey];
-                }
-            });
-
-            if (style) {
-                attribs.style = style;
-            }
-
-            return { tagName: tagName, attribs: attribs };
-        },
-    },
+// this is the same as the above except with less rewriting
+const composerSanitizeHtmlParams = Object.assign({}, sanitizeHtmlParams);
+composerSanitizeHtmlParams.transformTags = {
+    'code': transformTags['code'],
+    '*': transformTags['*'],
 };
 
 class BaseHighlighter {
@@ -385,6 +390,7 @@ class TextHighlighter extends BaseHighlighter {
  * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing
  * opts.returnString: return an HTML string rather than JSX elements
  * opts.emojiOne: optional param to do emojiOne (default true)
+ * opts.forComposerQuote: optional param to lessen the url rewriting done by sanitization, for quoting into composer
  */
 export function bodyToHtml(content, highlights, opts={}) {
     const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body;
@@ -392,6 +398,11 @@ export function bodyToHtml(content, highlights, opts={}) {
     const doEmojiOne = opts.emojiOne === undefined ? true : opts.emojiOne;
     let bodyHasEmoji = false;
 
+    let sanitizeParams = sanitizeHtmlParams;
+    if (opts.forComposerQuote) {
+        sanitizeParams = composerSanitizeHtmlParams;
+    }
+
     let strippedBody;
     let safeBody;
     let isDisplayedWithHtml;
@@ -403,10 +414,10 @@ export function bodyToHtml(content, highlights, opts={}) {
         if (highlights && highlights.length > 0) {
             const highlighter = new HtmlHighlighter("mx_EventTile_searchHighlight", opts.highlightLink);
             const safeHighlights = highlights.map(function(highlight) {
-                return sanitizeHtml(highlight, sanitizeHtmlParams);
+                return sanitizeHtml(highlight, sanitizeParams);
             });
-            // XXX: hacky bodge to temporarily apply a textFilter to the sanitizeHtmlParams structure.
-            sanitizeHtmlParams.textFilter = function(safeText) {
+            // XXX: hacky bodge to temporarily apply a textFilter to the sanitizeParams structure.
+            sanitizeParams.textFilter = function(safeText) {
                 return highlighter.applyHighlights(safeText, safeHighlights).join('');
             };
         }
@@ -422,13 +433,13 @@ export function bodyToHtml(content, highlights, opts={}) {
         // Only generate safeBody if the message was sent as org.matrix.custom.html
         if (isHtmlMessage) {
             isDisplayedWithHtml = true;
-            safeBody = sanitizeHtml(formattedBody, sanitizeHtmlParams);
+            safeBody = sanitizeHtml(formattedBody, sanitizeParams);
         } else {
             // ... or if there are emoji, which we insert as HTML alongside the
             // escaped plaintext body.
             if (bodyHasEmoji) {
                 isDisplayedWithHtml = true;
-                safeBody = sanitizeHtml(escape(strippedBody), sanitizeHtmlParams);
+                safeBody = sanitizeHtml(escape(strippedBody), sanitizeParams);
             }
         }
 
@@ -439,7 +450,7 @@ export function bodyToHtml(content, highlights, opts={}) {
             safeBody = unicodeToImage(safeBody);
         }
     } finally {
-        delete sanitizeHtmlParams.textFilter;
+        delete sanitizeParams.textFilter;
     }
 
     if (opts.returnString) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c5aafaa587..4153311bc6 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -373,6 +373,7 @@ export default class MessageComposerInput extends React.Component {
                 break;
             case 'quote': {
                 const html = HtmlUtils.bodyToHtml(payload.event.getContent(), null, {
+                    forComposerQuote: true,
                     returnString: true,
                     emojiOne: false,
                 });

From 68c46a694e625f7dad0ff023f0253db09a30e150 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 18 Jul 2018 10:18:55 +0100
Subject: [PATCH 653/702] lint

---
 src/components/views/rooms/AppsDrawer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 0de0b132e9..e6fe445b45 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -29,7 +29,6 @@ import ScalarAuthClient from '../../../ScalarAuthClient';
 import ScalarMessaging from '../../../ScalarMessaging';
 import { _t } from '../../../languageHandler';
 import WidgetUtils from '../../../utils/WidgetUtils';
-import SettingsStore from "../../../settings/SettingsStore";
 import WidgetEchoStore from "../../../stores/WidgetEchoStore";
 
 // The maximum number of widgets that can be added in a room

From f5856270cc260068258e45fbe135815d949c71f3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 10:48:54 +0100
Subject: [PATCH 654/702] undo removal of stripping <p>s as it breaks HTML
 `/me`s

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js                              | 27 +++++++++++++++++++
 src/Markdown.js                               |  8 +++---
 .../views/rooms/MessageComposerInput.js       |  3 +--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index e07c6eb72b..b6a2bd0acb 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -112,6 +112,33 @@ export function charactersToImageNode(alt, useSvg, ...unicode) {
     />;
 }
 
+export function processHtmlForSending(html: string): string {
+    const contentDiv = document.createElement('div');
+    contentDiv.innerHTML = html;
+
+    if (contentDiv.children.length === 0) {
+        return contentDiv.innerHTML;
+    }
+
+    let contentHTML = "";
+    for (let i=0; i < contentDiv.children.length; i++) {
+        const element = contentDiv.children[i];
+        if (element.tagName.toLowerCase() === 'p') {
+            contentHTML += element.innerHTML;
+            // Don't add a <br /> for the last <p>
+            if (i !== contentDiv.children.length - 1) {
+                contentHTML += '<br />';
+            }
+        } else {
+            const temp = document.createElement('div');
+            temp.appendChild(element.cloneNode(true));
+            contentHTML += temp.innerHTML;
+        }
+    }
+
+    return contentHTML;
+}
+
 /*
  * Given an untrusted HTML string, return a React node with an sanitized version
  * of that HTML.
diff --git a/src/Markdown.js b/src/Markdown.js
index dc0d5962fd..acfea52100 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -111,7 +111,7 @@ export default class Markdown {
         // you can nest them.
         //
         // Let's try sending with <p/>s anyway for now, though.
-/*        
+
         const real_paragraph = renderer.paragraph;
 
         renderer.paragraph = function(node, entering) {
@@ -124,10 +124,10 @@ export default class Markdown {
                 real_paragraph.call(this, node, entering);
             }
         };
-*/        
+
 
         renderer.html_inline = html_if_tag_allowed;
-  
+
         renderer.html_block = function(node) {
 /*
             // as with `paragraph`, we only insert line breaks
@@ -138,7 +138,7 @@ export default class Markdown {
             html_if_tag_allowed.call(this, node);
 /*
             if (isMultiLine) this.cr();
-*/        
+*/
         };
 
         return renderer.render(this.parsed);
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 4153311bc6..88b8280a4c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1089,8 +1089,7 @@ export default class MessageComposerInput extends React.Component {
             if (contentText === '') return true;
 
             if (shouldSendHTML) {
-                // FIXME: should we strip out the surrounding <p></p>?
-                contentHTML = this.html.serialize(editorState); // HtmlUtils.processHtmlForSending();
+                contentHTML = HtmlUtils.processHtmlForSending(this.html.serialize(editorState));
             }
         } else {
             const sourceWithPills = this.plainWithMdPills.serialize(editorState);

From 1a9de3fabed01d54279b2b996e41aa46765c9daa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 10:58:27 +0100
Subject: [PATCH 655/702] fix undo on pasting plaintext content

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 88b8280a4c..c20f6fb52c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -986,7 +986,11 @@ export default class MessageComposerInput extends React.Component {
                 }
             }
             case 'text':
-                return change.insertText(transfer.text);
+                // don't skip/merge so that multiple consecutive pastes can be undone individually
+                return change
+                    .setOperationFlag("skip", false)
+                    .setOperationFlag("merge", false)
+                    .insertText(transfer.text);
         }
     };
 
@@ -1538,7 +1542,7 @@ export default class MessageComposerInput extends React.Component {
 
         let {placeholder} = this.props;
         // XXX: workaround for placeholder being shown when there is a formatting block e.g blockquote but no text
-        if (isEmpty && this.state.editorState.startBlock.type !== DEFAULT_NODE) {
+        if (isEmpty && this.state.editorState.startBlock && this.state.editorState.startBlock.type !== DEFAULT_NODE) {
             placeholder = undefined;
         }
 

From 3e956514b3c9bd3c9a3879e065db4cd4f08fe104 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 11:00:45 +0100
Subject: [PATCH 656/702] also prevent merge/skip on rich text pastes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c20f6fb52c..03ca16c72c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -980,9 +980,15 @@ export default class MessageComposerInput extends React.Component {
                 // that we will silently discard nested blocks (e.g. nested lists) :(
                 const fragment = this.html.deserialize(transfer.html);
                 if (this.state.isRichTextEnabled) {
-                    return change.insertFragment(fragment.document);
+                    return change
+                        .setOperationFlag("skip", false)
+                        .setOperationFlag("merge", false)
+                        .insertFragment(fragment.document);
                 } else {
-                    return change.insertText(this.md.serialize(fragment));
+                    return change
+                        .setOperationFlag("skip", false)
+                        .setOperationFlag("merge", false)
+                        .insertText(this.md.serialize(fragment));
                 }
             }
             case 'text':

From 6bb88c0548474b7189069d943a0ff17f4b87b52d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 11:28:48 +0100
Subject: [PATCH 657/702] attempt to fix clash of Cmd-M on Mac. Should fix
 vector-im/riot-web#7047

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 03ca16c72c..16551f8446 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -734,6 +734,7 @@ export default class MessageComposerInput extends React.Component {
             }[ev.keyCode];
 
             if (ctrlCmdCommand) {
+                ev.preventDefault(); // to prevent clashing with Mac's minimize window
                 return this.handleKeyCommand(ctrlCmdCommand);
             }
         }

From 88dddb628dcd72e895261f786ae9c000d8484346 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 11:50:13 +0100
Subject: [PATCH 658/702] in MD mode forgo any Magic Rich Pasting conversion as
 its confusing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 16551f8446..af342a0b99 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -977,19 +977,20 @@ export default class MessageComposerInput extends React.Component {
             case 'files':
                 return this.props.onFilesPasted(transfer.files);
             case 'html': {
-                // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
-                // that we will silently discard nested blocks (e.g. nested lists) :(
-                const fragment = this.html.deserialize(transfer.html);
                 if (this.state.isRichTextEnabled) {
+                    // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
+                    // that we will silently discard nested blocks (e.g. nested lists) :(
+                    const fragment = this.html.deserialize(transfer.html);
                     return change
                         .setOperationFlag("skip", false)
                         .setOperationFlag("merge", false)
                         .insertFragment(fragment.document);
                 } else {
+                    // in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain
                     return change
                         .setOperationFlag("skip", false)
                         .setOperationFlag("merge", false)
-                        .insertText(this.md.serialize(fragment));
+                        .insertText(transfer.text);
                 }
             }
             case 'text':

From f868cd66994a2980b4205aef574dd620a665fb39 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 18 Jul 2018 11:52:57 +0100
Subject: [PATCH 659/702] Fix border around persisted widgets

The PersistedElement had zero height so the border ended up in the
wrong place. Add a wrapper to fix the height back.

Fixes https://github.com/vector-im/riot-web/issues/7030
Fixes https://github.com/vector-im/riot-web/issues/7029
---
 res/css/views/rooms/_AppsDrawer.scss     |  4 ++++
 src/components/views/elements/AppTile.js | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 6431853672..bf5df4fbaa 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -61,6 +61,10 @@ limitations under the License.
     background-color: $dialog-background-bg-color;
 }
 
+.mx_AppTile_persistedWrapper {
+    height: 280px;
+}
+
 .mx_AppTile:last-child {
     margin-right: 1px;
 }
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index e287abd07a..5dbc307810 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -569,9 +569,13 @@ export default class AppTile extends React.Component {
                     // re-mounted later when we do.
                     if (this.props.whitelistCapabilities.includes('m.always_on_screen')) {
                         const PersistedElement = sdk.getComponent("elements.PersistedElement");
-                        appTileBody = <PersistedElement persistKey={this._persistKey}>
-                            {appTileBody}
-                        </PersistedElement>;
+                        // Also wrap the PersistedElement in a div to fix the height, otherwise
+                        // AppTile's border is in the wrong place
+                        appTileBody = <div className="mx_AppTile_persistedWrapper">
+                            <PersistedElement persistKey={this._persistKey}>
+                                {appTileBody}
+                            </PersistedElement>
+                        </div>;
                     }
                 }
             } else {

From 22bde9fd50db11105e801c9a174a63c1e05ee698 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 18 Jul 2018 12:05:32 +0100
Subject: [PATCH 660/702] Read jitsi widget URL from config

---
 src/CallHandler.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index d9390310d6..cb1dfbc33a 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -444,11 +444,15 @@ function _startCallApp(roomId, type) {
         'avatarUrl=$matrix_avatar_url',
         'email=$matrix_user_id',
     ].join('&');
-    const widgetUrl = (
-        SdkConfig.get().integrations_rest_url +
-        '/widgets/jitsi.html?' +
-        queryString
-    );
+
+    let widgetUrl;
+    if (SdkConfig.get().integrations_jitsi_widget_url) {
+        // Try this config key. This probably isn't ideal as a way of discovering this
+        // URL, but this will at least allow the integration manager to not be hardcoded.
+        widgetUrl = SdkConfig.get().integrations_jitsi_widget_url + '?' + queryString;
+    } else {
+        widgetUrl = SdkConfig.get().integrations_rest_url + '/widgets/jitsi.html?' + queryString;
+    }
 
     const widgetData = { widgetSessionId };
 

From cbb61e3b2b933e24647c47817abef5a0d8d02e11 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 18 Jul 2018 12:51:51 +0000
Subject: [PATCH 661/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f0120db7d2..c0e40ef49b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1209,5 +1209,15 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "您在審閱並同意<consentLink>我們的條款與條件</consentLink>前無法傳送訊息。",
     "Show empty room list headings": "顯示空聊天室清單標題",
     "Demote yourself?": "將自己降級？",
-    "Demote": "降級"
+    "Demote": "降級",
+    "A conference call could not be started because the intgrations server is not available": "會議通話無法啟動，因為整合伺服器不可用",
+    "Permission Required": "需要權限",
+    "You do not have permission to start a conference call in this room": "您沒有在此聊天室啟動會議通話的權限",
+    "This event could not be displayed": "此活動無法顯示",
+    "deleted": "刪除線",
+    "underlined": "底線",
+    "inline-code": "內嵌程式碼",
+    "block-quote": "區塊引用",
+    "bulleted-list": "項目符號清單",
+    "numbered-list": "編號清單"
 }

From f6587536101a140deb15dcba3a0ecebcc7504972 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 18 Jul 2018 14:14:38 +0100
Subject: [PATCH 662/702] Fix e2e icons floating above jitsi

Remove another seemingly redundant z-index

Fixes https://github.com/vector-im/riot-web/issues/7056
---
 res/css/views/rooms/_EventTile.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 2898fb7bb7..f74e2e0850 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -288,7 +288,6 @@ limitations under the License.
     position: absolute;
     top: 9px;
     left: 46px;
-    z-index: 2;
     cursor: pointer;
 }
 

From 5867fe73dd2bb83926dd3f80094cae0cc5187697 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 15:38:21 +0100
Subject: [PATCH 663/702] hide some commands after space as they have special
 semantics

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.js                | 5 ++++-
 src/autocomplete/CommandProvider.js | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 211a68e7b0..2401d46f03 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -26,11 +26,12 @@ import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 
 class Command {
-    constructor({name, args='', description, runFn}) {
+    constructor({name, args='', description, runFn, hideCompletionAfterSpace=false}) {
         this.command = '/' + name;
         this.args = args;
         this.description = description;
         this.runFn = runFn;
+        this.hideCompletionAfterSpace = hideCompletionAfterSpace;
     }
 
     getCommand() {
@@ -78,6 +79,7 @@ export const CommandMap = {
             });
             return success();
         },
+        hideCompletionAfterSpace: true,
     }),
 
     nick: new Command({
@@ -466,6 +468,7 @@ export const CommandMap = {
         name: 'me',
         args: '<message>',
         description: _td('Displays action'),
+        hideCompletionAfterSpace: true,
     }),
 };
 /* eslint-enable babel/no-invalid-this */
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 5582b57e14..ca1bbb0b21 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -46,6 +46,8 @@ export default class CommandProvider extends AutocompleteProvider {
             // The input looks like a command with arguments, perform exact match
             const name = command[1].substr(1); // strip leading `/`
             if (CommandMap[name]) {
+                // some commands, namely `me` and `ddg` don't suit having the usage shown whilst typing their arguments
+                if (!CommandMap[name].hideCompletionAfterSpace) return [];
                 matches = [CommandMap[name]];
             }
         } else {

From 855f8871b810d20e88b255f693a9d783ee545c25 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Jul 2018 16:50:07 +0100
Subject: [PATCH 664/702] replace heuristic for the time being as it failed
 with inlines like pills. Fixes vector-im/riot-web#7059

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index af342a0b99..a6ed136cd5 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -504,8 +504,9 @@ export default class MessageComposerInput extends React.Component {
         // when in autocomplete mode and selection changes hide the autocomplete.
         // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
         if (this.autocomplete.state.completionList.length > 0 && !this.autocomplete.state.hide &&
-            this.state.editorState.document.text === editorState.document.text &&
-            !rangeEquals(this.state.editorState.selection, editorState.selection))
+            !rangeEquals(this.state.editorState.selection, editorState.selection) &&
+            // XXX: the heuristic failed when inlines like pills weren't taken into account. This is inideal
+            this.state.editorState.document.toJSON() === editorState.document.toJSON())
         {
             this.autocomplete.hide();
         }

From df025ca935439a0946e1dd07dba6fc9f0fbc8c22 Mon Sep 17 00:00:00 2001
From: Marc Yustin <marcyustin@gmail.com>
Date: Wed, 18 Jul 2018 18:38:51 +0000
Subject: [PATCH 665/702] Translated using Weblate (Italian)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 07e030c061..8783df2db7 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1195,5 +1195,29 @@
     "Share Message": "Condividi messaggio",
     "No Audio Outputs detected": "Nessuna uscita audio rilevata",
     "Audio Output": "Uscita audio",
-    "Try the app first": "Prova prima l'app"
+    "Try the app first": "Prova prima l'app",
+    "A conference call could not be started because the intgrations server is not available": "La chiamata di gruppo non può essere iniziata perchè il server di integrazione non è disponibile",
+    "Call in Progress": "Chiamata in corso",
+    "A call is already in progress!": "Una chiamata è già in corso!",
+    "Permission Required": "Permesso richiesto",
+    "You do not have permission to start a conference call in this room": "Non hai il permesso di iniziare una chiamata di gruppo in questa stanza",
+    "Jitsi Conference Calling": "Chiamata di gruppo Jitsi",
+    "Show empty room list headings": "Mostra le intestazioni dell'elenco delle stanze vuote",
+    "This event could not be displayed": "Questo evento non può essere mostrato",
+    "Demote yourself?": "Retrocedi?",
+    "Demote": "Retrocedi",
+    "deleted": "cancellato",
+    "underlined": "sottolineato",
+    "inline-code": "codice in linea",
+    "block-quote": "citazione",
+    "bulleted-list": "lista a punti",
+    "numbered-list": "lista a numeri",
+    "You have no historical rooms": "Non ci sono stanze storiche",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Nelle stanze criptate, come questa, le anteprime degli URL sono disabilitate di default per garantire che il tuo server di casa (dove vengono generate le anteprime) non possa raccogliere informazioni sui collegamenti che vedi in questa stanza.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Quando qualcuno inserisce un URL nel proprio messaggio, è possibile mostrare un'anteprima dell'URL per fornire maggiori informazioni su quel collegamento, come il titolo, la descrizione e un'immagine dal sito web.",
+    "The email field must not be blank.": "Il campo email non deve essere vuoto.",
+    "The user name field must not be blank.": "Il campo nome utente non deve essere vuoto.",
+    "The phone number field must not be blank.": "Il campo telefono non deve essere vuoto.",
+    "The password field must not be blank.": "Il campo passwordl non deve essere vuoto.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non è possibile inviare alcun messaggio fino a quando non si esaminano e si accettano <consentLink> i nostri termini e condizioni </ permissionLink>."
 }

From 1a61f15a970440a192a0577b00c34abfc0554b9c Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 17 Jul 2018 19:24:10 +0000
Subject: [PATCH 666/702] Translated using Weblate (Bulgarian)

Currently translated at 99.3% (1207 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 89cb022adc..2762cccd9c 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1209,5 +1209,7 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Не можете да изпращате съобщения докато не прегледате и се съгласите с <consentLink>нашите правила и условия</consentLink>.",
     "Demote yourself?": "Понижете себе си?",
     "Demote": "Понижение",
-    "This event could not be displayed": "Това събитие не може да бъде показано"
+    "This event could not be displayed": "Това събитие не може да бъде показано",
+    "A conference call could not be started because the intgrations server is not available": "Не може да бъде започнат конферентен разговор, защото сървърът с интеграции не е достъпен",
+    "Permission Required": "Необходимо е разрешение"
 }

From 89bc4776e963558d7c8905754a27fc93f76812cd Mon Sep 17 00:00:00 2001
From: Hugues De Keyzer <matrix@hugues.info>
Date: Wed, 18 Jul 2018 22:11:01 +0000
Subject: [PATCH 667/702] Translated using Weblate (Esperanto)

Currently translated at 91.0% (1106 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index ceecc17236..754751b0fd 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -658,7 +658,7 @@
     "I verify that the keys match": "Mi kontrolas, ke la ŝlosiloj kongruas",
     "An error has occurred.": "Eraro okazis.",
     "OK": "Bone",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vi aldonis novan aparaton ‹%(displayName)s›, kiu petas ĉifrajn ŝlasilojn.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vi aldonis novan aparaton “%(displayName)s”, kiu petas ĉifrajn ŝlosilojn.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Via nekontrolita aparato ‹%(displayName)s› petas ĉifrajn ŝlosilojn.",
     "Start verification": "Komenci kontrolon",
     "Share without verifying": "Kunhavigi sen kontrolo",
@@ -1103,5 +1103,12 @@
     "Your User Agent": "Via klienta aplikaĵo",
     "Your device resolution": "La distingivo de via aparato",
     "Call in Progress": "Voko farata",
-    "A call is already in progress!": "Voko estas jam farata!"
+    "A call is already in progress!": "Voko estas jam farata!",
+    "Always show encryption icons": "Ĉiam montri bildetojn de ĉifrado",
+    "Send analytics data": "Sendi statistikajn datumojn",
+    "Key request sent.": "Demando de ŝlosilo sendita.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Redemandi ĉifroŝlosilojn</requestLink> el viaj aliaj aparatoj.",
+    "Encrypting": "Ĉifranta",
+    "Encrypted, not sent": "Ĉifrita, ne sendita",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se viaj aliaj aparatoj ne havas la ŝlosilon por ĉi tiu mesaĝo, vi ne povos malĉifri ĝin."
 }

From 76129105071c6a757810e7a76be6643377247eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Wed, 18 Jul 2018 07:03:39 +0000
Subject: [PATCH 668/702] Translated using Weblate (French)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index b192bdf836..d1d10fab1d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1219,5 +1219,5 @@
     "numbered-list": "liste à numéros",
     "A conference call could not be started because the intgrations server is not available": "L'appel en téléconférence n'a pas pu aboutir car le serveur d'intégrations n'est pas disponible",
     "Permission Required": "Permission requise",
-    "You do not have permission to start a conference call in this room": "Vous n'avez pas l'autorisation de lancer un appel en téléconférence dans ce salon"
+    "You do not have permission to start a conference call in this room": "Vous n'avez pas la permission de lancer un appel en téléconférence dans ce salon"
 }

From 50c6b91c8f5ad119dc7d1e4360bd689b6b0935d6 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 17 Jul 2018 19:30:12 +0000
Subject: [PATCH 669/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 0ed5a95ed7..d03244189e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1216,5 +1216,8 @@
     "inline-code": "kód",
     "block-quote": "idézet",
     "bulleted-list": "rendezetlen lista",
-    "numbered-list": "rendezett lista"
+    "numbered-list": "rendezett lista",
+    "A conference call could not be started because the intgrations server is not available": "A konferencia hívást nem lehet elkezdeni mert az integrációs szerver nem érhető el",
+    "Permission Required": "Engedély szükséges",
+    "You do not have permission to start a conference call in this room": "Nincs jogosultságod konferencia hívást kezdeményezni ebben a szobában"
 }

From 0ddf84c45e4906bf20cab87f9c60839b17a354a0 Mon Sep 17 00:00:00 2001
From: Marc Yustin <marcyustin@gmail.com>
Date: Wed, 18 Jul 2018 18:46:29 +0000
Subject: [PATCH 670/702] Translated using Weblate (Italian)

Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 8783df2db7..5ded20b727 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -210,9 +210,9 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha reso visibile la futura cronologia della stanza a (%(visibility)s) sconosciuto.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha attivato la crottografia end-to-end (algoritmo %(algorithm)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha attivato la crittografia end-to-end (algoritmo %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s da %(fromPowerLevel)s a %(toPowerLevel)s",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha cambiato il messaggio ancorato della stanza.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha cambiato i messaggi ancorati della stanza.",
     "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificato da %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s aggiunto da %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s rimosso da %(senderName)s",

From eb0a1d9b92f926001c309992b84ef4e960263914 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 18 Jul 2018 16:13:28 +0000
Subject: [PATCH 671/702] Translated using Weblate (Russian)

Currently translated at 99.4% (1208 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 85bfa56616..ab18358f8b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1209,5 +1209,8 @@
     "Demote yourself?": "Понизить самого себя?",
     "This event could not be displayed": "Это событие отобразить невозможно",
     "deleted": "удален",
-    "underlined": "подчеркнут"
+    "underlined": "подчеркнут",
+    "A conference call could not be started because the intgrations server is not available": "Запуск конференции невозможен из-за недоступности сервера интеграции",
+    "Permission Required": "Требуется разрешение",
+    "You do not have permission to start a conference call in this room": "У вас нет разрешения на запуск конференции в этой комнате"
 }

From 0d1fd1b8928c8e8887721e5e553280f0099fafda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 19 Jul 2018 11:23:19 +0000
Subject: [PATCH 672/702] Translated using Weblate (French)

Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index d1d10fab1d..854422297f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1219,5 +1219,8 @@
     "numbered-list": "liste à numéros",
     "A conference call could not be started because the intgrations server is not available": "L'appel en téléconférence n'a pas pu aboutir car le serveur d'intégrations n'est pas disponible",
     "Permission Required": "Permission requise",
-    "You do not have permission to start a conference call in this room": "Vous n'avez pas la permission de lancer un appel en téléconférence dans ce salon"
+    "You do not have permission to start a conference call in this room": "Vous n'avez pas la permission de lancer un appel en téléconférence dans ce salon",
+    "A call is currently being placed!": "Un appel est en cours !",
+    "Failed to remove widget": "Échec de la suppression du widget",
+    "An error ocurred whilst trying to remove the widget from the room": "Une erreur est survenue lors de la suppression du widget du salon"
 }

From 25a3d49f678147eb5a3535d862bcd6049eac2f8c Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 19 Jul 2018 13:36:32 +0000
Subject: [PATCH 673/702] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d03244189e..9c8be3fe15 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1219,5 +1219,8 @@
     "numbered-list": "rendezett lista",
     "A conference call could not be started because the intgrations server is not available": "A konferencia hívást nem lehet elkezdeni mert az integrációs szerver nem érhető el",
     "Permission Required": "Engedély szükséges",
-    "You do not have permission to start a conference call in this room": "Nincs jogosultságod konferencia hívást kezdeményezni ebben a szobában"
+    "You do not have permission to start a conference call in this room": "Nincs jogosultságod konferencia hívást kezdeményezni ebben a szobában",
+    "A call is currently being placed!": "A hívás indítás alatt!",
+    "Failed to remove widget": "A kisalkalmazás törlése sikertelen",
+    "An error ocurred whilst trying to remove the widget from the room": "A kisalkalmazás szobából való törlése közben hiba történt"
 }

From 19f4d4e15b1e5f5b648ad6e477048c7dd10a83f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Fri, 20 Jul 2018 07:58:11 +0000
Subject: [PATCH 674/702] Translated using Weblate (Slovak)

Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
---
 src/i18n/strings/sk.json | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index bf5d365dfe..a343c44066 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1205,5 +1205,22 @@
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ak niekto vo svojej správe pošle URL adresu, môže byť zobrazený jej náhľad obsahujúci názov, popis a obrázok z cieľovej web stránky.",
     "Call in Progress": "Prebiehajúci hovor",
     "A call is already in progress!": "Jeden hovor už prebieha!",
-    "You have no historical rooms": "Nemáte žiadne historické miestnosti"
+    "You have no historical rooms": "Nemáte žiadne historické miestnosti",
+    "A conference call could not be started because the intgrations server is not available": "Nie je možné uskutočniť konferenčný hovor, integračný server nie je k dispozícii",
+    "A call is currently being placed!": "Práve prebieha iný hovor!",
+    "Permission Required": "Vyžaduje sa oprávnenie",
+    "You do not have permission to start a conference call in this room": "V tejto miestnosti nemáte oprávnenie začať konferenčný hovor",
+    "Show empty room list headings": "Zobrazovať nadpisy prázdnych zoznamov miestností",
+    "This event could not be displayed": "Nie je možné zobraziť túto udalosť",
+    "Demote yourself?": "Znížiť vlastnú úroveň moci?",
+    "Demote": "Znížiť",
+    "deleted": "Odstránené",
+    "underlined": "Podčiarknuté",
+    "inline-code": "Vnorený kód",
+    "block-quote": "Citácia",
+    "bulleted-list": "Odrážkový zoznam",
+    "numbered-list": "Číselný zoznam",
+    "Failed to remove widget": "Nepodarilo sa odstrániť widget",
+    "An error ocurred whilst trying to remove the widget from the room": "Pri odstraňovaní widgetu z  miestnosti sa vyskytla chyba",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nemôžete posielať žiadne správy, kým si neprečítate a neodsúhlasíte <consentLink>naše zmluvné podmienky</consentLink>."
 }

From bd3dd9aafc5a0befc94f63dc3c996d6bdb451f85 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Jul 2018 14:30:38 +0100
Subject: [PATCH 675/702] Allow jitsi in e2e rooms

We have a separate warning about how widgets are not very e2e, so
this should be sufficient warning.
---
 src/CallHandler.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index c8179b8b3c..e089b48786 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -301,23 +301,23 @@ function _onAction(payload) {
         case 'place_conference_call':
             console.log("Place conference call in %s", payload.room_id);
 
-            if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
-                // Conference calls are implemented by sending the media to central
-                // server which combines the audio from all the participants together
-                // into a single stream. This is incompatible with end-to-end encryption
-                // because a central server would be decrypting the audio for each
-                // participant.
-                // Therefore we disable conference calling in E2E rooms.
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Call Handler', 'Conference calls unsupported e2e', ErrorDialog, {
-                    description: _t('Conference calls are not supported in encrypted rooms'),
-                });
-                return;
-            }
-
             if (SettingsStore.isFeatureEnabled('feature_jitsi')) {
                 _startCallApp(payload.room_id, payload.type);
             } else {
+                if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
+                    // Conference calls are implemented by sending the media to central
+                    // server which combines the audio from all the participants together
+                    // into a single stream. This is incompatible with end-to-end encryption
+                    // because a central server would be decrypting the audio for each
+                    // participant.
+                    // Therefore we disable conference calling in E2E rooms.
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    Modal.createTrackedDialog('Call Handler', 'Conference calls unsupported e2e', ErrorDialog, {
+                        description: _t('Conference calls are not supported in encrypted rooms'),
+                    });
+                    return;
+                }
+
                 if (!ConferenceHandler) {
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createTrackedDialog('Call Handler', 'Conference call unsupported client', ErrorDialog, {

From 93abb4b74bc5a5aaaf06bb6e10f43ad538bbe534 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 20 Jul 2018 15:06:27 +0100
Subject: [PATCH 676/702] workaround to prevent Slate getting too empty when
 undoing RT pastes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index a6ed136cd5..c117bce6a2 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -983,8 +983,9 @@ export default class MessageComposerInput extends React.Component {
                     // that we will silently discard nested blocks (e.g. nested lists) :(
                     const fragment = this.html.deserialize(transfer.html);
                     return change
-                        .setOperationFlag("skip", false)
-                        .setOperationFlag("merge", false)
+                    // XXX: this somehow makes Slate barf on undo and get too empty and break entirely
+                    // .setOperationFlag("skip", false)
+                    // .setOperationFlag("merge", false)
                         .insertFragment(fragment.document);
                 } else {
                     // in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain

From fc18c301a1ebeb71e21b887a5ca3dc981d3a3e3a Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sun, 22 Jul 2018 13:00:56 +0000
Subject: [PATCH 677/702] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index c0e40ef49b..5147b9a4a4 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1219,5 +1219,8 @@
     "inline-code": "內嵌程式碼",
     "block-quote": "區塊引用",
     "bulleted-list": "項目符號清單",
-    "numbered-list": "編號清單"
+    "numbered-list": "編號清單",
+    "A call is currently being placed!": "目前正在撥打電話！",
+    "Failed to remove widget": "移除小工具失敗",
+    "An error ocurred whilst trying to remove the widget from the room": "嘗試從聊天室移除小工具時發生錯誤"
 }

From 3992e99850639e7c7b267bb89d3ad745924d2f41 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 23 Jul 2018 14:18:45 +0200
Subject: [PATCH 678/702] dont error on rooms the user has left already

---
 src/RoomInvite.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 0bcc08eb06..3a9088e65f 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -191,14 +191,11 @@ function _showAnyInviteErrors(addrs, room) {
 function _getDirectMessageRooms(addr) {
     const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
     const dmRooms = dmRoomMap.getDMRoomsForUserId(addr);
-    const rooms = [];
-    dmRooms.forEach((dmRoom) => {
+    const rooms = dmRooms.filter((dmRoom) => {
         const room = MatrixClientPeg.get().getRoom(dmRoom);
         if (room) {
             const me = room.getMember(MatrixClientPeg.get().credentials.userId);
-            if (me.membership == 'join') {
-                rooms.push(room);
-            }
+            return me && me.membership == 'join';
         }
     });
     return rooms;

From 00f78822c5aa3459b3e80fa31d32ef5e32c15731 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Jul 2018 13:50:16 +0100
Subject: [PATCH 679/702] Fix widgets resetting when going to the top-left

Remove the hash from the parentUrl because this change when we
change rooms.
---
 src/components/views/elements/AppTile.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 79930c3d6b..8983f039e7 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -117,8 +117,9 @@ export default class AppTile extends React.Component {
         const params = qs.parse(u.query);
         // Append widget ID to query parameters
         params.widgetId = this.props.id;
-        // Append current / parent URL
-        params.parentUrl = window.location.href;
+        // Append current / parent URL, minus the hash because that will change when
+        // we view a different room (ie. may change for persistent widgets)
+        params.parentUrl = window.location.href.split('#', 2)[0];
         u.search = undefined;
         u.query = params;
 

From 5adcd673ab342e21d90c14070de33d6b599bcafd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Jul 2018 15:08:17 +0100
Subject: [PATCH 680/702] Fix persisent apps being the wrong size

---
 res/css/structures/_LeftPanel.scss       |  2 +-
 res/css/views/rooms/_AppsDrawer.scss     | 28 +++++++++++++++++++-----
 src/components/views/elements/AppTile.js | 11 +++++++++-
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index bedec0e363..17e9cac1e4 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -54,7 +54,7 @@ limitations under the License.
 
 }
 
-.mx_LeftPanel .mx_AppTileFullWidth  {
+.mx_LeftPanel .mx_AppTileMini {
     height: 132px;
 }
 
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index bf5df4fbaa..e7f5697b27 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -61,10 +61,6 @@ limitations under the License.
     background-color: $dialog-background-bg-color;
 }
 
-.mx_AppTile_persistedWrapper {
-    height: 280px;
-}
-
 .mx_AppTile:last-child {
     margin-right: 1px;
 }
@@ -79,6 +75,22 @@ limitations under the License.
     border-radius: 2px;
 }
 
+.mx_AppTileMini {
+    max-width: 960px;
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+}
+
+.mx_AppTile_persistedWrapper {
+    height: 280px;
+}
+
+.mx_AppTileMini .mx_AppTile_persistedWrapper {
+    height: 114px;
+}
+
 .mx_AppTileMenuBar {
     margin: 0;
     padding: 2px 10px;
@@ -131,11 +143,17 @@ limitations under the License.
 }
 
 .mx_AppTileBody_mini {
-    height: 132px;
+    height: 112px;
     width: 100%;
     overflow: hidden;
 }
 
+.mx_AppTileBody_mini iframe {
+    border: none;
+    width: 100%;
+    height: 100%;
+}
+
 .mx_AppTileBody iframe {
     width: 100%;
     height: 280px;
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 8983f039e7..100276f933 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -616,8 +616,17 @@ export default class AppTile extends React.Component {
         const reloadWidgetIcon = 'img/button-refresh.svg';
         const windowStateIcon = (this.props.show ? 'img/minimize.svg' : 'img/maximize.svg');
 
+        let appTileClass;
+        if (this.props.miniMode) {
+            appTileClass = 'mx_AppTileMini';
+        } else if (this.props.fullWidth) {
+            appTileClass = 'mx_AppTileFullWidth';
+        } else {
+            appTileClass = 'mx_AppTile';
+        }
+
         return (
-            <div className={this.props.fullWidth ? "mx_AppTileFullWidth" : "mx_AppTile"} id={this.props.id}>
+            <div className={appTileClass} id={this.props.id}>
                 { this.props.showMenubar &&
                 <div ref="menu_bar" className="mx_AppTileMenuBar" onClick={this.onClickMenuBar}>
                     <span className="mx_AppTileMenuBarTitle" style={{pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : false)}}>

From 4f8ece53b2eb544ab54206a581cff6356fac570e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Jul 2018 15:58:07 +0100
Subject: [PATCH 681/702] Fix CSS naming

---
 res/css/structures/_LeftPanel.scss       | 3 ++-
 res/css/views/rooms/_AppsDrawer.scss     | 4 ++--
 src/components/views/elements/AppTile.js | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 17e9cac1e4..7cf6dd1119 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -54,7 +55,7 @@ limitations under the License.
 
 }
 
-.mx_LeftPanel .mx_AppTileMini {
+.mx_LeftPanel .mx_AppTile_mini {
     height: 132px;
 }
 
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index e7f5697b27..4a46063376 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -75,7 +75,7 @@ limitations under the License.
     border-radius: 2px;
 }
 
-.mx_AppTileMini {
+.mx_AppTile_mini {
     max-width: 960px;
     width: 100%;
     height: 100%;
@@ -87,7 +87,7 @@ limitations under the License.
     height: 280px;
 }
 
-.mx_AppTileMini .mx_AppTile_persistedWrapper {
+.mx_AppTile_mini .mx_AppTile_persistedWrapper {
     height: 114px;
 }
 
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 100276f933..534a490a32 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -618,7 +618,7 @@ export default class AppTile extends React.Component {
 
         let appTileClass;
         if (this.props.miniMode) {
-            appTileClass = 'mx_AppTileMini';
+            appTileClass = 'mx_AppTile_mini';
         } else if (this.props.fullWidth) {
             appTileClass = 'mx_AppTileFullWidth';
         } else {

From 77ab7d2589f53082cca4873be97984253c2f27aa Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Mon, 23 Jul 2018 14:23:54 +0200
Subject: [PATCH 682/702] CreateRoomDialog is rendered before get
 default_federate value

In React the order of the execution of mount and render functions
is: `componentWillMount --> render --> componentDidMount`

The `CreateRoomDialog` `render()` function is executed before than
the `componentDidMount()` function so the

  `this.defaultNoFederate = config.default_federate === false;`

; instruction which is executed in the `componentDidMount` function
(in `CreateRoomDialog`) is evaluated always after than the rendering
of the page.

Therefore, the obvious issue is that the values obtained from the
`SdkConfig.get()` function (`config.default_federate`) are obtained
later than their usage on `render()`.

This patch makes this change to fix the described issue:

* componentWillMount instead of componentDidMount

Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
---
 src/components/views/dialogs/CreateRoomDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 3b5369e8f6..3212e53c05 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -26,7 +26,7 @@ export default React.createClass({
         onFinished: PropTypes.func.isRequired,
     },
 
-    componentDidMount: function() {
+    componentWillMount: function() {
         const config = SdkConfig.get();
         // Dialog shows inverse of m.federate (noFederate) strict false check to skip undefined check (default = true)
         this.defaultNoFederate = config.default_federate === false;

From 6804647dda850b7454bf48ba8214f80617c5887d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Jul 2018 17:11:53 +0100
Subject: [PATCH 683/702] Destroy widget when its permission is revoked

---
 src/components/views/elements/AppTile.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 534a490a32..3b8105a0fe 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -161,14 +161,18 @@ export default class AppTile extends React.Component {
         // if it's not remaining on screen, get rid of the PersistedElement container
         if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
             // FIXME: ActiveWidgetStore should probably worry about this?
-            const PersistedElement = sdk.getComponent("elements.PersistedElement");
-            PersistedElement.destroyElement(this._persistKey);
-            ActiveWidgetStore.delWidgetMessaging(this.props.id);
-            ActiveWidgetStore.delWidgetCapabilities(this.props.id);
-            ActiveWidgetStore.delRoomId(this.props.id);
+            this._destroyPersistentWidget();
         }
     }
 
+    _destroyPersistentWidget() {
+        const PersistedElement = sdk.getComponent("elements.PersistedElement");
+        PersistedElement.destroyElement(this._persistKey);
+        ActiveWidgetStore.delWidgetMessaging(this.props.id);
+        ActiveWidgetStore.delWidgetCapabilities(this.props.id);
+        ActiveWidgetStore.delRoomId(this.props.id);
+    }
+
     /**
      * Adds a scalar token to the widget URL, if required
      * Component initialisation is only complete when this function has resolved
@@ -439,6 +443,10 @@ export default class AppTile extends React.Component {
         console.warn('Revoking permission to load widget - ', this.state.widgetUrl);
         localStorage.removeItem(this.state.widgetPermissionId);
         this.setState({hasPermissionToLoad: false});
+
+        // Force the widget to be non-persistent
+        ActiveWidgetStore.setWidgetPersistence(this.props.id, false);
+        this._destroyPersistentWidget();
     }
 
     formatAppTileName() {

From 7c3873b4494df6a44280184e54392d972e68f050 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 24 Jul 2018 12:18:10 +0100
Subject: [PATCH 684/702] fix `@room` pill href=undefined and @room parsing
 breaking subsequent pills

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/PlainWithPillsSerializer.js | 10 +++++++---
 src/components/views/messages/TextualBody.js | 14 +++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
index c1194ae2e1..59cf1bde3b 100644
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -64,13 +64,17 @@ class PlainWithPillsSerializer {
         } else if (node.type == 'emoji') {
             return node.data.get('emojiUnicode');
         } else if (node.type == 'pill') {
+            const completion = node.data.get('completion');
+            // over the wire the @room pill is just plaintext
+            if (completion === '@room') return completion;
+
             switch (this.pillFormat) {
                 case 'plain':
-                    return node.data.get('completion');
+                    return completion;
                 case 'md':
-                    return `[${ node.data.get('completion') }](${ node.data.get('href') })`;
+                    return `[${ completion }](${ node.data.get('href') })`;
                 case 'id':
-                    return node.data.get('completionId') || node.data.get('completion');
+                    return node.data.get('completionId') || completion;
             }
         } else if (node.nodes) {
             return node.nodes.map(this._serializeNode).join('');
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 2e5fe2aabc..17281dae09 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -203,7 +203,7 @@ module.exports = React.createClass({
                     // update the current node with one that's now taken its place
                     node = pillContainer;
                 }
-            } else if (node.nodeType == Node.TEXT_NODE) {
+            } else if (node.nodeType === Node.TEXT_NODE) {
                 const Pill = sdk.getComponent('elements.Pill');
 
                 let currentTextNode = node;
@@ -232,6 +232,12 @@ module.exports = React.createClass({
                     if (atRoomRule && pushProcessor.ruleMatchesEvent(atRoomRule, this.props.mxEvent)) {
                         // Now replace all those nodes with Pills
                         for (const roomNotifTextNode of roomNotifTextNodes) {
+                            // Set the next node to be processed to the one after the node
+                            // we're adding now, since we've just inserted nodes into the structure
+                            // we're iterating over.
+                            // Note we've checked roomNotifTextNodes.length > 0 so we'll do this at least once
+                            node = roomNotifTextNode.nextSibling;
+
                             const pillContainer = document.createElement('span');
                             const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
                             const pill = <Pill
@@ -243,12 +249,6 @@ module.exports = React.createClass({
 
                             ReactDOM.render(pill, pillContainer);
                             roomNotifTextNode.parentNode.replaceChild(pillContainer, roomNotifTextNode);
-
-                            // Set the next node to be processed to the one after the node
-                            // we're adding now, since we've just inserted nodes into the structure
-                            // we're iterating over.
-                            // Note we've checked roomNotifTextNodes.length > 0 so we'll do this at least once
-                            node = roomNotifTextNode.nextSibling;
                         }
                         // Nothing else to do for a text node (and we don't need to advance
                         // the loop pointer because we did it above)

From ef39327073269a99c3150029b905916e51da61df Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 24 Jul 2018 13:21:36 +0100
Subject: [PATCH 685/702] fix CommandMap typo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 9ebac031a8..a35a31966a 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -48,7 +48,7 @@ export default class CommandProvider extends AutocompleteProvider {
             const name = command[1].substr(1); // strip leading `/`
             if (CommandMap[name]) {
                 // some commands, namely `me` and `ddg` don't suit having the usage shown whilst typing their arguments
-                if (!CommandMap[name].hideCompletionAfterSpace) return [];
+                if (CommandMap[name].hideCompletionAfterSpace) return [];
                 matches = [CommandMap[name]];
             }
         } else {

From afa19cd60de28456ee55db7c44954551ab30949b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 24 Jul 2018 13:48:05 +0100
Subject: [PATCH 686/702] make clicking autocomplete suggestions work again

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/rooms/_Autocomplete.scss             |  3 ++-
 src/components/views/rooms/Autocomplete.js         |  9 ++++-----
 src/components/views/rooms/MessageComposerInput.js | 10 +++++++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/res/css/views/rooms/_Autocomplete.scss b/res/css/views/rooms/_Autocomplete.scss
index 732ada088b..3e1016f60d 100644
--- a/res/css/views/rooms/_Autocomplete.scss
+++ b/res/css/views/rooms/_Autocomplete.scss
@@ -69,7 +69,8 @@
     flex-flow: wrap;
 }
 
-.mx_Autocomplete_Completion.selected {
+.mx_Autocomplete_Completion.selected,
+.mx_Autocomplete_Completion:hover {
     background: $menu-bg-color;
     outline: none;
 }
diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index 4bc91b5c2b..ee6cc66d2d 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -216,12 +216,12 @@ export default class Autocomplete extends React.Component {
         return done.promise;
     }
 
-    onCompletionClicked(): boolean {
-        if (this.countCompletions() === 0 || this.state.selectionOffset === COMPOSER_SELECTED) {
+    onCompletionClicked(selectionOffset: number): boolean {
+        if (this.countCompletions() === 0 || selectionOffset === COMPOSER_SELECTED) {
             return false;
         }
 
-        this.props.onConfirm(this.state.completionList[this.state.selectionOffset - 1]);
+        this.props.onConfirm(this.state.completionList[selectionOffset - 1]);
         this.hide();
 
         return true;
@@ -264,8 +264,7 @@ export default class Autocomplete extends React.Component {
                 position++;
 
                 const onClick = () => {
-                    this.setSelection(componentPosition);
-                    this.onCompletionClicked();
+                    this.onCompletionClicked(componentPosition);
                 };
 
                 return React.cloneElement(completion.component, {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c117bce6a2..9cdb926a68 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1301,6 +1301,14 @@ export default class MessageComposerInput extends React.Component {
         await this.setDisplayedCompletion(null); // restore originalEditorState
     };
 
+    onAutocompleteConfirm = (displayedCompletion: ?Completion) => {
+        this.focusComposer();
+        // XXX: this fails if the composer isn't focused so focus it and delay the completion until next tick
+        setImmediate(() => {
+            this.setDisplayedCompletion(displayedCompletion);
+        });
+    };
+
     /* If passed null, restores the original editor content from state.originalEditorState.
      * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
      */
@@ -1563,7 +1571,7 @@ export default class MessageComposerInput extends React.Component {
                     <Autocomplete
                         ref={(e) => this.autocomplete = e}
                         room={this.props.room}
-                        onConfirm={this.setDisplayedCompletion}
+                        onConfirm={this.onAutocompleteConfirm}
                         onSelectionChange={this.setDisplayedCompletion}
                         query={ this.suppressAutoComplete ? '' : this.getAutocompleteQuery(activeEditorState) }
                         selection={this.getSelectionRange(activeEditorState)}

From 6cd3860058483150da3224024d758afe3e5f5fe9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 24 Jul 2018 14:35:23 +0100
Subject: [PATCH 687/702] fix conjugated emoji in slate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/RichText.js | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/RichText.js b/src/RichText.js
index 65b5dad107..3e8f834da6 100644
--- a/src/RichText.js
+++ b/src/RichText.js
@@ -16,37 +16,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-
-import * as sdk from './index';
 import * as emojione from 'emojione';
 
-import { SelectionRange } from "./autocomplete/Autocompleter";
-
 
 export function unicodeToEmojiUri(str) {
-    let replaceWith, unicode, alt;
-    if ((!emojione.unicodeAlt) || (emojione.sprites)) {
-        // if we are using the shortname as the alt tag then we need a reversed array to map unicode code point to shortnames
-        const mappedUnicode = emojione.mapUnicodeToShort();
-    }
+    const mappedUnicode = emojione.mapUnicodeToShort();
 
-    str = str.replace(emojione.regUnicode, function(unicodeChar) {
-        if ( (typeof unicodeChar === 'undefined') || (unicodeChar === '') || (!(unicodeChar in emojione.jsEscapeMap)) ) {
-            // if the unicodeChar doesnt exist just return the entire match
+    // remove any zero width joiners/spaces used in conjugate emojis as the emojione URIs don't contain them
+    return str.replace(emojione.regUnicode, function(unicodeChar) {
+        if ((typeof unicodeChar === 'undefined') || (unicodeChar === '') || (!(unicodeChar in emojione.jsEscapeMap))) {
+            // if the unicodeChar doesn't exist just return the entire match
             return unicodeChar;
         } else {
-            // Remove variant selector VS16 (explicitly emoji) as it is unnecessary and leads to an incorrect URL below
-            if (unicodeChar.length == 2 && unicodeChar[1] == '\ufe0f') {
-                unicodeChar = unicodeChar[0];
-            }
-
             // get the unicode codepoint from the actual char
-            unicode = emojione.jsEscapeMap[unicodeChar];
+            const unicode = emojione.jsEscapeMap[unicodeChar];
 
-            return emojione.imagePathSVG+unicode+'.svg'+emojione.cacheBustParam;
+            const short = mappedUnicode[unicode];
+            const fname = emojione.emojioneList[short].fname;
+
+            return emojione.imagePathSVG+fname+'.svg'+emojione.cacheBustParam;
         }
     });
-
-    return str;
 }

From 6a0182a653f4d353315de6933a521ee2f48d8e78 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 24 Jul 2018 15:53:48 +0100
Subject: [PATCH 688/702] update Slate as fixes have now landed

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 111fb97387..f79e0abd82 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "react-dom": "^15.6.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "resize-observer-polyfill": "^1.5.0",
-    "slate": "0.33.4",
+    "slate": "0.34.7",
     "slate-react": "^0.12.4",
     "slate-html-serializer": "^0.6.1",
     "slate-md-serializer": "matrix-org/slate-md-serializer#f7c4ad3",

From 020e714b85e9f5763b552363d52411dff691cad9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 24 Jul 2018 15:54:24 +0100
Subject: [PATCH 689/702] fix focus and too many <p>s after a Event>Quote in RT
 mode

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js       | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 9cdb926a68..f455db7fbc 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -387,17 +387,28 @@ export default class MessageComposerInput extends React.Component {
                     const anchorText = editorState.anchorText;
                     if ((!anchorText || anchorText.text === '') && editorState.anchorBlock.nodes.size === 1) {
                         // replace the current block rather than split the block
+                        // XXX: this destroys our focus by deleting the thing we are anchored/focused on
                         change = change.replaceNodeByKey(editorState.anchorBlock.key, quote);
-                    }
-                    else {
+                    } else {
                         // insert it into the middle of the block (splitting it)
                         change = change.insertBlock(quote);
                     }
-                    change = change.insertFragmentByKey(quote.key, 0, fragment.document)
-                                   .focus();
+
+                    // XXX: heuristic to strip out wrapping <p> which breaks quoting in RT mode
+                    if (fragment.document.nodes.size && fragment.document.nodes.get(0).type === DEFAULT_NODE) {
+                        change = change.insertFragmentByKey(quote.key, 0, fragment.document.nodes.get(0));
+                    } else {
+                        change = change.insertFragmentByKey(quote.key, 0, fragment.document);
+                    }
+
+                    // XXX: this is to bring back the focus in a sane place and add a paragraph after it
+                    change = change.select({
+                        anchorKey: quote.key,
+                        focusKey: quote.key,
+                    }).collapseToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus();
+
                     this.onChange(change);
-                }
-                else {
+                } else {
                     let fragmentChange = fragment.change();
                     fragmentChange.moveToRangeOf(fragment.document)
                                   .wrapBlock(quote);

From ec4c7ffb71605d29ba4f3fbee77257241b39d7d1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Jul 2018 16:21:43 +0100
Subject: [PATCH 690/702] Make ActiveWidgetStore clear persistent widgets

ActiveWidgetStore is now reponsible for removing the current
persistent widget from the store if it's been removed from whatever
room it was in. As per comment, this leaves us with the store updating
itself in this case but in all other cases, views call setters on the
store to update its state. We should make it so the store keeps itself
up to date and views aren't responsible for keeping the store up to date.

The store now emits events so it can notify PersistentApp when it changes.

Fixes https://github.com/vector-im/riot-web/issues/7076
---
 src/Lifecycle.js                              |  3 ++
 .../views/elements/PersistentApp.js           | 13 ++++-
 src/stores/ActiveWidgetStore.js               | 47 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 7378e982ef..a618cbeadf 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -30,6 +30,7 @@ import DMRoomMap from './utils/DMRoomMap';
 import RtsClient from './RtsClient';
 import Modal from './Modal';
 import sdk from './index';
+import ActiveWidgetStore from './stores/ActiveWidgetStore';
 
 /**
  * Called at startup, to attempt to build a logged-in Matrix session. It tries
@@ -436,6 +437,7 @@ async function startMatrixClient() {
     UserActivity.start();
     Presence.start();
     DMRoomMap.makeShared().start();
+    ActiveWidgetStore.start();
 
     await MatrixClientPeg.start();
 
@@ -488,6 +490,7 @@ export function stopMatrixClient() {
     Notifier.stop();
     UserActivity.stop();
     Presence.stop();
+    ActiveWidgetStore.start();
     if (DMRoomMap.shared()) DMRoomMap.shared().stop();
     const cli = MatrixClientPeg.get();
     if (cli) {
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index bbb3b2a9c8..facf5d1179 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -27,17 +27,20 @@ module.exports = React.createClass({
     getInitialState: function() {
         return {
             roomId: RoomViewStore.getRoomId(),
+            persistentWidgetId: ActiveWidgetStore.getPersistentWidgetId(),
         };
     },
 
     componentWillMount: function() {
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+        ActiveWidgetStore.on('update', this._onActiveWidgetStoreUpdate);
     },
 
     componentWillUnmount: function() {
         if (this._roomStoreToken) {
             this._roomStoreToken.remove();
         }
+        ActiveWidgetStore.removeListener('update', this._onActiveWidgetStoreUpdate);
     },
 
     _onRoomViewStoreUpdate: function(payload) {
@@ -47,9 +50,15 @@ module.exports = React.createClass({
         });
     },
 
+    _onActiveWidgetStoreUpdate: function() {
+        this.setState({
+            persistentWidgetId: ActiveWidgetStore.getPersistentWidgetId(),
+        });
+    },
+
     render: function() {
-        if (ActiveWidgetStore.getPersistentWidgetId()) {
-            const persistentWidgetInRoomId = ActiveWidgetStore.getRoomId(ActiveWidgetStore.getPersistentWidgetId());
+        if (this.state.persistentWidgetId) {
+            const persistentWidgetInRoomId = ActiveWidgetStore.getRoomId(this.state.persistentWidgetId);
             if (this.state.roomId !== persistentWidgetInRoomId) {
                 const persistentWidgetInRoom = MatrixClientPeg.get().getRoom(persistentWidgetInRoomId);
                 // get the widget data
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
index 01d5f15601..e1b1efaace 100644
--- a/src/stores/ActiveWidgetStore.js
+++ b/src/stores/ActiveWidgetStore.js
@@ -14,14 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import EventEmitter from 'events';
+
+import MatrixClientPeg from '../MatrixClientPeg';
+import sdk from '../index';
+
 /**
  * Stores information about the widgets active in the app right now:
  *  * What widget is set to remain always-on-screen, if any
  *    Only one widget may be 'always on screen' at any one time.
  *  * Negotiated capabilities for active apps
  */
-class ActiveWidgetStore {
+class ActiveWidgetStore extends EventEmitter {
     constructor() {
+        super();
         this._persistentWidgetId = null;
 
         // A list of negotiated capabilities for each widget, by ID
@@ -35,6 +41,38 @@ class ActiveWidgetStore {
 
         // What room ID each widget is associated with (if it's a room widget)
         this._roomIdByWidgetId = {};
+
+        this.onRoomStateEvents = this.onRoomStateEvents.bind(this);
+
+        this.dispatcherRef = null;
+    }
+
+    start() {
+        MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
+    }
+
+    stop() {
+        MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
+        this._capsByWidgetId = {};
+        this._widgetMessagingByWidgetId = {};
+        this._roomIdByWidgetId = {};
+    }
+
+    onRoomStateEvents(ev, state) {
+        // XXX: This listens for state events in order to remove the active widget.
+        // Everything else relies on views listening for events and calling setters
+        // on this class which is terrible. This store should just listen for events
+        // and keep itself up to date.
+        if (ev.getType() !== 'im.vector.modular.widgets') return;
+
+        if (ev.getStateKey() === this._persistentWidgetId) {
+            const PersistedElement = sdk.getComponent("elements.PersistedElement");
+            PersistedElement.destroyElement('widget_' + ev.getStateKey());
+            this.setWidgetPersistence(ev.getStateKey(), false);
+            this.delWidgetMessaging(ev.getStateKey());
+            this.delWidgetCapabilities(ev.getStateKey());
+            this.delRoomId(ev.getStateKey());
+        }
     }
 
     setWidgetPersistence(widgetId, val) {
@@ -43,6 +81,7 @@ class ActiveWidgetStore {
         } else if (this._persistentWidgetId !== widgetId && val) {
             this._persistentWidgetId = widgetId;
         }
+        this.emit('update');
     }
 
     getWidgetPersistence(widgetId) {
@@ -55,6 +94,7 @@ class ActiveWidgetStore {
 
     setWidgetCapabilities(widgetId, caps) {
         this._capsByWidgetId[widgetId] = caps;
+        this.emit('update');
     }
 
     widgetHasCapability(widgetId, cap) {
@@ -63,10 +103,12 @@ class ActiveWidgetStore {
 
     delWidgetCapabilities(widgetId) {
         delete this._capsByWidgetId[widgetId];
+        this.emit('update');
     }
 
     setWidgetMessaging(widgetId, wm) {
         this._widgetMessagingByWidgetId[widgetId] = wm;
+        this.emit('update');
     }
 
     getWidgetMessaging(widgetId) {
@@ -81,6 +123,7 @@ class ActiveWidgetStore {
                 console.error('Failed to stop listening for widgetMessaging events', e.message);
             }
             delete this._widgetMessagingByWidgetId[widgetId];
+            this.emit('update');
         }
     }
 
@@ -90,10 +133,12 @@ class ActiveWidgetStore {
 
     setRoomId(widgetId, roomId) {
         this._roomIdByWidgetId[widgetId] = roomId;
+        this.emit('update');
     }
 
     delRoomId(widgetId) {
         delete this._roomIdByWidgetId[widgetId];
+        this.emit('update');
     }
 }
 

From acc767a479fe9c3cae4ac198f1ec052cde662f67 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Jul 2018 16:39:30 +0100
Subject: [PATCH 691/702] s/start/stop/

---
 src/Lifecycle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index a618cbeadf..f32f105889 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -490,7 +490,7 @@ export function stopMatrixClient() {
     Notifier.stop();
     UserActivity.stop();
     Presence.stop();
-    ActiveWidgetStore.start();
+    ActiveWidgetStore.stop();
     if (DMRoomMap.shared()) DMRoomMap.shared().stop();
     const cli = MatrixClientPeg.get();
     if (cli) {

From 7044410a138047b93d83223152ee91911388fe4d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Jul 2018 16:50:34 +0100
Subject: [PATCH 692/702] Move destroyPersistentWidget to store

---
 src/components/views/elements/AppTile.js | 14 ++------------
 src/stores/ActiveWidgetStore.js          | 18 ++++++++++++------
 src/stores/LifecycleStore.js             |  1 +
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 3b8105a0fe..bd88327b7f 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -160,19 +160,10 @@ export default class AppTile extends React.Component {
 
         // if it's not remaining on screen, get rid of the PersistedElement container
         if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
-            // FIXME: ActiveWidgetStore should probably worry about this?
-            this._destroyPersistentWidget();
+            ActiveWidgetStore.destroyPersistentWidget();
         }
     }
 
-    _destroyPersistentWidget() {
-        const PersistedElement = sdk.getComponent("elements.PersistedElement");
-        PersistedElement.destroyElement(this._persistKey);
-        ActiveWidgetStore.delWidgetMessaging(this.props.id);
-        ActiveWidgetStore.delWidgetCapabilities(this.props.id);
-        ActiveWidgetStore.delRoomId(this.props.id);
-    }
-
     /**
      * Adds a scalar token to the widget URL, if required
      * Component initialisation is only complete when this function has resolved
@@ -445,8 +436,7 @@ export default class AppTile extends React.Component {
         this.setState({hasPermissionToLoad: false});
 
         // Force the widget to be non-persistent
-        ActiveWidgetStore.setWidgetPersistence(this.props.id, false);
-        this._destroyPersistentWidget();
+        ActiveWidgetStore.destroyPersistentWidget();
     }
 
     formatAppTileName() {
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
index e1b1efaace..53c17d0ee6 100644
--- a/src/stores/ActiveWidgetStore.js
+++ b/src/stores/ActiveWidgetStore.js
@@ -66,15 +66,21 @@ class ActiveWidgetStore extends EventEmitter {
         if (ev.getType() !== 'im.vector.modular.widgets') return;
 
         if (ev.getStateKey() === this._persistentWidgetId) {
-            const PersistedElement = sdk.getComponent("elements.PersistedElement");
-            PersistedElement.destroyElement('widget_' + ev.getStateKey());
-            this.setWidgetPersistence(ev.getStateKey(), false);
-            this.delWidgetMessaging(ev.getStateKey());
-            this.delWidgetCapabilities(ev.getStateKey());
-            this.delRoomId(ev.getStateKey());
+            this.destroyPersistentWidget();
         }
     }
 
+    destroyPersistentWidget() {
+        const toDeleteId = this._persistentWidgetId;
+
+        const PersistedElement = sdk.getComponent("elements.PersistedElement");
+        PersistedElement.destroyElement('widget_' + toDeleteId);
+        this.setWidgetPersistence(toDeleteId, false);
+        this.delWidgetMessaging(toDeleteId);
+        this.delWidgetCapabilities(toDeleteId);
+        this.delRoomId(toDeleteId);
+    }
+
     setWidgetPersistence(widgetId, val) {
         if (this._persistentWidgetId === widgetId && !val) {
             this._persistentWidgetId = null;
diff --git a/src/stores/LifecycleStore.js b/src/stores/LifecycleStore.js
index 0d76f06e72..2ce3be5a33 100644
--- a/src/stores/LifecycleStore.js
+++ b/src/stores/LifecycleStore.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From cdd73e6e1f318fefe82fd0fd8bf3d0180f1dbf64 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Jul 2018 16:55:45 +0100
Subject: [PATCH 693/702] Check matrix client exists when stopping

---
 src/stores/ActiveWidgetStore.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
index 53c17d0ee6..cc27febaf9 100644
--- a/src/stores/ActiveWidgetStore.js
+++ b/src/stores/ActiveWidgetStore.js
@@ -52,7 +52,9 @@ class ActiveWidgetStore extends EventEmitter {
     }
 
     stop() {
-        MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
+        }
         this._capsByWidgetId = {};
         this._widgetMessagingByWidgetId = {};
         this._roomIdByWidgetId = {};

From 07f0713a56d4022167dc4df3986a0f9e1b333c2e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 24 Jul 2018 17:06:45 +0100
Subject: [PATCH 694/702] allow autocompleting Emoji by common aliases, e.g
 :+1: to :thumbsup:

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 scripts/emoji-data-strip.js       | 3 +++
 src/autocomplete/EmojiProvider.js | 5 +++--
 src/stripped-emoji.json           | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/emoji-data-strip.js b/scripts/emoji-data-strip.js
index 40156471fe..42bf2ac2de 100644
--- a/scripts/emoji-data-strip.js
+++ b/scripts/emoji-data-strip.js
@@ -12,6 +12,9 @@ const output = Object.keys(EMOJI_DATA).map(
             category: datum.category,
             emoji_order: datum.emoji_order,
         };
+        if (datum.aliases.length > 0) {
+            newDatum.aliases = datum.aliases;
+        }
         if (datum.aliases_ascii.length > 0) {
             newDatum.aliases_ascii = datum.aliases_ascii;
         }
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 81f6144fd3..719550d59f 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -48,7 +48,7 @@ const CATEGORY_ORDER = [
 // (^|\s|(emojiUnicode)) to make sure we're either at the start of the string or there's a
 // whitespace character or an emoji before the emoji. The reason for unicodeRegexp is
 // that we need to support inputting multiple emoji with no space between them.
-const EMOJI_REGEX = new RegExp('(?:^|\\s|' + unicodeRegexp + ')(' + asciiRegexp + '|:\\w*:?)$', 'g');
+const EMOJI_REGEX = new RegExp('(?:^|\\s|' + unicodeRegexp + ')(' + asciiRegexp + '|:[+-\\w]*:?)$', 'g');
 
 // We also need to match the non-zero-length prefixes to remove them from the final match,
 // and update the range so that we don't replace the whitespace or the previous emoji.
@@ -65,6 +65,7 @@ const EMOJI_SHORTNAMES = Object.keys(EmojiData).map((key) => EmojiData[key]).sor
     return {
         name: a.name,
         shortname: a.shortname,
+        aliases: a.aliases ? a.aliases.join(' ') : '',
         aliases_ascii: a.aliases_ascii ? a.aliases_ascii.join(' ') : '',
         // Include the index so that we can preserve the original order
         _orderBy: index,
@@ -84,7 +85,7 @@ export default class EmojiProvider extends AutocompleteProvider {
     constructor() {
         super(EMOJI_REGEX);
         this.matcher = new FuzzyMatcher(EMOJI_SHORTNAMES, {
-            keys: ['aliases_ascii', 'shortname'],
+            keys: ['aliases_ascii', 'shortname', 'aliases'],
             // For matching against ascii equivalents
             shouldMatchWordsOnly: false,
         });
diff --git a/src/stripped-emoji.json b/src/stripped-emoji.json
index f39d76e877..16b772ae51 100644
--- a/src/stripped-emoji.json
+++ b/src/stripped-emoji.json
@@ -1 +1 @@
-[{"name":"hundred points symbol","shortname":":100:","category":"symbols","emoji_order":"2119"},{"name":"input symbol for numbers","shortname":":1234:","category":"symbols","emoji_order":"2122"},{"name":"grinning face","shortname":":grinning:","category":"people","emoji_order":"1"},{"name":"grinning face with smiling eyes","shortname":":grin:","category":"people","emoji_order":"2"},{"name":"face with tears of joy","shortname":":joy:","category":"people","emoji_order":"3","aliases_ascii":[":')",":'-)"]},{"name":"rolling on the floor laughing","shortname":":rofl:","category":"people","emoji_order":"4"},{"name":"smiling face with open mouth","shortname":":smiley:","category":"people","emoji_order":"5","aliases_ascii":[":D",":-D","=D"]},{"name":"smiling face with open mouth and smiling eyes","shortname":":smile:","category":"people","emoji_order":"6"},{"name":"smiling face with open mouth and cold sweat","shortname":":sweat_smile:","category":"people","emoji_order":"7","aliases_ascii":["':)","':-)","'=)","':D","':-D","'=D"]},{"name":"smiling face with open mouth and tightly-closed eyes","shortname":":laughing:","category":"people","emoji_order":"8","aliases_ascii":[">:)",">;)",">:-)",">=)"]},{"name":"winking face","shortname":":wink:","category":"people","emoji_order":"9","aliases_ascii":[";)",";-)","*-)","*)",";-]",";]",";D",";^)"]},{"name":"smiling face with smiling eyes","shortname":":blush:","category":"people","emoji_order":"10"},{"name":"face savouring delicious food","shortname":":yum:","category":"people","emoji_order":"11"},{"name":"smiling face with sunglasses","shortname":":sunglasses:","category":"people","emoji_order":"12","aliases_ascii":["B-)","B)","8)","8-)","B-D","8-D"]},{"name":"smiling face with heart-shaped eyes","shortname":":heart_eyes:","category":"people","emoji_order":"13"},{"name":"face throwing a kiss","shortname":":kissing_heart:","category":"people","emoji_order":"14","aliases_ascii":[":*",":-*","=*",":^*"]},{"name":"kissing face","shortname":":kissing:","category":"people","emoji_order":"15"},{"name":"kissing face with smiling eyes","shortname":":kissing_smiling_eyes:","category":"people","emoji_order":"16"},{"name":"kissing face with closed eyes","shortname":":kissing_closed_eyes:","category":"people","emoji_order":"17"},{"name":"white smiling face","shortname":":relaxed:","category":"people","emoji_order":"18"},{"name":"slightly smiling face","shortname":":slight_smile:","category":"people","emoji_order":"19","aliases_ascii":[":)",":-)","=]","=)",":]"]},{"name":"hugging face","shortname":":hugging:","category":"people","emoji_order":"20"},{"name":"thinking face","shortname":":thinking:","category":"people","emoji_order":"21"},{"name":"neutral face","shortname":":neutral_face:","category":"people","emoji_order":"22"},{"name":"expressionless face","shortname":":expressionless:","category":"people","emoji_order":"23","aliases_ascii":["-_-","-__-","-___-"]},{"name":"face without mouth","shortname":":no_mouth:","category":"people","emoji_order":"24","aliases_ascii":[":-X",":X",":-#",":#","=X","=x",":x",":-x","=#"]},{"name":"face with rolling eyes","shortname":":rolling_eyes:","category":"people","emoji_order":"25"},{"name":"smirking face","shortname":":smirk:","category":"people","emoji_order":"26"},{"name":"persevering face","shortname":":persevere:","category":"people","emoji_order":"27","aliases_ascii":[">.<"]},{"name":"disappointed but relieved face","shortname":":disappointed_relieved:","category":"people","emoji_order":"28"},{"name":"face with open mouth","shortname":":open_mouth:","category":"people","emoji_order":"29","aliases_ascii":[":-O",":O",":-o",":o","O_O",">:O"]},{"name":"zipper-mouth face","shortname":":zipper_mouth:","category":"people","emoji_order":"30"},{"name":"hushed face","shortname":":hushed:","category":"people","emoji_order":"31"},{"name":"sleepy face","shortname":":sleepy:","category":"people","emoji_order":"32"},{"name":"tired face","shortname":":tired_face:","category":"people","emoji_order":"33"},{"name":"sleeping face","shortname":":sleeping:","category":"people","emoji_order":"34"},{"name":"relieved face","shortname":":relieved:","category":"people","emoji_order":"35"},{"name":"nerd face","shortname":":nerd:","category":"people","emoji_order":"36"},{"name":"face with stuck-out tongue","shortname":":stuck_out_tongue:","category":"people","emoji_order":"37","aliases_ascii":[":P",":-P","=P",":-p",":p","=p",":-Þ",":Þ",":þ",":-þ",":-b",":b","d:"]},{"name":"face with stuck-out tongue and winking eye","shortname":":stuck_out_tongue_winking_eye:","category":"people","emoji_order":"38","aliases_ascii":[">:P","X-P","x-p"]},{"name":"face with stuck-out tongue and tightly-closed eyes","shortname":":stuck_out_tongue_closed_eyes:","category":"people","emoji_order":"39"},{"name":"drooling face","shortname":":drooling_face:","category":"people","emoji_order":"40"},{"name":"unamused face","shortname":":unamused:","category":"people","emoji_order":"41"},{"name":"face with cold sweat","shortname":":sweat:","category":"people","emoji_order":"42","aliases_ascii":["':(","':-(","'=("]},{"name":"pensive face","shortname":":pensive:","category":"people","emoji_order":"43"},{"name":"confused face","shortname":":confused:","category":"people","emoji_order":"44","aliases_ascii":[">:\\",">:/",":-/",":-.",":/",":\\","=/","=\\",":L","=L"]},{"name":"upside-down face","shortname":":upside_down:","category":"people","emoji_order":"45"},{"name":"money-mouth face","shortname":":money_mouth:","category":"people","emoji_order":"46"},{"name":"astonished face","shortname":":astonished:","category":"people","emoji_order":"47"},{"name":"white frowning face","shortname":":frowning2:","category":"people","emoji_order":"48"},{"name":"slightly frowning face","shortname":":slight_frown:","category":"people","emoji_order":"49"},{"name":"confounded face","shortname":":confounded:","category":"people","emoji_order":"50"},{"name":"disappointed face","shortname":":disappointed:","category":"people","emoji_order":"51","aliases_ascii":[">:[",":-(",":(",":-[",":[","=("]},{"name":"worried face","shortname":":worried:","category":"people","emoji_order":"52"},{"name":"face with look of triumph","shortname":":triumph:","category":"people","emoji_order":"53"},{"name":"crying face","shortname":":cry:","category":"people","emoji_order":"54","aliases_ascii":[":'(",":'-(",";(",";-("]},{"name":"loudly crying face","shortname":":sob:","category":"people","emoji_order":"55"},{"name":"frowning face with open mouth","shortname":":frowning:","category":"people","emoji_order":"56"},{"name":"anguished face","shortname":":anguished:","category":"people","emoji_order":"57"},{"name":"fearful face","shortname":":fearful:","category":"people","emoji_order":"58","aliases_ascii":["D:"]},{"name":"weary face","shortname":":weary:","category":"people","emoji_order":"59"},{"name":"grimacing face","shortname":":grimacing:","category":"people","emoji_order":"60"},{"name":"face with open mouth and cold sweat","shortname":":cold_sweat:","category":"people","emoji_order":"61"},{"name":"face screaming in fear","shortname":":scream:","category":"people","emoji_order":"62"},{"name":"flushed face","shortname":":flushed:","category":"people","emoji_order":"63","aliases_ascii":[":$","=$"]},{"name":"dizzy face","shortname":":dizzy_face:","category":"people","emoji_order":"64","aliases_ascii":["#-)","#)","%-)","%)","X)","X-)"]},{"name":"pouting face","shortname":":rage:","category":"people","emoji_order":"65"},{"name":"angry face","shortname":":angry:","category":"people","emoji_order":"66","aliases_ascii":[">:(",">:-(",":@"]},{"name":"smiling face with halo","shortname":":innocent:","category":"people","emoji_order":"67","aliases_ascii":["O:-)","0:-3","0:3","0:-)","0:)","0;^)","O:)","O;-)","O=)","0;-)","O:-3","O:3"]},{"name":"face with cowboy hat","shortname":":cowboy:","category":"people","emoji_order":"68"},{"name":"clown face","shortname":":clown:","category":"people","emoji_order":"69"},{"name":"lying face","shortname":":lying_face:","category":"people","emoji_order":"70"},{"name":"face with medical mask","shortname":":mask:","category":"people","emoji_order":"71"},{"name":"face with thermometer","shortname":":thermometer_face:","category":"people","emoji_order":"72"},{"name":"face with head-bandage","shortname":":head_bandage:","category":"people","emoji_order":"73"},{"name":"nauseated face","shortname":":nauseated_face:","category":"people","emoji_order":"74"},{"name":"sneezing face","shortname":":sneezing_face:","category":"people","emoji_order":"75"},{"name":"smiling face with horns","shortname":":smiling_imp:","category":"people","emoji_order":"76"},{"name":"imp","shortname":":imp:","category":"people","emoji_order":"77"},{"name":"japanese ogre","shortname":":japanese_ogre:","category":"people","emoji_order":"78"},{"name":"japanese goblin","shortname":":japanese_goblin:","category":"people","emoji_order":"79"},{"name":"skull","shortname":":skull:","category":"people","emoji_order":"80"},{"name":"skull and crossbones","shortname":":skull_crossbones:","category":"objects","emoji_order":"81"},{"name":"ghost","shortname":":ghost:","category":"people","emoji_order":"82"},{"name":"extraterrestrial alien","shortname":":alien:","category":"people","emoji_order":"83"},{"name":"alien monster","shortname":":space_invader:","category":"activity","emoji_order":"84"},{"name":"robot face","shortname":":robot:","category":"people","emoji_order":"85"},{"name":"pile of poo","shortname":":poop:","category":"people","emoji_order":"86"},{"name":"smiling cat face with open mouth","shortname":":smiley_cat:","category":"people","emoji_order":"87"},{"name":"grinning cat face with smiling eyes","shortname":":smile_cat:","category":"people","emoji_order":"88"},{"name":"cat face with tears of joy","shortname":":joy_cat:","category":"people","emoji_order":"89"},{"name":"smiling cat face with heart-shaped eyes","shortname":":heart_eyes_cat:","category":"people","emoji_order":"90"},{"name":"cat face with wry smile","shortname":":smirk_cat:","category":"people","emoji_order":"91"},{"name":"kissing cat face with closed eyes","shortname":":kissing_cat:","category":"people","emoji_order":"92"},{"name":"weary cat face","shortname":":scream_cat:","category":"people","emoji_order":"93"},{"name":"crying cat face","shortname":":crying_cat_face:","category":"people","emoji_order":"94"},{"name":"pouting cat face","shortname":":pouting_cat:","category":"people","emoji_order":"95"},{"name":"see-no-evil monkey","shortname":":see_no_evil:","category":"nature","emoji_order":"96"},{"name":"hear-no-evil monkey","shortname":":hear_no_evil:","category":"nature","emoji_order":"97"},{"name":"speak-no-evil monkey","shortname":":speak_no_evil:","category":"nature","emoji_order":"98"},{"name":"boy","shortname":":boy:","category":"people","emoji_order":"99"},{"name":"boy tone 1","shortname":":boy_tone1:","category":"people","emoji_order":"100"},{"name":"boy tone 2","shortname":":boy_tone2:","category":"people","emoji_order":"101"},{"name":"boy tone 3","shortname":":boy_tone3:","category":"people","emoji_order":"102"},{"name":"boy tone 4","shortname":":boy_tone4:","category":"people","emoji_order":"103"},{"name":"boy tone 5","shortname":":boy_tone5:","category":"people","emoji_order":"104"},{"name":"girl","shortname":":girl:","category":"people","emoji_order":"105"},{"name":"girl tone 1","shortname":":girl_tone1:","category":"people","emoji_order":"106"},{"name":"girl tone 2","shortname":":girl_tone2:","category":"people","emoji_order":"107"},{"name":"girl tone 3","shortname":":girl_tone3:","category":"people","emoji_order":"108"},{"name":"girl tone 4","shortname":":girl_tone4:","category":"people","emoji_order":"109"},{"name":"girl tone 5","shortname":":girl_tone5:","category":"people","emoji_order":"110"},{"name":"man","shortname":":man:","category":"people","emoji_order":"111"},{"name":"man tone 1","shortname":":man_tone1:","category":"people","emoji_order":"112"},{"name":"man tone 2","shortname":":man_tone2:","category":"people","emoji_order":"113"},{"name":"man tone 3","shortname":":man_tone3:","category":"people","emoji_order":"114"},{"name":"man tone 4","shortname":":man_tone4:","category":"people","emoji_order":"115"},{"name":"man tone 5","shortname":":man_tone5:","category":"people","emoji_order":"116"},{"name":"woman","shortname":":woman:","category":"people","emoji_order":"117"},{"name":"woman tone 1","shortname":":woman_tone1:","category":"people","emoji_order":"118"},{"name":"woman tone 2","shortname":":woman_tone2:","category":"people","emoji_order":"119"},{"name":"woman tone 3","shortname":":woman_tone3:","category":"people","emoji_order":"120"},{"name":"woman tone 4","shortname":":woman_tone4:","category":"people","emoji_order":"121"},{"name":"woman tone 5","shortname":":woman_tone5:","category":"people","emoji_order":"122"},{"name":"older man","shortname":":older_man:","category":"people","emoji_order":"123"},{"name":"older man tone 1","shortname":":older_man_tone1:","category":"people","emoji_order":"124"},{"name":"older man tone 2","shortname":":older_man_tone2:","category":"people","emoji_order":"125"},{"name":"older man tone 3","shortname":":older_man_tone3:","category":"people","emoji_order":"126"},{"name":"older man tone 4","shortname":":older_man_tone4:","category":"people","emoji_order":"127"},{"name":"older man tone 5","shortname":":older_man_tone5:","category":"people","emoji_order":"128"},{"name":"older woman","shortname":":older_woman:","category":"people","emoji_order":"129"},{"name":"older woman tone 1","shortname":":older_woman_tone1:","category":"people","emoji_order":"130"},{"name":"older woman tone 2","shortname":":older_woman_tone2:","category":"people","emoji_order":"131"},{"name":"older woman tone 3","shortname":":older_woman_tone3:","category":"people","emoji_order":"132"},{"name":"older woman tone 4","shortname":":older_woman_tone4:","category":"people","emoji_order":"133"},{"name":"older woman tone 5","shortname":":older_woman_tone5:","category":"people","emoji_order":"134"},{"name":"baby","shortname":":baby:","category":"people","emoji_order":"135"},{"name":"baby tone 1","shortname":":baby_tone1:","category":"people","emoji_order":"136"},{"name":"baby tone 2","shortname":":baby_tone2:","category":"people","emoji_order":"137"},{"name":"baby tone 3","shortname":":baby_tone3:","category":"people","emoji_order":"138"},{"name":"baby tone 4","shortname":":baby_tone4:","category":"people","emoji_order":"139"},{"name":"baby tone 5","shortname":":baby_tone5:","category":"people","emoji_order":"140"},{"name":"baby angel","shortname":":angel:","category":"people","emoji_order":"141"},{"name":"baby angel tone 1","shortname":":angel_tone1:","category":"people","emoji_order":"142"},{"name":"baby angel tone 2","shortname":":angel_tone2:","category":"people","emoji_order":"143"},{"name":"baby angel tone 3","shortname":":angel_tone3:","category":"people","emoji_order":"144"},{"name":"baby angel tone 4","shortname":":angel_tone4:","category":"people","emoji_order":"145"},{"name":"baby angel tone 5","shortname":":angel_tone5:","category":"people","emoji_order":"146"},{"name":"police officer","shortname":":cop:","category":"people","emoji_order":"339"},{"name":"police officer tone 1","shortname":":cop_tone1:","category":"people","emoji_order":"340"},{"name":"police officer tone 2","shortname":":cop_tone2:","category":"people","emoji_order":"341"},{"name":"police officer tone 3","shortname":":cop_tone3:","category":"people","emoji_order":"342"},{"name":"police officer tone 4","shortname":":cop_tone4:","category":"people","emoji_order":"343"},{"name":"police officer tone 5","shortname":":cop_tone5:","category":"people","emoji_order":"344"},{"name":"sleuth or spy","shortname":":spy:","category":"people","emoji_order":"357"},{"name":"sleuth or spy tone 1","shortname":":spy_tone1:","category":"people","emoji_order":"358"},{"name":"sleuth or spy tone 2","shortname":":spy_tone2:","category":"people","emoji_order":"359"},{"name":"sleuth or spy tone 3","shortname":":spy_tone3:","category":"people","emoji_order":"360"},{"name":"sleuth or spy tone 4","shortname":":spy_tone4:","category":"people","emoji_order":"361"},{"name":"sleuth or spy tone 5","shortname":":spy_tone5:","category":"people","emoji_order":"362"},{"name":"guardsman","shortname":":guardsman:","category":"people","emoji_order":"375"},{"name":"guardsman tone 1","shortname":":guardsman_tone1:","category":"people","emoji_order":"376"},{"name":"guardsman tone 2","shortname":":guardsman_tone2:","category":"people","emoji_order":"377"},{"name":"guardsman tone 3","shortname":":guardsman_tone3:","category":"people","emoji_order":"378"},{"name":"guardsman tone 4","shortname":":guardsman_tone4:","category":"people","emoji_order":"379"},{"name":"guardsman tone 5","shortname":":guardsman_tone5:","category":"people","emoji_order":"380"},{"name":"construction worker","shortname":":construction_worker:","category":"people","emoji_order":"393"},{"name":"construction worker tone 1","shortname":":construction_worker_tone1:","category":"people","emoji_order":"394"},{"name":"construction worker tone 2","shortname":":construction_worker_tone2:","category":"people","emoji_order":"395"},{"name":"construction worker tone 3","shortname":":construction_worker_tone3:","category":"people","emoji_order":"396"},{"name":"construction worker tone 4","shortname":":construction_worker_tone4:","category":"people","emoji_order":"397"},{"name":"construction worker tone 5","shortname":":construction_worker_tone5:","category":"people","emoji_order":"398"},{"name":"man with turban","shortname":":man_with_turban:","category":"people","emoji_order":"411"},{"name":"man with turban tone 1","shortname":":man_with_turban_tone1:","category":"people","emoji_order":"412"},{"name":"man with turban tone 2","shortname":":man_with_turban_tone2:","category":"people","emoji_order":"413"},{"name":"man with turban tone 3","shortname":":man_with_turban_tone3:","category":"people","emoji_order":"414"},{"name":"man with turban tone 4","shortname":":man_with_turban_tone4:","category":"people","emoji_order":"415"},{"name":"man with turban tone 5","shortname":":man_with_turban_tone5:","category":"people","emoji_order":"416"},{"name":"person with blond hair","shortname":":person_with_blond_hair:","category":"people","emoji_order":"429"},{"name":"person with blond hair tone 1","shortname":":person_with_blond_hair_tone1:","category":"people","emoji_order":"430"},{"name":"person with blond hair tone 2","shortname":":person_with_blond_hair_tone2:","category":"people","emoji_order":"431"},{"name":"person with blond hair tone 3","shortname":":person_with_blond_hair_tone3:","category":"people","emoji_order":"432"},{"name":"person with blond hair tone 4","shortname":":person_with_blond_hair_tone4:","category":"people","emoji_order":"433"},{"name":"person with blond hair tone 5","shortname":":person_with_blond_hair_tone5:","category":"people","emoji_order":"434"},{"name":"father christmas","shortname":":santa:","category":"people","emoji_order":"447"},{"name":"father christmas tone 1","shortname":":santa_tone1:","category":"people","emoji_order":"448"},{"name":"father christmas tone 2","shortname":":santa_tone2:","category":"people","emoji_order":"449"},{"name":"father christmas tone 3","shortname":":santa_tone3:","category":"people","emoji_order":"450"},{"name":"father christmas tone 4","shortname":":santa_tone4:","category":"people","emoji_order":"451"},{"name":"father christmas tone 5","shortname":":santa_tone5:","category":"people","emoji_order":"452"},{"name":"mother christmas","shortname":":mrs_claus:","category":"people","emoji_order":"453"},{"name":"mother christmas tone 1","shortname":":mrs_claus_tone1:","category":"people","emoji_order":"454"},{"name":"mother christmas tone 2","shortname":":mrs_claus_tone2:","category":"people","emoji_order":"455"},{"name":"mother christmas tone 3","shortname":":mrs_claus_tone3:","category":"people","emoji_order":"456"},{"name":"mother christmas tone 4","shortname":":mrs_claus_tone4:","category":"people","emoji_order":"457"},{"name":"mother christmas tone 5","shortname":":mrs_claus_tone5:","category":"people","emoji_order":"458"},{"name":"princess","shortname":":princess:","category":"people","emoji_order":"459"},{"name":"princess tone 1","shortname":":princess_tone1:","category":"people","emoji_order":"460"},{"name":"princess tone 2","shortname":":princess_tone2:","category":"people","emoji_order":"461"},{"name":"princess tone 3","shortname":":princess_tone3:","category":"people","emoji_order":"462"},{"name":"princess tone 4","shortname":":princess_tone4:","category":"people","emoji_order":"463"},{"name":"princess tone 5","shortname":":princess_tone5:","category":"people","emoji_order":"464"},{"name":"prince","shortname":":prince:","category":"people","emoji_order":"465"},{"name":"prince tone 1","shortname":":prince_tone1:","category":"people","emoji_order":"466"},{"name":"prince tone 2","shortname":":prince_tone2:","category":"people","emoji_order":"467"},{"name":"prince tone 3","shortname":":prince_tone3:","category":"people","emoji_order":"468"},{"name":"prince tone 4","shortname":":prince_tone4:","category":"people","emoji_order":"469"},{"name":"prince tone 5","shortname":":prince_tone5:","category":"people","emoji_order":"470"},{"name":"bride with veil","shortname":":bride_with_veil:","category":"people","emoji_order":"471"},{"name":"bride with veil tone 1","shortname":":bride_with_veil_tone1:","category":"people","emoji_order":"472"},{"name":"bride with veil tone 2","shortname":":bride_with_veil_tone2:","category":"people","emoji_order":"473"},{"name":"bride with veil tone 3","shortname":":bride_with_veil_tone3:","category":"people","emoji_order":"474"},{"name":"bride with veil tone 4","shortname":":bride_with_veil_tone4:","category":"people","emoji_order":"475"},{"name":"bride with veil tone 5","shortname":":bride_with_veil_tone5:","category":"people","emoji_order":"476"},{"name":"man in tuxedo","shortname":":man_in_tuxedo:","category":"people","emoji_order":"477"},{"name":"man in tuxedo tone 1","shortname":":man_in_tuxedo_tone1:","category":"people","emoji_order":"478"},{"name":"man in tuxedo tone 2","shortname":":man_in_tuxedo_tone2:","category":"people","emoji_order":"479"},{"name":"man in tuxedo tone 3","shortname":":man_in_tuxedo_tone3:","category":"people","emoji_order":"480"},{"name":"man in tuxedo tone 4","shortname":":man_in_tuxedo_tone4:","category":"people","emoji_order":"481"},{"name":"man in tuxedo tone 5","shortname":":man_in_tuxedo_tone5:","category":"people","emoji_order":"482"},{"name":"pregnant woman","shortname":":pregnant_woman:","category":"people","emoji_order":"483"},{"name":"pregnant woman tone 1","shortname":":pregnant_woman_tone1:","category":"people","emoji_order":"484"},{"name":"pregnant woman tone 2","shortname":":pregnant_woman_tone2:","category":"people","emoji_order":"485"},{"name":"pregnant woman tone 3","shortname":":pregnant_woman_tone3:","category":"people","emoji_order":"486"},{"name":"pregnant woman tone 4","shortname":":pregnant_woman_tone4:","category":"people","emoji_order":"487"},{"name":"pregnant woman tone 5","shortname":":pregnant_woman_tone5:","category":"people","emoji_order":"488"},{"name":"man with gua pi mao","shortname":":man_with_gua_pi_mao:","category":"people","emoji_order":"489"},{"name":"man with gua pi mao tone 1","shortname":":man_with_gua_pi_mao_tone1:","category":"people","emoji_order":"490"},{"name":"man with gua pi mao tone 2","shortname":":man_with_gua_pi_mao_tone2:","category":"people","emoji_order":"491"},{"name":"man with gua pi mao tone 3","shortname":":man_with_gua_pi_mao_tone3:","category":"people","emoji_order":"492"},{"name":"man with gua pi mao tone 4","shortname":":man_with_gua_pi_mao_tone4:","category":"people","emoji_order":"493"},{"name":"man with gua pi mao tone 5","shortname":":man_with_gua_pi_mao_tone5:","category":"people","emoji_order":"494"},{"name":"person frowning","shortname":":person_frowning:","category":"people","emoji_order":"495"},{"name":"person frowning tone 1","shortname":":person_frowning_tone1:","category":"people","emoji_order":"496"},{"name":"person frowning tone 2","shortname":":person_frowning_tone2:","category":"people","emoji_order":"497"},{"name":"person frowning tone 3","shortname":":person_frowning_tone3:","category":"people","emoji_order":"498"},{"name":"person frowning tone 4","shortname":":person_frowning_tone4:","category":"people","emoji_order":"499"},{"name":"person frowning tone 5","shortname":":person_frowning_tone5:","category":"people","emoji_order":"500"},{"name":"person with pouting face","shortname":":person_with_pouting_face:","category":"people","emoji_order":"513"},{"name":"person with pouting face tone1","shortname":":person_with_pouting_face_tone1:","category":"people","emoji_order":"514"},{"name":"person with pouting face tone2","shortname":":person_with_pouting_face_tone2:","category":"people","emoji_order":"515"},{"name":"person with pouting face tone3","shortname":":person_with_pouting_face_tone3:","category":"people","emoji_order":"516"},{"name":"person with pouting face tone4","shortname":":person_with_pouting_face_tone4:","category":"people","emoji_order":"517"},{"name":"person with pouting face tone5","shortname":":person_with_pouting_face_tone5:","category":"people","emoji_order":"518"},{"name":"face with no good gesture","shortname":":no_good:","category":"people","emoji_order":"531"},{"name":"face with no good gesture tone 1","shortname":":no_good_tone1:","category":"people","emoji_order":"532"},{"name":"face with no good gesture tone 2","shortname":":no_good_tone2:","category":"people","emoji_order":"533"},{"name":"face with no good gesture tone 3","shortname":":no_good_tone3:","category":"people","emoji_order":"534"},{"name":"face with no good gesture tone 4","shortname":":no_good_tone4:","category":"people","emoji_order":"535"},{"name":"face with no good gesture tone 5","shortname":":no_good_tone5:","category":"people","emoji_order":"536"},{"name":"face with ok gesture","shortname":":ok_woman:","category":"people","emoji_order":"549","aliases_ascii":["*\\0/*","\\0/","*\\O/*","\\O/"]},{"name":"face with ok gesture tone1","shortname":":ok_woman_tone1:","category":"people","emoji_order":"550"},{"name":"face with ok gesture tone2","shortname":":ok_woman_tone2:","category":"people","emoji_order":"551"},{"name":"face with ok gesture tone3","shortname":":ok_woman_tone3:","category":"people","emoji_order":"552"},{"name":"face with ok gesture tone4","shortname":":ok_woman_tone4:","category":"people","emoji_order":"553"},{"name":"face with ok gesture tone5","shortname":":ok_woman_tone5:","category":"people","emoji_order":"554"},{"name":"information desk person","shortname":":information_desk_person:","category":"people","emoji_order":"567"},{"name":"information desk person tone 1","shortname":":information_desk_person_tone1:","category":"people","emoji_order":"568"},{"name":"information desk person tone 2","shortname":":information_desk_person_tone2:","category":"people","emoji_order":"569"},{"name":"information desk person tone 3","shortname":":information_desk_person_tone3:","category":"people","emoji_order":"570"},{"name":"information desk person tone 4","shortname":":information_desk_person_tone4:","category":"people","emoji_order":"571"},{"name":"information desk person tone 5","shortname":":information_desk_person_tone5:","category":"people","emoji_order":"572"},{"name":"happy person raising one hand","shortname":":raising_hand:","category":"people","emoji_order":"585"},{"name":"happy person raising one hand tone1","shortname":":raising_hand_tone1:","category":"people","emoji_order":"586"},{"name":"happy person raising one hand tone2","shortname":":raising_hand_tone2:","category":"people","emoji_order":"587"},{"name":"happy person raising one hand tone3","shortname":":raising_hand_tone3:","category":"people","emoji_order":"588"},{"name":"happy person raising one hand tone4","shortname":":raising_hand_tone4:","category":"people","emoji_order":"589"},{"name":"happy person raising one hand tone5","shortname":":raising_hand_tone5:","category":"people","emoji_order":"590"},{"name":"person bowing deeply","shortname":":bow:","category":"people","emoji_order":"603"},{"name":"person bowing deeply tone 1","shortname":":bow_tone1:","category":"people","emoji_order":"604"},{"name":"person bowing deeply tone 2","shortname":":bow_tone2:","category":"people","emoji_order":"605"},{"name":"person bowing deeply tone 3","shortname":":bow_tone3:","category":"people","emoji_order":"606"},{"name":"person bowing deeply tone 4","shortname":":bow_tone4:","category":"people","emoji_order":"607"},{"name":"person bowing deeply tone 5","shortname":":bow_tone5:","category":"people","emoji_order":"608"},{"name":"face palm","shortname":":face_palm:","category":"people","emoji_order":"621"},{"name":"face palm tone 1","shortname":":face_palm_tone1:","category":"people","emoji_order":"622"},{"name":"face palm tone 2","shortname":":face_palm_tone2:","category":"people","emoji_order":"623"},{"name":"face palm tone 3","shortname":":face_palm_tone3:","category":"people","emoji_order":"624"},{"name":"face palm tone 4","shortname":":face_palm_tone4:","category":"people","emoji_order":"625"},{"name":"face palm tone 5","shortname":":face_palm_tone5:","category":"people","emoji_order":"626"},{"name":"shrug","shortname":":shrug:","category":"people","emoji_order":"639"},{"name":"shrug tone 1","shortname":":shrug_tone1:","category":"people","emoji_order":"640"},{"name":"shrug tone 2","shortname":":shrug_tone2:","category":"people","emoji_order":"641"},{"name":"shrug tone 3","shortname":":shrug_tone3:","category":"people","emoji_order":"642"},{"name":"shrug tone 4","shortname":":shrug_tone4:","category":"people","emoji_order":"643"},{"name":"shrug tone 5","shortname":":shrug_tone5:","category":"people","emoji_order":"644"},{"name":"face massage","shortname":":massage:","category":"people","emoji_order":"657"},{"name":"face massage tone 1","shortname":":massage_tone1:","category":"people","emoji_order":"658"},{"name":"face massage tone 2","shortname":":massage_tone2:","category":"people","emoji_order":"659"},{"name":"face massage tone 3","shortname":":massage_tone3:","category":"people","emoji_order":"660"},{"name":"face massage tone 4","shortname":":massage_tone4:","category":"people","emoji_order":"661"},{"name":"face massage tone 5","shortname":":massage_tone5:","category":"people","emoji_order":"662"},{"name":"haircut","shortname":":haircut:","category":"people","emoji_order":"675"},{"name":"haircut tone 1","shortname":":haircut_tone1:","category":"people","emoji_order":"676"},{"name":"haircut tone 2","shortname":":haircut_tone2:","category":"people","emoji_order":"677"},{"name":"haircut tone 3","shortname":":haircut_tone3:","category":"people","emoji_order":"678"},{"name":"haircut tone 4","shortname":":haircut_tone4:","category":"people","emoji_order":"679"},{"name":"haircut tone 5","shortname":":haircut_tone5:","category":"people","emoji_order":"680"},{"name":"pedestrian","shortname":":walking:","category":"people","emoji_order":"693"},{"name":"pedestrian tone 1","shortname":":walking_tone1:","category":"people","emoji_order":"694"},{"name":"pedestrian tone 2","shortname":":walking_tone2:","category":"people","emoji_order":"695"},{"name":"pedestrian tone 3","shortname":":walking_tone3:","category":"people","emoji_order":"696"},{"name":"pedestrian tone 4","shortname":":walking_tone4:","category":"people","emoji_order":"697"},{"name":"pedestrian tone 5","shortname":":walking_tone5:","category":"people","emoji_order":"698"},{"name":"runner","shortname":":runner:","category":"people","emoji_order":"711"},{"name":"runner tone 1","shortname":":runner_tone1:","category":"people","emoji_order":"712"},{"name":"runner tone 2","shortname":":runner_tone2:","category":"people","emoji_order":"713"},{"name":"runner tone 3","shortname":":runner_tone3:","category":"people","emoji_order":"714"},{"name":"runner tone 4","shortname":":runner_tone4:","category":"people","emoji_order":"715"},{"name":"runner tone 5","shortname":":runner_tone5:","category":"people","emoji_order":"716"},{"name":"dancer","shortname":":dancer:","category":"people","emoji_order":"729"},{"name":"dancer tone 1","shortname":":dancer_tone1:","category":"people","emoji_order":"730"},{"name":"dancer tone 2","shortname":":dancer_tone2:","category":"people","emoji_order":"731"},{"name":"dancer tone 3","shortname":":dancer_tone3:","category":"people","emoji_order":"732"},{"name":"dancer tone 4","shortname":":dancer_tone4:","category":"people","emoji_order":"733"},{"name":"dancer tone 5","shortname":":dancer_tone5:","category":"people","emoji_order":"734"},{"name":"man dancing","shortname":":man_dancing:","category":"people","emoji_order":"735"},{"name":"man dancing tone 1","shortname":":man_dancing_tone1:","category":"people","emoji_order":"736"},{"name":"man dancing tone 2","shortname":":man_dancing_tone2:","category":"people","emoji_order":"737"},{"name":"man dancing tone 3","shortname":":man_dancing_tone3:","category":"people","emoji_order":"738"},{"name":"man dancing tone 4","shortname":":man_dancing_tone4:","category":"people","emoji_order":"739"},{"name":"man dancing tone 5","shortname":":man_dancing_tone5:","category":"people","emoji_order":"740"},{"name":"woman with bunny ears","shortname":":dancers:","category":"people","emoji_order":"741"},{"name":"man in business suit levitating","shortname":":levitate:","category":"activity","emoji_order":"759"},{"name":"speaking head in silhouette","shortname":":speaking_head:","category":"people","emoji_order":"765"},{"name":"bust in silhouette","shortname":":bust_in_silhouette:","category":"people","emoji_order":"766"},{"name":"busts in silhouette","shortname":":busts_in_silhouette:","category":"people","emoji_order":"767"},{"name":"fencer","shortname":":fencer:","category":"activity","emoji_order":"768"},{"name":"horse racing","shortname":":horse_racing:","category":"activity","emoji_order":"769"},{"name":"horse racing tone 1","shortname":":horse_racing_tone1:","category":"activity","emoji_order":"770"},{"name":"horse racing tone 2","shortname":":horse_racing_tone2:","category":"activity","emoji_order":"771"},{"name":"horse racing tone 3","shortname":":horse_racing_tone3:","category":"activity","emoji_order":"772"},{"name":"horse racing tone 4","shortname":":horse_racing_tone4:","category":"activity","emoji_order":"773"},{"name":"horse racing tone 5","shortname":":horse_racing_tone5:","category":"activity","emoji_order":"774"},{"name":"skier","shortname":":skier:","category":"activity","emoji_order":"775"},{"name":"snowboarder","shortname":":snowboarder:","category":"activity","emoji_order":"776"},{"name":"golfer","shortname":":golfer:","category":"activity","emoji_order":"782"},{"name":"surfer","shortname":":surfer:","category":"activity","emoji_order":"800"},{"name":"surfer tone 1","shortname":":surfer_tone1:","category":"activity","emoji_order":"801"},{"name":"surfer tone 2","shortname":":surfer_tone2:","category":"activity","emoji_order":"802"},{"name":"surfer tone 3","shortname":":surfer_tone3:","category":"activity","emoji_order":"803"},{"name":"surfer tone 4","shortname":":surfer_tone4:","category":"activity","emoji_order":"804"},{"name":"surfer tone 5","shortname":":surfer_tone5:","category":"activity","emoji_order":"805"},{"name":"rowboat","shortname":":rowboat:","category":"activity","emoji_order":"818"},{"name":"rowboat tone 1","shortname":":rowboat_tone1:","category":"activity","emoji_order":"819"},{"name":"rowboat tone 2","shortname":":rowboat_tone2:","category":"activity","emoji_order":"820"},{"name":"rowboat tone 3","shortname":":rowboat_tone3:","category":"activity","emoji_order":"821"},{"name":"rowboat tone 4","shortname":":rowboat_tone4:","category":"activity","emoji_order":"822"},{"name":"rowboat tone 5","shortname":":rowboat_tone5:","category":"activity","emoji_order":"823"},{"name":"swimmer","shortname":":swimmer:","category":"activity","emoji_order":"836"},{"name":"swimmer tone 1","shortname":":swimmer_tone1:","category":"activity","emoji_order":"837"},{"name":"swimmer tone 2","shortname":":swimmer_tone2:","category":"activity","emoji_order":"838"},{"name":"swimmer tone 3","shortname":":swimmer_tone3:","category":"activity","emoji_order":"839"},{"name":"swimmer tone 4","shortname":":swimmer_tone4:","category":"activity","emoji_order":"840"},{"name":"swimmer tone 5","shortname":":swimmer_tone5:","category":"activity","emoji_order":"841"},{"name":"person with ball","shortname":":basketball_player:","category":"activity","emoji_order":"854"},{"name":"person with ball tone 1","shortname":":basketball_player_tone1:","category":"activity","emoji_order":"855"},{"name":"person with ball tone 2","shortname":":basketball_player_tone2:","category":"activity","emoji_order":"856"},{"name":"person with ball tone 3","shortname":":basketball_player_tone3:","category":"activity","emoji_order":"857"},{"name":"person with ball tone 4","shortname":":basketball_player_tone4:","category":"activity","emoji_order":"858"},{"name":"person with ball tone 5","shortname":":basketball_player_tone5:","category":"activity","emoji_order":"859"},{"name":"weight lifter","shortname":":lifter:","category":"activity","emoji_order":"872"},{"name":"weight lifter tone 1","shortname":":lifter_tone1:","category":"activity","emoji_order":"873"},{"name":"weight lifter tone 2","shortname":":lifter_tone2:","category":"activity","emoji_order":"874"},{"name":"weight lifter tone 3","shortname":":lifter_tone3:","category":"activity","emoji_order":"875"},{"name":"weight lifter tone 4","shortname":":lifter_tone4:","category":"activity","emoji_order":"876"},{"name":"weight lifter tone 5","shortname":":lifter_tone5:","category":"activity","emoji_order":"877"},{"name":"bicyclist","shortname":":bicyclist:","category":"activity","emoji_order":"890"},{"name":"bicyclist tone 1","shortname":":bicyclist_tone1:","category":"activity","emoji_order":"891"},{"name":"bicyclist tone 2","shortname":":bicyclist_tone2:","category":"activity","emoji_order":"892"},{"name":"bicyclist tone 3","shortname":":bicyclist_tone3:","category":"activity","emoji_order":"893"},{"name":"bicyclist tone 4","shortname":":bicyclist_tone4:","category":"activity","emoji_order":"894"},{"name":"bicyclist tone 5","shortname":":bicyclist_tone5:","category":"activity","emoji_order":"895"},{"name":"mountain bicyclist","shortname":":mountain_bicyclist:","category":"activity","emoji_order":"908"},{"name":"mountain bicyclist tone 1","shortname":":mountain_bicyclist_tone1:","category":"activity","emoji_order":"909"},{"name":"mountain bicyclist tone 2","shortname":":mountain_bicyclist_tone2:","category":"activity","emoji_order":"910"},{"name":"mountain bicyclist tone 3","shortname":":mountain_bicyclist_tone3:","category":"activity","emoji_order":"911"},{"name":"mountain bicyclist tone 4","shortname":":mountain_bicyclist_tone4:","category":"activity","emoji_order":"912"},{"name":"mountain bicyclist tone 5","shortname":":mountain_bicyclist_tone5:","category":"activity","emoji_order":"913"},{"name":"racing car","shortname":":race_car:","category":"travel","emoji_order":"926"},{"name":"racing motorcycle","shortname":":motorcycle:","category":"travel","emoji_order":"927"},{"name":"person doing cartwheel","shortname":":cartwheel:","category":"activity","emoji_order":"928"},{"name":"person doing cartwheel tone 1","shortname":":cartwheel_tone1:","category":"activity","emoji_order":"929"},{"name":"person doing cartwheel tone 2","shortname":":cartwheel_tone2:","category":"activity","emoji_order":"930"},{"name":"person doing cartwheel tone 3","shortname":":cartwheel_tone3:","category":"activity","emoji_order":"931"},{"name":"person doing cartwheel tone 4","shortname":":cartwheel_tone4:","category":"activity","emoji_order":"932"},{"name":"person doing cartwheel tone 5","shortname":":cartwheel_tone5:","category":"activity","emoji_order":"933"},{"name":"wrestlers","shortname":":wrestlers:","category":"activity","emoji_order":"946"},{"name":"wrestlers tone 1","shortname":":wrestlers_tone1:","category":"activity","emoji_order":"947"},{"name":"wrestlers tone 2","shortname":":wrestlers_tone2:","category":"activity","emoji_order":"948"},{"name":"wrestlers tone 3","shortname":":wrestlers_tone3:","category":"activity","emoji_order":"949"},{"name":"wrestlers tone 4","shortname":":wrestlers_tone4:","category":"activity","emoji_order":"950"},{"name":"wrestlers tone 5","shortname":":wrestlers_tone5:","category":"activity","emoji_order":"951"},{"name":"water polo","shortname":":water_polo:","category":"activity","emoji_order":"964"},{"name":"water polo tone 1","shortname":":water_polo_tone1:","category":"activity","emoji_order":"965"},{"name":"water polo tone 2","shortname":":water_polo_tone2:","category":"activity","emoji_order":"966"},{"name":"water polo tone 3","shortname":":water_polo_tone3:","category":"activity","emoji_order":"967"},{"name":"water polo tone 4","shortname":":water_polo_tone4:","category":"activity","emoji_order":"968"},{"name":"water polo tone 5","shortname":":water_polo_tone5:","category":"activity","emoji_order":"969"},{"name":"handball","shortname":":handball:","category":"activity","emoji_order":"982"},{"name":"handball tone 1","shortname":":handball_tone1:","category":"activity","emoji_order":"983"},{"name":"handball tone 2","shortname":":handball_tone2:","category":"activity","emoji_order":"984"},{"name":"handball tone 3","shortname":":handball_tone3:","category":"activity","emoji_order":"985"},{"name":"handball tone 4","shortname":":handball_tone4:","category":"activity","emoji_order":"986"},{"name":"handball tone 5","shortname":":handball_tone5:","category":"activity","emoji_order":"987"},{"name":"juggling","shortname":":juggling:","category":"activity","emoji_order":"1000"},{"name":"juggling tone 1","shortname":":juggling_tone1:","category":"activity","emoji_order":"1001"},{"name":"juggling tone 2","shortname":":juggling_tone2:","category":"activity","emoji_order":"1002"},{"name":"juggling tone 3","shortname":":juggling_tone3:","category":"activity","emoji_order":"1003"},{"name":"juggling tone 4","shortname":":juggling_tone4:","category":"activity","emoji_order":"1004"},{"name":"juggling tone 5","shortname":":juggling_tone5:","category":"activity","emoji_order":"1005"},{"name":"man and woman holding hands","shortname":":couple:","category":"people","emoji_order":"1018"},{"name":"two men holding hands","shortname":":two_men_holding_hands:","category":"people","emoji_order":"1024"},{"name":"two women holding hands","shortname":":two_women_holding_hands:","category":"people","emoji_order":"1030"},{"name":"kiss","shortname":":couplekiss:","category":"people","emoji_order":"1036"},{"name":"kiss (man,man)","shortname":":kiss_mm:","category":"people","emoji_order":"1038"},{"name":"kiss (woman,woman)","shortname":":kiss_ww:","category":"people","emoji_order":"1039"},{"name":"couple with heart","shortname":":couple_with_heart:","category":"people","emoji_order":"1040"},{"name":"couple (man,man)","shortname":":couple_mm:","category":"people","emoji_order":"1042"},{"name":"couple (woman,woman)","shortname":":couple_ww:","category":"people","emoji_order":"1043"},{"name":"family","shortname":":family:","category":"people","emoji_order":"1044"},{"name":"family (man,woman,girl)","shortname":":family_mwg:","category":"people","emoji_order":"1051"},{"name":"family (man,woman,girl,boy)","shortname":":family_mwgb:","category":"people","emoji_order":"1052"},{"name":"family (man,woman,boy,boy)","shortname":":family_mwbb:","category":"people","emoji_order":"1053"},{"name":"family (man,woman,girl,girl)","shortname":":family_mwgg:","category":"people","emoji_order":"1054"},{"name":"family (man,man,boy)","shortname":":family_mmb:","category":"people","emoji_order":"1055"},{"name":"family (man,man,girl)","shortname":":family_mmg:","category":"people","emoji_order":"1056"},{"name":"family (man,man,girl,boy)","shortname":":family_mmgb:","category":"people","emoji_order":"1057"},{"name":"family (man,man,boy,boy)","shortname":":family_mmbb:","category":"people","emoji_order":"1058"},{"name":"family (man,man,girl,girl)","shortname":":family_mmgg:","category":"people","emoji_order":"1059"},{"name":"family (woman,woman,boy)","shortname":":family_wwb:","category":"people","emoji_order":"1060"},{"name":"family (woman,woman,girl)","shortname":":family_wwg:","category":"people","emoji_order":"1061"},{"name":"family (woman,woman,girl,boy)","shortname":":family_wwgb:","category":"people","emoji_order":"1062"},{"name":"family (woman,woman,boy,boy)","shortname":":family_wwbb:","category":"people","emoji_order":"1063"},{"name":"family (woman,woman,girl,girl)","shortname":":family_wwgg:","category":"people","emoji_order":"1064"},{"name":"emoji modifier Fitzpatrick type-1-2","shortname":":tone1:","category":"modifier","emoji_order":"1075"},{"name":"emoji modifier Fitzpatrick type-3","shortname":":tone2:","category":"modifier","emoji_order":"1076"},{"name":"emoji modifier Fitzpatrick type-4","shortname":":tone3:","category":"modifier","emoji_order":"1077"},{"name":"emoji modifier Fitzpatrick type-5","shortname":":tone4:","category":"modifier","emoji_order":"1078"},{"name":"emoji modifier Fitzpatrick type-6","shortname":":tone5:","category":"modifier","emoji_order":"1079"},{"name":"flexed biceps","shortname":":muscle:","category":"people","emoji_order":"1080"},{"name":"flexed biceps tone 1","shortname":":muscle_tone1:","category":"people","emoji_order":"1081"},{"name":"flexed biceps tone 2","shortname":":muscle_tone2:","category":"people","emoji_order":"1082"},{"name":"flexed biceps tone 3","shortname":":muscle_tone3:","category":"people","emoji_order":"1083"},{"name":"flexed biceps tone 4","shortname":":muscle_tone4:","category":"people","emoji_order":"1084"},{"name":"flexed biceps tone 5","shortname":":muscle_tone5:","category":"people","emoji_order":"1085"},{"name":"selfie","shortname":":selfie:","category":"people","emoji_order":"1086"},{"name":"selfie tone 1","shortname":":selfie_tone1:","category":"people","emoji_order":"1087"},{"name":"selfie tone 2","shortname":":selfie_tone2:","category":"people","emoji_order":"1088"},{"name":"selfie tone 3","shortname":":selfie_tone3:","category":"people","emoji_order":"1089"},{"name":"selfie tone 4","shortname":":selfie_tone4:","category":"people","emoji_order":"1090"},{"name":"selfie tone 5","shortname":":selfie_tone5:","category":"people","emoji_order":"1091"},{"name":"white left pointing backhand index","shortname":":point_left:","category":"people","emoji_order":"1092"},{"name":"white left pointing backhand index tone 1","shortname":":point_left_tone1:","category":"people","emoji_order":"1093"},{"name":"white left pointing backhand index tone 2","shortname":":point_left_tone2:","category":"people","emoji_order":"1094"},{"name":"white left pointing backhand index tone 3","shortname":":point_left_tone3:","category":"people","emoji_order":"1095"},{"name":"white left pointing backhand index tone 4","shortname":":point_left_tone4:","category":"people","emoji_order":"1096"},{"name":"white left pointing backhand index tone 5","shortname":":point_left_tone5:","category":"people","emoji_order":"1097"},{"name":"white right pointing backhand index","shortname":":point_right:","category":"people","emoji_order":"1098"},{"name":"white right pointing backhand index tone 1","shortname":":point_right_tone1:","category":"people","emoji_order":"1099"},{"name":"white right pointing backhand index tone 2","shortname":":point_right_tone2:","category":"people","emoji_order":"1100"},{"name":"white right pointing backhand index tone 3","shortname":":point_right_tone3:","category":"people","emoji_order":"1101"},{"name":"white right pointing backhand index tone 4","shortname":":point_right_tone4:","category":"people","emoji_order":"1102"},{"name":"white right pointing backhand index tone 5","shortname":":point_right_tone5:","category":"people","emoji_order":"1103"},{"name":"white up pointing index","shortname":":point_up:","category":"people","emoji_order":"1104"},{"name":"white up pointing index tone 1","shortname":":point_up_tone1:","category":"people","emoji_order":"1105"},{"name":"white up pointing index tone 2","shortname":":point_up_tone2:","category":"people","emoji_order":"1106"},{"name":"white up pointing index tone 3","shortname":":point_up_tone3:","category":"people","emoji_order":"1107"},{"name":"white up pointing index tone 4","shortname":":point_up_tone4:","category":"people","emoji_order":"1108"},{"name":"white up pointing index tone 5","shortname":":point_up_tone5:","category":"people","emoji_order":"1109"},{"name":"white up pointing backhand index","shortname":":point_up_2:","category":"people","emoji_order":"1110"},{"name":"white up pointing backhand index tone 1","shortname":":point_up_2_tone1:","category":"people","emoji_order":"1111"},{"name":"white up pointing backhand index tone 2","shortname":":point_up_2_tone2:","category":"people","emoji_order":"1112"},{"name":"white up pointing backhand index tone 3","shortname":":point_up_2_tone3:","category":"people","emoji_order":"1113"},{"name":"white up pointing backhand index tone 4","shortname":":point_up_2_tone4:","category":"people","emoji_order":"1114"},{"name":"white up pointing backhand index tone 5","shortname":":point_up_2_tone5:","category":"people","emoji_order":"1115"},{"name":"reversed hand with middle finger extended","shortname":":middle_finger:","category":"people","emoji_order":"1116"},{"name":"reversed hand with middle finger extended tone 1","shortname":":middle_finger_tone1:","category":"people","emoji_order":"1117"},{"name":"reversed hand with middle finger extended tone 2","shortname":":middle_finger_tone2:","category":"people","emoji_order":"1118"},{"name":"reversed hand with middle finger extended tone 3","shortname":":middle_finger_tone3:","category":"people","emoji_order":"1119"},{"name":"reversed hand with middle finger extended tone 4","shortname":":middle_finger_tone4:","category":"people","emoji_order":"1120"},{"name":"reversed hand with middle finger extended tone 5","shortname":":middle_finger_tone5:","category":"people","emoji_order":"1121"},{"name":"white down pointing backhand index","shortname":":point_down:","category":"people","emoji_order":"1122"},{"name":"white down pointing backhand index tone 1","shortname":":point_down_tone1:","category":"people","emoji_order":"1123"},{"name":"white down pointing backhand index tone 2","shortname":":point_down_tone2:","category":"people","emoji_order":"1124"},{"name":"white down pointing backhand index tone 3","shortname":":point_down_tone3:","category":"people","emoji_order":"1125"},{"name":"white down pointing backhand index tone 4","shortname":":point_down_tone4:","category":"people","emoji_order":"1126"},{"name":"white down pointing backhand index tone 5","shortname":":point_down_tone5:","category":"people","emoji_order":"1127"},{"name":"victory hand","shortname":":v:","category":"people","emoji_order":"1128"},{"name":"victory hand tone 1","shortname":":v_tone1:","category":"people","emoji_order":"1129"},{"name":"victory hand tone 2","shortname":":v_tone2:","category":"people","emoji_order":"1130"},{"name":"victory hand tone 3","shortname":":v_tone3:","category":"people","emoji_order":"1131"},{"name":"victory hand tone 4","shortname":":v_tone4:","category":"people","emoji_order":"1132"},{"name":"victory hand tone 5","shortname":":v_tone5:","category":"people","emoji_order":"1133"},{"name":"hand with first and index finger crossed","shortname":":fingers_crossed:","category":"people","emoji_order":"1134"},{"name":"hand with index and middle fingers crossed tone 1","shortname":":fingers_crossed_tone1:","category":"people","emoji_order":"1135"},{"name":"hand with index and middle fingers crossed tone 2","shortname":":fingers_crossed_tone2:","category":"people","emoji_order":"1136"},{"name":"hand with index and middle fingers crossed tone 3","shortname":":fingers_crossed_tone3:","category":"people","emoji_order":"1137"},{"name":"hand with index and middle fingers crossed tone 4","shortname":":fingers_crossed_tone4:","category":"people","emoji_order":"1138"},{"name":"hand with index and middle fingers crossed tone 5","shortname":":fingers_crossed_tone5:","category":"people","emoji_order":"1139"},{"name":"raised hand with part between middle and ring fingers","shortname":":vulcan:","category":"people","emoji_order":"1140"},{"name":"raised hand with part between middle and ring fingers tone 1","shortname":":vulcan_tone1:","category":"people","emoji_order":"1141"},{"name":"raised hand with part between middle and ring fingers tone 2","shortname":":vulcan_tone2:","category":"people","emoji_order":"1142"},{"name":"raised hand with part between middle and ring fingers tone 3","shortname":":vulcan_tone3:","category":"people","emoji_order":"1143"},{"name":"raised hand with part between middle and ring fingers tone 4","shortname":":vulcan_tone4:","category":"people","emoji_order":"1144"},{"name":"raised hand with part between middle and ring fingers tone 5","shortname":":vulcan_tone5:","category":"people","emoji_order":"1145"},{"name":"sign of the horns","shortname":":metal:","category":"people","emoji_order":"1146"},{"name":"sign of the horns tone 1","shortname":":metal_tone1:","category":"people","emoji_order":"1147"},{"name":"sign of the horns tone 2","shortname":":metal_tone2:","category":"people","emoji_order":"1148"},{"name":"sign of the horns tone 3","shortname":":metal_tone3:","category":"people","emoji_order":"1149"},{"name":"sign of the horns tone 4","shortname":":metal_tone4:","category":"people","emoji_order":"1150"},{"name":"sign of the horns tone 5","shortname":":metal_tone5:","category":"people","emoji_order":"1151"},{"name":"call me hand","shortname":":call_me:","category":"people","emoji_order":"1152"},{"name":"call me hand tone 1","shortname":":call_me_tone1:","category":"people","emoji_order":"1153"},{"name":"call me hand tone 2","shortname":":call_me_tone2:","category":"people","emoji_order":"1154"},{"name":"call me hand tone 3","shortname":":call_me_tone3:","category":"people","emoji_order":"1155"},{"name":"call me hand tone 4","shortname":":call_me_tone4:","category":"people","emoji_order":"1156"},{"name":"call me hand tone 5","shortname":":call_me_tone5:","category":"people","emoji_order":"1157"},{"name":"raised hand with fingers splayed","shortname":":hand_splayed:","category":"people","emoji_order":"1158"},{"name":"raised hand with fingers splayed tone 1","shortname":":hand_splayed_tone1:","category":"people","emoji_order":"1159"},{"name":"raised hand with fingers splayed tone 2","shortname":":hand_splayed_tone2:","category":"people","emoji_order":"1160"},{"name":"raised hand with fingers splayed tone 3","shortname":":hand_splayed_tone3:","category":"people","emoji_order":"1161"},{"name":"raised hand with fingers splayed tone 4","shortname":":hand_splayed_tone4:","category":"people","emoji_order":"1162"},{"name":"raised hand with fingers splayed tone 5","shortname":":hand_splayed_tone5:","category":"people","emoji_order":"1163"},{"name":"raised hand","shortname":":raised_hand:","category":"people","emoji_order":"1164"},{"name":"raised hand tone 1","shortname":":raised_hand_tone1:","category":"people","emoji_order":"1165"},{"name":"raised hand tone 2","shortname":":raised_hand_tone2:","category":"people","emoji_order":"1166"},{"name":"raised hand tone 3","shortname":":raised_hand_tone3:","category":"people","emoji_order":"1167"},{"name":"raised hand tone 4","shortname":":raised_hand_tone4:","category":"people","emoji_order":"1168"},{"name":"raised hand tone 5","shortname":":raised_hand_tone5:","category":"people","emoji_order":"1169"},{"name":"ok hand sign","shortname":":ok_hand:","category":"people","emoji_order":"1170"},{"name":"ok hand sign tone 1","shortname":":ok_hand_tone1:","category":"people","emoji_order":"1171"},{"name":"ok hand sign tone 2","shortname":":ok_hand_tone2:","category":"people","emoji_order":"1172"},{"name":"ok hand sign tone 3","shortname":":ok_hand_tone3:","category":"people","emoji_order":"1173"},{"name":"ok hand sign tone 4","shortname":":ok_hand_tone4:","category":"people","emoji_order":"1174"},{"name":"ok hand sign tone 5","shortname":":ok_hand_tone5:","category":"people","emoji_order":"1175"},{"name":"thumbs up sign","shortname":":thumbsup:","category":"people","emoji_order":"1176"},{"name":"thumbs up sign tone 1","shortname":":thumbsup_tone1:","category":"people","emoji_order":"1177"},{"name":"thumbs up sign tone 2","shortname":":thumbsup_tone2:","category":"people","emoji_order":"1178"},{"name":"thumbs up sign tone 3","shortname":":thumbsup_tone3:","category":"people","emoji_order":"1179"},{"name":"thumbs up sign tone 4","shortname":":thumbsup_tone4:","category":"people","emoji_order":"1180"},{"name":"thumbs up sign tone 5","shortname":":thumbsup_tone5:","category":"people","emoji_order":"1181"},{"name":"thumbs down sign","shortname":":thumbsdown:","category":"people","emoji_order":"1182"},{"name":"thumbs down sign tone 1","shortname":":thumbsdown_tone1:","category":"people","emoji_order":"1183"},{"name":"thumbs down sign tone 2","shortname":":thumbsdown_tone2:","category":"people","emoji_order":"1184"},{"name":"thumbs down sign tone 3","shortname":":thumbsdown_tone3:","category":"people","emoji_order":"1185"},{"name":"thumbs down sign tone 4","shortname":":thumbsdown_tone4:","category":"people","emoji_order":"1186"},{"name":"thumbs down sign tone 5","shortname":":thumbsdown_tone5:","category":"people","emoji_order":"1187"},{"name":"raised fist","shortname":":fist:","category":"people","emoji_order":"1188"},{"name":"raised fist tone 1","shortname":":fist_tone1:","category":"people","emoji_order":"1189"},{"name":"raised fist tone 2","shortname":":fist_tone2:","category":"people","emoji_order":"1190"},{"name":"raised fist tone 3","shortname":":fist_tone3:","category":"people","emoji_order":"1191"},{"name":"raised fist tone 4","shortname":":fist_tone4:","category":"people","emoji_order":"1192"},{"name":"raised fist tone 5","shortname":":fist_tone5:","category":"people","emoji_order":"1193"},{"name":"fisted hand sign","shortname":":punch:","category":"people","emoji_order":"1194"},{"name":"fisted hand sign tone 1","shortname":":punch_tone1:","category":"people","emoji_order":"1195"},{"name":"fisted hand sign tone 2","shortname":":punch_tone2:","category":"people","emoji_order":"1196"},{"name":"fisted hand sign tone 3","shortname":":punch_tone3:","category":"people","emoji_order":"1197"},{"name":"fisted hand sign tone 4","shortname":":punch_tone4:","category":"people","emoji_order":"1198"},{"name":"fisted hand sign tone 5","shortname":":punch_tone5:","category":"people","emoji_order":"1199"},{"name":"left-facing fist","shortname":":left_facing_fist:","category":"people","emoji_order":"1200"},{"name":"left facing fist tone 1","shortname":":left_facing_fist_tone1:","category":"people","emoji_order":"1201"},{"name":"left facing fist tone 2","shortname":":left_facing_fist_tone2:","category":"people","emoji_order":"1202"},{"name":"left facing fist tone 3","shortname":":left_facing_fist_tone3:","category":"people","emoji_order":"1203"},{"name":"left facing fist tone 4","shortname":":left_facing_fist_tone4:","category":"people","emoji_order":"1204"},{"name":"left facing fist tone 5","shortname":":left_facing_fist_tone5:","category":"people","emoji_order":"1205"},{"name":"right-facing fist","shortname":":right_facing_fist:","category":"people","emoji_order":"1206"},{"name":"right facing fist tone 1","shortname":":right_facing_fist_tone1:","category":"people","emoji_order":"1207"},{"name":"right facing fist tone 2","shortname":":right_facing_fist_tone2:","category":"people","emoji_order":"1208"},{"name":"right facing fist tone 3","shortname":":right_facing_fist_tone3:","category":"people","emoji_order":"1209"},{"name":"right facing fist tone 4","shortname":":right_facing_fist_tone4:","category":"people","emoji_order":"1210"},{"name":"right facing fist tone 5","shortname":":right_facing_fist_tone5:","category":"people","emoji_order":"1211"},{"name":"raised back of hand","shortname":":raised_back_of_hand:","category":"people","emoji_order":"1212"},{"name":"raised back of hand tone 1","shortname":":raised_back_of_hand_tone1:","category":"people","emoji_order":"1213"},{"name":"raised back of hand tone 2","shortname":":raised_back_of_hand_tone2:","category":"people","emoji_order":"1214"},{"name":"raised back of hand tone 3","shortname":":raised_back_of_hand_tone3:","category":"people","emoji_order":"1215"},{"name":"raised back of hand tone 4","shortname":":raised_back_of_hand_tone4:","category":"people","emoji_order":"1216"},{"name":"raised back of hand tone 5","shortname":":raised_back_of_hand_tone5:","category":"people","emoji_order":"1217"},{"name":"waving hand sign","shortname":":wave:","category":"people","emoji_order":"1218"},{"name":"waving hand sign tone 1","shortname":":wave_tone1:","category":"people","emoji_order":"1219"},{"name":"waving hand sign tone 2","shortname":":wave_tone2:","category":"people","emoji_order":"1220"},{"name":"waving hand sign tone 3","shortname":":wave_tone3:","category":"people","emoji_order":"1221"},{"name":"waving hand sign tone 4","shortname":":wave_tone4:","category":"people","emoji_order":"1222"},{"name":"waving hand sign tone 5","shortname":":wave_tone5:","category":"people","emoji_order":"1223"},{"name":"clapping hands sign","shortname":":clap:","category":"people","emoji_order":"1224"},{"name":"clapping hands sign tone 1","shortname":":clap_tone1:","category":"people","emoji_order":"1225"},{"name":"clapping hands sign tone 2","shortname":":clap_tone2:","category":"people","emoji_order":"1226"},{"name":"clapping hands sign tone 3","shortname":":clap_tone3:","category":"people","emoji_order":"1227"},{"name":"clapping hands sign tone 4","shortname":":clap_tone4:","category":"people","emoji_order":"1228"},{"name":"clapping hands sign tone 5","shortname":":clap_tone5:","category":"people","emoji_order":"1229"},{"name":"writing hand","shortname":":writing_hand:","category":"people","emoji_order":"1230"},{"name":"writing hand tone 1","shortname":":writing_hand_tone1:","category":"people","emoji_order":"1231"},{"name":"writing hand tone 2","shortname":":writing_hand_tone2:","category":"people","emoji_order":"1232"},{"name":"writing hand tone 3","shortname":":writing_hand_tone3:","category":"people","emoji_order":"1233"},{"name":"writing hand tone 4","shortname":":writing_hand_tone4:","category":"people","emoji_order":"1234"},{"name":"writing hand tone 5","shortname":":writing_hand_tone5:","category":"people","emoji_order":"1235"},{"name":"open hands sign","shortname":":open_hands:","category":"people","emoji_order":"1236"},{"name":"open hands sign tone 1","shortname":":open_hands_tone1:","category":"people","emoji_order":"1237"},{"name":"open hands sign tone 2","shortname":":open_hands_tone2:","category":"people","emoji_order":"1238"},{"name":"open hands sign tone 3","shortname":":open_hands_tone3:","category":"people","emoji_order":"1239"},{"name":"open hands sign tone 4","shortname":":open_hands_tone4:","category":"people","emoji_order":"1240"},{"name":"open hands sign tone 5","shortname":":open_hands_tone5:","category":"people","emoji_order":"1241"},{"name":"person raising both hands in celebration","shortname":":raised_hands:","category":"people","emoji_order":"1242"},{"name":"person raising both hands in celebration tone 1","shortname":":raised_hands_tone1:","category":"people","emoji_order":"1243"},{"name":"person raising both hands in celebration tone 2","shortname":":raised_hands_tone2:","category":"people","emoji_order":"1244"},{"name":"person raising both hands in celebration tone 3","shortname":":raised_hands_tone3:","category":"people","emoji_order":"1245"},{"name":"person raising both hands in celebration tone 4","shortname":":raised_hands_tone4:","category":"people","emoji_order":"1246"},{"name":"person raising both hands in celebration tone 5","shortname":":raised_hands_tone5:","category":"people","emoji_order":"1247"},{"name":"person with folded hands","shortname":":pray:","category":"people","emoji_order":"1248"},{"name":"person with folded hands tone 1","shortname":":pray_tone1:","category":"people","emoji_order":"1249"},{"name":"person with folded hands tone 2","shortname":":pray_tone2:","category":"people","emoji_order":"1250"},{"name":"person with folded hands tone 3","shortname":":pray_tone3:","category":"people","emoji_order":"1251"},{"name":"person with folded hands tone 4","shortname":":pray_tone4:","category":"people","emoji_order":"1252"},{"name":"person with folded hands tone 5","shortname":":pray_tone5:","category":"people","emoji_order":"1253"},{"name":"handshake","shortname":":handshake:","category":"people","emoji_order":"1254"},{"name":"handshake tone 1","shortname":":handshake_tone1:","category":"people","emoji_order":"1255"},{"name":"handshake tone 2","shortname":":handshake_tone2:","category":"people","emoji_order":"1256"},{"name":"handshake tone 3","shortname":":handshake_tone3:","category":"people","emoji_order":"1257"},{"name":"handshake tone 4","shortname":":handshake_tone4:","category":"people","emoji_order":"1258"},{"name":"handshake tone 5","shortname":":handshake_tone5:","category":"people","emoji_order":"1259"},{"name":"nail polish","shortname":":nail_care:","category":"people","emoji_order":"1260"},{"name":"nail polish tone 1","shortname":":nail_care_tone1:","category":"people","emoji_order":"1261"},{"name":"nail polish tone 2","shortname":":nail_care_tone2:","category":"people","emoji_order":"1262"},{"name":"nail polish tone 3","shortname":":nail_care_tone3:","category":"people","emoji_order":"1263"},{"name":"nail polish tone 4","shortname":":nail_care_tone4:","category":"people","emoji_order":"1264"},{"name":"nail polish tone 5","shortname":":nail_care_tone5:","category":"people","emoji_order":"1265"},{"name":"ear","shortname":":ear:","category":"people","emoji_order":"1266"},{"name":"ear tone 1","shortname":":ear_tone1:","category":"people","emoji_order":"1267"},{"name":"ear tone 2","shortname":":ear_tone2:","category":"people","emoji_order":"1268"},{"name":"ear tone 3","shortname":":ear_tone3:","category":"people","emoji_order":"1269"},{"name":"ear tone 4","shortname":":ear_tone4:","category":"people","emoji_order":"1270"},{"name":"ear tone 5","shortname":":ear_tone5:","category":"people","emoji_order":"1271"},{"name":"nose","shortname":":nose:","category":"people","emoji_order":"1272"},{"name":"nose tone 1","shortname":":nose_tone1:","category":"people","emoji_order":"1273"},{"name":"nose tone 2","shortname":":nose_tone2:","category":"people","emoji_order":"1274"},{"name":"nose tone 3","shortname":":nose_tone3:","category":"people","emoji_order":"1275"},{"name":"nose tone 4","shortname":":nose_tone4:","category":"people","emoji_order":"1276"},{"name":"nose tone 5","shortname":":nose_tone5:","category":"people","emoji_order":"1277"},{"name":"footprints","shortname":":footprints:","category":"people","emoji_order":"1278"},{"name":"eyes","shortname":":eyes:","category":"people","emoji_order":"1279"},{"name":"eye","shortname":":eye:","category":"people","emoji_order":"1280"},{"name":"eye in speech bubble","shortname":":eye_in_speech_bubble:","category":"symbols","emoji_order":"1281"},{"name":"tongue","shortname":":tongue:","category":"people","emoji_order":"1282"},{"name":"mouth","shortname":":lips:","category":"people","emoji_order":"1283"},{"name":"kiss mark","shortname":":kiss:","category":"people","emoji_order":"1284"},{"name":"heart with arrow","shortname":":cupid:","category":"symbols","emoji_order":"1285"},{"name":"heavy black heart","shortname":":heart:","category":"symbols","emoji_order":"1286","aliases_ascii":["<3"]},{"name":"beating heart","shortname":":heartbeat:","category":"symbols","emoji_order":"1287"},{"name":"broken heart","shortname":":broken_heart:","category":"symbols","emoji_order":"1288","aliases_ascii":["</3"]},{"name":"two hearts","shortname":":two_hearts:","category":"symbols","emoji_order":"1289"},{"name":"sparkling heart","shortname":":sparkling_heart:","category":"symbols","emoji_order":"1290"},{"name":"growing heart","shortname":":heartpulse:","category":"symbols","emoji_order":"1291"},{"name":"blue heart","shortname":":blue_heart:","category":"symbols","emoji_order":"1292"},{"name":"green heart","shortname":":green_heart:","category":"symbols","emoji_order":"1293"},{"name":"yellow heart","shortname":":yellow_heart:","category":"symbols","emoji_order":"1294"},{"name":"purple heart","shortname":":purple_heart:","category":"symbols","emoji_order":"1295"},{"name":"black heart","shortname":":black_heart:","category":"symbols","emoji_order":"1296"},{"name":"heart with ribbon","shortname":":gift_heart:","category":"symbols","emoji_order":"1297"},{"name":"revolving hearts","shortname":":revolving_hearts:","category":"symbols","emoji_order":"1298"},{"name":"heart decoration","shortname":":heart_decoration:","category":"symbols","emoji_order":"1299"},{"name":"heavy heart exclamation mark ornament","shortname":":heart_exclamation:","category":"symbols","emoji_order":"1300"},{"name":"love letter","shortname":":love_letter:","category":"objects","emoji_order":"1301"},{"name":"sleeping symbol","shortname":":zzz:","category":"people","emoji_order":"1302"},{"name":"anger symbol","shortname":":anger:","category":"symbols","emoji_order":"1303"},{"name":"bomb","shortname":":bomb:","category":"objects","emoji_order":"1304"},{"name":"collision symbol","shortname":":boom:","category":"symbols","emoji_order":"1305"},{"name":"splashing sweat symbol","shortname":":sweat_drops:","category":"nature","emoji_order":"1306"},{"name":"dash symbol","shortname":":dash:","category":"nature","emoji_order":"1307"},{"name":"dizzy symbol","shortname":":dizzy:","category":"symbols","emoji_order":"1308"},{"name":"speech balloon","shortname":":speech_balloon:","category":"symbols","emoji_order":"1309"},{"name":"left speech bubble","shortname":":speech_left:","category":"symbols","emoji_order":"1310"},{"name":"right anger bubble","shortname":":anger_right:","category":"symbols","emoji_order":"1311"},{"name":"thought balloon","shortname":":thought_balloon:","category":"symbols","emoji_order":"1312"},{"name":"hole","shortname":":hole:","category":"objects","emoji_order":"1313"},{"name":"eyeglasses","shortname":":eyeglasses:","category":"people","emoji_order":"1314"},{"name":"dark sunglasses","shortname":":dark_sunglasses:","category":"people","emoji_order":"1315"},{"name":"necktie","shortname":":necktie:","category":"people","emoji_order":"1316"},{"name":"t-shirt","shortname":":shirt:","category":"people","emoji_order":"1317"},{"name":"jeans","shortname":":jeans:","category":"people","emoji_order":"1318"},{"name":"dress","shortname":":dress:","category":"people","emoji_order":"1319"},{"name":"kimono","shortname":":kimono:","category":"people","emoji_order":"1320"},{"name":"bikini","shortname":":bikini:","category":"people","emoji_order":"1321"},{"name":"womans clothes","shortname":":womans_clothes:","category":"people","emoji_order":"1322"},{"name":"purse","shortname":":purse:","category":"people","emoji_order":"1323"},{"name":"handbag","shortname":":handbag:","category":"people","emoji_order":"1324"},{"name":"pouch","shortname":":pouch:","category":"people","emoji_order":"1325"},{"name":"shopping bags","shortname":":shopping_bags:","category":"objects","emoji_order":"1326"},{"name":"school satchel","shortname":":school_satchel:","category":"people","emoji_order":"1327"},{"name":"mans shoe","shortname":":mans_shoe:","category":"people","emoji_order":"1328"},{"name":"athletic shoe","shortname":":athletic_shoe:","category":"people","emoji_order":"1329"},{"name":"high-heeled shoe","shortname":":high_heel:","category":"people","emoji_order":"1330"},{"name":"womans sandal","shortname":":sandal:","category":"people","emoji_order":"1331"},{"name":"womans boots","shortname":":boot:","category":"people","emoji_order":"1332"},{"name":"crown","shortname":":crown:","category":"people","emoji_order":"1333"},{"name":"womans hat","shortname":":womans_hat:","category":"people","emoji_order":"1334"},{"name":"top hat","shortname":":tophat:","category":"people","emoji_order":"1335"},{"name":"graduation cap","shortname":":mortar_board:","category":"people","emoji_order":"1336"},{"name":"helmet with white cross","shortname":":helmet_with_cross:","category":"people","emoji_order":"1337"},{"name":"prayer beads","shortname":":prayer_beads:","category":"objects","emoji_order":"1338"},{"name":"lipstick","shortname":":lipstick:","category":"people","emoji_order":"1339"},{"name":"ring","shortname":":ring:","category":"people","emoji_order":"1340"},{"name":"gem stone","shortname":":gem:","category":"objects","emoji_order":"1341"},{"name":"monkey face","shortname":":monkey_face:","category":"nature","emoji_order":"1342"},{"name":"monkey","shortname":":monkey:","category":"nature","emoji_order":"1343"},{"name":"gorilla","shortname":":gorilla:","category":"nature","emoji_order":"1344"},{"name":"dog face","shortname":":dog:","category":"nature","emoji_order":"1345"},{"name":"dog","shortname":":dog2:","category":"nature","emoji_order":"1346"},{"name":"poodle","shortname":":poodle:","category":"nature","emoji_order":"1347"},{"name":"wolf face","shortname":":wolf:","category":"nature","emoji_order":"1348"},{"name":"fox face","shortname":":fox:","category":"nature","emoji_order":"1349"},{"name":"cat face","shortname":":cat:","category":"nature","emoji_order":"1350"},{"name":"cat","shortname":":cat2:","category":"nature","emoji_order":"1351"},{"name":"lion face","shortname":":lion_face:","category":"nature","emoji_order":"1352"},{"name":"tiger face","shortname":":tiger:","category":"nature","emoji_order":"1353"},{"name":"tiger","shortname":":tiger2:","category":"nature","emoji_order":"1354"},{"name":"leopard","shortname":":leopard:","category":"nature","emoji_order":"1355"},{"name":"horse face","shortname":":horse:","category":"nature","emoji_order":"1356"},{"name":"horse","shortname":":racehorse:","category":"nature","emoji_order":"1357"},{"name":"deer","shortname":":deer:","category":"nature","emoji_order":"1358"},{"name":"unicorn face","shortname":":unicorn:","category":"nature","emoji_order":"1359"},{"name":"cow face","shortname":":cow:","category":"nature","emoji_order":"1360"},{"name":"ox","shortname":":ox:","category":"nature","emoji_order":"1361"},{"name":"water buffalo","shortname":":water_buffalo:","category":"nature","emoji_order":"1362"},{"name":"cow","shortname":":cow2:","category":"nature","emoji_order":"1363"},{"name":"pig face","shortname":":pig:","category":"nature","emoji_order":"1364"},{"name":"pig","shortname":":pig2:","category":"nature","emoji_order":"1365"},{"name":"boar","shortname":":boar:","category":"nature","emoji_order":"1366"},{"name":"pig nose","shortname":":pig_nose:","category":"nature","emoji_order":"1367"},{"name":"ram","shortname":":ram:","category":"nature","emoji_order":"1368"},{"name":"sheep","shortname":":sheep:","category":"nature","emoji_order":"1369"},{"name":"goat","shortname":":goat:","category":"nature","emoji_order":"1370"},{"name":"dromedary camel","shortname":":dromedary_camel:","category":"nature","emoji_order":"1371"},{"name":"bactrian camel","shortname":":camel:","category":"nature","emoji_order":"1372"},{"name":"elephant","shortname":":elephant:","category":"nature","emoji_order":"1373"},{"name":"rhinoceros","shortname":":rhino:","category":"nature","emoji_order":"1374"},{"name":"mouse face","shortname":":mouse:","category":"nature","emoji_order":"1375"},{"name":"mouse","shortname":":mouse2:","category":"nature","emoji_order":"1376"},{"name":"rat","shortname":":rat:","category":"nature","emoji_order":"1377"},{"name":"hamster face","shortname":":hamster:","category":"nature","emoji_order":"1378"},{"name":"rabbit face","shortname":":rabbit:","category":"nature","emoji_order":"1379"},{"name":"rabbit","shortname":":rabbit2:","category":"nature","emoji_order":"1380"},{"name":"chipmunk","shortname":":chipmunk:","category":"nature","emoji_order":"1381"},{"name":"bat","shortname":":bat:","category":"nature","emoji_order":"1382"},{"name":"bear face","shortname":":bear:","category":"nature","emoji_order":"1383"},{"name":"koala","shortname":":koala:","category":"nature","emoji_order":"1384"},{"name":"panda face","shortname":":panda_face:","category":"nature","emoji_order":"1385"},{"name":"paw prints","shortname":":feet:","category":"nature","emoji_order":"1386"},{"name":"turkey","shortname":":turkey:","category":"nature","emoji_order":"1387"},{"name":"chicken","shortname":":chicken:","category":"nature","emoji_order":"1388"},{"name":"rooster","shortname":":rooster:","category":"nature","emoji_order":"1389"},{"name":"hatching chick","shortname":":hatching_chick:","category":"nature","emoji_order":"1390"},{"name":"baby chick","shortname":":baby_chick:","category":"nature","emoji_order":"1391"},{"name":"front-facing baby chick","shortname":":hatched_chick:","category":"nature","emoji_order":"1392"},{"name":"bird","shortname":":bird:","category":"nature","emoji_order":"1393"},{"name":"penguin","shortname":":penguin:","category":"nature","emoji_order":"1394"},{"name":"dove of peace","shortname":":dove:","category":"nature","emoji_order":"1395"},{"name":"eagle","shortname":":eagle:","category":"nature","emoji_order":"1396"},{"name":"duck","shortname":":duck:","category":"nature","emoji_order":"1397"},{"name":"owl","shortname":":owl:","category":"nature","emoji_order":"1398"},{"name":"frog face","shortname":":frog:","category":"nature","emoji_order":"1399"},{"name":"crocodile","shortname":":crocodile:","category":"nature","emoji_order":"1400"},{"name":"turtle","shortname":":turtle:","category":"nature","emoji_order":"1401"},{"name":"lizard","shortname":":lizard:","category":"nature","emoji_order":"1402"},{"name":"snake","shortname":":snake:","category":"nature","emoji_order":"1403"},{"name":"dragon face","shortname":":dragon_face:","category":"nature","emoji_order":"1404"},{"name":"dragon","shortname":":dragon:","category":"nature","emoji_order":"1405"},{"name":"spouting whale","shortname":":whale:","category":"nature","emoji_order":"1406"},{"name":"whale","shortname":":whale2:","category":"nature","emoji_order":"1407"},{"name":"dolphin","shortname":":dolphin:","category":"nature","emoji_order":"1408"},{"name":"fish","shortname":":fish:","category":"nature","emoji_order":"1409"},{"name":"tropical fish","shortname":":tropical_fish:","category":"nature","emoji_order":"1410"},{"name":"blowfish","shortname":":blowfish:","category":"nature","emoji_order":"1411"},{"name":"shark","shortname":":shark:","category":"nature","emoji_order":"1412"},{"name":"octopus","shortname":":octopus:","category":"nature","emoji_order":"1413"},{"name":"spiral shell","shortname":":shell:","category":"nature","emoji_order":"1414"},{"name":"crab","shortname":":crab:","category":"nature","emoji_order":"1415"},{"name":"shrimp","shortname":":shrimp:","category":"nature","emoji_order":"1416"},{"name":"squid","shortname":":squid:","category":"nature","emoji_order":"1417"},{"name":"butterfly","shortname":":butterfly:","category":"nature","emoji_order":"1418"},{"name":"snail","shortname":":snail:","category":"nature","emoji_order":"1419"},{"name":"bug","shortname":":bug:","category":"nature","emoji_order":"1420"},{"name":"ant","shortname":":ant:","category":"nature","emoji_order":"1421"},{"name":"honeybee","shortname":":bee:","category":"nature","emoji_order":"1422"},{"name":"lady beetle","shortname":":beetle:","category":"nature","emoji_order":"1423"},{"name":"spider","shortname":":spider:","category":"nature","emoji_order":"1424"},{"name":"spider web","shortname":":spider_web:","category":"nature","emoji_order":"1425"},{"name":"scorpion","shortname":":scorpion:","category":"nature","emoji_order":"1426"},{"name":"bouquet","shortname":":bouquet:","category":"nature","emoji_order":"1427"},{"name":"cherry blossom","shortname":":cherry_blossom:","category":"nature","emoji_order":"1428"},{"name":"white flower","shortname":":white_flower:","category":"symbols","emoji_order":"1429"},{"name":"rosette","shortname":":rosette:","category":"nature","emoji_order":"1430"},{"name":"rose","shortname":":rose:","category":"nature","emoji_order":"1431"},{"name":"wilted flower","shortname":":wilted_rose:","category":"nature","emoji_order":"1432"},{"name":"hibiscus","shortname":":hibiscus:","category":"nature","emoji_order":"1433"},{"name":"sunflower","shortname":":sunflower:","category":"nature","emoji_order":"1434"},{"name":"blossom","shortname":":blossom:","category":"nature","emoji_order":"1435"},{"name":"tulip","shortname":":tulip:","category":"nature","emoji_order":"1436"},{"name":"seedling","shortname":":seedling:","category":"nature","emoji_order":"1437"},{"name":"evergreen tree","shortname":":evergreen_tree:","category":"nature","emoji_order":"1438"},{"name":"deciduous tree","shortname":":deciduous_tree:","category":"nature","emoji_order":"1439"},{"name":"palm tree","shortname":":palm_tree:","category":"nature","emoji_order":"1440"},{"name":"cactus","shortname":":cactus:","category":"nature","emoji_order":"1441"},{"name":"ear of rice","shortname":":ear_of_rice:","category":"nature","emoji_order":"1442"},{"name":"herb","shortname":":herb:","category":"nature","emoji_order":"1443"},{"name":"shamrock","shortname":":shamrock:","category":"nature","emoji_order":"1444"},{"name":"four leaf clover","shortname":":four_leaf_clover:","category":"nature","emoji_order":"1445"},{"name":"maple leaf","shortname":":maple_leaf:","category":"nature","emoji_order":"1446"},{"name":"fallen leaf","shortname":":fallen_leaf:","category":"nature","emoji_order":"1447"},{"name":"leaf fluttering in wind","shortname":":leaves:","category":"nature","emoji_order":"1448"},{"name":"grapes","shortname":":grapes:","category":"food","emoji_order":"1449"},{"name":"melon","shortname":":melon:","category":"food","emoji_order":"1450"},{"name":"watermelon","shortname":":watermelon:","category":"food","emoji_order":"1451"},{"name":"tangerine","shortname":":tangerine:","category":"food","emoji_order":"1452"},{"name":"lemon","shortname":":lemon:","category":"food","emoji_order":"1453"},{"name":"banana","shortname":":banana:","category":"food","emoji_order":"1454"},{"name":"pineapple","shortname":":pineapple:","category":"food","emoji_order":"1455"},{"name":"red apple","shortname":":apple:","category":"food","emoji_order":"1456"},{"name":"green apple","shortname":":green_apple:","category":"food","emoji_order":"1457"},{"name":"pear","shortname":":pear:","category":"food","emoji_order":"1458"},{"name":"peach","shortname":":peach:","category":"food","emoji_order":"1459"},{"name":"cherries","shortname":":cherries:","category":"food","emoji_order":"1460"},{"name":"strawberry","shortname":":strawberry:","category":"food","emoji_order":"1461"},{"name":"kiwifruit","shortname":":kiwi:","category":"food","emoji_order":"1462"},{"name":"tomato","shortname":":tomato:","category":"food","emoji_order":"1463"},{"name":"avocado","shortname":":avocado:","category":"food","emoji_order":"1464"},{"name":"aubergine","shortname":":eggplant:","category":"food","emoji_order":"1465"},{"name":"potato","shortname":":potato:","category":"food","emoji_order":"1466"},{"name":"carrot","shortname":":carrot:","category":"food","emoji_order":"1467"},{"name":"ear of maize","shortname":":corn:","category":"food","emoji_order":"1468"},{"name":"hot pepper","shortname":":hot_pepper:","category":"food","emoji_order":"1469"},{"name":"cucumber","shortname":":cucumber:","category":"food","emoji_order":"1470"},{"name":"mushroom","shortname":":mushroom:","category":"nature","emoji_order":"1471"},{"name":"peanuts","shortname":":peanuts:","category":"food","emoji_order":"1472"},{"name":"chestnut","shortname":":chestnut:","category":"nature","emoji_order":"1473"},{"name":"bread","shortname":":bread:","category":"food","emoji_order":"1474"},{"name":"croissant","shortname":":croissant:","category":"food","emoji_order":"1475"},{"name":"baguette bread","shortname":":french_bread:","category":"food","emoji_order":"1476"},{"name":"pancakes","shortname":":pancakes:","category":"food","emoji_order":"1477"},{"name":"cheese wedge","shortname":":cheese:","category":"food","emoji_order":"1478"},{"name":"meat on bone","shortname":":meat_on_bone:","category":"food","emoji_order":"1479"},{"name":"poultry leg","shortname":":poultry_leg:","category":"food","emoji_order":"1480"},{"name":"bacon","shortname":":bacon:","category":"food","emoji_order":"1481"},{"name":"hamburger","shortname":":hamburger:","category":"food","emoji_order":"1482"},{"name":"french fries","shortname":":fries:","category":"food","emoji_order":"1483"},{"name":"slice of pizza","shortname":":pizza:","category":"food","emoji_order":"1484"},{"name":"hot dog","shortname":":hotdog:","category":"food","emoji_order":"1485"},{"name":"taco","shortname":":taco:","category":"food","emoji_order":"1486"},{"name":"burrito","shortname":":burrito:","category":"food","emoji_order":"1487"},{"name":"stuffed flatbread","shortname":":stuffed_flatbread:","category":"food","emoji_order":"1488"},{"name":"egg","shortname":":egg:","category":"food","emoji_order":"1489"},{"name":"cooking","shortname":":cooking:","category":"food","emoji_order":"1490"},{"name":"shallow pan of food","shortname":":shallow_pan_of_food:","category":"food","emoji_order":"1491"},{"name":"pot of food","shortname":":stew:","category":"food","emoji_order":"1492"},{"name":"green salad","shortname":":salad:","category":"food","emoji_order":"1493"},{"name":"popcorn","shortname":":popcorn:","category":"food","emoji_order":"1494"},{"name":"bento box","shortname":":bento:","category":"food","emoji_order":"1495"},{"name":"rice cracker","shortname":":rice_cracker:","category":"food","emoji_order":"1496"},{"name":"rice ball","shortname":":rice_ball:","category":"food","emoji_order":"1497"},{"name":"cooked rice","shortname":":rice:","category":"food","emoji_order":"1498"},{"name":"curry and rice","shortname":":curry:","category":"food","emoji_order":"1499"},{"name":"steaming bowl","shortname":":ramen:","category":"food","emoji_order":"1500"},{"name":"spaghetti","shortname":":spaghetti:","category":"food","emoji_order":"1501"},{"name":"roasted sweet potato","shortname":":sweet_potato:","category":"food","emoji_order":"1502"},{"name":"oden","shortname":":oden:","category":"food","emoji_order":"1503"},{"name":"sushi","shortname":":sushi:","category":"food","emoji_order":"1504"},{"name":"fried shrimp","shortname":":fried_shrimp:","category":"food","emoji_order":"1505"},{"name":"fish cake with swirl design","shortname":":fish_cake:","category":"food","emoji_order":"1506"},{"name":"dango","shortname":":dango:","category":"food","emoji_order":"1507"},{"name":"soft ice cream","shortname":":icecream:","category":"food","emoji_order":"1508"},{"name":"shaved ice","shortname":":shaved_ice:","category":"food","emoji_order":"1509"},{"name":"ice cream","shortname":":ice_cream:","category":"food","emoji_order":"1510"},{"name":"doughnut","shortname":":doughnut:","category":"food","emoji_order":"1511"},{"name":"cookie","shortname":":cookie:","category":"food","emoji_order":"1512"},{"name":"birthday cake","shortname":":birthday:","category":"food","emoji_order":"1513"},{"name":"shortcake","shortname":":cake:","category":"food","emoji_order":"1514"},{"name":"chocolate bar","shortname":":chocolate_bar:","category":"food","emoji_order":"1515"},{"name":"candy","shortname":":candy:","category":"food","emoji_order":"1516"},{"name":"lollipop","shortname":":lollipop:","category":"food","emoji_order":"1517"},{"name":"custard","shortname":":custard:","category":"food","emoji_order":"1518"},{"name":"honey pot","shortname":":honey_pot:","category":"food","emoji_order":"1519"},{"name":"baby bottle","shortname":":baby_bottle:","category":"food","emoji_order":"1520"},{"name":"glass of milk","shortname":":milk:","category":"food","emoji_order":"1521"},{"name":"hot beverage","shortname":":coffee:","category":"food","emoji_order":"1522"},{"name":"teacup without handle","shortname":":tea:","category":"food","emoji_order":"1523"},{"name":"sake bottle and cup","shortname":":sake:","category":"food","emoji_order":"1524"},{"name":"bottle with popping cork","shortname":":champagne:","category":"food","emoji_order":"1525"},{"name":"wine glass","shortname":":wine_glass:","category":"food","emoji_order":"1526"},{"name":"cocktail glass","shortname":":cocktail:","category":"food","emoji_order":"1527"},{"name":"tropical drink","shortname":":tropical_drink:","category":"food","emoji_order":"1528"},{"name":"beer mug","shortname":":beer:","category":"food","emoji_order":"1529"},{"name":"clinking beer mugs","shortname":":beers:","category":"food","emoji_order":"1530"},{"name":"clinking glasses","shortname":":champagne_glass:","category":"food","emoji_order":"1531"},{"name":"tumbler glass","shortname":":tumbler_glass:","category":"food","emoji_order":"1532"},{"name":"fork and knife with plate","shortname":":fork_knife_plate:","category":"food","emoji_order":"1533"},{"name":"fork and knife","shortname":":fork_and_knife:","category":"food","emoji_order":"1534"},{"name":"spoon","shortname":":spoon:","category":"food","emoji_order":"1535"},{"name":"hocho","shortname":":knife:","category":"objects","emoji_order":"1536"},{"name":"amphora","shortname":":amphora:","category":"objects","emoji_order":"1537"},{"name":"earth globe europe-africa","shortname":":earth_africa:","category":"nature","emoji_order":"1538"},{"name":"earth globe americas","shortname":":earth_americas:","category":"nature","emoji_order":"1539"},{"name":"earth globe asia-australia","shortname":":earth_asia:","category":"nature","emoji_order":"1540"},{"name":"globe with meridians","shortname":":globe_with_meridians:","category":"symbols","emoji_order":"1541"},{"name":"world map","shortname":":map:","category":"objects","emoji_order":"1542"},{"name":"silhouette of japan","shortname":":japan:","category":"travel","emoji_order":"1543"},{"name":"snow capped mountain","shortname":":mountain_snow:","category":"travel","emoji_order":"1544"},{"name":"mountain","shortname":":mountain:","category":"travel","emoji_order":"1545"},{"name":"volcano","shortname":":volcano:","category":"travel","emoji_order":"1546"},{"name":"mount fuji","shortname":":mount_fuji:","category":"travel","emoji_order":"1547"},{"name":"camping","shortname":":camping:","category":"travel","emoji_order":"1548"},{"name":"beach with umbrella","shortname":":beach:","category":"travel","emoji_order":"1549"},{"name":"desert","shortname":":desert:","category":"travel","emoji_order":"1550"},{"name":"desert island","shortname":":island:","category":"travel","emoji_order":"1551"},{"name":"national park","shortname":":park:","category":"travel","emoji_order":"1552"},{"name":"stadium","shortname":":stadium:","category":"travel","emoji_order":"1553"},{"name":"classical building","shortname":":classical_building:","category":"travel","emoji_order":"1554"},{"name":"building construction","shortname":":construction_site:","category":"travel","emoji_order":"1555"},{"name":"house buildings","shortname":":homes:","category":"travel","emoji_order":"1556"},{"name":"cityscape","shortname":":cityscape:","category":"travel","emoji_order":"1557"},{"name":"derelict house building","shortname":":house_abandoned:","category":"travel","emoji_order":"1558"},{"name":"house building","shortname":":house:","category":"travel","emoji_order":"1559"},{"name":"house with garden","shortname":":house_with_garden:","category":"travel","emoji_order":"1560"},{"name":"office building","shortname":":office:","category":"travel","emoji_order":"1561"},{"name":"japanese post office","shortname":":post_office:","category":"travel","emoji_order":"1562"},{"name":"european post office","shortname":":european_post_office:","category":"travel","emoji_order":"1563"},{"name":"hospital","shortname":":hospital:","category":"travel","emoji_order":"1564"},{"name":"bank","shortname":":bank:","category":"travel","emoji_order":"1565"},{"name":"hotel","shortname":":hotel:","category":"travel","emoji_order":"1566"},{"name":"love hotel","shortname":":love_hotel:","category":"travel","emoji_order":"1567"},{"name":"convenience store","shortname":":convenience_store:","category":"travel","emoji_order":"1568"},{"name":"school","shortname":":school:","category":"travel","emoji_order":"1569"},{"name":"department store","shortname":":department_store:","category":"travel","emoji_order":"1570"},{"name":"factory","shortname":":factory:","category":"travel","emoji_order":"1571"},{"name":"japanese castle","shortname":":japanese_castle:","category":"travel","emoji_order":"1572"},{"name":"european castle","shortname":":european_castle:","category":"travel","emoji_order":"1573"},{"name":"wedding","shortname":":wedding:","category":"travel","emoji_order":"1574"},{"name":"tokyo tower","shortname":":tokyo_tower:","category":"travel","emoji_order":"1575"},{"name":"statue of liberty","shortname":":statue_of_liberty:","category":"travel","emoji_order":"1576"},{"name":"church","shortname":":church:","category":"travel","emoji_order":"1577"},{"name":"mosque","shortname":":mosque:","category":"travel","emoji_order":"1578"},{"name":"synagogue","shortname":":synagogue:","category":"travel","emoji_order":"1579"},{"name":"shinto shrine","shortname":":shinto_shrine:","category":"travel","emoji_order":"1580"},{"name":"kaaba","shortname":":kaaba:","category":"travel","emoji_order":"1581"},{"name":"fountain","shortname":":fountain:","category":"travel","emoji_order":"1582"},{"name":"tent","shortname":":tent:","category":"travel","emoji_order":"1583"},{"name":"foggy","shortname":":foggy:","category":"travel","emoji_order":"1584"},{"name":"night with stars","shortname":":night_with_stars:","category":"travel","emoji_order":"1585"},{"name":"sunrise over mountains","shortname":":sunrise_over_mountains:","category":"travel","emoji_order":"1586"},{"name":"sunrise","shortname":":sunrise:","category":"travel","emoji_order":"1587"},{"name":"cityscape at dusk","shortname":":city_dusk:","category":"travel","emoji_order":"1588"},{"name":"sunset over buildings","shortname":":city_sunset:","category":"travel","emoji_order":"1589"},{"name":"bridge at night","shortname":":bridge_at_night:","category":"travel","emoji_order":"1590"},{"name":"hot springs","shortname":":hotsprings:","category":"symbols","emoji_order":"1591"},{"name":"milky way","shortname":":milky_way:","category":"travel","emoji_order":"1592"},{"name":"carousel horse","shortname":":carousel_horse:","category":"travel","emoji_order":"1593"},{"name":"ferris wheel","shortname":":ferris_wheel:","category":"travel","emoji_order":"1594"},{"name":"roller coaster","shortname":":roller_coaster:","category":"travel","emoji_order":"1595"},{"name":"barber pole","shortname":":barber:","category":"objects","emoji_order":"1596"},{"name":"circus tent","shortname":":circus_tent:","category":"activity","emoji_order":"1597"},{"name":"performing arts","shortname":":performing_arts:","category":"activity","emoji_order":"1598"},{"name":"frame with picture","shortname":":frame_photo:","category":"objects","emoji_order":"1599"},{"name":"artist palette","shortname":":art:","category":"activity","emoji_order":"1600"},{"name":"slot machine","shortname":":slot_machine:","category":"activity","emoji_order":"1601"},{"name":"steam locomotive","shortname":":steam_locomotive:","category":"travel","emoji_order":"1602"},{"name":"railway car","shortname":":railway_car:","category":"travel","emoji_order":"1603"},{"name":"high-speed train","shortname":":bullettrain_side:","category":"travel","emoji_order":"1604"},{"name":"high-speed train with bullet nose","shortname":":bullettrain_front:","category":"travel","emoji_order":"1605"},{"name":"train","shortname":":train2:","category":"travel","emoji_order":"1606"},{"name":"metro","shortname":":metro:","category":"travel","emoji_order":"1607"},{"name":"light rail","shortname":":light_rail:","category":"travel","emoji_order":"1608"},{"name":"station","shortname":":station:","category":"travel","emoji_order":"1609"},{"name":"tram","shortname":":tram:","category":"travel","emoji_order":"1610"},{"name":"monorail","shortname":":monorail:","category":"travel","emoji_order":"1611"},{"name":"mountain railway","shortname":":mountain_railway:","category":"travel","emoji_order":"1612"},{"name":"tram car","shortname":":train:","category":"travel","emoji_order":"1613"},{"name":"bus","shortname":":bus:","category":"travel","emoji_order":"1614"},{"name":"oncoming bus","shortname":":oncoming_bus:","category":"travel","emoji_order":"1615"},{"name":"trolleybus","shortname":":trolleybus:","category":"travel","emoji_order":"1616"},{"name":"minibus","shortname":":minibus:","category":"travel","emoji_order":"1617"},{"name":"ambulance","shortname":":ambulance:","category":"travel","emoji_order":"1618"},{"name":"fire engine","shortname":":fire_engine:","category":"travel","emoji_order":"1619"},{"name":"police car","shortname":":police_car:","category":"travel","emoji_order":"1620"},{"name":"oncoming police car","shortname":":oncoming_police_car:","category":"travel","emoji_order":"1621"},{"name":"taxi","shortname":":taxi:","category":"travel","emoji_order":"1622"},{"name":"oncoming taxi","shortname":":oncoming_taxi:","category":"travel","emoji_order":"1623"},{"name":"automobile","shortname":":red_car:","category":"travel","emoji_order":"1624"},{"name":"oncoming automobile","shortname":":oncoming_automobile:","category":"travel","emoji_order":"1625"},{"name":"recreational vehicle","shortname":":blue_car:","category":"travel","emoji_order":"1626"},{"name":"delivery truck","shortname":":truck:","category":"travel","emoji_order":"1627"},{"name":"articulated lorry","shortname":":articulated_lorry:","category":"travel","emoji_order":"1628"},{"name":"tractor","shortname":":tractor:","category":"travel","emoji_order":"1629"},{"name":"bicycle","shortname":":bike:","category":"travel","emoji_order":"1630"},{"name":"scooter","shortname":":scooter:","category":"travel","emoji_order":"1631"},{"name":"motor scooter","shortname":":motor_scooter:","category":"travel","emoji_order":"1632"},{"name":"bus stop","shortname":":busstop:","category":"travel","emoji_order":"1633"},{"name":"motorway","shortname":":motorway:","category":"travel","emoji_order":"1634"},{"name":"railway track","shortname":":railway_track:","category":"travel","emoji_order":"1635"},{"name":"fuel pump","shortname":":fuelpump:","category":"travel","emoji_order":"1636"},{"name":"police cars revolving light","shortname":":rotating_light:","category":"travel","emoji_order":"1637"},{"name":"horizontal traffic light","shortname":":traffic_light:","category":"travel","emoji_order":"1638"},{"name":"vertical traffic light","shortname":":vertical_traffic_light:","category":"travel","emoji_order":"1639"},{"name":"construction sign","shortname":":construction:","category":"travel","emoji_order":"1640"},{"name":"octagonal sign","shortname":":octagonal_sign:","category":"symbols","emoji_order":"1641"},{"name":"anchor","shortname":":anchor:","category":"travel","emoji_order":"1642"},{"name":"sailboat","shortname":":sailboat:","category":"travel","emoji_order":"1643"},{"name":"canoe","shortname":":canoe:","category":"travel","emoji_order":"1644"},{"name":"speedboat","shortname":":speedboat:","category":"travel","emoji_order":"1645"},{"name":"passenger ship","shortname":":cruise_ship:","category":"travel","emoji_order":"1646"},{"name":"ferry","shortname":":ferry:","category":"travel","emoji_order":"1647"},{"name":"motorboat","shortname":":motorboat:","category":"travel","emoji_order":"1648"},{"name":"ship","shortname":":ship:","category":"travel","emoji_order":"1649"},{"name":"airplane","shortname":":airplane:","category":"travel","emoji_order":"1650"},{"name":"small airplane","shortname":":airplane_small:","category":"travel","emoji_order":"1651"},{"name":"airplane departure","shortname":":airplane_departure:","category":"travel","emoji_order":"1652"},{"name":"airplane arriving","shortname":":airplane_arriving:","category":"travel","emoji_order":"1653"},{"name":"seat","shortname":":seat:","category":"travel","emoji_order":"1654"},{"name":"helicopter","shortname":":helicopter:","category":"travel","emoji_order":"1655"},{"name":"suspension railway","shortname":":suspension_railway:","category":"travel","emoji_order":"1656"},{"name":"mountain cableway","shortname":":mountain_cableway:","category":"travel","emoji_order":"1657"},{"name":"aerial tramway","shortname":":aerial_tramway:","category":"travel","emoji_order":"1658"},{"name":"rocket","shortname":":rocket:","category":"travel","emoji_order":"1659"},{"name":"satellite","shortname":":satellite_orbital:","category":"travel","emoji_order":"1660"},{"name":"bellhop bell","shortname":":bellhop:","category":"objects","emoji_order":"1661"},{"name":"door","shortname":":door:","category":"objects","emoji_order":"1662"},{"name":"sleeping accommodation","shortname":":sleeping_accommodation:","category":"objects","emoji_order":"1663"},{"name":"bed","shortname":":bed:","category":"objects","emoji_order":"1669"},{"name":"couch and lamp","shortname":":couch:","category":"objects","emoji_order":"1670"},{"name":"toilet","shortname":":toilet:","category":"objects","emoji_order":"1671"},{"name":"shower","shortname":":shower:","category":"objects","emoji_order":"1672"},{"name":"bath","shortname":":bath:","category":"activity","emoji_order":"1673"},{"name":"bath tone 1","shortname":":bath_tone1:","category":"activity","emoji_order":"1674"},{"name":"bath tone 2","shortname":":bath_tone2:","category":"activity","emoji_order":"1675"},{"name":"bath tone 3","shortname":":bath_tone3:","category":"activity","emoji_order":"1676"},{"name":"bath tone 4","shortname":":bath_tone4:","category":"activity","emoji_order":"1677"},{"name":"bath tone 5","shortname":":bath_tone5:","category":"activity","emoji_order":"1678"},{"name":"bathtub","shortname":":bathtub:","category":"objects","emoji_order":"1679"},{"name":"hourglass","shortname":":hourglass:","category":"objects","emoji_order":"1680"},{"name":"hourglass with flowing sand","shortname":":hourglass_flowing_sand:","category":"objects","emoji_order":"1681"},{"name":"watch","shortname":":watch:","category":"objects","emoji_order":"1682"},{"name":"alarm clock","shortname":":alarm_clock:","category":"objects","emoji_order":"1683"},{"name":"stopwatch","shortname":":stopwatch:","category":"objects","emoji_order":"1684"},{"name":"timer clock","shortname":":timer:","category":"objects","emoji_order":"1685"},{"name":"mantlepiece clock","shortname":":clock:","category":"objects","emoji_order":"1686"},{"name":"clock face twelve oclock","shortname":":clock12:","category":"symbols","emoji_order":"1687"},{"name":"clock face twelve-thirty","shortname":":clock1230:","category":"symbols","emoji_order":"1688"},{"name":"clock face one oclock","shortname":":clock1:","category":"symbols","emoji_order":"1689"},{"name":"clock face one-thirty","shortname":":clock130:","category":"symbols","emoji_order":"1690"},{"name":"clock face two oclock","shortname":":clock2:","category":"symbols","emoji_order":"1691"},{"name":"clock face two-thirty","shortname":":clock230:","category":"symbols","emoji_order":"1692"},{"name":"clock face three oclock","shortname":":clock3:","category":"symbols","emoji_order":"1693"},{"name":"clock face three-thirty","shortname":":clock330:","category":"symbols","emoji_order":"1694"},{"name":"clock face four oclock","shortname":":clock4:","category":"symbols","emoji_order":"1695"},{"name":"clock face four-thirty","shortname":":clock430:","category":"symbols","emoji_order":"1696"},{"name":"clock face five oclock","shortname":":clock5:","category":"symbols","emoji_order":"1697"},{"name":"clock face five-thirty","shortname":":clock530:","category":"symbols","emoji_order":"1698"},{"name":"clock face six oclock","shortname":":clock6:","category":"symbols","emoji_order":"1699"},{"name":"clock face six-thirty","shortname":":clock630:","category":"symbols","emoji_order":"1700"},{"name":"clock face seven oclock","shortname":":clock7:","category":"symbols","emoji_order":"1701"},{"name":"clock face seven-thirty","shortname":":clock730:","category":"symbols","emoji_order":"1702"},{"name":"clock face eight oclock","shortname":":clock8:","category":"symbols","emoji_order":"1703"},{"name":"clock face eight-thirty","shortname":":clock830:","category":"symbols","emoji_order":"1704"},{"name":"clock face nine oclock","shortname":":clock9:","category":"symbols","emoji_order":"1705"},{"name":"clock face nine-thirty","shortname":":clock930:","category":"symbols","emoji_order":"1706"},{"name":"clock face ten oclock","shortname":":clock10:","category":"symbols","emoji_order":"1707"},{"name":"clock face ten-thirty","shortname":":clock1030:","category":"symbols","emoji_order":"1708"},{"name":"clock face eleven oclock","shortname":":clock11:","category":"symbols","emoji_order":"1709"},{"name":"clock face eleven-thirty","shortname":":clock1130:","category":"symbols","emoji_order":"1710"},{"name":"new moon symbol","shortname":":new_moon:","category":"nature","emoji_order":"1711"},{"name":"waxing crescent moon symbol","shortname":":waxing_crescent_moon:","category":"nature","emoji_order":"1712"},{"name":"first quarter moon symbol","shortname":":first_quarter_moon:","category":"nature","emoji_order":"1713"},{"name":"waxing gibbous moon symbol","shortname":":waxing_gibbous_moon:","category":"nature","emoji_order":"1714"},{"name":"full moon symbol","shortname":":full_moon:","category":"nature","emoji_order":"1715"},{"name":"waning gibbous moon symbol","shortname":":waning_gibbous_moon:","category":"nature","emoji_order":"1716"},{"name":"last quarter moon symbol","shortname":":last_quarter_moon:","category":"nature","emoji_order":"1717"},{"name":"waning crescent moon symbol","shortname":":waning_crescent_moon:","category":"nature","emoji_order":"1718"},{"name":"crescent moon","shortname":":crescent_moon:","category":"nature","emoji_order":"1719"},{"name":"new moon with face","shortname":":new_moon_with_face:","category":"nature","emoji_order":"1720"},{"name":"first quarter moon with face","shortname":":first_quarter_moon_with_face:","category":"nature","emoji_order":"1721"},{"name":"last quarter moon with face","shortname":":last_quarter_moon_with_face:","category":"nature","emoji_order":"1722"},{"name":"thermometer","shortname":":thermometer:","category":"objects","emoji_order":"1723"},{"name":"black sun with rays","shortname":":sunny:","category":"nature","emoji_order":"1724"},{"name":"full moon with face","shortname":":full_moon_with_face:","category":"nature","emoji_order":"1725"},{"name":"sun with face","shortname":":sun_with_face:","category":"nature","emoji_order":"1726"},{"name":"white medium star","shortname":":star:","category":"nature","emoji_order":"1727"},{"name":"glowing star","shortname":":star2:","category":"nature","emoji_order":"1728"},{"name":"shooting star","shortname":":stars:","category":"travel","emoji_order":"1729"},{"name":"cloud","shortname":":cloud:","category":"nature","emoji_order":"1730"},{"name":"sun behind cloud","shortname":":partly_sunny:","category":"nature","emoji_order":"1731"},{"name":"thunder cloud and rain","shortname":":thunder_cloud_rain:","category":"nature","emoji_order":"1732"},{"name":"white sun with small cloud","shortname":":white_sun_small_cloud:","category":"nature","emoji_order":"1733"},{"name":"white sun behind cloud","shortname":":white_sun_cloud:","category":"nature","emoji_order":"1734"},{"name":"white sun behind cloud with rain","shortname":":white_sun_rain_cloud:","category":"nature","emoji_order":"1735"},{"name":"cloud with rain","shortname":":cloud_rain:","category":"nature","emoji_order":"1736"},{"name":"cloud with snow","shortname":":cloud_snow:","category":"nature","emoji_order":"1737"},{"name":"cloud with lightning","shortname":":cloud_lightning:","category":"nature","emoji_order":"1738"},{"name":"cloud with tornado","shortname":":cloud_tornado:","category":"nature","emoji_order":"1739"},{"name":"fog","shortname":":fog:","category":"nature","emoji_order":"1740"},{"name":"wind blowing face","shortname":":wind_blowing_face:","category":"nature","emoji_order":"1741"},{"name":"cyclone","shortname":":cyclone:","category":"symbols","emoji_order":"1742"},{"name":"rainbow","shortname":":rainbow:","category":"travel","emoji_order":"1743"},{"name":"closed umbrella","shortname":":closed_umbrella:","category":"people","emoji_order":"1744"},{"name":"umbrella","shortname":":umbrella2:","category":"nature","emoji_order":"1745"},{"name":"umbrella with rain drops","shortname":":umbrella:","category":"nature","emoji_order":"1746"},{"name":"umbrella on ground","shortname":":beach_umbrella:","category":"objects","emoji_order":"1747"},{"name":"high voltage sign","shortname":":zap:","category":"nature","emoji_order":"1748"},{"name":"snowflake","shortname":":snowflake:","category":"nature","emoji_order":"1749"},{"name":"snowman","shortname":":snowman2:","category":"nature","emoji_order":"1750"},{"name":"snowman without snow","shortname":":snowman:","category":"nature","emoji_order":"1751"},{"name":"comet","shortname":":comet:","category":"nature","emoji_order":"1752"},{"name":"fire","shortname":":fire:","category":"nature","emoji_order":"1753"},{"name":"droplet","shortname":":droplet:","category":"nature","emoji_order":"1754"},{"name":"water wave","shortname":":ocean:","category":"nature","emoji_order":"1755"},{"name":"jack-o-lantern","shortname":":jack_o_lantern:","category":"nature","emoji_order":"1756"},{"name":"christmas tree","shortname":":christmas_tree:","category":"nature","emoji_order":"1757"},{"name":"fireworks","shortname":":fireworks:","category":"travel","emoji_order":"1758"},{"name":"firework sparkler","shortname":":sparkler:","category":"travel","emoji_order":"1759"},{"name":"sparkles","shortname":":sparkles:","category":"nature","emoji_order":"1760"},{"name":"balloon","shortname":":balloon:","category":"objects","emoji_order":"1761"},{"name":"party popper","shortname":":tada:","category":"objects","emoji_order":"1762"},{"name":"confetti ball","shortname":":confetti_ball:","category":"objects","emoji_order":"1763"},{"name":"tanabata tree","shortname":":tanabata_tree:","category":"nature","emoji_order":"1764"},{"name":"pine decoration","shortname":":bamboo:","category":"nature","emoji_order":"1765"},{"name":"japanese dolls","shortname":":dolls:","category":"objects","emoji_order":"1766"},{"name":"carp streamer","shortname":":flags:","category":"objects","emoji_order":"1767"},{"name":"wind chime","shortname":":wind_chime:","category":"objects","emoji_order":"1768"},{"name":"moon viewing ceremony","shortname":":rice_scene:","category":"travel","emoji_order":"1769"},{"name":"ribbon","shortname":":ribbon:","category":"objects","emoji_order":"1770"},{"name":"wrapped present","shortname":":gift:","category":"objects","emoji_order":"1771"},{"name":"reminder ribbon","shortname":":reminder_ribbon:","category":"activity","emoji_order":"1772"},{"name":"admission tickets","shortname":":tickets:","category":"activity","emoji_order":"1773"},{"name":"ticket","shortname":":ticket:","category":"activity","emoji_order":"1774"},{"name":"military medal","shortname":":military_medal:","category":"activity","emoji_order":"1775"},{"name":"trophy","shortname":":trophy:","category":"activity","emoji_order":"1776"},{"name":"sports medal","shortname":":medal:","category":"activity","emoji_order":"1777"},{"name":"first place medal","shortname":":first_place:","category":"activity","emoji_order":"1778"},{"name":"second place medal","shortname":":second_place:","category":"activity","emoji_order":"1779"},{"name":"third place medal","shortname":":third_place:","category":"activity","emoji_order":"1780"},{"name":"soccer ball","shortname":":soccer:","category":"activity","emoji_order":"1781"},{"name":"baseball","shortname":":baseball:","category":"activity","emoji_order":"1782"},{"name":"basketball and hoop","shortname":":basketball:","category":"activity","emoji_order":"1783"},{"name":"volleyball","shortname":":volleyball:","category":"activity","emoji_order":"1784"},{"name":"american football","shortname":":football:","category":"activity","emoji_order":"1785"},{"name":"rugby football","shortname":":rugby_football:","category":"activity","emoji_order":"1786"},{"name":"tennis racquet and ball","shortname":":tennis:","category":"activity","emoji_order":"1787"},{"name":"billiards","shortname":":8ball:","category":"activity","emoji_order":"1788"},{"name":"bowling","shortname":":bowling:","category":"activity","emoji_order":"1789"},{"name":"cricket bat and ball","shortname":":cricket:","category":"activity","emoji_order":"1790"},{"name":"field hockey stick and ball","shortname":":field_hockey:","category":"activity","emoji_order":"1791"},{"name":"ice hockey stick and puck","shortname":":hockey:","category":"activity","emoji_order":"1792"},{"name":"table tennis paddle and ball","shortname":":ping_pong:","category":"activity","emoji_order":"1793"},{"name":"badminton racquet","shortname":":badminton:","category":"activity","emoji_order":"1794"},{"name":"boxing glove","shortname":":boxing_glove:","category":"activity","emoji_order":"1795"},{"name":"martial arts uniform","shortname":":martial_arts_uniform:","category":"activity","emoji_order":"1796"},{"name":"goal net","shortname":":goal:","category":"activity","emoji_order":"1797"},{"name":"direct hit","shortname":":dart:","category":"activity","emoji_order":"1798"},{"name":"flag in hole","shortname":":golf:","category":"activity","emoji_order":"1799"},{"name":"ice skate","shortname":":ice_skate:","category":"activity","emoji_order":"1800"},{"name":"fishing pole and fish","shortname":":fishing_pole_and_fish:","category":"activity","emoji_order":"1801"},{"name":"running shirt with sash","shortname":":running_shirt_with_sash:","category":"activity","emoji_order":"1802"},{"name":"ski and ski boot","shortname":":ski:","category":"activity","emoji_order":"1803"},{"name":"video game","shortname":":video_game:","category":"activity","emoji_order":"1804"},{"name":"joystick","shortname":":joystick:","category":"objects","emoji_order":"1805"},{"name":"game die","shortname":":game_die:","category":"activity","emoji_order":"1806"},{"name":"black spade suit","shortname":":spades:","category":"symbols","emoji_order":"1807"},{"name":"black heart suit","shortname":":hearts:","category":"symbols","emoji_order":"1808"},{"name":"black diamond suit","shortname":":diamonds:","category":"symbols","emoji_order":"1809"},{"name":"black club suit","shortname":":clubs:","category":"symbols","emoji_order":"1810"},{"name":"playing card black joker","shortname":":black_joker:","category":"symbols","emoji_order":"1811"},{"name":"mahjong tile red dragon","shortname":":mahjong:","category":"symbols","emoji_order":"1812"},{"name":"flower playing cards","shortname":":flower_playing_cards:","category":"symbols","emoji_order":"1813"},{"name":"speaker with cancellation stroke","shortname":":mute:","category":"symbols","emoji_order":"1814"},{"name":"speaker","shortname":":speaker:","category":"symbols","emoji_order":"1815"},{"name":"speaker with one sound wave","shortname":":sound:","category":"symbols","emoji_order":"1816"},{"name":"speaker with three sound waves","shortname":":loud_sound:","category":"symbols","emoji_order":"1817"},{"name":"public address loudspeaker","shortname":":loudspeaker:","category":"symbols","emoji_order":"1818"},{"name":"cheering megaphone","shortname":":mega:","category":"symbols","emoji_order":"1819"},{"name":"postal horn","shortname":":postal_horn:","category":"objects","emoji_order":"1820"},{"name":"bell","shortname":":bell:","category":"symbols","emoji_order":"1821"},{"name":"bell with cancellation stroke","shortname":":no_bell:","category":"symbols","emoji_order":"1822"},{"name":"musical score","shortname":":musical_score:","category":"activity","emoji_order":"1823"},{"name":"musical note","shortname":":musical_note:","category":"symbols","emoji_order":"1824"},{"name":"multiple musical notes","shortname":":notes:","category":"symbols","emoji_order":"1825"},{"name":"studio microphone","shortname":":microphone2:","category":"objects","emoji_order":"1826"},{"name":"level slider","shortname":":level_slider:","category":"objects","emoji_order":"1827"},{"name":"control knobs","shortname":":control_knobs:","category":"objects","emoji_order":"1828"},{"name":"microphone","shortname":":microphone:","category":"activity","emoji_order":"1829"},{"name":"headphone","shortname":":headphones:","category":"activity","emoji_order":"1830"},{"name":"radio","shortname":":radio:","category":"objects","emoji_order":"1831"},{"name":"saxophone","shortname":":saxophone:","category":"activity","emoji_order":"1832"},{"name":"guitar","shortname":":guitar:","category":"activity","emoji_order":"1833"},{"name":"musical keyboard","shortname":":musical_keyboard:","category":"activity","emoji_order":"1834"},{"name":"trumpet","shortname":":trumpet:","category":"activity","emoji_order":"1835"},{"name":"violin","shortname":":violin:","category":"activity","emoji_order":"1836"},{"name":"drum with drumsticks","shortname":":drum:","category":"activity","emoji_order":"1837"},{"name":"mobile phone","shortname":":iphone:","category":"objects","emoji_order":"1838"},{"name":"mobile phone with rightwards arrow at left","shortname":":calling:","category":"objects","emoji_order":"1839"},{"name":"black telephone","shortname":":telephone:","category":"objects","emoji_order":"1840"},{"name":"telephone receiver","shortname":":telephone_receiver:","category":"objects","emoji_order":"1841"},{"name":"pager","shortname":":pager:","category":"objects","emoji_order":"1842"},{"name":"fax machine","shortname":":fax:","category":"objects","emoji_order":"1843"},{"name":"battery","shortname":":battery:","category":"objects","emoji_order":"1844"},{"name":"electric plug","shortname":":electric_plug:","category":"objects","emoji_order":"1845"},{"name":"personal computer","shortname":":computer:","category":"objects","emoji_order":"1846"},{"name":"desktop computer","shortname":":desktop:","category":"objects","emoji_order":"1847"},{"name":"printer","shortname":":printer:","category":"objects","emoji_order":"1848"},{"name":"keyboard","shortname":":keyboard:","category":"objects","emoji_order":"1849"},{"name":"three button mouse","shortname":":mouse_three_button:","category":"objects","emoji_order":"1850"},{"name":"trackball","shortname":":trackball:","category":"objects","emoji_order":"1851"},{"name":"minidisc","shortname":":minidisc:","category":"objects","emoji_order":"1852"},{"name":"floppy disk","shortname":":floppy_disk:","category":"objects","emoji_order":"1853"},{"name":"optical disc","shortname":":cd:","category":"objects","emoji_order":"1854"},{"name":"dvd","shortname":":dvd:","category":"objects","emoji_order":"1855"},{"name":"movie camera","shortname":":movie_camera:","category":"objects","emoji_order":"1856"},{"name":"film frames","shortname":":film_frames:","category":"objects","emoji_order":"1857"},{"name":"film projector","shortname":":projector:","category":"objects","emoji_order":"1858"},{"name":"clapper board","shortname":":clapper:","category":"activity","emoji_order":"1859"},{"name":"television","shortname":":tv:","category":"objects","emoji_order":"1860"},{"name":"camera","shortname":":camera:","category":"objects","emoji_order":"1861"},{"name":"camera with flash","shortname":":camera_with_flash:","category":"objects","emoji_order":"1862"},{"name":"video camera","shortname":":video_camera:","category":"objects","emoji_order":"1863"},{"name":"videocassette","shortname":":vhs:","category":"objects","emoji_order":"1864"},{"name":"left-pointing magnifying glass","shortname":":mag:","category":"objects","emoji_order":"1865"},{"name":"right-pointing magnifying glass","shortname":":mag_right:","category":"objects","emoji_order":"1866"},{"name":"microscope","shortname":":microscope:","category":"objects","emoji_order":"1867"},{"name":"telescope","shortname":":telescope:","category":"objects","emoji_order":"1868"},{"name":"satellite antenna","shortname":":satellite:","category":"objects","emoji_order":"1869"},{"name":"candle","shortname":":candle:","category":"objects","emoji_order":"1870"},{"name":"electric light bulb","shortname":":bulb:","category":"objects","emoji_order":"1871"},{"name":"electric torch","shortname":":flashlight:","category":"objects","emoji_order":"1872"},{"name":"izakaya lantern","shortname":":izakaya_lantern:","category":"objects","emoji_order":"1873"},{"name":"notebook with decorative cover","shortname":":notebook_with_decorative_cover:","category":"objects","emoji_order":"1874"},{"name":"closed book","shortname":":closed_book:","category":"objects","emoji_order":"1875"},{"name":"open book","shortname":":book:","category":"objects","emoji_order":"1876"},{"name":"green book","shortname":":green_book:","category":"objects","emoji_order":"1877"},{"name":"blue book","shortname":":blue_book:","category":"objects","emoji_order":"1878"},{"name":"orange book","shortname":":orange_book:","category":"objects","emoji_order":"1879"},{"name":"books","shortname":":books:","category":"objects","emoji_order":"1880"},{"name":"notebook","shortname":":notebook:","category":"objects","emoji_order":"1881"},{"name":"ledger","shortname":":ledger:","category":"objects","emoji_order":"1882"},{"name":"page with curl","shortname":":page_with_curl:","category":"objects","emoji_order":"1883"},{"name":"scroll","shortname":":scroll:","category":"objects","emoji_order":"1884"},{"name":"page facing up","shortname":":page_facing_up:","category":"objects","emoji_order":"1885"},{"name":"newspaper","shortname":":newspaper:","category":"objects","emoji_order":"1886"},{"name":"rolled-up newspaper","shortname":":newspaper2:","category":"objects","emoji_order":"1887"},{"name":"bookmark tabs","shortname":":bookmark_tabs:","category":"objects","emoji_order":"1888"},{"name":"bookmark","shortname":":bookmark:","category":"objects","emoji_order":"1889"},{"name":"label","shortname":":label:","category":"objects","emoji_order":"1890"},{"name":"money bag","shortname":":moneybag:","category":"objects","emoji_order":"1891"},{"name":"banknote with yen sign","shortname":":yen:","category":"objects","emoji_order":"1892"},{"name":"banknote with dollar sign","shortname":":dollar:","category":"objects","emoji_order":"1893"},{"name":"banknote with euro sign","shortname":":euro:","category":"objects","emoji_order":"1894"},{"name":"banknote with pound sign","shortname":":pound:","category":"objects","emoji_order":"1895"},{"name":"money with wings","shortname":":money_with_wings:","category":"objects","emoji_order":"1896"},{"name":"credit card","shortname":":credit_card:","category":"objects","emoji_order":"1897"},{"name":"chart with upwards trend and yen sign","shortname":":chart:","category":"symbols","emoji_order":"1898"},{"name":"currency exchange","shortname":":currency_exchange:","category":"symbols","emoji_order":"1899"},{"name":"heavy dollar sign","shortname":":heavy_dollar_sign:","category":"symbols","emoji_order":"1900"},{"name":"envelope","shortname":":envelope:","category":"objects","emoji_order":"1901"},{"name":"e-mail symbol","shortname":":e-mail:","category":"objects","emoji_order":"1902"},{"name":"incoming envelope","shortname":":incoming_envelope:","category":"objects","emoji_order":"1903"},{"name":"envelope with downwards arrow above","shortname":":envelope_with_arrow:","category":"objects","emoji_order":"1904"},{"name":"outbox tray","shortname":":outbox_tray:","category":"objects","emoji_order":"1905"},{"name":"inbox tray","shortname":":inbox_tray:","category":"objects","emoji_order":"1906"},{"name":"package","shortname":":package:","category":"objects","emoji_order":"1907"},{"name":"closed mailbox with raised flag","shortname":":mailbox:","category":"objects","emoji_order":"1908"},{"name":"closed mailbox with lowered flag","shortname":":mailbox_closed:","category":"objects","emoji_order":"1909"},{"name":"open mailbox with raised flag","shortname":":mailbox_with_mail:","category":"objects","emoji_order":"1910"},{"name":"open mailbox with lowered flag","shortname":":mailbox_with_no_mail:","category":"objects","emoji_order":"1911"},{"name":"postbox","shortname":":postbox:","category":"objects","emoji_order":"1912"},{"name":"ballot box with ballot","shortname":":ballot_box:","category":"objects","emoji_order":"1913"},{"name":"pencil","shortname":":pencil2:","category":"objects","emoji_order":"1914"},{"name":"black nib","shortname":":black_nib:","category":"objects","emoji_order":"1915"},{"name":"lower left fountain pen","shortname":":pen_fountain:","category":"objects","emoji_order":"1916"},{"name":"lower left ballpoint pen","shortname":":pen_ballpoint:","category":"objects","emoji_order":"1917"},{"name":"lower left paintbrush","shortname":":paintbrush:","category":"objects","emoji_order":"1918"},{"name":"lower left crayon","shortname":":crayon:","category":"objects","emoji_order":"1919"},{"name":"memo","shortname":":pencil:","category":"objects","emoji_order":"1920"},{"name":"briefcase","shortname":":briefcase:","category":"people","emoji_order":"1921"},{"name":"file folder","shortname":":file_folder:","category":"objects","emoji_order":"1922"},{"name":"open file folder","shortname":":open_file_folder:","category":"objects","emoji_order":"1923"},{"name":"card index dividers","shortname":":dividers:","category":"objects","emoji_order":"1924"},{"name":"calendar","shortname":":date:","category":"objects","emoji_order":"1925"},{"name":"tear-off calendar","shortname":":calendar:","category":"objects","emoji_order":"1926"},{"name":"spiral note pad","shortname":":notepad_spiral:","category":"objects","emoji_order":"1927"},{"name":"spiral calendar pad","shortname":":calendar_spiral:","category":"objects","emoji_order":"1928"},{"name":"card index","shortname":":card_index:","category":"objects","emoji_order":"1929"},{"name":"chart with upwards trend","shortname":":chart_with_upwards_trend:","category":"objects","emoji_order":"1930"},{"name":"chart with downwards trend","shortname":":chart_with_downwards_trend:","category":"objects","emoji_order":"1931"},{"name":"bar chart","shortname":":bar_chart:","category":"objects","emoji_order":"1932"},{"name":"clipboard","shortname":":clipboard:","category":"objects","emoji_order":"1933"},{"name":"pushpin","shortname":":pushpin:","category":"objects","emoji_order":"1934"},{"name":"round pushpin","shortname":":round_pushpin:","category":"objects","emoji_order":"1935"},{"name":"paperclip","shortname":":paperclip:","category":"objects","emoji_order":"1936"},{"name":"linked paperclips","shortname":":paperclips:","category":"objects","emoji_order":"1937"},{"name":"straight ruler","shortname":":straight_ruler:","category":"objects","emoji_order":"1938"},{"name":"triangular ruler","shortname":":triangular_ruler:","category":"objects","emoji_order":"1939"},{"name":"black scissors","shortname":":scissors:","category":"objects","emoji_order":"1940"},{"name":"card file box","shortname":":card_box:","category":"objects","emoji_order":"1941"},{"name":"file cabinet","shortname":":file_cabinet:","category":"objects","emoji_order":"1942"},{"name":"wastebasket","shortname":":wastebasket:","category":"objects","emoji_order":"1943"},{"name":"lock","shortname":":lock:","category":"objects","emoji_order":"1944"},{"name":"open lock","shortname":":unlock:","category":"objects","emoji_order":"1945"},{"name":"lock with ink pen","shortname":":lock_with_ink_pen:","category":"objects","emoji_order":"1946"},{"name":"closed lock with key","shortname":":closed_lock_with_key:","category":"objects","emoji_order":"1947"},{"name":"key","shortname":":key:","category":"objects","emoji_order":"1948"},{"name":"old key","shortname":":key2:","category":"objects","emoji_order":"1949"},{"name":"hammer","shortname":":hammer:","category":"objects","emoji_order":"1950"},{"name":"pick","shortname":":pick:","category":"objects","emoji_order":"1951"},{"name":"hammer and pick","shortname":":hammer_pick:","category":"objects","emoji_order":"1952"},{"name":"hammer and wrench","shortname":":tools:","category":"objects","emoji_order":"1953"},{"name":"dagger knife","shortname":":dagger:","category":"objects","emoji_order":"1954"},{"name":"crossed swords","shortname":":crossed_swords:","category":"objects","emoji_order":"1955"},{"name":"pistol","shortname":":gun:","category":"objects","emoji_order":"1956"},{"name":"bow and arrow","shortname":":bow_and_arrow:","category":"activity","emoji_order":"1957"},{"name":"shield","shortname":":shield:","category":"objects","emoji_order":"1958"},{"name":"wrench","shortname":":wrench:","category":"objects","emoji_order":"1959"},{"name":"nut and bolt","shortname":":nut_and_bolt:","category":"objects","emoji_order":"1960"},{"name":"gear","shortname":":gear:","category":"objects","emoji_order":"1961"},{"name":"compression","shortname":":compression:","category":"objects","emoji_order":"1962"},{"name":"alembic","shortname":":alembic:","category":"objects","emoji_order":"1963"},{"name":"scales","shortname":":scales:","category":"objects","emoji_order":"1964"},{"name":"link symbol","shortname":":link:","category":"objects","emoji_order":"1965"},{"name":"chains","shortname":":chains:","category":"objects","emoji_order":"1966"},{"name":"syringe","shortname":":syringe:","category":"objects","emoji_order":"1967"},{"name":"pill","shortname":":pill:","category":"objects","emoji_order":"1968"},{"name":"smoking symbol","shortname":":smoking:","category":"objects","emoji_order":"1969"},{"name":"coffin","shortname":":coffin:","category":"objects","emoji_order":"1970"},{"name":"funeral urn","shortname":":urn:","category":"objects","emoji_order":"1971"},{"name":"moyai","shortname":":moyai:","category":"objects","emoji_order":"1972"},{"name":"oil drum","shortname":":oil:","category":"objects","emoji_order":"1973"},{"name":"crystal ball","shortname":":crystal_ball:","category":"objects","emoji_order":"1974"},{"name":"shopping trolley","shortname":":shopping_cart:","category":"objects","emoji_order":"1975"},{"name":"automated teller machine","shortname":":atm:","category":"symbols","emoji_order":"1976"},{"name":"put litter in its place symbol","shortname":":put_litter_in_its_place:","category":"symbols","emoji_order":"1977"},{"name":"potable water symbol","shortname":":potable_water:","category":"symbols","emoji_order":"1978"},{"name":"wheelchair symbol","shortname":":wheelchair:","category":"symbols","emoji_order":"1979"},{"name":"mens symbol","shortname":":mens:","category":"symbols","emoji_order":"1980"},{"name":"womens symbol","shortname":":womens:","category":"symbols","emoji_order":"1981"},{"name":"restroom","shortname":":restroom:","category":"symbols","emoji_order":"1982"},{"name":"baby symbol","shortname":":baby_symbol:","category":"symbols","emoji_order":"1983"},{"name":"water closet","shortname":":wc:","category":"symbols","emoji_order":"1984"},{"name":"passport control","shortname":":passport_control:","category":"symbols","emoji_order":"1985"},{"name":"customs","shortname":":customs:","category":"symbols","emoji_order":"1986"},{"name":"baggage claim","shortname":":baggage_claim:","category":"symbols","emoji_order":"1987"},{"name":"left luggage","shortname":":left_luggage:","category":"symbols","emoji_order":"1988"},{"name":"warning sign","shortname":":warning:","category":"symbols","emoji_order":"1989"},{"name":"children crossing","shortname":":children_crossing:","category":"symbols","emoji_order":"1990"},{"name":"no entry","shortname":":no_entry:","category":"symbols","emoji_order":"1991"},{"name":"no entry sign","shortname":":no_entry_sign:","category":"symbols","emoji_order":"1992"},{"name":"no bicycles","shortname":":no_bicycles:","category":"symbols","emoji_order":"1993"},{"name":"no smoking symbol","shortname":":no_smoking:","category":"symbols","emoji_order":"1994"},{"name":"do not litter symbol","shortname":":do_not_litter:","category":"symbols","emoji_order":"1995"},{"name":"non-potable water symbol","shortname":":non-potable_water:","category":"symbols","emoji_order":"1996"},{"name":"no pedestrians","shortname":":no_pedestrians:","category":"symbols","emoji_order":"1997"},{"name":"no mobile phones","shortname":":no_mobile_phones:","category":"symbols","emoji_order":"1998"},{"name":"no one under eighteen symbol","shortname":":underage:","category":"symbols","emoji_order":"1999"},{"name":"radioactive sign","shortname":":radioactive:","category":"symbols","emoji_order":"2000"},{"name":"biohazard sign","shortname":":biohazard:","category":"symbols","emoji_order":"2001"},{"name":"upwards black arrow","shortname":":arrow_up:","category":"symbols","emoji_order":"2002"},{"name":"north east arrow","shortname":":arrow_upper_right:","category":"symbols","emoji_order":"2003"},{"name":"black rightwards arrow","shortname":":arrow_right:","category":"symbols","emoji_order":"2004"},{"name":"south east arrow","shortname":":arrow_lower_right:","category":"symbols","emoji_order":"2005"},{"name":"downwards black arrow","shortname":":arrow_down:","category":"symbols","emoji_order":"2006"},{"name":"south west arrow","shortname":":arrow_lower_left:","category":"symbols","emoji_order":"2007"},{"name":"leftwards black arrow","shortname":":arrow_left:","category":"symbols","emoji_order":"2008"},{"name":"north west arrow","shortname":":arrow_upper_left:","category":"symbols","emoji_order":"2009"},{"name":"up down arrow","shortname":":arrow_up_down:","category":"symbols","emoji_order":"2010"},{"name":"left right arrow","shortname":":left_right_arrow:","category":"symbols","emoji_order":"2011"},{"name":"leftwards arrow with hook","shortname":":leftwards_arrow_with_hook:","category":"symbols","emoji_order":"2012"},{"name":"rightwards arrow with hook","shortname":":arrow_right_hook:","category":"symbols","emoji_order":"2013"},{"name":"arrow pointing rightwards then curving upwards","shortname":":arrow_heading_up:","category":"symbols","emoji_order":"2014"},{"name":"arrow pointing rightwards then curving downwards","shortname":":arrow_heading_down:","category":"symbols","emoji_order":"2015"},{"name":"clockwise downwards and upwards open circle arrows","shortname":":arrows_clockwise:","category":"symbols","emoji_order":"2016"},{"name":"anticlockwise downwards and upwards open circle arrows","shortname":":arrows_counterclockwise:","category":"symbols","emoji_order":"2017"},{"name":"back with leftwards arrow above","shortname":":back:","category":"symbols","emoji_order":"2018"},{"name":"end with leftwards arrow above","shortname":":end:","category":"symbols","emoji_order":"2019"},{"name":"on with exclamation mark with left right arrow abo","shortname":":on:","category":"symbols","emoji_order":"2020"},{"name":"soon with rightwards arrow above","shortname":":soon:","category":"symbols","emoji_order":"2021"},{"name":"top with upwards arrow above","shortname":":top:","category":"symbols","emoji_order":"2022"},{"name":"place of worship","shortname":":place_of_worship:","category":"symbols","emoji_order":"2023"},{"name":"atom symbol","shortname":":atom:","category":"symbols","emoji_order":"2024"},{"name":"om symbol","shortname":":om_symbol:","category":"symbols","emoji_order":"2025"},{"name":"star of david","shortname":":star_of_david:","category":"symbols","emoji_order":"2026"},{"name":"wheel of dharma","shortname":":wheel_of_dharma:","category":"symbols","emoji_order":"2027"},{"name":"yin yang","shortname":":yin_yang:","category":"symbols","emoji_order":"2028"},{"name":"latin cross","shortname":":cross:","category":"symbols","emoji_order":"2029"},{"name":"orthodox cross","shortname":":orthodox_cross:","category":"symbols","emoji_order":"2030"},{"name":"star and crescent","shortname":":star_and_crescent:","category":"symbols","emoji_order":"2031"},{"name":"peace symbol","shortname":":peace:","category":"symbols","emoji_order":"2032"},{"name":"menorah with nine branches","shortname":":menorah:","category":"symbols","emoji_order":"2033"},{"name":"six pointed star with middle dot","shortname":":six_pointed_star:","category":"symbols","emoji_order":"2034"},{"name":"aries","shortname":":aries:","category":"symbols","emoji_order":"2035"},{"name":"taurus","shortname":":taurus:","category":"symbols","emoji_order":"2036"},{"name":"gemini","shortname":":gemini:","category":"symbols","emoji_order":"2037"},{"name":"cancer","shortname":":cancer:","category":"symbols","emoji_order":"2038"},{"name":"leo","shortname":":leo:","category":"symbols","emoji_order":"2039"},{"name":"virgo","shortname":":virgo:","category":"symbols","emoji_order":"2040"},{"name":"libra","shortname":":libra:","category":"symbols","emoji_order":"2041"},{"name":"scorpius","shortname":":scorpius:","category":"symbols","emoji_order":"2042"},{"name":"sagittarius","shortname":":sagittarius:","category":"symbols","emoji_order":"2043"},{"name":"capricorn","shortname":":capricorn:","category":"symbols","emoji_order":"2044"},{"name":"aquarius","shortname":":aquarius:","category":"symbols","emoji_order":"2045"},{"name":"pisces","shortname":":pisces:","category":"symbols","emoji_order":"2046"},{"name":"ophiuchus","shortname":":ophiuchus:","category":"symbols","emoji_order":"2047"},{"name":"twisted rightwards arrows","shortname":":twisted_rightwards_arrows:","category":"symbols","emoji_order":"2048"},{"name":"clockwise rightwards and leftwards open circle arrows","shortname":":repeat:","category":"symbols","emoji_order":"2049"},{"name":"clockwise rightwards and leftwards open circle arrows with circled one overlay","shortname":":repeat_one:","category":"symbols","emoji_order":"2050"},{"name":"black right-pointing triangle","shortname":":arrow_forward:","category":"symbols","emoji_order":"2051"},{"name":"black right-pointing double triangle","shortname":":fast_forward:","category":"symbols","emoji_order":"2052"},{"name":"black right-pointing double triangle with vertical bar","shortname":":track_next:","category":"symbols","emoji_order":"2053"},{"name":"black right-pointing double triangle with double vertical bar","shortname":":play_pause:","category":"symbols","emoji_order":"2054"},{"name":"black left-pointing triangle","shortname":":arrow_backward:","category":"symbols","emoji_order":"2055"},{"name":"black left-pointing double triangle","shortname":":rewind:","category":"symbols","emoji_order":"2056"},{"name":"black left-pointing double triangle with vertical bar","shortname":":track_previous:","category":"symbols","emoji_order":"2057"},{"name":"up-pointing small red triangle","shortname":":arrow_up_small:","category":"symbols","emoji_order":"2058"},{"name":"black up-pointing double triangle","shortname":":arrow_double_up:","category":"symbols","emoji_order":"2059"},{"name":"down-pointing small red triangle","shortname":":arrow_down_small:","category":"symbols","emoji_order":"2060"},{"name":"black down-pointing double triangle","shortname":":arrow_double_down:","category":"symbols","emoji_order":"2061"},{"name":"double vertical bar","shortname":":pause_button:","category":"symbols","emoji_order":"2062"},{"name":"black square for stop","shortname":":stop_button:","category":"symbols","emoji_order":"2063"},{"name":"black circle for record","shortname":":record_button:","category":"symbols","emoji_order":"2064"},{"name":"eject symbol","shortname":":eject:","category":"symbols","emoji_order":"2065"},{"name":"cinema","shortname":":cinema:","category":"symbols","emoji_order":"2066"},{"name":"low brightness symbol","shortname":":low_brightness:","category":"symbols","emoji_order":"2067"},{"name":"high brightness symbol","shortname":":high_brightness:","category":"symbols","emoji_order":"2068"},{"name":"antenna with bars","shortname":":signal_strength:","category":"symbols","emoji_order":"2069"},{"name":"vibration mode","shortname":":vibration_mode:","category":"symbols","emoji_order":"2070"},{"name":"mobile phone off","shortname":":mobile_phone_off:","category":"symbols","emoji_order":"2071"},{"name":"black universal recycling symbol","shortname":":recycle:","category":"symbols","emoji_order":"2072"},{"name":"name badge","shortname":":name_badge:","category":"symbols","emoji_order":"2073"},{"name":"fleur-de-lis","shortname":":fleur-de-lis:","category":"symbols","emoji_order":"2074"},{"name":"japanese symbol for beginner","shortname":":beginner:","category":"symbols","emoji_order":"2075"},{"name":"trident emblem","shortname":":trident:","category":"symbols","emoji_order":"2076"},{"name":"heavy large circle","shortname":":o:","category":"symbols","emoji_order":"2077"},{"name":"white heavy check mark","shortname":":white_check_mark:","category":"symbols","emoji_order":"2078"},{"name":"ballot box with check","shortname":":ballot_box_with_check:","category":"symbols","emoji_order":"2079"},{"name":"heavy check mark","shortname":":heavy_check_mark:","category":"symbols","emoji_order":"2080"},{"name":"heavy multiplication x","shortname":":heavy_multiplication_x:","category":"symbols","emoji_order":"2081"},{"name":"cross mark","shortname":":x:","category":"symbols","emoji_order":"2082"},{"name":"negative squared cross mark","shortname":":negative_squared_cross_mark:","category":"symbols","emoji_order":"2083"},{"name":"heavy plus sign","shortname":":heavy_plus_sign:","category":"symbols","emoji_order":"2084"},{"name":"heavy minus sign","shortname":":heavy_minus_sign:","category":"symbols","emoji_order":"2088"},{"name":"heavy division sign","shortname":":heavy_division_sign:","category":"symbols","emoji_order":"2089"},{"name":"curly loop","shortname":":curly_loop:","category":"symbols","emoji_order":"2090"},{"name":"double curly loop","shortname":":loop:","category":"symbols","emoji_order":"2091"},{"name":"part alternation mark","shortname":":part_alternation_mark:","category":"symbols","emoji_order":"2092"},{"name":"eight spoked asterisk","shortname":":eight_spoked_asterisk:","category":"symbols","emoji_order":"2093"},{"name":"eight pointed black star","shortname":":eight_pointed_black_star:","category":"symbols","emoji_order":"2094"},{"name":"sparkle","shortname":":sparkle:","category":"symbols","emoji_order":"2095"},{"name":"double exclamation mark","shortname":":bangbang:","category":"symbols","emoji_order":"2096"},{"name":"exclamation question mark","shortname":":interrobang:","category":"symbols","emoji_order":"2097"},{"name":"black question mark ornament","shortname":":question:","category":"symbols","emoji_order":"2098"},{"name":"white question mark ornament","shortname":":grey_question:","category":"symbols","emoji_order":"2099"},{"name":"white exclamation mark ornament","shortname":":grey_exclamation:","category":"symbols","emoji_order":"2100"},{"name":"heavy exclamation mark symbol","shortname":":exclamation:","category":"symbols","emoji_order":"2101"},{"name":"wavy dash","shortname":":wavy_dash:","category":"symbols","emoji_order":"2102"},{"name":"copyright sign","shortname":":copyright:","category":"symbols","emoji_order":"2103"},{"name":"registered sign","shortname":":registered:","category":"symbols","emoji_order":"2104"},{"name":"trade mark sign","shortname":":tm:","category":"symbols","emoji_order":"2105"},{"name":"keycap number sign","shortname":":hash:","category":"symbols","emoji_order":"2106"},{"name":"keycap asterisk","shortname":":asterisk:","category":"symbols","emoji_order":"2107"},{"name":"keycap digit zero","shortname":":zero:","category":"symbols","emoji_order":"2108"},{"name":"keycap digit one","shortname":":one:","category":"symbols","emoji_order":"2109"},{"name":"keycap digit two","shortname":":two:","category":"symbols","emoji_order":"2110"},{"name":"keycap digit three","shortname":":three:","category":"symbols","emoji_order":"2111"},{"name":"keycap digit four","shortname":":four:","category":"symbols","emoji_order":"2112"},{"name":"keycap digit five","shortname":":five:","category":"symbols","emoji_order":"2113"},{"name":"keycap digit six","shortname":":six:","category":"symbols","emoji_order":"2114"},{"name":"keycap digit seven","shortname":":seven:","category":"symbols","emoji_order":"2115"},{"name":"keycap digit eight","shortname":":eight:","category":"symbols","emoji_order":"2116"},{"name":"keycap digit nine","shortname":":nine:","category":"symbols","emoji_order":"2117"},{"name":"keycap ten","shortname":":keycap_ten:","category":"symbols","emoji_order":"2118"},{"name":"input symbol for latin capital letters","shortname":":capital_abcd:","category":"symbols","emoji_order":"2120"},{"name":"input symbol for latin small letters","shortname":":abcd:","category":"symbols","emoji_order":"2121"},{"name":"input symbol for symbols","shortname":":symbols:","category":"symbols","emoji_order":"2123"},{"name":"input symbol for latin letters","shortname":":abc:","category":"symbols","emoji_order":"2124"},{"name":"negative squared latin capital letter a","shortname":":a:","category":"symbols","emoji_order":"2125"},{"name":"negative squared ab","shortname":":ab:","category":"symbols","emoji_order":"2126"},{"name":"negative squared latin capital letter b","shortname":":b:","category":"symbols","emoji_order":"2127"},{"name":"squared cl","shortname":":cl:","category":"symbols","emoji_order":"2128"},{"name":"squared cool","shortname":":cool:","category":"symbols","emoji_order":"2129"},{"name":"squared free","shortname":":free:","category":"symbols","emoji_order":"2130"},{"name":"information source","shortname":":information_source:","category":"symbols","emoji_order":"2131"},{"name":"squared id","shortname":":id:","category":"symbols","emoji_order":"2132"},{"name":"circled latin capital letter m","shortname":":m:","category":"symbols","emoji_order":"2133"},{"name":"squared new","shortname":":new:","category":"symbols","emoji_order":"2134"},{"name":"squared ng","shortname":":ng:","category":"symbols","emoji_order":"2135"},{"name":"negative squared latin capital letter o","shortname":":o2:","category":"symbols","emoji_order":"2136"},{"name":"squared ok","shortname":":ok:","category":"symbols","emoji_order":"2137"},{"name":"negative squared latin capital letter p","shortname":":parking:","category":"symbols","emoji_order":"2138"},{"name":"squared sos","shortname":":sos:","category":"symbols","emoji_order":"2139"},{"name":"squared up with exclamation mark","shortname":":up:","category":"symbols","emoji_order":"2140"},{"name":"squared vs","shortname":":vs:","category":"symbols","emoji_order":"2141"},{"name":"squared katakana koko","shortname":":koko:","category":"symbols","emoji_order":"2142"},{"name":"squared katakana sa","shortname":":sa:","category":"symbols","emoji_order":"2143"},{"name":"squared cjk unified ideograph-6708","shortname":":u6708:","category":"symbols","emoji_order":"2144"},{"name":"squared cjk unified ideograph-6709","shortname":":u6709:","category":"symbols","emoji_order":"2145"},{"name":"squared cjk unified ideograph-6307","shortname":":u6307:","category":"symbols","emoji_order":"2146"},{"name":"circled ideograph advantage","shortname":":ideograph_advantage:","category":"symbols","emoji_order":"2147"},{"name":"squared cjk unified ideograph-5272","shortname":":u5272:","category":"symbols","emoji_order":"2148"},{"name":"squared cjk unified ideograph-7121","shortname":":u7121:","category":"symbols","emoji_order":"2149"},{"name":"squared cjk unified ideograph-7981","shortname":":u7981:","category":"symbols","emoji_order":"2150"},{"name":"circled ideograph accept","shortname":":accept:","category":"symbols","emoji_order":"2151"},{"name":"squared cjk unified ideograph-7533","shortname":":u7533:","category":"symbols","emoji_order":"2152"},{"name":"squared cjk unified ideograph-5408","shortname":":u5408:","category":"symbols","emoji_order":"2153"},{"name":"squared cjk unified ideograph-7a7a","shortname":":u7a7a:","category":"symbols","emoji_order":"2154"},{"name":"circled ideograph congratulation","shortname":":congratulations:","category":"symbols","emoji_order":"2155"},{"name":"circled ideograph secret","shortname":":secret:","category":"symbols","emoji_order":"2156"},{"name":"squared cjk unified ideograph-55b6","shortname":":u55b6:","category":"symbols","emoji_order":"2157"},{"name":"squared cjk unified ideograph-6e80","shortname":":u6e80:","category":"symbols","emoji_order":"2158"},{"name":"black small square","shortname":":black_small_square:","category":"symbols","emoji_order":"2159"},{"name":"white small square","shortname":":white_small_square:","category":"symbols","emoji_order":"2160"},{"name":"white medium square","shortname":":white_medium_square:","category":"symbols","emoji_order":"2161"},{"name":"black medium square","shortname":":black_medium_square:","category":"symbols","emoji_order":"2162"},{"name":"white medium small square","shortname":":white_medium_small_square:","category":"symbols","emoji_order":"2163"},{"name":"black medium small square","shortname":":black_medium_small_square:","category":"symbols","emoji_order":"2164"},{"name":"black large square","shortname":":black_large_square:","category":"symbols","emoji_order":"2165"},{"name":"white large square","shortname":":white_large_square:","category":"symbols","emoji_order":"2166"},{"name":"large orange diamond","shortname":":large_orange_diamond:","category":"symbols","emoji_order":"2167"},{"name":"large blue diamond","shortname":":large_blue_diamond:","category":"symbols","emoji_order":"2168"},{"name":"small orange diamond","shortname":":small_orange_diamond:","category":"symbols","emoji_order":"2169"},{"name":"small blue diamond","shortname":":small_blue_diamond:","category":"symbols","emoji_order":"2170"},{"name":"up-pointing red triangle","shortname":":small_red_triangle:","category":"symbols","emoji_order":"2171"},{"name":"down-pointing red triangle","shortname":":small_red_triangle_down:","category":"symbols","emoji_order":"2172"},{"name":"diamond shape with a dot inside","shortname":":diamond_shape_with_a_dot_inside:","category":"symbols","emoji_order":"2173"},{"name":"radio button","shortname":":radio_button:","category":"symbols","emoji_order":"2174"},{"name":"black square button","shortname":":black_square_button:","category":"symbols","emoji_order":"2175"},{"name":"white square button","shortname":":white_square_button:","category":"symbols","emoji_order":"2176"},{"name":"white circle","shortname":":white_circle:","category":"symbols","emoji_order":"2177"},{"name":"black circle","shortname":":black_circle:","category":"symbols","emoji_order":"2178"},{"name":"red circle","shortname":":red_circle:","category":"symbols","emoji_order":"2179"},{"name":"blue circle","shortname":":blue_circle:","category":"symbols","emoji_order":"2180"},{"name":"chequered flag","shortname":":checkered_flag:","category":"travel","emoji_order":"2181"},{"name":"triangular flag on post","shortname":":triangular_flag_on_post:","category":"objects","emoji_order":"2182"},{"name":"crossed flags","shortname":":crossed_flags:","category":"objects","emoji_order":"2183"},{"name":"waving black flag","shortname":":flag_black:","category":"objects","emoji_order":"2184"},{"name":"waving white flag","shortname":":flag_white:","category":"objects","emoji_order":"2185"},{"name":"rainbow_flag","shortname":":rainbow_flag:","category":"objects","emoji_order":"2186"},{"name":"ascension","shortname":":flag_ac:","category":"flags","emoji_order":"2187"},{"name":"andorra","shortname":":flag_ad:","category":"flags","emoji_order":"2188"},{"name":"the united arab emirates","shortname":":flag_ae:","category":"flags","emoji_order":"2189"},{"name":"afghanistan","shortname":":flag_af:","category":"flags","emoji_order":"2190"},{"name":"antigua and barbuda","shortname":":flag_ag:","category":"flags","emoji_order":"2191"},{"name":"anguilla","shortname":":flag_ai:","category":"flags","emoji_order":"2192"},{"name":"albania","shortname":":flag_al:","category":"flags","emoji_order":"2193"},{"name":"armenia","shortname":":flag_am:","category":"flags","emoji_order":"2194"},{"name":"angola","shortname":":flag_ao:","category":"flags","emoji_order":"2195"},{"name":"antarctica","shortname":":flag_aq:","category":"flags","emoji_order":"2196"},{"name":"argentina","shortname":":flag_ar:","category":"flags","emoji_order":"2197"},{"name":"american samoa","shortname":":flag_as:","category":"flags","emoji_order":"2198"},{"name":"austria","shortname":":flag_at:","category":"flags","emoji_order":"2199"},{"name":"australia","shortname":":flag_au:","category":"flags","emoji_order":"2200"},{"name":"aruba","shortname":":flag_aw:","category":"flags","emoji_order":"2201"},{"name":"åland islands","shortname":":flag_ax:","category":"flags","emoji_order":"2202"},{"name":"azerbaijan","shortname":":flag_az:","category":"flags","emoji_order":"2203"},{"name":"bosnia and herzegovina","shortname":":flag_ba:","category":"flags","emoji_order":"2204"},{"name":"barbados","shortname":":flag_bb:","category":"flags","emoji_order":"2205"},{"name":"bangladesh","shortname":":flag_bd:","category":"flags","emoji_order":"2206"},{"name":"belgium","shortname":":flag_be:","category":"flags","emoji_order":"2207"},{"name":"burkina faso","shortname":":flag_bf:","category":"flags","emoji_order":"2208"},{"name":"bulgaria","shortname":":flag_bg:","category":"flags","emoji_order":"2209"},{"name":"bahrain","shortname":":flag_bh:","category":"flags","emoji_order":"2210"},{"name":"burundi","shortname":":flag_bi:","category":"flags","emoji_order":"2211"},{"name":"benin","shortname":":flag_bj:","category":"flags","emoji_order":"2212"},{"name":"saint barthélemy","shortname":":flag_bl:","category":"flags","emoji_order":"2213"},{"name":"bermuda","shortname":":flag_bm:","category":"flags","emoji_order":"2214"},{"name":"brunei","shortname":":flag_bn:","category":"flags","emoji_order":"2215"},{"name":"bolivia","shortname":":flag_bo:","category":"flags","emoji_order":"2216"},{"name":"caribbean netherlands","shortname":":flag_bq:","category":"flags","emoji_order":"2217"},{"name":"brazil","shortname":":flag_br:","category":"flags","emoji_order":"2218"},{"name":"the bahamas","shortname":":flag_bs:","category":"flags","emoji_order":"2219"},{"name":"bhutan","shortname":":flag_bt:","category":"flags","emoji_order":"2220"},{"name":"bouvet island","shortname":":flag_bv:","category":"flags","emoji_order":"2221"},{"name":"botswana","shortname":":flag_bw:","category":"flags","emoji_order":"2222"},{"name":"belarus","shortname":":flag_by:","category":"flags","emoji_order":"2223"},{"name":"belize","shortname":":flag_bz:","category":"flags","emoji_order":"2224"},{"name":"canada","shortname":":flag_ca:","category":"flags","emoji_order":"2225"},{"name":"cocos (keeling) islands","shortname":":flag_cc:","category":"flags","emoji_order":"2226"},{"name":"the democratic republic of the congo","shortname":":flag_cd:","category":"flags","emoji_order":"2227"},{"name":"central african republic","shortname":":flag_cf:","category":"flags","emoji_order":"2228"},{"name":"the republic of the congo","shortname":":flag_cg:","category":"flags","emoji_order":"2229"},{"name":"switzerland","shortname":":flag_ch:","category":"flags","emoji_order":"2230"},{"name":"côte d’ivoire","shortname":":flag_ci:","category":"flags","emoji_order":"2231"},{"name":"cook islands","shortname":":flag_ck:","category":"flags","emoji_order":"2232"},{"name":"chile","shortname":":flag_cl:","category":"flags","emoji_order":"2233"},{"name":"cameroon","shortname":":flag_cm:","category":"flags","emoji_order":"2234"},{"name":"china","shortname":":flag_cn:","category":"flags","emoji_order":"2235"},{"name":"colombia","shortname":":flag_co:","category":"flags","emoji_order":"2236"},{"name":"clipperton island","shortname":":flag_cp:","category":"flags","emoji_order":"2237"},{"name":"costa rica","shortname":":flag_cr:","category":"flags","emoji_order":"2238"},{"name":"cuba","shortname":":flag_cu:","category":"flags","emoji_order":"2239"},{"name":"cape verde","shortname":":flag_cv:","category":"flags","emoji_order":"2240"},{"name":"curaçao","shortname":":flag_cw:","category":"flags","emoji_order":"2241"},{"name":"christmas island","shortname":":flag_cx:","category":"flags","emoji_order":"2242"},{"name":"cyprus","shortname":":flag_cy:","category":"flags","emoji_order":"2243"},{"name":"the czech republic","shortname":":flag_cz:","category":"flags","emoji_order":"2244"},{"name":"germany","shortname":":flag_de:","category":"flags","emoji_order":"2245"},{"name":"diego garcia","shortname":":flag_dg:","category":"flags","emoji_order":"2246"},{"name":"djibouti","shortname":":flag_dj:","category":"flags","emoji_order":"2247"},{"name":"denmark","shortname":":flag_dk:","category":"flags","emoji_order":"2248"},{"name":"dominica","shortname":":flag_dm:","category":"flags","emoji_order":"2249"},{"name":"the dominican republic","shortname":":flag_do:","category":"flags","emoji_order":"2250"},{"name":"algeria","shortname":":flag_dz:","category":"flags","emoji_order":"2251"},{"name":"ceuta, melilla","shortname":":flag_ea:","category":"flags","emoji_order":"2252"},{"name":"ecuador","shortname":":flag_ec:","category":"flags","emoji_order":"2253"},{"name":"estonia","shortname":":flag_ee:","category":"flags","emoji_order":"2254"},{"name":"egypt","shortname":":flag_eg:","category":"flags","emoji_order":"2255"},{"name":"western sahara","shortname":":flag_eh:","category":"flags","emoji_order":"2256"},{"name":"eritrea","shortname":":flag_er:","category":"flags","emoji_order":"2257"},{"name":"spain","shortname":":flag_es:","category":"flags","emoji_order":"2258"},{"name":"ethiopia","shortname":":flag_et:","category":"flags","emoji_order":"2259"},{"name":"european union","shortname":":flag_eu:","category":"flags","emoji_order":"2260"},{"name":"finland","shortname":":flag_fi:","category":"flags","emoji_order":"2261"},{"name":"fiji","shortname":":flag_fj:","category":"flags","emoji_order":"2262"},{"name":"falkland islands","shortname":":flag_fk:","category":"flags","emoji_order":"2263"},{"name":"micronesia","shortname":":flag_fm:","category":"flags","emoji_order":"2264"},{"name":"faroe islands","shortname":":flag_fo:","category":"flags","emoji_order":"2265"},{"name":"france","shortname":":flag_fr:","category":"flags","emoji_order":"2266"},{"name":"gabon","shortname":":flag_ga:","category":"flags","emoji_order":"2267"},{"name":"great britain","shortname":":flag_gb:","category":"flags","emoji_order":"2268"},{"name":"grenada","shortname":":flag_gd:","category":"flags","emoji_order":"2269"},{"name":"georgia","shortname":":flag_ge:","category":"flags","emoji_order":"2270"},{"name":"french guiana","shortname":":flag_gf:","category":"flags","emoji_order":"2271"},{"name":"guernsey","shortname":":flag_gg:","category":"flags","emoji_order":"2272"},{"name":"ghana","shortname":":flag_gh:","category":"flags","emoji_order":"2273"},{"name":"gibraltar","shortname":":flag_gi:","category":"flags","emoji_order":"2274"},{"name":"greenland","shortname":":flag_gl:","category":"flags","emoji_order":"2275"},{"name":"the gambia","shortname":":flag_gm:","category":"flags","emoji_order":"2276"},{"name":"guinea","shortname":":flag_gn:","category":"flags","emoji_order":"2277"},{"name":"guadeloupe","shortname":":flag_gp:","category":"flags","emoji_order":"2278"},{"name":"equatorial guinea","shortname":":flag_gq:","category":"flags","emoji_order":"2279"},{"name":"greece","shortname":":flag_gr:","category":"flags","emoji_order":"2280"},{"name":"south georgia","shortname":":flag_gs:","category":"flags","emoji_order":"2281"},{"name":"guatemala","shortname":":flag_gt:","category":"flags","emoji_order":"2282"},{"name":"guam","shortname":":flag_gu:","category":"flags","emoji_order":"2283"},{"name":"guinea-bissau","shortname":":flag_gw:","category":"flags","emoji_order":"2284"},{"name":"guyana","shortname":":flag_gy:","category":"flags","emoji_order":"2285"},{"name":"hong kong","shortname":":flag_hk:","category":"flags","emoji_order":"2286"},{"name":"heard island and mcdonald islands","shortname":":flag_hm:","category":"flags","emoji_order":"2287"},{"name":"honduras","shortname":":flag_hn:","category":"flags","emoji_order":"2288"},{"name":"croatia","shortname":":flag_hr:","category":"flags","emoji_order":"2289"},{"name":"haiti","shortname":":flag_ht:","category":"flags","emoji_order":"2290"},{"name":"hungary","shortname":":flag_hu:","category":"flags","emoji_order":"2291"},{"name":"canary islands","shortname":":flag_ic:","category":"flags","emoji_order":"2292"},{"name":"indonesia","shortname":":flag_id:","category":"flags","emoji_order":"2293"},{"name":"ireland","shortname":":flag_ie:","category":"flags","emoji_order":"2294"},{"name":"israel","shortname":":flag_il:","category":"flags","emoji_order":"2295"},{"name":"isle of man","shortname":":flag_im:","category":"flags","emoji_order":"2296"},{"name":"india","shortname":":flag_in:","category":"flags","emoji_order":"2297"},{"name":"british indian ocean territory","shortname":":flag_io:","category":"flags","emoji_order":"2298"},{"name":"iraq","shortname":":flag_iq:","category":"flags","emoji_order":"2299"},{"name":"iran","shortname":":flag_ir:","category":"flags","emoji_order":"2300"},{"name":"iceland","shortname":":flag_is:","category":"flags","emoji_order":"2301"},{"name":"italy","shortname":":flag_it:","category":"flags","emoji_order":"2302"},{"name":"jersey","shortname":":flag_je:","category":"flags","emoji_order":"2303"},{"name":"jamaica","shortname":":flag_jm:","category":"flags","emoji_order":"2304"},{"name":"jordan","shortname":":flag_jo:","category":"flags","emoji_order":"2305"},{"name":"japan","shortname":":flag_jp:","category":"flags","emoji_order":"2306"},{"name":"kenya","shortname":":flag_ke:","category":"flags","emoji_order":"2307"},{"name":"kyrgyzstan","shortname":":flag_kg:","category":"flags","emoji_order":"2308"},{"name":"cambodia","shortname":":flag_kh:","category":"flags","emoji_order":"2309"},{"name":"kiribati","shortname":":flag_ki:","category":"flags","emoji_order":"2310"},{"name":"the comoros","shortname":":flag_km:","category":"flags","emoji_order":"2311"},{"name":"saint kitts and nevis","shortname":":flag_kn:","category":"flags","emoji_order":"2312"},{"name":"north korea","shortname":":flag_kp:","category":"flags","emoji_order":"2313"},{"name":"korea","shortname":":flag_kr:","category":"flags","emoji_order":"2314"},{"name":"kuwait","shortname":":flag_kw:","category":"flags","emoji_order":"2315"},{"name":"cayman islands","shortname":":flag_ky:","category":"flags","emoji_order":"2316"},{"name":"kazakhstan","shortname":":flag_kz:","category":"flags","emoji_order":"2317"},{"name":"laos","shortname":":flag_la:","category":"flags","emoji_order":"2318"},{"name":"lebanon","shortname":":flag_lb:","category":"flags","emoji_order":"2319"},{"name":"saint lucia","shortname":":flag_lc:","category":"flags","emoji_order":"2320"},{"name":"liechtenstein","shortname":":flag_li:","category":"flags","emoji_order":"2321"},{"name":"sri lanka","shortname":":flag_lk:","category":"flags","emoji_order":"2322"},{"name":"liberia","shortname":":flag_lr:","category":"flags","emoji_order":"2323"},{"name":"lesotho","shortname":":flag_ls:","category":"flags","emoji_order":"2324"},{"name":"lithuania","shortname":":flag_lt:","category":"flags","emoji_order":"2325"},{"name":"luxembourg","shortname":":flag_lu:","category":"flags","emoji_order":"2326"},{"name":"latvia","shortname":":flag_lv:","category":"flags","emoji_order":"2327"},{"name":"libya","shortname":":flag_ly:","category":"flags","emoji_order":"2328"},{"name":"morocco","shortname":":flag_ma:","category":"flags","emoji_order":"2329"},{"name":"monaco","shortname":":flag_mc:","category":"flags","emoji_order":"2330"},{"name":"moldova","shortname":":flag_md:","category":"flags","emoji_order":"2331"},{"name":"montenegro","shortname":":flag_me:","category":"flags","emoji_order":"2332"},{"name":"saint martin","shortname":":flag_mf:","category":"flags","emoji_order":"2333"},{"name":"madagascar","shortname":":flag_mg:","category":"flags","emoji_order":"2334"},{"name":"the marshall islands","shortname":":flag_mh:","category":"flags","emoji_order":"2335"},{"name":"macedonia","shortname":":flag_mk:","category":"flags","emoji_order":"2336"},{"name":"mali","shortname":":flag_ml:","category":"flags","emoji_order":"2337"},{"name":"myanmar","shortname":":flag_mm:","category":"flags","emoji_order":"2338"},{"name":"mongolia","shortname":":flag_mn:","category":"flags","emoji_order":"2339"},{"name":"macau","shortname":":flag_mo:","category":"flags","emoji_order":"2340"},{"name":"northern mariana islands","shortname":":flag_mp:","category":"flags","emoji_order":"2341"},{"name":"martinique","shortname":":flag_mq:","category":"flags","emoji_order":"2342"},{"name":"mauritania","shortname":":flag_mr:","category":"flags","emoji_order":"2343"},{"name":"montserrat","shortname":":flag_ms:","category":"flags","emoji_order":"2344"},{"name":"malta","shortname":":flag_mt:","category":"flags","emoji_order":"2345"},{"name":"mauritius","shortname":":flag_mu:","category":"flags","emoji_order":"2346"},{"name":"maldives","shortname":":flag_mv:","category":"flags","emoji_order":"2347"},{"name":"malawi","shortname":":flag_mw:","category":"flags","emoji_order":"2348"},{"name":"mexico","shortname":":flag_mx:","category":"flags","emoji_order":"2349"},{"name":"malaysia","shortname":":flag_my:","category":"flags","emoji_order":"2350"},{"name":"mozambique","shortname":":flag_mz:","category":"flags","emoji_order":"2351"},{"name":"namibia","shortname":":flag_na:","category":"flags","emoji_order":"2352"},{"name":"new caledonia","shortname":":flag_nc:","category":"flags","emoji_order":"2353"},{"name":"niger","shortname":":flag_ne:","category":"flags","emoji_order":"2354"},{"name":"norfolk island","shortname":":flag_nf:","category":"flags","emoji_order":"2355"},{"name":"nigeria","shortname":":flag_ng:","category":"flags","emoji_order":"2356"},{"name":"nicaragua","shortname":":flag_ni:","category":"flags","emoji_order":"2357"},{"name":"the netherlands","shortname":":flag_nl:","category":"flags","emoji_order":"2358"},{"name":"norway","shortname":":flag_no:","category":"flags","emoji_order":"2359"},{"name":"nepal","shortname":":flag_np:","category":"flags","emoji_order":"2360"},{"name":"nauru","shortname":":flag_nr:","category":"flags","emoji_order":"2361"},{"name":"niue","shortname":":flag_nu:","category":"flags","emoji_order":"2362"},{"name":"new zealand","shortname":":flag_nz:","category":"flags","emoji_order":"2363"},{"name":"oman","shortname":":flag_om:","category":"flags","emoji_order":"2364"},{"name":"panama","shortname":":flag_pa:","category":"flags","emoji_order":"2365"},{"name":"peru","shortname":":flag_pe:","category":"flags","emoji_order":"2366"},{"name":"french polynesia","shortname":":flag_pf:","category":"flags","emoji_order":"2367"},{"name":"papua new guinea","shortname":":flag_pg:","category":"flags","emoji_order":"2368"},{"name":"the philippines","shortname":":flag_ph:","category":"flags","emoji_order":"2369"},{"name":"pakistan","shortname":":flag_pk:","category":"flags","emoji_order":"2370"},{"name":"poland","shortname":":flag_pl:","category":"flags","emoji_order":"2371"},{"name":"saint pierre and miquelon","shortname":":flag_pm:","category":"flags","emoji_order":"2372"},{"name":"pitcairn","shortname":":flag_pn:","category":"flags","emoji_order":"2373"},{"name":"puerto rico","shortname":":flag_pr:","category":"flags","emoji_order":"2374"},{"name":"palestinian authority","shortname":":flag_ps:","category":"flags","emoji_order":"2375"},{"name":"portugal","shortname":":flag_pt:","category":"flags","emoji_order":"2376"},{"name":"palau","shortname":":flag_pw:","category":"flags","emoji_order":"2377"},{"name":"paraguay","shortname":":flag_py:","category":"flags","emoji_order":"2378"},{"name":"qatar","shortname":":flag_qa:","category":"flags","emoji_order":"2379"},{"name":"réunion","shortname":":flag_re:","category":"flags","emoji_order":"2380"},{"name":"romania","shortname":":flag_ro:","category":"flags","emoji_order":"2381"},{"name":"serbia","shortname":":flag_rs:","category":"flags","emoji_order":"2382"},{"name":"russia","shortname":":flag_ru:","category":"flags","emoji_order":"2383"},{"name":"rwanda","shortname":":flag_rw:","category":"flags","emoji_order":"2384"},{"name":"saudi arabia","shortname":":flag_sa:","category":"flags","emoji_order":"2385"},{"name":"the solomon islands","shortname":":flag_sb:","category":"flags","emoji_order":"2386"},{"name":"the seychelles","shortname":":flag_sc:","category":"flags","emoji_order":"2387"},{"name":"sudan","shortname":":flag_sd:","category":"flags","emoji_order":"2388"},{"name":"sweden","shortname":":flag_se:","category":"flags","emoji_order":"2389"},{"name":"singapore","shortname":":flag_sg:","category":"flags","emoji_order":"2390"},{"name":"saint helena","shortname":":flag_sh:","category":"flags","emoji_order":"2391"},{"name":"slovenia","shortname":":flag_si:","category":"flags","emoji_order":"2392"},{"name":"svalbard and jan mayen","shortname":":flag_sj:","category":"flags","emoji_order":"2393"},{"name":"slovakia","shortname":":flag_sk:","category":"flags","emoji_order":"2394"},{"name":"sierra leone","shortname":":flag_sl:","category":"flags","emoji_order":"2395"},{"name":"san marino","shortname":":flag_sm:","category":"flags","emoji_order":"2396"},{"name":"senegal","shortname":":flag_sn:","category":"flags","emoji_order":"2397"},{"name":"somalia","shortname":":flag_so:","category":"flags","emoji_order":"2398"},{"name":"suriname","shortname":":flag_sr:","category":"flags","emoji_order":"2399"},{"name":"south sudan","shortname":":flag_ss:","category":"flags","emoji_order":"2400"},{"name":"são tomé and príncipe","shortname":":flag_st:","category":"flags","emoji_order":"2401"},{"name":"el salvador","shortname":":flag_sv:","category":"flags","emoji_order":"2402"},{"name":"sint maarten","shortname":":flag_sx:","category":"flags","emoji_order":"2403"},{"name":"syria","shortname":":flag_sy:","category":"flags","emoji_order":"2404"},{"name":"swaziland","shortname":":flag_sz:","category":"flags","emoji_order":"2405"},{"name":"tristan da cunha","shortname":":flag_ta:","category":"flags","emoji_order":"2406"},{"name":"turks and caicos islands","shortname":":flag_tc:","category":"flags","emoji_order":"2407"},{"name":"chad","shortname":":flag_td:","category":"flags","emoji_order":"2408"},{"name":"french southern territories","shortname":":flag_tf:","category":"flags","emoji_order":"2409"},{"name":"togo","shortname":":flag_tg:","category":"flags","emoji_order":"2410"},{"name":"thailand","shortname":":flag_th:","category":"flags","emoji_order":"2411"},{"name":"tajikistan","shortname":":flag_tj:","category":"flags","emoji_order":"2412"},{"name":"tokelau","shortname":":flag_tk:","category":"flags","emoji_order":"2413"},{"name":"timor-leste","shortname":":flag_tl:","category":"flags","emoji_order":"2414"},{"name":"turkmenistan","shortname":":flag_tm:","category":"flags","emoji_order":"2415"},{"name":"tunisia","shortname":":flag_tn:","category":"flags","emoji_order":"2416"},{"name":"tonga","shortname":":flag_to:","category":"flags","emoji_order":"2417"},{"name":"turkey","shortname":":flag_tr:","category":"flags","emoji_order":"2418"},{"name":"trinidad and tobago","shortname":":flag_tt:","category":"flags","emoji_order":"2419"},{"name":"tuvalu","shortname":":flag_tv:","category":"flags","emoji_order":"2420"},{"name":"the republic of china","shortname":":flag_tw:","category":"flags","emoji_order":"2421"},{"name":"tanzania","shortname":":flag_tz:","category":"flags","emoji_order":"2422"},{"name":"ukraine","shortname":":flag_ua:","category":"flags","emoji_order":"2423"},{"name":"uganda","shortname":":flag_ug:","category":"flags","emoji_order":"2424"},{"name":"united states minor outlying islands","shortname":":flag_um:","category":"flags","emoji_order":"2425"},{"name":"united states","shortname":":flag_us:","category":"flags","emoji_order":"2427"},{"name":"uruguay","shortname":":flag_uy:","category":"flags","emoji_order":"2428"},{"name":"uzbekistan","shortname":":flag_uz:","category":"flags","emoji_order":"2429"},{"name":"the vatican city","shortname":":flag_va:","category":"flags","emoji_order":"2430"},{"name":"saint vincent and the grenadines","shortname":":flag_vc:","category":"flags","emoji_order":"2431"},{"name":"venezuela","shortname":":flag_ve:","category":"flags","emoji_order":"2432"},{"name":"british virgin islands","shortname":":flag_vg:","category":"flags","emoji_order":"2433"},{"name":"u.s. virgin islands","shortname":":flag_vi:","category":"flags","emoji_order":"2434"},{"name":"vietnam","shortname":":flag_vn:","category":"flags","emoji_order":"2435"},{"name":"vanuatu","shortname":":flag_vu:","category":"flags","emoji_order":"2436"},{"name":"wallis and futuna","shortname":":flag_wf:","category":"flags","emoji_order":"2437"},{"name":"samoa","shortname":":flag_ws:","category":"flags","emoji_order":"2438"},{"name":"kosovo","shortname":":flag_xk:","category":"flags","emoji_order":"2439"},{"name":"yemen","shortname":":flag_ye:","category":"flags","emoji_order":"2440"},{"name":"mayotte","shortname":":flag_yt:","category":"flags","emoji_order":"2441"},{"name":"south africa","shortname":":flag_za:","category":"flags","emoji_order":"2442"},{"name":"zambia","shortname":":flag_zm:","category":"flags","emoji_order":"2443"},{"name":"zimbabwe","shortname":":flag_zw:","category":"flags","emoji_order":"2444"},{"name":"regional indicator symbol letter z","shortname":":regional_indicator_z:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter y","shortname":":regional_indicator_y:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter x","shortname":":regional_indicator_x:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter w","shortname":":regional_indicator_w:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter v","shortname":":regional_indicator_v:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter u","shortname":":regional_indicator_u:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter t","shortname":":regional_indicator_t:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter s","shortname":":regional_indicator_s:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter r","shortname":":regional_indicator_r:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter q","shortname":":regional_indicator_q:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter p","shortname":":regional_indicator_p:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter o","shortname":":regional_indicator_o:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter n","shortname":":regional_indicator_n:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter m","shortname":":regional_indicator_m:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter l","shortname":":regional_indicator_l:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter k","shortname":":regional_indicator_k:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter j","shortname":":regional_indicator_j:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter i","shortname":":regional_indicator_i:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter h","shortname":":regional_indicator_h:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter g","shortname":":regional_indicator_g:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter f","shortname":":regional_indicator_f:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter e","shortname":":regional_indicator_e:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter d","shortname":":regional_indicator_d:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter c","shortname":":regional_indicator_c:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter b","shortname":":regional_indicator_b:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter a","shortname":":regional_indicator_a:","category":"regional","emoji_order":"12345"}]
\ No newline at end of file
+[{"name":"hundred points symbol","shortname":":100:","category":"symbols","emoji_order":"2119"},{"name":"input symbol for numbers","shortname":":1234:","category":"symbols","emoji_order":"2122"},{"name":"grinning face","shortname":":grinning:","category":"people","emoji_order":"1"},{"name":"grinning face with smiling eyes","shortname":":grin:","category":"people","emoji_order":"2"},{"name":"face with tears of joy","shortname":":joy:","category":"people","emoji_order":"3","aliases_ascii":[":')",":'-)"]},{"name":"rolling on the floor laughing","shortname":":rofl:","category":"people","emoji_order":"4","aliases":[":rolling_on_the_floor_laughing:"]},{"name":"smiling face with open mouth","shortname":":smiley:","category":"people","emoji_order":"5","aliases_ascii":[":D",":-D","=D"]},{"name":"smiling face with open mouth and smiling eyes","shortname":":smile:","category":"people","emoji_order":"6"},{"name":"smiling face with open mouth and cold sweat","shortname":":sweat_smile:","category":"people","emoji_order":"7","aliases_ascii":["':)","':-)","'=)","':D","':-D","'=D"]},{"name":"smiling face with open mouth and tightly-closed eyes","shortname":":laughing:","category":"people","emoji_order":"8","aliases":[":satisfied:"],"aliases_ascii":[">:)",">;)",">:-)",">=)"]},{"name":"winking face","shortname":":wink:","category":"people","emoji_order":"9","aliases_ascii":[";)",";-)","*-)","*)",";-]",";]",";D",";^)"]},{"name":"smiling face with smiling eyes","shortname":":blush:","category":"people","emoji_order":"10"},{"name":"face savouring delicious food","shortname":":yum:","category":"people","emoji_order":"11"},{"name":"smiling face with sunglasses","shortname":":sunglasses:","category":"people","emoji_order":"12","aliases_ascii":["B-)","B)","8)","8-)","B-D","8-D"]},{"name":"smiling face with heart-shaped eyes","shortname":":heart_eyes:","category":"people","emoji_order":"13"},{"name":"face throwing a kiss","shortname":":kissing_heart:","category":"people","emoji_order":"14","aliases_ascii":[":*",":-*","=*",":^*"]},{"name":"kissing face","shortname":":kissing:","category":"people","emoji_order":"15"},{"name":"kissing face with smiling eyes","shortname":":kissing_smiling_eyes:","category":"people","emoji_order":"16"},{"name":"kissing face with closed eyes","shortname":":kissing_closed_eyes:","category":"people","emoji_order":"17"},{"name":"white smiling face","shortname":":relaxed:","category":"people","emoji_order":"18"},{"name":"slightly smiling face","shortname":":slight_smile:","category":"people","emoji_order":"19","aliases":[":slightly_smiling_face:"],"aliases_ascii":[":)",":-)","=]","=)",":]"]},{"name":"hugging face","shortname":":hugging:","category":"people","emoji_order":"20","aliases":[":hugging_face:"]},{"name":"thinking face","shortname":":thinking:","category":"people","emoji_order":"21","aliases":[":thinking_face:"]},{"name":"neutral face","shortname":":neutral_face:","category":"people","emoji_order":"22"},{"name":"expressionless face","shortname":":expressionless:","category":"people","emoji_order":"23","aliases_ascii":["-_-","-__-","-___-"]},{"name":"face without mouth","shortname":":no_mouth:","category":"people","emoji_order":"24","aliases_ascii":[":-X",":X",":-#",":#","=X","=x",":x",":-x","=#"]},{"name":"face with rolling eyes","shortname":":rolling_eyes:","category":"people","emoji_order":"25","aliases":[":face_with_rolling_eyes:"]},{"name":"smirking face","shortname":":smirk:","category":"people","emoji_order":"26"},{"name":"persevering face","shortname":":persevere:","category":"people","emoji_order":"27","aliases_ascii":[">.<"]},{"name":"disappointed but relieved face","shortname":":disappointed_relieved:","category":"people","emoji_order":"28"},{"name":"face with open mouth","shortname":":open_mouth:","category":"people","emoji_order":"29","aliases_ascii":[":-O",":O",":-o",":o","O_O",">:O"]},{"name":"zipper-mouth face","shortname":":zipper_mouth:","category":"people","emoji_order":"30","aliases":[":zipper_mouth_face:"]},{"name":"hushed face","shortname":":hushed:","category":"people","emoji_order":"31"},{"name":"sleepy face","shortname":":sleepy:","category":"people","emoji_order":"32"},{"name":"tired face","shortname":":tired_face:","category":"people","emoji_order":"33"},{"name":"sleeping face","shortname":":sleeping:","category":"people","emoji_order":"34"},{"name":"relieved face","shortname":":relieved:","category":"people","emoji_order":"35"},{"name":"nerd face","shortname":":nerd:","category":"people","emoji_order":"36","aliases":[":nerd_face:"]},{"name":"face with stuck-out tongue","shortname":":stuck_out_tongue:","category":"people","emoji_order":"37","aliases_ascii":[":P",":-P","=P",":-p",":p","=p",":-Þ",":Þ",":þ",":-þ",":-b",":b","d:"]},{"name":"face with stuck-out tongue and winking eye","shortname":":stuck_out_tongue_winking_eye:","category":"people","emoji_order":"38","aliases_ascii":[">:P","X-P","x-p"]},{"name":"face with stuck-out tongue and tightly-closed eyes","shortname":":stuck_out_tongue_closed_eyes:","category":"people","emoji_order":"39"},{"name":"drooling face","shortname":":drooling_face:","category":"people","emoji_order":"40","aliases":[":drool:"]},{"name":"unamused face","shortname":":unamused:","category":"people","emoji_order":"41"},{"name":"face with cold sweat","shortname":":sweat:","category":"people","emoji_order":"42","aliases_ascii":["':(","':-(","'=("]},{"name":"pensive face","shortname":":pensive:","category":"people","emoji_order":"43"},{"name":"confused face","shortname":":confused:","category":"people","emoji_order":"44","aliases_ascii":[">:\\",">:/",":-/",":-.",":/",":\\","=/","=\\",":L","=L"]},{"name":"upside-down face","shortname":":upside_down:","category":"people","emoji_order":"45","aliases":[":upside_down_face:"]},{"name":"money-mouth face","shortname":":money_mouth:","category":"people","emoji_order":"46","aliases":[":money_mouth_face:"]},{"name":"astonished face","shortname":":astonished:","category":"people","emoji_order":"47"},{"name":"white frowning face","shortname":":frowning2:","category":"people","emoji_order":"48","aliases":[":white_frowning_face:"]},{"name":"slightly frowning face","shortname":":slight_frown:","category":"people","emoji_order":"49","aliases":[":slightly_frowning_face:"]},{"name":"confounded face","shortname":":confounded:","category":"people","emoji_order":"50"},{"name":"disappointed face","shortname":":disappointed:","category":"people","emoji_order":"51","aliases_ascii":[">:[",":-(",":(",":-[",":[","=("]},{"name":"worried face","shortname":":worried:","category":"people","emoji_order":"52"},{"name":"face with look of triumph","shortname":":triumph:","category":"people","emoji_order":"53"},{"name":"crying face","shortname":":cry:","category":"people","emoji_order":"54","aliases_ascii":[":'(",":'-(",";(",";-("]},{"name":"loudly crying face","shortname":":sob:","category":"people","emoji_order":"55"},{"name":"frowning face with open mouth","shortname":":frowning:","category":"people","emoji_order":"56"},{"name":"anguished face","shortname":":anguished:","category":"people","emoji_order":"57"},{"name":"fearful face","shortname":":fearful:","category":"people","emoji_order":"58","aliases_ascii":["D:"]},{"name":"weary face","shortname":":weary:","category":"people","emoji_order":"59"},{"name":"grimacing face","shortname":":grimacing:","category":"people","emoji_order":"60"},{"name":"face with open mouth and cold sweat","shortname":":cold_sweat:","category":"people","emoji_order":"61"},{"name":"face screaming in fear","shortname":":scream:","category":"people","emoji_order":"62"},{"name":"flushed face","shortname":":flushed:","category":"people","emoji_order":"63","aliases_ascii":[":$","=$"]},{"name":"dizzy face","shortname":":dizzy_face:","category":"people","emoji_order":"64","aliases_ascii":["#-)","#)","%-)","%)","X)","X-)"]},{"name":"pouting face","shortname":":rage:","category":"people","emoji_order":"65"},{"name":"angry face","shortname":":angry:","category":"people","emoji_order":"66","aliases_ascii":[">:(",">:-(",":@"]},{"name":"smiling face with halo","shortname":":innocent:","category":"people","emoji_order":"67","aliases_ascii":["O:-)","0:-3","0:3","0:-)","0:)","0;^)","O:)","O;-)","O=)","0;-)","O:-3","O:3"]},{"name":"face with cowboy hat","shortname":":cowboy:","category":"people","emoji_order":"68","aliases":[":face_with_cowboy_hat:"]},{"name":"clown face","shortname":":clown:","category":"people","emoji_order":"69","aliases":[":clown_face:"]},{"name":"lying face","shortname":":lying_face:","category":"people","emoji_order":"70","aliases":[":liar:"]},{"name":"face with medical mask","shortname":":mask:","category":"people","emoji_order":"71"},{"name":"face with thermometer","shortname":":thermometer_face:","category":"people","emoji_order":"72","aliases":[":face_with_thermometer:"]},{"name":"face with head-bandage","shortname":":head_bandage:","category":"people","emoji_order":"73","aliases":[":face_with_head_bandage:"]},{"name":"nauseated face","shortname":":nauseated_face:","category":"people","emoji_order":"74","aliases":[":sick:"]},{"name":"sneezing face","shortname":":sneezing_face:","category":"people","emoji_order":"75","aliases":[":sneeze:"]},{"name":"smiling face with horns","shortname":":smiling_imp:","category":"people","emoji_order":"76"},{"name":"imp","shortname":":imp:","category":"people","emoji_order":"77"},{"name":"japanese ogre","shortname":":japanese_ogre:","category":"people","emoji_order":"78"},{"name":"japanese goblin","shortname":":japanese_goblin:","category":"people","emoji_order":"79"},{"name":"skull","shortname":":skull:","category":"people","emoji_order":"80","aliases":[":skeleton:"]},{"name":"skull and crossbones","shortname":":skull_crossbones:","category":"objects","emoji_order":"81","aliases":[":skull_and_crossbones:"]},{"name":"ghost","shortname":":ghost:","category":"people","emoji_order":"82"},{"name":"extraterrestrial alien","shortname":":alien:","category":"people","emoji_order":"83"},{"name":"alien monster","shortname":":space_invader:","category":"activity","emoji_order":"84"},{"name":"robot face","shortname":":robot:","category":"people","emoji_order":"85","aliases":[":robot_face:"]},{"name":"pile of poo","shortname":":poop:","category":"people","emoji_order":"86","aliases":[":shit:",":hankey:",":poo:"]},{"name":"smiling cat face with open mouth","shortname":":smiley_cat:","category":"people","emoji_order":"87"},{"name":"grinning cat face with smiling eyes","shortname":":smile_cat:","category":"people","emoji_order":"88"},{"name":"cat face with tears of joy","shortname":":joy_cat:","category":"people","emoji_order":"89"},{"name":"smiling cat face with heart-shaped eyes","shortname":":heart_eyes_cat:","category":"people","emoji_order":"90"},{"name":"cat face with wry smile","shortname":":smirk_cat:","category":"people","emoji_order":"91"},{"name":"kissing cat face with closed eyes","shortname":":kissing_cat:","category":"people","emoji_order":"92"},{"name":"weary cat face","shortname":":scream_cat:","category":"people","emoji_order":"93"},{"name":"crying cat face","shortname":":crying_cat_face:","category":"people","emoji_order":"94"},{"name":"pouting cat face","shortname":":pouting_cat:","category":"people","emoji_order":"95"},{"name":"see-no-evil monkey","shortname":":see_no_evil:","category":"nature","emoji_order":"96"},{"name":"hear-no-evil monkey","shortname":":hear_no_evil:","category":"nature","emoji_order":"97"},{"name":"speak-no-evil monkey","shortname":":speak_no_evil:","category":"nature","emoji_order":"98"},{"name":"boy","shortname":":boy:","category":"people","emoji_order":"99"},{"name":"boy tone 1","shortname":":boy_tone1:","category":"people","emoji_order":"100"},{"name":"boy tone 2","shortname":":boy_tone2:","category":"people","emoji_order":"101"},{"name":"boy tone 3","shortname":":boy_tone3:","category":"people","emoji_order":"102"},{"name":"boy tone 4","shortname":":boy_tone4:","category":"people","emoji_order":"103"},{"name":"boy tone 5","shortname":":boy_tone5:","category":"people","emoji_order":"104"},{"name":"girl","shortname":":girl:","category":"people","emoji_order":"105"},{"name":"girl tone 1","shortname":":girl_tone1:","category":"people","emoji_order":"106"},{"name":"girl tone 2","shortname":":girl_tone2:","category":"people","emoji_order":"107"},{"name":"girl tone 3","shortname":":girl_tone3:","category":"people","emoji_order":"108"},{"name":"girl tone 4","shortname":":girl_tone4:","category":"people","emoji_order":"109"},{"name":"girl tone 5","shortname":":girl_tone5:","category":"people","emoji_order":"110"},{"name":"man","shortname":":man:","category":"people","emoji_order":"111"},{"name":"man tone 1","shortname":":man_tone1:","category":"people","emoji_order":"112"},{"name":"man tone 2","shortname":":man_tone2:","category":"people","emoji_order":"113"},{"name":"man tone 3","shortname":":man_tone3:","category":"people","emoji_order":"114"},{"name":"man tone 4","shortname":":man_tone4:","category":"people","emoji_order":"115"},{"name":"man tone 5","shortname":":man_tone5:","category":"people","emoji_order":"116"},{"name":"woman","shortname":":woman:","category":"people","emoji_order":"117"},{"name":"woman tone 1","shortname":":woman_tone1:","category":"people","emoji_order":"118"},{"name":"woman tone 2","shortname":":woman_tone2:","category":"people","emoji_order":"119"},{"name":"woman tone 3","shortname":":woman_tone3:","category":"people","emoji_order":"120"},{"name":"woman tone 4","shortname":":woman_tone4:","category":"people","emoji_order":"121"},{"name":"woman tone 5","shortname":":woman_tone5:","category":"people","emoji_order":"122"},{"name":"older man","shortname":":older_man:","category":"people","emoji_order":"123"},{"name":"older man tone 1","shortname":":older_man_tone1:","category":"people","emoji_order":"124"},{"name":"older man tone 2","shortname":":older_man_tone2:","category":"people","emoji_order":"125"},{"name":"older man tone 3","shortname":":older_man_tone3:","category":"people","emoji_order":"126"},{"name":"older man tone 4","shortname":":older_man_tone4:","category":"people","emoji_order":"127"},{"name":"older man tone 5","shortname":":older_man_tone5:","category":"people","emoji_order":"128"},{"name":"older woman","shortname":":older_woman:","category":"people","emoji_order":"129","aliases":[":grandma:"]},{"name":"older woman tone 1","shortname":":older_woman_tone1:","category":"people","emoji_order":"130","aliases":[":grandma_tone1:"]},{"name":"older woman tone 2","shortname":":older_woman_tone2:","category":"people","emoji_order":"131","aliases":[":grandma_tone2:"]},{"name":"older woman tone 3","shortname":":older_woman_tone3:","category":"people","emoji_order":"132","aliases":[":grandma_tone3:"]},{"name":"older woman tone 4","shortname":":older_woman_tone4:","category":"people","emoji_order":"133","aliases":[":grandma_tone4:"]},{"name":"older woman tone 5","shortname":":older_woman_tone5:","category":"people","emoji_order":"134","aliases":[":grandma_tone5:"]},{"name":"baby","shortname":":baby:","category":"people","emoji_order":"135"},{"name":"baby tone 1","shortname":":baby_tone1:","category":"people","emoji_order":"136"},{"name":"baby tone 2","shortname":":baby_tone2:","category":"people","emoji_order":"137"},{"name":"baby tone 3","shortname":":baby_tone3:","category":"people","emoji_order":"138"},{"name":"baby tone 4","shortname":":baby_tone4:","category":"people","emoji_order":"139"},{"name":"baby tone 5","shortname":":baby_tone5:","category":"people","emoji_order":"140"},{"name":"baby angel","shortname":":angel:","category":"people","emoji_order":"141"},{"name":"baby angel tone 1","shortname":":angel_tone1:","category":"people","emoji_order":"142"},{"name":"baby angel tone 2","shortname":":angel_tone2:","category":"people","emoji_order":"143"},{"name":"baby angel tone 3","shortname":":angel_tone3:","category":"people","emoji_order":"144"},{"name":"baby angel tone 4","shortname":":angel_tone4:","category":"people","emoji_order":"145"},{"name":"baby angel tone 5","shortname":":angel_tone5:","category":"people","emoji_order":"146"},{"name":"police officer","shortname":":cop:","category":"people","emoji_order":"339"},{"name":"police officer tone 1","shortname":":cop_tone1:","category":"people","emoji_order":"340"},{"name":"police officer tone 2","shortname":":cop_tone2:","category":"people","emoji_order":"341"},{"name":"police officer tone 3","shortname":":cop_tone3:","category":"people","emoji_order":"342"},{"name":"police officer tone 4","shortname":":cop_tone4:","category":"people","emoji_order":"343"},{"name":"police officer tone 5","shortname":":cop_tone5:","category":"people","emoji_order":"344"},{"name":"sleuth or spy","shortname":":spy:","category":"people","emoji_order":"357","aliases":[":sleuth_or_spy:"]},{"name":"sleuth or spy tone 1","shortname":":spy_tone1:","category":"people","emoji_order":"358","aliases":[":sleuth_or_spy_tone1:"]},{"name":"sleuth or spy tone 2","shortname":":spy_tone2:","category":"people","emoji_order":"359","aliases":[":sleuth_or_spy_tone2:"]},{"name":"sleuth or spy tone 3","shortname":":spy_tone3:","category":"people","emoji_order":"360","aliases":[":sleuth_or_spy_tone3:"]},{"name":"sleuth or spy tone 4","shortname":":spy_tone4:","category":"people","emoji_order":"361","aliases":[":sleuth_or_spy_tone4:"]},{"name":"sleuth or spy tone 5","shortname":":spy_tone5:","category":"people","emoji_order":"362","aliases":[":sleuth_or_spy_tone5:"]},{"name":"guardsman","shortname":":guardsman:","category":"people","emoji_order":"375"},{"name":"guardsman tone 1","shortname":":guardsman_tone1:","category":"people","emoji_order":"376"},{"name":"guardsman tone 2","shortname":":guardsman_tone2:","category":"people","emoji_order":"377"},{"name":"guardsman tone 3","shortname":":guardsman_tone3:","category":"people","emoji_order":"378"},{"name":"guardsman tone 4","shortname":":guardsman_tone4:","category":"people","emoji_order":"379"},{"name":"guardsman tone 5","shortname":":guardsman_tone5:","category":"people","emoji_order":"380"},{"name":"construction worker","shortname":":construction_worker:","category":"people","emoji_order":"393"},{"name":"construction worker tone 1","shortname":":construction_worker_tone1:","category":"people","emoji_order":"394"},{"name":"construction worker tone 2","shortname":":construction_worker_tone2:","category":"people","emoji_order":"395"},{"name":"construction worker tone 3","shortname":":construction_worker_tone3:","category":"people","emoji_order":"396"},{"name":"construction worker tone 4","shortname":":construction_worker_tone4:","category":"people","emoji_order":"397"},{"name":"construction worker tone 5","shortname":":construction_worker_tone5:","category":"people","emoji_order":"398"},{"name":"man with turban","shortname":":man_with_turban:","category":"people","emoji_order":"411"},{"name":"man with turban tone 1","shortname":":man_with_turban_tone1:","category":"people","emoji_order":"412"},{"name":"man with turban tone 2","shortname":":man_with_turban_tone2:","category":"people","emoji_order":"413"},{"name":"man with turban tone 3","shortname":":man_with_turban_tone3:","category":"people","emoji_order":"414"},{"name":"man with turban tone 4","shortname":":man_with_turban_tone4:","category":"people","emoji_order":"415"},{"name":"man with turban tone 5","shortname":":man_with_turban_tone5:","category":"people","emoji_order":"416"},{"name":"person with blond hair","shortname":":person_with_blond_hair:","category":"people","emoji_order":"429"},{"name":"person with blond hair tone 1","shortname":":person_with_blond_hair_tone1:","category":"people","emoji_order":"430"},{"name":"person with blond hair tone 2","shortname":":person_with_blond_hair_tone2:","category":"people","emoji_order":"431"},{"name":"person with blond hair tone 3","shortname":":person_with_blond_hair_tone3:","category":"people","emoji_order":"432"},{"name":"person with blond hair tone 4","shortname":":person_with_blond_hair_tone4:","category":"people","emoji_order":"433"},{"name":"person with blond hair tone 5","shortname":":person_with_blond_hair_tone5:","category":"people","emoji_order":"434"},{"name":"father christmas","shortname":":santa:","category":"people","emoji_order":"447"},{"name":"father christmas tone 1","shortname":":santa_tone1:","category":"people","emoji_order":"448"},{"name":"father christmas tone 2","shortname":":santa_tone2:","category":"people","emoji_order":"449"},{"name":"father christmas tone 3","shortname":":santa_tone3:","category":"people","emoji_order":"450"},{"name":"father christmas tone 4","shortname":":santa_tone4:","category":"people","emoji_order":"451"},{"name":"father christmas tone 5","shortname":":santa_tone5:","category":"people","emoji_order":"452"},{"name":"mother christmas","shortname":":mrs_claus:","category":"people","emoji_order":"453","aliases":[":mother_christmas:"]},{"name":"mother christmas tone 1","shortname":":mrs_claus_tone1:","category":"people","emoji_order":"454","aliases":[":mother_christmas_tone1:"]},{"name":"mother christmas tone 2","shortname":":mrs_claus_tone2:","category":"people","emoji_order":"455","aliases":[":mother_christmas_tone2:"]},{"name":"mother christmas tone 3","shortname":":mrs_claus_tone3:","category":"people","emoji_order":"456","aliases":[":mother_christmas_tone3:"]},{"name":"mother christmas tone 4","shortname":":mrs_claus_tone4:","category":"people","emoji_order":"457","aliases":[":mother_christmas_tone4:"]},{"name":"mother christmas tone 5","shortname":":mrs_claus_tone5:","category":"people","emoji_order":"458","aliases":[":mother_christmas_tone5:"]},{"name":"princess","shortname":":princess:","category":"people","emoji_order":"459"},{"name":"princess tone 1","shortname":":princess_tone1:","category":"people","emoji_order":"460"},{"name":"princess tone 2","shortname":":princess_tone2:","category":"people","emoji_order":"461"},{"name":"princess tone 3","shortname":":princess_tone3:","category":"people","emoji_order":"462"},{"name":"princess tone 4","shortname":":princess_tone4:","category":"people","emoji_order":"463"},{"name":"princess tone 5","shortname":":princess_tone5:","category":"people","emoji_order":"464"},{"name":"prince","shortname":":prince:","category":"people","emoji_order":"465"},{"name":"prince tone 1","shortname":":prince_tone1:","category":"people","emoji_order":"466"},{"name":"prince tone 2","shortname":":prince_tone2:","category":"people","emoji_order":"467"},{"name":"prince tone 3","shortname":":prince_tone3:","category":"people","emoji_order":"468"},{"name":"prince tone 4","shortname":":prince_tone4:","category":"people","emoji_order":"469"},{"name":"prince tone 5","shortname":":prince_tone5:","category":"people","emoji_order":"470"},{"name":"bride with veil","shortname":":bride_with_veil:","category":"people","emoji_order":"471"},{"name":"bride with veil tone 1","shortname":":bride_with_veil_tone1:","category":"people","emoji_order":"472"},{"name":"bride with veil tone 2","shortname":":bride_with_veil_tone2:","category":"people","emoji_order":"473"},{"name":"bride with veil tone 3","shortname":":bride_with_veil_tone3:","category":"people","emoji_order":"474"},{"name":"bride with veil tone 4","shortname":":bride_with_veil_tone4:","category":"people","emoji_order":"475"},{"name":"bride with veil tone 5","shortname":":bride_with_veil_tone5:","category":"people","emoji_order":"476"},{"name":"man in tuxedo","shortname":":man_in_tuxedo:","category":"people","emoji_order":"477"},{"name":"man in tuxedo tone 1","shortname":":man_in_tuxedo_tone1:","category":"people","emoji_order":"478","aliases":[":tuxedo_tone1:"]},{"name":"man in tuxedo tone 2","shortname":":man_in_tuxedo_tone2:","category":"people","emoji_order":"479","aliases":[":tuxedo_tone2:"]},{"name":"man in tuxedo tone 3","shortname":":man_in_tuxedo_tone3:","category":"people","emoji_order":"480","aliases":[":tuxedo_tone3:"]},{"name":"man in tuxedo tone 4","shortname":":man_in_tuxedo_tone4:","category":"people","emoji_order":"481","aliases":[":tuxedo_tone4:"]},{"name":"man in tuxedo tone 5","shortname":":man_in_tuxedo_tone5:","category":"people","emoji_order":"482","aliases":[":tuxedo_tone5:"]},{"name":"pregnant woman","shortname":":pregnant_woman:","category":"people","emoji_order":"483","aliases":[":expecting_woman:"]},{"name":"pregnant woman tone 1","shortname":":pregnant_woman_tone1:","category":"people","emoji_order":"484","aliases":[":expecting_woman_tone1:"]},{"name":"pregnant woman tone 2","shortname":":pregnant_woman_tone2:","category":"people","emoji_order":"485","aliases":[":expecting_woman_tone2:"]},{"name":"pregnant woman tone 3","shortname":":pregnant_woman_tone3:","category":"people","emoji_order":"486","aliases":[":expecting_woman_tone3:"]},{"name":"pregnant woman tone 4","shortname":":pregnant_woman_tone4:","category":"people","emoji_order":"487","aliases":[":expecting_woman_tone4:"]},{"name":"pregnant woman tone 5","shortname":":pregnant_woman_tone5:","category":"people","emoji_order":"488","aliases":[":expecting_woman_tone5:"]},{"name":"man with gua pi mao","shortname":":man_with_gua_pi_mao:","category":"people","emoji_order":"489"},{"name":"man with gua pi mao tone 1","shortname":":man_with_gua_pi_mao_tone1:","category":"people","emoji_order":"490"},{"name":"man with gua pi mao tone 2","shortname":":man_with_gua_pi_mao_tone2:","category":"people","emoji_order":"491"},{"name":"man with gua pi mao tone 3","shortname":":man_with_gua_pi_mao_tone3:","category":"people","emoji_order":"492"},{"name":"man with gua pi mao tone 4","shortname":":man_with_gua_pi_mao_tone4:","category":"people","emoji_order":"493"},{"name":"man with gua pi mao tone 5","shortname":":man_with_gua_pi_mao_tone5:","category":"people","emoji_order":"494"},{"name":"person frowning","shortname":":person_frowning:","category":"people","emoji_order":"495"},{"name":"person frowning tone 1","shortname":":person_frowning_tone1:","category":"people","emoji_order":"496"},{"name":"person frowning tone 2","shortname":":person_frowning_tone2:","category":"people","emoji_order":"497"},{"name":"person frowning tone 3","shortname":":person_frowning_tone3:","category":"people","emoji_order":"498"},{"name":"person frowning tone 4","shortname":":person_frowning_tone4:","category":"people","emoji_order":"499"},{"name":"person frowning tone 5","shortname":":person_frowning_tone5:","category":"people","emoji_order":"500"},{"name":"person with pouting face","shortname":":person_with_pouting_face:","category":"people","emoji_order":"513"},{"name":"person with pouting face tone1","shortname":":person_with_pouting_face_tone1:","category":"people","emoji_order":"514"},{"name":"person with pouting face tone2","shortname":":person_with_pouting_face_tone2:","category":"people","emoji_order":"515"},{"name":"person with pouting face tone3","shortname":":person_with_pouting_face_tone3:","category":"people","emoji_order":"516"},{"name":"person with pouting face tone4","shortname":":person_with_pouting_face_tone4:","category":"people","emoji_order":"517"},{"name":"person with pouting face tone5","shortname":":person_with_pouting_face_tone5:","category":"people","emoji_order":"518"},{"name":"face with no good gesture","shortname":":no_good:","category":"people","emoji_order":"531"},{"name":"face with no good gesture tone 1","shortname":":no_good_tone1:","category":"people","emoji_order":"532"},{"name":"face with no good gesture tone 2","shortname":":no_good_tone2:","category":"people","emoji_order":"533"},{"name":"face with no good gesture tone 3","shortname":":no_good_tone3:","category":"people","emoji_order":"534"},{"name":"face with no good gesture tone 4","shortname":":no_good_tone4:","category":"people","emoji_order":"535"},{"name":"face with no good gesture tone 5","shortname":":no_good_tone5:","category":"people","emoji_order":"536"},{"name":"face with ok gesture","shortname":":ok_woman:","category":"people","emoji_order":"549","aliases_ascii":["*\\0/*","\\0/","*\\O/*","\\O/"]},{"name":"face with ok gesture tone1","shortname":":ok_woman_tone1:","category":"people","emoji_order":"550"},{"name":"face with ok gesture tone2","shortname":":ok_woman_tone2:","category":"people","emoji_order":"551"},{"name":"face with ok gesture tone3","shortname":":ok_woman_tone3:","category":"people","emoji_order":"552"},{"name":"face with ok gesture tone4","shortname":":ok_woman_tone4:","category":"people","emoji_order":"553"},{"name":"face with ok gesture tone5","shortname":":ok_woman_tone5:","category":"people","emoji_order":"554"},{"name":"information desk person","shortname":":information_desk_person:","category":"people","emoji_order":"567"},{"name":"information desk person tone 1","shortname":":information_desk_person_tone1:","category":"people","emoji_order":"568"},{"name":"information desk person tone 2","shortname":":information_desk_person_tone2:","category":"people","emoji_order":"569"},{"name":"information desk person tone 3","shortname":":information_desk_person_tone3:","category":"people","emoji_order":"570"},{"name":"information desk person tone 4","shortname":":information_desk_person_tone4:","category":"people","emoji_order":"571"},{"name":"information desk person tone 5","shortname":":information_desk_person_tone5:","category":"people","emoji_order":"572"},{"name":"happy person raising one hand","shortname":":raising_hand:","category":"people","emoji_order":"585"},{"name":"happy person raising one hand tone1","shortname":":raising_hand_tone1:","category":"people","emoji_order":"586"},{"name":"happy person raising one hand tone2","shortname":":raising_hand_tone2:","category":"people","emoji_order":"587"},{"name":"happy person raising one hand tone3","shortname":":raising_hand_tone3:","category":"people","emoji_order":"588"},{"name":"happy person raising one hand tone4","shortname":":raising_hand_tone4:","category":"people","emoji_order":"589"},{"name":"happy person raising one hand tone5","shortname":":raising_hand_tone5:","category":"people","emoji_order":"590"},{"name":"person bowing deeply","shortname":":bow:","category":"people","emoji_order":"603"},{"name":"person bowing deeply tone 1","shortname":":bow_tone1:","category":"people","emoji_order":"604"},{"name":"person bowing deeply tone 2","shortname":":bow_tone2:","category":"people","emoji_order":"605"},{"name":"person bowing deeply tone 3","shortname":":bow_tone3:","category":"people","emoji_order":"606"},{"name":"person bowing deeply tone 4","shortname":":bow_tone4:","category":"people","emoji_order":"607"},{"name":"person bowing deeply tone 5","shortname":":bow_tone5:","category":"people","emoji_order":"608"},{"name":"face palm","shortname":":face_palm:","category":"people","emoji_order":"621","aliases":[":facepalm:"]},{"name":"face palm tone 1","shortname":":face_palm_tone1:","category":"people","emoji_order":"622","aliases":[":facepalm_tone1:"]},{"name":"face palm tone 2","shortname":":face_palm_tone2:","category":"people","emoji_order":"623","aliases":[":facepalm_tone2:"]},{"name":"face palm tone 3","shortname":":face_palm_tone3:","category":"people","emoji_order":"624","aliases":[":facepalm_tone3:"]},{"name":"face palm tone 4","shortname":":face_palm_tone4:","category":"people","emoji_order":"625","aliases":[":facepalm_tone4:"]},{"name":"face palm tone 5","shortname":":face_palm_tone5:","category":"people","emoji_order":"626","aliases":[":facepalm_tone5:"]},{"name":"shrug","shortname":":shrug:","category":"people","emoji_order":"639"},{"name":"shrug tone 1","shortname":":shrug_tone1:","category":"people","emoji_order":"640"},{"name":"shrug tone 2","shortname":":shrug_tone2:","category":"people","emoji_order":"641"},{"name":"shrug tone 3","shortname":":shrug_tone3:","category":"people","emoji_order":"642"},{"name":"shrug tone 4","shortname":":shrug_tone4:","category":"people","emoji_order":"643"},{"name":"shrug tone 5","shortname":":shrug_tone5:","category":"people","emoji_order":"644"},{"name":"face massage","shortname":":massage:","category":"people","emoji_order":"657"},{"name":"face massage tone 1","shortname":":massage_tone1:","category":"people","emoji_order":"658"},{"name":"face massage tone 2","shortname":":massage_tone2:","category":"people","emoji_order":"659"},{"name":"face massage tone 3","shortname":":massage_tone3:","category":"people","emoji_order":"660"},{"name":"face massage tone 4","shortname":":massage_tone4:","category":"people","emoji_order":"661"},{"name":"face massage tone 5","shortname":":massage_tone5:","category":"people","emoji_order":"662"},{"name":"haircut","shortname":":haircut:","category":"people","emoji_order":"675"},{"name":"haircut tone 1","shortname":":haircut_tone1:","category":"people","emoji_order":"676"},{"name":"haircut tone 2","shortname":":haircut_tone2:","category":"people","emoji_order":"677"},{"name":"haircut tone 3","shortname":":haircut_tone3:","category":"people","emoji_order":"678"},{"name":"haircut tone 4","shortname":":haircut_tone4:","category":"people","emoji_order":"679"},{"name":"haircut tone 5","shortname":":haircut_tone5:","category":"people","emoji_order":"680"},{"name":"pedestrian","shortname":":walking:","category":"people","emoji_order":"693"},{"name":"pedestrian tone 1","shortname":":walking_tone1:","category":"people","emoji_order":"694"},{"name":"pedestrian tone 2","shortname":":walking_tone2:","category":"people","emoji_order":"695"},{"name":"pedestrian tone 3","shortname":":walking_tone3:","category":"people","emoji_order":"696"},{"name":"pedestrian tone 4","shortname":":walking_tone4:","category":"people","emoji_order":"697"},{"name":"pedestrian tone 5","shortname":":walking_tone5:","category":"people","emoji_order":"698"},{"name":"runner","shortname":":runner:","category":"people","emoji_order":"711"},{"name":"runner tone 1","shortname":":runner_tone1:","category":"people","emoji_order":"712"},{"name":"runner tone 2","shortname":":runner_tone2:","category":"people","emoji_order":"713"},{"name":"runner tone 3","shortname":":runner_tone3:","category":"people","emoji_order":"714"},{"name":"runner tone 4","shortname":":runner_tone4:","category":"people","emoji_order":"715"},{"name":"runner tone 5","shortname":":runner_tone5:","category":"people","emoji_order":"716"},{"name":"dancer","shortname":":dancer:","category":"people","emoji_order":"729"},{"name":"dancer tone 1","shortname":":dancer_tone1:","category":"people","emoji_order":"730"},{"name":"dancer tone 2","shortname":":dancer_tone2:","category":"people","emoji_order":"731"},{"name":"dancer tone 3","shortname":":dancer_tone3:","category":"people","emoji_order":"732"},{"name":"dancer tone 4","shortname":":dancer_tone4:","category":"people","emoji_order":"733"},{"name":"dancer tone 5","shortname":":dancer_tone5:","category":"people","emoji_order":"734"},{"name":"man dancing","shortname":":man_dancing:","category":"people","emoji_order":"735","aliases":[":male_dancer:"]},{"name":"man dancing tone 1","shortname":":man_dancing_tone1:","category":"people","emoji_order":"736","aliases":[":male_dancer_tone1:"]},{"name":"man dancing tone 2","shortname":":man_dancing_tone2:","category":"people","emoji_order":"737","aliases":[":male_dancer_tone2:"]},{"name":"man dancing tone 3","shortname":":man_dancing_tone3:","category":"people","emoji_order":"738","aliases":[":male_dancer_tone3:"]},{"name":"man dancing tone 4","shortname":":man_dancing_tone4:","category":"people","emoji_order":"739","aliases":[":male_dancer_tone4:"]},{"name":"man dancing tone 5","shortname":":man_dancing_tone5:","category":"people","emoji_order":"740","aliases":[":male_dancer_tone5:"]},{"name":"woman with bunny ears","shortname":":dancers:","category":"people","emoji_order":"741"},{"name":"man in business suit levitating","shortname":":levitate:","category":"activity","emoji_order":"759","aliases":[":man_in_business_suit_levitating:"]},{"name":"speaking head in silhouette","shortname":":speaking_head:","category":"people","emoji_order":"765","aliases":[":speaking_head_in_silhouette:"]},{"name":"bust in silhouette","shortname":":bust_in_silhouette:","category":"people","emoji_order":"766"},{"name":"busts in silhouette","shortname":":busts_in_silhouette:","category":"people","emoji_order":"767"},{"name":"fencer","shortname":":fencer:","category":"activity","emoji_order":"768","aliases":[":fencing:"]},{"name":"horse racing","shortname":":horse_racing:","category":"activity","emoji_order":"769"},{"name":"horse racing tone 1","shortname":":horse_racing_tone1:","category":"activity","emoji_order":"770"},{"name":"horse racing tone 2","shortname":":horse_racing_tone2:","category":"activity","emoji_order":"771"},{"name":"horse racing tone 3","shortname":":horse_racing_tone3:","category":"activity","emoji_order":"772"},{"name":"horse racing tone 4","shortname":":horse_racing_tone4:","category":"activity","emoji_order":"773"},{"name":"horse racing tone 5","shortname":":horse_racing_tone5:","category":"activity","emoji_order":"774"},{"name":"skier","shortname":":skier:","category":"activity","emoji_order":"775"},{"name":"snowboarder","shortname":":snowboarder:","category":"activity","emoji_order":"776"},{"name":"golfer","shortname":":golfer:","category":"activity","emoji_order":"782"},{"name":"surfer","shortname":":surfer:","category":"activity","emoji_order":"800"},{"name":"surfer tone 1","shortname":":surfer_tone1:","category":"activity","emoji_order":"801"},{"name":"surfer tone 2","shortname":":surfer_tone2:","category":"activity","emoji_order":"802"},{"name":"surfer tone 3","shortname":":surfer_tone3:","category":"activity","emoji_order":"803"},{"name":"surfer tone 4","shortname":":surfer_tone4:","category":"activity","emoji_order":"804"},{"name":"surfer tone 5","shortname":":surfer_tone5:","category":"activity","emoji_order":"805"},{"name":"rowboat","shortname":":rowboat:","category":"activity","emoji_order":"818"},{"name":"rowboat tone 1","shortname":":rowboat_tone1:","category":"activity","emoji_order":"819"},{"name":"rowboat tone 2","shortname":":rowboat_tone2:","category":"activity","emoji_order":"820"},{"name":"rowboat tone 3","shortname":":rowboat_tone3:","category":"activity","emoji_order":"821"},{"name":"rowboat tone 4","shortname":":rowboat_tone4:","category":"activity","emoji_order":"822"},{"name":"rowboat tone 5","shortname":":rowboat_tone5:","category":"activity","emoji_order":"823"},{"name":"swimmer","shortname":":swimmer:","category":"activity","emoji_order":"836"},{"name":"swimmer tone 1","shortname":":swimmer_tone1:","category":"activity","emoji_order":"837"},{"name":"swimmer tone 2","shortname":":swimmer_tone2:","category":"activity","emoji_order":"838"},{"name":"swimmer tone 3","shortname":":swimmer_tone3:","category":"activity","emoji_order":"839"},{"name":"swimmer tone 4","shortname":":swimmer_tone4:","category":"activity","emoji_order":"840"},{"name":"swimmer tone 5","shortname":":swimmer_tone5:","category":"activity","emoji_order":"841"},{"name":"person with ball","shortname":":basketball_player:","category":"activity","emoji_order":"854","aliases":[":person_with_ball:"]},{"name":"person with ball tone 1","shortname":":basketball_player_tone1:","category":"activity","emoji_order":"855","aliases":[":person_with_ball_tone1:"]},{"name":"person with ball tone 2","shortname":":basketball_player_tone2:","category":"activity","emoji_order":"856","aliases":[":person_with_ball_tone2:"]},{"name":"person with ball tone 3","shortname":":basketball_player_tone3:","category":"activity","emoji_order":"857","aliases":[":person_with_ball_tone3:"]},{"name":"person with ball tone 4","shortname":":basketball_player_tone4:","category":"activity","emoji_order":"858","aliases":[":person_with_ball_tone4:"]},{"name":"person with ball tone 5","shortname":":basketball_player_tone5:","category":"activity","emoji_order":"859","aliases":[":person_with_ball_tone5:"]},{"name":"weight lifter","shortname":":lifter:","category":"activity","emoji_order":"872","aliases":[":weight_lifter:"]},{"name":"weight lifter tone 1","shortname":":lifter_tone1:","category":"activity","emoji_order":"873","aliases":[":weight_lifter_tone1:"]},{"name":"weight lifter tone 2","shortname":":lifter_tone2:","category":"activity","emoji_order":"874","aliases":[":weight_lifter_tone2:"]},{"name":"weight lifter tone 3","shortname":":lifter_tone3:","category":"activity","emoji_order":"875","aliases":[":weight_lifter_tone3:"]},{"name":"weight lifter tone 4","shortname":":lifter_tone4:","category":"activity","emoji_order":"876","aliases":[":weight_lifter_tone4:"]},{"name":"weight lifter tone 5","shortname":":lifter_tone5:","category":"activity","emoji_order":"877","aliases":[":weight_lifter_tone5:"]},{"name":"bicyclist","shortname":":bicyclist:","category":"activity","emoji_order":"890"},{"name":"bicyclist tone 1","shortname":":bicyclist_tone1:","category":"activity","emoji_order":"891"},{"name":"bicyclist tone 2","shortname":":bicyclist_tone2:","category":"activity","emoji_order":"892"},{"name":"bicyclist tone 3","shortname":":bicyclist_tone3:","category":"activity","emoji_order":"893"},{"name":"bicyclist tone 4","shortname":":bicyclist_tone4:","category":"activity","emoji_order":"894"},{"name":"bicyclist tone 5","shortname":":bicyclist_tone5:","category":"activity","emoji_order":"895"},{"name":"mountain bicyclist","shortname":":mountain_bicyclist:","category":"activity","emoji_order":"908"},{"name":"mountain bicyclist tone 1","shortname":":mountain_bicyclist_tone1:","category":"activity","emoji_order":"909"},{"name":"mountain bicyclist tone 2","shortname":":mountain_bicyclist_tone2:","category":"activity","emoji_order":"910"},{"name":"mountain bicyclist tone 3","shortname":":mountain_bicyclist_tone3:","category":"activity","emoji_order":"911"},{"name":"mountain bicyclist tone 4","shortname":":mountain_bicyclist_tone4:","category":"activity","emoji_order":"912"},{"name":"mountain bicyclist tone 5","shortname":":mountain_bicyclist_tone5:","category":"activity","emoji_order":"913"},{"name":"racing car","shortname":":race_car:","category":"travel","emoji_order":"926","aliases":[":racing_car:"]},{"name":"racing motorcycle","shortname":":motorcycle:","category":"travel","emoji_order":"927","aliases":[":racing_motorcycle:"]},{"name":"person doing cartwheel","shortname":":cartwheel:","category":"activity","emoji_order":"928","aliases":[":person_doing_cartwheel:"]},{"name":"person doing cartwheel tone 1","shortname":":cartwheel_tone1:","category":"activity","emoji_order":"929","aliases":[":person_doing_cartwheel_tone1:"]},{"name":"person doing cartwheel tone 2","shortname":":cartwheel_tone2:","category":"activity","emoji_order":"930","aliases":[":person_doing_cartwheel_tone2:"]},{"name":"person doing cartwheel tone 3","shortname":":cartwheel_tone3:","category":"activity","emoji_order":"931","aliases":[":person_doing_cartwheel_tone3:"]},{"name":"person doing cartwheel tone 4","shortname":":cartwheel_tone4:","category":"activity","emoji_order":"932","aliases":[":person_doing_cartwheel_tone4:"]},{"name":"person doing cartwheel tone 5","shortname":":cartwheel_tone5:","category":"activity","emoji_order":"933","aliases":[":person_doing_cartwheel_tone5:"]},{"name":"wrestlers","shortname":":wrestlers:","category":"activity","emoji_order":"946","aliases":[":wrestling:"]},{"name":"wrestlers tone 1","shortname":":wrestlers_tone1:","category":"activity","emoji_order":"947","aliases":[":wrestling_tone1:"]},{"name":"wrestlers tone 2","shortname":":wrestlers_tone2:","category":"activity","emoji_order":"948","aliases":[":wrestling_tone2:"]},{"name":"wrestlers tone 3","shortname":":wrestlers_tone3:","category":"activity","emoji_order":"949","aliases":[":wrestling_tone3:"]},{"name":"wrestlers tone 4","shortname":":wrestlers_tone4:","category":"activity","emoji_order":"950","aliases":[":wrestling_tone4:"]},{"name":"wrestlers tone 5","shortname":":wrestlers_tone5:","category":"activity","emoji_order":"951","aliases":[":wrestling_tone5:"]},{"name":"water polo","shortname":":water_polo:","category":"activity","emoji_order":"964"},{"name":"water polo tone 1","shortname":":water_polo_tone1:","category":"activity","emoji_order":"965"},{"name":"water polo tone 2","shortname":":water_polo_tone2:","category":"activity","emoji_order":"966"},{"name":"water polo tone 3","shortname":":water_polo_tone3:","category":"activity","emoji_order":"967"},{"name":"water polo tone 4","shortname":":water_polo_tone4:","category":"activity","emoji_order":"968"},{"name":"water polo tone 5","shortname":":water_polo_tone5:","category":"activity","emoji_order":"969"},{"name":"handball","shortname":":handball:","category":"activity","emoji_order":"982"},{"name":"handball tone 1","shortname":":handball_tone1:","category":"activity","emoji_order":"983"},{"name":"handball tone 2","shortname":":handball_tone2:","category":"activity","emoji_order":"984"},{"name":"handball tone 3","shortname":":handball_tone3:","category":"activity","emoji_order":"985"},{"name":"handball tone 4","shortname":":handball_tone4:","category":"activity","emoji_order":"986"},{"name":"handball tone 5","shortname":":handball_tone5:","category":"activity","emoji_order":"987"},{"name":"juggling","shortname":":juggling:","category":"activity","emoji_order":"1000","aliases":[":juggler:"]},{"name":"juggling tone 1","shortname":":juggling_tone1:","category":"activity","emoji_order":"1001","aliases":[":juggler_tone1:"]},{"name":"juggling tone 2","shortname":":juggling_tone2:","category":"activity","emoji_order":"1002","aliases":[":juggler_tone2:"]},{"name":"juggling tone 3","shortname":":juggling_tone3:","category":"activity","emoji_order":"1003","aliases":[":juggler_tone3:"]},{"name":"juggling tone 4","shortname":":juggling_tone4:","category":"activity","emoji_order":"1004","aliases":[":juggler_tone4:"]},{"name":"juggling tone 5","shortname":":juggling_tone5:","category":"activity","emoji_order":"1005","aliases":[":juggler_tone5:"]},{"name":"man and woman holding hands","shortname":":couple:","category":"people","emoji_order":"1018"},{"name":"two men holding hands","shortname":":two_men_holding_hands:","category":"people","emoji_order":"1024"},{"name":"two women holding hands","shortname":":two_women_holding_hands:","category":"people","emoji_order":"1030"},{"name":"kiss","shortname":":couplekiss:","category":"people","emoji_order":"1036"},{"name":"kiss (man,man)","shortname":":kiss_mm:","category":"people","emoji_order":"1038","aliases":[":couplekiss_mm:"]},{"name":"kiss (woman,woman)","shortname":":kiss_ww:","category":"people","emoji_order":"1039","aliases":[":couplekiss_ww:"]},{"name":"couple with heart","shortname":":couple_with_heart:","category":"people","emoji_order":"1040"},{"name":"couple (man,man)","shortname":":couple_mm:","category":"people","emoji_order":"1042","aliases":[":couple_with_heart_mm:"]},{"name":"couple (woman,woman)","shortname":":couple_ww:","category":"people","emoji_order":"1043","aliases":[":couple_with_heart_ww:"]},{"name":"family","shortname":":family:","category":"people","emoji_order":"1044"},{"name":"family (man,woman,girl)","shortname":":family_mwg:","category":"people","emoji_order":"1051"},{"name":"family (man,woman,girl,boy)","shortname":":family_mwgb:","category":"people","emoji_order":"1052"},{"name":"family (man,woman,boy,boy)","shortname":":family_mwbb:","category":"people","emoji_order":"1053"},{"name":"family (man,woman,girl,girl)","shortname":":family_mwgg:","category":"people","emoji_order":"1054"},{"name":"family (man,man,boy)","shortname":":family_mmb:","category":"people","emoji_order":"1055"},{"name":"family (man,man,girl)","shortname":":family_mmg:","category":"people","emoji_order":"1056"},{"name":"family (man,man,girl,boy)","shortname":":family_mmgb:","category":"people","emoji_order":"1057"},{"name":"family (man,man,boy,boy)","shortname":":family_mmbb:","category":"people","emoji_order":"1058"},{"name":"family (man,man,girl,girl)","shortname":":family_mmgg:","category":"people","emoji_order":"1059"},{"name":"family (woman,woman,boy)","shortname":":family_wwb:","category":"people","emoji_order":"1060"},{"name":"family (woman,woman,girl)","shortname":":family_wwg:","category":"people","emoji_order":"1061"},{"name":"family (woman,woman,girl,boy)","shortname":":family_wwgb:","category":"people","emoji_order":"1062"},{"name":"family (woman,woman,boy,boy)","shortname":":family_wwbb:","category":"people","emoji_order":"1063"},{"name":"family (woman,woman,girl,girl)","shortname":":family_wwgg:","category":"people","emoji_order":"1064"},{"name":"emoji modifier Fitzpatrick type-1-2","shortname":":tone1:","category":"modifier","emoji_order":"1075"},{"name":"emoji modifier Fitzpatrick type-3","shortname":":tone2:","category":"modifier","emoji_order":"1076"},{"name":"emoji modifier Fitzpatrick type-4","shortname":":tone3:","category":"modifier","emoji_order":"1077"},{"name":"emoji modifier Fitzpatrick type-5","shortname":":tone4:","category":"modifier","emoji_order":"1078"},{"name":"emoji modifier Fitzpatrick type-6","shortname":":tone5:","category":"modifier","emoji_order":"1079"},{"name":"flexed biceps","shortname":":muscle:","category":"people","emoji_order":"1080"},{"name":"flexed biceps tone 1","shortname":":muscle_tone1:","category":"people","emoji_order":"1081"},{"name":"flexed biceps tone 2","shortname":":muscle_tone2:","category":"people","emoji_order":"1082"},{"name":"flexed biceps tone 3","shortname":":muscle_tone3:","category":"people","emoji_order":"1083"},{"name":"flexed biceps tone 4","shortname":":muscle_tone4:","category":"people","emoji_order":"1084"},{"name":"flexed biceps tone 5","shortname":":muscle_tone5:","category":"people","emoji_order":"1085"},{"name":"selfie","shortname":":selfie:","category":"people","emoji_order":"1086"},{"name":"selfie tone 1","shortname":":selfie_tone1:","category":"people","emoji_order":"1087"},{"name":"selfie tone 2","shortname":":selfie_tone2:","category":"people","emoji_order":"1088"},{"name":"selfie tone 3","shortname":":selfie_tone3:","category":"people","emoji_order":"1089"},{"name":"selfie tone 4","shortname":":selfie_tone4:","category":"people","emoji_order":"1090"},{"name":"selfie tone 5","shortname":":selfie_tone5:","category":"people","emoji_order":"1091"},{"name":"white left pointing backhand index","shortname":":point_left:","category":"people","emoji_order":"1092"},{"name":"white left pointing backhand index tone 1","shortname":":point_left_tone1:","category":"people","emoji_order":"1093"},{"name":"white left pointing backhand index tone 2","shortname":":point_left_tone2:","category":"people","emoji_order":"1094"},{"name":"white left pointing backhand index tone 3","shortname":":point_left_tone3:","category":"people","emoji_order":"1095"},{"name":"white left pointing backhand index tone 4","shortname":":point_left_tone4:","category":"people","emoji_order":"1096"},{"name":"white left pointing backhand index tone 5","shortname":":point_left_tone5:","category":"people","emoji_order":"1097"},{"name":"white right pointing backhand index","shortname":":point_right:","category":"people","emoji_order":"1098"},{"name":"white right pointing backhand index tone 1","shortname":":point_right_tone1:","category":"people","emoji_order":"1099"},{"name":"white right pointing backhand index tone 2","shortname":":point_right_tone2:","category":"people","emoji_order":"1100"},{"name":"white right pointing backhand index tone 3","shortname":":point_right_tone3:","category":"people","emoji_order":"1101"},{"name":"white right pointing backhand index tone 4","shortname":":point_right_tone4:","category":"people","emoji_order":"1102"},{"name":"white right pointing backhand index tone 5","shortname":":point_right_tone5:","category":"people","emoji_order":"1103"},{"name":"white up pointing index","shortname":":point_up:","category":"people","emoji_order":"1104"},{"name":"white up pointing index tone 1","shortname":":point_up_tone1:","category":"people","emoji_order":"1105"},{"name":"white up pointing index tone 2","shortname":":point_up_tone2:","category":"people","emoji_order":"1106"},{"name":"white up pointing index tone 3","shortname":":point_up_tone3:","category":"people","emoji_order":"1107"},{"name":"white up pointing index tone 4","shortname":":point_up_tone4:","category":"people","emoji_order":"1108"},{"name":"white up pointing index tone 5","shortname":":point_up_tone5:","category":"people","emoji_order":"1109"},{"name":"white up pointing backhand index","shortname":":point_up_2:","category":"people","emoji_order":"1110"},{"name":"white up pointing backhand index tone 1","shortname":":point_up_2_tone1:","category":"people","emoji_order":"1111"},{"name":"white up pointing backhand index tone 2","shortname":":point_up_2_tone2:","category":"people","emoji_order":"1112"},{"name":"white up pointing backhand index tone 3","shortname":":point_up_2_tone3:","category":"people","emoji_order":"1113"},{"name":"white up pointing backhand index tone 4","shortname":":point_up_2_tone4:","category":"people","emoji_order":"1114"},{"name":"white up pointing backhand index tone 5","shortname":":point_up_2_tone5:","category":"people","emoji_order":"1115"},{"name":"reversed hand with middle finger extended","shortname":":middle_finger:","category":"people","emoji_order":"1116","aliases":[":reversed_hand_with_middle_finger_extended:"]},{"name":"reversed hand with middle finger extended tone 1","shortname":":middle_finger_tone1:","category":"people","emoji_order":"1117","aliases":[":reversed_hand_with_middle_finger_extended_tone1:"]},{"name":"reversed hand with middle finger extended tone 2","shortname":":middle_finger_tone2:","category":"people","emoji_order":"1118","aliases":[":reversed_hand_with_middle_finger_extended_tone2:"]},{"name":"reversed hand with middle finger extended tone 3","shortname":":middle_finger_tone3:","category":"people","emoji_order":"1119","aliases":[":reversed_hand_with_middle_finger_extended_tone3:"]},{"name":"reversed hand with middle finger extended tone 4","shortname":":middle_finger_tone4:","category":"people","emoji_order":"1120","aliases":[":reversed_hand_with_middle_finger_extended_tone4:"]},{"name":"reversed hand with middle finger extended tone 5","shortname":":middle_finger_tone5:","category":"people","emoji_order":"1121","aliases":[":reversed_hand_with_middle_finger_extended_tone5:"]},{"name":"white down pointing backhand index","shortname":":point_down:","category":"people","emoji_order":"1122"},{"name":"white down pointing backhand index tone 1","shortname":":point_down_tone1:","category":"people","emoji_order":"1123"},{"name":"white down pointing backhand index tone 2","shortname":":point_down_tone2:","category":"people","emoji_order":"1124"},{"name":"white down pointing backhand index tone 3","shortname":":point_down_tone3:","category":"people","emoji_order":"1125"},{"name":"white down pointing backhand index tone 4","shortname":":point_down_tone4:","category":"people","emoji_order":"1126"},{"name":"white down pointing backhand index tone 5","shortname":":point_down_tone5:","category":"people","emoji_order":"1127"},{"name":"victory hand","shortname":":v:","category":"people","emoji_order":"1128"},{"name":"victory hand tone 1","shortname":":v_tone1:","category":"people","emoji_order":"1129"},{"name":"victory hand tone 2","shortname":":v_tone2:","category":"people","emoji_order":"1130"},{"name":"victory hand tone 3","shortname":":v_tone3:","category":"people","emoji_order":"1131"},{"name":"victory hand tone 4","shortname":":v_tone4:","category":"people","emoji_order":"1132"},{"name":"victory hand tone 5","shortname":":v_tone5:","category":"people","emoji_order":"1133"},{"name":"hand with first and index finger crossed","shortname":":fingers_crossed:","category":"people","emoji_order":"1134","aliases":[":hand_with_index_and_middle_finger_crossed:"]},{"name":"hand with index and middle fingers crossed tone 1","shortname":":fingers_crossed_tone1:","category":"people","emoji_order":"1135","aliases":[":hand_with_index_and_middle_fingers_crossed_tone1:"]},{"name":"hand with index and middle fingers crossed tone 2","shortname":":fingers_crossed_tone2:","category":"people","emoji_order":"1136","aliases":[":hand_with_index_and_middle_fingers_crossed_tone2:"]},{"name":"hand with index and middle fingers crossed tone 3","shortname":":fingers_crossed_tone3:","category":"people","emoji_order":"1137","aliases":[":hand_with_index_and_middle_fingers_crossed_tone3:"]},{"name":"hand with index and middle fingers crossed tone 4","shortname":":fingers_crossed_tone4:","category":"people","emoji_order":"1138","aliases":[":hand_with_index_and_middle_fingers_crossed_tone4:"]},{"name":"hand with index and middle fingers crossed tone 5","shortname":":fingers_crossed_tone5:","category":"people","emoji_order":"1139","aliases":[":hand_with_index_and_middle_fingers_crossed_tone5:"]},{"name":"raised hand with part between middle and ring fingers","shortname":":vulcan:","category":"people","emoji_order":"1140","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers:"]},{"name":"raised hand with part between middle and ring fingers tone 1","shortname":":vulcan_tone1:","category":"people","emoji_order":"1141","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone1:"]},{"name":"raised hand with part between middle and ring fingers tone 2","shortname":":vulcan_tone2:","category":"people","emoji_order":"1142","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone2:"]},{"name":"raised hand with part between middle and ring fingers tone 3","shortname":":vulcan_tone3:","category":"people","emoji_order":"1143","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone3:"]},{"name":"raised hand with part between middle and ring fingers tone 4","shortname":":vulcan_tone4:","category":"people","emoji_order":"1144","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone4:"]},{"name":"raised hand with part between middle and ring fingers tone 5","shortname":":vulcan_tone5:","category":"people","emoji_order":"1145","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone5:"]},{"name":"sign of the horns","shortname":":metal:","category":"people","emoji_order":"1146","aliases":[":sign_of_the_horns:"]},{"name":"sign of the horns tone 1","shortname":":metal_tone1:","category":"people","emoji_order":"1147","aliases":[":sign_of_the_horns_tone1:"]},{"name":"sign of the horns tone 2","shortname":":metal_tone2:","category":"people","emoji_order":"1148","aliases":[":sign_of_the_horns_tone2:"]},{"name":"sign of the horns tone 3","shortname":":metal_tone3:","category":"people","emoji_order":"1149","aliases":[":sign_of_the_horns_tone3:"]},{"name":"sign of the horns tone 4","shortname":":metal_tone4:","category":"people","emoji_order":"1150","aliases":[":sign_of_the_horns_tone4:"]},{"name":"sign of the horns tone 5","shortname":":metal_tone5:","category":"people","emoji_order":"1151","aliases":[":sign_of_the_horns_tone5:"]},{"name":"call me hand","shortname":":call_me:","category":"people","emoji_order":"1152","aliases":[":call_me_hand:"]},{"name":"call me hand tone 1","shortname":":call_me_tone1:","category":"people","emoji_order":"1153","aliases":[":call_me_hand_tone1:"]},{"name":"call me hand tone 2","shortname":":call_me_tone2:","category":"people","emoji_order":"1154","aliases":[":call_me_hand_tone2:"]},{"name":"call me hand tone 3","shortname":":call_me_tone3:","category":"people","emoji_order":"1155","aliases":[":call_me_hand_tone3:"]},{"name":"call me hand tone 4","shortname":":call_me_tone4:","category":"people","emoji_order":"1156","aliases":[":call_me_hand_tone4:"]},{"name":"call me hand tone 5","shortname":":call_me_tone5:","category":"people","emoji_order":"1157","aliases":[":call_me_hand_tone5:"]},{"name":"raised hand with fingers splayed","shortname":":hand_splayed:","category":"people","emoji_order":"1158","aliases":[":raised_hand_with_fingers_splayed:"]},{"name":"raised hand with fingers splayed tone 1","shortname":":hand_splayed_tone1:","category":"people","emoji_order":"1159","aliases":[":raised_hand_with_fingers_splayed_tone1:"]},{"name":"raised hand with fingers splayed tone 2","shortname":":hand_splayed_tone2:","category":"people","emoji_order":"1160","aliases":[":raised_hand_with_fingers_splayed_tone2:"]},{"name":"raised hand with fingers splayed tone 3","shortname":":hand_splayed_tone3:","category":"people","emoji_order":"1161","aliases":[":raised_hand_with_fingers_splayed_tone3:"]},{"name":"raised hand with fingers splayed tone 4","shortname":":hand_splayed_tone4:","category":"people","emoji_order":"1162","aliases":[":raised_hand_with_fingers_splayed_tone4:"]},{"name":"raised hand with fingers splayed tone 5","shortname":":hand_splayed_tone5:","category":"people","emoji_order":"1163","aliases":[":raised_hand_with_fingers_splayed_tone5:"]},{"name":"raised hand","shortname":":raised_hand:","category":"people","emoji_order":"1164"},{"name":"raised hand tone 1","shortname":":raised_hand_tone1:","category":"people","emoji_order":"1165"},{"name":"raised hand tone 2","shortname":":raised_hand_tone2:","category":"people","emoji_order":"1166"},{"name":"raised hand tone 3","shortname":":raised_hand_tone3:","category":"people","emoji_order":"1167"},{"name":"raised hand tone 4","shortname":":raised_hand_tone4:","category":"people","emoji_order":"1168"},{"name":"raised hand tone 5","shortname":":raised_hand_tone5:","category":"people","emoji_order":"1169"},{"name":"ok hand sign","shortname":":ok_hand:","category":"people","emoji_order":"1170"},{"name":"ok hand sign tone 1","shortname":":ok_hand_tone1:","category":"people","emoji_order":"1171"},{"name":"ok hand sign tone 2","shortname":":ok_hand_tone2:","category":"people","emoji_order":"1172"},{"name":"ok hand sign tone 3","shortname":":ok_hand_tone3:","category":"people","emoji_order":"1173"},{"name":"ok hand sign tone 4","shortname":":ok_hand_tone4:","category":"people","emoji_order":"1174"},{"name":"ok hand sign tone 5","shortname":":ok_hand_tone5:","category":"people","emoji_order":"1175"},{"name":"thumbs up sign","shortname":":thumbsup:","category":"people","emoji_order":"1176","aliases":[":+1:",":thumbup:"]},{"name":"thumbs up sign tone 1","shortname":":thumbsup_tone1:","category":"people","emoji_order":"1177","aliases":[":+1_tone1:",":thumbup_tone1:"]},{"name":"thumbs up sign tone 2","shortname":":thumbsup_tone2:","category":"people","emoji_order":"1178","aliases":[":+1_tone2:",":thumbup_tone2:"]},{"name":"thumbs up sign tone 3","shortname":":thumbsup_tone3:","category":"people","emoji_order":"1179","aliases":[":+1_tone3:",":thumbup_tone3:"]},{"name":"thumbs up sign tone 4","shortname":":thumbsup_tone4:","category":"people","emoji_order":"1180","aliases":[":+1_tone4:",":thumbup_tone4:"]},{"name":"thumbs up sign tone 5","shortname":":thumbsup_tone5:","category":"people","emoji_order":"1181","aliases":[":+1_tone5:",":thumbup_tone5:"]},{"name":"thumbs down sign","shortname":":thumbsdown:","category":"people","emoji_order":"1182","aliases":[":-1:",":thumbdown:"]},{"name":"thumbs down sign tone 1","shortname":":thumbsdown_tone1:","category":"people","emoji_order":"1183","aliases":[":-1_tone1:",":thumbdown_tone1:"]},{"name":"thumbs down sign tone 2","shortname":":thumbsdown_tone2:","category":"people","emoji_order":"1184","aliases":[":-1_tone2:",":thumbdown_tone2:"]},{"name":"thumbs down sign tone 3","shortname":":thumbsdown_tone3:","category":"people","emoji_order":"1185","aliases":[":-1_tone3:",":thumbdown_tone3:"]},{"name":"thumbs down sign tone 4","shortname":":thumbsdown_tone4:","category":"people","emoji_order":"1186","aliases":[":-1_tone4:",":thumbdown_tone4:"]},{"name":"thumbs down sign tone 5","shortname":":thumbsdown_tone5:","category":"people","emoji_order":"1187","aliases":[":-1_tone5:",":thumbdown_tone5:"]},{"name":"raised fist","shortname":":fist:","category":"people","emoji_order":"1188"},{"name":"raised fist tone 1","shortname":":fist_tone1:","category":"people","emoji_order":"1189"},{"name":"raised fist tone 2","shortname":":fist_tone2:","category":"people","emoji_order":"1190"},{"name":"raised fist tone 3","shortname":":fist_tone3:","category":"people","emoji_order":"1191"},{"name":"raised fist tone 4","shortname":":fist_tone4:","category":"people","emoji_order":"1192"},{"name":"raised fist tone 5","shortname":":fist_tone5:","category":"people","emoji_order":"1193"},{"name":"fisted hand sign","shortname":":punch:","category":"people","emoji_order":"1194"},{"name":"fisted hand sign tone 1","shortname":":punch_tone1:","category":"people","emoji_order":"1195"},{"name":"fisted hand sign tone 2","shortname":":punch_tone2:","category":"people","emoji_order":"1196"},{"name":"fisted hand sign tone 3","shortname":":punch_tone3:","category":"people","emoji_order":"1197"},{"name":"fisted hand sign tone 4","shortname":":punch_tone4:","category":"people","emoji_order":"1198"},{"name":"fisted hand sign tone 5","shortname":":punch_tone5:","category":"people","emoji_order":"1199"},{"name":"left-facing fist","shortname":":left_facing_fist:","category":"people","emoji_order":"1200","aliases":[":left_fist:"]},{"name":"left facing fist tone 1","shortname":":left_facing_fist_tone1:","category":"people","emoji_order":"1201","aliases":[":left_fist_tone1:"]},{"name":"left facing fist tone 2","shortname":":left_facing_fist_tone2:","category":"people","emoji_order":"1202","aliases":[":left_fist_tone2:"]},{"name":"left facing fist tone 3","shortname":":left_facing_fist_tone3:","category":"people","emoji_order":"1203","aliases":[":left_fist_tone3:"]},{"name":"left facing fist tone 4","shortname":":left_facing_fist_tone4:","category":"people","emoji_order":"1204","aliases":[":left_fist_tone4:"]},{"name":"left facing fist tone 5","shortname":":left_facing_fist_tone5:","category":"people","emoji_order":"1205","aliases":[":left_fist_tone5:"]},{"name":"right-facing fist","shortname":":right_facing_fist:","category":"people","emoji_order":"1206","aliases":[":right_fist:"]},{"name":"right facing fist tone 1","shortname":":right_facing_fist_tone1:","category":"people","emoji_order":"1207","aliases":[":right_fist_tone1:"]},{"name":"right facing fist tone 2","shortname":":right_facing_fist_tone2:","category":"people","emoji_order":"1208","aliases":[":right_fist_tone2:"]},{"name":"right facing fist tone 3","shortname":":right_facing_fist_tone3:","category":"people","emoji_order":"1209","aliases":[":right_fist_tone3:"]},{"name":"right facing fist tone 4","shortname":":right_facing_fist_tone4:","category":"people","emoji_order":"1210","aliases":[":right_fist_tone4:"]},{"name":"right facing fist tone 5","shortname":":right_facing_fist_tone5:","category":"people","emoji_order":"1211","aliases":[":right_fist_tone5:"]},{"name":"raised back of hand","shortname":":raised_back_of_hand:","category":"people","emoji_order":"1212","aliases":[":back_of_hand:"]},{"name":"raised back of hand tone 1","shortname":":raised_back_of_hand_tone1:","category":"people","emoji_order":"1213","aliases":[":back_of_hand_tone1:"]},{"name":"raised back of hand tone 2","shortname":":raised_back_of_hand_tone2:","category":"people","emoji_order":"1214","aliases":[":back_of_hand_tone2:"]},{"name":"raised back of hand tone 3","shortname":":raised_back_of_hand_tone3:","category":"people","emoji_order":"1215","aliases":[":back_of_hand_tone3:"]},{"name":"raised back of hand tone 4","shortname":":raised_back_of_hand_tone4:","category":"people","emoji_order":"1216","aliases":[":back_of_hand_tone4:"]},{"name":"raised back of hand tone 5","shortname":":raised_back_of_hand_tone5:","category":"people","emoji_order":"1217","aliases":[":back_of_hand_tone5:"]},{"name":"waving hand sign","shortname":":wave:","category":"people","emoji_order":"1218"},{"name":"waving hand sign tone 1","shortname":":wave_tone1:","category":"people","emoji_order":"1219"},{"name":"waving hand sign tone 2","shortname":":wave_tone2:","category":"people","emoji_order":"1220"},{"name":"waving hand sign tone 3","shortname":":wave_tone3:","category":"people","emoji_order":"1221"},{"name":"waving hand sign tone 4","shortname":":wave_tone4:","category":"people","emoji_order":"1222"},{"name":"waving hand sign tone 5","shortname":":wave_tone5:","category":"people","emoji_order":"1223"},{"name":"clapping hands sign","shortname":":clap:","category":"people","emoji_order":"1224"},{"name":"clapping hands sign tone 1","shortname":":clap_tone1:","category":"people","emoji_order":"1225"},{"name":"clapping hands sign tone 2","shortname":":clap_tone2:","category":"people","emoji_order":"1226"},{"name":"clapping hands sign tone 3","shortname":":clap_tone3:","category":"people","emoji_order":"1227"},{"name":"clapping hands sign tone 4","shortname":":clap_tone4:","category":"people","emoji_order":"1228"},{"name":"clapping hands sign tone 5","shortname":":clap_tone5:","category":"people","emoji_order":"1229"},{"name":"writing hand","shortname":":writing_hand:","category":"people","emoji_order":"1230"},{"name":"writing hand tone 1","shortname":":writing_hand_tone1:","category":"people","emoji_order":"1231"},{"name":"writing hand tone 2","shortname":":writing_hand_tone2:","category":"people","emoji_order":"1232"},{"name":"writing hand tone 3","shortname":":writing_hand_tone3:","category":"people","emoji_order":"1233"},{"name":"writing hand tone 4","shortname":":writing_hand_tone4:","category":"people","emoji_order":"1234"},{"name":"writing hand tone 5","shortname":":writing_hand_tone5:","category":"people","emoji_order":"1235"},{"name":"open hands sign","shortname":":open_hands:","category":"people","emoji_order":"1236"},{"name":"open hands sign tone 1","shortname":":open_hands_tone1:","category":"people","emoji_order":"1237"},{"name":"open hands sign tone 2","shortname":":open_hands_tone2:","category":"people","emoji_order":"1238"},{"name":"open hands sign tone 3","shortname":":open_hands_tone3:","category":"people","emoji_order":"1239"},{"name":"open hands sign tone 4","shortname":":open_hands_tone4:","category":"people","emoji_order":"1240"},{"name":"open hands sign tone 5","shortname":":open_hands_tone5:","category":"people","emoji_order":"1241"},{"name":"person raising both hands in celebration","shortname":":raised_hands:","category":"people","emoji_order":"1242"},{"name":"person raising both hands in celebration tone 1","shortname":":raised_hands_tone1:","category":"people","emoji_order":"1243"},{"name":"person raising both hands in celebration tone 2","shortname":":raised_hands_tone2:","category":"people","emoji_order":"1244"},{"name":"person raising both hands in celebration tone 3","shortname":":raised_hands_tone3:","category":"people","emoji_order":"1245"},{"name":"person raising both hands in celebration tone 4","shortname":":raised_hands_tone4:","category":"people","emoji_order":"1246"},{"name":"person raising both hands in celebration tone 5","shortname":":raised_hands_tone5:","category":"people","emoji_order":"1247"},{"name":"person with folded hands","shortname":":pray:","category":"people","emoji_order":"1248"},{"name":"person with folded hands tone 1","shortname":":pray_tone1:","category":"people","emoji_order":"1249"},{"name":"person with folded hands tone 2","shortname":":pray_tone2:","category":"people","emoji_order":"1250"},{"name":"person with folded hands tone 3","shortname":":pray_tone3:","category":"people","emoji_order":"1251"},{"name":"person with folded hands tone 4","shortname":":pray_tone4:","category":"people","emoji_order":"1252"},{"name":"person with folded hands tone 5","shortname":":pray_tone5:","category":"people","emoji_order":"1253"},{"name":"handshake","shortname":":handshake:","category":"people","emoji_order":"1254","aliases":[":shaking_hands:"]},{"name":"handshake tone 1","shortname":":handshake_tone1:","category":"people","emoji_order":"1255","aliases":[":shaking_hands_tone1:"]},{"name":"handshake tone 2","shortname":":handshake_tone2:","category":"people","emoji_order":"1256","aliases":[":shaking_hands_tone2:"]},{"name":"handshake tone 3","shortname":":handshake_tone3:","category":"people","emoji_order":"1257","aliases":[":shaking_hands_tone3:"]},{"name":"handshake tone 4","shortname":":handshake_tone4:","category":"people","emoji_order":"1258","aliases":[":shaking_hands_tone4:"]},{"name":"handshake tone 5","shortname":":handshake_tone5:","category":"people","emoji_order":"1259","aliases":[":shaking_hands_tone5:"]},{"name":"nail polish","shortname":":nail_care:","category":"people","emoji_order":"1260"},{"name":"nail polish tone 1","shortname":":nail_care_tone1:","category":"people","emoji_order":"1261"},{"name":"nail polish tone 2","shortname":":nail_care_tone2:","category":"people","emoji_order":"1262"},{"name":"nail polish tone 3","shortname":":nail_care_tone3:","category":"people","emoji_order":"1263"},{"name":"nail polish tone 4","shortname":":nail_care_tone4:","category":"people","emoji_order":"1264"},{"name":"nail polish tone 5","shortname":":nail_care_tone5:","category":"people","emoji_order":"1265"},{"name":"ear","shortname":":ear:","category":"people","emoji_order":"1266"},{"name":"ear tone 1","shortname":":ear_tone1:","category":"people","emoji_order":"1267"},{"name":"ear tone 2","shortname":":ear_tone2:","category":"people","emoji_order":"1268"},{"name":"ear tone 3","shortname":":ear_tone3:","category":"people","emoji_order":"1269"},{"name":"ear tone 4","shortname":":ear_tone4:","category":"people","emoji_order":"1270"},{"name":"ear tone 5","shortname":":ear_tone5:","category":"people","emoji_order":"1271"},{"name":"nose","shortname":":nose:","category":"people","emoji_order":"1272"},{"name":"nose tone 1","shortname":":nose_tone1:","category":"people","emoji_order":"1273"},{"name":"nose tone 2","shortname":":nose_tone2:","category":"people","emoji_order":"1274"},{"name":"nose tone 3","shortname":":nose_tone3:","category":"people","emoji_order":"1275"},{"name":"nose tone 4","shortname":":nose_tone4:","category":"people","emoji_order":"1276"},{"name":"nose tone 5","shortname":":nose_tone5:","category":"people","emoji_order":"1277"},{"name":"footprints","shortname":":footprints:","category":"people","emoji_order":"1278"},{"name":"eyes","shortname":":eyes:","category":"people","emoji_order":"1279"},{"name":"eye","shortname":":eye:","category":"people","emoji_order":"1280"},{"name":"eye in speech bubble","shortname":":eye_in_speech_bubble:","category":"symbols","emoji_order":"1281"},{"name":"tongue","shortname":":tongue:","category":"people","emoji_order":"1282"},{"name":"mouth","shortname":":lips:","category":"people","emoji_order":"1283"},{"name":"kiss mark","shortname":":kiss:","category":"people","emoji_order":"1284"},{"name":"heart with arrow","shortname":":cupid:","category":"symbols","emoji_order":"1285"},{"name":"heavy black heart","shortname":":heart:","category":"symbols","emoji_order":"1286","aliases_ascii":["<3"]},{"name":"beating heart","shortname":":heartbeat:","category":"symbols","emoji_order":"1287"},{"name":"broken heart","shortname":":broken_heart:","category":"symbols","emoji_order":"1288","aliases_ascii":["</3"]},{"name":"two hearts","shortname":":two_hearts:","category":"symbols","emoji_order":"1289"},{"name":"sparkling heart","shortname":":sparkling_heart:","category":"symbols","emoji_order":"1290"},{"name":"growing heart","shortname":":heartpulse:","category":"symbols","emoji_order":"1291"},{"name":"blue heart","shortname":":blue_heart:","category":"symbols","emoji_order":"1292"},{"name":"green heart","shortname":":green_heart:","category":"symbols","emoji_order":"1293"},{"name":"yellow heart","shortname":":yellow_heart:","category":"symbols","emoji_order":"1294"},{"name":"purple heart","shortname":":purple_heart:","category":"symbols","emoji_order":"1295"},{"name":"black heart","shortname":":black_heart:","category":"symbols","emoji_order":"1296"},{"name":"heart with ribbon","shortname":":gift_heart:","category":"symbols","emoji_order":"1297"},{"name":"revolving hearts","shortname":":revolving_hearts:","category":"symbols","emoji_order":"1298"},{"name":"heart decoration","shortname":":heart_decoration:","category":"symbols","emoji_order":"1299"},{"name":"heavy heart exclamation mark ornament","shortname":":heart_exclamation:","category":"symbols","emoji_order":"1300","aliases":[":heavy_heart_exclamation_mark_ornament:"]},{"name":"love letter","shortname":":love_letter:","category":"objects","emoji_order":"1301"},{"name":"sleeping symbol","shortname":":zzz:","category":"people","emoji_order":"1302"},{"name":"anger symbol","shortname":":anger:","category":"symbols","emoji_order":"1303"},{"name":"bomb","shortname":":bomb:","category":"objects","emoji_order":"1304"},{"name":"collision symbol","shortname":":boom:","category":"symbols","emoji_order":"1305"},{"name":"splashing sweat symbol","shortname":":sweat_drops:","category":"nature","emoji_order":"1306"},{"name":"dash symbol","shortname":":dash:","category":"nature","emoji_order":"1307"},{"name":"dizzy symbol","shortname":":dizzy:","category":"symbols","emoji_order":"1308"},{"name":"speech balloon","shortname":":speech_balloon:","category":"symbols","emoji_order":"1309"},{"name":"left speech bubble","shortname":":speech_left:","category":"symbols","emoji_order":"1310","aliases":[":left_speech_bubble:"]},{"name":"right anger bubble","shortname":":anger_right:","category":"symbols","emoji_order":"1311","aliases":[":right_anger_bubble:"]},{"name":"thought balloon","shortname":":thought_balloon:","category":"symbols","emoji_order":"1312"},{"name":"hole","shortname":":hole:","category":"objects","emoji_order":"1313"},{"name":"eyeglasses","shortname":":eyeglasses:","category":"people","emoji_order":"1314"},{"name":"dark sunglasses","shortname":":dark_sunglasses:","category":"people","emoji_order":"1315"},{"name":"necktie","shortname":":necktie:","category":"people","emoji_order":"1316"},{"name":"t-shirt","shortname":":shirt:","category":"people","emoji_order":"1317"},{"name":"jeans","shortname":":jeans:","category":"people","emoji_order":"1318"},{"name":"dress","shortname":":dress:","category":"people","emoji_order":"1319"},{"name":"kimono","shortname":":kimono:","category":"people","emoji_order":"1320"},{"name":"bikini","shortname":":bikini:","category":"people","emoji_order":"1321"},{"name":"womans clothes","shortname":":womans_clothes:","category":"people","emoji_order":"1322"},{"name":"purse","shortname":":purse:","category":"people","emoji_order":"1323"},{"name":"handbag","shortname":":handbag:","category":"people","emoji_order":"1324"},{"name":"pouch","shortname":":pouch:","category":"people","emoji_order":"1325"},{"name":"shopping bags","shortname":":shopping_bags:","category":"objects","emoji_order":"1326"},{"name":"school satchel","shortname":":school_satchel:","category":"people","emoji_order":"1327"},{"name":"mans shoe","shortname":":mans_shoe:","category":"people","emoji_order":"1328"},{"name":"athletic shoe","shortname":":athletic_shoe:","category":"people","emoji_order":"1329"},{"name":"high-heeled shoe","shortname":":high_heel:","category":"people","emoji_order":"1330"},{"name":"womans sandal","shortname":":sandal:","category":"people","emoji_order":"1331"},{"name":"womans boots","shortname":":boot:","category":"people","emoji_order":"1332"},{"name":"crown","shortname":":crown:","category":"people","emoji_order":"1333"},{"name":"womans hat","shortname":":womans_hat:","category":"people","emoji_order":"1334"},{"name":"top hat","shortname":":tophat:","category":"people","emoji_order":"1335"},{"name":"graduation cap","shortname":":mortar_board:","category":"people","emoji_order":"1336"},{"name":"helmet with white cross","shortname":":helmet_with_cross:","category":"people","emoji_order":"1337","aliases":[":helmet_with_white_cross:"]},{"name":"prayer beads","shortname":":prayer_beads:","category":"objects","emoji_order":"1338"},{"name":"lipstick","shortname":":lipstick:","category":"people","emoji_order":"1339"},{"name":"ring","shortname":":ring:","category":"people","emoji_order":"1340"},{"name":"gem stone","shortname":":gem:","category":"objects","emoji_order":"1341"},{"name":"monkey face","shortname":":monkey_face:","category":"nature","emoji_order":"1342"},{"name":"monkey","shortname":":monkey:","category":"nature","emoji_order":"1343"},{"name":"gorilla","shortname":":gorilla:","category":"nature","emoji_order":"1344"},{"name":"dog face","shortname":":dog:","category":"nature","emoji_order":"1345"},{"name":"dog","shortname":":dog2:","category":"nature","emoji_order":"1346"},{"name":"poodle","shortname":":poodle:","category":"nature","emoji_order":"1347"},{"name":"wolf face","shortname":":wolf:","category":"nature","emoji_order":"1348"},{"name":"fox face","shortname":":fox:","category":"nature","emoji_order":"1349","aliases":[":fox_face:"]},{"name":"cat face","shortname":":cat:","category":"nature","emoji_order":"1350"},{"name":"cat","shortname":":cat2:","category":"nature","emoji_order":"1351"},{"name":"lion face","shortname":":lion_face:","category":"nature","emoji_order":"1352","aliases":[":lion:"]},{"name":"tiger face","shortname":":tiger:","category":"nature","emoji_order":"1353"},{"name":"tiger","shortname":":tiger2:","category":"nature","emoji_order":"1354"},{"name":"leopard","shortname":":leopard:","category":"nature","emoji_order":"1355"},{"name":"horse face","shortname":":horse:","category":"nature","emoji_order":"1356"},{"name":"horse","shortname":":racehorse:","category":"nature","emoji_order":"1357"},{"name":"deer","shortname":":deer:","category":"nature","emoji_order":"1358"},{"name":"unicorn face","shortname":":unicorn:","category":"nature","emoji_order":"1359","aliases":[":unicorn_face:"]},{"name":"cow face","shortname":":cow:","category":"nature","emoji_order":"1360"},{"name":"ox","shortname":":ox:","category":"nature","emoji_order":"1361"},{"name":"water buffalo","shortname":":water_buffalo:","category":"nature","emoji_order":"1362"},{"name":"cow","shortname":":cow2:","category":"nature","emoji_order":"1363"},{"name":"pig face","shortname":":pig:","category":"nature","emoji_order":"1364"},{"name":"pig","shortname":":pig2:","category":"nature","emoji_order":"1365"},{"name":"boar","shortname":":boar:","category":"nature","emoji_order":"1366"},{"name":"pig nose","shortname":":pig_nose:","category":"nature","emoji_order":"1367"},{"name":"ram","shortname":":ram:","category":"nature","emoji_order":"1368"},{"name":"sheep","shortname":":sheep:","category":"nature","emoji_order":"1369"},{"name":"goat","shortname":":goat:","category":"nature","emoji_order":"1370"},{"name":"dromedary camel","shortname":":dromedary_camel:","category":"nature","emoji_order":"1371"},{"name":"bactrian camel","shortname":":camel:","category":"nature","emoji_order":"1372"},{"name":"elephant","shortname":":elephant:","category":"nature","emoji_order":"1373"},{"name":"rhinoceros","shortname":":rhino:","category":"nature","emoji_order":"1374","aliases":[":rhinoceros:"]},{"name":"mouse face","shortname":":mouse:","category":"nature","emoji_order":"1375"},{"name":"mouse","shortname":":mouse2:","category":"nature","emoji_order":"1376"},{"name":"rat","shortname":":rat:","category":"nature","emoji_order":"1377"},{"name":"hamster face","shortname":":hamster:","category":"nature","emoji_order":"1378"},{"name":"rabbit face","shortname":":rabbit:","category":"nature","emoji_order":"1379"},{"name":"rabbit","shortname":":rabbit2:","category":"nature","emoji_order":"1380"},{"name":"chipmunk","shortname":":chipmunk:","category":"nature","emoji_order":"1381"},{"name":"bat","shortname":":bat:","category":"nature","emoji_order":"1382"},{"name":"bear face","shortname":":bear:","category":"nature","emoji_order":"1383"},{"name":"koala","shortname":":koala:","category":"nature","emoji_order":"1384"},{"name":"panda face","shortname":":panda_face:","category":"nature","emoji_order":"1385"},{"name":"paw prints","shortname":":feet:","category":"nature","emoji_order":"1386","aliases":[":paw_prints:"]},{"name":"turkey","shortname":":turkey:","category":"nature","emoji_order":"1387"},{"name":"chicken","shortname":":chicken:","category":"nature","emoji_order":"1388"},{"name":"rooster","shortname":":rooster:","category":"nature","emoji_order":"1389"},{"name":"hatching chick","shortname":":hatching_chick:","category":"nature","emoji_order":"1390"},{"name":"baby chick","shortname":":baby_chick:","category":"nature","emoji_order":"1391"},{"name":"front-facing baby chick","shortname":":hatched_chick:","category":"nature","emoji_order":"1392"},{"name":"bird","shortname":":bird:","category":"nature","emoji_order":"1393"},{"name":"penguin","shortname":":penguin:","category":"nature","emoji_order":"1394"},{"name":"dove of peace","shortname":":dove:","category":"nature","emoji_order":"1395","aliases":[":dove_of_peace:"]},{"name":"eagle","shortname":":eagle:","category":"nature","emoji_order":"1396"},{"name":"duck","shortname":":duck:","category":"nature","emoji_order":"1397"},{"name":"owl","shortname":":owl:","category":"nature","emoji_order":"1398"},{"name":"frog face","shortname":":frog:","category":"nature","emoji_order":"1399"},{"name":"crocodile","shortname":":crocodile:","category":"nature","emoji_order":"1400"},{"name":"turtle","shortname":":turtle:","category":"nature","emoji_order":"1401"},{"name":"lizard","shortname":":lizard:","category":"nature","emoji_order":"1402"},{"name":"snake","shortname":":snake:","category":"nature","emoji_order":"1403"},{"name":"dragon face","shortname":":dragon_face:","category":"nature","emoji_order":"1404"},{"name":"dragon","shortname":":dragon:","category":"nature","emoji_order":"1405"},{"name":"spouting whale","shortname":":whale:","category":"nature","emoji_order":"1406"},{"name":"whale","shortname":":whale2:","category":"nature","emoji_order":"1407"},{"name":"dolphin","shortname":":dolphin:","category":"nature","emoji_order":"1408"},{"name":"fish","shortname":":fish:","category":"nature","emoji_order":"1409"},{"name":"tropical fish","shortname":":tropical_fish:","category":"nature","emoji_order":"1410"},{"name":"blowfish","shortname":":blowfish:","category":"nature","emoji_order":"1411"},{"name":"shark","shortname":":shark:","category":"nature","emoji_order":"1412"},{"name":"octopus","shortname":":octopus:","category":"nature","emoji_order":"1413"},{"name":"spiral shell","shortname":":shell:","category":"nature","emoji_order":"1414"},{"name":"crab","shortname":":crab:","category":"nature","emoji_order":"1415"},{"name":"shrimp","shortname":":shrimp:","category":"nature","emoji_order":"1416"},{"name":"squid","shortname":":squid:","category":"nature","emoji_order":"1417"},{"name":"butterfly","shortname":":butterfly:","category":"nature","emoji_order":"1418"},{"name":"snail","shortname":":snail:","category":"nature","emoji_order":"1419"},{"name":"bug","shortname":":bug:","category":"nature","emoji_order":"1420"},{"name":"ant","shortname":":ant:","category":"nature","emoji_order":"1421"},{"name":"honeybee","shortname":":bee:","category":"nature","emoji_order":"1422"},{"name":"lady beetle","shortname":":beetle:","category":"nature","emoji_order":"1423"},{"name":"spider","shortname":":spider:","category":"nature","emoji_order":"1424"},{"name":"spider web","shortname":":spider_web:","category":"nature","emoji_order":"1425"},{"name":"scorpion","shortname":":scorpion:","category":"nature","emoji_order":"1426"},{"name":"bouquet","shortname":":bouquet:","category":"nature","emoji_order":"1427"},{"name":"cherry blossom","shortname":":cherry_blossom:","category":"nature","emoji_order":"1428"},{"name":"white flower","shortname":":white_flower:","category":"symbols","emoji_order":"1429"},{"name":"rosette","shortname":":rosette:","category":"nature","emoji_order":"1430"},{"name":"rose","shortname":":rose:","category":"nature","emoji_order":"1431"},{"name":"wilted flower","shortname":":wilted_rose:","category":"nature","emoji_order":"1432","aliases":[":wilted_flower:"]},{"name":"hibiscus","shortname":":hibiscus:","category":"nature","emoji_order":"1433"},{"name":"sunflower","shortname":":sunflower:","category":"nature","emoji_order":"1434"},{"name":"blossom","shortname":":blossom:","category":"nature","emoji_order":"1435"},{"name":"tulip","shortname":":tulip:","category":"nature","emoji_order":"1436"},{"name":"seedling","shortname":":seedling:","category":"nature","emoji_order":"1437"},{"name":"evergreen tree","shortname":":evergreen_tree:","category":"nature","emoji_order":"1438"},{"name":"deciduous tree","shortname":":deciduous_tree:","category":"nature","emoji_order":"1439"},{"name":"palm tree","shortname":":palm_tree:","category":"nature","emoji_order":"1440"},{"name":"cactus","shortname":":cactus:","category":"nature","emoji_order":"1441"},{"name":"ear of rice","shortname":":ear_of_rice:","category":"nature","emoji_order":"1442"},{"name":"herb","shortname":":herb:","category":"nature","emoji_order":"1443"},{"name":"shamrock","shortname":":shamrock:","category":"nature","emoji_order":"1444"},{"name":"four leaf clover","shortname":":four_leaf_clover:","category":"nature","emoji_order":"1445"},{"name":"maple leaf","shortname":":maple_leaf:","category":"nature","emoji_order":"1446"},{"name":"fallen leaf","shortname":":fallen_leaf:","category":"nature","emoji_order":"1447"},{"name":"leaf fluttering in wind","shortname":":leaves:","category":"nature","emoji_order":"1448"},{"name":"grapes","shortname":":grapes:","category":"food","emoji_order":"1449"},{"name":"melon","shortname":":melon:","category":"food","emoji_order":"1450"},{"name":"watermelon","shortname":":watermelon:","category":"food","emoji_order":"1451"},{"name":"tangerine","shortname":":tangerine:","category":"food","emoji_order":"1452"},{"name":"lemon","shortname":":lemon:","category":"food","emoji_order":"1453"},{"name":"banana","shortname":":banana:","category":"food","emoji_order":"1454"},{"name":"pineapple","shortname":":pineapple:","category":"food","emoji_order":"1455"},{"name":"red apple","shortname":":apple:","category":"food","emoji_order":"1456"},{"name":"green apple","shortname":":green_apple:","category":"food","emoji_order":"1457"},{"name":"pear","shortname":":pear:","category":"food","emoji_order":"1458"},{"name":"peach","shortname":":peach:","category":"food","emoji_order":"1459"},{"name":"cherries","shortname":":cherries:","category":"food","emoji_order":"1460"},{"name":"strawberry","shortname":":strawberry:","category":"food","emoji_order":"1461"},{"name":"kiwifruit","shortname":":kiwi:","category":"food","emoji_order":"1462","aliases":[":kiwifruit:"]},{"name":"tomato","shortname":":tomato:","category":"food","emoji_order":"1463"},{"name":"avocado","shortname":":avocado:","category":"food","emoji_order":"1464"},{"name":"aubergine","shortname":":eggplant:","category":"food","emoji_order":"1465"},{"name":"potato","shortname":":potato:","category":"food","emoji_order":"1466"},{"name":"carrot","shortname":":carrot:","category":"food","emoji_order":"1467"},{"name":"ear of maize","shortname":":corn:","category":"food","emoji_order":"1468"},{"name":"hot pepper","shortname":":hot_pepper:","category":"food","emoji_order":"1469"},{"name":"cucumber","shortname":":cucumber:","category":"food","emoji_order":"1470"},{"name":"mushroom","shortname":":mushroom:","category":"nature","emoji_order":"1471"},{"name":"peanuts","shortname":":peanuts:","category":"food","emoji_order":"1472","aliases":[":shelled_peanut:"]},{"name":"chestnut","shortname":":chestnut:","category":"nature","emoji_order":"1473"},{"name":"bread","shortname":":bread:","category":"food","emoji_order":"1474"},{"name":"croissant","shortname":":croissant:","category":"food","emoji_order":"1475"},{"name":"baguette bread","shortname":":french_bread:","category":"food","emoji_order":"1476","aliases":[":baguette_bread:"]},{"name":"pancakes","shortname":":pancakes:","category":"food","emoji_order":"1477"},{"name":"cheese wedge","shortname":":cheese:","category":"food","emoji_order":"1478","aliases":[":cheese_wedge:"]},{"name":"meat on bone","shortname":":meat_on_bone:","category":"food","emoji_order":"1479"},{"name":"poultry leg","shortname":":poultry_leg:","category":"food","emoji_order":"1480"},{"name":"bacon","shortname":":bacon:","category":"food","emoji_order":"1481"},{"name":"hamburger","shortname":":hamburger:","category":"food","emoji_order":"1482"},{"name":"french fries","shortname":":fries:","category":"food","emoji_order":"1483"},{"name":"slice of pizza","shortname":":pizza:","category":"food","emoji_order":"1484"},{"name":"hot dog","shortname":":hotdog:","category":"food","emoji_order":"1485","aliases":[":hot_dog:"]},{"name":"taco","shortname":":taco:","category":"food","emoji_order":"1486"},{"name":"burrito","shortname":":burrito:","category":"food","emoji_order":"1487"},{"name":"stuffed flatbread","shortname":":stuffed_flatbread:","category":"food","emoji_order":"1488","aliases":[":stuffed_pita:"]},{"name":"egg","shortname":":egg:","category":"food","emoji_order":"1489"},{"name":"cooking","shortname":":cooking:","category":"food","emoji_order":"1490"},{"name":"shallow pan of food","shortname":":shallow_pan_of_food:","category":"food","emoji_order":"1491","aliases":[":paella:"]},{"name":"pot of food","shortname":":stew:","category":"food","emoji_order":"1492"},{"name":"green salad","shortname":":salad:","category":"food","emoji_order":"1493","aliases":[":green_salad:"]},{"name":"popcorn","shortname":":popcorn:","category":"food","emoji_order":"1494"},{"name":"bento box","shortname":":bento:","category":"food","emoji_order":"1495"},{"name":"rice cracker","shortname":":rice_cracker:","category":"food","emoji_order":"1496"},{"name":"rice ball","shortname":":rice_ball:","category":"food","emoji_order":"1497"},{"name":"cooked rice","shortname":":rice:","category":"food","emoji_order":"1498"},{"name":"curry and rice","shortname":":curry:","category":"food","emoji_order":"1499"},{"name":"steaming bowl","shortname":":ramen:","category":"food","emoji_order":"1500"},{"name":"spaghetti","shortname":":spaghetti:","category":"food","emoji_order":"1501"},{"name":"roasted sweet potato","shortname":":sweet_potato:","category":"food","emoji_order":"1502"},{"name":"oden","shortname":":oden:","category":"food","emoji_order":"1503"},{"name":"sushi","shortname":":sushi:","category":"food","emoji_order":"1504"},{"name":"fried shrimp","shortname":":fried_shrimp:","category":"food","emoji_order":"1505"},{"name":"fish cake with swirl design","shortname":":fish_cake:","category":"food","emoji_order":"1506"},{"name":"dango","shortname":":dango:","category":"food","emoji_order":"1507"},{"name":"soft ice cream","shortname":":icecream:","category":"food","emoji_order":"1508"},{"name":"shaved ice","shortname":":shaved_ice:","category":"food","emoji_order":"1509"},{"name":"ice cream","shortname":":ice_cream:","category":"food","emoji_order":"1510"},{"name":"doughnut","shortname":":doughnut:","category":"food","emoji_order":"1511"},{"name":"cookie","shortname":":cookie:","category":"food","emoji_order":"1512"},{"name":"birthday cake","shortname":":birthday:","category":"food","emoji_order":"1513"},{"name":"shortcake","shortname":":cake:","category":"food","emoji_order":"1514"},{"name":"chocolate bar","shortname":":chocolate_bar:","category":"food","emoji_order":"1515"},{"name":"candy","shortname":":candy:","category":"food","emoji_order":"1516"},{"name":"lollipop","shortname":":lollipop:","category":"food","emoji_order":"1517"},{"name":"custard","shortname":":custard:","category":"food","emoji_order":"1518","aliases":[":pudding:",":flan:"]},{"name":"honey pot","shortname":":honey_pot:","category":"food","emoji_order":"1519"},{"name":"baby bottle","shortname":":baby_bottle:","category":"food","emoji_order":"1520"},{"name":"glass of milk","shortname":":milk:","category":"food","emoji_order":"1521","aliases":[":glass_of_milk:"]},{"name":"hot beverage","shortname":":coffee:","category":"food","emoji_order":"1522"},{"name":"teacup without handle","shortname":":tea:","category":"food","emoji_order":"1523"},{"name":"sake bottle and cup","shortname":":sake:","category":"food","emoji_order":"1524"},{"name":"bottle with popping cork","shortname":":champagne:","category":"food","emoji_order":"1525","aliases":[":bottle_with_popping_cork:"]},{"name":"wine glass","shortname":":wine_glass:","category":"food","emoji_order":"1526"},{"name":"cocktail glass","shortname":":cocktail:","category":"food","emoji_order":"1527"},{"name":"tropical drink","shortname":":tropical_drink:","category":"food","emoji_order":"1528"},{"name":"beer mug","shortname":":beer:","category":"food","emoji_order":"1529"},{"name":"clinking beer mugs","shortname":":beers:","category":"food","emoji_order":"1530"},{"name":"clinking glasses","shortname":":champagne_glass:","category":"food","emoji_order":"1531","aliases":[":clinking_glass:"]},{"name":"tumbler glass","shortname":":tumbler_glass:","category":"food","emoji_order":"1532","aliases":[":whisky:"]},{"name":"fork and knife with plate","shortname":":fork_knife_plate:","category":"food","emoji_order":"1533","aliases":[":fork_and_knife_with_plate:"]},{"name":"fork and knife","shortname":":fork_and_knife:","category":"food","emoji_order":"1534"},{"name":"spoon","shortname":":spoon:","category":"food","emoji_order":"1535"},{"name":"hocho","shortname":":knife:","category":"objects","emoji_order":"1536"},{"name":"amphora","shortname":":amphora:","category":"objects","emoji_order":"1537"},{"name":"earth globe europe-africa","shortname":":earth_africa:","category":"nature","emoji_order":"1538"},{"name":"earth globe americas","shortname":":earth_americas:","category":"nature","emoji_order":"1539"},{"name":"earth globe asia-australia","shortname":":earth_asia:","category":"nature","emoji_order":"1540"},{"name":"globe with meridians","shortname":":globe_with_meridians:","category":"symbols","emoji_order":"1541"},{"name":"world map","shortname":":map:","category":"objects","emoji_order":"1542","aliases":[":world_map:"]},{"name":"silhouette of japan","shortname":":japan:","category":"travel","emoji_order":"1543"},{"name":"snow capped mountain","shortname":":mountain_snow:","category":"travel","emoji_order":"1544","aliases":[":snow_capped_mountain:"]},{"name":"mountain","shortname":":mountain:","category":"travel","emoji_order":"1545"},{"name":"volcano","shortname":":volcano:","category":"travel","emoji_order":"1546"},{"name":"mount fuji","shortname":":mount_fuji:","category":"travel","emoji_order":"1547"},{"name":"camping","shortname":":camping:","category":"travel","emoji_order":"1548"},{"name":"beach with umbrella","shortname":":beach:","category":"travel","emoji_order":"1549","aliases":[":beach_with_umbrella:"]},{"name":"desert","shortname":":desert:","category":"travel","emoji_order":"1550"},{"name":"desert island","shortname":":island:","category":"travel","emoji_order":"1551","aliases":[":desert_island:"]},{"name":"national park","shortname":":park:","category":"travel","emoji_order":"1552","aliases":[":national_park:"]},{"name":"stadium","shortname":":stadium:","category":"travel","emoji_order":"1553"},{"name":"classical building","shortname":":classical_building:","category":"travel","emoji_order":"1554"},{"name":"building construction","shortname":":construction_site:","category":"travel","emoji_order":"1555","aliases":[":building_construction:"]},{"name":"house buildings","shortname":":homes:","category":"travel","emoji_order":"1556","aliases":[":house_buildings:"]},{"name":"cityscape","shortname":":cityscape:","category":"travel","emoji_order":"1557"},{"name":"derelict house building","shortname":":house_abandoned:","category":"travel","emoji_order":"1558","aliases":[":derelict_house_building:"]},{"name":"house building","shortname":":house:","category":"travel","emoji_order":"1559"},{"name":"house with garden","shortname":":house_with_garden:","category":"travel","emoji_order":"1560"},{"name":"office building","shortname":":office:","category":"travel","emoji_order":"1561"},{"name":"japanese post office","shortname":":post_office:","category":"travel","emoji_order":"1562"},{"name":"european post office","shortname":":european_post_office:","category":"travel","emoji_order":"1563"},{"name":"hospital","shortname":":hospital:","category":"travel","emoji_order":"1564"},{"name":"bank","shortname":":bank:","category":"travel","emoji_order":"1565"},{"name":"hotel","shortname":":hotel:","category":"travel","emoji_order":"1566"},{"name":"love hotel","shortname":":love_hotel:","category":"travel","emoji_order":"1567"},{"name":"convenience store","shortname":":convenience_store:","category":"travel","emoji_order":"1568"},{"name":"school","shortname":":school:","category":"travel","emoji_order":"1569"},{"name":"department store","shortname":":department_store:","category":"travel","emoji_order":"1570"},{"name":"factory","shortname":":factory:","category":"travel","emoji_order":"1571"},{"name":"japanese castle","shortname":":japanese_castle:","category":"travel","emoji_order":"1572"},{"name":"european castle","shortname":":european_castle:","category":"travel","emoji_order":"1573"},{"name":"wedding","shortname":":wedding:","category":"travel","emoji_order":"1574"},{"name":"tokyo tower","shortname":":tokyo_tower:","category":"travel","emoji_order":"1575"},{"name":"statue of liberty","shortname":":statue_of_liberty:","category":"travel","emoji_order":"1576"},{"name":"church","shortname":":church:","category":"travel","emoji_order":"1577"},{"name":"mosque","shortname":":mosque:","category":"travel","emoji_order":"1578"},{"name":"synagogue","shortname":":synagogue:","category":"travel","emoji_order":"1579"},{"name":"shinto shrine","shortname":":shinto_shrine:","category":"travel","emoji_order":"1580"},{"name":"kaaba","shortname":":kaaba:","category":"travel","emoji_order":"1581"},{"name":"fountain","shortname":":fountain:","category":"travel","emoji_order":"1582"},{"name":"tent","shortname":":tent:","category":"travel","emoji_order":"1583"},{"name":"foggy","shortname":":foggy:","category":"travel","emoji_order":"1584"},{"name":"night with stars","shortname":":night_with_stars:","category":"travel","emoji_order":"1585"},{"name":"sunrise over mountains","shortname":":sunrise_over_mountains:","category":"travel","emoji_order":"1586"},{"name":"sunrise","shortname":":sunrise:","category":"travel","emoji_order":"1587"},{"name":"cityscape at dusk","shortname":":city_dusk:","category":"travel","emoji_order":"1588"},{"name":"sunset over buildings","shortname":":city_sunset:","category":"travel","emoji_order":"1589","aliases":[":city_sunrise:"]},{"name":"bridge at night","shortname":":bridge_at_night:","category":"travel","emoji_order":"1590"},{"name":"hot springs","shortname":":hotsprings:","category":"symbols","emoji_order":"1591"},{"name":"milky way","shortname":":milky_way:","category":"travel","emoji_order":"1592"},{"name":"carousel horse","shortname":":carousel_horse:","category":"travel","emoji_order":"1593"},{"name":"ferris wheel","shortname":":ferris_wheel:","category":"travel","emoji_order":"1594"},{"name":"roller coaster","shortname":":roller_coaster:","category":"travel","emoji_order":"1595"},{"name":"barber pole","shortname":":barber:","category":"objects","emoji_order":"1596"},{"name":"circus tent","shortname":":circus_tent:","category":"activity","emoji_order":"1597"},{"name":"performing arts","shortname":":performing_arts:","category":"activity","emoji_order":"1598"},{"name":"frame with picture","shortname":":frame_photo:","category":"objects","emoji_order":"1599","aliases":[":frame_with_picture:"]},{"name":"artist palette","shortname":":art:","category":"activity","emoji_order":"1600"},{"name":"slot machine","shortname":":slot_machine:","category":"activity","emoji_order":"1601"},{"name":"steam locomotive","shortname":":steam_locomotive:","category":"travel","emoji_order":"1602"},{"name":"railway car","shortname":":railway_car:","category":"travel","emoji_order":"1603"},{"name":"high-speed train","shortname":":bullettrain_side:","category":"travel","emoji_order":"1604"},{"name":"high-speed train with bullet nose","shortname":":bullettrain_front:","category":"travel","emoji_order":"1605"},{"name":"train","shortname":":train2:","category":"travel","emoji_order":"1606"},{"name":"metro","shortname":":metro:","category":"travel","emoji_order":"1607"},{"name":"light rail","shortname":":light_rail:","category":"travel","emoji_order":"1608"},{"name":"station","shortname":":station:","category":"travel","emoji_order":"1609"},{"name":"tram","shortname":":tram:","category":"travel","emoji_order":"1610"},{"name":"monorail","shortname":":monorail:","category":"travel","emoji_order":"1611"},{"name":"mountain railway","shortname":":mountain_railway:","category":"travel","emoji_order":"1612"},{"name":"tram car","shortname":":train:","category":"travel","emoji_order":"1613"},{"name":"bus","shortname":":bus:","category":"travel","emoji_order":"1614"},{"name":"oncoming bus","shortname":":oncoming_bus:","category":"travel","emoji_order":"1615"},{"name":"trolleybus","shortname":":trolleybus:","category":"travel","emoji_order":"1616"},{"name":"minibus","shortname":":minibus:","category":"travel","emoji_order":"1617"},{"name":"ambulance","shortname":":ambulance:","category":"travel","emoji_order":"1618"},{"name":"fire engine","shortname":":fire_engine:","category":"travel","emoji_order":"1619"},{"name":"police car","shortname":":police_car:","category":"travel","emoji_order":"1620"},{"name":"oncoming police car","shortname":":oncoming_police_car:","category":"travel","emoji_order":"1621"},{"name":"taxi","shortname":":taxi:","category":"travel","emoji_order":"1622"},{"name":"oncoming taxi","shortname":":oncoming_taxi:","category":"travel","emoji_order":"1623"},{"name":"automobile","shortname":":red_car:","category":"travel","emoji_order":"1624"},{"name":"oncoming automobile","shortname":":oncoming_automobile:","category":"travel","emoji_order":"1625"},{"name":"recreational vehicle","shortname":":blue_car:","category":"travel","emoji_order":"1626"},{"name":"delivery truck","shortname":":truck:","category":"travel","emoji_order":"1627"},{"name":"articulated lorry","shortname":":articulated_lorry:","category":"travel","emoji_order":"1628"},{"name":"tractor","shortname":":tractor:","category":"travel","emoji_order":"1629"},{"name":"bicycle","shortname":":bike:","category":"travel","emoji_order":"1630"},{"name":"scooter","shortname":":scooter:","category":"travel","emoji_order":"1631"},{"name":"motor scooter","shortname":":motor_scooter:","category":"travel","emoji_order":"1632","aliases":[":motorbike:"]},{"name":"bus stop","shortname":":busstop:","category":"travel","emoji_order":"1633"},{"name":"motorway","shortname":":motorway:","category":"travel","emoji_order":"1634"},{"name":"railway track","shortname":":railway_track:","category":"travel","emoji_order":"1635","aliases":[":railroad_track:"]},{"name":"fuel pump","shortname":":fuelpump:","category":"travel","emoji_order":"1636"},{"name":"police cars revolving light","shortname":":rotating_light:","category":"travel","emoji_order":"1637"},{"name":"horizontal traffic light","shortname":":traffic_light:","category":"travel","emoji_order":"1638"},{"name":"vertical traffic light","shortname":":vertical_traffic_light:","category":"travel","emoji_order":"1639"},{"name":"construction sign","shortname":":construction:","category":"travel","emoji_order":"1640"},{"name":"octagonal sign","shortname":":octagonal_sign:","category":"symbols","emoji_order":"1641","aliases":[":stop_sign:"]},{"name":"anchor","shortname":":anchor:","category":"travel","emoji_order":"1642"},{"name":"sailboat","shortname":":sailboat:","category":"travel","emoji_order":"1643"},{"name":"canoe","shortname":":canoe:","category":"travel","emoji_order":"1644","aliases":[":kayak:"]},{"name":"speedboat","shortname":":speedboat:","category":"travel","emoji_order":"1645"},{"name":"passenger ship","shortname":":cruise_ship:","category":"travel","emoji_order":"1646","aliases":[":passenger_ship:"]},{"name":"ferry","shortname":":ferry:","category":"travel","emoji_order":"1647"},{"name":"motorboat","shortname":":motorboat:","category":"travel","emoji_order":"1648"},{"name":"ship","shortname":":ship:","category":"travel","emoji_order":"1649"},{"name":"airplane","shortname":":airplane:","category":"travel","emoji_order":"1650"},{"name":"small airplane","shortname":":airplane_small:","category":"travel","emoji_order":"1651","aliases":[":small_airplane:"]},{"name":"airplane departure","shortname":":airplane_departure:","category":"travel","emoji_order":"1652"},{"name":"airplane arriving","shortname":":airplane_arriving:","category":"travel","emoji_order":"1653"},{"name":"seat","shortname":":seat:","category":"travel","emoji_order":"1654"},{"name":"helicopter","shortname":":helicopter:","category":"travel","emoji_order":"1655"},{"name":"suspension railway","shortname":":suspension_railway:","category":"travel","emoji_order":"1656"},{"name":"mountain cableway","shortname":":mountain_cableway:","category":"travel","emoji_order":"1657"},{"name":"aerial tramway","shortname":":aerial_tramway:","category":"travel","emoji_order":"1658"},{"name":"rocket","shortname":":rocket:","category":"travel","emoji_order":"1659"},{"name":"satellite","shortname":":satellite_orbital:","category":"travel","emoji_order":"1660"},{"name":"bellhop bell","shortname":":bellhop:","category":"objects","emoji_order":"1661","aliases":[":bellhop_bell:"]},{"name":"door","shortname":":door:","category":"objects","emoji_order":"1662"},{"name":"sleeping accommodation","shortname":":sleeping_accommodation:","category":"objects","emoji_order":"1663"},{"name":"bed","shortname":":bed:","category":"objects","emoji_order":"1669"},{"name":"couch and lamp","shortname":":couch:","category":"objects","emoji_order":"1670","aliases":[":couch_and_lamp:"]},{"name":"toilet","shortname":":toilet:","category":"objects","emoji_order":"1671"},{"name":"shower","shortname":":shower:","category":"objects","emoji_order":"1672"},{"name":"bath","shortname":":bath:","category":"activity","emoji_order":"1673"},{"name":"bath tone 1","shortname":":bath_tone1:","category":"activity","emoji_order":"1674"},{"name":"bath tone 2","shortname":":bath_tone2:","category":"activity","emoji_order":"1675"},{"name":"bath tone 3","shortname":":bath_tone3:","category":"activity","emoji_order":"1676"},{"name":"bath tone 4","shortname":":bath_tone4:","category":"activity","emoji_order":"1677"},{"name":"bath tone 5","shortname":":bath_tone5:","category":"activity","emoji_order":"1678"},{"name":"bathtub","shortname":":bathtub:","category":"objects","emoji_order":"1679"},{"name":"hourglass","shortname":":hourglass:","category":"objects","emoji_order":"1680"},{"name":"hourglass with flowing sand","shortname":":hourglass_flowing_sand:","category":"objects","emoji_order":"1681"},{"name":"watch","shortname":":watch:","category":"objects","emoji_order":"1682"},{"name":"alarm clock","shortname":":alarm_clock:","category":"objects","emoji_order":"1683"},{"name":"stopwatch","shortname":":stopwatch:","category":"objects","emoji_order":"1684"},{"name":"timer clock","shortname":":timer:","category":"objects","emoji_order":"1685","aliases":[":timer_clock:"]},{"name":"mantlepiece clock","shortname":":clock:","category":"objects","emoji_order":"1686","aliases":[":mantlepiece_clock:"]},{"name":"clock face twelve oclock","shortname":":clock12:","category":"symbols","emoji_order":"1687"},{"name":"clock face twelve-thirty","shortname":":clock1230:","category":"symbols","emoji_order":"1688"},{"name":"clock face one oclock","shortname":":clock1:","category":"symbols","emoji_order":"1689"},{"name":"clock face one-thirty","shortname":":clock130:","category":"symbols","emoji_order":"1690"},{"name":"clock face two oclock","shortname":":clock2:","category":"symbols","emoji_order":"1691"},{"name":"clock face two-thirty","shortname":":clock230:","category":"symbols","emoji_order":"1692"},{"name":"clock face three oclock","shortname":":clock3:","category":"symbols","emoji_order":"1693"},{"name":"clock face three-thirty","shortname":":clock330:","category":"symbols","emoji_order":"1694"},{"name":"clock face four oclock","shortname":":clock4:","category":"symbols","emoji_order":"1695"},{"name":"clock face four-thirty","shortname":":clock430:","category":"symbols","emoji_order":"1696"},{"name":"clock face five oclock","shortname":":clock5:","category":"symbols","emoji_order":"1697"},{"name":"clock face five-thirty","shortname":":clock530:","category":"symbols","emoji_order":"1698"},{"name":"clock face six oclock","shortname":":clock6:","category":"symbols","emoji_order":"1699"},{"name":"clock face six-thirty","shortname":":clock630:","category":"symbols","emoji_order":"1700"},{"name":"clock face seven oclock","shortname":":clock7:","category":"symbols","emoji_order":"1701"},{"name":"clock face seven-thirty","shortname":":clock730:","category":"symbols","emoji_order":"1702"},{"name":"clock face eight oclock","shortname":":clock8:","category":"symbols","emoji_order":"1703"},{"name":"clock face eight-thirty","shortname":":clock830:","category":"symbols","emoji_order":"1704"},{"name":"clock face nine oclock","shortname":":clock9:","category":"symbols","emoji_order":"1705"},{"name":"clock face nine-thirty","shortname":":clock930:","category":"symbols","emoji_order":"1706"},{"name":"clock face ten oclock","shortname":":clock10:","category":"symbols","emoji_order":"1707"},{"name":"clock face ten-thirty","shortname":":clock1030:","category":"symbols","emoji_order":"1708"},{"name":"clock face eleven oclock","shortname":":clock11:","category":"symbols","emoji_order":"1709"},{"name":"clock face eleven-thirty","shortname":":clock1130:","category":"symbols","emoji_order":"1710"},{"name":"new moon symbol","shortname":":new_moon:","category":"nature","emoji_order":"1711"},{"name":"waxing crescent moon symbol","shortname":":waxing_crescent_moon:","category":"nature","emoji_order":"1712"},{"name":"first quarter moon symbol","shortname":":first_quarter_moon:","category":"nature","emoji_order":"1713"},{"name":"waxing gibbous moon symbol","shortname":":waxing_gibbous_moon:","category":"nature","emoji_order":"1714"},{"name":"full moon symbol","shortname":":full_moon:","category":"nature","emoji_order":"1715"},{"name":"waning gibbous moon symbol","shortname":":waning_gibbous_moon:","category":"nature","emoji_order":"1716"},{"name":"last quarter moon symbol","shortname":":last_quarter_moon:","category":"nature","emoji_order":"1717"},{"name":"waning crescent moon symbol","shortname":":waning_crescent_moon:","category":"nature","emoji_order":"1718"},{"name":"crescent moon","shortname":":crescent_moon:","category":"nature","emoji_order":"1719"},{"name":"new moon with face","shortname":":new_moon_with_face:","category":"nature","emoji_order":"1720"},{"name":"first quarter moon with face","shortname":":first_quarter_moon_with_face:","category":"nature","emoji_order":"1721"},{"name":"last quarter moon with face","shortname":":last_quarter_moon_with_face:","category":"nature","emoji_order":"1722"},{"name":"thermometer","shortname":":thermometer:","category":"objects","emoji_order":"1723"},{"name":"black sun with rays","shortname":":sunny:","category":"nature","emoji_order":"1724"},{"name":"full moon with face","shortname":":full_moon_with_face:","category":"nature","emoji_order":"1725"},{"name":"sun with face","shortname":":sun_with_face:","category":"nature","emoji_order":"1726"},{"name":"white medium star","shortname":":star:","category":"nature","emoji_order":"1727"},{"name":"glowing star","shortname":":star2:","category":"nature","emoji_order":"1728"},{"name":"shooting star","shortname":":stars:","category":"travel","emoji_order":"1729"},{"name":"cloud","shortname":":cloud:","category":"nature","emoji_order":"1730"},{"name":"sun behind cloud","shortname":":partly_sunny:","category":"nature","emoji_order":"1731"},{"name":"thunder cloud and rain","shortname":":thunder_cloud_rain:","category":"nature","emoji_order":"1732","aliases":[":thunder_cloud_and_rain:"]},{"name":"white sun with small cloud","shortname":":white_sun_small_cloud:","category":"nature","emoji_order":"1733","aliases":[":white_sun_with_small_cloud:"]},{"name":"white sun behind cloud","shortname":":white_sun_cloud:","category":"nature","emoji_order":"1734","aliases":[":white_sun_behind_cloud:"]},{"name":"white sun behind cloud with rain","shortname":":white_sun_rain_cloud:","category":"nature","emoji_order":"1735","aliases":[":white_sun_behind_cloud_with_rain:"]},{"name":"cloud with rain","shortname":":cloud_rain:","category":"nature","emoji_order":"1736","aliases":[":cloud_with_rain:"]},{"name":"cloud with snow","shortname":":cloud_snow:","category":"nature","emoji_order":"1737","aliases":[":cloud_with_snow:"]},{"name":"cloud with lightning","shortname":":cloud_lightning:","category":"nature","emoji_order":"1738","aliases":[":cloud_with_lightning:"]},{"name":"cloud with tornado","shortname":":cloud_tornado:","category":"nature","emoji_order":"1739","aliases":[":cloud_with_tornado:"]},{"name":"fog","shortname":":fog:","category":"nature","emoji_order":"1740"},{"name":"wind blowing face","shortname":":wind_blowing_face:","category":"nature","emoji_order":"1741"},{"name":"cyclone","shortname":":cyclone:","category":"symbols","emoji_order":"1742"},{"name":"rainbow","shortname":":rainbow:","category":"travel","emoji_order":"1743"},{"name":"closed umbrella","shortname":":closed_umbrella:","category":"people","emoji_order":"1744"},{"name":"umbrella","shortname":":umbrella2:","category":"nature","emoji_order":"1745"},{"name":"umbrella with rain drops","shortname":":umbrella:","category":"nature","emoji_order":"1746"},{"name":"umbrella on ground","shortname":":beach_umbrella:","category":"objects","emoji_order":"1747","aliases":[":umbrella_on_ground:"]},{"name":"high voltage sign","shortname":":zap:","category":"nature","emoji_order":"1748"},{"name":"snowflake","shortname":":snowflake:","category":"nature","emoji_order":"1749"},{"name":"snowman","shortname":":snowman2:","category":"nature","emoji_order":"1750"},{"name":"snowman without snow","shortname":":snowman:","category":"nature","emoji_order":"1751"},{"name":"comet","shortname":":comet:","category":"nature","emoji_order":"1752"},{"name":"fire","shortname":":fire:","category":"nature","emoji_order":"1753","aliases":[":flame:"]},{"name":"droplet","shortname":":droplet:","category":"nature","emoji_order":"1754"},{"name":"water wave","shortname":":ocean:","category":"nature","emoji_order":"1755"},{"name":"jack-o-lantern","shortname":":jack_o_lantern:","category":"nature","emoji_order":"1756"},{"name":"christmas tree","shortname":":christmas_tree:","category":"nature","emoji_order":"1757"},{"name":"fireworks","shortname":":fireworks:","category":"travel","emoji_order":"1758"},{"name":"firework sparkler","shortname":":sparkler:","category":"travel","emoji_order":"1759"},{"name":"sparkles","shortname":":sparkles:","category":"nature","emoji_order":"1760"},{"name":"balloon","shortname":":balloon:","category":"objects","emoji_order":"1761"},{"name":"party popper","shortname":":tada:","category":"objects","emoji_order":"1762"},{"name":"confetti ball","shortname":":confetti_ball:","category":"objects","emoji_order":"1763"},{"name":"tanabata tree","shortname":":tanabata_tree:","category":"nature","emoji_order":"1764"},{"name":"pine decoration","shortname":":bamboo:","category":"nature","emoji_order":"1765"},{"name":"japanese dolls","shortname":":dolls:","category":"objects","emoji_order":"1766"},{"name":"carp streamer","shortname":":flags:","category":"objects","emoji_order":"1767"},{"name":"wind chime","shortname":":wind_chime:","category":"objects","emoji_order":"1768"},{"name":"moon viewing ceremony","shortname":":rice_scene:","category":"travel","emoji_order":"1769"},{"name":"ribbon","shortname":":ribbon:","category":"objects","emoji_order":"1770"},{"name":"wrapped present","shortname":":gift:","category":"objects","emoji_order":"1771"},{"name":"reminder ribbon","shortname":":reminder_ribbon:","category":"activity","emoji_order":"1772"},{"name":"admission tickets","shortname":":tickets:","category":"activity","emoji_order":"1773","aliases":[":admission_tickets:"]},{"name":"ticket","shortname":":ticket:","category":"activity","emoji_order":"1774"},{"name":"military medal","shortname":":military_medal:","category":"activity","emoji_order":"1775"},{"name":"trophy","shortname":":trophy:","category":"activity","emoji_order":"1776"},{"name":"sports medal","shortname":":medal:","category":"activity","emoji_order":"1777","aliases":[":sports_medal:"]},{"name":"first place medal","shortname":":first_place:","category":"activity","emoji_order":"1778","aliases":[":first_place_medal:"]},{"name":"second place medal","shortname":":second_place:","category":"activity","emoji_order":"1779","aliases":[":second_place_medal:"]},{"name":"third place medal","shortname":":third_place:","category":"activity","emoji_order":"1780","aliases":[":third_place_medal:"]},{"name":"soccer ball","shortname":":soccer:","category":"activity","emoji_order":"1781"},{"name":"baseball","shortname":":baseball:","category":"activity","emoji_order":"1782"},{"name":"basketball and hoop","shortname":":basketball:","category":"activity","emoji_order":"1783"},{"name":"volleyball","shortname":":volleyball:","category":"activity","emoji_order":"1784"},{"name":"american football","shortname":":football:","category":"activity","emoji_order":"1785"},{"name":"rugby football","shortname":":rugby_football:","category":"activity","emoji_order":"1786"},{"name":"tennis racquet and ball","shortname":":tennis:","category":"activity","emoji_order":"1787"},{"name":"billiards","shortname":":8ball:","category":"activity","emoji_order":"1788"},{"name":"bowling","shortname":":bowling:","category":"activity","emoji_order":"1789"},{"name":"cricket bat and ball","shortname":":cricket:","category":"activity","emoji_order":"1790","aliases":[":cricket_bat_ball:"]},{"name":"field hockey stick and ball","shortname":":field_hockey:","category":"activity","emoji_order":"1791"},{"name":"ice hockey stick and puck","shortname":":hockey:","category":"activity","emoji_order":"1792"},{"name":"table tennis paddle and ball","shortname":":ping_pong:","category":"activity","emoji_order":"1793","aliases":[":table_tennis:"]},{"name":"badminton racquet","shortname":":badminton:","category":"activity","emoji_order":"1794"},{"name":"boxing glove","shortname":":boxing_glove:","category":"activity","emoji_order":"1795","aliases":[":boxing_gloves:"]},{"name":"martial arts uniform","shortname":":martial_arts_uniform:","category":"activity","emoji_order":"1796","aliases":[":karate_uniform:"]},{"name":"goal net","shortname":":goal:","category":"activity","emoji_order":"1797","aliases":[":goal_net:"]},{"name":"direct hit","shortname":":dart:","category":"activity","emoji_order":"1798"},{"name":"flag in hole","shortname":":golf:","category":"activity","emoji_order":"1799"},{"name":"ice skate","shortname":":ice_skate:","category":"activity","emoji_order":"1800"},{"name":"fishing pole and fish","shortname":":fishing_pole_and_fish:","category":"activity","emoji_order":"1801"},{"name":"running shirt with sash","shortname":":running_shirt_with_sash:","category":"activity","emoji_order":"1802"},{"name":"ski and ski boot","shortname":":ski:","category":"activity","emoji_order":"1803"},{"name":"video game","shortname":":video_game:","category":"activity","emoji_order":"1804"},{"name":"joystick","shortname":":joystick:","category":"objects","emoji_order":"1805"},{"name":"game die","shortname":":game_die:","category":"activity","emoji_order":"1806"},{"name":"black spade suit","shortname":":spades:","category":"symbols","emoji_order":"1807"},{"name":"black heart suit","shortname":":hearts:","category":"symbols","emoji_order":"1808"},{"name":"black diamond suit","shortname":":diamonds:","category":"symbols","emoji_order":"1809"},{"name":"black club suit","shortname":":clubs:","category":"symbols","emoji_order":"1810"},{"name":"playing card black joker","shortname":":black_joker:","category":"symbols","emoji_order":"1811"},{"name":"mahjong tile red dragon","shortname":":mahjong:","category":"symbols","emoji_order":"1812"},{"name":"flower playing cards","shortname":":flower_playing_cards:","category":"symbols","emoji_order":"1813"},{"name":"speaker with cancellation stroke","shortname":":mute:","category":"symbols","emoji_order":"1814"},{"name":"speaker","shortname":":speaker:","category":"symbols","emoji_order":"1815"},{"name":"speaker with one sound wave","shortname":":sound:","category":"symbols","emoji_order":"1816"},{"name":"speaker with three sound waves","shortname":":loud_sound:","category":"symbols","emoji_order":"1817"},{"name":"public address loudspeaker","shortname":":loudspeaker:","category":"symbols","emoji_order":"1818"},{"name":"cheering megaphone","shortname":":mega:","category":"symbols","emoji_order":"1819"},{"name":"postal horn","shortname":":postal_horn:","category":"objects","emoji_order":"1820"},{"name":"bell","shortname":":bell:","category":"symbols","emoji_order":"1821"},{"name":"bell with cancellation stroke","shortname":":no_bell:","category":"symbols","emoji_order":"1822"},{"name":"musical score","shortname":":musical_score:","category":"activity","emoji_order":"1823"},{"name":"musical note","shortname":":musical_note:","category":"symbols","emoji_order":"1824"},{"name":"multiple musical notes","shortname":":notes:","category":"symbols","emoji_order":"1825"},{"name":"studio microphone","shortname":":microphone2:","category":"objects","emoji_order":"1826","aliases":[":studio_microphone:"]},{"name":"level slider","shortname":":level_slider:","category":"objects","emoji_order":"1827"},{"name":"control knobs","shortname":":control_knobs:","category":"objects","emoji_order":"1828"},{"name":"microphone","shortname":":microphone:","category":"activity","emoji_order":"1829"},{"name":"headphone","shortname":":headphones:","category":"activity","emoji_order":"1830"},{"name":"radio","shortname":":radio:","category":"objects","emoji_order":"1831"},{"name":"saxophone","shortname":":saxophone:","category":"activity","emoji_order":"1832"},{"name":"guitar","shortname":":guitar:","category":"activity","emoji_order":"1833"},{"name":"musical keyboard","shortname":":musical_keyboard:","category":"activity","emoji_order":"1834"},{"name":"trumpet","shortname":":trumpet:","category":"activity","emoji_order":"1835"},{"name":"violin","shortname":":violin:","category":"activity","emoji_order":"1836"},{"name":"drum with drumsticks","shortname":":drum:","category":"activity","emoji_order":"1837","aliases":[":drum_with_drumsticks:"]},{"name":"mobile phone","shortname":":iphone:","category":"objects","emoji_order":"1838"},{"name":"mobile phone with rightwards arrow at left","shortname":":calling:","category":"objects","emoji_order":"1839"},{"name":"black telephone","shortname":":telephone:","category":"objects","emoji_order":"1840"},{"name":"telephone receiver","shortname":":telephone_receiver:","category":"objects","emoji_order":"1841"},{"name":"pager","shortname":":pager:","category":"objects","emoji_order":"1842"},{"name":"fax machine","shortname":":fax:","category":"objects","emoji_order":"1843"},{"name":"battery","shortname":":battery:","category":"objects","emoji_order":"1844"},{"name":"electric plug","shortname":":electric_plug:","category":"objects","emoji_order":"1845"},{"name":"personal computer","shortname":":computer:","category":"objects","emoji_order":"1846"},{"name":"desktop computer","shortname":":desktop:","category":"objects","emoji_order":"1847","aliases":[":desktop_computer:"]},{"name":"printer","shortname":":printer:","category":"objects","emoji_order":"1848"},{"name":"keyboard","shortname":":keyboard:","category":"objects","emoji_order":"1849"},{"name":"three button mouse","shortname":":mouse_three_button:","category":"objects","emoji_order":"1850","aliases":[":three_button_mouse:"]},{"name":"trackball","shortname":":trackball:","category":"objects","emoji_order":"1851"},{"name":"minidisc","shortname":":minidisc:","category":"objects","emoji_order":"1852"},{"name":"floppy disk","shortname":":floppy_disk:","category":"objects","emoji_order":"1853"},{"name":"optical disc","shortname":":cd:","category":"objects","emoji_order":"1854"},{"name":"dvd","shortname":":dvd:","category":"objects","emoji_order":"1855"},{"name":"movie camera","shortname":":movie_camera:","category":"objects","emoji_order":"1856"},{"name":"film frames","shortname":":film_frames:","category":"objects","emoji_order":"1857"},{"name":"film projector","shortname":":projector:","category":"objects","emoji_order":"1858","aliases":[":film_projector:"]},{"name":"clapper board","shortname":":clapper:","category":"activity","emoji_order":"1859"},{"name":"television","shortname":":tv:","category":"objects","emoji_order":"1860"},{"name":"camera","shortname":":camera:","category":"objects","emoji_order":"1861"},{"name":"camera with flash","shortname":":camera_with_flash:","category":"objects","emoji_order":"1862"},{"name":"video camera","shortname":":video_camera:","category":"objects","emoji_order":"1863"},{"name":"videocassette","shortname":":vhs:","category":"objects","emoji_order":"1864"},{"name":"left-pointing magnifying glass","shortname":":mag:","category":"objects","emoji_order":"1865"},{"name":"right-pointing magnifying glass","shortname":":mag_right:","category":"objects","emoji_order":"1866"},{"name":"microscope","shortname":":microscope:","category":"objects","emoji_order":"1867"},{"name":"telescope","shortname":":telescope:","category":"objects","emoji_order":"1868"},{"name":"satellite antenna","shortname":":satellite:","category":"objects","emoji_order":"1869"},{"name":"candle","shortname":":candle:","category":"objects","emoji_order":"1870"},{"name":"electric light bulb","shortname":":bulb:","category":"objects","emoji_order":"1871"},{"name":"electric torch","shortname":":flashlight:","category":"objects","emoji_order":"1872"},{"name":"izakaya lantern","shortname":":izakaya_lantern:","category":"objects","emoji_order":"1873"},{"name":"notebook with decorative cover","shortname":":notebook_with_decorative_cover:","category":"objects","emoji_order":"1874"},{"name":"closed book","shortname":":closed_book:","category":"objects","emoji_order":"1875"},{"name":"open book","shortname":":book:","category":"objects","emoji_order":"1876"},{"name":"green book","shortname":":green_book:","category":"objects","emoji_order":"1877"},{"name":"blue book","shortname":":blue_book:","category":"objects","emoji_order":"1878"},{"name":"orange book","shortname":":orange_book:","category":"objects","emoji_order":"1879"},{"name":"books","shortname":":books:","category":"objects","emoji_order":"1880"},{"name":"notebook","shortname":":notebook:","category":"objects","emoji_order":"1881"},{"name":"ledger","shortname":":ledger:","category":"objects","emoji_order":"1882"},{"name":"page with curl","shortname":":page_with_curl:","category":"objects","emoji_order":"1883"},{"name":"scroll","shortname":":scroll:","category":"objects","emoji_order":"1884"},{"name":"page facing up","shortname":":page_facing_up:","category":"objects","emoji_order":"1885"},{"name":"newspaper","shortname":":newspaper:","category":"objects","emoji_order":"1886"},{"name":"rolled-up newspaper","shortname":":newspaper2:","category":"objects","emoji_order":"1887","aliases":[":rolled_up_newspaper:"]},{"name":"bookmark tabs","shortname":":bookmark_tabs:","category":"objects","emoji_order":"1888"},{"name":"bookmark","shortname":":bookmark:","category":"objects","emoji_order":"1889"},{"name":"label","shortname":":label:","category":"objects","emoji_order":"1890"},{"name":"money bag","shortname":":moneybag:","category":"objects","emoji_order":"1891"},{"name":"banknote with yen sign","shortname":":yen:","category":"objects","emoji_order":"1892"},{"name":"banknote with dollar sign","shortname":":dollar:","category":"objects","emoji_order":"1893"},{"name":"banknote with euro sign","shortname":":euro:","category":"objects","emoji_order":"1894"},{"name":"banknote with pound sign","shortname":":pound:","category":"objects","emoji_order":"1895"},{"name":"money with wings","shortname":":money_with_wings:","category":"objects","emoji_order":"1896"},{"name":"credit card","shortname":":credit_card:","category":"objects","emoji_order":"1897"},{"name":"chart with upwards trend and yen sign","shortname":":chart:","category":"symbols","emoji_order":"1898"},{"name":"currency exchange","shortname":":currency_exchange:","category":"symbols","emoji_order":"1899"},{"name":"heavy dollar sign","shortname":":heavy_dollar_sign:","category":"symbols","emoji_order":"1900"},{"name":"envelope","shortname":":envelope:","category":"objects","emoji_order":"1901"},{"name":"e-mail symbol","shortname":":e-mail:","category":"objects","emoji_order":"1902","aliases":[":email:"]},{"name":"incoming envelope","shortname":":incoming_envelope:","category":"objects","emoji_order":"1903"},{"name":"envelope with downwards arrow above","shortname":":envelope_with_arrow:","category":"objects","emoji_order":"1904"},{"name":"outbox tray","shortname":":outbox_tray:","category":"objects","emoji_order":"1905"},{"name":"inbox tray","shortname":":inbox_tray:","category":"objects","emoji_order":"1906"},{"name":"package","shortname":":package:","category":"objects","emoji_order":"1907"},{"name":"closed mailbox with raised flag","shortname":":mailbox:","category":"objects","emoji_order":"1908"},{"name":"closed mailbox with lowered flag","shortname":":mailbox_closed:","category":"objects","emoji_order":"1909"},{"name":"open mailbox with raised flag","shortname":":mailbox_with_mail:","category":"objects","emoji_order":"1910"},{"name":"open mailbox with lowered flag","shortname":":mailbox_with_no_mail:","category":"objects","emoji_order":"1911"},{"name":"postbox","shortname":":postbox:","category":"objects","emoji_order":"1912"},{"name":"ballot box with ballot","shortname":":ballot_box:","category":"objects","emoji_order":"1913","aliases":[":ballot_box_with_ballot:"]},{"name":"pencil","shortname":":pencil2:","category":"objects","emoji_order":"1914"},{"name":"black nib","shortname":":black_nib:","category":"objects","emoji_order":"1915"},{"name":"lower left fountain pen","shortname":":pen_fountain:","category":"objects","emoji_order":"1916","aliases":[":lower_left_fountain_pen:"]},{"name":"lower left ballpoint pen","shortname":":pen_ballpoint:","category":"objects","emoji_order":"1917","aliases":[":lower_left_ballpoint_pen:"]},{"name":"lower left paintbrush","shortname":":paintbrush:","category":"objects","emoji_order":"1918","aliases":[":lower_left_paintbrush:"]},{"name":"lower left crayon","shortname":":crayon:","category":"objects","emoji_order":"1919","aliases":[":lower_left_crayon:"]},{"name":"memo","shortname":":pencil:","category":"objects","emoji_order":"1920"},{"name":"briefcase","shortname":":briefcase:","category":"people","emoji_order":"1921"},{"name":"file folder","shortname":":file_folder:","category":"objects","emoji_order":"1922"},{"name":"open file folder","shortname":":open_file_folder:","category":"objects","emoji_order":"1923"},{"name":"card index dividers","shortname":":dividers:","category":"objects","emoji_order":"1924","aliases":[":card_index_dividers:"]},{"name":"calendar","shortname":":date:","category":"objects","emoji_order":"1925"},{"name":"tear-off calendar","shortname":":calendar:","category":"objects","emoji_order":"1926"},{"name":"spiral note pad","shortname":":notepad_spiral:","category":"objects","emoji_order":"1927","aliases":[":spiral_note_pad:"]},{"name":"spiral calendar pad","shortname":":calendar_spiral:","category":"objects","emoji_order":"1928","aliases":[":spiral_calendar_pad:"]},{"name":"card index","shortname":":card_index:","category":"objects","emoji_order":"1929"},{"name":"chart with upwards trend","shortname":":chart_with_upwards_trend:","category":"objects","emoji_order":"1930"},{"name":"chart with downwards trend","shortname":":chart_with_downwards_trend:","category":"objects","emoji_order":"1931"},{"name":"bar chart","shortname":":bar_chart:","category":"objects","emoji_order":"1932"},{"name":"clipboard","shortname":":clipboard:","category":"objects","emoji_order":"1933"},{"name":"pushpin","shortname":":pushpin:","category":"objects","emoji_order":"1934"},{"name":"round pushpin","shortname":":round_pushpin:","category":"objects","emoji_order":"1935"},{"name":"paperclip","shortname":":paperclip:","category":"objects","emoji_order":"1936"},{"name":"linked paperclips","shortname":":paperclips:","category":"objects","emoji_order":"1937","aliases":[":linked_paperclips:"]},{"name":"straight ruler","shortname":":straight_ruler:","category":"objects","emoji_order":"1938"},{"name":"triangular ruler","shortname":":triangular_ruler:","category":"objects","emoji_order":"1939"},{"name":"black scissors","shortname":":scissors:","category":"objects","emoji_order":"1940"},{"name":"card file box","shortname":":card_box:","category":"objects","emoji_order":"1941","aliases":[":card_file_box:"]},{"name":"file cabinet","shortname":":file_cabinet:","category":"objects","emoji_order":"1942"},{"name":"wastebasket","shortname":":wastebasket:","category":"objects","emoji_order":"1943"},{"name":"lock","shortname":":lock:","category":"objects","emoji_order":"1944"},{"name":"open lock","shortname":":unlock:","category":"objects","emoji_order":"1945"},{"name":"lock with ink pen","shortname":":lock_with_ink_pen:","category":"objects","emoji_order":"1946"},{"name":"closed lock with key","shortname":":closed_lock_with_key:","category":"objects","emoji_order":"1947"},{"name":"key","shortname":":key:","category":"objects","emoji_order":"1948"},{"name":"old key","shortname":":key2:","category":"objects","emoji_order":"1949","aliases":[":old_key:"]},{"name":"hammer","shortname":":hammer:","category":"objects","emoji_order":"1950"},{"name":"pick","shortname":":pick:","category":"objects","emoji_order":"1951"},{"name":"hammer and pick","shortname":":hammer_pick:","category":"objects","emoji_order":"1952","aliases":[":hammer_and_pick:"]},{"name":"hammer and wrench","shortname":":tools:","category":"objects","emoji_order":"1953","aliases":[":hammer_and_wrench:"]},{"name":"dagger knife","shortname":":dagger:","category":"objects","emoji_order":"1954","aliases":[":dagger_knife:"]},{"name":"crossed swords","shortname":":crossed_swords:","category":"objects","emoji_order":"1955"},{"name":"pistol","shortname":":gun:","category":"objects","emoji_order":"1956"},{"name":"bow and arrow","shortname":":bow_and_arrow:","category":"activity","emoji_order":"1957","aliases":[":archery:"]},{"name":"shield","shortname":":shield:","category":"objects","emoji_order":"1958"},{"name":"wrench","shortname":":wrench:","category":"objects","emoji_order":"1959"},{"name":"nut and bolt","shortname":":nut_and_bolt:","category":"objects","emoji_order":"1960"},{"name":"gear","shortname":":gear:","category":"objects","emoji_order":"1961"},{"name":"compression","shortname":":compression:","category":"objects","emoji_order":"1962"},{"name":"alembic","shortname":":alembic:","category":"objects","emoji_order":"1963"},{"name":"scales","shortname":":scales:","category":"objects","emoji_order":"1964"},{"name":"link symbol","shortname":":link:","category":"objects","emoji_order":"1965"},{"name":"chains","shortname":":chains:","category":"objects","emoji_order":"1966"},{"name":"syringe","shortname":":syringe:","category":"objects","emoji_order":"1967"},{"name":"pill","shortname":":pill:","category":"objects","emoji_order":"1968"},{"name":"smoking symbol","shortname":":smoking:","category":"objects","emoji_order":"1969"},{"name":"coffin","shortname":":coffin:","category":"objects","emoji_order":"1970"},{"name":"funeral urn","shortname":":urn:","category":"objects","emoji_order":"1971","aliases":[":funeral_urn:"]},{"name":"moyai","shortname":":moyai:","category":"objects","emoji_order":"1972"},{"name":"oil drum","shortname":":oil:","category":"objects","emoji_order":"1973","aliases":[":oil_drum:"]},{"name":"crystal ball","shortname":":crystal_ball:","category":"objects","emoji_order":"1974"},{"name":"shopping trolley","shortname":":shopping_cart:","category":"objects","emoji_order":"1975","aliases":[":shopping_trolley:"]},{"name":"automated teller machine","shortname":":atm:","category":"symbols","emoji_order":"1976"},{"name":"put litter in its place symbol","shortname":":put_litter_in_its_place:","category":"symbols","emoji_order":"1977"},{"name":"potable water symbol","shortname":":potable_water:","category":"symbols","emoji_order":"1978"},{"name":"wheelchair symbol","shortname":":wheelchair:","category":"symbols","emoji_order":"1979"},{"name":"mens symbol","shortname":":mens:","category":"symbols","emoji_order":"1980"},{"name":"womens symbol","shortname":":womens:","category":"symbols","emoji_order":"1981"},{"name":"restroom","shortname":":restroom:","category":"symbols","emoji_order":"1982"},{"name":"baby symbol","shortname":":baby_symbol:","category":"symbols","emoji_order":"1983"},{"name":"water closet","shortname":":wc:","category":"symbols","emoji_order":"1984"},{"name":"passport control","shortname":":passport_control:","category":"symbols","emoji_order":"1985"},{"name":"customs","shortname":":customs:","category":"symbols","emoji_order":"1986"},{"name":"baggage claim","shortname":":baggage_claim:","category":"symbols","emoji_order":"1987"},{"name":"left luggage","shortname":":left_luggage:","category":"symbols","emoji_order":"1988"},{"name":"warning sign","shortname":":warning:","category":"symbols","emoji_order":"1989"},{"name":"children crossing","shortname":":children_crossing:","category":"symbols","emoji_order":"1990"},{"name":"no entry","shortname":":no_entry:","category":"symbols","emoji_order":"1991"},{"name":"no entry sign","shortname":":no_entry_sign:","category":"symbols","emoji_order":"1992"},{"name":"no bicycles","shortname":":no_bicycles:","category":"symbols","emoji_order":"1993"},{"name":"no smoking symbol","shortname":":no_smoking:","category":"symbols","emoji_order":"1994"},{"name":"do not litter symbol","shortname":":do_not_litter:","category":"symbols","emoji_order":"1995"},{"name":"non-potable water symbol","shortname":":non-potable_water:","category":"symbols","emoji_order":"1996"},{"name":"no pedestrians","shortname":":no_pedestrians:","category":"symbols","emoji_order":"1997"},{"name":"no mobile phones","shortname":":no_mobile_phones:","category":"symbols","emoji_order":"1998"},{"name":"no one under eighteen symbol","shortname":":underage:","category":"symbols","emoji_order":"1999"},{"name":"radioactive sign","shortname":":radioactive:","category":"symbols","emoji_order":"2000","aliases":[":radioactive_sign:"]},{"name":"biohazard sign","shortname":":biohazard:","category":"symbols","emoji_order":"2001","aliases":[":biohazard_sign:"]},{"name":"upwards black arrow","shortname":":arrow_up:","category":"symbols","emoji_order":"2002"},{"name":"north east arrow","shortname":":arrow_upper_right:","category":"symbols","emoji_order":"2003"},{"name":"black rightwards arrow","shortname":":arrow_right:","category":"symbols","emoji_order":"2004"},{"name":"south east arrow","shortname":":arrow_lower_right:","category":"symbols","emoji_order":"2005"},{"name":"downwards black arrow","shortname":":arrow_down:","category":"symbols","emoji_order":"2006"},{"name":"south west arrow","shortname":":arrow_lower_left:","category":"symbols","emoji_order":"2007"},{"name":"leftwards black arrow","shortname":":arrow_left:","category":"symbols","emoji_order":"2008"},{"name":"north west arrow","shortname":":arrow_upper_left:","category":"symbols","emoji_order":"2009"},{"name":"up down arrow","shortname":":arrow_up_down:","category":"symbols","emoji_order":"2010"},{"name":"left right arrow","shortname":":left_right_arrow:","category":"symbols","emoji_order":"2011"},{"name":"leftwards arrow with hook","shortname":":leftwards_arrow_with_hook:","category":"symbols","emoji_order":"2012"},{"name":"rightwards arrow with hook","shortname":":arrow_right_hook:","category":"symbols","emoji_order":"2013"},{"name":"arrow pointing rightwards then curving upwards","shortname":":arrow_heading_up:","category":"symbols","emoji_order":"2014"},{"name":"arrow pointing rightwards then curving downwards","shortname":":arrow_heading_down:","category":"symbols","emoji_order":"2015"},{"name":"clockwise downwards and upwards open circle arrows","shortname":":arrows_clockwise:","category":"symbols","emoji_order":"2016"},{"name":"anticlockwise downwards and upwards open circle arrows","shortname":":arrows_counterclockwise:","category":"symbols","emoji_order":"2017"},{"name":"back with leftwards arrow above","shortname":":back:","category":"symbols","emoji_order":"2018"},{"name":"end with leftwards arrow above","shortname":":end:","category":"symbols","emoji_order":"2019"},{"name":"on with exclamation mark with left right arrow abo","shortname":":on:","category":"symbols","emoji_order":"2020"},{"name":"soon with rightwards arrow above","shortname":":soon:","category":"symbols","emoji_order":"2021"},{"name":"top with upwards arrow above","shortname":":top:","category":"symbols","emoji_order":"2022"},{"name":"place of worship","shortname":":place_of_worship:","category":"symbols","emoji_order":"2023","aliases":[":worship_symbol:"]},{"name":"atom symbol","shortname":":atom:","category":"symbols","emoji_order":"2024","aliases":[":atom_symbol:"]},{"name":"om symbol","shortname":":om_symbol:","category":"symbols","emoji_order":"2025"},{"name":"star of david","shortname":":star_of_david:","category":"symbols","emoji_order":"2026"},{"name":"wheel of dharma","shortname":":wheel_of_dharma:","category":"symbols","emoji_order":"2027"},{"name":"yin yang","shortname":":yin_yang:","category":"symbols","emoji_order":"2028"},{"name":"latin cross","shortname":":cross:","category":"symbols","emoji_order":"2029","aliases":[":latin_cross:"]},{"name":"orthodox cross","shortname":":orthodox_cross:","category":"symbols","emoji_order":"2030"},{"name":"star and crescent","shortname":":star_and_crescent:","category":"symbols","emoji_order":"2031"},{"name":"peace symbol","shortname":":peace:","category":"symbols","emoji_order":"2032","aliases":[":peace_symbol:"]},{"name":"menorah with nine branches","shortname":":menorah:","category":"symbols","emoji_order":"2033"},{"name":"six pointed star with middle dot","shortname":":six_pointed_star:","category":"symbols","emoji_order":"2034"},{"name":"aries","shortname":":aries:","category":"symbols","emoji_order":"2035"},{"name":"taurus","shortname":":taurus:","category":"symbols","emoji_order":"2036"},{"name":"gemini","shortname":":gemini:","category":"symbols","emoji_order":"2037"},{"name":"cancer","shortname":":cancer:","category":"symbols","emoji_order":"2038"},{"name":"leo","shortname":":leo:","category":"symbols","emoji_order":"2039"},{"name":"virgo","shortname":":virgo:","category":"symbols","emoji_order":"2040"},{"name":"libra","shortname":":libra:","category":"symbols","emoji_order":"2041"},{"name":"scorpius","shortname":":scorpius:","category":"symbols","emoji_order":"2042"},{"name":"sagittarius","shortname":":sagittarius:","category":"symbols","emoji_order":"2043"},{"name":"capricorn","shortname":":capricorn:","category":"symbols","emoji_order":"2044"},{"name":"aquarius","shortname":":aquarius:","category":"symbols","emoji_order":"2045"},{"name":"pisces","shortname":":pisces:","category":"symbols","emoji_order":"2046"},{"name":"ophiuchus","shortname":":ophiuchus:","category":"symbols","emoji_order":"2047"},{"name":"twisted rightwards arrows","shortname":":twisted_rightwards_arrows:","category":"symbols","emoji_order":"2048"},{"name":"clockwise rightwards and leftwards open circle arrows","shortname":":repeat:","category":"symbols","emoji_order":"2049"},{"name":"clockwise rightwards and leftwards open circle arrows with circled one overlay","shortname":":repeat_one:","category":"symbols","emoji_order":"2050"},{"name":"black right-pointing triangle","shortname":":arrow_forward:","category":"symbols","emoji_order":"2051"},{"name":"black right-pointing double triangle","shortname":":fast_forward:","category":"symbols","emoji_order":"2052"},{"name":"black right-pointing double triangle with vertical bar","shortname":":track_next:","category":"symbols","emoji_order":"2053","aliases":[":next_track:"]},{"name":"black right-pointing double triangle with double vertical bar","shortname":":play_pause:","category":"symbols","emoji_order":"2054"},{"name":"black left-pointing triangle","shortname":":arrow_backward:","category":"symbols","emoji_order":"2055"},{"name":"black left-pointing double triangle","shortname":":rewind:","category":"symbols","emoji_order":"2056"},{"name":"black left-pointing double triangle with vertical bar","shortname":":track_previous:","category":"symbols","emoji_order":"2057","aliases":[":previous_track:"]},{"name":"up-pointing small red triangle","shortname":":arrow_up_small:","category":"symbols","emoji_order":"2058"},{"name":"black up-pointing double triangle","shortname":":arrow_double_up:","category":"symbols","emoji_order":"2059"},{"name":"down-pointing small red triangle","shortname":":arrow_down_small:","category":"symbols","emoji_order":"2060"},{"name":"black down-pointing double triangle","shortname":":arrow_double_down:","category":"symbols","emoji_order":"2061"},{"name":"double vertical bar","shortname":":pause_button:","category":"symbols","emoji_order":"2062","aliases":[":double_vertical_bar:"]},{"name":"black square for stop","shortname":":stop_button:","category":"symbols","emoji_order":"2063"},{"name":"black circle for record","shortname":":record_button:","category":"symbols","emoji_order":"2064"},{"name":"eject symbol","shortname":":eject:","category":"symbols","emoji_order":"2065","aliases":[":eject_symbol:"]},{"name":"cinema","shortname":":cinema:","category":"symbols","emoji_order":"2066"},{"name":"low brightness symbol","shortname":":low_brightness:","category":"symbols","emoji_order":"2067"},{"name":"high brightness symbol","shortname":":high_brightness:","category":"symbols","emoji_order":"2068"},{"name":"antenna with bars","shortname":":signal_strength:","category":"symbols","emoji_order":"2069"},{"name":"vibration mode","shortname":":vibration_mode:","category":"symbols","emoji_order":"2070"},{"name":"mobile phone off","shortname":":mobile_phone_off:","category":"symbols","emoji_order":"2071"},{"name":"black universal recycling symbol","shortname":":recycle:","category":"symbols","emoji_order":"2072"},{"name":"name badge","shortname":":name_badge:","category":"symbols","emoji_order":"2073"},{"name":"fleur-de-lis","shortname":":fleur-de-lis:","category":"symbols","emoji_order":"2074"},{"name":"japanese symbol for beginner","shortname":":beginner:","category":"symbols","emoji_order":"2075"},{"name":"trident emblem","shortname":":trident:","category":"symbols","emoji_order":"2076"},{"name":"heavy large circle","shortname":":o:","category":"symbols","emoji_order":"2077"},{"name":"white heavy check mark","shortname":":white_check_mark:","category":"symbols","emoji_order":"2078"},{"name":"ballot box with check","shortname":":ballot_box_with_check:","category":"symbols","emoji_order":"2079"},{"name":"heavy check mark","shortname":":heavy_check_mark:","category":"symbols","emoji_order":"2080"},{"name":"heavy multiplication x","shortname":":heavy_multiplication_x:","category":"symbols","emoji_order":"2081"},{"name":"cross mark","shortname":":x:","category":"symbols","emoji_order":"2082"},{"name":"negative squared cross mark","shortname":":negative_squared_cross_mark:","category":"symbols","emoji_order":"2083"},{"name":"heavy plus sign","shortname":":heavy_plus_sign:","category":"symbols","emoji_order":"2084"},{"name":"heavy minus sign","shortname":":heavy_minus_sign:","category":"symbols","emoji_order":"2088"},{"name":"heavy division sign","shortname":":heavy_division_sign:","category":"symbols","emoji_order":"2089"},{"name":"curly loop","shortname":":curly_loop:","category":"symbols","emoji_order":"2090"},{"name":"double curly loop","shortname":":loop:","category":"symbols","emoji_order":"2091"},{"name":"part alternation mark","shortname":":part_alternation_mark:","category":"symbols","emoji_order":"2092"},{"name":"eight spoked asterisk","shortname":":eight_spoked_asterisk:","category":"symbols","emoji_order":"2093"},{"name":"eight pointed black star","shortname":":eight_pointed_black_star:","category":"symbols","emoji_order":"2094"},{"name":"sparkle","shortname":":sparkle:","category":"symbols","emoji_order":"2095"},{"name":"double exclamation mark","shortname":":bangbang:","category":"symbols","emoji_order":"2096"},{"name":"exclamation question mark","shortname":":interrobang:","category":"symbols","emoji_order":"2097"},{"name":"black question mark ornament","shortname":":question:","category":"symbols","emoji_order":"2098"},{"name":"white question mark ornament","shortname":":grey_question:","category":"symbols","emoji_order":"2099"},{"name":"white exclamation mark ornament","shortname":":grey_exclamation:","category":"symbols","emoji_order":"2100"},{"name":"heavy exclamation mark symbol","shortname":":exclamation:","category":"symbols","emoji_order":"2101"},{"name":"wavy dash","shortname":":wavy_dash:","category":"symbols","emoji_order":"2102"},{"name":"copyright sign","shortname":":copyright:","category":"symbols","emoji_order":"2103"},{"name":"registered sign","shortname":":registered:","category":"symbols","emoji_order":"2104"},{"name":"trade mark sign","shortname":":tm:","category":"symbols","emoji_order":"2105"},{"name":"keycap number sign","shortname":":hash:","category":"symbols","emoji_order":"2106"},{"name":"keycap asterisk","shortname":":asterisk:","category":"symbols","emoji_order":"2107","aliases":[":keycap_asterisk:"]},{"name":"keycap digit zero","shortname":":zero:","category":"symbols","emoji_order":"2108"},{"name":"keycap digit one","shortname":":one:","category":"symbols","emoji_order":"2109"},{"name":"keycap digit two","shortname":":two:","category":"symbols","emoji_order":"2110"},{"name":"keycap digit three","shortname":":three:","category":"symbols","emoji_order":"2111"},{"name":"keycap digit four","shortname":":four:","category":"symbols","emoji_order":"2112"},{"name":"keycap digit five","shortname":":five:","category":"symbols","emoji_order":"2113"},{"name":"keycap digit six","shortname":":six:","category":"symbols","emoji_order":"2114"},{"name":"keycap digit seven","shortname":":seven:","category":"symbols","emoji_order":"2115"},{"name":"keycap digit eight","shortname":":eight:","category":"symbols","emoji_order":"2116"},{"name":"keycap digit nine","shortname":":nine:","category":"symbols","emoji_order":"2117"},{"name":"keycap ten","shortname":":keycap_ten:","category":"symbols","emoji_order":"2118"},{"name":"input symbol for latin capital letters","shortname":":capital_abcd:","category":"symbols","emoji_order":"2120"},{"name":"input symbol for latin small letters","shortname":":abcd:","category":"symbols","emoji_order":"2121"},{"name":"input symbol for symbols","shortname":":symbols:","category":"symbols","emoji_order":"2123"},{"name":"input symbol for latin letters","shortname":":abc:","category":"symbols","emoji_order":"2124"},{"name":"negative squared latin capital letter a","shortname":":a:","category":"symbols","emoji_order":"2125"},{"name":"negative squared ab","shortname":":ab:","category":"symbols","emoji_order":"2126"},{"name":"negative squared latin capital letter b","shortname":":b:","category":"symbols","emoji_order":"2127"},{"name":"squared cl","shortname":":cl:","category":"symbols","emoji_order":"2128"},{"name":"squared cool","shortname":":cool:","category":"symbols","emoji_order":"2129"},{"name":"squared free","shortname":":free:","category":"symbols","emoji_order":"2130"},{"name":"information source","shortname":":information_source:","category":"symbols","emoji_order":"2131"},{"name":"squared id","shortname":":id:","category":"symbols","emoji_order":"2132"},{"name":"circled latin capital letter m","shortname":":m:","category":"symbols","emoji_order":"2133"},{"name":"squared new","shortname":":new:","category":"symbols","emoji_order":"2134"},{"name":"squared ng","shortname":":ng:","category":"symbols","emoji_order":"2135"},{"name":"negative squared latin capital letter o","shortname":":o2:","category":"symbols","emoji_order":"2136"},{"name":"squared ok","shortname":":ok:","category":"symbols","emoji_order":"2137"},{"name":"negative squared latin capital letter p","shortname":":parking:","category":"symbols","emoji_order":"2138"},{"name":"squared sos","shortname":":sos:","category":"symbols","emoji_order":"2139"},{"name":"squared up with exclamation mark","shortname":":up:","category":"symbols","emoji_order":"2140"},{"name":"squared vs","shortname":":vs:","category":"symbols","emoji_order":"2141"},{"name":"squared katakana koko","shortname":":koko:","category":"symbols","emoji_order":"2142"},{"name":"squared katakana sa","shortname":":sa:","category":"symbols","emoji_order":"2143"},{"name":"squared cjk unified ideograph-6708","shortname":":u6708:","category":"symbols","emoji_order":"2144"},{"name":"squared cjk unified ideograph-6709","shortname":":u6709:","category":"symbols","emoji_order":"2145"},{"name":"squared cjk unified ideograph-6307","shortname":":u6307:","category":"symbols","emoji_order":"2146"},{"name":"circled ideograph advantage","shortname":":ideograph_advantage:","category":"symbols","emoji_order":"2147"},{"name":"squared cjk unified ideograph-5272","shortname":":u5272:","category":"symbols","emoji_order":"2148"},{"name":"squared cjk unified ideograph-7121","shortname":":u7121:","category":"symbols","emoji_order":"2149"},{"name":"squared cjk unified ideograph-7981","shortname":":u7981:","category":"symbols","emoji_order":"2150"},{"name":"circled ideograph accept","shortname":":accept:","category":"symbols","emoji_order":"2151"},{"name":"squared cjk unified ideograph-7533","shortname":":u7533:","category":"symbols","emoji_order":"2152"},{"name":"squared cjk unified ideograph-5408","shortname":":u5408:","category":"symbols","emoji_order":"2153"},{"name":"squared cjk unified ideograph-7a7a","shortname":":u7a7a:","category":"symbols","emoji_order":"2154"},{"name":"circled ideograph congratulation","shortname":":congratulations:","category":"symbols","emoji_order":"2155"},{"name":"circled ideograph secret","shortname":":secret:","category":"symbols","emoji_order":"2156"},{"name":"squared cjk unified ideograph-55b6","shortname":":u55b6:","category":"symbols","emoji_order":"2157"},{"name":"squared cjk unified ideograph-6e80","shortname":":u6e80:","category":"symbols","emoji_order":"2158"},{"name":"black small square","shortname":":black_small_square:","category":"symbols","emoji_order":"2159"},{"name":"white small square","shortname":":white_small_square:","category":"symbols","emoji_order":"2160"},{"name":"white medium square","shortname":":white_medium_square:","category":"symbols","emoji_order":"2161"},{"name":"black medium square","shortname":":black_medium_square:","category":"symbols","emoji_order":"2162"},{"name":"white medium small square","shortname":":white_medium_small_square:","category":"symbols","emoji_order":"2163"},{"name":"black medium small square","shortname":":black_medium_small_square:","category":"symbols","emoji_order":"2164"},{"name":"black large square","shortname":":black_large_square:","category":"symbols","emoji_order":"2165"},{"name":"white large square","shortname":":white_large_square:","category":"symbols","emoji_order":"2166"},{"name":"large orange diamond","shortname":":large_orange_diamond:","category":"symbols","emoji_order":"2167"},{"name":"large blue diamond","shortname":":large_blue_diamond:","category":"symbols","emoji_order":"2168"},{"name":"small orange diamond","shortname":":small_orange_diamond:","category":"symbols","emoji_order":"2169"},{"name":"small blue diamond","shortname":":small_blue_diamond:","category":"symbols","emoji_order":"2170"},{"name":"up-pointing red triangle","shortname":":small_red_triangle:","category":"symbols","emoji_order":"2171"},{"name":"down-pointing red triangle","shortname":":small_red_triangle_down:","category":"symbols","emoji_order":"2172"},{"name":"diamond shape with a dot inside","shortname":":diamond_shape_with_a_dot_inside:","category":"symbols","emoji_order":"2173"},{"name":"radio button","shortname":":radio_button:","category":"symbols","emoji_order":"2174"},{"name":"black square button","shortname":":black_square_button:","category":"symbols","emoji_order":"2175"},{"name":"white square button","shortname":":white_square_button:","category":"symbols","emoji_order":"2176"},{"name":"white circle","shortname":":white_circle:","category":"symbols","emoji_order":"2177"},{"name":"black circle","shortname":":black_circle:","category":"symbols","emoji_order":"2178"},{"name":"red circle","shortname":":red_circle:","category":"symbols","emoji_order":"2179"},{"name":"blue circle","shortname":":blue_circle:","category":"symbols","emoji_order":"2180"},{"name":"chequered flag","shortname":":checkered_flag:","category":"travel","emoji_order":"2181"},{"name":"triangular flag on post","shortname":":triangular_flag_on_post:","category":"objects","emoji_order":"2182"},{"name":"crossed flags","shortname":":crossed_flags:","category":"objects","emoji_order":"2183"},{"name":"waving black flag","shortname":":flag_black:","category":"objects","emoji_order":"2184","aliases":[":waving_black_flag:"]},{"name":"waving white flag","shortname":":flag_white:","category":"objects","emoji_order":"2185","aliases":[":waving_white_flag:"]},{"name":"rainbow_flag","shortname":":rainbow_flag:","category":"objects","emoji_order":"2186","aliases":[":gay_pride_flag:"]},{"name":"ascension","shortname":":flag_ac:","category":"flags","emoji_order":"2187","aliases":[":ac:"]},{"name":"andorra","shortname":":flag_ad:","category":"flags","emoji_order":"2188","aliases":[":ad:"]},{"name":"the united arab emirates","shortname":":flag_ae:","category":"flags","emoji_order":"2189","aliases":[":ae:"]},{"name":"afghanistan","shortname":":flag_af:","category":"flags","emoji_order":"2190","aliases":[":af:"]},{"name":"antigua and barbuda","shortname":":flag_ag:","category":"flags","emoji_order":"2191","aliases":[":ag:"]},{"name":"anguilla","shortname":":flag_ai:","category":"flags","emoji_order":"2192","aliases":[":ai:"]},{"name":"albania","shortname":":flag_al:","category":"flags","emoji_order":"2193","aliases":[":al:"]},{"name":"armenia","shortname":":flag_am:","category":"flags","emoji_order":"2194","aliases":[":am:"]},{"name":"angola","shortname":":flag_ao:","category":"flags","emoji_order":"2195","aliases":[":ao:"]},{"name":"antarctica","shortname":":flag_aq:","category":"flags","emoji_order":"2196","aliases":[":aq:"]},{"name":"argentina","shortname":":flag_ar:","category":"flags","emoji_order":"2197","aliases":[":ar:"]},{"name":"american samoa","shortname":":flag_as:","category":"flags","emoji_order":"2198","aliases":[":as:"]},{"name":"austria","shortname":":flag_at:","category":"flags","emoji_order":"2199","aliases":[":at:"]},{"name":"australia","shortname":":flag_au:","category":"flags","emoji_order":"2200","aliases":[":au:"]},{"name":"aruba","shortname":":flag_aw:","category":"flags","emoji_order":"2201","aliases":[":aw:"]},{"name":"åland islands","shortname":":flag_ax:","category":"flags","emoji_order":"2202","aliases":[":ax:"]},{"name":"azerbaijan","shortname":":flag_az:","category":"flags","emoji_order":"2203","aliases":[":az:"]},{"name":"bosnia and herzegovina","shortname":":flag_ba:","category":"flags","emoji_order":"2204","aliases":[":ba:"]},{"name":"barbados","shortname":":flag_bb:","category":"flags","emoji_order":"2205","aliases":[":bb:"]},{"name":"bangladesh","shortname":":flag_bd:","category":"flags","emoji_order":"2206","aliases":[":bd:"]},{"name":"belgium","shortname":":flag_be:","category":"flags","emoji_order":"2207","aliases":[":be:"]},{"name":"burkina faso","shortname":":flag_bf:","category":"flags","emoji_order":"2208","aliases":[":bf:"]},{"name":"bulgaria","shortname":":flag_bg:","category":"flags","emoji_order":"2209","aliases":[":bg:"]},{"name":"bahrain","shortname":":flag_bh:","category":"flags","emoji_order":"2210","aliases":[":bh:"]},{"name":"burundi","shortname":":flag_bi:","category":"flags","emoji_order":"2211","aliases":[":bi:"]},{"name":"benin","shortname":":flag_bj:","category":"flags","emoji_order":"2212","aliases":[":bj:"]},{"name":"saint barthélemy","shortname":":flag_bl:","category":"flags","emoji_order":"2213","aliases":[":bl:"]},{"name":"bermuda","shortname":":flag_bm:","category":"flags","emoji_order":"2214","aliases":[":bm:"]},{"name":"brunei","shortname":":flag_bn:","category":"flags","emoji_order":"2215","aliases":[":bn:"]},{"name":"bolivia","shortname":":flag_bo:","category":"flags","emoji_order":"2216","aliases":[":bo:"]},{"name":"caribbean netherlands","shortname":":flag_bq:","category":"flags","emoji_order":"2217","aliases":[":bq:"]},{"name":"brazil","shortname":":flag_br:","category":"flags","emoji_order":"2218","aliases":[":br:"]},{"name":"the bahamas","shortname":":flag_bs:","category":"flags","emoji_order":"2219","aliases":[":bs:"]},{"name":"bhutan","shortname":":flag_bt:","category":"flags","emoji_order":"2220","aliases":[":bt:"]},{"name":"bouvet island","shortname":":flag_bv:","category":"flags","emoji_order":"2221","aliases":[":bv:"]},{"name":"botswana","shortname":":flag_bw:","category":"flags","emoji_order":"2222","aliases":[":bw:"]},{"name":"belarus","shortname":":flag_by:","category":"flags","emoji_order":"2223","aliases":[":by:"]},{"name":"belize","shortname":":flag_bz:","category":"flags","emoji_order":"2224","aliases":[":bz:"]},{"name":"canada","shortname":":flag_ca:","category":"flags","emoji_order":"2225","aliases":[":ca:"]},{"name":"cocos (keeling) islands","shortname":":flag_cc:","category":"flags","emoji_order":"2226","aliases":[":cc:"]},{"name":"the democratic republic of the congo","shortname":":flag_cd:","category":"flags","emoji_order":"2227","aliases":[":congo:"]},{"name":"central african republic","shortname":":flag_cf:","category":"flags","emoji_order":"2228","aliases":[":cf:"]},{"name":"the republic of the congo","shortname":":flag_cg:","category":"flags","emoji_order":"2229","aliases":[":cg:"]},{"name":"switzerland","shortname":":flag_ch:","category":"flags","emoji_order":"2230","aliases":[":ch:"]},{"name":"côte d’ivoire","shortname":":flag_ci:","category":"flags","emoji_order":"2231","aliases":[":ci:"]},{"name":"cook islands","shortname":":flag_ck:","category":"flags","emoji_order":"2232","aliases":[":ck:"]},{"name":"chile","shortname":":flag_cl:","category":"flags","emoji_order":"2233","aliases":[":chile:"]},{"name":"cameroon","shortname":":flag_cm:","category":"flags","emoji_order":"2234","aliases":[":cm:"]},{"name":"china","shortname":":flag_cn:","category":"flags","emoji_order":"2235","aliases":[":cn:"]},{"name":"colombia","shortname":":flag_co:","category":"flags","emoji_order":"2236","aliases":[":co:"]},{"name":"clipperton island","shortname":":flag_cp:","category":"flags","emoji_order":"2237","aliases":[":cp:"]},{"name":"costa rica","shortname":":flag_cr:","category":"flags","emoji_order":"2238","aliases":[":cr:"]},{"name":"cuba","shortname":":flag_cu:","category":"flags","emoji_order":"2239","aliases":[":cu:"]},{"name":"cape verde","shortname":":flag_cv:","category":"flags","emoji_order":"2240","aliases":[":cv:"]},{"name":"curaçao","shortname":":flag_cw:","category":"flags","emoji_order":"2241","aliases":[":cw:"]},{"name":"christmas island","shortname":":flag_cx:","category":"flags","emoji_order":"2242","aliases":[":cx:"]},{"name":"cyprus","shortname":":flag_cy:","category":"flags","emoji_order":"2243","aliases":[":cy:"]},{"name":"the czech republic","shortname":":flag_cz:","category":"flags","emoji_order":"2244","aliases":[":cz:"]},{"name":"germany","shortname":":flag_de:","category":"flags","emoji_order":"2245","aliases":[":de:"]},{"name":"diego garcia","shortname":":flag_dg:","category":"flags","emoji_order":"2246","aliases":[":dg:"]},{"name":"djibouti","shortname":":flag_dj:","category":"flags","emoji_order":"2247","aliases":[":dj:"]},{"name":"denmark","shortname":":flag_dk:","category":"flags","emoji_order":"2248","aliases":[":dk:"]},{"name":"dominica","shortname":":flag_dm:","category":"flags","emoji_order":"2249","aliases":[":dm:"]},{"name":"the dominican republic","shortname":":flag_do:","category":"flags","emoji_order":"2250","aliases":[":do:"]},{"name":"algeria","shortname":":flag_dz:","category":"flags","emoji_order":"2251","aliases":[":dz:"]},{"name":"ceuta, melilla","shortname":":flag_ea:","category":"flags","emoji_order":"2252","aliases":[":ea:"]},{"name":"ecuador","shortname":":flag_ec:","category":"flags","emoji_order":"2253","aliases":[":ec:"]},{"name":"estonia","shortname":":flag_ee:","category":"flags","emoji_order":"2254","aliases":[":ee:"]},{"name":"egypt","shortname":":flag_eg:","category":"flags","emoji_order":"2255","aliases":[":eg:"]},{"name":"western sahara","shortname":":flag_eh:","category":"flags","emoji_order":"2256","aliases":[":eh:"]},{"name":"eritrea","shortname":":flag_er:","category":"flags","emoji_order":"2257","aliases":[":er:"]},{"name":"spain","shortname":":flag_es:","category":"flags","emoji_order":"2258","aliases":[":es:"]},{"name":"ethiopia","shortname":":flag_et:","category":"flags","emoji_order":"2259","aliases":[":et:"]},{"name":"european union","shortname":":flag_eu:","category":"flags","emoji_order":"2260","aliases":[":eu:"]},{"name":"finland","shortname":":flag_fi:","category":"flags","emoji_order":"2261","aliases":[":fi:"]},{"name":"fiji","shortname":":flag_fj:","category":"flags","emoji_order":"2262","aliases":[":fj:"]},{"name":"falkland islands","shortname":":flag_fk:","category":"flags","emoji_order":"2263","aliases":[":fk:"]},{"name":"micronesia","shortname":":flag_fm:","category":"flags","emoji_order":"2264","aliases":[":fm:"]},{"name":"faroe islands","shortname":":flag_fo:","category":"flags","emoji_order":"2265","aliases":[":fo:"]},{"name":"france","shortname":":flag_fr:","category":"flags","emoji_order":"2266","aliases":[":fr:"]},{"name":"gabon","shortname":":flag_ga:","category":"flags","emoji_order":"2267","aliases":[":ga:"]},{"name":"great britain","shortname":":flag_gb:","category":"flags","emoji_order":"2268","aliases":[":gb:"]},{"name":"grenada","shortname":":flag_gd:","category":"flags","emoji_order":"2269","aliases":[":gd:"]},{"name":"georgia","shortname":":flag_ge:","category":"flags","emoji_order":"2270","aliases":[":ge:"]},{"name":"french guiana","shortname":":flag_gf:","category":"flags","emoji_order":"2271","aliases":[":gf:"]},{"name":"guernsey","shortname":":flag_gg:","category":"flags","emoji_order":"2272","aliases":[":gg:"]},{"name":"ghana","shortname":":flag_gh:","category":"flags","emoji_order":"2273","aliases":[":gh:"]},{"name":"gibraltar","shortname":":flag_gi:","category":"flags","emoji_order":"2274","aliases":[":gi:"]},{"name":"greenland","shortname":":flag_gl:","category":"flags","emoji_order":"2275","aliases":[":gl:"]},{"name":"the gambia","shortname":":flag_gm:","category":"flags","emoji_order":"2276","aliases":[":gm:"]},{"name":"guinea","shortname":":flag_gn:","category":"flags","emoji_order":"2277","aliases":[":gn:"]},{"name":"guadeloupe","shortname":":flag_gp:","category":"flags","emoji_order":"2278","aliases":[":gp:"]},{"name":"equatorial guinea","shortname":":flag_gq:","category":"flags","emoji_order":"2279","aliases":[":gq:"]},{"name":"greece","shortname":":flag_gr:","category":"flags","emoji_order":"2280","aliases":[":gr:"]},{"name":"south georgia","shortname":":flag_gs:","category":"flags","emoji_order":"2281","aliases":[":gs:"]},{"name":"guatemala","shortname":":flag_gt:","category":"flags","emoji_order":"2282","aliases":[":gt:"]},{"name":"guam","shortname":":flag_gu:","category":"flags","emoji_order":"2283","aliases":[":gu:"]},{"name":"guinea-bissau","shortname":":flag_gw:","category":"flags","emoji_order":"2284","aliases":[":gw:"]},{"name":"guyana","shortname":":flag_gy:","category":"flags","emoji_order":"2285","aliases":[":gy:"]},{"name":"hong kong","shortname":":flag_hk:","category":"flags","emoji_order":"2286","aliases":[":hk:"]},{"name":"heard island and mcdonald islands","shortname":":flag_hm:","category":"flags","emoji_order":"2287","aliases":[":hm:"]},{"name":"honduras","shortname":":flag_hn:","category":"flags","emoji_order":"2288","aliases":[":hn:"]},{"name":"croatia","shortname":":flag_hr:","category":"flags","emoji_order":"2289","aliases":[":hr:"]},{"name":"haiti","shortname":":flag_ht:","category":"flags","emoji_order":"2290","aliases":[":ht:"]},{"name":"hungary","shortname":":flag_hu:","category":"flags","emoji_order":"2291","aliases":[":hu:"]},{"name":"canary islands","shortname":":flag_ic:","category":"flags","emoji_order":"2292","aliases":[":ic:"]},{"name":"indonesia","shortname":":flag_id:","category":"flags","emoji_order":"2293","aliases":[":indonesia:"]},{"name":"ireland","shortname":":flag_ie:","category":"flags","emoji_order":"2294","aliases":[":ie:"]},{"name":"israel","shortname":":flag_il:","category":"flags","emoji_order":"2295","aliases":[":il:"]},{"name":"isle of man","shortname":":flag_im:","category":"flags","emoji_order":"2296","aliases":[":im:"]},{"name":"india","shortname":":flag_in:","category":"flags","emoji_order":"2297","aliases":[":in:"]},{"name":"british indian ocean territory","shortname":":flag_io:","category":"flags","emoji_order":"2298","aliases":[":io:"]},{"name":"iraq","shortname":":flag_iq:","category":"flags","emoji_order":"2299","aliases":[":iq:"]},{"name":"iran","shortname":":flag_ir:","category":"flags","emoji_order":"2300","aliases":[":ir:"]},{"name":"iceland","shortname":":flag_is:","category":"flags","emoji_order":"2301","aliases":[":is:"]},{"name":"italy","shortname":":flag_it:","category":"flags","emoji_order":"2302","aliases":[":it:"]},{"name":"jersey","shortname":":flag_je:","category":"flags","emoji_order":"2303","aliases":[":je:"]},{"name":"jamaica","shortname":":flag_jm:","category":"flags","emoji_order":"2304","aliases":[":jm:"]},{"name":"jordan","shortname":":flag_jo:","category":"flags","emoji_order":"2305","aliases":[":jo:"]},{"name":"japan","shortname":":flag_jp:","category":"flags","emoji_order":"2306","aliases":[":jp:"]},{"name":"kenya","shortname":":flag_ke:","category":"flags","emoji_order":"2307","aliases":[":ke:"]},{"name":"kyrgyzstan","shortname":":flag_kg:","category":"flags","emoji_order":"2308","aliases":[":kg:"]},{"name":"cambodia","shortname":":flag_kh:","category":"flags","emoji_order":"2309","aliases":[":kh:"]},{"name":"kiribati","shortname":":flag_ki:","category":"flags","emoji_order":"2310","aliases":[":ki:"]},{"name":"the comoros","shortname":":flag_km:","category":"flags","emoji_order":"2311","aliases":[":km:"]},{"name":"saint kitts and nevis","shortname":":flag_kn:","category":"flags","emoji_order":"2312","aliases":[":kn:"]},{"name":"north korea","shortname":":flag_kp:","category":"flags","emoji_order":"2313","aliases":[":kp:"]},{"name":"korea","shortname":":flag_kr:","category":"flags","emoji_order":"2314","aliases":[":kr:"]},{"name":"kuwait","shortname":":flag_kw:","category":"flags","emoji_order":"2315","aliases":[":kw:"]},{"name":"cayman islands","shortname":":flag_ky:","category":"flags","emoji_order":"2316","aliases":[":ky:"]},{"name":"kazakhstan","shortname":":flag_kz:","category":"flags","emoji_order":"2317","aliases":[":kz:"]},{"name":"laos","shortname":":flag_la:","category":"flags","emoji_order":"2318","aliases":[":la:"]},{"name":"lebanon","shortname":":flag_lb:","category":"flags","emoji_order":"2319","aliases":[":lb:"]},{"name":"saint lucia","shortname":":flag_lc:","category":"flags","emoji_order":"2320","aliases":[":lc:"]},{"name":"liechtenstein","shortname":":flag_li:","category":"flags","emoji_order":"2321","aliases":[":li:"]},{"name":"sri lanka","shortname":":flag_lk:","category":"flags","emoji_order":"2322","aliases":[":lk:"]},{"name":"liberia","shortname":":flag_lr:","category":"flags","emoji_order":"2323","aliases":[":lr:"]},{"name":"lesotho","shortname":":flag_ls:","category":"flags","emoji_order":"2324","aliases":[":ls:"]},{"name":"lithuania","shortname":":flag_lt:","category":"flags","emoji_order":"2325","aliases":[":lt:"]},{"name":"luxembourg","shortname":":flag_lu:","category":"flags","emoji_order":"2326","aliases":[":lu:"]},{"name":"latvia","shortname":":flag_lv:","category":"flags","emoji_order":"2327","aliases":[":lv:"]},{"name":"libya","shortname":":flag_ly:","category":"flags","emoji_order":"2328","aliases":[":ly:"]},{"name":"morocco","shortname":":flag_ma:","category":"flags","emoji_order":"2329","aliases":[":ma:"]},{"name":"monaco","shortname":":flag_mc:","category":"flags","emoji_order":"2330","aliases":[":mc:"]},{"name":"moldova","shortname":":flag_md:","category":"flags","emoji_order":"2331","aliases":[":md:"]},{"name":"montenegro","shortname":":flag_me:","category":"flags","emoji_order":"2332","aliases":[":me:"]},{"name":"saint martin","shortname":":flag_mf:","category":"flags","emoji_order":"2333","aliases":[":mf:"]},{"name":"madagascar","shortname":":flag_mg:","category":"flags","emoji_order":"2334","aliases":[":mg:"]},{"name":"the marshall islands","shortname":":flag_mh:","category":"flags","emoji_order":"2335","aliases":[":mh:"]},{"name":"macedonia","shortname":":flag_mk:","category":"flags","emoji_order":"2336","aliases":[":mk:"]},{"name":"mali","shortname":":flag_ml:","category":"flags","emoji_order":"2337","aliases":[":ml:"]},{"name":"myanmar","shortname":":flag_mm:","category":"flags","emoji_order":"2338","aliases":[":mm:"]},{"name":"mongolia","shortname":":flag_mn:","category":"flags","emoji_order":"2339","aliases":[":mn:"]},{"name":"macau","shortname":":flag_mo:","category":"flags","emoji_order":"2340","aliases":[":mo:"]},{"name":"northern mariana islands","shortname":":flag_mp:","category":"flags","emoji_order":"2341","aliases":[":mp:"]},{"name":"martinique","shortname":":flag_mq:","category":"flags","emoji_order":"2342","aliases":[":mq:"]},{"name":"mauritania","shortname":":flag_mr:","category":"flags","emoji_order":"2343","aliases":[":mr:"]},{"name":"montserrat","shortname":":flag_ms:","category":"flags","emoji_order":"2344","aliases":[":ms:"]},{"name":"malta","shortname":":flag_mt:","category":"flags","emoji_order":"2345","aliases":[":mt:"]},{"name":"mauritius","shortname":":flag_mu:","category":"flags","emoji_order":"2346","aliases":[":mu:"]},{"name":"maldives","shortname":":flag_mv:","category":"flags","emoji_order":"2347","aliases":[":mv:"]},{"name":"malawi","shortname":":flag_mw:","category":"flags","emoji_order":"2348","aliases":[":mw:"]},{"name":"mexico","shortname":":flag_mx:","category":"flags","emoji_order":"2349","aliases":[":mx:"]},{"name":"malaysia","shortname":":flag_my:","category":"flags","emoji_order":"2350","aliases":[":my:"]},{"name":"mozambique","shortname":":flag_mz:","category":"flags","emoji_order":"2351","aliases":[":mz:"]},{"name":"namibia","shortname":":flag_na:","category":"flags","emoji_order":"2352","aliases":[":na:"]},{"name":"new caledonia","shortname":":flag_nc:","category":"flags","emoji_order":"2353","aliases":[":nc:"]},{"name":"niger","shortname":":flag_ne:","category":"flags","emoji_order":"2354","aliases":[":ne:"]},{"name":"norfolk island","shortname":":flag_nf:","category":"flags","emoji_order":"2355","aliases":[":nf:"]},{"name":"nigeria","shortname":":flag_ng:","category":"flags","emoji_order":"2356","aliases":[":nigeria:"]},{"name":"nicaragua","shortname":":flag_ni:","category":"flags","emoji_order":"2357","aliases":[":ni:"]},{"name":"the netherlands","shortname":":flag_nl:","category":"flags","emoji_order":"2358","aliases":[":nl:"]},{"name":"norway","shortname":":flag_no:","category":"flags","emoji_order":"2359","aliases":[":no:"]},{"name":"nepal","shortname":":flag_np:","category":"flags","emoji_order":"2360","aliases":[":np:"]},{"name":"nauru","shortname":":flag_nr:","category":"flags","emoji_order":"2361","aliases":[":nr:"]},{"name":"niue","shortname":":flag_nu:","category":"flags","emoji_order":"2362","aliases":[":nu:"]},{"name":"new zealand","shortname":":flag_nz:","category":"flags","emoji_order":"2363","aliases":[":nz:"]},{"name":"oman","shortname":":flag_om:","category":"flags","emoji_order":"2364","aliases":[":om:"]},{"name":"panama","shortname":":flag_pa:","category":"flags","emoji_order":"2365","aliases":[":pa:"]},{"name":"peru","shortname":":flag_pe:","category":"flags","emoji_order":"2366","aliases":[":pe:"]},{"name":"french polynesia","shortname":":flag_pf:","category":"flags","emoji_order":"2367","aliases":[":pf:"]},{"name":"papua new guinea","shortname":":flag_pg:","category":"flags","emoji_order":"2368","aliases":[":pg:"]},{"name":"the philippines","shortname":":flag_ph:","category":"flags","emoji_order":"2369","aliases":[":ph:"]},{"name":"pakistan","shortname":":flag_pk:","category":"flags","emoji_order":"2370","aliases":[":pk:"]},{"name":"poland","shortname":":flag_pl:","category":"flags","emoji_order":"2371","aliases":[":pl:"]},{"name":"saint pierre and miquelon","shortname":":flag_pm:","category":"flags","emoji_order":"2372","aliases":[":pm:"]},{"name":"pitcairn","shortname":":flag_pn:","category":"flags","emoji_order":"2373","aliases":[":pn:"]},{"name":"puerto rico","shortname":":flag_pr:","category":"flags","emoji_order":"2374","aliases":[":pr:"]},{"name":"palestinian authority","shortname":":flag_ps:","category":"flags","emoji_order":"2375","aliases":[":ps:"]},{"name":"portugal","shortname":":flag_pt:","category":"flags","emoji_order":"2376","aliases":[":pt:"]},{"name":"palau","shortname":":flag_pw:","category":"flags","emoji_order":"2377","aliases":[":pw:"]},{"name":"paraguay","shortname":":flag_py:","category":"flags","emoji_order":"2378","aliases":[":py:"]},{"name":"qatar","shortname":":flag_qa:","category":"flags","emoji_order":"2379","aliases":[":qa:"]},{"name":"réunion","shortname":":flag_re:","category":"flags","emoji_order":"2380","aliases":[":re:"]},{"name":"romania","shortname":":flag_ro:","category":"flags","emoji_order":"2381","aliases":[":ro:"]},{"name":"serbia","shortname":":flag_rs:","category":"flags","emoji_order":"2382","aliases":[":rs:"]},{"name":"russia","shortname":":flag_ru:","category":"flags","emoji_order":"2383","aliases":[":ru:"]},{"name":"rwanda","shortname":":flag_rw:","category":"flags","emoji_order":"2384","aliases":[":rw:"]},{"name":"saudi arabia","shortname":":flag_sa:","category":"flags","emoji_order":"2385","aliases":[":saudiarabia:",":saudi:"]},{"name":"the solomon islands","shortname":":flag_sb:","category":"flags","emoji_order":"2386","aliases":[":sb:"]},{"name":"the seychelles","shortname":":flag_sc:","category":"flags","emoji_order":"2387","aliases":[":sc:"]},{"name":"sudan","shortname":":flag_sd:","category":"flags","emoji_order":"2388","aliases":[":sd:"]},{"name":"sweden","shortname":":flag_se:","category":"flags","emoji_order":"2389","aliases":[":se:"]},{"name":"singapore","shortname":":flag_sg:","category":"flags","emoji_order":"2390","aliases":[":sg:"]},{"name":"saint helena","shortname":":flag_sh:","category":"flags","emoji_order":"2391","aliases":[":sh:"]},{"name":"slovenia","shortname":":flag_si:","category":"flags","emoji_order":"2392","aliases":[":si:"]},{"name":"svalbard and jan mayen","shortname":":flag_sj:","category":"flags","emoji_order":"2393","aliases":[":sj:"]},{"name":"slovakia","shortname":":flag_sk:","category":"flags","emoji_order":"2394","aliases":[":sk:"]},{"name":"sierra leone","shortname":":flag_sl:","category":"flags","emoji_order":"2395","aliases":[":sl:"]},{"name":"san marino","shortname":":flag_sm:","category":"flags","emoji_order":"2396","aliases":[":sm:"]},{"name":"senegal","shortname":":flag_sn:","category":"flags","emoji_order":"2397","aliases":[":sn:"]},{"name":"somalia","shortname":":flag_so:","category":"flags","emoji_order":"2398","aliases":[":so:"]},{"name":"suriname","shortname":":flag_sr:","category":"flags","emoji_order":"2399","aliases":[":sr:"]},{"name":"south sudan","shortname":":flag_ss:","category":"flags","emoji_order":"2400","aliases":[":ss:"]},{"name":"são tomé and príncipe","shortname":":flag_st:","category":"flags","emoji_order":"2401","aliases":[":st:"]},{"name":"el salvador","shortname":":flag_sv:","category":"flags","emoji_order":"2402","aliases":[":sv:"]},{"name":"sint maarten","shortname":":flag_sx:","category":"flags","emoji_order":"2403","aliases":[":sx:"]},{"name":"syria","shortname":":flag_sy:","category":"flags","emoji_order":"2404","aliases":[":sy:"]},{"name":"swaziland","shortname":":flag_sz:","category":"flags","emoji_order":"2405","aliases":[":sz:"]},{"name":"tristan da cunha","shortname":":flag_ta:","category":"flags","emoji_order":"2406","aliases":[":ta:"]},{"name":"turks and caicos islands","shortname":":flag_tc:","category":"flags","emoji_order":"2407","aliases":[":tc:"]},{"name":"chad","shortname":":flag_td:","category":"flags","emoji_order":"2408","aliases":[":td:"]},{"name":"french southern territories","shortname":":flag_tf:","category":"flags","emoji_order":"2409","aliases":[":tf:"]},{"name":"togo","shortname":":flag_tg:","category":"flags","emoji_order":"2410","aliases":[":tg:"]},{"name":"thailand","shortname":":flag_th:","category":"flags","emoji_order":"2411","aliases":[":th:"]},{"name":"tajikistan","shortname":":flag_tj:","category":"flags","emoji_order":"2412","aliases":[":tj:"]},{"name":"tokelau","shortname":":flag_tk:","category":"flags","emoji_order":"2413","aliases":[":tk:"]},{"name":"timor-leste","shortname":":flag_tl:","category":"flags","emoji_order":"2414","aliases":[":tl:"]},{"name":"turkmenistan","shortname":":flag_tm:","category":"flags","emoji_order":"2415","aliases":[":turkmenistan:"]},{"name":"tunisia","shortname":":flag_tn:","category":"flags","emoji_order":"2416","aliases":[":tn:"]},{"name":"tonga","shortname":":flag_to:","category":"flags","emoji_order":"2417","aliases":[":to:"]},{"name":"turkey","shortname":":flag_tr:","category":"flags","emoji_order":"2418","aliases":[":tr:"]},{"name":"trinidad and tobago","shortname":":flag_tt:","category":"flags","emoji_order":"2419","aliases":[":tt:"]},{"name":"tuvalu","shortname":":flag_tv:","category":"flags","emoji_order":"2420","aliases":[":tuvalu:"]},{"name":"the republic of china","shortname":":flag_tw:","category":"flags","emoji_order":"2421","aliases":[":tw:"]},{"name":"tanzania","shortname":":flag_tz:","category":"flags","emoji_order":"2422","aliases":[":tz:"]},{"name":"ukraine","shortname":":flag_ua:","category":"flags","emoji_order":"2423","aliases":[":ua:"]},{"name":"uganda","shortname":":flag_ug:","category":"flags","emoji_order":"2424","aliases":[":ug:"]},{"name":"united states minor outlying islands","shortname":":flag_um:","category":"flags","emoji_order":"2425","aliases":[":um:"]},{"name":"united states","shortname":":flag_us:","category":"flags","emoji_order":"2427","aliases":[":us:"]},{"name":"uruguay","shortname":":flag_uy:","category":"flags","emoji_order":"2428","aliases":[":uy:"]},{"name":"uzbekistan","shortname":":flag_uz:","category":"flags","emoji_order":"2429","aliases":[":uz:"]},{"name":"the vatican city","shortname":":flag_va:","category":"flags","emoji_order":"2430","aliases":[":va:"]},{"name":"saint vincent and the grenadines","shortname":":flag_vc:","category":"flags","emoji_order":"2431","aliases":[":vc:"]},{"name":"venezuela","shortname":":flag_ve:","category":"flags","emoji_order":"2432","aliases":[":ve:"]},{"name":"british virgin islands","shortname":":flag_vg:","category":"flags","emoji_order":"2433","aliases":[":vg:"]},{"name":"u.s. virgin islands","shortname":":flag_vi:","category":"flags","emoji_order":"2434","aliases":[":vi:"]},{"name":"vietnam","shortname":":flag_vn:","category":"flags","emoji_order":"2435","aliases":[":vn:"]},{"name":"vanuatu","shortname":":flag_vu:","category":"flags","emoji_order":"2436","aliases":[":vu:"]},{"name":"wallis and futuna","shortname":":flag_wf:","category":"flags","emoji_order":"2437","aliases":[":wf:"]},{"name":"samoa","shortname":":flag_ws:","category":"flags","emoji_order":"2438","aliases":[":ws:"]},{"name":"kosovo","shortname":":flag_xk:","category":"flags","emoji_order":"2439","aliases":[":xk:"]},{"name":"yemen","shortname":":flag_ye:","category":"flags","emoji_order":"2440","aliases":[":ye:"]},{"name":"mayotte","shortname":":flag_yt:","category":"flags","emoji_order":"2441","aliases":[":yt:"]},{"name":"south africa","shortname":":flag_za:","category":"flags","emoji_order":"2442","aliases":[":za:"]},{"name":"zambia","shortname":":flag_zm:","category":"flags","emoji_order":"2443","aliases":[":zm:"]},{"name":"zimbabwe","shortname":":flag_zw:","category":"flags","emoji_order":"2444","aliases":[":zw:"]},{"name":"regional indicator symbol letter z","shortname":":regional_indicator_z:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter y","shortname":":regional_indicator_y:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter x","shortname":":regional_indicator_x:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter w","shortname":":regional_indicator_w:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter v","shortname":":regional_indicator_v:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter u","shortname":":regional_indicator_u:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter t","shortname":":regional_indicator_t:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter s","shortname":":regional_indicator_s:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter r","shortname":":regional_indicator_r:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter q","shortname":":regional_indicator_q:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter p","shortname":":regional_indicator_p:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter o","shortname":":regional_indicator_o:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter n","shortname":":regional_indicator_n:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter m","shortname":":regional_indicator_m:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter l","shortname":":regional_indicator_l:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter k","shortname":":regional_indicator_k:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter j","shortname":":regional_indicator_j:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter i","shortname":":regional_indicator_i:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter h","shortname":":regional_indicator_h:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter g","shortname":":regional_indicator_g:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter f","shortname":":regional_indicator_f:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter e","shortname":":regional_indicator_e:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter d","shortname":":regional_indicator_d:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter c","shortname":":regional_indicator_c:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter b","shortname":":regional_indicator_b:","category":"regional","emoji_order":"12345"},{"name":"regional indicator symbol letter a","shortname":":regional_indicator_a:","category":"regional","emoji_order":"12345"}]
\ No newline at end of file

From cfa7d0f11df42260e964f1f2bce0742ee6e77e25 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Jul 2018 19:06:19 +0100
Subject: [PATCH 695/702] Take jitsi conf calling out of labs

---
 src/CallHandler.js       | 78 +++++++++-------------------------------
 src/settings/Settings.js |  6 ----
 2 files changed, 17 insertions(+), 67 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 9b0a446565..4edc076343 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -301,67 +301,7 @@ function _onAction(payload) {
             break;
         case 'place_conference_call':
             console.log("Place conference call in %s", payload.room_id);
-
-            if (SettingsStore.isFeatureEnabled('feature_jitsi')) {
-                _startCallApp(payload.room_id, payload.type);
-            } else {
-                if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
-                    // Conference calls are implemented by sending the media to central
-                    // server which combines the audio from all the participants together
-                    // into a single stream. This is incompatible with end-to-end encryption
-                    // because a central server would be decrypting the audio for each
-                    // participant.
-                    // Therefore we disable conference calling in E2E rooms.
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Call Handler', 'Conference calls unsupported e2e', ErrorDialog, {
-                        description: _t('Conference calls are not supported in encrypted rooms'),
-                    });
-                    return;
-                }
-
-                if (!ConferenceHandler) {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Call Handler', 'Conference call unsupported client', ErrorDialog, {
-                        description: _t('Conference calls are not supported in this client'),
-                    });
-                } else if (!MatrixClientPeg.get().supportsVoip()) {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, {
-                        title: _t('VoIP is unsupported'),
-                        description: _t('You cannot place VoIP calls in this browser.'),
-                    });
-                } else {
-                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                    Modal.createTrackedDialog('Call Handler', 'Conference calling in development', QuestionDialog, {
-                        title: _t('Warning!'),
-                        description: _t('Conference calling is in development and may not be reliable.'),
-                        onFinished: (confirm)=>{
-                            if (confirm) {
-                                ConferenceHandler.createNewMatrixCall(
-                                    MatrixClientPeg.get(), payload.room_id,
-                                ).done(function(call) {
-                                    placeCall(call);
-                                }, function(err) {
-                                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                                    console.error("Conference call failed: " + err);
-                                    Modal.createTrackedDialog(
-                                        'Call Handler',
-                                        'Failed to set up conference call',
-                                        ErrorDialog,
-                                        {
-                                            title: _t('Failed to set up conference call'),
-                                            description: (
-                                                _t('Conference call failed.') +
-                                                ' ' + ((err && err.message) ? err.message : '')
-                                            ),
-                                        },
-                                    );
-                                });
-                            }
-                        },
-                    });
-                }
-            }
+            _startCallApp(payload.room_id, payload.type);
             break;
         case 'incoming_call':
             {
@@ -543,6 +483,22 @@ const callHandler = {
         return null;
     },
 
+    /**
+     * The conference handler is a module that deals with implementation-specific
+     * multi-party calling implementations. Riot passes in its own which creates
+     * a one-to-one call with a freeswitch conference bridge. As of July 2018,
+     * the de-facto way of conference calling is a Jitsi widget, so this is
+     * deprecated. It reamins here for two reasons:
+     *  1. So Riot still supports joining existing freeswitch conference calls
+     *     (but doesn't support creating them). After a transition period, we can
+     *     remove support for joining them too.
+     *  2. To hide the one-to-one rooms that old-style conferencing creates. This
+     *     is much harder to remove: probably either we make Riot leave & forget these
+     *     rooms after we remove support for joining freeswitch conferences, or we
+     *     accept that random rooms with cryptic users will suddently appear for
+     *     anyone who's ever used conference calling, or we are stuck with this
+     *     code forever.
+     */
     setConferenceHandler: function(confHandler) {
         ConferenceHandler = confHandler;
     },
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 022fabc739..e3f5855f0d 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -83,12 +83,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_jitsi": {
-        isFeature: true,
-        displayName: _td("Jitsi Conference Calling"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),

From d8be4508e8d599a8fc89449a0a73a4a7cb745693 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Jul 2018 19:13:05 +0100
Subject: [PATCH 696/702] Unused import

---
 src/CallHandler.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 4edc076343..a05a6f5405 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -61,7 +61,6 @@ import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
 import SdkConfig from './SdkConfig';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
-import SettingsStore from "./settings/SettingsStore";
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
 import ScalarAuthClient from './ScalarAuthClient';

From 20ea86417e7c548785d5728d27a4d946d7d6e6c9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Jul 2018 19:14:44 +0100
Subject: [PATCH 697/702] Appease the linter

---
 src/CallHandler.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index a05a6f5405..acdc3e5122 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -497,6 +497,8 @@ const callHandler = {
      *     accept that random rooms with cryptic users will suddently appear for
      *     anyone who's ever used conference calling, or we are stuck with this
      *     code forever.
+     *
+     * @param {object} confHandler The conference handler object
      */
     setConferenceHandler: function(confHandler) {
         ConferenceHandler = confHandler;

From 0c1722c8ee50050be8e96a5afd501b2c7a5a137c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Jul 2018 22:06:45 +0100
Subject: [PATCH 698/702] Update package-lock deps

---
 package-lock.json | 265 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 225 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 048fba30e4..3dedf8dcd2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.7",
+  "version": "0.12.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1708,6 +1708,11 @@
       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
+    "direction": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/direction/-/direction-0.1.5.tgz",
+      "integrity": "sha1-zl15f5fib4vnvv9T99xA4cGp7Ew="
+    },
     "doctrine": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
@@ -1774,37 +1779,6 @@
         "domelementtype": "1.3.0"
       }
     },
-    "draft-js": {
-      "version": "0.11.0-alpha",
-      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0-alpha.tgz",
-      "integrity": "sha1-MtshCPkn6bhEbaH3nkR1wrf4aK4=",
-      "requires": {
-        "fbjs": "0.8.16",
-        "immutable": "3.7.6",
-        "object-assign": "4.1.1"
-      }
-    },
-    "draft-js-export-html": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz",
-      "integrity": "sha1-zIDwVExD0Kf+28U8DLCRToCQ92k=",
-      "requires": {
-        "draft-js-utils": "1.2.0"
-      }
-    },
-    "draft-js-export-markdown": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz",
-      "integrity": "sha1-hjkOA86vHTR/xhaGerf1Net2v0I=",
-      "requires": {
-        "draft-js-utils": "1.2.0"
-      }
-    },
-    "draft-js-utils": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.2.0.tgz",
-      "integrity": "sha1-9csj6xZzJf/tPXmIL9wxdyHS/RI="
-    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -2237,6 +2211,11 @@
         "object-assign": "4.1.1"
       }
     },
+    "esrever": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/esrever/-/esrever-0.2.0.tgz",
+      "integrity": "sha1-lunSj08bGnZ4TNXUkOquAQ50B7g="
+    },
     "estraverse": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
@@ -3574,6 +3553,19 @@
         "is-property": "1.0.2"
       }
     },
+    "get-document": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-document/-/get-document-1.0.0.tgz",
+      "integrity": "sha1-SCG85m8cJMsDMWAr5strEsTwHEs="
+    },
+    "get-window": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-window/-/get-window-1.1.2.tgz",
+      "integrity": "sha512-yjWpFcy9fjhLQHW1dPtg9ga4pmizLY8y4ZSHdGrAQ1NU277MRhnGnnLPxe19X8W5lWVsCZz++5xEuNozWMVmTw==",
+      "requires": {
+        "get-document": "1.0.0"
+      }
+    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -3928,6 +3920,11 @@
       "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
       "dev": true
     },
+    "is-empty": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-empty/-/is-empty-1.2.0.tgz",
+      "integrity": "sha1-3pu1snhzigWgsJpX4ftNSjQan2s="
+    },
     "is-equal": {
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/is-equal/-/is-equal-1.5.5.tgz",
@@ -4001,6 +3998,16 @@
         "is-extglob": "1.0.0"
       }
     },
+    "is-hotkey": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/is-hotkey/-/is-hotkey-0.1.2.tgz",
+      "integrity": "sha512-H05t1Tc+uCWLOjHtF1bZH3b/i7+RkjlhwFWDsroTwC0acCjXOVyjJ63yTnRGdNhV5bnKIcYnijgLAJtM0/Xqsw=="
+    },
+    "is-in-browser": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
+      "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU="
+    },
     "is-my-json-valid": {
       "version": "2.16.1",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
@@ -4052,6 +4059,21 @@
         "path-is-inside": "1.0.2"
       }
     },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
     "is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
@@ -4110,6 +4132,11 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
+    "is-window": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz",
+      "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0="
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -4136,6 +4163,11 @@
         "isarray": "1.0.0"
       }
     },
+    "isomorphic-base64": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/isomorphic-base64/-/isomorphic-base64-1.0.2.tgz",
+      "integrity": "sha1-9Caq6CVpuopOxcpzrSGkSrHueAM="
+    },
     "isomorphic-fetch": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
@@ -4417,6 +4449,11 @@
         }
       }
     },
+    "keycode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
+      "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
+    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -4561,9 +4598,9 @@
       }
     },
     "lolex": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz",
-      "integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg=="
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
+      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
     },
     "longest": {
       "version": "1.0.1",
@@ -4586,9 +4623,9 @@
       "dev": true
     },
     "matrix-js-sdk": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.4.tgz",
-      "integrity": "sha512-jmO08eml0mr+us2Xs9F9UD2U6gX/MVD20QEqrEt3p+cuZ043OEWCg6Ko8mR65P/JteqjXMz+TXOMmfcxLwCLFA==",
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.6.tgz",
+      "integrity": "sha512-8aC6wpHBCBgnJ/v0FjfBkjNo2BR3LlU5hIM2ql5OqxTbY64miJ5WKr8hD4meD86C/TSHtzJtlLrlThO0vmHuwg==",
       "requires": {
         "another-json": "0.2.0",
         "babel-runtime": "6.26.0",
@@ -4788,8 +4825,7 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "mute-stream": {
       "version": "0.0.5",
@@ -5437,6 +5473,11 @@
         "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
       }
     },
+    "react-immutable-proptypes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz",
+      "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ="
+    },
     "react-motion": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
@@ -5454,6 +5495,14 @@
         }
       }
     },
+    "react-portal": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-3.2.0.tgz",
+      "integrity": "sha512-avb1FreAZAVCvNNyS2dCpxZiPYPJnAasHYPxdVBTROgNFeI+KSb+OoMHNsC1GbDawESCriPwCX+qKua6WSPIFw==",
+      "requires": {
+        "prop-types": "15.6.0"
+      }
+    },
     "react-redux": {
       "version": "5.0.7",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
@@ -5687,6 +5736,11 @@
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
       "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz",
+      "integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg=="
+    },
     "resolve": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
@@ -5793,6 +5847,11 @@
         "xtend": "4.0.1"
       }
     },
+    "selection-is-backward": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/selection-is-backward/-/selection-is-backward-1.0.0.tgz",
+      "integrity": "sha1-l6VGMxiKURq6ZBn8XB+pG0Z+a+E="
+    },
     "semver": {
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
@@ -5893,6 +5952,127 @@
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
+    "slate": {
+      "version": "0.34.7",
+      "resolved": "https://registry.npmjs.org/slate/-/slate-0.34.7.tgz",
+      "integrity": "sha1-WQjh0PwJKiISSIvsplZx8B4OuAo=",
+      "requires": {
+        "debug": "3.1.0",
+        "direction": "0.1.5",
+        "esrever": "0.2.0",
+        "is-empty": "1.2.0",
+        "is-plain-object": "2.0.4",
+        "lodash": "4.17.4",
+        "slate-dev-logger": "0.1.39",
+        "slate-schema-violations": "0.1.20",
+        "type-of": "2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "slate-base64-serializer": {
+      "version": "0.2.41",
+      "resolved": "https://registry.npmjs.org/slate-base64-serializer/-/slate-base64-serializer-0.2.41.tgz",
+      "integrity": "sha1-z+yhA7X9rd2WeOACWADfw174QJg=",
+      "requires": {
+        "isomorphic-base64": "1.0.2"
+      }
+    },
+    "slate-dev-environment": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/slate-dev-environment/-/slate-dev-environment-0.1.2.tgz",
+      "integrity": "sha1-dDqL1/Qn3CckJbBDminoPKVSFog=",
+      "requires": {
+        "is-in-browser": "1.1.3"
+      }
+    },
+    "slate-dev-logger": {
+      "version": "0.1.39",
+      "resolved": "https://registry.npmjs.org/slate-dev-logger/-/slate-dev-logger-0.1.39.tgz",
+      "integrity": "sha1-dEppuFA0JEcT5t5RSDr1cTw0WvQ="
+    },
+    "slate-hotkeys": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/slate-hotkeys/-/slate-hotkeys-0.1.2.tgz",
+      "integrity": "sha1-LjWgikLqqhE7ZNQ41TfnelgsjUo=",
+      "requires": {
+        "is-hotkey": "0.1.2",
+        "slate-dev-environment": "0.1.2"
+      }
+    },
+    "slate-html-serializer": {
+      "version": "0.6.13",
+      "resolved": "https://registry.npmjs.org/slate-html-serializer/-/slate-html-serializer-0.6.13.tgz",
+      "integrity": "sha1-7kzECd/w+Bk/OddemXKJTrmsydo=",
+      "requires": {
+        "slate-dev-logger": "0.1.39",
+        "type-of": "2.0.1"
+      }
+    },
+    "slate-md-serializer": {
+      "version": "github:matrix-org/slate-md-serializer#f7c4ad394f5af34d4c623de7909ce95ab78072d3"
+    },
+    "slate-plain-serializer": {
+      "version": "0.5.22",
+      "resolved": "https://registry.npmjs.org/slate-plain-serializer/-/slate-plain-serializer-0.5.22.tgz",
+      "integrity": "sha1-kcgbdDi02M03Rqu8oA5XTlFL6bw=",
+      "requires": {
+        "slate-dev-logger": "0.1.39"
+      }
+    },
+    "slate-prop-types": {
+      "version": "0.4.39",
+      "resolved": "https://registry.npmjs.org/slate-prop-types/-/slate-prop-types-0.4.39.tgz",
+      "integrity": "sha1-+taDqyVzIa1LP4NvrkDopfWc0Jo=",
+      "requires": {
+        "slate-dev-logger": "0.1.39"
+      }
+    },
+    "slate-react": {
+      "version": "0.12.11",
+      "resolved": "https://registry.npmjs.org/slate-react/-/slate-react-0.12.11.tgz",
+      "integrity": "sha1-bYPmBGNHBHV2kKV9vWqrKCqWStM=",
+      "requires": {
+        "debug": "3.1.0",
+        "get-window": "1.1.2",
+        "is-window": "1.0.2",
+        "keycode": "2.2.0",
+        "lodash": "4.17.4",
+        "prop-types": "15.6.0",
+        "react-immutable-proptypes": "2.1.0",
+        "react-portal": "3.2.0",
+        "selection-is-backward": "1.0.0",
+        "slate-base64-serializer": "0.2.41",
+        "slate-dev-environment": "0.1.2",
+        "slate-dev-logger": "0.1.39",
+        "slate-hotkeys": "0.1.2",
+        "slate-plain-serializer": "0.5.22",
+        "slate-prop-types": "0.4.39"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "slate-schema-violations": {
+      "version": "0.1.20",
+      "resolved": "https://registry.npmjs.org/slate-schema-violations/-/slate-schema-violations-0.1.20.tgz",
+      "integrity": "sha1-v2O0+ylbkPQhiTlWStr80cLyF1k="
+    },
     "slice-ansi": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
@@ -6400,6 +6580,11 @@
         "mime-types": "2.1.17"
       }
     },
+    "type-of": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/type-of/-/type-of-2.0.1.tgz",
+      "integrity": "sha1-5yoXQYllaOn2KDeNgW1pEvfyOXI="
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",

From 265e4267b8586c622e742ff6ae764e5673f9d61f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Jul 2018 15:00:43 +0100
Subject: [PATCH 699/702] remove faulty onBlur/onFocus code which caused
 selection to rollback

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f455db7fbc..111c73284c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1544,18 +1544,6 @@ export default class MessageComposerInput extends React.Component {
         this.handleKeyCommand('toggle-mode');
     };
 
-    onBlur = (e) => {
-        this.selection = this.state.editorState.selection;
-    };
-
-    onFocus = (e) => {
-        if (this.selection) {
-            const change = this.state.editorState.change().select(this.selection);
-            this.onChange(change);
-            delete this.selection;
-        }
-    };
-
     focusComposer = () => {
         this.refs.editor.focus();
     };
@@ -1601,8 +1589,6 @@ export default class MessageComposerInput extends React.Component {
                             onChange={this.onChange}
                             onKeyDown={this.onKeyDown}
                             onPaste={this.onPaste}
-                            onBlur={this.onBlur}
-                            onFocus={this.onFocus}
                             renderNode={this.renderNode}
                             renderMark={this.renderMark}
                             // disable spell check for the placeholder because browsers don't like "unencrypted"

From f264075369b2fdac3c9c2d1580e19a4b39b118e8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Jul 2018 17:11:32 +0100
Subject: [PATCH 700/702] null-guard history properly

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerInput.js        | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 111c73284c..267db89e8c 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -1255,16 +1255,14 @@ export default class MessageComposerInput extends React.Component {
 
         let editorState;
         const historyItem = this.historyManager.getItem(delta);
-        if (historyItem) {
-            if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
-                editorState = this.richToMdEditorState(historyItem.value);
-            }
-            else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
-                editorState = this.mdToRichEditorState(historyItem.value);
-            }
-            else {
-                editorState = historyItem.value;
-            }
+        if (!historyItem) return;
+
+        if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
+            editorState = this.richToMdEditorState(historyItem.value);
+        } else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
+            editorState = this.mdToRichEditorState(historyItem.value);
+        } else {
+            editorState = historyItem.value;
         }
 
         // Move selection to the end of the selected history

From 0174f67fe748febf2899286d57669547191a6d9d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Jul 2018 18:17:45 +0100
Subject: [PATCH 701/702] fix Devtools input autofocus && state traversal when
 len === 1 && key=""

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/DevtoolsDialog.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 3078944b62..ea198461c5 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -61,7 +61,7 @@ class GenericEditor extends DevtoolsComponent {
                 <label htmlFor={id}>{ label }</label>
             </div>
             <div className="mx_DevTools_inputCell">
-                <input id={id} className="mx_TextInputDialog_input" onChange={this._onChange} value={this.state[id]} size="32" />
+                <input id={id} className="mx_TextInputDialog_input" onChange={this._onChange} value={this.state[id]} size="32" autoFocus={true} />
             </div>
         </div>;
     }
@@ -303,10 +303,13 @@ class FilteredList extends React.Component {
         const TruncatedList = sdk.getComponent("elements.TruncatedList");
         return <div>
             <input size="64"
+                   autoFocus={true}
                    onChange={this.onQuery}
                    value={this.props.query}
                    placeholder={_t('Filter results')}
-                   className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query" />
+                   className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
+                   // force re-render so that autoFocus is applied when this component is re-used
+                   key={this.props.children[0] ? this.props.children[0].key : ''} />
             <TruncatedList getChildren={this.getChildren}
                            getChildCount={this.getChildCount}
                            truncateAt={this.state.truncateAt}
@@ -414,10 +417,10 @@ class RoomStateExplorer extends DevtoolsComponent {
                         const stateKeys = Object.keys(stateGroup);
 
                         let onClickFn;
-                        if (stateKeys.length > 1) {
-                            onClickFn = this.browseEventType(evType);
-                        } else if (stateKeys.length === 1) {
+                        if (stateKeys.length === 1 && stateKeys[0] === '') {
                             onClickFn = this.onViewSourceClick(stateGroup[stateKeys[0]]);
+                        } else {
+                            onClickFn = this.browseEventType(evType);
                         }
 
                         return <button className={classes} key={evType} onClick={onClickFn}>

From 1fe0f04986432ef00f8b534a483286f5f62a2b93 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 27 Jul 2018 14:33:05 +0100
Subject: [PATCH 702/702] Fix persistend element location not updating

As hopefully all explained in comment
---
 .../views/elements/PersistedElement.js        | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 6a10fadeb3..ff839de2a9 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -20,6 +20,8 @@ import PropTypes from 'prop-types';
 
 import ResizeObserver from 'resize-observer-polyfill';
 
+import dis from '../../../dispatcher';
+
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
 // pass in a custom control as the actual body.
@@ -64,9 +66,17 @@ export default class PersistedElement extends React.Component {
         super();
         this.collectChildContainer = this.collectChildContainer.bind(this);
         this.collectChild = this.collectChild.bind(this);
-        this._onContainerResize = this._onContainerResize.bind(this);
+        this._repositionChild = this._repositionChild.bind(this);
+        this._onAction = this._onAction.bind(this);
 
-        this.resizeObserver = new ResizeObserver(this._onContainerResize);
+        this.resizeObserver = new ResizeObserver(this._repositionChild);
+        // Annoyingly, a resize observer is insufficient, since we also care
+        // about when the element moves on the screen without changing its
+        // dimensions. Doesn't look like there's a ResizeObserver equivalent
+        // for this, so we bodge it by listening for document resize and
+        // the timeline_resize action.
+        window.addEventListener('resize', this._repositionChild);
+        this._dispatcherRef = dis.register(this._onAction);
     }
 
     /**
@@ -113,9 +123,17 @@ export default class PersistedElement extends React.Component {
     componentWillUnmount() {
         this.updateChildVisibility(this.child, false);
         this.resizeObserver.disconnect();
+        window.removeEventListener('resize', this._repositionChild);
+        dis.unregister(this._dispatcherRef);
     }
 
-    _onContainerResize() {
+    _onAction(payload) {
+        if (payload.action === 'timeline_resize') {
+            this._repositionChild();
+        }
+    }
+
+    _repositionChild() {
         this.updateChildPosition(this.child, this.childContainer);
     }