From 159a920dc8896a01bf6059c67a890d4155c70708 Mon Sep 17 00:00:00 2001
From: "saul.kredi@krutt.org" <shaulk@bitsofgold.co.il>
Date: Sat, 3 Jun 2017 18:52:45 +0300
Subject: [PATCH 01/44] Better RTL support

---
 src/components/views/messages/SenderProfile.js        | 2 +-
 src/components/views/rooms/EntityTile.js              | 4 ++--
 src/components/views/rooms/MessageComposerInput.js    | 1 +
 src/components/views/rooms/MessageComposerInputOld.js | 2 +-
 src/components/views/rooms/RoomHeader.js              | 4 ++--
 src/components/views/rooms/RoomNameEditor.js          | 4 ++--
 src/components/views/rooms/RoomTile.js                | 6 +++---
 src/components/views/rooms/RoomTopicEditor.js         | 3 ++-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 9e6fba2127..e224714a27 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -30,7 +30,7 @@ export default function SenderProfile(props) {
     }
 
     return (
-        <EmojiText className="mx_SenderProfile"
+        <EmojiText className="mx_SenderProfile" dir="auto"
               onClick={props.onClick}>{`${name || ''} ${props.aux || ''}`}</EmojiText>
     );
 }
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 71e8fb0be7..67b3f54ba9 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -115,7 +115,7 @@ module.exports = React.createClass({
             nameEl = (
                 <div className="mx_EntityTile_details">
                     <img className="mx_EntityTile_chevron" src="img/member_chevron.png" width="8" height="12"/>
-                    <EmojiText element="div" className="mx_EntityTile_name_hover">{name}</EmojiText>
+                    <EmojiText element="div" className="mx_EntityTile_name_hover" dir="auto">{name}</EmojiText>
                     <PresenceLabel activeAgo={ activeAgo }
                         currentlyActive={this.props.presenceCurrentlyActive}
                         presenceState={this.props.presenceState} />
@@ -124,7 +124,7 @@ module.exports = React.createClass({
         }
         else {
             nameEl = (
-                <EmojiText element="div" className="mx_EntityTile_name">{name}</EmojiText>
+                <EmojiText element="div" className="mx_EntityTile_name" dir="auto">{name}</EmojiText>
             );
         }
 
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 65148f91ef..5416ee5d27 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -723,6 +723,7 @@ export default class MessageComposerInput extends React.Component {
                          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"
                             placeholder={this.props.placeholder}
                             editorState={this.state.editorState}
                             onChange={this.onEditorContentChanged}
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index f6af20c03b..bda384b621 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -461,7 +461,7 @@ export default React.createClass({
     render: function() {
         return (
             <div className="mx_MessageComposer_input" onClick={ this.onInputClick }>
-                <textarea autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder}
+                <textarea dir="auto" autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder}
                     onPaste={this._onPaste}
                 />
             </div>
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index df5df8b4f8..6fabd079fd 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -238,7 +238,7 @@ module.exports = React.createClass({
             const emojiTextClasses = classNames('mx_RoomHeader_nametext', { mx_RoomHeader_settingsHint: settingsHint });
             name =
                 <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
-                    <EmojiText element="div" className={emojiTextClasses} title={roomName}>{ roomName }</EmojiText>
+                    <EmojiText dir="auto" element="div" className={emojiTextClasses} title={roomName}>{ roomName }</EmojiText>
                     { searchStatus }
                 </div>;
         }
@@ -255,7 +255,7 @@ module.exports = React.createClass({
                 }
             }
             if (topic) {
-                topic_el = <div className="mx_RoomHeader_topic" ref="topic" title={ topic }>{ topic }</div>;
+                topic_el = <div className="mx_RoomHeader_topic" ref="topic" title={ topic } dir="auto">{ topic }</div>;
             }
         }
 
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index 773b713584..d1f0b0f99e 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -55,9 +55,9 @@ module.exports = React.createClass({
                          placeholderClassName="mx_RoomHeader_placeholder"
                          placeholder={ this._placeholderName }
                          blurToCancel={ false }
-                         initialValue={ this._initialName }/>
+                         initialValue={ this._initialName }
+                         dir="auto" />
                 </div>
         );
     },
 });
-
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index c123f31d19..97568a52a1 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -224,13 +224,13 @@ module.exports = React.createClass({
             if (this.props.selected) {
                 let nameSelected = <EmojiText>{name}</EmojiText>;
 
-                label = <div title={ name } className={ nameClasses }>{ nameSelected }</div>;
+                label = <div title={ name } className={ nameClasses } dir="auto">{ nameSelected }</div>;
             } else {
-                label = <EmojiText element="div" title={ name } className={ nameClasses }>{name}</EmojiText>;
+                label = <EmojiText element="div" title={ name } className={ nameClasses } dir="auto">{name}</EmojiText>;
             }
         } else if (this.state.hover) {
             var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} />;
+            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} dir="auto" />;
         }
 
         //var incomingCallBox;
diff --git a/src/components/views/rooms/RoomTopicEditor.js b/src/components/views/rooms/RoomTopicEditor.js
index e2fd40a7e8..9305381b6c 100644
--- a/src/components/views/rooms/RoomTopicEditor.js
+++ b/src/components/views/rooms/RoomTopicEditor.js
@@ -46,7 +46,8 @@ module.exports = React.createClass({
                      placeholderClassName="mx_RoomHeader_placeholder"
                      placeholder={_t("Add a topic")}
                      blurToCancel={ false }
-                     initialValue={ this._initialTopic }/>
+                     initialValue={ this._initialTopic }
+                     dir="auto" />
         );
     },
 });

From a640e943f770a372f0670297ced82b23aaf10068 Mon Sep 17 00:00:00 2001
From: Oliver Hunt <oliver@hunt.bz>
Date: Tue, 6 Jun 2017 00:29:14 +0100
Subject: [PATCH 02/44] Added button that copies code to clipboard

Signed-off-by: Oliver Hunt <oliver@hunt.bz>
---
 src/HtmlUtils.js                             | 13 ++++++++++
 src/components/views/messages/TextualBody.js | 27 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 4acb314c2f..e597d011b9 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -345,6 +345,7 @@ export function bodyToHtml(content, highlights, opts) {
         }
         safeBody = sanitizeHtml(body, sanitizeHtmlParams);
         safeBody = unicodeToImage(safeBody);
+        safeBody = addCodeCopyButton(safeBody);
     }
     finally {
         delete sanitizeHtmlParams.textFilter;
@@ -363,6 +364,18 @@ export function bodyToHtml(content, highlights, opts) {
     return <span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} />;
 }
 
+function addCodeCopyButton(safeBody) {
+    var el = document.createElement("div");
+    el.innerHTML = safeBody;
+    var codeBlocks = Array.from(el.getElementsByTagName("pre"));
+    codeBlocks.forEach(p => {
+        var button = document.createElement("span");
+        button.className = "mx_EventTile_copyButton";
+        p.appendChild(button);
+    });
+    return el.innerHTML;
+}
+
 export function emojifyText(text) {
     return {
         __html: unicodeToImage(escape(text)),
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 3df09fc444..fe4a66b55f 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -62,6 +62,19 @@ module.exports = React.createClass({
         };
     },
 
+    copyToClipboard: function(text) {
+        const textArea = document.createElement("textarea");
+        textArea.value = text;
+        document.body.appendChild(textArea);
+        textArea.select();
+        try {
+            const successful = document.execCommand('copy');
+        } catch (err) {
+            console.log('Unable to copy');
+        }
+        document.body.removeChild(textArea);
+    },
+
     componentDidMount: function() {
         this._unmounted = false;
 
@@ -80,6 +93,20 @@ module.exports = React.createClass({
                     }
                 }, 10);
             }
+            const buttons = ReactDOM.findDOMNode(this).getElementsByClassName("mx_EventTile_copyButton");
+            if (buttons.length > 0) {
+                // Do this asynchronously: parsing code takes time and we don't
+                // need to block the DOM update on it.
+                setTimeout(() => {
+                    if (this._unmounted) return;
+                    for (let i = 0; i < buttons.length; i++) {
+                        buttons[i].onclick = (e) => {
+                            const copyCode = buttons[i].parentNode.getElementsByTagName("code")[0];
+                            this.copyToClipboard(copyCode.textContent);
+                        };
+                    }
+                }, 10);
+            }
         }
     },
 

From dd6171a39ebced55fd154bd8856bbc126ed111d8 Mon Sep 17 00:00:00 2001
From: Oliver Hunt <oliver@hunt.bz>
Date: Tue, 6 Jun 2017 12:29:23 +0100
Subject: [PATCH 03/44] Review changes

Signed-off-by: Oliver Hunt <oliver@hunt.bz>
---
 src/HtmlUtils.js                             |  6 +++---
 src/components/views/messages/TextualBody.js | 17 ++++++-----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index e597d011b9..59717b0459 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -365,11 +365,11 @@ export function bodyToHtml(content, highlights, opts) {
 }
 
 function addCodeCopyButton(safeBody) {
-    var el = document.createElement("div");
+    const el = document.createElement("div");
     el.innerHTML = safeBody;
-    var codeBlocks = Array.from(el.getElementsByTagName("pre"));
+    const codeBlocks = Array.from(el.getElementsByTagName("pre"));
     codeBlocks.forEach(p => {
-        var button = document.createElement("span");
+        const button = document.createElement("span");
         button.className = "mx_EventTile_copyButton";
         p.appendChild(button);
     });
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index fe4a66b55f..8265ed5010 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -95,17 +95,12 @@ module.exports = React.createClass({
             }
             const buttons = ReactDOM.findDOMNode(this).getElementsByClassName("mx_EventTile_copyButton");
             if (buttons.length > 0) {
-                // Do this asynchronously: parsing code takes time and we don't
-                // need to block the DOM update on it.
-                setTimeout(() => {
-                    if (this._unmounted) return;
-                    for (let i = 0; i < buttons.length; i++) {
-                        buttons[i].onclick = (e) => {
-                            const copyCode = buttons[i].parentNode.getElementsByTagName("code")[0];
-                            this.copyToClipboard(copyCode.textContent);
-                        };
-                    }
-                }, 10);
+                for (let i = 0; i < buttons.length; i++) {
+                    buttons[i].onclick = (e) => {
+                        const copyCode = buttons[i].parentNode.getElementsByTagName("code")[0];
+                        this.copyToClipboard(copyCode.textContent);
+                    };
+                }
             }
         }
     },

From 0f4028da07f05682950ac47489d7f5bafebc2f0f Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 8 Jun 2017 09:44:58 +0100
Subject: [PATCH 04/44] Add more translations..

---
 src/components/views/create_room/Presets.js             | 7 ++++---
 src/components/views/create_room/RoomAlias.js           | 3 ++-
 src/components/views/dialogs/ChatCreateOrReuseDialog.js | 4 ++--
 src/components/views/dialogs/ChatInviteDialog.js        | 2 +-
 src/components/views/dialogs/DeactivateAccountDialog.js | 2 +-
 src/i18n/strings/en_EN.json                             | 7 +++++++
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/views/create_room/Presets.js b/src/components/views/create_room/Presets.js
index 6d40be9d32..c4d7ca0cdb 100644
--- a/src/components/views/create_room/Presets.js
+++ b/src/components/views/create_room/Presets.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+import { _t } from '../../../languageHandler';
 
 var Presets = {
     PrivateChat: "private_chat",
@@ -46,9 +47,9 @@ module.exports = React.createClass({
     render: function() {
         return (
             <select className="mx_Presets" onChange={this.onValueChanged} value={this.props.preset}>
-                <option value={this.Presets.PrivateChat}>Private Chat</option>
-                <option value={this.Presets.PublicChat}>Public Chat</option>
-                <option value={this.Presets.Custom}>Custom</option>
+                <option value={this.Presets.PrivateChat}>{_t("Private Chat")}</option>
+                <option value={this.Presets.PublicChat}>{_t("Public Chat")}</option>
+                <option value={this.Presets.Custom}>{_t("Custom")}</option>
             </select>
         );
     }
diff --git a/src/components/views/create_room/RoomAlias.js b/src/components/views/create_room/RoomAlias.js
index 6d311db593..e1cb7e4094 100644
--- a/src/components/views/create_room/RoomAlias.js
+++ b/src/components/views/create_room/RoomAlias.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 var React = require('react');
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'RoomAlias',
@@ -94,7 +95,7 @@ module.exports = React.createClass({
 
     render: function() {
         return (
-            <input type="text" className="mx_RoomAlias" placeholder="Alias (optional)"
+            <input type="text" className="mx_RoomAlias" placeholder={_t("Alias (optional)")}
                 onChange={this.onValueChanged} onFocus={this.onFocus} onBlur={this.onBlur}
                 value={this.props.alias}/>
         );
diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index 55caa52299..e83333556d 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -96,10 +96,10 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                 onFinished={() => {
                     this.props.onFinished(false)
                 }}
-                title='Create a new chat or reuse an existing one'
+                title={_t('Create a new chat or reuse an existing one')}
             >
                 <div className="mx_Dialog_content">
-                    You already have existing direct chats with this user:
+                    {_t("You already have existing direct chats with this user:")}
                     <div className="mx_ChatCreateOrReuseDialog_tiles">
                         {tiles}
                         {startNewChat}
diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js
index cd294a123d..c411c42392 100644
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@@ -490,7 +490,7 @@ module.exports = React.createClass({
             error = <div className="mx_ChatInviteDialog_error">{_t("You have entered an invalid contact. Try using their Matrix ID or email address.")}</div>;
         } else {
             const addressSelectorHeader = <div className="mx_ChatInviteDialog_addressSelectHeader">
-                Searching known users
+                {_t("Searching known users")}
             </div>;
             addressSelector = (
                 <AddressSelector ref={(ref) => {this.addressSelector = ref;}}
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index da74e6b716..e3b7cca078 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -86,7 +86,7 @@ export default class DeactivateAccountDialog extends React.Component {
             passwordBoxClass = 'error';
         }
 
-        const okLabel = this.state.busy ? <Loader /> : 'Deactivate Account';
+        const okLabel = this.state.busy ? <Loader /> : _t('Deactivate Account');
         const okEnabled = this.state.confirmButtonEnabled && !this.state.busy;
 
         let cancelButton = null;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 56f38cc87c..36d220dca5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -145,6 +145,7 @@
   "Hide removed messages": "Hide removed messages",
   "Always show message timestamps": "Always show message timestamps",
   "Authentication": "Authentication",
+  "Alias (optional)": "Alias (optional)",
   "all room members": "all room members",
   "all room members, from the point they are invited": "all room members, from the point they are invited",
   "all room members, from the point they joined": "all room members, from the point they joined",
@@ -218,11 +219,13 @@
     "one": "%(count)s new message",
     "other": "%(count)s new messages"
   },
+  "Create a new chat or reuse an existing one": "Create a new chat or reuse an existing one",
   "Create an account": "Create an account",
   "Create Room": "Create Room",
   "Cryptography": "Cryptography",
   "Current password": "Current password",
   "Curve25519 identity key": "Curve25519 identity key",
+  "Custom": "Custom",
   "Custom level": "Custom level",
   "/ddg is not a command": "/ddg is not a command",
   "Deactivate Account": "Deactivate Account",
@@ -420,8 +423,10 @@
   "Power level must be positive integer.": "Power level must be positive integer.",
   "Press": "Press",
   "Privacy warning": "Privacy warning",
+  "Private Chat": "Private Chat",
   "Privileged Users": "Privileged Users",
   "Profile": "Profile",
+  "Public Chat": "Public Chat",
   "Reason": "Reason",
   "Revoke Moderator": "Revoke Moderator",
   "Refer a friend to Riot:": "Refer a friend to Riot:",
@@ -456,6 +461,7 @@
   "Search": "Search",
   "Search failed": "Search failed",
   "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
+  "Searching known users": "Searching known users",
   "Send a message (unencrypted)": "Send a message (unencrypted)",
   "Send an encrypted message": "Send an encrypted message",
   "Sender device information": "Sender device information",
@@ -601,6 +607,7 @@
   "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.",
   "Would you like to": "Would you like to",
+  "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
   "You are already in a call.": "You are already in a call.",
   "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",
   "You are trying to access %(roomName)s": "You are trying to access %(roomName)s",

From ec9a436625d70e4af616a4fadb19d16d9577bdef Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 8 Jun 2017 11:56:48 +0100
Subject: [PATCH 05/44] Formatting

---
 src/Login.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Login.js b/src/Login.js
index 87731744e9..659fdb92bb 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -161,8 +161,7 @@ export default class Login {
                 error.friendlyText = (
                     _t('This Home Server does not support login using email address.')
                 );
-            }
-            else if (error.httpStatus === 403) {
+            } else if (error.httpStatus === 403) {
                 error.friendlyText = (
                     _t('Incorrect username and/or password.')
                 );
@@ -185,8 +184,7 @@ export default class Login {
                         throw error;
                     });
                 }
-            }
-            else {
+            } else {
                 error.friendlyText = (
                     _t("There was a problem logging in.") + ' (HTTP ' + error.httpStatus + ")"
                 );

From c9f723b16052d2e215ba716ab23196dbd7c9ae70 Mon Sep 17 00:00:00 2001
From: RiotTranslate <info@nordgedanken.de>
Date: Thu, 8 Jun 2017 13:05:02 +0200
Subject: [PATCH 06/44] Update from Weblate. (#1053)

* Added translation using Weblate (Thai)

* Translated using Weblate (Thai)

Currently translated at 2.6% (22 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (Thai)

Currently translated at 8.9% (74 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 99.8% (826 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Swedish)

Currently translated at 35.4% (293 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/

* Translated using Weblate (Thai)

Currently translated at 9.7% (81 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Russian)

Currently translated at 76.9% (636 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (Hungarian)

Currently translated at 0.1% (1 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/

* Translated using Weblate (Thai)

Currently translated at 39.2% (325 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 99.8% (827 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (German)

Currently translated at 99.8% (827 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Thai)

Currently translated at 39.7% (329 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 99.8% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Hungarian)

Currently translated at 3.1% (26 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/

* Translated using Weblate (Russian)

Currently translated at 77.4% (641 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (Thai)

Currently translated at 39.7% (329 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (Russian)

Currently translated at 100.0% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (German)

Currently translated at 100.0% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (German)

Currently translated at 100.0% (850 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (French)

Currently translated at 96.5% (821 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (Thai)

Currently translated at 39.0% (332 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (French)

Currently translated at 97.0% (825 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (German)

Currently translated at 100.0% (850 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Thai)

Currently translated at 40.8% (347 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (French)

Currently translated at 100.0% (850 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (German)

Currently translated at 100.0% (850 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Thai)

Currently translated at 49.5% (421 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (Thai)

Currently translated at 56.0% (476 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (Russian)

Currently translated at 100.0% (852 of 852 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (German)

Currently translated at 99.7% (850 of 852 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Thai)

Currently translated at 56.2% (479 of 852 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 99.7% (851 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (German)

Currently translated at 99.7% (851 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (German)

Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json |  62 +++++++-------
 src/i18n/strings/fr.json    |  31 ++++++-
 src/i18n/strings/ru.json    |  46 +++++++++--
 src/i18n/strings/th.json    | 156 +++++++++++++++++++++++++++++++++++-
 4 files changed, 247 insertions(+), 48 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f7b3d16ebc..4102d7be56 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -114,7 +114,7 @@
     "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?",
     "Failed to forget room": "Vergessen des Raums schlug fehl",
     "Failed to leave room": "Verlassen des Raums fehlgeschlagen",
-    "Failed to reject invitation": "Fehler beim Abweisen der Einladung",
+    "Failed to reject invitation": "Einladung konnte nicht abgelehnt werden",
     "Failed to set avatar.": "Fehler beim Setzen des Profilbilds.",
     "Failed to unban": "Entbannen fehlgeschlagen",
     "Failed to upload file": "Datei-Upload fehlgeschlagen",
@@ -127,7 +127,7 @@
     "Found a bug?": "Fehler gefunden?",
     "Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten, auch wenn sie explizit eingeladen wurden.",
     "Guests can't set avatars. Please register.": "Gäste können kein Profilbild setzen. Bitte registrieren.",
-    "Guest users can't upload files. Please register to upload.": "Gäste können keine Dateien hochladen. Bitte registrieren um hochzuladen.",
+    "Guest users can't upload files. Please register to upload.": "Gäste können keine Dateien hochladen. Bitte zunächst registrieren.",
     "had": "hatte",
     "Hangup": "Auflegen",
     "Homeserver is": "Der Homeserver ist",
@@ -182,7 +182,7 @@
     "Once you&#39;ve followed the link it contains, click below": "Nachdem du dem darin enthaltenen Link gefolgt bist, klicke unten",
     "rejected the invitation.": "lehnte die Einladung ab.",
     "Reject invitation": "Einladung ablehnen",
-    "Remove Contact Information?": "Kontakt-Informationen löschen?",
+    "Remove Contact Information?": "Kontakt-Informationen entfernen?",
     "removed their display name": "löschte den eigenen Anzeigenamen",
     "Remove": "Entfernen",
     "requested a VoIP conference": "hat eine VoIP-Konferenz angefordert",
@@ -227,7 +227,7 @@
     "to join the discussion": "um an der Diskussion teilzunehmen",
     "To kick users": "Um Nutzer zu entfernen",
     "Admin": "Administrator",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server könnte nicht verfügbar oder überlastet sein oder du bist auf einen Fehler gestoßen.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Fehler gestoßen.",
     "Could not connect to the integration server": "Konnte keine Verbindung zum Integrations-Server herstellen",
     "Disable inline URL previews by default": "URL-Vorschau im Chat standardmäßig deaktivieren",
     "Guests can't use labs features. Please register.": "Gäste können keine Labor-Funktionen nutzen. Bitte registrieren.",
@@ -271,7 +271,7 @@
     "Who would you like to communicate with?": "Mit wem möchtest du kommunizieren?",
     "Would you like to": "Möchtest du",
     "You do not have permission to post to this room": "Du hast keine Berechtigung an diesen Raum etwas zu senden",
-    "You have been invited to join this room by %(inviterName)s": "Du wurdest von %(inviterName)s in diesen Raum eingeladen",
+    "You have been invited to join this room by %(inviterName)s": "%(inviterName)s hat dich in diesen Raum eingeladen",
     "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 wurdest auf allen Geräten abgemeldet und wirst keine Push-Benachrichtigungen mehr erhalten. Um die Benachrichtigungen zu reaktivieren, musst du dich auf jedem Gerät neu anmelden",
     "you must be a": "nötige Rolle",
     "Your password has been reset": "Dein Passwort wurde zurückgesetzt",
@@ -281,14 +281,14 @@
     "Bulk Options": "Bulk-Optionen",
     "Call Timeout": "Anruf-Timeout",
     "Conference call failed.": "Konferenzgespräch fehlgeschlagen.",
-    "Conference calling is in development and may not be reliable.": "Konferenzgespräche sind in Entwicklung und evtl. nicht zuverlässig.",
+    "Conference calling is in development and may not be reliable.": "Konferenzgespräche befinden sich noch in der Entwicklungsphase und sind möglicherweise nicht zuverlässig nutzbar.",
     "Conference calls are not supported in encrypted rooms": "Konferenzgespräche werden in verschlüsselten Räumen nicht unterstützt",
     "Conference calls are not supported in this client": "Konferenzgespräche werden von diesem Client nicht unterstützt",
     "Existing Call": "Bereits bestehender Anruf",
     "Failed to set up conference call": "Konferenzgespräch konnte nicht gestartet werden",
     "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast",
     "Failure to create room": "Raumerstellung fehlgeschlagen",
-    "Guest users can't create new rooms. Please register to create room and start a chat.": "Gäste können keine neuen Räume erstellen. Bitte registrieren um einen Raum zu erstellen und einen Chat zu starten.",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Gastnutzer können keine neuen Räume erstellen. Bitte registriere dich um Räume zu erstellen und Chats zu starten.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot hat keine Berechtigung Benachrichtigungen zu senden - bitte prüfe deine Browser-Einstellungen",
     "Riot was not given permission to send notifications - please try again": "Riot hat das Recht nicht bekommen Benachrichtigungen zu senden. Bitte erneut probieren",
     "This email address is already in use": "Diese E-Mail-Adresse wird bereits verwendet",
@@ -302,11 +302,11 @@
     "Unable to enable Notifications": "Benachrichtigungen konnten nicht aktiviert werden",
     "Upload Failed": "Upload fehlgeschlagen",
     "VoIP is unsupported": "VoIP wird nicht unterstützt",
-    "You are already in a call.": "Du bist bereits bei einem Anruf.",
+    "You are already in a call.": "Du bist bereits in einem Gespräch.",
     "You cannot place a call with yourself.": "Du kannst keinen Anruf mit dir selbst starten.",
-    "You cannot place VoIP calls in this browser.": "Du kannst kein VoIP-Gespräch in diesem Browser starten.",
+    "You cannot place VoIP calls in this browser.": "Du kannst keine VoIP-Gespräche in diesem Browser starten.",
     "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "Du musst dich erneut anmelden, um Ende-zu-Ende-Verschlüsselungs-Schlüssel für dieses Gerät zu generieren und um den öffentlichen Schlüssel auf deinem Homeserver zu hinterlegen. Dies muss nur einmal durchgeführt werden, bitte entschuldige die Unannehmlichkeiten.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Homeserver verknüpft zu sein.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Heimserver verbunden zu sein.",
     "Sun": "So",
     "Mon": "Mo",
     "Tue": "Di",
@@ -377,7 +377,7 @@
     "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 löschte den Anzeigenamen (%(oldDisplayName)s).",
+    "%(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",
@@ -418,7 +418,7 @@
     "Press": "Drücke",
     "tag as %(tagName)s": "als %(tagName)s taggen",
     "to browse the directory": "um das Raum-Verzeichnis zu durchsuchen",
-    "to demote": "um die Priorität herabzusetzen",
+    "to demote": "um das Berechtigungslevel herabzusetzen",
     "to favourite": "zum Favorisieren",
     "to make a room or": "um einen Raum zu erstellen, oder",
     "to restore": "zum wiederherstellen",
@@ -581,7 +581,6 @@
     "Failed to save settings": "Einstellungen konnten nicht gespeichert werden",
     "Failed to set display name": "Anzeigename konnte nicht gesetzt werden",
     "Fill screen": "Fülle Bildschirm",
-    "Guest users can't upload files. Please register to upload.": "Gäste können keine Dateien hochladen. Bitte zunächst registrieren.",
     "Hide Text Formatting Toolbar": "Verberge Text-Formatierungs-Toolbar",
     "Incorrect verification code": "Falscher Verifizierungscode",
     "Invalid alias format": "Ungültiges Alias-Format",
@@ -608,16 +607,17 @@
     "Server error": "Server-Fehler",
     "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(",
     "Server may be unavailable, overloaded, or the file too big": "Server ist entweder nicht verfügbar, überlastet oder die Datei ist zu groß",
-    "Server unavailable, overloaded, or something else went wrong.": "Der Server ist entweder nicht verfügbar, überlastet oder es liegt ein anderweitiger Fehler vor.",
-    "Some of your messages have not been sent.": "Einige deiner Nachrichten wurden noch nicht gesendet.",
+    "Server unavailable, overloaded, or something else went wrong.": "Server nicht verfügbar, überlastet oder etwas anderes lief falsch.",
+    "Some of your messages have not been sent.": "Einige deiner Nachrichten wurden nicht gesendet.",
     "Submit": "Absenden",
     "The main address for this room is: %(canonical_alias_section)s": "Die Hauptadresse für diesen Raum ist: %(canonical_alias_section)s",
     "This action cannot be performed by a guest user. Please register to be able to do this": "Diese Aktion kann nicht von einem Gast ausgeführt werden. Bitte registriere dich um dies zu tun",
     "%(actionVerb)s this person?": "Diese Person %(actionVerb)s?",
     "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Der Versuch, einen spezifischen Punkt im Chatverlauf zu laden, ist fehlgeschlagen. Der Punkt konnte nicht gefunden werden.",
-    "Turn Markdown off": "Markdown abschalten",
+    "This room is private or inaccessible to guests. You may be able to join if you register": "Dieser Raum ist privat oder für Gäste nicht zugänglich. Du kannst jedoch eventuell beitreten, wenn du dich registrierst",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen",
+    "Tried to load a specific point in this room's timeline, but was unable to find it": "Der Versuch, einen spezifischen Punkt im Chatverlauf zu laden, ist fehlgeschlagen. Der Punkt konnte nicht gefunden werden",
+    "Turn Markdown off": "Markdown deaktiveren",
     "Turn Markdown on": "Markdown einschalten",
     "Unable to load device list": "Geräteliste konnte nicht geladen werden",
     "Unknown command": "Unbekannter Befehl",
@@ -725,7 +725,7 @@
     "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.": "Eine Änderung des Passworts setzt derzeit alle Schlüssel für die E2E-Verschlüsselung auf allen verwendeten Geräten zurück. Bereits verschlüsselte Chat-Inhalte sind somit nur noch lesbar, wenn du zunächst alle Schlüssel exportierst und später wieder importierst. Wir arbeiten an einer Verbesserung dieser momentan noch notwendigen Vorgehensweise.",
     "Unmute": "Stummschalten aufheben",
     "Invalid file%(extra)s": "Ungültige Datei%(extra)s",
-    "Remove %(threePid)s?": "Entferne %(threePid)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 gelöscht.",
     "Passphrases must match": "Passphrase muss übereinstimmen",
@@ -735,7 +735,6 @@
     "Confirm passphrase": "Bestätige Passphrase",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Die Export-Datei wird mit einer Passphrase geschützt sein. Du solltest die Passphrase hier eingeben um die Datei zu entschlüsseln.",
     "You must join the room to see its files": "Du musst dem Raum beitreten, um die Raum-Dateien sehen zu können",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Fehler gestoßen.",
     "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s Einladungen ablehnen",
     "Start new Chat": "Starte neuen Chat",
     "Guest users can't invite users. Please register.": "Gäste können keine Nutzer einladen. Bitte registrieren.",
@@ -785,7 +784,7 @@
     "This image cannot be displayed.": "Dieses Bild kann nicht angezeigt werden.",
     "Error decrypting video": "Video-Entschlüsselung fehlgeschlagen",
     "Import room keys": "Importiere Raum-Schlüssel",
-    "File to import": "Datei zum Importieren",
+    "File to import": "Zu importierende Datei",
     "Failed to invite the following users to the %(roomName)s room:": "Das Einladen der folgenden Nutzer in den Raum \"%(roomName)s\" ist fehlgeschlagen:",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Bist du sicher, dass du dieses Ereignis entfernen (löschen) möchtest? Wenn du die Änderung eines Raum-Namens oder eines Raum-Themas löscht, kann dies dazu führen, dass die ursprüngliche Änderung rückgängig gemacht wird.",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Dieser Prozess erlaubt es dir, die Schlüssel für in verschlüsselten Räumen empfangene Nachrichten in eine lokale Datei zu exportieren. In Zukunft wird es möglich sein, diese Datei in einen anderen Matrix-Client zu importieren, sodass dieser Client ebenfalls diese Nachrichten entschlüsseln kann.",
@@ -827,7 +826,7 @@
     "Invited": "Eingeladen",
     "Set a Display Name": "Setze einen Anzeigenamen",
     "for %(amount)ss": "für %(amount)ss",
-    "for %(amount)sm": "für %(amount)sm",
+    "for %(amount)sm": "seit %(amount)smin",
     "for %(amount)sh": "für %(amount)sh",
     "for %(amount)sd": "für %(amount)sd",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raum-Bild entfernt.",
@@ -840,17 +839,13 @@
     "Default Device": "Standard-Gerät",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
-    "Conference call failed.": "Konferenzgespräch fehlgeschlagen.",
-    "Conference calling is in development and may not be reliable.": "Konferenzgespräche befinden sich noch in der Entwicklungsphase und sind möglicherweise nicht zuverlässig nutzbar.",
     "Device already verified!": "Gerät bereits verifiziert!",
     "Export": "Export",
     "Failed to register as guest:": "Registrieren als Gast schlug fehl:",
     "Guest access is disabled on this Home Server.": "Gastzugang ist auf diesem Heimserver deaktivert.",
-    "Guest users can't create new rooms. Please register to create room and start a chat.": "Gastnutzer können keine neuen Räume erstellen. Bitte registriere dich um Räume zu erstellen und Chats zu starten.",
     "Import": "Import",
     "Incorrect username and/or password.": "Inkorrekter Nutzername und/oder Passwort.",
     "Results from DuckDuckGo": "Ergebnisse von DuckDuckGo",
-    "Server unavailable, overloaded, or something else went wrong.": "Server nicht verfügbar, überlastet oder etwas anderes lief falsch.",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Den Signaturschlüssel den du bereitstellst stimmt mit dem Schlüssel den du von %(userId)s's Gerät %(deviceId)s empfangen hast überein. Gerät als verifiziert markiert.",
     "Add a topic": "Thema hinzufügen",
     "Anyone": "Jeder",
@@ -878,13 +873,9 @@
     "Verified key": "Verifizierter Schlüssel",
     "WARNING: Device already verified, but keys do NOT MATCH!": "WARNUNG: Gerät bereits verifiziert, aber Schlüssel sind NICHT GLEICH!",
     "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 Gerät %(deviceId)s ist \"%(fprint)s\" welche nicht dem bereitgestellten Schlüssel \"%(fingerprint)s\" übereinstimmen. Dies kann bedeuten, dass deine Kommunikation abgefangen wird!",
-    "You are already in a call.": "Du bist bereits in einem Gespräch.",
-    "You cannot place a call with yourself.": "Du kannst keinen Anruf mit dir selbst starten.",
-    "You cannot place VoIP calls in this browser.": "Du kannst keine VoIP-Gespräche in diesem Browser starten.",
     "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>.",
     "You have entered an invalid contact. Try using their Matrix ID or email address.": "Du hast einen ungültigen Kontakt eingegeben. Versuche es mit der Matrix-ID oder der E-Mail-Adresse.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Heimserver verbunden zu sein.",
     "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName 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",
@@ -895,17 +886,16 @@
     "%(count)s new messages.other": "%(count)s neue Nachrichten",
     "Error: Problem communicating with the given homeserver.": "Fehler: Problem beim kommunizieren mit dem angegebenen Heimserver.",
     "Failed to fetch avatar URL": "Fehler beim holen der Avatar-URL",
-    "Some of your messages have not been sent.": "Einige deiner Nachrichten wurden nicht gesendet.",
     "The phone number entered looks invalid": "Die Telefonnummer, die eingegeben wurde, sieht ungültig aus",
     "This room is private or inaccessible to guests. You may be able to join if you register.": "Dieser Raum ist privat oder für Gäste nicht betretbar. Du kannst evtl. beitreten wenn du dich registrierst.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Es wurde versucht einen spezifischen Punkt in der Chat-Historie zu laden, aber du hast keine Berechtigung diese Nachricht zu sehen.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Es wurde versucht einen spezifischen Punkt in der Chat-Historie zu laden, aber er konnte nicht gefunden werden.",
     "Uploading %(filename)s and %(count)s others.zero": "%(filename)s wird hochgeladen",
-    "Uploading %(filename)s and %(count)s others.one": "%(filename)s und %(count)s weitere werden hochgeladen",
-    "Uploading %(filename)s and %(count)s others.other": "%(filename)s und %(count)s weitere werden hochgeladen",
+    "Uploading %(filename)s and %(count)s others.one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
+    "Uploading %(filename)s and %(count)s others.other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "You must <a>register</a> to use this functionality": "Du musst dich <a>registrieren</a> um diese Funktionalität zu nutzen",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Sende erneut</a> oder <a>breche alles ab</a>. Du kannst auch auch individuelle Nachrichten erneut senden or abbrechen.",
-    "Create new room": "Erstelle neuen Raum",
+    "Create new room": "Neuen Raum erstellen",
     "Welcome page": "Willkommensseite",
     "Room directory": "Raum-Verzeichnis",
     "Start chat": "Starte Chat",
@@ -919,5 +909,7 @@
     "Username not available": "Nutzername nicht verfügbar",
     "Something went wrong!": "Etwas ging schief!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Dies wird dein Konto-Name auf dem <span></span> Heimserver, oder du kannst einen <a>anderen Server</a> auswählen.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Wenn du bereits ein Matrix-Konto hast, kannst du ansonsten auch <a>anmelden</a>."
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Wenn du bereits ein Matrix-Benutzerkonto hast, kannst du dich stattdessen auch direkt <a>anmelden</a>.",
+    "Home": "Start",
+    "Username invalid: %(errMessage)s": "Nutzername falsch: %(errMessage)s"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ecbb20fbb7..ffd1ef5885 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -829,5 +829,34 @@
     "Hide removed messages": "Cacher les messages supprimés",
     "Add": "Ajouter",
     "%(count)s new messages.one": "%(count)s nouveau message",
-    "%(count)s new messages.other": "%(count)s nouveaux messages"
+    "%(count)s new messages.other": "%(count)s nouveaux messages",
+    "Disable markdown formatting": "Désactiver le formattage markdown",
+    "Error: Problem communicating with the given homeserver.": "Erreur: Problème de communication avec le homeserveur.",
+    "Failed to fetch avatar URL": "Échec lors de la récupération de l’URL de l’avatar",
+    "The phone number entered looks invalid": "Le numéro de téléphone entré semble être invalide",
+    "Guest users can't upload files. Please register to upload.": "Les visiteurs ne peuvent pas télécharger de fichier. Veuillez vous enregistrer pour télécharger.",
+    "Some of your messages have not been sent.": "Certains de vos messages n’ont pas été envoyés.",
+    "This room is private or inaccessible to guests. You may be able to join if you register.": "Ce salon est privé ou interdits aux visiteurs. Vous pourrez peut-être le joindre si vous vous enregistrez.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Un instant donné de la chronologie n’a pu être chargé car vous n’avez pas la permission de le visualiser.",
+    "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é.",
+    "Uploading %(filename)s and %(count)s others.zero": "Téléchargement de %(filename)s",
+    "Uploading %(filename)s and %(count)s others.one": "Téléchargement de %(filename)s et %(count)s autre",
+    "Uploading %(filename)s and %(count)s others.other": "Téléchargement de %(filename)s et %(count)s autres",
+    "You must <a>register</a> to use this functionality": "Vous devez vous <a>inscrire</a> pour utiliser cette fonctionnalité",
+    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Tout renvoyer</a> or <a>tout annuler</a> maintenant. Vous pouvez aussi sélectionner des messages individuels à envoyer ou annuler.",
+    "Create new room": "Créer un nouveau salon",
+    "Welcome page": "Page d'accueil",
+    "Room directory": "Répertoire des salons",
+    "Start chat": "Démarrer une discussion",
+    "New Password": "Nouveau mot de passe",
+    "Start chatting": "Démarrer une discussion",
+    "Start Chatting": "Démarrer une discussion",
+    "Click on the button below to start chatting!": "Cliquer sur le bouton ci-dessous pour commencer une discussion !",
+    "Create a new chat or reuse an existing one": "Démarrer une nouvelle discussion ou en réutiliser une existante",
+    "You already have existing direct chats with this user:": "Vous avez déjà des discussions en cours avec cet utilisateur :",
+    "Username available": "Nom d'utilisateur disponible",
+    "Username not available": "Nom d'utilisateur indisponible",
+    "Something went wrong!": "Quelque chose s’est mal passé !",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Cela sera le nom de votre compte sur le serveur  <span></span>, ou vous pouvez sélectionner un <a>autre serveur</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Si vous avez déjà un compte Matrix vous pouvez vous <a>identifier</a> à la place."
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 85b7a6a7f5..647fbfe1d5 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -92,14 +92,14 @@
     "Found a bug?": "Нашли ошибку?",
     "had": "имеет",
     "Hangup": "Отключение",
-    "Historical": "Исторический",
+    "Historical": "История",
     "Homeserver is": "Домашний сервер является",
     "Identity Server is": "Регистрационный сервер",
     "I have verified my email address": "Я проверил мой адрес электронной почты",
     "Import E2E room keys": "Импортировать E2E ключ комнаты",
     "Invalid Email Address": "Недействительный адрес электронной почты",
     "invited": "invited",
-    "Invite new room members": "Прегласить новых учасников комнаты",
+    "Invite new room members": "Пригласить новых учасников в комнату",
     "Invites": "Приглашать",
     "Invites user with given id to current room": "Пригласить пользователя с данным id в текущую комнату",
     "is a": "является",
@@ -119,13 +119,13 @@
     "Logout": "Выход из системы",
     "Low priority": "Низкий приоритет",
     "made future room history visible to": "made future room history visible to",
-    "Manage Integrations": "Управление интеграций",
+    "Manage Integrations": "Управление интеграциями",
     "Members only": "Только участники",
     "Mobile phone number": "Номер мобильного телефона",
     "Moderator": "Ведущий",
     "my Matrix ID": "мой Matrix ID",
     "Name": "Имя",
-    "Never send encrypted messages to unverified devices 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 password": "Новый пароль",
     "New passwords must match each other.": "Новые пароли должны соответствовать друг другу.",
@@ -190,7 +190,7 @@
     "Voice call": "Голосовой вызов",
     "VoIP conference finished.": "VoIP конференция закончилась.",
     "VoIP conference started.": "VoIP Конференция стартовала.",
-    "(warning: cannot be disabled again!)": "(предупреждение: не может быть снова отключен!)",
+    "(warning: cannot be disabled again!)": "(предупреждение: не может быть отключено!)",
     "Warning!": "Предупреждение!",
     "was banned": "запрещен",
     "was invited": "приглашенный",
@@ -200,7 +200,7 @@
     "were": "быть",
     "Who can access this room?": "Кто может получить доступ к этой комнате?",
     "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?": "С кем хотели бы Вы связываться?",
     "withdrawn": "уходить",
     "Would you like to": "Хотели бы Вы",
@@ -658,7 +658,7 @@
     "powered by Matrix": "управляемый с Matrix",
     "Add a topic": "Добавить тему",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Времея отображать в 12 часовом формате (напр. 2:30pm)",
-    "Use compact timeline layout": "Используйте компактным указанием времени",
+    "Use compact timeline layout": "Компактное отображение",
     "Hide removed messages": "Скрыть удаленное сообщение",
     "No Microphones detected": "Микрофоны не обнаружены",
     "Unknown devices": "Незнакомое устройство",
@@ -864,5 +864,35 @@
     "Disable URL previews for this room (affects only you)": "Отключить предпросмотр URL в этой комнате (только для вас)",
     "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName сменил аватар комнаты на <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 avatar for %(roomName)s": "%(senderDisplayName)s сменил аватар для %(roomName)s",
+    "Create new room": "Создать комнату",
+    "Room directory": "Каталог комнат",
+    "Start chat": "Начать чат",
+    "Welcome page": "Домашняя страница",
+    "Add": "Добавить",
+    "%(count)s new messages.one": "%(count)s новое сообщение",
+    "%(count)s new messages.other": "%(count)s новых сообщений",
+    "Error: Problem communicating with the given homeserver.": "Ошибка: проблема коммуникаций с указанным Home Server'ом.",
+    "Failed to fetch avatar URL": "Ошибка получения аватара",
+    "The phone number entered looks invalid": "Введенный номер телефона выглядит неправильным",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Ошибка загрузки истории комнаты: недостаточно прав.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Ошибка загрузки истории комнаты: запрошенный элемент не найден.",
+    "Uploading %(filename)s and %(count)s others.zero": "Загрузка %(filename)s",
+    "Uploading %(filename)s and %(count)s others.one": "Загрузка %(filename)s и %(count)s другой файл",
+    "Uploading %(filename)s and %(count)s others.other": "Загрузка %(filename)s и %(count)s других файлов",
+    "Username invalid: %(errMessage)s": "Неверное имя пользователя: %(errMessage)s",
+    "Searching known users": "Искать известных пользователей",
+    "You must <a>register</a> to use this functionality": "Вы должны <a>зарегистрироваться</a> для использования этой функции",
+    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Отослать снова</a> или <a>отменить отправку</a>. Вы также можете выбрать на отправку или отмену отдельные сообщения.",
+    "New Password": "Новый пароль",
+    "Start chatting": "Начать общение",
+    "Start Chatting": "Начать общение",
+    "Click on the button below to start chatting!": "Нажмите на кнопку ниже для того, чтобы начать общение!",
+    "Create a new chat or reuse an existing one": "Создать новый чат или использовать уже существующий",
+    "You already have existing direct chats with this user:": "У вас уже есть существующие приватные чаты с этим пользователем:",
+    "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.": "Если вы уже имеете учетную запись Matrix, то вы можете <a>войти</a>."
 }
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 6608219faa..f97b6b8d50 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -201,7 +201,7 @@
     "Hangup": "วางสาย",
     "Historical": "ประวัติแชทเก่า",
     "Homeserver is": "เซิร์ฟเวอร์บ้านคือ",
-    "Identity Server is": "เซิร์ฟเวอร์ยืนยันตัวตนคือ",
+    "Identity Server is": "เซิร์ฟเวอร์ระบุตัวตนคือ",
     "I have verified my email address": "ฉันยืนยันที่อยู่อีเมลแล้ว",
     "Import": "นำเข้า",
     "Incorrect username and/or password.": "ชื่อผู้ใช้และ/หรือรหัสผ่านไม่ถูกต้อง",
@@ -229,7 +229,7 @@
     "Leave room": "ออกจากห้อง",
     "left and rejoined": "ออกแล้วกลับเข้าร่วมอีกครั้ง",
     "left": "ออกไปแล้ว",
-    "%(targetName)s left the room.": "%(targetName)s ออกจากห้องไปแล้ว",
+    "%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
     "List this room in %(domain)s's room directory?": "แสดงห้องนี้ในไดเรกทอรีห้องของ %(domain)s?",
     "Logged in as:": "เข้าสู่ระบบในชื่อ:",
     "Login as guest": "เข้าสู่ระบบในฐานะแขก",
@@ -322,7 +322,7 @@
     "This is a preview of this room. Room interactions have been disabled": "นี่คือตัวอย่างของห้อง การตอบสนองภายในห้องถูกปิดใช้งาน",
     "This phone number is already in use": "หมายเลขโทรศัพท์นี้ถูกใช้งานแล้ว",
     "This room's internal ID is": "ID ภายในของห้องนี้คือ",
-    "times": "เวลา",
+    "times": "ครั้ง",
     "%(oneUser)schanged their name": "%(oneUser)sเปลี่ยนชื่อของเขาแล้ว",
     "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)sเปลี่ยนชื่อของพวกเขา %(repeats)s ครั้ง",
     "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)sเปลี่ยนชื่อของเขา %(repeats)s ครั้ง",
@@ -330,5 +330,153 @@
     "Create new room": "สร้างห้องใหม่",
     "Room directory": "ไดเรกทอรีห้อง",
     "Start chat": "เริ่มแชท",
-    "Welcome page": "หน้าต้อนรับ"
+    "Welcome page": "หน้าต้อนรับ",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์บ้านผ่านทาง HTTP ได้เนื่องจาก URL ที่อยู่บนเบราว์เซอร์เป็น HTTPS กรุณาใช้ HTTPS หรือ<a>เปิดใช้งานสคริปต์ที่ไม่ปลอดภัย</a>.",
+    "%(count)s new messages.one": "มี %(count)s ข้อความใหม่",
+    "%(count)s new messages.other": "มี %(count)s ข้อความใหม่",
+    "Disable inline URL previews by default": "ตั้งค่าเริ่มต้นให้ไม่แสดงตัวอย่าง URL ในแชท",
+    "Disable markdown formatting": "ปิดใช้งานการจัดรูปแบบ markdown",
+    "End-to-end encryption information": "ข้อมูลการเข้ารหัสจากปลายทางถึงปลายทาง",
+    "End-to-end encryption is in beta and may not be reliable": "การเข้ารหัสจากปลายทางถึงปลายทางยังอยู่ในเบต้า และอาจพึ่งพาไม่ได้",
+    "Error: Problem communicating with the given homeserver.": "ข้อผิดพลาด: มีปัญหาในการติดต่อกับเซิร์ฟเวอร์บ้านที่กำหนด",
+    "Export E2E room keys": "ส่งออกกุญแจถอดรหัส E2E",
+    "Failed to change power level": "การเปลี่ยนระดับอำนาจล้มเหลว",
+    "Import E2E room keys": "นำเข้ากุญแจถอดรหัส E2E",
+    "to favourite": "ไปยังรายการโปรด",
+    "to demote": "เพื่อลดขั้น",
+    "The default role for new room members is": "บทบาทเริ่มต้นของสมาชิกใหม่คือ",
+    "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' มีขนาดใหญ่เกินจำกัดของเซิร์ฟเวอร์บ้าน",
+    "To send messages": "เพื่อส่งข้อความ",
+    "to start a chat with someone": "เพื่อเริ่มแชทกับผู้อื่น",
+    "to tag as %(tagName)s": "เพื่อแท็กว่า %(tagName)s",
+    "to tag direct chat": "เพื่อแทกว่าแชทตรง",
+    "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": "ไม่สามารถโหลดรายชื่ออุปกรณ์",
+    "Unencrypted room": "ห้องที่ไม่เข้ารหัส",
+    "unencrypted": "ยังไม่ได้เข้ารหัส",
+    "Unknown command": "คำสั่งที่ไม่รู้จัก",
+    "unknown device": "อุปกรณ์ที่ไม่รู้จัก",
+    "Unknown room %(roomId)s": "ห้องที่ไม่รู้จัก %(roomId)s",
+    "Unknown (user, device) pair:": "คู่ (ผู้ใช้, อุปกรณ์) ที่ไม่รู้จัก:",
+    "unknown": "ไม่รู้จัก",
+    "Unrecognised command:": "คำสั่งที่ไม่รู้จัก:",
+    "Unrecognised room alias:": "นามแฝงห้องที่ไม่รู้จัก:",
+    "Uploading %(filename)s and %(count)s others.zero": "กำลังอัปโหลด %(filename)s",
+    "Uploading %(filename)s and %(count)s others.one": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
+    "Uploading %(filename)s and %(count)s others.other": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
+    "uploaded a file": "อัปโหลดไฟล์",
+    "Upload Failed": "การอัปโหลดล้มเหลว",
+    "Upload Files": "อัปโหลดไฟล์",
+    "Upload file": "อัปโหลดไฟล์",
+    "Usage": "การใช้งาน",
+    "User ID": "ID ผู้ใช้",
+    "User Interface": "อินเตอร์เฟสผู้ใช้",
+    "User name": "ชื่อผู้ใช้",
+    "User": "ผู้ใช้",
+    "Warning!": "คำเตือน!",
+    "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?": "คุณต้องการสื่อสารกับใคร?",
+    "You're not in any rooms yet! Press": "คุณยังไม่ได้อยู่ในห้องใดเลย! กด",
+    "You are trying to access %(roomName)s": "คุณกำลังพยายามเข้าสู่ %(roomName)s",
+    "You have <a>disabled</a> URL previews by default.": "ค่าเริ่มต้นของคุณ<a>ปิดใช้งาน</a>ตัวอย่าง URL เอาไว้",
+    "You have <a>enabled</a> URL previews by default.": "ค่าเริ่มต้นของคุณ<a>เปิดใช้งาน</a>ตัวอย่าง URL เอาไว้",
+    "you must be 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": "รหัสผ่านถูกรีเซ็ตแล้ว",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "การเปลี่ยนรหัสผ่านเสร็จสมบูณณ์ คุณจะไม่ได้รับการแจ้งเตือนบนอุปกรณ์อื่น ๆ จนกว่าคุณจะกลับเข้าสู่ระบบในอุปกรณ์เหล่านั้น",
+    "Sun": "อา.",
+    "Mon": "จ.",
+    "Tue": "อ.",
+    "Wed": "พ.",
+    "Thu": "พฤ.",
+    "Fri": "ศ.",
+    "Sat": "ส.",
+    "Jan": "ม.ค.",
+    "Feb": "ก.พ.",
+    "Mar": "มี.ค.",
+    "Apr": "เม.ย.",
+    "May": "พ.ค.",
+    "Jun": "มิ.ย.",
+    "Jul": "ก.ค.",
+    "Aug": "ส.ค.",
+    "Sep": "ก.ย.",
+    "Oct": "ต.ค.",
+    "Nov": "พ.ย.",
+    "Dec": "ธ.ค.",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "Set a display name:": "ตั้งชื่อที่แสดง:",
+    "Set a Display Name": "ตั้งชื่อที่แสดง",
+    "Passwords don't match.": "รหัสผ่านไม่ตรงกัน",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "รหัสผ่านสั้นเกินไป (ขึ้นต่ำ %(MIN_PASSWORD_LENGTH)s ตัวอักษร)",
+    "An unknown error occurred.": "เกิดข้อผิดพลาดที่ไม่รู้จัก",
+    "I already have an account": "ฉันมีบัญชีอยู่แล้ว",
+    "An error occured: %(error_string)s": "เกิดข้อผิดพลาด: %(error_string)s",
+    "Topic": "หัวข้อ",
+    "Make Moderator": "เลื่อนขั้นเป็นผู้ช่วยดูแล",
+    "Make this room private": "ทำให้ห้องนี้เป็นส่วนตัว",
+    "Share message history with new users": "แบ่งประวัติแชทให้ผู้ใช้ใหม่",
+    "Encrypt room": "เข้ารหัสห้อง",
+    "Room": "ห้อง",
+    "(~%(searchCount)s results)": "(~%(searchCount)s ผลลัพธ์)",
+    "or": "หรือ",
+    "bold": "หนา",
+    "italic": "เอียง",
+    "strike": "ขีดทับ",
+    "underline": "ขีดเส้นใต้",
+    "code": "โค๊ด",
+    "quote": "อ้างอิง",
+    "were kicked %(repeats)s times": "ถูกเตะ %(repeats)s ครั้ง",
+    "was kicked %(repeats)s times": "ถูกเตะ %(repeats)s ครั้ง",
+    "were kicked": "ถูกเตะ",
+    "was kicked": "ถูกเตะ",
+    "New Password": "รหัสผ่านใหม่",
+    "Options": "ตัวเลือก",
+    "Export room keys": "ส่งออกกุณแจห้อง",
+    "Confirm passphrase": "ยืนยันรหัสผ่าน",
+    "Import room keys": "นำเข้ากุณแจห้อง",
+    "File to import": "ไฟล์ที่จะนำเข้า",
+    "Start new chat": "เริ่มแชทใหม่",
+    "Failed to invite": "การเชิญล้มเหลว",
+    "Failed to invite user": "การเชิญผู้ใช้ล้มเหลว",
+    "Failed to invite the following users to the %(roomName)s room:": "การเชิญผู้ใช้เหล่านี้เข้าสู่ห้อง %(roomName)s ล้มเหลว:",
+    "Confirm Removal": "ยืนยันการลบ",
+    "Unknown error": "ข้อผิดพลาดที่ไม่รู้จัก",
+    "Incorrect password": "รหัสผ่านไม่ถูกต้อง",
+    "Device name": "ชื่ออุปกรณ์",
+    "Device key": "Key อุปกรณ์",
+    "Unknown devices": "อุปกรณ์ที่ไม่รู้จัก",
+    "Unknown Address": "ที่อยู่ที่ไม่รู้จัก",
+    "Unblacklist": "ถอดบัญชีดำ",
+    "Blacklist": "ขึ้นบัญชีดำ",
+    "ex. @bob:example.com": "เช่น @bob:example.com",
+    "Add User": "เพิ่มผู้ใช้",
+    "This Home Server would like to make sure you are not a robot": "เซิร์ฟเวอร์บ้านต้องการยืนยันว่าคุณไม่ใช่หุ่นยนต์",
+    "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.": "คุณสามารถกำหนดเซิร์ฟเวอร์บ้านเองได้โดยใส่ URL ของเซิร์ฟเวอร์นั้น เพื่อเข้าสู่ระบบของเซิร์ฟเวอร์ Matrix อื่น",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "ทั้งนี่เพื่อให้คุณสามารถใช้ Riot กับบัญชี Matrix ที่มีอยู่แล้วบนเซิร์ฟเวอร์บ้านอื่น ๆ ได้",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "คุณอาจเลือกเซิร์ฟเวอร์ระบุตัวตนเองด้วยก็ได้ แต่คุณจะไม่สามารถเชิญผู้ใช้อื่นด้วยที่อยู่อีเมล หรือรับคำเชิญจากผู้ใช้อื่นทางที่อยู่อีเมลได้",
+    "Default server": "เซิร์ฟเวอร์เริ่มต้น",
+    "Custom server": "เซิร์ฟเวอร์ที่กำหนดเอง",
+    "Home server URL": "URL เซิร์ฟเวอร์บ้าน",
+    "Identity server URL": "URL เซิร์ฟเวอร์ระบุตัวตน",
+    "%(severalUsers)sleft %(repeats)s times": "%(targetName)sออกจากห้อง %(repeats)s ครั้ง",
+    "%(oneUser)sleft %(repeats)s times": "%(oneUser)sออกจากห้อง %(repeats)s ครั้ง",
+    "%(severalUsers)sleft": "%(severalUsers)sออกจากห้องแล้ว",
+    "%(oneUser)sleft": "%(oneUser)sออกจากห้องแล้ว"
 }

From 1c58a9cd5e1ef9625fb4a2b753b6639ec00027ce Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 8 Jun 2017 12:33:29 +0100
Subject: [PATCH 07/44] Everything but src/components/views/rooms

---
 .../views/dialogs/InteractiveAuthDialog.js    |  2 +-
 .../dialogs/SessionRestoreErrorDialog.js      |  9 +++++---
 .../views/dialogs/SetDisplayNameDialog.js     |  2 +-
 .../views/dialogs/UnknownDeviceDialog.js      |  4 ++--
 .../views/elements/TruncatedList.js           |  3 ++-
 .../login/InteractiveAuthEntryComponents.js   |  2 +-
 .../views/login/RegistrationForm.js           |  4 ++--
 .../views/room_settings/ColorSettings.js      |  5 +++--
 .../views/settings/AddPhoneNumber.js          |  2 +-
 src/components/views/settings/ChangeAvatar.js |  5 +++--
 .../views/settings/ChangeDisplayName.js       |  3 ++-
 .../views/settings/ChangePassword.js          |  2 +-
 src/components/views/settings/DevicesPanel.js | 11 +++++-----
 .../settings/EnableNotificationsButton.js     |  5 +++--
 src/components/views/voip/CallView.js         |  7 +++++-
 src/components/views/voip/IncomingCallBox.js  | 22 +++++++++++++++----
 src/i18n/strings/en_EN.json                   | 22 +++++++++++++++++++
 17 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index 945e0a9d69..363ce89b57 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -78,7 +78,7 @@ export default React.createClass({
                     <AccessibleButton onClick={this._onDismissClick}
                         className="mx_UserSettings_button"
                     >
-                        Dismiss
+                        {_t("Dismiss")}
                     </AccessibleButton>
                 </div>
             );
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index e7f6e19db7..51651b4aaa 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -18,7 +18,7 @@ import React from 'react';
 import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';
 
 
 export default React.createClass({
@@ -44,8 +44,11 @@ export default React.createClass({
 
         if (SdkConfig.get().bug_report_endpoint_url) {
             bugreport = (
-                <p>Otherwise, <a onClick={this._sendBugReport} href='#'>
-                   click here</a> to send a bug report.
+                <p>
+                {_tJsx(
+                    "Otherwise, <a>click here</a> to send a bug report.",
+                    /<a>(.*?)<\/a>/, (sub) => <a onClick={this._sendBugReport} key="bugreport" href='#'>{sub}</a>
+                )}
                 </p>
             );
         }
diff --git a/src/components/views/dialogs/SetDisplayNameDialog.js b/src/components/views/dialogs/SetDisplayNameDialog.js
index 1134b1f8cd..0d6f486e0e 100644
--- a/src/components/views/dialogs/SetDisplayNameDialog.js
+++ b/src/components/views/dialogs/SetDisplayNameDialog.js
@@ -80,7 +80,7 @@ export default React.createClass({
                         />
                     </div>
                     <div className="mx_Dialog_buttons">
-                        <input className="mx_Dialog_primary" type="submit" value="Set" />
+                        <input className="mx_Dialog_primary" type="submit" value={_t("Set")} />
                     </div>
                 </form>
             </BaseDialog>
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 8f91b84519..6ebd0c3efc 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -145,7 +145,7 @@ export default React.createClass({
                             console.log("UnknownDeviceDialog closed by escape");
                             this.props.onFinished();
                 }}
-                title='Room contains unknown devices'
+                title={_t('Room contains unknown devices')}
             >
                 <GeminiScrollbar autoshow={false} className="mx_Dialog_content">
                     <h4>
@@ -162,7 +162,7 @@ export default React.createClass({
                                 this.props.onFinished();
                                 Resend.resendUnsentEvents(this.props.room);
                             }}>
-                        Send anyway
+                        {_t("Send anyway")}
                     </button>
                     <button className="mx_Dialog_primary" autoFocus={ true }
                             onClick={() => {
diff --git a/src/components/views/elements/TruncatedList.js b/src/components/views/elements/TruncatedList.js
index 0ec2c15f0a..d6a8e1fb7e 100644
--- a/src/components/views/elements/TruncatedList.js
+++ b/src/components/views/elements/TruncatedList.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 var React = require('react');
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'TruncatedList',
@@ -33,7 +34,7 @@ module.exports = React.createClass({
             truncateAt: 2,
             createOverflowElement: function(overflowCount, totalCount) {
                 return (
-                    <div>And {overflowCount} more...</div>
+                    <div>{_t("And %(count)s more...", {count: overflowCount})}</div>
                 );
             }
         };
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index d570847c21..ae8a087fdd 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -440,7 +440,7 @@ export const FallbackAuthEntry = React.createClass({
     render: function() {
         return (
             <div>
-                <a onClick={this._onShowFallbackClick}>Start authentication</a>
+                <a onClick={this._onShowFallbackClick}>{_t("Start authentication")}</a>
                 <div className="error">
                     {this.props.errorText}
                 </div>
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index 9066e31b47..0ca4615a84 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -101,7 +101,7 @@ module.exports = React.createClass({
             if (this.refs.email.value == '') {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createDialog(QuestionDialog, {
-                    title: "Warning!",
+                    title: _t("Warning!"),
                     description:
                         <div>
                             {_t("If you don't specify an email address, you won't be able to reset your password. " +
@@ -335,7 +335,7 @@ module.exports = React.createClass({
         );
 
         const registerButton = (
-            <input className="mx_Login_submit" type="submit" value="Register" />
+            <input className="mx_Login_submit" type="submit" value={_t("Register")} />
         );
 
         let placeholderUserName = _t("User name");
diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index 6a455d9c3c..42f2b9b620 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -20,6 +20,7 @@ var sdk = require('../../../index');
 var Tinter = require('../../../Tinter');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var Modal = require("../../../Modal");
+import { _t } from '../../../languageHandler';
 
 var ROOM_COLORS = [
     // magic room default values courtesy of Ribot
@@ -88,8 +89,8 @@ module.exports = React.createClass({
                 if (err.errcode == 'M_GUEST_ACCESS_FORBIDDEN') {
                     var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                     Modal.createDialog(NeedToRegisterDialog, {
-                        title: "Please Register",
-                        description: "Saving room color settings is only available to registered users"
+                        title: _t("Please Register"),
+                        description: _t("Saving room color settings is only available to registered users")
                     });
                 }
             });
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 358658ba60..dd79720e80 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -165,7 +165,7 @@ export default WithMatrixClient(React.createClass({
                     </div>
                 </div>
                 <div className="mx_UserSettings_threepidButton mx_filterFlipColor">
-                     <input type="image" value="Add" src="img/plus.svg" width="14" height="14" />
+                     <input type="image" value={_t("Add")} src="img/plus.svg" width="14" height="14" />
                 </div>
             </form>
         );
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 230787d241..ae6f1957b8 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -17,6 +17,7 @@ limitations under the License.
 var React = require('react');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var sdk = require('../../../index');
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'ChangeAvatar',
@@ -105,7 +106,7 @@ module.exports = React.createClass({
 
     onError: function(error) {
         this.setState({
-            errorText: "Failed to upload profile picture!"
+            errorText: _t("Failed to upload profile picture!")
         });
     },
 
@@ -127,7 +128,7 @@ module.exports = React.createClass({
         if (this.props.showUploadSection) {
             uploadSection = (
                 <div className={this.props.className}>
-                    Upload new:
+                    {_t("Upload new:")}
                     <input type="file" accept="image/*" onChange={this.onFileSelected}/>
                     {this.state.errorText}
                 </div>
diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index 23966c003d..36865c37b0 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -18,6 +18,7 @@ limitations under the License.
 var React = require('react');
 var sdk = require('../../../index');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'ChangeDisplayName',
@@ -52,7 +53,7 @@ module.exports = React.createClass({
         return (
             <EditableTextContainer
                 getInitialValue={this._getDisplayName}
-                placeholder="No display name"
+                placeholder={_t("No display name")}
                 blurToSubmit={true}
                 onSubmit={this._changeDisplayName} />
         );
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 48c0b5501e..fcc64d5d06 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -48,7 +48,7 @@ module.exports = React.createClass({
             onCheckPassword: function(oldPass, newPass, confirmPass) {
                 if (newPass !== confirmPass) {
                     return {
-                        error: _t("New passwords don't match") + "."
+                        error: _t("New passwords don't match")
                     };
                 } else if (!newPass || newPass.length === 0) {
                     return {
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 28eee55527..d10f17a40e 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -19,6 +19,7 @@ import classNames from 'classnames';
 
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
+import { _t } from '../../../languageHandler';
 
 
 export default class DevicesPanel extends React.Component {
@@ -54,10 +55,10 @@ export default class DevicesPanel extends React.Component {
                 var errtxt;
                 if (error.httpStatus == 404) {
                     // 404 probably means the HS doesn't yet support the API.
-                    errtxt = "Your home server does not support device management.";
+                    errtxt = _t("Your home server does not support device management.");
                 } else {
                     console.error("Error loading devices:", error);
-                    errtxt = "Unable to load device list.";
+                    errtxt = _t("Unable to load device list");
                 }
                 this.setState({deviceLoadError: errtxt});
             }
@@ -127,9 +128,9 @@ export default class DevicesPanel extends React.Component {
         return (
             <div className={classes}>
                 <div className="mx_DevicesPanel_header">
-                    <div className="mx_DevicesPanel_deviceId">ID</div>
-                    <div className="mx_DevicesPanel_deviceName">Name</div>
-                    <div className="mx_DevicesPanel_deviceLastSeen">Last seen</div>
+                    <div className="mx_DevicesPanel_deviceId">{_t("Device ID")}</div>
+                    <div className="mx_DevicesPanel_deviceName">{_t("Device Name")}</div>
+                    <div className="mx_DevicesPanel_deviceLastSeen">{_t("Last seen")}</div>
                     <div className="mx_DevicesPanel_deviceButtons"></div>
                 </div>
                 {devices.map(this._renderDevice)}
diff --git a/src/components/views/settings/EnableNotificationsButton.js b/src/components/views/settings/EnableNotificationsButton.js
index d106b8bbb4..f1b1f12c2a 100644
--- a/src/components/views/settings/EnableNotificationsButton.js
+++ b/src/components/views/settings/EnableNotificationsButton.js
@@ -18,6 +18,7 @@ limitations under the License.
 var React = require("react");
 var Notifier = require("../../../Notifier");
 var dis = require("../../../dispatcher");
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'EnableNotificationsButton',
@@ -60,13 +61,13 @@ module.exports = React.createClass({
         if (this.enabled()) {
             return (
                 <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    Disable Notifications
+                    {_t("Disable Notifications")}
                 </button>
             );
         } else {
             return (
                 <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    Enable Notifications
+                    {_t("Enable Notifications")}
                 </button>
             );
         }
diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index 6cab7531b7..b53794637f 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -18,6 +18,7 @@ var dis = require("../../../dispatcher");
 var CallHandler = require("../../../CallHandler");
 var sdk = require('../../../index');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'CallView',
@@ -130,7 +131,11 @@ module.exports = React.createClass({
         var voice;
         if (this.state.call && this.state.call.type === "voice" && this.props.showVoice) {
             var callRoom = MatrixClientPeg.get().getRoom(this.state.call.roomId);
-            voice = <div className="mx_CallView_voice" onClick={ this.props.onClick }>Active call ({ callRoom.name })</div>;
+            voice = (
+                <div className="mx_CallView_voice" onClick={ this.props.onClick }>
+                {_t("Active call (%(roomName)s)", {roomName: callRoom.name})}
+                </div>
+            );
         }
 
         return (
diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index 6cd19538f0..1b806fc5b3 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -17,6 +17,7 @@ var React = require('react');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var dis = require("../../../dispatcher");
 var CallHandler = require("../../../CallHandler");
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'IncomingCallBox',
@@ -45,23 +46,36 @@ module.exports = React.createClass({
             room = MatrixClientPeg.get().getRoom(this.props.incomingCall.roomId);
         }
 
-        var caller = room ? room.name : "unknown";
+        var caller = room ? room.name : _t("unknown caller");
+
+        let incomingCallText = null;
+        if (this.props.incomingCall) {
+            if (this.props.incomingCall.type === "voice") {
+                incomingCallText = _t("Incoming voice call from %(name)s", {name: caller});
+            }
+            else if (this.props.incomingCall.type === "video") {
+                incomingCallText = _t("Incoming video call from %(name)s", {name: caller});
+            }
+            else {
+                incomingCallText = _t("Incoming call from %(name)s", {name: caller});
+            }
+        }
 
         return (
             <div className="mx_IncomingCallBox" id="incomingCallBox">
                 <img className="mx_IncomingCallBox_chevron" src="img/chevron-left.png" width="9" height="16" />
                 <div className="mx_IncomingCallBox_title">
-                    Incoming { this.props.incomingCall ? this.props.incomingCall.type : '' } call from { caller }
+                    {incomingCallText}
                 </div>
                 <div className="mx_IncomingCallBox_buttons">
                     <div className="mx_IncomingCallBox_buttons_cell">
                         <div className="mx_IncomingCallBox_buttons_decline" onClick={this.onRejectClick}>
-                            Decline
+                            {_t("Decline")}
                         </div>
                     </div>
                     <div className="mx_IncomingCallBox_buttons_cell">
                         <div className="mx_IncomingCallBox_buttons_accept" onClick={this.onAnswerClick}>
-                            Accept
+                            {_t("Accept")}
                         </div>
                     </div>
                 </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 36d220dca5..de1adc539d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -122,15 +122,18 @@
   "A registered account is required for this action": "A registered account is required for this action",
   "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",
   "accept": "accept",
+  "Accept": "Accept",
   "%(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:",
+  "Active call (%(roomName)s)": "Active call (%(roomName)s)",
   "Add": "Add",
   "Add a topic": "Add a topic",
   "Add email address": "Add email address",
   "Add phone number": "Add phone number",
   "Admin": "Admin",
+  "And %(count)s more...": "And %(count)s more...",
   "VoIP": "VoIP",
   "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
   "No Microphones detected": "No Microphones detected",
@@ -230,6 +233,7 @@
   "/ddg is not a command": "/ddg is not a command",
   "Deactivate Account": "Deactivate Account",
   "Deactivate my account": "Deactivate my account",
+  "Decline": "Decline",
   "decline": "decline",
   "Decrypt %(text)s": "Decrypt %(text)s",
   "Decryption error": "Decryption error",
@@ -247,6 +251,7 @@
   "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
   "Direct Chat": "Direct Chat",
   "Direct chats": "Direct chats",
+  "Disable Notifications": "Disable Notifications",
   "disabled": "disabled",
   "Disable inline URL previews by default": "Disable inline URL previews by default",
   "Disable markdown formatting": "Disable markdown formatting",
@@ -264,6 +269,7 @@
   "Email, name or matrix ID": "Email, name or matrix ID",
   "Emoji": "Emoji",
   "Enable encryption": "Enable encryption",
+  "Enable Notifications": "Enable Notifications",
   "enabled": "enabled",
   "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",
@@ -303,6 +309,7 @@
   "Failed to toggle moderator status": "Failed to toggle moderator status",
   "Failed to unban": "Failed to unban",
   "Failed to upload file": "Failed to upload file",
+  "Failed to upload profile picture!": "Failed to upload profile picture!",
   "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
   "Failure to create room": "Failure to create room",
   "Favourite": "Favourite",
@@ -332,6 +339,9 @@
   "I have verified my email address": "I have verified my email address",
   "Import": "Import",
   "Import E2E room keys": "Import E2E room keys",
+  "Incoming call from %(name)s": "Incoming call from %(name)s",
+  "Incoming video call from %(name)s": "Incoming video call from %(name)s",
+  "Incoming voice call from %(name)s": "Incoming voice call from %(name)s",
   "Incorrect username and/or password.": "Incorrect username and/or password.",
   "Incorrect verification code": "Incorrect verification code",
   "Interface Language": "Interface Language",
@@ -359,6 +369,7 @@
   "Kick": "Kick",
   "Kicks user with given id": "Kicks user with given id",
   "Labs": "Labs",
+  "Last seen": "Last seen",
   "Leave room": "Leave room",
   "left and rejoined": "left and rejoined",
   "left": "left",
@@ -402,6 +413,7 @@
   "<not supported>": "<not supported>",
   "NOT verified": "NOT verified",
   "No devices with registered encryption keys": "No devices with registered encryption keys",
+  "No display name": "No display name",
   "No more results": "No more results",
   "No results": "No results",
   "No users have specific privileges in this room": "No users have specific privileges in this room",
@@ -411,6 +423,7 @@
   "Once you&#39;ve followed the link it contains, click below": "Once you&#39;ve followed the link it contains, click below",
   "Only people who have been invited": "Only people who have been invited",
   "Operation failed": "Operation failed",
+  "Otherwise, <a>click here</a> to send a bug report.": "Otherwise, <a>click here</a> to send a bug report.",
   "Password": "Password",
   "Password:": "Password:",
   "Passwords can't be empty": "Passwords can't be empty",
@@ -453,9 +466,11 @@
   "riot-web version:": "riot-web version:",
   "Room %(roomId)s not visible": "Room %(roomId)s not visible",
   "Room Colour": "Room Colour",
+  "Room contains unknown devices": "Room contains unknown devices",
   "Room name (optional)": "Room name (optional)",
   "Rooms": "Rooms",
   "Save": "Save",
+  "Saving room color settings is only available to registered users": "Saving room color settings is only available to registered users",
   "Scroll to bottom of page": "Scroll to bottom of page",
   "Scroll to unread messages": "Scroll to unread messages",
   "Search": "Search",
@@ -464,6 +479,7 @@
   "Searching known users": "Searching known users",
   "Send a message (unencrypted)": "Send a message (unencrypted)",
   "Send an encrypted message": "Send an encrypted message",
+  "Send anyway": "Send anyway",
   "Sender device information": "Sender device information",
   "Send Invites": "Send Invites",
   "Send Reset Email": "Send Reset Email",
@@ -480,6 +496,7 @@
   "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.",
+  "Set": "Set",
   "Setting a user name will create a fresh account": "Setting a user name will create a fresh account",
   "Settings": "Settings",
   "Show panel": "Show panel",
@@ -494,6 +511,7 @@
   "Someone": "Someone",
   "Sorry, this homeserver is using a login which is not recognised ": "Sorry, this homeserver is using a login which is not recognised ",
   "Start a chat": "Start a chat",
+  "Start authentication": "Start authentication",
   "Start Chat": "Start Chat",
   "Submit": "Submit",
   "Success": "Success",
@@ -561,6 +579,7 @@
   "Unable to load device list": "Unable to load device list",
   "Unencrypted room": "Unencrypted room",
   "unencrypted": "unencrypted",
+  "unknown caller": "unknown caller",
   "Unknown command": "Unknown command",
   "unknown device": "unknown device",
   "unknown error code": "unknown error code",
@@ -580,6 +599,7 @@
   "Upload Failed": "Upload Failed",
   "Upload Files": "Upload Files",
   "Upload file": "Upload file",
+  "Upload new:": "Upload new:",
   "Usage": "Usage",
   "Use compact timeline layout": "Use compact timeline layout",
   "Use with caution": "Use with caution",
@@ -633,6 +653,7 @@
   "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
   "You should not yet trust it to secure data": "You should not yet trust it to secure data",
   "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",
+  "Your home server does not support device management.": "Your home server does not support device management.",
   "Sun": "Sun",
   "Mon": "Mon",
   "Tue": "Tue",
@@ -780,6 +801,7 @@
   "To continue, please enter your password.": "To continue, please enter your password.",
   "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:": "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 Name": "Device Name",
   "Device key": "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.": "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.",

From 9bda212cb189939066f389ec7d2d7d3677d4219c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 8 Jun 2017 13:52:52 +0100
Subject: [PATCH 08/44] Make travis/jenkins check for lint on files which are
 clean to start with

---
 .eslintignore.errorfiles                  | 187 ++++++++++++++++++++++
 .travis.yml                               |   4 +-
 jenkins.sh                                |   5 +
 scripts/generate-eslint-error-ignore-file |  21 +++
 scripts/travis.sh                         |  11 ++
 5 files changed, 225 insertions(+), 3 deletions(-)
 create mode 100644 .eslintignore.errorfiles
 create mode 100755 scripts/generate-eslint-error-ignore-file
 create mode 100755 scripts/travis.sh

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
new file mode 100644
index 0000000000..f1b63d7367
--- /dev/null
+++ b/.eslintignore.errorfiles
@@ -0,0 +1,187 @@
+# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
+
+src/AddThreepid.js
+src/async-components/views/dialogs/EncryptedEventDialog.js
+src/autocomplete/AutocompleteProvider.js
+src/autocomplete/Autocompleter.js
+src/autocomplete/Components.js
+src/autocomplete/DuckDuckGoProvider.js
+src/autocomplete/EmojiProvider.js
+src/autocomplete/RoomProvider.js
+src/autocomplete/UserProvider.js
+src/Avatar.js
+src/BasePlatform.js
+src/CallHandler.js
+src/component-index.js
+src/components/structures/ContextualMenu.js
+src/components/structures/CreateRoom.js
+src/components/structures/FilePanel.js
+src/components/structures/InteractiveAuth.js
+src/components/structures/LoggedInView.js
+src/components/structures/login/ForgotPassword.js
+src/components/structures/login/Login.js
+src/components/structures/login/PostRegistration.js
+src/components/structures/login/Registration.js
+src/components/structures/MatrixChat.js
+src/components/structures/MessagePanel.js
+src/components/structures/NotificationPanel.js
+src/components/structures/RoomStatusBar.js
+src/components/structures/RoomView.js
+src/components/structures/ScrollPanel.js
+src/components/structures/TimelinePanel.js
+src/components/structures/UploadBar.js
+src/components/structures/UserSettings.js
+src/components/views/avatars/BaseAvatar.js
+src/components/views/avatars/MemberAvatar.js
+src/components/views/avatars/RoomAvatar.js
+src/components/views/create_room/CreateRoomButton.js
+src/components/views/create_room/Presets.js
+src/components/views/create_room/RoomAlias.js
+src/components/views/dialogs/ChatCreateOrReuseDialog.js
+src/components/views/dialogs/ChatInviteDialog.js
+src/components/views/dialogs/DeactivateAccountDialog.js
+src/components/views/dialogs/InteractiveAuthDialog.js
+src/components/views/dialogs/SetMxIdDialog.js
+src/components/views/dialogs/UnknownDeviceDialog.js
+src/components/views/elements/AccessibleButton.js
+src/components/views/elements/ActionButton.js
+src/components/views/elements/AddressSelector.js
+src/components/views/elements/AddressTile.js
+src/components/views/elements/CreateRoomButton.js
+src/components/views/elements/DeviceVerifyButtons.js
+src/components/views/elements/DirectorySearchBox.js
+src/components/views/elements/Dropdown.js
+src/components/views/elements/EditableText.js
+src/components/views/elements/EditableTextContainer.js
+src/components/views/elements/HomeButton.js
+src/components/views/elements/LanguageDropdown.js
+src/components/views/elements/MemberEventListSummary.js
+src/components/views/elements/PowerSelector.js
+src/components/views/elements/ProgressBar.js
+src/components/views/elements/RoomDirectoryButton.js
+src/components/views/elements/SettingsButton.js
+src/components/views/elements/StartChatButton.js
+src/components/views/elements/TintableSvg.js
+src/components/views/elements/TruncatedList.js
+src/components/views/elements/UserSelector.js
+src/components/views/login/CaptchaForm.js
+src/components/views/login/CasLogin.js
+src/components/views/login/CountryDropdown.js
+src/components/views/login/CustomServerDialog.js
+src/components/views/login/InteractiveAuthEntryComponents.js
+src/components/views/login/LoginHeader.js
+src/components/views/login/PasswordLogin.js
+src/components/views/login/RegistrationForm.js
+src/components/views/login/ServerConfig.js
+src/components/views/messages/MAudioBody.js
+src/components/views/messages/MessageEvent.js
+src/components/views/messages/MFileBody.js
+src/components/views/messages/MImageBody.js
+src/components/views/messages/MVideoBody.js
+src/components/views/messages/RoomAvatarEvent.js
+src/components/views/messages/TextualBody.js
+src/components/views/messages/TextualEvent.js
+src/components/views/room_settings/AliasSettings.js
+src/components/views/room_settings/ColorSettings.js
+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
+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/MessageComposerInputOld.js
+src/components/views/rooms/PresenceLabel.js
+src/components/views/rooms/ReadReceiptMarker.js
+src/components/views/rooms/RoomHeader.js
+src/components/views/rooms/RoomList.js
+src/components/views/rooms/RoomNameEditor.js
+src/components/views/rooms/RoomPreviewBar.js
+src/components/views/rooms/RoomSettings.js
+src/components/views/rooms/RoomTile.js
+src/components/views/rooms/RoomTopicEditor.js
+src/components/views/rooms/SearchableEntityList.js
+src/components/views/rooms/SearchResultTile.js
+src/components/views/rooms/TabCompleteBar.js
+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/DevicesPanelEntry.js
+src/components/views/settings/EnableNotificationsButton.js
+src/components/views/voip/CallView.js
+src/components/views/voip/IncomingCallBox.js
+src/components/views/voip/VideoFeed.js
+src/components/views/voip/VideoView.js
+src/ContentMessages.js
+src/createRoom.js
+src/DateUtils.js
+src/email.js
+src/Entities.js
+src/extend.js
+src/HtmlUtils.js
+src/ImageUtils.js
+src/Invite.js
+src/languageHandler.js
+src/linkify-matrix.js
+src/Login.js
+src/Markdown.js
+src/MatrixClientPeg.js
+src/Modal.js
+src/Notifier.js
+src/ObjectUtils.js
+src/PasswordReset.js
+src/PlatformPeg.js
+src/Presence.js
+src/ratelimitedfunc.js
+src/Resend.js
+src/RichText.js
+src/Roles.js
+src/RoomListSorter.js
+src/RoomNotifs.js
+src/Rooms.js
+src/RtsClient.js
+src/ScalarAuthClient.js
+src/ScalarMessaging.js
+src/SdkConfig.js
+src/Skinner.js
+src/SlashCommands.js
+src/stores/LifecycleStore.js
+src/TabComplete.js
+src/TabCompleteEntries.js
+src/TextForEvent.js
+src/Tinter.js
+src/UiEffects.js
+src/Unread.js
+src/UserActivity.js
+src/utils/DecryptFile.js
+src/utils/DMRoomMap.js
+src/utils/FormattingUtils.js
+src/utils/MultiInviter.js
+src/utils/Receipt.js
+src/Velociraptor.js
+src/VelocityBounce.js
+src/WhoIsTyping.js
+src/wrappers/WithMatrixClient.js
+test/all-tests.js
+test/components/structures/login/Registration-test.js
+test/components/structures/MessagePanel-test.js
+test/components/structures/ScrollPanel-test.js
+test/components/structures/TimelinePanel-test.js
+test/components/stub-component.js
+test/components/views/dialogs/InteractiveAuthDialog-test.js
+test/components/views/elements/MemberEventListSummary-test.js
+test/components/views/login/RegistrationForm-test.js
+test/components/views/rooms/MessageComposerInput-test.js
+test/mock-clock.js
+test/skinned-sdk.js
+test/stores/RoomViewStore-test.js
+test/test-utils.js
diff --git a/.travis.yml b/.travis.yml
index a405b9ef35..918cec696b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,4 @@ install:
     - npm install
     - (cd node_modules/matrix-js-sdk && npm install)
 script:
-    # don't run the riot tests unless the react-sdk tests pass, otherwise
-    # the output is confusing.
-    - npm run test && ./.travis-test-riot.sh
+    ./scripts/travis.sh
diff --git a/jenkins.sh b/jenkins.sh
index 6a77911c27..d9bb62855b 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -21,6 +21,11 @@ npm run test
 # run eslint
 npm run lintall -- -f checkstyle -o eslint.xml || true
 
+# re-run the linter, excluding any files known to have errors or warnings.
+./node_modules/.bin/eslint --max-warnings 0 \
+    --ignore-path .eslintignore.errorfiles \
+    src test
+
 # delete the old tarball, if it exists
 rm -f matrix-react-sdk-*.tgz
 
diff --git a/scripts/generate-eslint-error-ignore-file b/scripts/generate-eslint-error-ignore-file
new file mode 100755
index 0000000000..3a635f5a7d
--- /dev/null
+++ b/scripts/generate-eslint-error-ignore-file
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# generates .eslintignore.errorfiles to list the files which have errors in,
+# so that they can be ignored in future automated linting.
+
+out=.eslintignore.errorfiles
+
+cd `dirname $0`/..
+
+echo "generating $out"
+
+{
+    cat <<EOF
+# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
+
+EOF
+    
+    ./node_modules/.bin/eslint --no-ignore -f json src test |
+        jq -r '.[] | select((.errorCount + .warningCount) > 0) | .filePath' |
+        sed -e 's/.*matrix-react-sdk\///';
+} > "$out"
diff --git a/scripts/travis.sh b/scripts/travis.sh
new file mode 100755
index 0000000000..f349b06ad5
--- /dev/null
+++ b/scripts/travis.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -ex
+
+npm run test
+./.travis-test-riot.sh
+
+# run the linter, but exclude any files known to have errors or warnings.
+./node_modules/.bin/eslint --max-warnings 0 \
+    --ignore-path .eslintignore.errorfiles \
+    src test

From 00df956ca24b39134641573ea9456bbdd7d63565 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 8 Jun 2017 14:08:51 +0100
Subject: [PATCH 09/44] Add remaining translations!

Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
---
 src/components/views/rooms/AuxPanel.js        | 15 +++--
 src/components/views/rooms/EntityTile.js      |  5 +-
 src/components/views/rooms/EventTile.js       | 10 ++--
 .../views/rooms/MemberDeviceInfo.js           |  6 +-
 src/components/views/rooms/MemberInfo.js      |  8 +--
 src/components/views/rooms/MemberTile.js      |  3 +-
 src/components/views/rooms/MessageComposer.js |  6 +-
 .../views/rooms/ReadReceiptMarker.js          |  7 ++-
 src/components/views/rooms/RoomHeader.js      |  4 +-
 src/components/views/rooms/RoomNameEditor.js  |  5 +-
 src/components/views/rooms/RoomPreviewBar.js  | 58 +++++++++++++------
 src/components/views/rooms/RoomSettings.js    | 14 +++--
 .../views/rooms/SimpleRoomHeader.js           |  3 +-
 .../views/rooms/TopUnreadMessagesBar.js       |  2 +-
 src/i18n/strings/en_EN.json                   | 53 ++++++++++++-----
 15 files changed, 130 insertions(+), 69 deletions(-)

diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index f53512e684..7e7a670aea 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -19,7 +19,7 @@ import MatrixClientPeg from "../../../MatrixClientPeg";
 import sdk from '../../../index';
 import dis from "../../../dispatcher";
 import ObjectUtils from '../../../ObjectUtils';
-import  { _t } from '../../../languageHandler';
+import  { _t, _tJsx} from '../../../languageHandler';
 
 
 module.exports = React.createClass({
@@ -78,7 +78,7 @@ module.exports = React.createClass({
             fileDropTarget = (
                 <div className="mx_RoomView_fileDropTarget">
                     <div className="mx_RoomView_fileDropTargetLabel"
-                      title="Drop File Here">
+                      title={_t("Drop File Here")}>
                         <TintableSvg src="img/upload-big.svg" width="45" height="59"/>
                         <br/>
                         {_t("Drop file here to upload")}
@@ -95,9 +95,14 @@ module.exports = React.createClass({
             }
             else {
                 joinText = (<span>
-                    Join as <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}}
-                               href="#">voice</a> or <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video'); }}
-                               href="#">video</a>.
+                    {_tJsx(
+                        "Join as <a>voice</a> or <a>video</a>.",
+                        [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
+                        [
+                            (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}} href="#">{sub}</a>,
+                            (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video');}} href="#">{sub}</a>,
+                        ]
+                    )}
                 </span>);
 
             }
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 71e8fb0be7..015b7b4603 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -21,6 +21,7 @@ var React = require('react');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var sdk = require('../../../index');
 import AccessibleButton from '../elements/AccessibleButton';
+import { _t } from '../../../languageHandler';
 
 
 var PRESENCE_CLASS = {
@@ -140,10 +141,10 @@ module.exports = React.createClass({
         var power;
         var powerLevel = this.props.powerLevel;
         if (powerLevel >= 50 && powerLevel < 99) {
-            power = <img src="img/mod.svg" className="mx_EntityTile_power" width="16" height="17" alt="Mod"/>;
+            power = <img src="img/mod.svg" className="mx_EntityTile_power" width="16" height="17" alt={_t("Moderator")}/>;
         }
         if (powerLevel >= 99) {
-            power = <img src="img/admin.svg" className="mx_EntityTile_power" width="16" height="17" alt="Admin"/>;
+            power = <img src="img/admin.svg" className="mx_EntityTile_power" width="16" height="17" alt={_t("Admin")}/>;
         }
 
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index e527f53170..80f062aef7 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -487,22 +487,22 @@ module.exports = WithMatrixClient(React.createClass({
         let e2e;
         // cosmetic padlocks:
         if ((e2eEnabled && this.props.eventSendStatus) || this.props.mxEvent.getType() === 'm.room.encryption') {
-            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12" />;
+            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" alt={_t("Encrypted by a verified device")} src="img/e2e-verified.svg" width="10" height="12" />;
         }
         // real padlocks
         else if (this.props.mxEvent.isEncrypted() || (e2eEnabled && this.props.eventSendStatus)) {
             if (this.props.mxEvent.getContent().msgtype === 'm.bad.encrypted') {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Undecryptable" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt={_t("Undecryptable")} src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
             }
             else if (this.state.verified == true || (e2eEnabled && this.props.eventSendStatus)) {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12"/>;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt={_t("Encrypted by a verified device")} src="img/e2e-verified.svg" width="10" height="12"/>;
             }
             else {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Encrypted by unverified device" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt={_t("Encrypted by an unverified device")} src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
             }
         }
         else if (e2eEnabled) {
-            e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Unencrypted message" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
+            e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt={_t("Unencrypted message")} src="img/e2e-unencrypted.svg" width="12" height="12"/>;
         }
         const timestamp = this.props.mxEvent.getTs() ?
             <MessageTimestamp showTwelveHour={this.props.isTwelveHour} ts={this.props.mxEvent.getTs()} /> : null;
diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
index af44bf7f99..33b919835c 100644
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@@ -26,19 +26,19 @@ export default class MemberDeviceInfo extends React.Component {
         if (this.props.device.isBlocked()) {
             indicator = (
                     <div className="mx_MemberDeviceInfo_blacklisted">
-                    <img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt="Blacklisted"/>
+                    <img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt={_t("Blacklisted")}/>
                     </div>
             );
         } else if (this.props.device.isVerified()) {
             indicator = (
                     <div className="mx_MemberDeviceInfo_verified">
-                    <img src="img/e2e-verified.svg" width="10" height="12" alt="Verified"/>
+                    <img src="img/e2e-verified.svg" width="10" height="12" alt={_t("Verified")}/>
                     </div>
             );
         } else {
             indicator = (
                     <div className="mx_MemberDeviceInfo_unverified">
-                    <img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt="Unverified"/>
+                    <img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt={_t("Unverified")}/>
                     </div>
             );
         }
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 86d39f91ec..0c66dd4f11 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -378,7 +378,7 @@ module.exports = WithMatrixClient(React.createClass({
                     var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                     Modal.createDialog(NeedToRegisterDialog, {
                         title: _t("Please Register"),
-                        description: _t("This action cannot be performed by a guest user. Please register to be able to do this") + ".",
+                        description: _t("This action cannot be performed by a guest user. Please register to be able to do this."),
                     });
                 } else {
                     console.error("Toggle moderator error:" + err);
@@ -436,7 +436,7 @@ 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"),
@@ -705,7 +705,7 @@ module.exports = WithMatrixClient(React.createClass({
         if (kickButton || banButton || muteButton || giveModButton) {
             adminTools =
                 <div>
-                    <h3>Admin tools</h3>
+                    <h3>{_t("Admin tools")}</h3>
 
                     <div className="mx_MemberInfo_buttons">
                         {muteButton}
@@ -743,7 +743,7 @@ module.exports = WithMatrixClient(React.createClass({
                         { this.props.member.userId }
                     </div>
                     <div className="mx_MemberInfo_profileField">
-                        { _t("Level") }: <b><PowerSelector controlled={true} value={ parseInt(this.props.member.powerLevel) } disabled={ !this.state.can.modifyLevel } onChange={ this.onPowerChange }/></b>
+                        { _t("Level:") } <b><PowerSelector controlled={true} value={ parseInt(this.props.member.powerLevel) } disabled={ !this.state.can.modifyLevel } onChange={ this.onPowerChange }/></b>
                     </div>
                     <div className="mx_MemberInfo_profileField">
                         <PresenceLabel activeAgo={ presenceLastActiveAgo }
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 5becef9ede..d7e6b4a1ec 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -22,6 +22,7 @@ var MatrixClientPeg = require('../../../MatrixClientPeg');
 var sdk = require('../../../index');
 var dis = require('../../../dispatcher');
 var Modal = require("../../../Modal");
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'MemberTile',
@@ -63,7 +64,7 @@ module.exports = React.createClass({
     },
 
     getPowerLabel: function() {
-        return this.props.member.userId + " (power " + this.props.member.powerLevel + ")";
+        return _t("%(userName)s (power %(powerLevelNumber)s)", {userName: this.props.member.userId, powerLevelNumber: this.props.member.powerLevel});
     },
 
     render: function() {
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4b812263ce..8ac2f9db7a 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -94,7 +94,7 @@ export default class MessageComposer extends React.Component {
             let NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
             Modal.createDialog(NeedToRegisterDialog, {
                 title: _t('Please Register'),
-                description: _t('Guest users can\'t upload files. Please register to upload') + '.',
+                description: _t('Guest users can\'t upload files. Please register to upload.'),
             });
             return;
         }
@@ -113,7 +113,7 @@ export default class MessageComposer extends React.Component {
         let fileList = [];
         for (let i=0; i<files.length; i++) {
             fileList.push(<li key={i}>
-                <TintableSvg key={i} src="img/files.svg" width="16" height="16" /> {files[i].name || 'Attachment'}
+                <TintableSvg key={i} src="img/files.svg" width="16" height="16" /> {files[i].name || _t('Attachment')}
             </li>);
         }
 
@@ -291,7 +291,7 @@ export default class MessageComposer extends React.Component {
 
             const formattingButton = (
                 <img className="mx_MessageComposer_formatting"
-                     title="Show Text Formatting Toolbar"
+                     title={_t("Show Text Formatting Toolbar")}
                      src="img/button-text-formatting.svg"
                      onClick={this.onToggleFormattingClicked}
                      style={{visibility: this.state.showFormatting ||
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 0911d50c3e..7565b0741d 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -23,6 +23,7 @@ var sdk = require('../../../index');
 
 var Velociraptor = require('../../../Velociraptor');
 require('../../../VelocityBounce');
+import { _t } from '../../../languageHandler';
 
 import DateUtils from '../../../DateUtils';
 
@@ -169,8 +170,10 @@ module.exports = React.createClass({
 
         let title;
         if (this.props.timestamp) {
-            title = "Seen by " + this.props.member.userId + " at " + 
-                    DateUtils.formatDate(new Date(this.props.timestamp));
+            title = _t(
+                "Seen by %(userName)s at %(dateTime)s",
+                {userName: this.props.member.userId, dateTime: DateUtils.formatDate(new Date(this.props.timestamp))}
+            );
         }
 
         return (
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index df5df8b4f8..75ab13a51c 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -213,7 +213,7 @@ module.exports = React.createClass({
             // don't display the search count until the search completes and
             // gives us a valid (possibly zero) searchCount.
             if (this.props.searchInfo && this.props.searchInfo.searchCount !== undefined && this.props.searchInfo.searchCount !== null) {
-                searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;{ _t("(~%(searchCount)s results)", { searchCount: this.props.searchInfo.searchCount }) }</div>;
+                searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;{ _t("(~%(count)s results)", { count: this.props.searchInfo.searchCount }) }</div>;
             }
 
             // XXX: this is a bit inefficient - we could just compare room.name for 'Empty room'...
@@ -288,7 +288,7 @@ module.exports = React.createClass({
         var settings_button;
         if (this.props.onSettingsClick) {
             settings_button =
-                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onSettingsClick} title="Settings">
+                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onSettingsClick} title={_t("Settings")}>
                     <TintableSvg src="img/icons-settings-room.svg" width="16" height="16"/>
                 </AccessibleButton>;
         }
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index 773b713584..0fc2d1669c 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -19,6 +19,7 @@ limitations under the License.
 var React = require('react');
 var sdk = require('../../../index');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'RoomNameEditor',
@@ -35,8 +36,8 @@ module.exports = React.createClass({
 
         this._initialName = name ? name.getContent().name : '';
 
-        this._placeholderName = "Unnamed Room";
-        if (defaultName && defaultName !== 'Empty room') {
+        this._placeholderName = _t("Unnamed Room");
+        if (defaultName && defaultName !== 'Empty room') { // default name from JS SDK, needs no translation as we don't ever show it.
             this._placeholderName += " (" + defaultName + ")";
         }
     },
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index b20b2ef58e..8aa1f353a6 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -21,7 +21,7 @@ var React = require('react');
 var sdk = require('../../../index');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 
-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'RoomPreviewBar',
@@ -84,7 +84,7 @@ module.exports = React.createClass({
     },
 
     _roomNameElement: function(fallback) {
-        fallback = fallback || 'a room';
+        fallback = fallback || _t('a room');
         const name = this.props.room ? this.props.room.name : (this.props.room_alias || "");
         return name ? name : fallback;
     },
@@ -114,8 +114,7 @@ module.exports = React.createClass({
             if (this.props.invitedEmail) {
                 if (this.state.threePidFetchError) {
                     emailMatchBlock = <div className="error">
-                        Unable to ascertain that the address this invite was
-                        sent to matches one associated with your account.
+                        {_t("Unable to ascertain that the address this invite was sent to matches one associated with your account.")}
                     </div>;
                 } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {
                     emailMatchBlock =
@@ -124,28 +123,35 @@ module.exports = React.createClass({
                                 <img src="img/warning.svg" width="24" height="23" title= "/!\\" alt="/!\\" />
                             </div>
                             <div className="mx_RoomPreviewBar_warningText">
-                                This invitation was sent to <b><span className="email">{this.props.invitedEmail}</span></b>, which is not associated with this account.<br/>
-                                You may wish to login with a different account, or add this email to this account.
+                                {_t("This invitation was sent to an email address which is not associated with this account:")}
+                                <b><span className="email">{this.props.invitedEmail}</span></b>
+                                <br/>
+                                {_t("You may wish to login with a different account, or add this email to this account.")}
                             </div>
                         </div>;
                 }
             }
-            // TODO: find a way to respect HTML in counterpart!
             joinBlock = (
                 <div>
                     <div className="mx_RoomPreviewBar_invite_text">
                         { _t('You have been invited to join this room by %(inviterName)s', {inviterName: this.props.inviterName}) }
                     </div>
                     <div className="mx_RoomPreviewBar_join_text">
-                        { _t('Would you like to') } <a onClick={ this.props.onJoinClick }>{ _t('accept') }</a> { _t('or') } <a onClick={ this.props.onRejectClick }>{ _t('decline') }</a> { _t('this invitation?') }
+                        { _tJsx(
+                            'Would you like to <a>accept</a> or <a>decline</a> this invitation?',
+                            [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
+                            [
+                                (sub) => <a onClick={ this.props.onJoinClick }>{sub}</a>,
+                                (sub) => <a onClick={ this.props.onRejectClick }>{sub}</a>
+                            ]
+                        )}
                     </div>
                     {emailMatchBlock}
                 </div>
             );
 
         } else if (kicked || banned) {
-            const verb = kicked ? 'kicked' : 'banned';
-            const roomName = this._roomNameElement('this room');
+            const roomName = this._roomNameElement(_t('This room'));
             const kickerMember = this.props.room.currentState.getMember(
                 myMember.events.member.getSender()
             );
@@ -153,29 +159,39 @@ module.exports = React.createClass({
                 kickerMember.name : myMember.events.member.getSender();
             let reason;
             if (myMember.events.member.getContent().reason) {
-                reason = <div>Reason: {myMember.events.member.getContent().reason}</div>
+                reason = <div>{_t("Reason: %(reasonText)s", {reasonText: myMember.events.member.getContent().reason})}</div>
             }
             let rejoinBlock;
             if (!banned) {
-                rejoinBlock = <div><a onClick={ this.props.onJoinClick }><b>Rejoin</b></a></div>;
+                rejoinBlock = <div><a onClick={ this.props.onJoinClick }><b>{_t("Rejoin")}</b></a></div>;
             }
+
+            let actionText;
+            if (kicked) {
+                actionText = _t("You have been kicked from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName});
+            }
+            else if (banned) {
+                actionText = _t("You have been banned from %(roomName)s by %(userName)s.", {roomName: roomName, userName: kickerName});
+            } // no other options possible due to the kicked || banned check above.
+
             joinBlock = (
                 <div>
                     <div className="mx_RoomPreviewBar_join_text">
-                        You have been {verb} from {roomName} by {kickerName}.<br />
+                        {actionText}
+                        <br />
                         {reason}
                         {rejoinBlock}
-                        <a onClick={ this.props.onForgetClick }><b>Forget</b></a>
+                        <a onClick={ this.props.onForgetClick }><b>{_t("Forget room")}</b></a>
                     </div>
                 </div>
             );
         } else if (this.props.error) {
-            var name = this.props.roomAlias || "This room";
+            var name = this.props.roomAlias || _t("This room");
             var error;
             if (this.props.error.errcode == 'M_NOT_FOUND') {
-                error = name + " does not exist";
+                error = _t("%(roomName)s does not exist.", {roomName: name});
             } else {
-                error = name + " is not accessible at this time";
+                error = _t("%(roomName)s is not accessible at this time.", {roomName: name});
             }
             joinBlock = (
                 <div>
@@ -189,8 +205,12 @@ module.exports = React.createClass({
             joinBlock = (
                 <div>
                     <div className="mx_RoomPreviewBar_join_text">
-                        { _t('You are trying to access %(roomName)s', {roomName: name}) }.<br/>
-                        <a onClick={ this.props.onJoinClick }><b>{ _t('Click here') }</b></a> { _t('to join the discussion') }!
+                        { _t('You are trying to access %(roomName)s.', {roomName: name}) }
+                        <br/>
+                        { _tJsx("<a>Click here</a> to join the discussion!",
+                            /<a>(.*?)<\/a>/,
+                            (sub) => <a onClick={ this.props.onJoinClick }><b>{sub}</b></a>
+                        )}
                     </div>
                 </div>
             );
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 205f614ba2..f31fc68afc 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import q from 'q';
 import React from 'react';
-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import SdkConfig from '../../../SdkConfig';
 import sdk from '../../../index';
@@ -46,7 +46,7 @@ const BannedUser = React.createClass({
         const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
         Modal.createDialog(ConfirmUserActionDialog, {
             member: this.props.member,
-            action: 'Unban',
+            action: _t('Unban'),
             danger: false,
             onFinished: (proceed) => {
                 if (!proceed) return;
@@ -597,7 +597,7 @@ module.exports = React.createClass({
                       ? <img className="mx_RoomSettings_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" />
                       : <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" />
                     }
-                    { isEncrypted ? "Encryption is enabled in this room" : "Encryption is not enabled in this room" }.
+                    { isEncrypted ? _t("Encryption is enabled in this room") : _t("Encryption is not enabled in this room") }.
                     </label>
                     { settings }
                 </div>
@@ -653,7 +653,7 @@ module.exports = React.createClass({
                         {Object.keys(user_levels).map(function(user, i) {
                             return (
                                 <li className="mx_RoomSettings_userLevel" key={user}>
-                                    { user } { _t('is a') } <PowerSelector value={ user_levels[user] } disabled={true}/>
+                                    { _t("%(user)s is a", {user: user}) } <PowerSelector value={ user_levels[user] } disabled={true}/>
                                 </li>
                             );
                         })}
@@ -754,7 +754,11 @@ module.exports = React.createClass({
         if (this.state.join_rule === "public" && aliasCount == 0) {
             addressWarning =
                 <div className="mx_RoomSettings_warning">
-                		{ _t('To link to a room it must have') } <a href="#addresses"> { _t('an address') }</a>.
+                		{ _tJsx(
+                            'To link to a room it must have <a>an address</a>.',
+                            /<a>(.*?)<\/a>/,
+                            (sub) => <a href="#addresses">{sub}</a>
+                        )}
                 </div>;
         }
 
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index a6f342af86..44ec7c29aa 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -20,6 +20,7 @@ import React from 'react';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
 import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 
 // cancel button which is shared between room header and simple room header
 export function CancelButton(props) {
@@ -28,7 +29,7 @@ export function CancelButton(props) {
     return (
         <AccessibleButton className='mx_RoomHeader_cancelButton' onClick={onClick}>
             <img src="img/cancel.svg" className='mx_filterFlipColor'
-                width="18" height="18" alt="Cancel"/>
+                width="18" height="18" alt={_t("Cancel")}/>
         </AccessibleButton>
     );
 }
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index 45aba66633..aa1f86483e 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -41,7 +41,7 @@ module.exports = React.createClass({
                 </div>
                 <img className="mx_TopUnreadMessagesBar_close mx_filterFlipColor"
                     src="img/cancel.svg" width="18" height="18"
-                    alt="Close" title="Close"
+                    alt={_t("Close")} title={_t("Close")}
                     onClick={this.props.onCloseClick} />
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index de1adc539d..6026298cd6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -120,8 +120,8 @@
   "zh-tw":"Chinese (Taiwan)",
   "zu":"Zulu",
   "A registered account is required for this action": "A registered account is required for this action",
+  "a room": "a room",
   "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",
-  "accept": "accept",
   "Accept": "Accept",
   "%(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.",
@@ -133,6 +133,7 @@
   "Add email address": "Add email address",
   "Add phone number": "Add phone number",
   "Admin": "Admin",
+  "Admin tools": "Admin tools",
   "And %(count)s more...": "And %(count)s more...",
   "VoIP": "VoIP",
   "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
@@ -152,7 +153,6 @@
   "all room members": "all room members",
   "all room members, from the point they are invited": "all room members, from the point they are invited",
   "all room members, from the point they joined": "all room members, from the point they joined",
-  "an address": "an address",
   "and": "and",
   "%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
   "%(items)s and one other": "%(items)s and one other",
@@ -201,13 +201,14 @@
   "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
   "Clear Cache and Reload": "Clear Cache and Reload",
   "Clear Cache": "Clear Cache",
-  "Click here": "Click here",
+  "<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!",
   "Click here to fix": "Click here to fix",
   "Click to mute audio": "Click to mute audio",
   "Click to mute video": "Click to mute video",
   "click to reveal": "click to reveal",
   "Click to unmute video": "Click to unmute video",
   "Click to unmute audio": "Click to unmute audio",
+  "Close": "Close",
   "Command error": "Command error",
   "Commands": "Commands",
   "Conference call failed.": "Conference call failed.",
@@ -234,7 +235,6 @@
   "Deactivate Account": "Deactivate Account",
   "Deactivate my account": "Deactivate my account",
   "Decline": "Decline",
-  "decline": "decline",
   "Decrypt %(text)s": "Decrypt %(text)s",
   "Decryption error": "Decryption error",
   "(default: %(userName)s)": "(default: %(userName)s)",
@@ -260,6 +260,7 @@
   "Displays action": "Displays action",
   "Don't send typing notifications": "Don't send typing notifications",
   "Download %(text)s": "Download %(text)s",
+  "Drop File Here": "Drop File Here",
   "Drop here %(toAction)s": "Drop here %(toAction)s",
   "Drop here to tag %(section)s": "Drop here to tag %(section)s",
   "Ed25519 fingerprint": "Ed25519 fingerprint",
@@ -271,8 +272,12 @@
   "Enable encryption": "Enable encryption",
   "Enable Notifications": "Enable Notifications",
   "enabled": "enabled",
+  "Encrypted by a verified device": "Encrypted by a verified device",
+  "Encrypted by an unverified device": "Encrypted by an unverified device",
   "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",
+  "Encryption is enabled in this room": "Encryption is enabled in this room",
+  "Encryption is not enabled in this room": "Encryption is not enabled in this 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",
@@ -354,11 +359,11 @@
   "Invited": "Invited",
   "Invites": "Invites",
   "Invites user with given id to current room": "Invites user with given id to current room",
-  "is a": "is a",
   "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
   "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
   "%(displayName)s is typing": "%(displayName)s is typing",
   "Sign in with": "Sign in with",
+  "Join as <a>voice</a> or <a>video</a>.": "Join as <a>voice</a> or <a>video</a>.",
   "Join Room": "Join Room",
   "joined and left": "joined and left",
   "joined": "joined",
@@ -374,7 +379,7 @@
   "left and rejoined": "left and rejoined",
   "left": "left",
   "%(targetName)s left the room.": "%(targetName)s left the room.",
-  "Level": "Level",
+  "Level:": "Level:",
   "List this room in %(domain)s's room directory?": "List this room in %(domain)s's room directory?",
   "Local addresses for this room:": "Local addresses for this room:",
   "Logged in as:": "Logged in as:",
@@ -441,6 +446,7 @@
   "Profile": "Profile",
   "Public Chat": "Public Chat",
   "Reason": "Reason",
+  "Reason: %(reasonText)s": "Reason: %(reasonText)s",
   "Revoke Moderator": "Revoke Moderator",
   "Refer a friend to Riot:": "Refer a friend to Riot:",
   "Register": "Register",
@@ -448,6 +454,7 @@
   "rejected": "rejected",
   "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
   "Reject invitation": "Reject invitation",
+  "Rejoin": "Rejoin",
   "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).",
@@ -468,6 +475,8 @@
   "Room Colour": "Room Colour",
   "Room contains unknown devices": "Room contains unknown devices",
   "Room name (optional)": "Room name (optional)",
+  "%(roomName)s does not exist.": "%(roomName)s does not exist.",
+  "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
   "Rooms": "Rooms",
   "Save": "Save",
   "Saving room color settings is only available to registered users": "Saving room color settings is only available to registered users",
@@ -477,6 +486,7 @@
   "Search failed": "Search failed",
   "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
   "Searching known users": "Searching known users",
+  "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
   "Send a message (unencrypted)": "Send a message (unencrypted)",
   "Send an encrypted message": "Send an encrypted message",
   "Send anyway": "Send anyway",
@@ -500,6 +510,7 @@
   "Setting a user name will create a fresh account": "Setting a user name will create a fresh account",
   "Settings": "Settings",
   "Show panel": "Show panel",
+  "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
   "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
   "Signed Out": "Signed Out",
   "Sign in": "Sign in",
@@ -522,7 +533,7 @@
   "The main address for this room is": "The main address for this room is",
   "The phone number entered looks invalid": "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.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
-  "This action cannot be performed by a guest user. Please register to be able to do this": "This action cannot be performed by a guest user. Please register to be able to do this",
+  "This action cannot be performed by a guest user. Please register to be able to do this.": "This action cannot be performed by a guest user. Please register to be able to do this.",
   "This email address is already in use": "This email address is already in use",
   "This email address was not found": "This email address was not found",
   "%(actionVerb)s this person?": "%(actionVerb)s this person?",
@@ -531,6 +542,7 @@
   "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
   "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 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 invitation was sent to an email address which is not associated with this account:",
   "There was a problem logging in.": "There was a problem logging in.",
   "This room has no local addresses": "This room has no local addresses",
   "This room is not recognised.": "This room is not recognised.",
@@ -538,9 +550,9 @@
   "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
   "The visibility of existing history will be unchanged": "The visibility of existing history will be unchanged",
   "This doesn't appear to be a valid email address": "This doesn't appear to be a valid email address",
-  "this invitation?": "this invitation?",
   "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 phone number is already in use",
+  "This room": "This room",
   "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
   "This room's internal ID is": "This room's internal ID is",
   "times": "times",
@@ -550,9 +562,8 @@
   "to demote": "to demote",
   "to favourite": "to favourite",
   "To invite users into the room": "To invite users into the room",
-  "to join the discussion": "to join the discussion",
   "To kick users": "To kick users",
-  "To link to a room it must have": "To link to a room it must have",
+  "To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
   "to make a room or": "to make a room or",
   "To remove other users' messages": "To remove other users' messages",
   "To reset your password, enter the email address linked to your account": "To reset your password, enter the email address linked to your account",
@@ -574,11 +585,14 @@
   "Unable to verify email address.": "Unable to verify email address.",
   "Unban": "Unban",
   "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
+  "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.",
   "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",
+  "Undecryptable": "Undecryptable",
   "Unencrypted room": "Unencrypted room",
   "unencrypted": "unencrypted",
+  "Unencrypted message": "Unencrypted message",
   "unknown caller": "unknown caller",
   "Unknown command": "Unknown command",
   "unknown device": "unknown device",
@@ -587,8 +601,10 @@
   "Unknown (user, device) pair:": "Unknown (user, device) pair:",
   "unknown": "unknown",
   "Unmute": "Unmute",
+  "Unnamed Room": "Unnamed Room",
   "Unrecognised command:": "Unrecognised command:",
   "Unrecognised room alias:": "Unrecognised room alias:",
+  "Unverified": "Unverified",
   "Uploading %(filename)s and %(count)s others": {
     "zero": "Uploading %(filename)s",
     "one": "Uploading %(filename)s and %(count)s other",
@@ -605,12 +621,15 @@
   "Use with caution": "Use with caution",
   "User ID": "User ID",
   "User Interface": "User Interface",
+  "%(user)s is a": "%(user)s is a",
   "User name": "User name",
+  "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
   "Users": "Users",
   "User": "User",
   "Verification Pending": "Verification Pending",
   "Verification": "Verification",
   "verified": "verified",
+  "Verified": "Verified",
   "Verified key": "Verified key",
   "Video call": "Video call",
   "Voice call": "Voice call",
@@ -626,20 +645,23 @@
   "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.",
-  "Would you like to": "Would you like to",
+  "Would you like to <a>accept</a> or <a>decline</a> this invitation?": "Would you like to <a>accept</a> or <a>decline</a> this invitation?".
   "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
   "You are already in a call.": "You are already in a call.",
   "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",
-  "You are trying to access %(roomName)s": "You are trying to access %(roomName)s",
+  "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.",
   "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
   "You do not have permission to post to this room": "You do not have permission to post to this room",
+  "You have been banned from %(roomName)s by %(userName)s.": "You have been banned from %(roomName)s by %(userName)s.",
   "You have been invited to join this room by %(inviterName)s": "You have been invited to join this room by %(inviterName)s",
+  "You have been kicked from %(roomName)s by %(userName)s.": "You have been kicked from %(roomName)s by %(userName)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.": "You have <a>disabled</a> URL previews by default.",
   "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
   "You have entered an invalid contact. Try using their Matrix ID or email address.": "You have entered an invalid contact. Try using their Matrix ID or email address.",
   "You have no visible notifications": "You have no visible notifications",
+  "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.",
   "you must be a": "you must be a",
   "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
   "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
@@ -652,7 +674,7 @@
   "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
   "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
   "You should not yet trust it to secure data": "You should not yet trust it to secure data",
-  "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",
+  "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.",
   "Your home server does not support device management.": "Your home server does not support device management.",
   "Sun": "Sun",
   "Mon": "Mon",
@@ -700,7 +722,10 @@
   "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
   "Auto-complete": "Auto-complete",
   "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
-  "(~%(searchCount)s results)": "(~%(searchCount)s results)",
+  "(~%(count)s results)": {
+    "one": "(~%(count)s result)",
+    "other": "(~%(count)s results)"
+  },
   "Cancel": "Cancel",
   "or": "or",
   "Active call": "Active call",

From 8479a8f5ffc5e3aeaa2547fe007ebcaab3916437 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 8 Jun 2017 14:11:34 +0100
Subject: [PATCH 10/44] Update .eslintignore.errorfiles

---
 .eslintignore.errorfiles | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index f1b63d7367..dedde7e07d 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -2,6 +2,8 @@
 
 src/AddThreepid.js
 src/async-components/views/dialogs/EncryptedEventDialog.js
+src/async-components/views/dialogs/ExportE2eKeysDialog.js
+src/async-components/views/dialogs/ImportE2eKeysDialog.js
 src/autocomplete/AutocompleteProvider.js
 src/autocomplete/Autocompleter.js
 src/autocomplete/Components.js
@@ -165,6 +167,7 @@ src/UserActivity.js
 src/utils/DecryptFile.js
 src/utils/DMRoomMap.js
 src/utils/FormattingUtils.js
+src/utils/MegolmExportEncryption.js
 src/utils/MultiInviter.js
 src/utils/Receipt.js
 src/Velociraptor.js
@@ -185,3 +188,4 @@ test/mock-clock.js
 test/skinned-sdk.js
 test/stores/RoomViewStore-test.js
 test/test-utils.js
+test/utils/MegolmExportEncryption-test.js

From 6d1fa775a04c24b37bf81524f1eb03516176e62e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 8 Jun 2017 14:14:45 +0100
Subject: [PATCH 11/44] Formatting

---
 src/components/structures/login/Login.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 840f0874a7..be440febdc 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -219,8 +219,8 @@ module.exports = React.createClass({
         if (err.cors === 'rejected') {
             if (window.location.protocol === 'https:' &&
                 (this.state.enteredHomeserverUrl.startsWith("http:") ||
-                 !this.state.enteredHomeserverUrl.startsWith("http")))
-            {
+                 !this.state.enteredHomeserverUrl.startsWith("http"))
+            ) {
                 errorText = <span>
                     { _tJsx("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>.",
@@ -228,8 +228,7 @@ module.exports = React.createClass({
                       (sub) => { return <a href="https://www.google.com/search?&q=enable%20unsafe%20scripts">{ sub }</a>; }
                     )}
                 </span>;
-            }
-            else {
+            } else {
                 errorText = <span>
                     { _tJsx("Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.",
                       /<a>(.*?)<\/a>/,

From d3cf78ff5abd3297cb1f51a3017d5236db114af5 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 14:17:49 +0100
Subject: [PATCH 12/44] Control currently viewied event via RoomViewStore

Fix for https://github.com/vector-im/riot-web/issues/4224

Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously).

This required a few changes:
 - The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`.
 - The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.
---
 src/components/structures/LoggedInView.js |  2 -
 src/components/structures/MatrixChat.js   | 19 +----
 src/components/structures/RoomView.js     | 93 +++++++++--------------
 src/components/views/rooms/EventTile.js   |  1 +
 src/stores/RoomViewStore.js               | 72 +++++++++++++++++-
 5 files changed, 109 insertions(+), 78 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index a201a0bea7..8fa35e84d7 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -223,10 +223,8 @@ export default React.createClass({
                         ref='roomView'
                         autoJoin={this.props.autoJoin}
                         onRegistered={this.props.onRegistered}
-                        eventId={this.props.initialEventId}
                         thirdPartyInvite={this.props.thirdPartyInvite}
                         oobData={this.props.roomOobData}
-                        highlightedEventId={this.props.highlightedEventId}
                         eventPixelOffset={this.props.initialEventPixelOffset}
                         key={this.props.currentRoomId || 'roomview'}
                         opacity={this.props.middleOpacity}
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index efb2b38d6e..b65fa0be1c 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -618,9 +618,6 @@ module.exports = React.createClass({
         this.focusComposer = true;
 
         const newState = {
-            initialEventId: roomInfo.event_id,
-            highlightedEventId: roomInfo.event_id,
-            initialEventPixelOffset: undefined,
             page_type: PageTypes.RoomView,
             thirdPartyInvite: roomInfo.third_party_invite,
             roomOobData: roomInfo.oob_data,
@@ -632,18 +629,6 @@ module.exports = React.createClass({
             newState.currentRoomId = roomInfo.room_id;
         }
 
-        // if we aren't given an explicit event id, look for one in the
-        // scrollStateMap.
-        //
-        // TODO: do this in RoomView rather than here
-        if (!roomInfo.event_id && this.refs.loggedInView) {
-            const scrollState = this.refs.loggedInView.getScrollStateForRoom(roomInfo.room_id);
-            if (scrollState) {
-                newState.initialEventId = scrollState.focussedEvent;
-                newState.initialEventPixelOffset = scrollState.pixelOffset;
-            }
-        }
-
         // Wait for the first sync to complete so that if a room does have an alias,
         // it would have been retrieved.
         let waitFor = q(null);
@@ -669,7 +654,7 @@ module.exports = React.createClass({
                 }
             }
 
-            if (roomInfo.event_id) {
+            if (roomInfo.event_id && roomInfo.highlighted) {
                 presentedId += "/" + roomInfo.event_id;
             }
             this.notifyNewScreen('room/' + presentedId);
@@ -1124,8 +1109,10 @@ module.exports = React.createClass({
             };
 
             const payload = {
+                id: '#mylovelyid',
                 action: 'view_room',
                 event_id: eventId,
+                highlighted: Boolean(eventId),
                 third_party_invite: thirdPartyInvite,
                 oob_data: oobData,
             };
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index df21715d75..a4c589187b 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -83,36 +83,8 @@ module.exports = React.createClass({
         //  *                      invited us tovthe room
         oobData: React.PropTypes.object,
 
-        // id of an event to jump to. If not given, will go to the end of the
-        // live timeline.
-        eventId: React.PropTypes.string,
-
-        // where to position the event given by eventId, in pixels from the
-        // bottom of the viewport. If not given, will try to put the event
-        // 1/3 of the way down the viewport.
-        eventPixelOffset: React.PropTypes.number,
-
-        // ID of an event to highlight. If undefined, no event will be highlighted.
-        // Typically this will either be the same as 'eventId', or undefined.
-        highlightedEventId: React.PropTypes.string,
-
         // is the RightPanel collapsed?
         collapsedRhs: React.PropTypes.bool,
-
-        // a map from room id to scroll state, which will be updated on unmount.
-        //
-        // If there is no special scroll state (ie, we are following the live
-        // timeline), the scroll state is null. Otherwise, it is an object with
-        // the following properties:
-        //
-        //    focussedEvent: the ID of the 'focussed' event. Typically this is
-        //        the last event fully visible in the viewport, though if we
-        //        have done an explicit scroll to an explicit event, it will be
-        //        that event.
-        //
-        //    pixelOffset: the number of pixels the window is scrolled down
-        //        from the focussedEvent.
-        scrollStateMap: React.PropTypes.object,
     },
 
     getInitialState: function() {
@@ -180,13 +152,28 @@ module.exports = React.createClass({
         if (this.unmounted) {
             return;
         }
-        this.setState({
+        const newState = {
             roomId: RoomViewStore.getRoomId(),
             roomAlias: RoomViewStore.getRoomAlias(),
             roomLoading: RoomViewStore.isRoomLoading(),
             roomLoadError: RoomViewStore.getRoomLoadError(),
             joining: RoomViewStore.isJoining(),
-        }, () => {
+            eventId: RoomViewStore.getEventId(),
+            eventPixelOffset: RoomViewStore.getEventPixelOffset(),
+            isEventHighlighted: RoomViewStore.isEventHighlighted(),
+        };
+
+        if (this.state.eventId !== newState.eventId) {
+            newState.searchResults = null;
+        }
+
+        // Store the scroll state for the previous room so that we can return to this
+        // position when viewing this room in future.
+        if (this.state.roomId !== newState.roomId) {
+            this._updateScrollMap(this.state.roomId);
+        }
+
+        this.setState(newState, () => {
             this._onHaveRoom();
             this.onRoom(MatrixClientPeg.get().getRoom(this.state.roomId));
         });
@@ -287,13 +274,6 @@ module.exports = React.createClass({
         }
     },
 
-    componentWillReceiveProps: function(newProps) {
-        if (newProps.eventId != this.props.eventId) {
-            // when we change focussed event id, hide the search results.
-            this.setState({searchResults: null});
-        }
-    },
-
     shouldComponentUpdate: function(nextProps, nextState) {
         return (!ObjectUtils.shallowEqual(this.props, nextProps) ||
                 !ObjectUtils.shallowEqual(this.state, nextState));
@@ -319,7 +299,7 @@ module.exports = React.createClass({
         this.unmounted = true;
 
         // update the scroll map before we get unmounted
-        this._updateScrollMap();
+        this._updateScrollMap(this.state.roomId);
 
         if (this.refs.roomView) {
             // disconnect the D&D event listeners from the room view. This
@@ -598,6 +578,14 @@ module.exports = React.createClass({
         });
     },
 
+    _updateScrollMap(roomId) {
+        dis.dispatch({
+            action: 'update_scroll_state',
+            room_id: roomId,
+            scroll_state: this._getScrollState(),
+        });
+    },
+
     onRoom: function(room) {
         if (!room || room.roomId !== this.state.roomId) {
             return;
@@ -1240,21 +1228,6 @@ module.exports = React.createClass({
         }
     },
 
-    // update scrollStateMap on unmount
-    _updateScrollMap: function() {
-        if (!this.state.room) {
-            // we were instantiated on a room alias and haven't yet joined the room.
-            return;
-        }
-        if (!this.props.scrollStateMap) return;
-
-        var roomId = this.state.room.roomId;
-
-        var state = this._getScrollState();
-        this.props.scrollStateMap[roomId] = state;
-    },
-
-
     // get the current scroll position of the room, so that it can be
     // restored when we switch back to it.
     //
@@ -1677,6 +1650,14 @@ module.exports = React.createClass({
             hideMessagePanel = true;
         }
 
+        const shouldHighlight = this.state.isEventHighlighted;
+        let highlightedEventId = null;
+        if (this.state.forwardingEvent) {
+            highlightedEventId = this.state.forwardingEvent.getId();
+        } else if (shouldHighlight) {
+            highlightedEventId = this.state.eventId;
+        }
+
         // console.log("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
         var messagePanel = (
             <TimelinePanel ref={this._gatherTimelinePanelRef}
@@ -1684,9 +1665,9 @@ module.exports = React.createClass({
                 manageReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
                 manageReadMarkers={true}
                 hidden={hideMessagePanel}
-                highlightedEventId={this.state.forwardingEvent ? this.state.forwardingEvent.getId() : this.props.highlightedEventId}
-                eventId={this.props.eventId}
-                eventPixelOffset={this.props.eventPixelOffset}
+                highlightedEventId={highlightedEventId}
+                eventId={this.state.eventId}
+                eventPixelOffset={this.state.eventPixelOffset}
                 onScroll={ this.onMessageListScroll }
                 onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
                 showUrlPreview = { this.state.showUrlPreview }
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index e527f53170..80f66e600d 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -381,6 +381,7 @@ module.exports = WithMatrixClient(React.createClass({
         dis.dispatch({
             action: 'view_room',
             event_id: this.props.mxEvent.getId(),
+            highlighted: true,
             room_id: this.props.mxEvent.getRoomId(),
         });
     },
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index cc8959af7a..0529824a4b 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -27,12 +27,32 @@ const INITIAL_STATE = {
     joinError: null,
     // The room ID of the room
     roomId: null,
+    // The event being viewed
+    eventId: null,
+    // The offset to display the event at (see scrollStateMap)
+    eventPixelOffset: null,
+    // Whether to highlight the event
+    isEventHighlighted: false,
     // The room alias of the room (or null if not originally specified in view_room)
     roomAlias: null,
     // Whether the current room is loading
     roomLoading: false,
     // Any error that has occurred during loading
     roomLoadError: null,
+    // A map from room id to scroll state.
+    //
+    // If there is no special scroll state (ie, we are following the live
+    // timeline), the scroll state is null. Otherwise, it is an object with
+    // the following properties:
+    //
+    //    focussedEvent: the ID of the 'focussed' event. Typically this is
+    //        the last event fully visible in the viewport, though if we
+    //        have done an explicit scroll to an explicit event, it will be
+    //        that event.
+    //
+    //    pixelOffset: the number of pixels the window is scrolled down
+    //        from the focussedEvent.
+    scrollStateMap: {},
 };
 
 /**
@@ -56,8 +76,11 @@ class RoomViewStore extends Store {
     __onDispatch(payload) {
         switch (payload.action) {
             // view_room:
-            //      - room_alias: '#somealias:matrix.org'
-            //      - room_id:    '!roomid123:matrix.org'
+            //      - room_alias:   '#somealias:matrix.org'
+            //      - room_id:      '!roomid123:matrix.org'
+            //      - event_id:     '$213456782:matrix.org'
+            //      - event_offset: 100
+            //      - highlighted:  true
             case 'view_room':
                 this._viewRoom(payload);
                 break;
@@ -88,20 +111,39 @@ class RoomViewStore extends Store {
             case 'on_logged_out':
                 this.reset();
                 break;
+            case 'update_scroll_state':
+                this._updateScrollState(payload);
+                break;
         }
     }
 
     _viewRoom(payload) {
-        // Always set the room ID if present
         if (payload.room_id) {
+            // If an event ID wasn't specified, default to the one saved for this room
+            // via update_scroll_state. Also assume event_offset should be set.
+            if (!payload.event_id) {
+                const roomScrollState = this._state.scrollStateMap[payload.room_id];
+                if (roomScrollState) {
+                    payload.event_id = roomScrollState.focussedEvent;
+                    payload.event_offset = roomScrollState.pixelOffset;
+                }
+            }
+
             this._setState({
                 roomId: payload.room_id,
+                eventId: payload.event_id,
+                eventPixelOffset: payload.event_offset,
+                isEventHighlighted: payload.highlighted,
                 roomLoading: false,
                 roomLoadError: null,
             });
         } else if (payload.room_alias) {
+            // Resolve the alias and then do a second dispatch with the room ID acquired
             this._setState({
                 roomId: null,
+                eventId: null,
+                eventPixelOffset: null,
+                isEventHighlighted: null,
                 roomAlias: payload.room_alias,
                 roomLoading: true,
                 roomLoadError: null,
@@ -111,6 +153,8 @@ class RoomViewStore extends Store {
                 dis.dispatch({
                     action: 'view_room',
                     room_id: result.room_id,
+                    event_id: payload.event_id,
+                    highlighted: payload.highlighted,
                     room_alias: payload.room_alias,
                 });
             }, (err) => {
@@ -168,6 +212,15 @@ class RoomViewStore extends Store {
         });
     }
 
+    _updateScrollState(payload) {
+        // Clobber existing scroll state for the given room ID
+        const newScrollStateMap = this._state.scrollStateMap;
+        newScrollStateMap[payload.room_id] = payload.scroll_state;
+        this._setState({
+            scrollStateMap: newScrollStateMap,
+        });
+    }
+
     reset() {
         this._state = Object.assign({}, INITIAL_STATE);
     }
@@ -176,6 +229,18 @@ class RoomViewStore extends Store {
         return this._state.roomId;
     }
 
+    getEventId() {
+        return this._state.eventId;
+    }
+
+    getEventPixelOffset() {
+        return this._state.eventPixelOffset;
+    }
+
+    isEventHighlighted() {
+        return this._state.isEventHighlighted;
+    }
+
     getRoomAlias() {
         return this._state.roomAlias;
     }
@@ -195,7 +260,6 @@ class RoomViewStore extends Store {
     getJoinError() {
         return this._state.joinError;
     }
-
 }
 
 let singletonRoomViewStore = null;

From 29e792b6428b87eabc5ddf3c10c058e494e5d4ee Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 8 Jun 2017 14:21:14 +0100
Subject: [PATCH 13/44] make mels emoji capable

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

diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index fdfd46e9e5..f2f6da83e5 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import sdk from '../../../index';
 const MemberAvatar = require('../avatars/MemberAvatar.js');
 import { _t } from '../../../languageHandler';
 
@@ -111,9 +112,13 @@ module.exports = React.createClass({
             return null;
         }
 
+        const EmojiText = sdk.getComponent('elements.EmojiText');
+
         return (
             <span className="mx_TextualEvent mx_MemberEventListSummary_summary">
-                {summaries.join(", ")}
+                <EmojiText>
+                    {summaries.join(", ")}
+                </EmojiText>
             </span>
         );
     },

From d9bc8ebc538d52bb576eb8bc02a2282038a9d87c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 8 Jun 2017 13:12:27 +0100
Subject: [PATCH 14/44] de-lint MegolmExportEncryption + test

---
 .eslintignore.errorfiles                      |  4 --
 .../views/dialogs/ExportE2eKeysDialog.js      |  4 +-
 .../views/dialogs/ImportE2eKeysDialog.js      |  4 +-
 src/utils/MegolmExportEncryption.js           | 56 +++++++++----------
 test/.eslintrc.js                             |  7 ++-
 test/utils/MegolmExportEncryption-test.js     | 45 ++++++++++-----
 6 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index dedde7e07d..f1b63d7367 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -2,8 +2,6 @@
 
 src/AddThreepid.js
 src/async-components/views/dialogs/EncryptedEventDialog.js
-src/async-components/views/dialogs/ExportE2eKeysDialog.js
-src/async-components/views/dialogs/ImportE2eKeysDialog.js
 src/autocomplete/AutocompleteProvider.js
 src/autocomplete/Autocompleter.js
 src/autocomplete/Components.js
@@ -167,7 +165,6 @@ src/UserActivity.js
 src/utils/DecryptFile.js
 src/utils/DMRoomMap.js
 src/utils/FormattingUtils.js
-src/utils/MegolmExportEncryption.js
 src/utils/MultiInviter.js
 src/utils/Receipt.js
 src/Velociraptor.js
@@ -188,4 +185,3 @@ test/mock-clock.js
 test/skinned-sdk.js
 test/stores/RoomViewStore-test.js
 test/test-utils.js
-test/utils/MegolmExportEncryption-test.js
diff --git a/src/async-components/views/dialogs/ExportE2eKeysDialog.js b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
index d6f16a7105..045ea63c34 100644
--- a/src/async-components/views/dialogs/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
@@ -120,7 +120,7 @@ export default React.createClass({
                                 '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.'
+                                'decrypt these messages.',
                             ) }
                         </p>
                         <p>
@@ -130,7 +130,7 @@ export default React.createClass({
                                 '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.'
+                                'same passphrase.',
                             ) }
                         </p>
                         <div className='error'>
diff --git a/src/async-components/views/dialogs/ImportE2eKeysDialog.js b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
index 61d2aeec74..91010d33b9 100644
--- a/src/async-components/views/dialogs/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
@@ -122,13 +122,13 @@ export default React.createClass({
                                 '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.'
+                                'messages that the other client could decrypt.',
                             ) }
                         </p>
                         <p>
                             { _t(
                                 'The export file will be protected with a passphrase. ' +
-                                'You should enter the passphrase here, to decrypt the file.'
+                                'You should enter the passphrase here, to decrypt the file.',
                             ) }
                         </p>
                         <div className='error'>
diff --git a/src/utils/MegolmExportEncryption.js b/src/utils/MegolmExportEncryption.js
index c98c467e1c..de39ea71cc 100644
--- a/src/utils/MegolmExportEncryption.js
+++ b/src/utils/MegolmExportEncryption.js
@@ -32,7 +32,7 @@ const subtleCrypto = window.crypto.subtle || window.crypto.webkitSubtle;
 /**
  * Decrypt a megolm key file
  *
- * @param {ArrayBuffer} file
+ * @param {ArrayBuffer} data file to decrypt
  * @param {String} password
  * @return {Promise<String>} promise for decrypted output
  */
@@ -61,12 +61,12 @@ export function decryptMegolmKeyFile(data, password) {
     const hmac = body.subarray(-32);
 
     return deriveKeys(salt, iterations, password).then((keys) => {
-        const [aes_key, hmac_key] = keys;
+        const [aesKey, hmacKey] = keys;
 
         const toVerify = body.subarray(0, -32);
         return subtleCrypto.verify(
             {name: 'HMAC'},
-            hmac_key,
+            hmacKey,
             hmac,
             toVerify,
         ).then((isValid) => {
@@ -80,7 +80,7 @@ export function decryptMegolmKeyFile(data, password) {
                     counter: iv,
                     length: 64,
                 },
-                aes_key,
+                aesKey,
                 ciphertext,
             );
         });
@@ -102,7 +102,7 @@ export function decryptMegolmKeyFile(data, password) {
  */
 export function encryptMegolmKeyFile(data, password, options) {
     options = options || {};
-    const kdf_rounds = options.kdf_rounds || 500000;
+    const kdfRounds = options.kdf_rounds || 500000;
 
     const salt = new Uint8Array(16);
     window.crypto.getRandomValues(salt);
@@ -115,8 +115,8 @@ export function encryptMegolmKeyFile(data, password, options) {
     // of a single bit of iv is a price we have to pay.
     iv[9] &= 0x7f;
 
-    return deriveKeys(salt, kdf_rounds, password).then((keys) => {
-        const [aes_key, hmac_key] = keys;
+    return deriveKeys(salt, kdfRounds, password).then((keys) => {
+        const [aesKey, hmacKey] = keys;
 
         return subtleCrypto.encrypt(
             {
@@ -124,7 +124,7 @@ export function encryptMegolmKeyFile(data, password, options) {
                 counter: iv,
                 length: 64,
             },
-            aes_key,
+            aesKey,
             new TextEncoder().encode(data),
         ).then((ciphertext) => {
             const cipherArray = new Uint8Array(ciphertext);
@@ -134,17 +134,17 @@ export function encryptMegolmKeyFile(data, password, options) {
             resultBuffer[idx++] = 1; // version
             resultBuffer.set(salt, idx); idx += salt.length;
             resultBuffer.set(iv, idx); idx += iv.length;
-            resultBuffer[idx++] = kdf_rounds >> 24;
-            resultBuffer[idx++] = (kdf_rounds >> 16) & 0xff;
-            resultBuffer[idx++] = (kdf_rounds >> 8) & 0xff;
-            resultBuffer[idx++] = kdf_rounds & 0xff;
+            resultBuffer[idx++] = kdfRounds >> 24;
+            resultBuffer[idx++] = (kdfRounds >> 16) & 0xff;
+            resultBuffer[idx++] = (kdfRounds >> 8) & 0xff;
+            resultBuffer[idx++] = kdfRounds & 0xff;
             resultBuffer.set(cipherArray, idx); idx += cipherArray.length;
 
             const toSign = resultBuffer.subarray(0, idx);
 
             return subtleCrypto.sign(
                 {name: 'HMAC'},
-                hmac_key,
+                hmacKey,
                 toSign,
             ).then((hmac) => {
                 hmac = new Uint8Array(hmac);
@@ -170,7 +170,7 @@ function deriveKeys(salt, iterations, password) {
         new TextEncoder().encode(password),
         {name: 'PBKDF2'},
         false,
-        ['deriveBits']
+        ['deriveBits'],
     ).then((key) => {
         return subtleCrypto.deriveBits(
             {
@@ -180,33 +180,33 @@ function deriveKeys(salt, iterations, password) {
                 hash: 'SHA-512',
             },
             key,
-            512
+            512,
         );
     }).then((keybits) => {
         const now = new Date();
         console.log("E2e import/export: deriveKeys took " + (now - start) + "ms");
 
-        const aes_key = keybits.slice(0, 32);
-        const hmac_key = keybits.slice(32);
+        const aesKey = keybits.slice(0, 32);
+        const hmacKey = keybits.slice(32);
 
-        const aes_prom = subtleCrypto.importKey(
+        const aesProm = subtleCrypto.importKey(
             'raw',
-            aes_key,
+            aesKey,
             {name: 'AES-CTR'},
             false,
-            ['encrypt', 'decrypt']
+            ['encrypt', 'decrypt'],
         );
-        const hmac_prom = subtleCrypto.importKey(
+        const hmacProm = subtleCrypto.importKey(
             'raw',
-            hmac_key,
+            hmacKey,
             {
                 name: 'HMAC',
                 hash: {name: 'SHA-256'},
             },
             false,
-            ['sign', 'verify']
+            ['sign', 'verify'],
         );
-        return Promise.all([aes_prom, hmac_prom]);
+        return Promise.all([aesProm, hmacProm]);
     });
 }
 
@@ -301,7 +301,7 @@ function packMegolmKeyFile(data) {
 function encodeBase64(uint8Array) {
     // Misinterpt the Uint8Array as Latin-1.
     // window.btoa expects a unicode string with codepoints in the range 0-255.
-    var latin1String = String.fromCharCode.apply(null, uint8Array);
+    const latin1String = String.fromCharCode.apply(null, uint8Array);
     // Use the builtin base64 encoder.
     return window.btoa(latin1String);
 }
@@ -313,10 +313,10 @@ function encodeBase64(uint8Array) {
  */
 function decodeBase64(base64) {
     // window.atob returns a unicode string with codepoints in the range 0-255.
-    var latin1String = window.atob(base64);
+    const latin1String = window.atob(base64);
     // Encode the string as a Uint8Array
-    var uint8Array = new Uint8Array(latin1String.length);
-    for (var i = 0; i < latin1String.length; i++) {
+    const uint8Array = new Uint8Array(latin1String.length);
+    for (let i = 0; i < latin1String.length; i++) {
         uint8Array[i] = latin1String.charCodeAt(i);
     }
     return uint8Array;
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
index 4cc4659d7d..537f989b62 100644
--- a/test/.eslintrc.js
+++ b/test/.eslintrc.js
@@ -2,4 +2,9 @@ module.exports = {
     env: {
         mocha: true,
     },
-}
+
+    // mocha defines a 'this'
+    rules: {
+        "babel/no-invalid-this": "off",
+    },
+};
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index 1c90c7a030..2637097837 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -25,23 +25,40 @@ const TEST_VECTORS=[
     [
         "plain",
         "password",
-        "-----BEGIN MEGOLM SESSION DATA-----\nAXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx\ncissyYBxjsfsAndErh065A8=\n-----END MEGOLM SESSION DATA-----"
+        "-----BEGIN MEGOLM SESSION DATA-----\n" +
+        "AXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx\n" +
+        "cissyYBxjsfsAndErh065A8=\n" +
+        "-----END MEGOLM SESSION DATA-----",
     ],
     [
         "Hello, World",
         "betterpassword",
-        "-----BEGIN MEGOLM SESSION DATA-----\nAW1vcmVzYWx0bW9yZXNhbHT//////////wAAAAAAAAAAAAAD6KyBpe1Niv5M5NPm4ZATsJo5nghk\nKYu63a0YQ5DRhUWEKk7CcMkrKnAUiZny\n-----END MEGOLM SESSION DATA-----"
+        "-----BEGIN MEGOLM SESSION DATA-----\n" +
+        "AW1vcmVzYWx0bW9yZXNhbHT//////////wAAAAAAAAAAAAAD6KyBpe1Niv5M5NPm4ZATsJo5nghk\n" +
+        "KYu63a0YQ5DRhUWEKk7CcMkrKnAUiZny\n" +
+        "-----END MEGOLM SESSION DATA-----",
     ],
     [
         "alphanumericallyalphanumericallyalphanumericallyalphanumerically",
         "SWORDFISH",
-        "-----BEGIN MEGOLM SESSION DATA-----\nAXllc3NhbHR5Z29vZG5lc3P//////////wAAAAAAAAAAAAAD6OIW+Je7gwvjd4kYrb+49gKCfExw\nMgJBMD4mrhLkmgAngwR1pHjbWXaoGybtiAYr0moQ93GrBQsCzPbvl82rZhaXO3iH5uHo/RCEpOqp\nPgg29363BGR+/Ripq/VCLKGNbw==\n-----END MEGOLM SESSION DATA-----"
+        "-----BEGIN MEGOLM SESSION DATA-----\n" +
+        "AXllc3NhbHR5Z29vZG5lc3P//////////wAAAAAAAAAAAAAD6OIW+Je7gwvjd4kYrb+49gKCfExw\n" +
+        "MgJBMD4mrhLkmgAngwR1pHjbWXaoGybtiAYr0moQ93GrBQsCzPbvl82rZhaXO3iH5uHo/RCEpOqp\n" +
+        "Pgg29363BGR+/Ripq/VCLKGNbw==\n" +
+        "-----END MEGOLM SESSION DATA-----",
     ],
     [
         "alphanumericallyalphanumericallyalphanumericallyalphanumerically",
-        "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword",
-        "-----BEGIN MEGOLM SESSION DATA-----\nAf//////////////////////////////////////////AAAD6IAZJy7IQ7Y0idqSw/bmpngEEVVh\ngsH+8ptgqxw6ZVWQnohr8JsuwH9SwGtiebZuBu5smPCO+RFVWH2cQYslZijXv/BEH/txvhUrrtCd\nbWnSXS9oymiqwUIGs08sXI33ZA==\n-----END MEGOLM SESSION DATA-----"
-    ]
+        "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword" +
+        "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword" +
+        "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword" +
+        "passwordpasswordpasswordpasswordpassword",
+        "-----BEGIN MEGOLM SESSION DATA-----\n" +
+        "Af//////////////////////////////////////////AAAD6IAZJy7IQ7Y0idqSw/bmpngEEVVh\n" +
+        "gsH+8ptgqxw6ZVWQnohr8JsuwH9SwGtiebZuBu5smPCO+RFVWH2cQYslZijXv/BEH/txvhUrrtCd\n" +
+        "bWnSXS9oymiqwUIGs08sXI33ZA==\n" +
+        "-----END MEGOLM SESSION DATA-----",
+    ],
 ]
 ;
 
@@ -55,7 +72,7 @@ describe('MegolmExportEncryption', function() {
         if (!window.crypto.subtle && !window.crypto.webkitSubtle) {
             this.skip();
         }
-    })
+    });
 
     beforeEach(function() {
         testUtils.beforeEach(this);
@@ -64,14 +81,14 @@ describe('MegolmExportEncryption', function() {
     describe('decrypt', function() {
         it('should handle missing header', function() {
             const input=stringToArray(`-----`);
-            expect(()=>{MegolmExportEncryption.decryptMegolmKeyFile(input, '')})
+            expect(()=>MegolmExportEncryption.decryptMegolmKeyFile(input, ''))
                 .toThrow('Header line not found');
         });
 
         it('should handle missing trailer', function() {
             const input=stringToArray(`-----BEGIN MEGOLM SESSION DATA-----
 -----`);
-            expect(()=>{MegolmExportEncryption.decryptMegolmKeyFile(input, '')})
+            expect(()=>MegolmExportEncryption.decryptMegolmKeyFile(input, ''))
                 .toThrow('Trailer line not found');
         });
 
@@ -81,7 +98,7 @@ AXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx
 cissyYBxjsfsAn
 -----END MEGOLM SESSION DATA-----
 `);
-            expect(()=>{MegolmExportEncryption.decryptMegolmKeyFile(input, '')})
+            expect(()=>MegolmExportEncryption.decryptMegolmKeyFile(input, ''))
                 .toThrow('Invalid file: too short');
         });
 
@@ -94,12 +111,12 @@ cissyYBxjsfsAn
 
                 const [plain, password, input] = TEST_VECTORS[i];
                 return MegolmExportEncryption.decryptMegolmKeyFile(
-                    stringToArray(input), password
+                    stringToArray(input), password,
                 ).then((decrypted) => {
                     expect(decrypted).toEqual(plain);
                     return next(i+1);
-                })
-            };
+                });
+            }
             return next(0).catch(done);
         });
     });
@@ -115,7 +132,7 @@ cissyYBxjsfsAn
                 input, password, {kdf_rounds: 1000},
             ).then((ciphertext) => {
                 return MegolmExportEncryption.decryptMegolmKeyFile(
-                    ciphertext, password
+                    ciphertext, password,
                 );
             }).then((plaintext) => {
                 expect(plaintext).toEqual(input);

From f320f7d475465f0fa1fae3e15f2c666a2d14c678 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 14:30:45 +0100
Subject: [PATCH 15/44] Remove redundant action id

---
 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 b65fa0be1c..1f9d2f6bb8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1109,7 +1109,6 @@ module.exports = React.createClass({
             };
 
             const payload = {
-                id: '#mylovelyid',
                 action: 'view_room',
                 event_id: eventId,
                 highlighted: Boolean(eventId),

From e3ac78bd2804f8d6f76c99d24175bd31dcf3735a Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 8 Jun 2017 14:36:20 +0100
Subject: [PATCH 16/44] Self-review

---
 src/components/views/room_settings/ColorSettings.js | 1 -
 src/i18n/strings/en_EN.json                         | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index 2c18cb74f9..5fc845a541 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -20,7 +20,6 @@ var sdk = require('../../../index');
 var Tinter = require('../../../Tinter');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var Modal = require("../../../Modal");
-import { _t } from '../../../languageHandler';
 
 import dis from '../../../dispatcher';
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0ecbf3da55..3619424d19 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -481,7 +481,6 @@
   "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
   "Rooms": "Rooms",
   "Save": "Save",
-  "Saving room color settings is only available to registered users": "Saving room color settings is only available to registered users",
   "Scroll to bottom of page": "Scroll to bottom of page",
   "Scroll to unread messages": "Scroll to unread messages",
   "Search": "Search",
@@ -648,7 +647,7 @@
   "Who would you like to communicate with?": "Who would you like to communicate with?",
   "Searching known users": "Searching known users",
   "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
-  "Would you like to <a>accept</a> or <a>decline</a> this invitation?": "Would you like to <a>accept</a> or <a>decline</a> this invitation?".
+  "Would you like to <a>accept</a> or <a>decline</a> this invitation?": "Would you like to <a>accept</a> or <a>decline</a> this invitation?",
   "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
   "You are already in a call.": "You are already in a call.",
   "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",

From f2efdf8a4f4fbf0122dbd9aa266bde4ed713ccd5 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 8 Jun 2017 14:45:59 +0100
Subject: [PATCH 17/44] Review comments

---
 src/components/views/rooms/AuxPanel.js       | 4 ++--
 src/components/views/rooms/RoomPreviewBar.js | 4 ++--
 src/components/views/rooms/RoomSettings.js   | 2 +-
 src/i18n/strings/en_EN.json                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 7e7a670aea..55b68d1eb1 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -96,8 +96,8 @@ module.exports = React.createClass({
             else {
                 joinText = (<span>
                     {_tJsx(
-                        "Join as <a>voice</a> or <a>video</a>.",
-                        [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
+                        "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
+                        [/<voiceText>(.*?)<\/voiceText>/, /<videoText>(.*?)<\/videoText>/],
                         [
                             (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}} href="#">{sub}</a>,
                             (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video');}} href="#">{sub}</a>,
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 8aa1f353a6..34166452cb 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -138,8 +138,8 @@ module.exports = React.createClass({
                     </div>
                     <div className="mx_RoomPreviewBar_join_text">
                         { _tJsx(
-                            'Would you like to <a>accept</a> or <a>decline</a> this invitation?',
-                            [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
+                            'Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?',
+                            [/<acceptText>(.*?)<\/acceptText>/, /<declineText>(.*?)<\/declineText>/],
                             [
                                 (sub) => <a onClick={ this.props.onJoinClick }>{sub}</a>,
                                 (sub) => <a onClick={ this.props.onRejectClick }>{sub}</a>
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index f31fc68afc..997c451aa0 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -754,7 +754,7 @@ module.exports = React.createClass({
         if (this.state.join_rule === "public" && aliasCount == 0) {
             addressWarning =
                 <div className="mx_RoomSettings_warning">
-                		{ _tJsx(
+                        { _tJsx(
                             'To link to a room it must have <a>an address</a>.',
                             /<a>(.*?)<\/a>/,
                             (sub) => <a href="#addresses">{sub}</a>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3619424d19..d29c26aa28 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -365,7 +365,7 @@
   "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
   "%(displayName)s is typing": "%(displayName)s is typing",
   "Sign in with": "Sign in with",
-  "Join as <a>voice</a> or <a>video</a>.": "Join as <a>voice</a> or <a>video</a>.",
+  "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
   "Join Room": "Join Room",
   "joined and left": "joined and left",
   "joined": "joined",
@@ -647,7 +647,7 @@
   "Who would you like to communicate with?": "Who would you like to communicate with?",
   "Searching known users": "Searching known users",
   "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
-  "Would you like to <a>accept</a> or <a>decline</a> this invitation?": "Would you like to <a>accept</a> or <a>decline</a> this invitation?",
+  "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?",
   "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
   "You are already in a call.": "You are already in a call.",
   "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",

From 71eb40585991da54b42961f9a970fc2107caee38 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 8 Jun 2017 14:53:21 +0100
Subject: [PATCH 18/44] Add comments & remove redundant check

---
 src/HtmlUtils.js                             |  5 +++++
 src/components/views/messages/TextualBody.js | 13 ++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 5e8cfc3755..aec32092ed 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -365,6 +365,11 @@ export function bodyToHtml(content, highlights, opts) {
 }
 
 function addCodeCopyButton(safeBody) {
+    // Adds 'copy' buttons to pre blocks
+    // Note that this only manipulates the markup to add the buttons:
+    // we need to add the event handlers once the nodes are in the DOM
+    // since we can't save functions in the markup.
+    // This is done in TextualBody
     const el = document.createElement("div");
     el.innerHTML = safeBody;
     const codeBlocks = Array.from(el.getElementsByTagName("pre"));
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 45fca566b9..d5a1977cdd 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -94,14 +94,13 @@ module.exports = React.createClass({
                     }
                 }, 10);
             }
+            // add event handlers to the 'copy code' buttons
             const buttons = ReactDOM.findDOMNode(this).getElementsByClassName("mx_EventTile_copyButton");
-            if (buttons.length > 0) {
-                for (let i = 0; i < buttons.length; i++) {
-                    buttons[i].onclick = (e) => {
-                        const copyCode = buttons[i].parentNode.getElementsByTagName("code")[0];
-                        this.copyToClipboard(copyCode.textContent);
-                    };
-                }
+            for (let i = 0; i < buttons.length; i++) {
+                buttons[i].onclick = (e) => {
+                    const copyCode = buttons[i].parentNode.getElementsByTagName("code")[0];
+                    this.copyToClipboard(copyCode.textContent);
+                };
             }
         }
     },

From 9baaf5499f30c80f8018279c69a742f572483805 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 8 Jun 2017 14:58:54 +0100
Subject: [PATCH 19/44] Linting

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

diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index 51651b4aaa..a3eb7c6962 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -47,7 +47,7 @@ export default React.createClass({
                 <p>
                 {_tJsx(
                     "Otherwise, <a>click here</a> to send a bug report.",
-                    /<a>(.*?)<\/a>/, (sub) => <a onClick={this._sendBugReport} key="bugreport" href='#'>{sub}</a>
+                    /<a>(.*?)<\/a>/, (sub) => <a onClick={this._sendBugReport} key="bugreport" href='#'>{sub}</a>,
                 )}
                 </p>
             );

From 614006a256c725804fcb7d7f031e9bbc15fb1107 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 8 Jun 2017 15:09:23 +0100
Subject: [PATCH 20/44] remove duplicate keys from en_EN

---
 src/i18n/strings/en_EN.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d29c26aa28..3540feddee 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -645,7 +645,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?",
-  "Searching known users": "Searching known users",
   "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
   "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?",
   "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
@@ -817,7 +816,6 @@
   "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.": "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.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
   "You must join the room to see its files": "You must join the room to see its files",
-  "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
   "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
   "Start new chat": "Start new chat",
   "Guest users can't invite users. Please register.": "Guest users can't invite users. Please register.",
@@ -897,15 +895,9 @@
   "Online": "Online",
   "Idle": "Idle",
   "Offline": "Offline",
-  "disabled": "disabled",
-  "enabled": "enabled",
   "Start chatting": "Start chatting",
   "Start Chatting": "Start Chatting",
   "Click on the button below to start chatting!": "Click on the button below to start chatting!",
-  "Create a new chat or reuse an existing one": "Create a new chat or reuse an existing one",
-  "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
-  "Start new chat": "Start new chat",
-  "Disable URL previews for this room (affects only you)": "Disable URL previews for this room (affects only you)",
   "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName 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",

From 74e426055699b2b0415710cc4af3661f297592f5 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 8 Jun 2017 15:14:46 +0100
Subject: [PATCH 21/44] fix fullstops

---
 scripts/fix-i18n.pl           |  7 ++++++-
 src/i18n/strings/de_DE.json   | 12 ++++++------
 src/i18n/strings/en_US.json   |  6 +++---
 src/i18n/strings/fr.json      |  6 +++---
 src/i18n/strings/pt.json      |  6 +++---
 src/i18n/strings/pt_BR.json   |  6 +++---
 src/i18n/strings/ru.json      | 10 +++++-----
 src/i18n/strings/th.json      |  2 +-
 src/i18n/strings/zh_Hans.json |  2 +-
 src/i18n/strings/zh_Hant.json |  4 ++--
 10 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
index ea19d710df..def352463d 100755
--- a/scripts/fix-i18n.pl
+++ b/scripts/fix-i18n.pl
@@ -66,6 +66,11 @@ Some of your messages have not been sent.
 This room is private or inaccessible to guests. You may be able to join if you register.
 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 you do not have permission to view the message in question.
+This action cannot be performed by a guest user. Please register to be able to do this.
+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 you do not have permission to view the message in question.
+You are trying to access %(roomName)s.
+You will not be able to undo this change as you are promoting the user to have the same power level as yourself.
 EOT
 )];
 }
@@ -89,7 +94,7 @@ if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
             $sub = 1;
         }
 
-        if ($src eq $fixup && $dst !~ /\.$/) {
+        if ($ARGV !~ /(zh_Hans|zh_Hant|th)\.json$/ && $src eq $fixup && $dst !~ /\.$/) {
             print STDERR "fixing up dst: $dst\n";
             $dst .= '.';
             $sub = 1;            
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4102d7be56..384e27027b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -427,7 +427,7 @@
     "You're not in any rooms yet! Press": "Du bist noch keinem Raum beigetreten! Drücke",
     "click to reveal": "Klicke zum anzeigen",
     "To remove other users' messages": "Um Nachrichten anderer Nutzer zu verbergen",
-    "You are trying to access %(roomName)s": "Du versuchst, auf den Raum \"%(roomName)s\" zuzugreifen",
+    "You are trying to access %(roomName)s.": "Du versuchst, auf den Raum \"%(roomName)s\" zuzugreifen.",
     "af": "Afrikaans",
     "ar-ae": "Arabisch (VAE)",
     "ar-bh": "Arabisch (Bahrain)",
@@ -611,12 +611,12 @@
     "Some of your messages have not been sent.": "Einige deiner Nachrichten wurden nicht gesendet.",
     "Submit": "Absenden",
     "The main address for this room is: %(canonical_alias_section)s": "Die Hauptadresse für diesen Raum ist: %(canonical_alias_section)s",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "Diese Aktion kann nicht von einem Gast ausgeführt werden. Bitte registriere dich um dies zu tun",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Diese Aktion kann nicht von einem Gast ausgeführt werden. Bitte registriere dich um dies zu tun.",
     "%(actionVerb)s this person?": "Diese Person %(actionVerb)s?",
     "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
-    "This room is private or inaccessible to guests. You may be able to join if you register": "Dieser Raum ist privat oder für Gäste nicht zugänglich. Du kannst jedoch eventuell beitreten, wenn du dich registrierst",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen",
-    "Tried to load a specific point in this room's timeline, but was unable to find it": "Der Versuch, einen spezifischen Punkt im Chatverlauf zu laden, ist fehlgeschlagen. Der Punkt konnte nicht gefunden werden",
+    "This room is private or inaccessible to guests. You may be able to join if you register.": "Dieser Raum ist privat oder für Gäste nicht zugänglich. Du kannst jedoch eventuell beitreten, wenn du dich registrierst.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Der Versuch, einen spezifischen Punkt im Chatverlauf zu laden, ist fehlgeschlagen. Der Punkt konnte nicht gefunden werden.",
     "Turn Markdown off": "Markdown deaktiveren",
     "Turn Markdown on": "Markdown einschalten",
     "Unable to load device list": "Geräteliste konnte nicht geladen werden",
@@ -625,7 +625,7 @@
     "Usage: /markdown on|off": "Verwendung: /markdown on|off",
     "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Anruf zu sein. Bist du sicher schließen zu wollen?",
     "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "Du wirst diese Änderung nicht rückgängig machen können, da der Nutzer dasselbe Berechtigungslevel wie du selbst erhalten wird",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der Nutzer dasselbe Berechtigungslevel wie du selbst erhalten wird.",
     "Make Moderator": "Zum Moderator machen",
     "Room": "Raum",
     "(~%(searchCount)s results)": "(~%(searchCount)s Ergebnisse)",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 6736e39276..5cdfd65d27 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -489,7 +489,7 @@
     "The default role for new room members is": "The default role for new room members is",
     "The main address for this room is": "The main address for this room is",
     "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.",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "This action cannot be performed by a guest user. Please register to be able to do this",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "This action cannot be performed by a guest user. Please register to be able to do this.",
     "This email address is already in use": "This email address is already in use",
     "This email address was not found": "This email address was not found",
     "%(actionVerb)s this person?": "%(actionVerb)s this person?",
@@ -588,7 +588,7 @@
     "Would you like to": "Would you like to",
     "You are already in a call.": "You are already in a call.",
     "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",
-    "You are trying to access %(roomName)s": "You are trying to access %(roomName)s",
+    "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.",
     "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
     "You do not have permission to post to this room": "You do not have permission to post to this room",
@@ -609,7 +609,7 @@
     "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
     "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
     "You should not yet trust it to secure data": "You should not yet trust it to secure data",
-    "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",
+    "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.",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ffd1ef5885..1058db4aca 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -468,7 +468,7 @@
     "tag direct chat": "marquer comme conversation directe",
     "The default role for new room members is": "Le rôle par défaut des nouveaux membres est",
     "The main address for this room is": "L'adresse principale pour ce salon est",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "Cette action ne peut être effectuée par un visiteur. Merci de vous enregistrer afin de pouvoir effectuer cette action",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Cette action ne peut être effectuée par un visiteur. Merci de vous enregistrer afin de pouvoir effectuer cette action.",
     "This email address is already in use": "Cette adresse e-mail est déjà utilisée",
     "This email address was not found": "Cette adresse e-mail n’a pas été trouvée",
     "%(actionVerb)s this person?": "%(actionVerb)s cette personne ?",
@@ -557,7 +557,7 @@
     "Would you like to": "Voulez-vous",
     "You are already in a call.": "Vous êtes déjà dans un appel.",
     "You're not in any rooms yet! Press": "Vous n’êtes dans aucun salon ! Cliquez",
-    "You are trying to access %(roomName)s": "Vous essayez d'accéder à %(roomName)s",
+    "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.",
     "You cannot place VoIP calls in this browser.": "Vous ne pouvez pas passer d'appel voix dans cet explorateur.",
     "You do not have permission to post to this room": "Vous n’avez pas la permission de poster dans ce salon",
@@ -576,7 +576,7 @@
     "You seem to be uploading files, are you sure you want to quit?": "Vous semblez être en train de télécharger des fichiers, êtes-vous sûr(e) de vouloir quitter ?",
     "You should not yet trust it to secure data": "Vous ne pouvez pas encore lui faire confiance pour sécuriser vos données",
     "changing room on a RoomView is not supported": "changer de salon sur un RoomView n'est pas supporté",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "Vous ne pourrez pas défaire ce changement car vous promouvez l’utilisateur aux mêmes pouvoirs que vous",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Vous ne pourrez pas défaire ce changement car vous promouvez l’utilisateur aux mêmes pouvoirs que vous.",
     "Sun": "Dim",
     "Mon": "Lun",
     "Tue": "Mar",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 27d257de9e..850e95f61f 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -399,7 +399,7 @@
     "%(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": "Você ainda não está em nenhuma sala! Pressione",
-    "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
+    "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.",
     "You cannot place VoIP calls in this browser.": "Você não pode fazer chamadas de voz neste navegador.",
     "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
@@ -630,7 +630,7 @@
     "Some of your messages have not been sent.": "Algumas das suas mensagens não foram enviadas.",
     "Submit": "Enviar",
     "The main address for this room is": "O endereço principal desta sala é",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "Esta ação não pode ser realizada por um/a usuário/a visitante. Por favor, registre-se para poder fazer isso",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Esta ação não pode ser realizada por um/a usuário/a visitante. Por favor, registre-se para poder fazer isso.",
     "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?",
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas parece que você não tem permissões para ver a mensagem em questão.",
@@ -643,7 +643,7 @@
     "You have been invited to join this room by %(inviterName)s": "Você foi convidada/o por %(inviterName)s a ingressar nesta sala",
     "You seem to be in a call, are you sure you want to quit?": "Parece que você está em uma chamada. Tem certeza que quer sair?",
     "You seem to be uploading files, are you sure you want to quit?": "Parece que você está enviando arquivos. Tem certeza que quer sair?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "Você não poderá desfazer esta mudança, pois estará dando a este(a) usuário(a) o mesmo nível de permissões que você",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Você não poderá desfazer esta mudança, pois estará dando a este(a) usuário(a) o mesmo nível de permissões que você.",
     "Make Moderator": "Tornar moderador(a)",
     "Room": "Sala",
     "(~%(searchCount)s results)": "(±%(searchCount)s resultados)",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 99175c874e..9e218d5c36 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -399,7 +399,7 @@
     "%(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": "Você ainda não está em nenhuma sala! Pressione",
-    "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
+    "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.",
     "You cannot place VoIP calls in this browser.": "Você não pode fazer chamadas de voz neste navegador.",
     "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
@@ -630,7 +630,7 @@
     "Some of your messages have not been sent.": "Algumas das suas mensagens não foram enviadas.",
     "Submit": "Enviar",
     "The main address for this room is": "O endereço principal desta sala é",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "Esta ação não pode ser realizada por um/a usuário/a visitante. Por favor, registre-se para poder fazer isso",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Esta ação não pode ser realizada por um/a usuário/a visitante. Por favor, registre-se para poder fazer isso.",
     "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?",
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas parece que você não tem permissões para ver a mensagem em questão.",
@@ -643,7 +643,7 @@
     "You have been invited to join this room by %(inviterName)s": "Você foi convidada/o por %(inviterName)s a ingressar nesta sala",
     "You seem to be in a call, are you sure you want to quit?": "Parece que você está em uma chamada. Tem certeza que quer sair?",
     "You seem to be uploading files, are you sure you want to quit?": "Parece que você está enviando arquivos. Tem certeza que quer sair?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "Você não poderá desfazer esta mudança, pois estará dando a este(a) usuário(a) o mesmo nível de permissões que você",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Você não poderá desfazer esta mudança, pois estará dando a este(a) usuário(a) o mesmo nível de permissões que você.",
     "Make Moderator": "Tornar moderador(a)",
     "Room": "Sala",
     "(~%(searchCount)s results)": "(±%(searchCount)s resultados)",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 647fbfe1d5..ce3d0d973d 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -362,7 +362,7 @@
     "You cannot place VoIP calls in this browser.": "Вы не можете сделать вызовы VoIP с этим браузером.",
     "You are already in a call.": "Вы уже находитесь в разговоре.",
     "You're not in any rooms yet! Press": "Вы еще не находитесь ни в каких комнатах! Нажать",
-    "You are trying to access %(roomName)s": "Вы пытаетесь получить доступ %(roomName)s",
+    "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's преглашение.",
     "Sep": "Сен.",
@@ -575,7 +575,7 @@
     "tag direct chat": "отметить прямое общение",
     "The default role for new room members is": "Роль по умолчанию для новых участников комнаты",
     "The main address for this room is": "Основной адрес для этой комнаты",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "Это действие не может быть выполнено гостем. Пожалуйста, зарегистрируйтесь для этого",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "Это действие не может быть выполнено гостем. Пожалуйста, зарегистрируйтесь для этого.",
     "This email address is already in use": "Этот адрес электронной почты уже используется",
     "This email address was not found": "Этот адрес электронной почты не найден",
     "The email address linked to your account must be entered.": "Необходимо ввести адрес электронной почты, связанный с вашей учётной записью.",
@@ -752,8 +752,8 @@
     "To remove other users' messages": "Удалять сообщения других пользователей",
     "To reset your password, enter the email address linked to your account": "Чтобы сбросить ваш пароль введите адрес email, который используется аккаунтом",
     "to tag as %(tagName)s": "отметить как %(tagName)s",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question": "Вы попытались загрузить указанное сообщение в комнате, однако у вас нету разрешений для его просмотра",
-    "Tried to load a specific point in this room's timeline, but was unable to find it": "Вы попытались загрузить указанное сообщение в комнате, однако сервер не смог его найти",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Вы попытались загрузить указанное сообщение в комнате, однако у вас нету разрешений для его просмотра.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Вы попытались загрузить указанное сообщение в комнате, однако сервер не смог его найти.",
     "Unable to load device list": "Невозможно загрузить список устройств",
     "Unknown (user, device) pair:": "Неизвестная пара пользователь-устройство:",
     "Unmute": "Разглушить",
@@ -767,7 +767,7 @@
     "You have entered an invalid contact. Try using their Matrix ID or email address.": "Вы ввели неправильный адрес. Попробуйте использовать Matrix ID или адрес email.",
     "You need to enter a user name.": "Необходимо ввести имя пользователя.",
     "You seem to be in a call, are you sure you want to quit?": "Вы учавствуете в звонке, вы уверены, что хотите выйти?",
-    "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.": "Вы не сможете отменить это действие так как даете пользователю такой же уровень доступа как и у вас.",
     "Set a Display Name": "Установить отображаемое имя",
     "(~%(searchCount)s results)": "(~%(searchCount)s результатов)",
     "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)s отозвали свои приглашения %(repeats)s раз",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index f97b6b8d50..7ec5b606fc 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -389,7 +389,7 @@
     "Who would you like to add to this room?": "คุณต้องการเพิ่มใครเข้าห้องนี้?",
     "Who would you like to communicate with?": "คุณต้องการสื่อสารกับใคร?",
     "You're not in any rooms yet! Press": "คุณยังไม่ได้อยู่ในห้องใดเลย! กด",
-    "You are trying to access %(roomName)s": "คุณกำลังพยายามเข้าสู่ %(roomName)s",
+    "You are trying to access %(roomName)s.": "คุณกำลังพยายามเข้าสู่ %(roomName)s",
     "You have <a>disabled</a> URL previews by default.": "ค่าเริ่มต้นของคุณ<a>ปิดใช้งาน</a>ตัวอย่าง URL เอาไว้",
     "You have <a>enabled</a> URL previews by default.": "ค่าเริ่มต้นของคุณ<a>เปิดใช้งาน</a>ตัวอย่าง URL เอาไว้",
     "you must be a": "คุณต้องเป็น",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index e0db2b525b..e6eb5f632b 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -147,7 +147,7 @@
     "Success": "成功",
     "The default role for new room members is": "此聊天室新成员的默认角色是",
     "The main address for this room is": "此聊天室的主要地址是",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "游客不能进行此操作。请注册",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "游客不能进行此操作。请注册",
     "This email address is already in use": "此邮箱地址已经被使用",
     "This email address was not found": "未找到此邮箱地址",
     "%(actionVerb)s this person?": "%(actionVerb)s 这个用户？",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 17901789e9..56cc8f6add 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -274,7 +274,7 @@
     "Success": "成功",
     "The default role for new room members is": "此聊天室新成員的默認角色是",
     "The main address for this room is": "此聊天室的主要地址是",
-    "This action cannot be performed by a guest user. Please register to be able to do this": "訪客不能進行此操作。請注冊",
+    "This action cannot be performed by a guest user. Please register to be able to do this.": "訪客不能進行此操作。請注冊",
     "This email address is already in use": "此郵箱地址已經被使用",
     "This email address was not found": "未找到此郵箱地址",
     "%(actionVerb)s this person?": "%(actionVerb)s 這個用戶？",
@@ -290,7 +290,7 @@
     "Would you like to": "你要",
     "You are already in a call.": "你已在電話通話中",
     "You're not in any rooms yet! Press": "你尚未加入任何聊天室！請按",
-    "You are trying to access %(roomName)s": "你將進入 %(roomName)聊天室",
+    "You are trying to access %(roomName)s.": "你將進入 %(roomName)聊天室",
     "You cannot place a call with yourself.": "你不能打電話給自已",
     "You cannot place VoIP calls in this browser.": "在此瀏覽器下無法置入網路電話通話",
     "Sun": "星期日",

From aa20ad706e0f6110801a6e30c884f21be46d76a1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:30:43 +0100
Subject: [PATCH 22/44] Remove redundant `currentRoomAlias`

---
 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 a115e89062..0493456e0e 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -621,7 +621,6 @@ module.exports = React.createClass({
             page_type: PageTypes.RoomView,
             thirdPartyInvite: roomInfo.third_party_invite,
             roomOobData: roomInfo.oob_data,
-            currentRoomAlias: roomInfo.room_alias,
             autoJoin: roomInfo.auto_join,
         };
 

From 8ddc38c9b107ddd3d143e0269f7609c2444e4bbd Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:32:31 +0100
Subject: [PATCH 23/44] Doc _viewRoom highlighted

---
 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 0493456e0e..f34cc8b0ef 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -607,6 +607,7 @@ module.exports = React.createClass({
     // @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
     // @param {Object=} roomInfo.third_party_invite Object containing data about the third party
     //                                    we received to join the room, if any.
     // @param {string=} roomInfo.third_party_invite.inviteSignUrl 3pid invite sign URL

From 2e82bf40fb7996f909b68ab8ad4fdc94ef489c47 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:34:20 +0100
Subject: [PATCH 24/44] Explain setting of highlighted in room/$eventId
 showScreen handling.

---
 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 f34cc8b0ef..5f13f53d0b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1118,6 +1118,7 @@ module.exports = React.createClass({
             const payload = {
                 action: 'view_room',
                 event_id: eventId,
+                // If an event ID is set (truthy), mark it as highlighted
                 highlighted: Boolean(eventId),
                 third_party_invite: thirdPartyInvite,
                 oob_data: oobData,

From dca2be632591c64914421329a3a9743232019ec6 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:37:30 +0100
Subject: [PATCH 25/44] Add RoomView initial state and docs

---
 src/components/structures/RoomView.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index a4c589187b..f5db36a581 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -94,6 +94,13 @@ module.exports = React.createClass({
             roomLoading: true,
             peekLoading: false,
 
+            // The event to be scrolled to initially
+            eventId: null,
+            // The offset in pixels from the event with which to scroll vertically
+            eventPixelOffset: null,
+            // Whether to highlight the event scrolled to
+            isEventHighlighted: null,
+
             forwardingEvent: null,
             editingRoomSettings: false,
             uploadingRoomSettings: false,

From e58e4db628c17e54d396570f4d6cf7e216eb11d6 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:38:58 +0100
Subject: [PATCH 26/44] Explain why search results are cleared when eventId
 changes

---
 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 f5db36a581..180e6ebc89 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -170,6 +170,8 @@ module.exports = React.createClass({
             isEventHighlighted: RoomViewStore.isEventHighlighted(),
         };
 
+        // Clear the search results when clicking a search result (which changes the
+        // currently scrolled to event, this.state.eventId).
         if (this.state.eventId !== newState.eventId) {
             newState.searchResults = null;
         }

From 59e649f326aaff78253ae40cb824f78969b3b611 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:43:45 +0100
Subject: [PATCH 27/44] Add comment about roomId potentially not being resolved
 following an update from RoomViewStore

---
 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 180e6ebc89..cfa4038114 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -183,6 +183,8 @@ module.exports = React.createClass({
         }
 
         this.setState(newState, () => {
+            // At this point, this.state.roomId could be null (e.g. the alias might not
+            // have been resolved yet) so anything called here must handle this case.
             this._onHaveRoom();
             this.onRoom(MatrixClientPeg.get().getRoom(this.state.roomId));
         });

From 1792fa45f4732aae292f85a85903d1199be87a65 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:45:50 +0100
Subject: [PATCH 28/44] Null-guard roomId before sending a dispatch to update
 scroll state

Otherwise we pointlessly assign the null key to something
---
 src/components/structures/RoomView.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index cfa4038114..06e65589d1 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -590,6 +590,10 @@ module.exports = React.createClass({
     },
 
     _updateScrollMap(roomId) {
+        // No point updating scroll state if the room ID hasn't been resolved yet
+        if (!roomId) {
+            return;
+        }
         dis.dispatch({
             action: 'update_scroll_state',
             room_id: roomId,

From d691c891e7353e95d309474f92bf2d1ff7cc6546 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 8 Jun 2017 15:49:48 +0100
Subject: [PATCH 29/44] Move all login error string generation into view

This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
---
 src/Login.js                             | 18 +--------
 src/components/structures/login/Login.js | 51 ++++++++++++++++--------
 src/i18n/strings/en_EN.json              |  2 +-
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/Login.js b/src/Login.js
index 659fdb92bb..8db6e99b89 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -97,11 +97,6 @@ export default class Login {
                 guest: true
             };
         }, (error) => {
-            if (error.httpStatus === 403) {
-                error.friendlyText = _t("Guest access is disabled on this Home Server.");
-            } else {
-                error.friendlyText = _t("Failed to register as guest:") + ' ' + error.data;
-            }
             throw error;
         });
     }
@@ -157,14 +152,7 @@ export default class Login {
                 accessToken: data.access_token
             });
         }, function(error) {
-            if (error.httpStatus == 400 && loginParams.medium) {
-                error.friendlyText = (
-                    _t('This Home Server does not support login using email address.')
-                );
-            } else if (error.httpStatus === 403) {
-                error.friendlyText = (
-                    _t('Incorrect username and/or password.')
-                );
+            if (error.httpStatus === 403) {
                 if (self._fallbackHsUrl) {
                     var fbClient = Matrix.createClient({
                         baseUrl: self._fallbackHsUrl,
@@ -184,10 +172,6 @@ export default class Login {
                         throw error;
                     });
                 }
-            } else {
-                error.friendlyText = (
-                    _t("There was a problem logging in.") + ' (HTTP ' + error.httpStatus + ")"
-                );
             }
             throw error;
         });
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index be440febdc..7d283e0e36 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -87,7 +87,24 @@ module.exports = React.createClass({
         ).then((data) => {
             this.props.onLoggedIn(data);
         }, (error) => {
-            this._setStateFromError(error, true);
+            let errorText;
+
+            // Some error strings only apply for logging in
+            const usingEmail = username.indexOf("@");
+            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) {
+                errorText = _t('Incorrect username and/or password.');
+            } else {
+                // other errors, not specific to doing a password login
+                errorText = this._errorTextFromError(error);
+            }
+
+            this.setState({
+                errorText: errorText,
+                // https://matrix.org/jira/browse/SYN-744
+                loginIncorrect: error.httpStatus == 401 || error.httpStatus == 403
+            });
         }).finally(() => {
             this.setState({
                 busy: false
@@ -110,7 +127,16 @@ module.exports = React.createClass({
         this._loginLogic.loginAsGuest().then(function(data) {
             self.props.onLoggedIn(data);
         }, function(error) {
-            self._setStateFromError(error, true);
+            let errorText;
+            if (error.httpStatus === 403) {
+                errorText = _t("Guest access is disabled on this Home Server.");
+            } else {
+                errorText = self._errorTextFromError(error);
+            }
+            self.setState({
+                errorText: errorText,
+                loginIncorrect: false,
+            });
         }).finally(function() {
             self.setState({
                 busy: false
@@ -183,31 +209,22 @@ module.exports = React.createClass({
                 currentFlow: self._getCurrentFlowStep(),
             });
         }, function(err) {
-            self._setStateFromError(err, false);
+            self.setState({
+                errorText: self._errorTextFromError(err),
+                loginIncorrect: false,
+            });
         }).finally(function() {
             self.setState({
                 busy: false,
             });
-        });
+        }).done();
     },
 
     _getCurrentFlowStep: function() {
         return this._loginLogic ? this._loginLogic.getCurrentFlowStep() : null;
     },
 
-    _setStateFromError: function(err, isLoginAttempt) {
-        this.setState({
-            errorText: this._errorTextFromError(err),
-            // https://matrix.org/jira/browse/SYN-744
-            loginIncorrect: isLoginAttempt && (err.httpStatus == 401 || err.httpStatus == 403)
-        });
-    },
-
     _errorTextFromError(err) {
-        if (err.friendlyText) {
-            return err.friendlyText;
-        }
-
         let errCode = err.errcode;
         if (!errCode && err.httpStatus) {
             errCode = "HTTP " + err.httpStatus;
@@ -230,7 +247,7 @@ module.exports = React.createClass({
                 </span>;
             } else {
                 errorText = <span>
-                    { _tJsx("Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.",
+                    { _tJsx("Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted and that a browser extension is not blocking requests.",
                       /<a>(.*?)<\/a>/,
                       (sub) => { return <a href={this.state.enteredHomeserverUrl}>{ sub }</a>; }
                     )}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8dbbb98423..6984d46ed4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -180,7 +180,7 @@
   "Bug Report": "Bug Report",
   "Bulk Options": "Bulk Options",
   "Call Timeout": "Call Timeout",
-  "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.",
+  "Can't connect to homeserver - please check your connectivity and 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 and ensure your <a>homeserver's SSL certificate</a> is trusted and that a browser extension is not blocking requests.",
   "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",

From 000a045e3523ed7154fb3817e06d3ee5cf343439 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:47:41 +0100
Subject: [PATCH 30/44] Rename RVS state (event -> initialEvent) and redocument

---
 src/components/structures/RoomView.js | 18 ++++++-------
 src/stores/RoomViewStore.js           | 38 ++++++++++++++-------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 06e65589d1..942e3c8e07 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -165,14 +165,14 @@ module.exports = React.createClass({
             roomLoading: RoomViewStore.isRoomLoading(),
             roomLoadError: RoomViewStore.getRoomLoadError(),
             joining: RoomViewStore.isJoining(),
-            eventId: RoomViewStore.getEventId(),
-            eventPixelOffset: RoomViewStore.getEventPixelOffset(),
-            isEventHighlighted: RoomViewStore.isEventHighlighted(),
+            initialEventId: RoomViewStore.getInitialEventId(),
+            initialEventPixelOffset: RoomViewStore.getInitialEventPixelOffset(),
+            isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
         };
 
         // Clear the search results when clicking a search result (which changes the
-        // currently scrolled to event, this.state.eventId).
-        if (this.state.eventId !== newState.eventId) {
+        // currently scrolled to event, this.state.initialEventId).
+        if (this.state.initialEventId !== newState.initialEventId) {
             newState.searchResults = null;
         }
 
@@ -1665,12 +1665,12 @@ module.exports = React.createClass({
             hideMessagePanel = true;
         }
 
-        const shouldHighlight = this.state.isEventHighlighted;
+        const shouldHighlight = this.state.isInitialEventHighlighted;
         let highlightedEventId = null;
         if (this.state.forwardingEvent) {
             highlightedEventId = this.state.forwardingEvent.getId();
         } else if (shouldHighlight) {
-            highlightedEventId = this.state.eventId;
+            highlightedEventId = this.state.initialEventId;
         }
 
         // console.log("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
@@ -1681,8 +1681,8 @@ module.exports = React.createClass({
                 manageReadMarkers={true}
                 hidden={hideMessagePanel}
                 highlightedEventId={highlightedEventId}
-                eventId={this.state.eventId}
-                eventPixelOffset={this.state.eventPixelOffset}
+                eventId={this.state.initialEventId}
+                eventPixelOffset={this.state.initialEventPixelOffset}
                 onScroll={ this.onMessageListScroll }
                 onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
                 showUrlPreview = { this.state.showUrlPreview }
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 0529824a4b..8277aeda97 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -27,12 +27,14 @@ const INITIAL_STATE = {
     joinError: null,
     // The room ID of the room
     roomId: null,
-    // The event being viewed
-    eventId: null,
-    // The offset to display the event at (see scrollStateMap)
-    eventPixelOffset: null,
-    // Whether to highlight the event
-    isEventHighlighted: false,
+
+    // The event to scroll to initially
+    initialEventId: null,
+    // The offset to display the initial event at (see scrollStateMap)
+    initialEventPixelOffset: null,
+    // Whether to highlight the initial event
+    isInitialEventHighlighted: false,
+
     // The room alias of the room (or null if not originally specified in view_room)
     roomAlias: null,
     // Whether the current room is loading
@@ -131,9 +133,9 @@ class RoomViewStore extends Store {
 
             this._setState({
                 roomId: payload.room_id,
-                eventId: payload.event_id,
-                eventPixelOffset: payload.event_offset,
-                isEventHighlighted: payload.highlighted,
+                initialEventId: payload.event_id,
+                initialEventPixelOffset: payload.event_offset,
+                isInitialEventHighlighted: payload.highlighted,
                 roomLoading: false,
                 roomLoadError: null,
             });
@@ -141,9 +143,9 @@ class RoomViewStore extends Store {
             // Resolve the alias and then do a second dispatch with the room ID acquired
             this._setState({
                 roomId: null,
-                eventId: null,
-                eventPixelOffset: null,
-                isEventHighlighted: null,
+                initialEventId: null,
+                initialEventPixelOffset: null,
+                isInitialEventHighlighted: null,
                 roomAlias: payload.room_alias,
                 roomLoading: true,
                 roomLoadError: null,
@@ -229,16 +231,16 @@ class RoomViewStore extends Store {
         return this._state.roomId;
     }
 
-    getEventId() {
-        return this._state.eventId;
+    getInitialEventId() {
+        return this._state.initialEventId;
     }
 
-    getEventPixelOffset() {
-        return this._state.eventPixelOffset;
+    getInitialEventPixelOffset() {
+        return this._state.initialEventPixelOffset;
     }
 
-    isEventHighlighted() {
-        return this._state.isEventHighlighted;
+    isInitialEventHighlighted() {
+        return this._state.isInitialEventHighlighted;
     }
 
     getRoomAlias() {

From 36f72cccb51d4be536509b8879321660b604d90c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 15:54:23 +0100
Subject: [PATCH 31/44] Don't alter members of payload (when defaulting an
 event to scroll to), alter a copy

---
 src/stores/RoomViewStore.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 8277aeda97..a0c9ccc33f 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -121,24 +121,26 @@ class RoomViewStore extends Store {
 
     _viewRoom(payload) {
         if (payload.room_id) {
-            // If an event ID wasn't specified, default to the one saved for this room
-            // via update_scroll_state. Also assume event_offset should be set.
-            if (!payload.event_id) {
-                const roomScrollState = this._state.scrollStateMap[payload.room_id];
-                if (roomScrollState) {
-                    payload.event_id = roomScrollState.focussedEvent;
-                    payload.event_offset = roomScrollState.pixelOffset;
-                }
-            }
-
-            this._setState({
+            const newState = {
                 roomId: payload.room_id,
                 initialEventId: payload.event_id,
                 initialEventPixelOffset: payload.event_offset,
                 isInitialEventHighlighted: payload.highlighted,
                 roomLoading: false,
                 roomLoadError: null,
-            });
+            };
+
+            // If an event ID wasn't specified, default to the one saved for this room
+            // via update_scroll_state. Assume initialEventPixelOffset should be set.
+            if (!newState.initialEventId) {
+                const roomScrollState = this._state.scrollStateMap[payload.room_id];
+                if (roomScrollState) {
+                    newState.initialEventId = roomScrollState.focussedEvent;
+                    newState.initialEventPixelOffset = roomScrollState.pixelOffset;
+                }
+            }
+
+            this._setState(newState);
         } else if (payload.room_alias) {
             // Resolve the alias and then do a second dispatch with the room ID acquired
             this._setState({

From 1ff2be189605c5827dbeedc462446b29b388361b Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 16:00:12 +0100
Subject: [PATCH 32/44] Update docs for RVS

---
 src/stores/RoomViewStore.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index a0c9ccc33f..e2a3f574ed 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -23,9 +23,9 @@ import { _t } from '../languageHandler';
 const INITIAL_STATE = {
     // Whether we're joining the currently viewed room
     joining: false,
-    // Any error occurred during joining
+    // Any error that has occurred during joining
     joinError: null,
-    // The room ID of the room
+    // The room ID of the room currently being viewed
     roomId: null,
 
     // The event to scroll to initially
@@ -229,38 +229,47 @@ class RoomViewStore extends Store {
         this._state = Object.assign({}, INITIAL_STATE);
     }
 
+    // The room ID of the room currently being viewed
     getRoomId() {
         return this._state.roomId;
     }
 
+    // The event to scroll to initially
     getInitialEventId() {
         return this._state.initialEventId;
     }
 
+    // The offset to display the initial event at (see scrollStateMap)
     getInitialEventPixelOffset() {
         return this._state.initialEventPixelOffset;
     }
 
+    // Whether to highlight the initial event
     isInitialEventHighlighted() {
         return this._state.isInitialEventHighlighted;
     }
 
+    // The room alias of the room (or null if not originally specified in view_room)
     getRoomAlias() {
         return this._state.roomAlias;
     }
 
+    // Whether the current room is loading (true whilst resolving an alias)
     isRoomLoading() {
         return this._state.roomLoading;
     }
 
+    // Any error that has occurred during loading
     getRoomLoadError() {
         return this._state.roomLoadError;
     }
 
+    // Whether we're joining the currently viewed room
     isJoining() {
         return this._state.joining;
     }
 
+    // Any error that has occurred during joining
     getJoinError() {
         return this._state.joinError;
     }

From 8dc20606c8be5ae78859178b91f2760ea37d0827 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 8 Jun 2017 16:07:29 +0100
Subject: [PATCH 33/44] Use comma for list of three things

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

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 7d283e0e36..6d0e929c93 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -247,7 +247,7 @@ module.exports = React.createClass({
                 </span>;
             } else {
                 errorText = <span>
-                    { _tJsx("Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted and that a browser extension is not blocking requests.",
+                    { _tJsx("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>(.*?)<\/a>/,
                       (sub) => { return <a href={this.state.enteredHomeserverUrl}>{ sub }</a>; }
                     )}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6984d46ed4..c6086faf0a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -180,7 +180,7 @@
   "Bug Report": "Bug Report",
   "Bulk Options": "Bulk Options",
   "Call Timeout": "Call Timeout",
-  "Can't connect to homeserver - please check your connectivity and 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 and 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.": "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 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",

From 9def0bb5c2947ecfc53ce1abbe8e959cc2ab23d8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 8 Jun 2017 16:08:19 +0100
Subject: [PATCH 34/44] Oops, fix email check

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

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 6d0e929c93..bbfff3712e 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -90,7 +90,7 @@ module.exports = React.createClass({
             let errorText;
 
             // Some error strings only apply for logging in
-            const usingEmail = username.indexOf("@");
+            const usingEmail = username.indexOf("@") > 0;
             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) {

From 5e55b6a6435f8d342ab84281d31407f14792b54c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 8 Jun 2017 16:23:43 +0100
Subject: [PATCH 35/44] PR feedback

---
 src/components/structures/login/Login.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index bbfff3712e..27c0c200be 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -93,7 +93,7 @@ module.exports = React.createClass({
             const usingEmail = username.indexOf("@") > 0;
             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) {
+            } else if (error.httpStatus === 401 || error.httpStatus === 403) {
                 errorText = _t('Incorrect username and/or password.');
             } else {
                 // other errors, not specific to doing a password login
@@ -102,8 +102,11 @@ module.exports = React.createClass({
 
             this.setState({
                 errorText: errorText,
-                // https://matrix.org/jira/browse/SYN-744
-                loginIncorrect: error.httpStatus == 401 || error.httpStatus == 403
+                // 401 would be the sensible status code for 'incorrect password'
+                // 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,
             });
         }).finally(() => {
             this.setState({

From c02dbd1cdcde8b82db68e1ef9e2ff6d285ad3789 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 17:26:08 +0100
Subject: [PATCH 36/44] Rename initial state variables

---
 src/components/structures/RoomView.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 942e3c8e07..79420e776a 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -95,11 +95,11 @@ module.exports = React.createClass({
             peekLoading: false,
 
             // The event to be scrolled to initially
-            eventId: null,
+            initialEventId: null,
             // The offset in pixels from the event with which to scroll vertically
-            eventPixelOffset: null,
+            initialEventPixelOffset: null,
             // Whether to highlight the event scrolled to
-            isEventHighlighted: null,
+            isInitialEventHighlighted: null,
 
             forwardingEvent: null,
             editingRoomSettings: false,

From df625b0d318661ba64d2b1155651204f3219f7bf Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 8 Jun 2017 17:26:40 +0100
Subject: [PATCH 37/44] hit MemberInfo with Gemini to fix
 vector-im/riot-web#4223

---
 src/components/views/rooms/MemberInfo.js | 48 +++++++++++++-----------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index ff684aeae4..6dc86f9a97 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -38,6 +38,8 @@ import Unread from '../../../Unread';
 import { findReadReceiptFromUserId } from '../../../utils/Receipt';
 import WithMatrixClient from '../../../wrappers/WithMatrixClient';
 import AccessibleButton from '../elements/AccessibleButton';
+import GeminiScrollbar from 'react-gemini-scrollbar';
+
 
 module.exports = WithMatrixClient(React.createClass({
     displayName: 'MemberInfo',
@@ -727,34 +729,36 @@ module.exports = WithMatrixClient(React.createClass({
         const EmojiText = sdk.getComponent('elements.EmojiText');
         return (
             <div className="mx_MemberInfo">
-                <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}> <img src="img/cancel.svg" width="18" height="18"/></AccessibleButton>
-                <div className="mx_MemberInfo_avatar">
-                    <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
-                </div>
-
-                <EmojiText element="h2">{memberName}</EmojiText>
-
-                <div className="mx_MemberInfo_profile">
-                    <div className="mx_MemberInfo_profileField">
-                        { this.props.member.userId }
+                <GeminiScrollbar autoshow={true}>
+                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}> <img src="img/cancel.svg" width="18" height="18"/></AccessibleButton>
+                    <div className="mx_MemberInfo_avatar">
+                        <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
                     </div>
-                    <div className="mx_MemberInfo_profileField">
-                        { _t("Level:") } <b><PowerSelector controlled={true} value={ parseInt(this.props.member.powerLevel) } disabled={ !this.state.can.modifyLevel } onChange={ this.onPowerChange }/></b>
+
+                    <EmojiText element="h2">{memberName}</EmojiText>
+
+                    <div className="mx_MemberInfo_profile">
+                        <div className="mx_MemberInfo_profileField">
+                            { this.props.member.userId }
+                        </div>
+                        <div className="mx_MemberInfo_profileField">
+                            { _t("Level:") } <b><PowerSelector controlled={true} value={ parseInt(this.props.member.powerLevel) } disabled={ !this.state.can.modifyLevel } onChange={ this.onPowerChange }/></b>
+                        </div>
+                        <div className="mx_MemberInfo_profileField">
+                            <PresenceLabel activeAgo={ presenceLastActiveAgo }
+                                currentlyActive={ presenceCurrentlyActive }
+                                presenceState={ presenceState } />
+                        </div>
                     </div>
-                    <div className="mx_MemberInfo_profileField">
-                        <PresenceLabel activeAgo={ presenceLastActiveAgo }
-                            currentlyActive={ presenceCurrentlyActive }
-                            presenceState={ presenceState } />
-                    </div>
-                </div>
 
-                { adminTools }
+                    { adminTools }
 
-                { startChat }
+                    { startChat }
 
-                { this._renderDevices() }
+                    { this._renderDevices() }
 
-                { spinner }
+                    { spinner }
+                </GeminiScrollbar>
             </div>
         );
     }

From 8cfdb4ce091dc947ffe3f9b4a8a98c04b236f208 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 17:27:04 +0100
Subject: [PATCH 38/44] Clarify initial event

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

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index e2a3f574ed..ec1a86b0e4 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -28,7 +28,7 @@ const INITIAL_STATE = {
     // The room ID of the room currently being viewed
     roomId: null,
 
-    // The event to scroll to initially
+    // The event to scroll to when the room is first viewed
     initialEventId: null,
     // The offset to display the initial event at (see scrollStateMap)
     initialEventPixelOffset: null,

From cd8093d953abf69784aca82bbb1b076773a6cd28 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 17:28:21 +0100
Subject: [PATCH 39/44] Explicit undefined initialEventPixelOffset

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

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index ec1a86b0e4..ec545dcfd5 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -124,7 +124,7 @@ class RoomViewStore extends Store {
             const newState = {
                 roomId: payload.room_id,
                 initialEventId: payload.event_id,
-                initialEventPixelOffset: payload.event_offset,
+                initialEventPixelOffset: undefined,
                 isInitialEventHighlighted: payload.highlighted,
                 roomLoading: false,
                 roomLoadError: null,

From c72edab7267dc408fbd2d4900f9deb7fefeb16d4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 17:28:56 +0100
Subject: [PATCH 40/44] Update doc for getInitialEventId

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

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index ec545dcfd5..15a46894a1 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -234,7 +234,7 @@ class RoomViewStore extends Store {
         return this._state.roomId;
     }
 
-    // The event to scroll to initially
+    // The event to scroll to when the room is first viewed
     getInitialEventId() {
         return this._state.initialEventId;
     }

From cd6786114b6b1d49d747be3750d7df763a101e04 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 17:40:53 +0100
Subject: [PATCH 41/44] When joining, use a roomAlias if we have it

And default to the current roomId otherwise
---
 src/stores/RoomViewStore.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index cc8959af7a..2c5dd9e534 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -137,7 +137,9 @@ class RoomViewStore extends Store {
         this._setState({
             joining: true,
         });
-        MatrixClientPeg.get().joinRoom(this._state.roomId, payload.opts).done(() => {
+        MatrixClientPeg.get().joinRoom(
+            this._state.roomAlias || this._state.roomId, payload.opts,
+        ).done(() => {
             dis.dispatch({
                 action: 'joined_room',
             });

From 3218cae6e3bdce6265826df4d02f6f008240e328 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 17:47:48 +0100
Subject: [PATCH 42/44] Expect to join by alias if given to RVS

---
 test/stores/RoomViewStore-test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 2f545ffd74..adcae90e9b 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -28,8 +28,8 @@ describe('RoomViewStore', function() {
     });
 
     it('can be used to view a room by ID and join', function(done) {
-        peg.get().joinRoom = (roomId) => {
-            expect(roomId).toBe("!randomcharacters:aser.ver");
+        peg.get().joinRoom = (roomAddress) => {
+            expect(roomAddress).toBe("!randomcharacters:aser.ver");
             done();
         };
 
@@ -40,8 +40,8 @@ describe('RoomViewStore', function() {
 
     it('can be used to view a room by alias and join', function(done) {
         peg.get().getRoomIdForAlias.returns(q({room_id: "!randomcharacters:aser.ver"}));
-        peg.get().joinRoom = (roomId) => {
-            expect(roomId).toBe("!randomcharacters:aser.ver");
+        peg.get().joinRoom = (roomAddress) => {
+            expect(roomAddress).toBe("#somealias2:aser.ver");
             done();
         };
 

From 9892566007f2790e2e8295b7e7093977f61672d5 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 17:54:41 +0100
Subject: [PATCH 43/44] Highlighted means highlighted

---
 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 5f13f53d0b..b803b676f7 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -608,6 +608,7 @@ module.exports = React.createClass({
     // @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
+    //                                        and alter the EventTile to appear highlighted.
     // @param {Object=} roomInfo.third_party_invite Object containing data about the third party
     //                                    we received to join the room, if any.
     // @param {string=} roomInfo.third_party_invite.inviteSignUrl 3pid invite sign URL

From 5588e115eb9be9a1cf10fe4c7e33b9a3e44cbc86 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 8 Jun 2017 17:57:37 +0100
Subject: [PATCH 44/44] Clarify doc for highlighted

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b803b676f7..b6e3552a95 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1119,7 +1119,9 @@ module.exports = React.createClass({
             const payload = {
                 action: 'view_room',
                 event_id: eventId,
-                // If an event ID is set (truthy), mark it as highlighted
+                // If an event ID is given in the URL hash, notify RoomViewStore to mark
+                // it as highlighted, which will propagate to RoomView and highlight the
+                // associated EventTile.
                 highlighted: Boolean(eventId),
                 third_party_invite: thirdPartyInvite,
                 oob_data: oobData,