From 0fb6a305a316c39f32259aea5434336c864a7d9c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 26 May 2017 09:45:30 +0100
Subject: [PATCH 01/15] uber basic multi-profile support for electron app

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 electron_app/package.json         | 3 ++-
 electron_app/src/electron-main.js | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index df9c3bd261..e001f51de6 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -6,6 +6,7 @@
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {
-    "electron-window-state": "^4.1.0"
+    "electron-window-state": "^4.1.0",
+    "minimist": "^1.2.0"
   }
 }
diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 26f8f972f3..9170d4b495 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -23,6 +23,7 @@ limitations under the License.
 const check_squirrel_hooks = require('./squirrelhooks');
 if (check_squirrel_hooks()) return;
 
+const argv = require('minimist')(process.argv);
 const electron = require('electron');
 
 const tray = require('./tray');
@@ -32,6 +33,10 @@ const webContentsHandler = require('./webcontents-handler');
 
 const windowStateKeeper = require('electron-window-state');
 
+if (argv.profile) {
+    electron.app.setPath('userData', `${electron.app.getPath('userData')}-${argv.profile}`);
+}
+
 let vectorConfig = {};
 try {
     vectorConfig = require('../../webapp/config.json');
@@ -191,7 +196,7 @@ electron.app.on('ready', () => {
         brand: vectorConfig.brand || 'Riot'
     });
 
-    if (!process.argv.includes('--hidden')) {
+    if (!argv.hidden) {
         mainWindow.once('ready-to-show', () => {
             mainWindow.show();
         });

From e63baf62c44e54a6704597570067f8380989b6e3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 26 May 2017 09:49:23 +0100
Subject: [PATCH 02/15] quit -> exit as screen is not accessible in alt
 instance when using makeSingleInstance which leads to a weird error Unhandled
 exception { Error: Cannot find module '../screen'

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

diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 9170d4b495..0df1662b80 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -156,7 +156,7 @@ const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirector
 
 if (shouldQuit) {
     console.log("Other instance detected: exiting");
-    electron.app.quit()
+    electron.app.exit();
 }
 
 electron.app.on('ready', () => {

From 52ddcd8a600bba9b66f66b04a7cc5640a705b81b Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 14:51:08 +0100
Subject: [PATCH 03/15] Translate src/vector/platform

---
 src/i18n/strings/en_EN.json               | 4 ++++
 src/vector/index.js                       | 1 -
 src/vector/platform/ElectronPlatform.js   | 5 +++--
 src/vector/platform/VectorBasePlatform.js | 6 ++++--
 src/vector/platform/WebPlatform.js        | 9 ++++++---
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index adf0800d3e..494ad65dea 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,4 +1,5 @@
 {
+  "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s on %(osName)s",
   "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.",
   "Add an email address above to configure email notifications": "Add an email address above to configure email notifications",
   "Advanced notification settings": "Advanced notification settings",
@@ -88,6 +89,7 @@
   "remove %(name)s from the directory": "remove %(name)s from the directory",
   "Remove from Directory": "Remove from Directory",
   "Resend": "Resend",
+  "Riot Desktop on %(platformName)": "Riot Desktop on %(platformName)",
   "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
   "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
   "Room directory": "Room directory",
@@ -106,6 +108,7 @@
   "Unable to join network": "Unable to join network",
   "Unable to look up room ID from server": "Unable to look up room ID from server",
   "Unhide Preview": "Unhide Preview",
+  "Unknown device": "Unknown device",
   "unknown error code": "unknown error code",
   "Unnamed room": "Unnamed room",
   "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
@@ -126,6 +129,7 @@
   "Saturday": "Saturday",
   "Today": "Today",
   "Yesterday": "Yesterday",
+  "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
   "Welcome page": "Welcome page",
   "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!"
 }
diff --git a/src/vector/index.js b/src/vector/index.js
index 432710fbc2..716e9c53e5 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -278,7 +278,6 @@ async function loadApp() {
         </div>, document.getElementById('matrixchat'));
     } else if (validBrowser) {
         UpdateChecker.start();
-
         const MatrixChat = sdk.getComponent('structures.MatrixChat');
         window.matrixChat = ReactDOM.render(
             <MatrixChat
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index 06ea21367b..6bc04730e0 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -19,6 +19,7 @@ limitations under the License.
 
 import VectorBasePlatform from './VectorBasePlatform';
 import dis from 'matrix-react-sdk/lib/dispatcher';
+import _t from 'matrix-react-sdk/lib/languageHandler';
 import q from 'q';
 import electron, {remote, ipcRenderer} from 'electron';
 
@@ -68,7 +69,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
     }
 
     getHumanReadableName(): string {
-        return 'Electron Platform';
+        return 'Electron Platform'; // no translation required: only used for analytics
     }
 
     setNotificationCount(count: number) {
@@ -146,7 +147,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
     }
 
     getDefaultDeviceDisplayName(): string {
-        return 'Riot Desktop on ' + platformFriendlyName();
+        return _t('Riot Desktop on %(platformName)s', { platformName: platformFriendlyName() });
     }
 
     screenCaptureErrorString(): ?string {
diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js
index 04caecdc2d..bf15e6cf77 100644
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -18,6 +18,8 @@ limitations under the License.
 */
 
 import BasePlatform from 'matrix-react-sdk/lib/BasePlatform';
+import _t from 'matrix-react-sdk/lib/languageHandler';
+
 import Favico from 'favico.js';
 
 /**
@@ -36,7 +38,7 @@ export default class VectorBasePlatform extends BasePlatform {
     }
 
     getHumanReadableName(): string {
-        return 'Vector Base Platform';
+        return 'Vector Base Platform'; // no translation required: only used for analytics
     }
 
     _updateFavicon() {
@@ -94,6 +96,6 @@ export default class VectorBasePlatform extends BasePlatform {
      * device Vector is running on
      */
     getDefaultDeviceDisplayName(): string {
-        return "Unknown device";
+        return _t("Unknown device");
     }
 }
diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js
index 1a3c46fb0b..8397a7f703 100644
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -20,6 +20,7 @@ limitations under the License.
 import VectorBasePlatform from './VectorBasePlatform';
 import request from 'browser-request';
 import dis from 'matrix-react-sdk/lib/dispatcher.js';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import q from 'q';
 
 import url from 'url';
@@ -32,7 +33,7 @@ export default class WebPlatform extends VectorBasePlatform {
     }
 
     getHumanReadableName(): string {
-        return 'Web Platform';
+        return 'Web Platform'; // no translation required: only used for analytics
     }
 
     /**
@@ -159,13 +160,15 @@ export default class WebPlatform extends VectorBasePlatform {
         const appName = u.format();
 
         const ua = new UAParser();
-        return `${appName} via ${ua.getBrowser().name} on ${ua.getOS().name}`;
+        const browserName = ua.getBrowser().name;
+        const osName = ua.getOS().name;
+        return _t('%(appName)s via %(browserName)s on %(osName)s', {appName: appName, browserName: browserName, osName: osName});
     }
 
     screenCaptureErrorString(): ?string {
         // it won't work at all if you're not on HTTPS so whine whine whine
         if (!global.window || global.window.location.protocol !== "https:") {
-            return "You need to be using HTTPS to place a screen-sharing call.";
+            return _t("You need to be using HTTPS to place a screen-sharing call.");
         }
         return null;
     }

From fd5e7ff37afcb5047d89f73608888aa9622df3a5 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 15:06:03 +0100
Subject: [PATCH 04/15] Translate src/vector

---
 src/i18n/strings/en_EN.json    | 5 +++++
 src/vector/index.html          | 2 +-
 src/vector/index.js            | 4 ++--
 src/vector/submit-rageshake.js | 9 +++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 494ad65dea..2c8bb19aae 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -12,6 +12,8 @@
   "Can't update user notification settings": "Can't update user notification settings",
   "Close": "Close",
   "Collapse panel": "Collapse panel",
+  "Collecting app version information": "Collecting app version information",
+  "Collecting logs": "Collecting logs",
   "Create new room": "Create new room",
   "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
   "Custom Server Options": "Custom Server Options",
@@ -91,6 +93,7 @@
   "Resend": "Resend",
   "Riot Desktop on %(platformName)": "Riot Desktop on %(platformName)",
   "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
+  "Riot is not supported on mobile web. Install the app?": "Riot is not supported on mobile web. Install the app?",
   "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
   "Room directory": "Room directory",
   "Room not found": "Room not found",
@@ -112,8 +115,10 @@
   "unknown error code": "unknown error code",
   "Unnamed room": "Unnamed room",
   "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
+  "Uploading report": "Uploading report",
   "View Decrypted Source": "View Decrypted Source",
   "View Source": "View Source",
+  "Waiting for response from server": "Waiting for response from server",
   "When I'm invited to a room": "When I'm invited to a room",
   "World readable": "World readable",
   "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
diff --git a/src/vector/index.html b/src/vector/index.html
index 38810f62c1..49c2979ed1 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -36,7 +36,7 @@
   </head>
   <body style="height: 100%;">
     <section id="matrixchat" style="height: 100%;"></section>
-    <noscript>Sorry, Riot requires JavaScript to be enabled.</noscript>
+    <noscript>Sorry, Riot requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
     <% for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) {
         // Not a particularly graceful way of not putting the indexeddb worker script
         // into the main page
diff --git a/src/vector/index.js b/src/vector/index.js
index 716e9c53e5..9f16205164 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -245,13 +245,13 @@ async function loadApp() {
 
     if (!preventRedirect) {
         if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
-            if (confirm("Riot is not supported on mobile web. Install the app?")) {
+            if (confirm(languageHandler._t("Riot is not supported on mobile web. Install the app?"))) {
                 window.location = "https://itunes.apple.com/us/app/vector.im/id1083446067";
                 return;
             }
         }
         else if (/Android/.test(navigator.userAgent)) {
-            if (confirm("Riot is not supported on mobile web. Install the app?")) {
+            if (confirm(languageHandler._t("Riot is not supported on mobile web. Install the app?"))) {
                 window.location = "https://play.google.com/store/apps/details?id=im.vector.alpha";
                 return;
             }
diff --git a/src/vector/submit-rageshake.js b/src/vector/submit-rageshake.js
index 45b427e899..c6c551c61f 100644
--- a/src/vector/submit-rageshake.js
+++ b/src/vector/submit-rageshake.js
@@ -19,6 +19,7 @@ import q from "q";
 
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 import rageshake from './rageshake'
 
@@ -53,7 +54,7 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
     opts = opts || {};
     const progressCallback = opts.progressCallback || (() => {});
 
-    progressCallback("Collecting app version information");
+    progressCallback(_t("Collecting app version information"));
     let version = "UNKNOWN";
     try {
         version = await PlatformPeg.get().getAppVersion();
@@ -81,7 +82,7 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
     }
 
     if (opts.sendLogs) {
-        progressCallback("Collecting logs");
+        progressCallback(_t("Collecting logs"));
         const logs = await rageshake.getLogsForReport();
         for (let entry of logs) {
             // encode as UTF-8
@@ -94,7 +95,7 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         }
     }
 
-    progressCallback("Uploading report");
+    progressCallback(_t("Uploading report"));
     await _submitReport(bugReportEndpoint, body, progressCallback);
 }
 
@@ -106,7 +107,7 @@ function _submitReport(endpoint, body, progressCallback) {
     req.timeout = 5 * 60 * 1000;
     req.onreadystatechange = function() {
         if (req.readyState === XMLHttpRequest.LOADING) {
-            progressCallback("Waiting for response from server");
+            progressCallback(_t("Waiting for response from server"));
         } else if (req.readyState === XMLHttpRequest.DONE) {
             on_done();
         }

From 162f3872e5d2182b30346e6f2903b30691d40cf6 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 15:40:49 +0100
Subject: [PATCH 05/15] Translate src/components/context_menus|dialogs

---
 .../views/context_menus/MessageContextMenu.js |  2 +-
 .../views/dialogs/BugReportDialog.js          | 34 +++++++++++--------
 .../views/dialogs/ChangelogDialog.js          |  7 ++--
 src/i18n/strings/en_EN.json                   | 14 ++++++++
 4 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 5445fd4fb8..e3f4d14042 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -182,7 +182,7 @@ module.exports = React.createClass({
             if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {
                 forwardButton = (
                     <div className="mx_MessageContextMenu_field" onClick={this.onForwardClick}>
-                        Forward Message
+                        { _t('Forward Message') }
                     </div>
                 );
             }
diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 7a65ac587f..0db425e33f 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import sdk from 'matrix-react-sdk';
 import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 export default class BugReportDialog extends React.Component {
     constructor(props, context) {
@@ -49,12 +50,12 @@ export default class BugReportDialog extends React.Component {
         const userText = this.state.text;
         if (!sendLogs && userText.trim().length === 0) {
             this.setState({
-                err: "Please describe the bug and/or send logs.",
+                err: _t("Please describe the bug and/or send logs."),
             });
             return;
         }
         this.setState({ busy: true, progress: null, err: null });
-        this._sendProgressCallback("Loading bug report module");
+        this._sendProgressCallback(_t("Loading bug report module"));
 
         require(['../../../vector/submit-rageshake'], (s) => {
             s(SdkConfig.get().bug_report_endpoint_url, {
@@ -69,8 +70,9 @@ export default class BugReportDialog extends React.Component {
             }, (err) => {
                 if (!this._unmounted) {
                     this.setState({
-                        busy: false, progress: null,
-                        err: `Failed to send report: ${err.message}`,
+                        busy: false,
+                        progress: null,
+                        err: _t("Failed to send report: ") + `${err.message}`,
                     });
                 }
             });
@@ -105,7 +107,7 @@ export default class BugReportDialog extends React.Component {
         let cancelButton = null;
         if (!this.state.busy) {
             cancelButton = <button onClick={this._onCancel}>
-                Cancel
+                { _t("Cancel") }
             </button>;
         }
 
@@ -122,25 +124,27 @@ export default class BugReportDialog extends React.Component {
         return (
             <div className="mx_BugReportDialog">
                 <div className="mx_Dialog_title">
-                    Report a bug
+                    { _t("Report a bug") }
                 </div>
                 <div className="mx_Dialog_content">
-                    <p>Please describe the bug. What did you do?
-                    What did you expect to happen?
-                    What actually happened?</p>
+                    <p>
+                    { _t("Please describe the bug. What did you do? What did you expect to happen? What actually happened?") }
+                    </p>
                     <textarea
                         className="mx_BugReportDialog_input"
                         rows={5}
                         onChange={this._onTextChange}
                         value={this.state.text}
-                        placeholder="Describe your problem here."
+                        placeholder={_t("Describe your problem here.")}
                     />
-                    <p>In order to diagnose problems, logs from this client will be sent with
-                    this bug report.
-                    If you would prefer to only send the text above, please untick:</p>
+                    <p>
+                    { _t("In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:") }
+                    </p>
                     <input type="checkbox" checked={this.state.sendLogs}
                         onChange={this._onSendLogsChange} id="mx_BugReportDialog_logs"/>
-                    <label htmlFor="mx_BugReportDialog_logs">Send logs</label>
+                    <label htmlFor="mx_BugReportDialog_logs">
+                        { _t("Send logs") }
+                    </label>
                     {progress}
                     {error}
                 </div>
@@ -151,7 +155,7 @@ export default class BugReportDialog extends React.Component {
                         autoFocus={true}
                         disabled={this.state.busy}
                     >
-                        Send
+                        { _t("Send") }
                     </button>
 
                     {cancelButton}
diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js
index d14d8dc2ce..c42833d7c4 100644
--- a/src/components/views/dialogs/ChangelogDialog.js
+++ b/src/components/views/dialogs/ChangelogDialog.js
@@ -17,6 +17,7 @@
 import React from 'react';
 import sdk from 'matrix-react-sdk';
 import request from 'browser-request';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 const REPOS = ['vector-im/vector-web', 'matrix-org/matrix-react-sdk', 'matrix-org/matrix-js-sdk'];
 
@@ -70,16 +71,16 @@ export default class ChangelogDialog extends React.Component {
 
         const content = (
             <div className="mx_ChangelogDialog_content">
-                {this.props.version == null || this.props.newVersion == null ? <h2>Unavailable</h2> : logs}
+                {this.props.version == null || this.props.newVersion == null ? <h2>{_t("Unavailable")}</h2> : logs}
             </div>
         );
 
 
         return (
             <QuestionDialog
-                title="Changelog"
+                title={_t("Changelog")}
                 description={content}
-                button="Update"
+                button={_t("Update")}
                 onFinished={this.props.onFinished}
                 />
         )
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index adf0800d3e..80899de1a6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -7,8 +7,10 @@
   "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
   "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
   "Call invitation": "Call invitation",
+  "Cancel": "Cancel",
   "Cancel Sending": "Cancel Sending",
   "Can't update user notification settings": "Can't update user notification settings",
+  "Changelog": "Changelog",
   "Close": "Close",
   "Collapse panel": "Collapse panel",
   "Create new room": "Create new room",
@@ -17,6 +19,7 @@
   "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
   "delete the alias": "delete the alias",
   "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
+  "Describe your problem here.": "Describe your problem here.",
   "Direct Chat": "Direct Chat",
   "Directory": "Directory",
   "Dismiss": "Dismiss",
@@ -41,6 +44,7 @@
   "Failed to get public room list": "Failed to get public room list",
   "Failed to join the room": "Failed to join the room",
   "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
+  "Failed to send report: ": "Failed to send report: ",
   "Failed to set direct chat tag": "Failed to set direct chat tag",
   "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
   "Favourite": "Favourite",
@@ -48,13 +52,16 @@
   "Files": "Files",
   "Filter room names": "Filter room names",
   "Forget": "Forget",
+  "Forward Message": "Forward Message",
   " from room": " from room",
   "Guests can join": "Guests can join",
   "Guest users can't invite users. Please register to invite": "Guest users can't invite users. Please register to invite",
   "I understand the risks and wish to continue": "I understand the risks and wish to continue",
+  "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:",
   "Invite to this room": "Invite to this room",
   "Keywords": "Keywords",
   "Leave": "Leave",
+  "Loading bug report module": "Loading bug report module",
   "Low Priority": "Low Priority",
   "Members": "Members",
   "Mentions only": "Mentions only",
@@ -77,6 +84,8 @@
   "On": "On",
   "Operation failed": "Operation failed",
   "Permalink": "Permalink",
+  "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Please describe the bug. What did you do? What did you expect to happen? What actually happened?",
+  "Please describe the bug and/or send logs.": "Please describe the bug and/or send logs.",
   "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.",
   "Please Register": "Please Register",
   "powered by Matrix": "powered by Matrix",
@@ -87,12 +96,15 @@
   "Remove": "Remove",
   "remove %(name)s from the directory": "remove %(name)s from the directory",
   "Remove from Directory": "Remove from Directory",
+  "Report a bug": "Report a bug",
   "Resend": "Resend",
   "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
   "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
   "Room directory": "Room directory",
   "Room not found": "Room not found",
   "Search for a room": "Search for a room",
+  "Send": "Send",
+  "Send logs": "Send logs",
   "Settings": "Settings",
   "Source URL": "Source URL",
   "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
@@ -105,9 +117,11 @@
   "Unable to fetch notification target list": "Unable to fetch notification target list",
   "Unable to join network": "Unable to join network",
   "Unable to look up room ID from server": "Unable to look up room ID from server",
+  "Unavailable": "Unavailable",
   "Unhide Preview": "Unhide Preview",
   "unknown error code": "unknown error code",
   "Unnamed room": "Unnamed room",
+  "Update": "Update",
   "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
   "View Decrypted Source": "View Decrypted Source",
   "View Source": "View Source",

From 1dce9cda9e0823feeb66efcf3eb38245c722d7d9 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 16:02:59 +0100
Subject: [PATCH 06/15] Translate src/components/views/globals

directory and elements already done
---
 .../views/globals/GuestWarningBar.js          | 15 +++++++++--
 src/components/views/globals/NewVersionBar.js | 25 ++++++++++++++-----
 src/i18n/strings/en_EN.json                   |  4 +++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/components/views/globals/GuestWarningBar.js b/src/components/views/globals/GuestWarningBar.js
index 810021cc4a..6cf11fed62 100644
--- a/src/components/views/globals/GuestWarningBar.js
+++ b/src/components/views/globals/GuestWarningBar.js
@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 var React = require('react');
-var dis = require('matrix-react-sdk/lib/dispatcher')
+var dis = require('matrix-react-sdk/lib/dispatcher');
+import { _tJsx } from 'matrix-react-sdk/lib/languageHandler';
 
 module.exports = React.createClass({
     displayName: 'GuestWarningBar',
@@ -34,7 +35,17 @@ module.exports = React.createClass({
             <div className="mx_GuestWarningBar">
                 <img className="mx_GuestWarningBar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
                 <div>
-                    You are Rioting as a guest. <a onClick={this.onRegisterClicked}>Register</a> or <a onClick={this.onLoginClicked}>sign in</a> to access more rooms and features.
+                    { _tJsx(
+                        "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!",
+                        [
+                            /<a>(.*?)<\/a>/,
+                            /<a>(.*?)<\/a>/
+                        ],
+                        [
+                            (sub) => <a onClick={this.onRegisterClicked}>{sub}</a>,
+                            (sub) => <a onClick={this.onLoginClicked}>{sub}</a>
+                        ]
+                    ) }
                 </div>
             </div>
         );
diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
index 3e03be72be..219ef02a9a 100644
--- a/src/components/views/globals/NewVersionBar.js
+++ b/src/components/views/globals/NewVersionBar.js
@@ -20,6 +20,7 @@ import React from 'react';
 import sdk from 'matrix-react-sdk';
 import Modal from 'matrix-react-sdk/lib/Modal';
 import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 /**
  * Check a version string is compatible with the Changelog
@@ -40,9 +41,9 @@ export default React.createClass({
     displayReleaseNotes: function(releaseNotes) {
         const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
         Modal.createDialog(QuestionDialog, {
-            title: "What's New",
+            title: _t("What's New"),
             description: <pre className="changelog_text">{releaseNotes}</pre>,
-            button: "Update",
+            button: _t("Update"),
             onFinished: (update) => {
                 if(update && PlatformPeg.get()) {
                     PlatformPeg.get().installUpdate();
@@ -75,17 +76,29 @@ export default React.createClass({
         // automatically tells you what's changed (provided the versions
         // are in the right format)
         if (this.props.releaseNotes) {
-            action_button = <button className="mx_MatrixToolbar_action" onClick={this.displayReleaseNotes}>What's new?</button>;
+            action_button = (
+                <button className="mx_MatrixToolbar_action" onClick={this.displayReleaseNotes}>
+                    { _t("What's new?") }
+                </button>
+            );
         } else if (checkVersion(this.props.version) && checkVersion(this.props.newVersion)) {
-            action_button = <button className="mx_MatrixToolbar_action" onClick={this.displayChangelog}>What's new?</button>;
+            action_button = (
+                <button className="mx_MatrixToolbar_action" onClick={this.displayChangelog}>
+                    { _t("What's new?") }
+                </button>
+            );
         } else if (PlatformPeg.get()) {
-            action_button = <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>Update</button>;
+            action_button = (
+                <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>
+                    { _t("Update") }
+                </button>
+            );
         }
         return (
             <div className="mx_MatrixToolbar">
                 <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
                 <div className="mx_MatrixToolbar_content">
-                    A new version of Riot is available.
+                    {_t("A new version of Riot is available.")}
                 </div>
                 {action_button}
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 80899de1a6..3d14423bde 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,5 +1,6 @@
 {
   "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.",
+  "A new version of Riot is available.": "A new version of Riot is available.",
   "Add an email address above to configure email notifications": "Add an email address above to configure email notifications",
   "Advanced notification settings": "Advanced notification settings",
   "All messages": "All messages",
@@ -125,11 +126,14 @@
   "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
   "View Decrypted Source": "View Decrypted Source",
   "View Source": "View Source",
+  "What's New": "What's New",
+  "What's new?": "What's new?",
   "When I'm invited to a room": "When I'm invited to a room",
   "World readable": "World readable",
   "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
   "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
   "You are not receiving desktop notifications": "You are not receiving desktop notifications",
+  "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!",
   "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
   "Sunday": "Sunday",
   "Monday": "Monday",

From c4c2b760ba940e1c7ca01c1bf72b7bb448285201 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 16:07:12 +0100
Subject: [PATCH 07/15] Add translation from #4103

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 3bfb0f0a63..ffaae2b2d4 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -42,6 +42,7 @@
     "Files": "Arquivos",
     "Filter room names": "Filtrar salas por título",
     "Forget": "Esquecer",
+    "Forward Message": "Encaminhar",
     " from room": " da sala",
     "Guests can join": "Convidados podem entrar",
     "Guest users can't invite users. Please register to invite": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites",

From a3ebeb5c69ee99f20f6b5daf755218b461e59da2 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 16:38:51 +0100
Subject: [PATCH 08/15] Sanitize translated HTML

---
 src/components/views/login/VectorCustomServerDialog.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/login/VectorCustomServerDialog.js b/src/components/views/login/VectorCustomServerDialog.js
index d7fe545a0a..80cd68006f 100644
--- a/src/components/views/login/VectorCustomServerDialog.js
+++ b/src/components/views/login/VectorCustomServerDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 var React = require("react");
+var sanitizeHtml = require("sanitize-html");
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 module.exports = React.createClass({
@@ -30,7 +31,7 @@ module.exports = React.createClass({
                     { _t('Custom Server Options') }
                 </div>
                 <div className="mx_Dialog_content">
-                    <span dangerouslySetInnerHTML={{__html: _t('customServer_text')}} />
+                    <span dangerouslySetInnerHTML={{__html: sanitizeHtml(_t('customServer_text'))}} />
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.props.onFinished} autoFocus={true}>

From a7659a57a886f1474d088ff564b4e442e250e3a2 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 16:56:50 +0100
Subject: [PATCH 09/15] Add remaining translations

---
 src/components/views/rooms/SearchBar.js | 9 +++++----
 src/i18n/strings/en_EN.json             | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js
index 1653f269a8..26bf81e428 100644
--- a/src/components/views/rooms/SearchBar.js
+++ b/src/components/views/rooms/SearchBar.js
@@ -21,6 +21,7 @@ var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var sdk = require('matrix-react-sdk');
 var classNames = require('classnames');
 var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
+import { _t } from "matrix-react-sdk/lib/languageHandler";
 
 module.exports = React.createClass({
     displayName: 'SearchBar',
@@ -59,10 +60,10 @@ module.exports = React.createClass({
 
         return (
             <div className="mx_SearchBar"> 
-                <input ref="search_term" className="mx_SearchBar_input" type="text" autoFocus={true} placeholder="Search..." onKeyDown={this.onSearchChange}/>
-                <AccessibleButton className={ searchButtonClasses } onClick={this.onSearch}><img src="img/search-button.svg" width="37" height="37" alt="Search"/></AccessibleButton>
-                <AccessibleButton className={ thisRoomClasses } onClick={this.onThisRoomClick}>This Room</AccessibleButton>
-                <AccessibleButton className={ allRoomsClasses } onClick={this.onAllRoomsClick}>All Rooms</AccessibleButton>
+                <input ref="search_term" className="mx_SearchBar_input" type="text" autoFocus={true} placeholder={_t("Search…")} onKeyDown={this.onSearchChange}/>
+                <AccessibleButton className={ searchButtonClasses } onClick={this.onSearch}><img src="img/search-button.svg" width="37" height="37" alt={_t("Search")}/></AccessibleButton>
+                <AccessibleButton className={ thisRoomClasses } onClick={this.onThisRoomClick}>{_t("This Room")}</AccessibleButton>
+                <AccessibleButton className={ allRoomsClasses } onClick={this.onAllRoomsClick}>{_t("All Rooms")}</AccessibleButton>
                 <AccessibleButton className="mx_SearchBar_cancel" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3d14423bde..aaf564444a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -5,6 +5,7 @@
   "Advanced notification settings": "Advanced notification settings",
   "All messages": "All messages",
   "All messages (loud)": "All messages (loud)",
+  "All Rooms": "All Rooms",
   "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
   "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
   "Call invitation": "Call invitation",
@@ -103,6 +104,8 @@
   "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
   "Room directory": "Room directory",
   "Room not found": "Room not found",
+  "Search": "Search",
+  "Search…": "Search…",
   "Search for a room": "Search for a room",
   "Send": "Send",
   "Send logs": "Send logs",
@@ -113,6 +116,7 @@
   "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
   "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
   "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
+  "This Room": "This Room",
   "This room is inaccessible to guests. You may be able to join if you register": "This room is inaccessible to guests. You may be able to join if you register",
   " to room": " to room",
   "Unable to fetch notification target list": "Unable to fetch notification target list",

From 7dc55a9a47259fdf4be0b5112e0962df5e69914e Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 31 May 2017 17:53:32 +0100
Subject: [PATCH 10/15] Import correctly

---
 src/vector/platform/ElectronPlatform.js   | 2 +-
 src/vector/platform/VectorBasePlatform.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index 6bc04730e0..0f04445838 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -19,7 +19,7 @@ limitations under the License.
 
 import VectorBasePlatform from './VectorBasePlatform';
 import dis from 'matrix-react-sdk/lib/dispatcher';
-import _t from 'matrix-react-sdk/lib/languageHandler';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import q from 'q';
 import electron, {remote, ipcRenderer} from 'electron';
 
diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js
index bf15e6cf77..76707d1d58 100644
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -18,7 +18,7 @@ limitations under the License.
 */
 
 import BasePlatform from 'matrix-react-sdk/lib/BasePlatform';
-import _t from 'matrix-react-sdk/lib/languageHandler';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 import Favico from 'favico.js';
 

From 89e5c4f8aede1dd8c68f56626bd988203e30c172 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 31 May 2017 23:50:06 +0100
Subject: [PATCH 11/15] Fix fetch-develop-deps.sh

This got broken by https://github.com/vector-im/riot-web/pull/4120 so that it
didn't work on a clean git clone.
---
 scripts/fetch-develop.deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
index 29309f2117..b39e08399c 100755
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -42,13 +42,13 @@ dodep matrix-org matrix-react-sdk
 mkdir -p node_modules
 cd node_modules
 
-rm -r matrix-js-sdk 2> /dev/null
+rm -r matrix-js-sdk 2> /dev/null || true
 ln -s ../matrix-js-sdk ./
 pushd matrix-js-sdk
 npm install
 popd
 
-rm -r matrix-react-sdk 2> /dev/null
+rm -r matrix-react-sdk 2> /dev/null || true
 ln -s ../matrix-react-sdk ./
 pushd matrix-react-sdk
 mkdir -p node_modules

From 33ee42f821300021102877030db96419c238eaab Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 00:00:00 +0100
Subject: [PATCH 12/15] use loudNotification for flashFrame, resetting on
 count=0 or focus win32 check is optional just there so we're not attaching
 pointless handlers

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 electron_app/src/electron-main.js       | 24 ++++++++++++------------
 src/vector/platform/ElectronPlatform.js |  4 ++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index f21fe1c01a..a5708164a2 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -119,19 +119,19 @@ electron.ipcMain.on('install_update', installUpdate);
 let focusHandlerAttached = false;
 electron.ipcMain.on('setBadgeCount', function(ev, count) {
     electron.app.setBadgeCount(count);
-    if (process.platform === 'win32' && mainWindow && !mainWindow.isFocused()) {
-        if (count > 0) {
-            if (!focusHandlerAttached) {
-                mainWindow.once('focus', () => {
-                    mainWindow.flashFrame(false);
-                    focusHandlerAttached = false;
-                });
-                focusHandlerAttached = true;
-            }
-            mainWindow.flashFrame(true);
-        } else {
+    if (count === 0) {
+        mainWindow.flashFrame(false);
+    }
+});
+
+electron.ipcMain.on('loudNotification', function() {
+    if (process.platform === 'win32' && mainWindow && !mainWindow.isFocused() && !focusHandlerAttached) {
+        mainWindow.flashFrame(true);
+        mainWindow.once('focus', () => {
             mainWindow.flashFrame(false);
-        }
+            focusHandlerAttached = false;
+        });
+        focusHandlerAttached = true;
     }
 });
 
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index 06ea21367b..7cfe36eff9 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -124,6 +124,10 @@ export default class ElectronPlatform extends VectorBasePlatform {
         return notification;
     }
 
+    loudNotification(ev: Event, room: Object) {
+        ipcRenderer.send('loudNotification');
+    }
+
     clearNotification(notif: Notification) {
         notif.close();
     }

From d12c349e1fac10bd4f2df34b695e010aceb815df Mon Sep 17 00:00:00 2001
From: RiotTranslate <info@nordgedanken.de>
Date: Thu, 1 Jun 2017 01:37:08 +0200
Subject: [PATCH 13/15] Update from Weblate. (#4105)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 99.1% (119 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (128 of 128 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 92.9% (119 of 128 strings)

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

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 87.5% (112 of 128 strings)

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

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (129 of 129 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (129 of 129 strings)

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

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 94.5% (122 of 129 strings)

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

* Translated using Weblate (French)

Currently translated at 93.0% (120 of 129 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (129 of 129 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (129 of 129 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (129 of 129 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (129 of 129 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (129 of 129 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/fr/
---
 src/i18n/strings/fr.json    | 31 ++++++++++++++++++++-----------
 src/i18n/strings/pt_BR.json | 12 +++++++++++-
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 55c0671bbe..d64602467a 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -3,7 +3,7 @@
     "All messages": "Tous les messages",
     "All messages (loud)": "Tous les messages (fort)",
     "All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.",
-    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications mail.",
+    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications par e-mail.",
     "Cancel Sending": "Annuler l'envoi",
     "Can't update user notification settings": "Impossible de mettre à jour les notifications utilisateur",
     "Close": "Fermer",
@@ -22,17 +22,17 @@
     "Enable email notifications": "Activer les notifications par e-mail",
     "Enable notifications for this account": "Activer les notifications pour ce compte",
     "Enable them now": "Les activer maintenant",
-    "Enter keywords separated by a comma:": "Entrez les mots clés séparés par une virgule",
+    "Enter keywords separated by a comma:": "Entrez les mots clés séparés par une virgule :",
     "Error": "Erreur",
     "Error saving email notification preferences": "Erreur lors de la sauvegarde des notifications par email",
     "#example": "#exemple",
-    "Failed to": "Echec pour",
-    "Failed to add tag %(tagName)s to room": "Echec lors de l'ajout du tag %(tagName)s pour le salon",
-    "Failed to change settings": "Changement de configuration échouée",
-    "Failed to forget room %(errCode)s": "Echec lors de l'oublie du salon %(errCode)s",
-    "Failed to update keywords": "Échec dans la mise à jour des mots clés",
-    "Failed to get protocol list from Home Server": "Echec lors de la récupération depuis le serveur maison",
-    "Failed to get public room list": "Echec lors de la récupération de la liste des salons publics",
+    "Failed to": "Échec pour",
+    "Failed to add tag %(tagName)s to room": "Échec lors de l'ajout de l’étiquette %(tagName)s au salon",
+    "Failed to change settings": "Échec de la mise à jour des paramètres",
+    "Failed to forget room %(errCode)s": "Échec lors de l'oubli du salon %(errCode)s",
+    "Failed to update keywords": "Échec dans la mise à jour des mots-clés",
+    "Failed to get protocol list from Home Server": "Échec lors de la récupération de la liste sur le serveur",
+    "Failed to get public room list": "Échec lors de la récupération de la liste des salons publics",
     "Failed to join the room": "Échec de l'adhésion au salon",
     "Failed to remove tag %(tagName)s from room": "Échec dans la suppression de l’étiquette %(tagName)s du salon",
     "Failed to set direct chat tag": "Échec dans l'attribution d'une étiquette dans le chat direct",
@@ -117,7 +117,16 @@
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vous les avez probablement configurées dans un autre client que Riot. Vous ne pouvez pas les configurer dans Riot mais elles s'appliquent quand même",
     "Guests can join": "Ouvert aux visiteurs",
     " to room": " au salon",
-    "Advanced notification settings": "Paramètres de notifications avancés",
+    "Advanced notification settings": "Paramètres de notification avancés",
     "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.<br/>Cela permet d'utiliser Riot avec un compte existant sur un homeserverdifférent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots clés suivant répondent à des critères qui ne peuvent pas être affichés ici :"
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots-clés suivant répondent à des critères qui ne peuvent pas être affichés ici :",
+    "Collapse panel": "Cacher le panneau",
+    "Expand panel": "Dévoiler le panneau",
+    "I understand the risks and wish to continue": "Je comprends les risques et souhaite continuer",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utilise de nombreuses fonctionnalités avancées du navigateur, certaines ne sont pas disponibles ou expérimentales dans votre navigateur actuel.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Désolé, Riot n'est <b>pas</b> supporté par votre navigateur.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Depuis votre navigateur actuel, le visuel et le ressenti de l'application pourraient être complètement incorrects, et certaines fonctionnalités pourraient ne pas être supportées. Vous pouvez continuer malgré tout, mais vous n'aurez pas de support si vous rencontrez des problèmes !",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Veuillez installer <a href=\"https://www.google.com/chrome\">Chrome</a> ou <a href=\"https://getfirefox.com\">Firefox</a> pour une expérience optimale.",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> et <a href=\"http://opera.com\">Opera</a> fonctionnent aussi.",
+    "Messages containing <span>keywords</span>": "Messages contenant des <span>mots-clés</span>"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index ffaae2b2d4..f8537502eb 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -120,5 +120,15 @@
     "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala",
     "Welcome page": "Página de boas vindas",
     "Advanced notification settings": "Configurações avançadas de notificação",
-    "customServer_text": "Você pode usar as opções de servidor personalizado para entrar em outros servidores Matrix, especificando uma URL de outro Servidor de Base. Isso permite que você use Riot com uma conta Matrix que exista em outro Servidor de Base. Você também pode configurar um servidor de Identidade personalizado, mas neste caso não poderá convidar usuárias(os) pelo endereço de e-mail, ou ser convidado(a) pelo seu endereço de e-mail."
+    "customServer_text": "Você pode usar as opções de servidor personalizado para entrar em outros servidores Matrix, especificando uma URL de outro Servidor de Base. Isso permite que você use Riot com uma conta Matrix que exista em outro Servidor de Base. Você também pode configurar um servidor de Identidade personalizado, mas neste caso não poderá convidar usuárias(os) pelo endereço de e-mail, ou ser convidado(a) pelo seu endereço de e-mail.",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> e <a href=\"http://opera.com\">Opera</a> funcionam também.",
+    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os casos.",
+    "Collapse panel": "Colapsar o painel",
+    "Expand panel": "Expandir o painel",
+    "I understand the risks and wish to continue": "Entendo os riscos e desejo continuar",
+    "Messages containing <span>keywords</span>": "Mensagens contendo <span>palavras-chave</span>",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Por favor instale <a href=\"https://www.google.com/chrome\">Chrome</a> ou <a href=\"https://getfirefox.com\">Firefox</a> para ter a melhor experiência de uso.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "O Riot usa muitas funcionalidades avançadas do navegador, algumas das quais não estão disponíveis ou ainda são experimentais no seu navegador atual.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Perdão. O seu navegador <b>não</b> é capaz de rodar o Riot.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e algumas das funcionalidades poderão não funcionar. Se você quiser tentar de qualquer maneira, pode continuar, mas aí vai ter que se virar sozinho(a) com os problemas que porventura encontrar!"
 }

From 292b50f1ac212903c80a53c4686f3af460525c80 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Jun 2017 00:51:56 +0100
Subject: [PATCH 14/15] fix myriad bugs in i18n files

---
 src/i18n/strings/be.json    |  8 ++++----
 src/i18n/strings/da.json    |  6 +++---
 src/i18n/strings/de_DE.json |  8 ++++----
 src/i18n/strings/en_EN.json | 11 ++++++-----
 src/i18n/strings/es.json    |  8 ++++----
 src/i18n/strings/fr.json    |  8 ++++----
 src/i18n/strings/hu.json    |  8 ++++----
 src/i18n/strings/nb_NO.json |  8 ++++----
 src/i18n/strings/nl.json    |  8 ++++----
 src/i18n/strings/pt.json    |  8 ++++----
 src/i18n/strings/pt_BR.json |  8 ++++----
 src/i18n/strings/ru.json    |  8 ++++----
 src/i18n/strings/sv.json    |  2 +-
 13 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json
index 18b0179ab8..69a6a9233c 100644
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.json
@@ -10,7 +10,7 @@
     "Create new room": "Стварыць новы пакой",
     "Couldn't find a matching Matrix room": "Не атрымалася знайсці адпаведны пакой Matrix",
     "Custom Server Options": "Карыстальніцкія параметры сервера",
-    "delete the alias": "выдаліць псеўданім",
+    "delete the alias.": "выдаліць псеўданім.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Выдаліць псеўданім пакоя %(alias)s і выдаліць %(name)s з каталога?",
     "Direct Chat": "Прамы чат",
     "Directory": "Каталог",
@@ -44,7 +44,7 @@
     "Forget": "Забыць",
     " from room": " з пакоя",
     "Guests can join": "Госці могуць далучыцца",
-    "Guest users can't invite users. Please register to invite": "Госцi не могуць запрашаць карыстальнікаў. Калі ласка, зарэгіструйцеся, каб запрасiць",
+    "Guest users can't invite users. Please register to invite.": "Госцi не могуць запрашаць карыстальнікаў. Калі ласка, зарэгіструйцеся, каб запрасiць.",
     "Invite to this room": "Запрасіць у гэты пакой",
     "Keywords": "Ключавыя словы",
     "Leave": "Пакінуць",
@@ -70,7 +70,7 @@
     "Reject": "Адхіліць",
     "Remove %(name)s from the directory?": "Выдаліць %(name)s з каталога?",
     "Remove": "Выдалiць",
-    "remove %(name)s from the directory": "выдаліць %(name)s з каталога",
+    "remove %(name)s from the directory.": "выдаліць %(name)s з каталога.",
     "Remove from Directory": "Выдалiць з каталога",
     "Resend": "Паўторна",
     "Riot does not know how to join a room on this network": "Riot не ведае, як увайсці ў пакой у гэтай сетке",
@@ -83,6 +83,6 @@
     "The Home Server may be too old to support third party networks": "Хатні сервер можа быць занадта стары для падтрымкі іншых сетак",
     "There are advanced notifications which are not shown here": "Ёсць пашыраныя апавяшчэння, якія не паказаныя тут",
     "The server may be unavailable or overloaded": "Сервер можа быць недаступны ці перагружаны",
-    "This room is inaccessible to guests. You may be able to join if you register": "Гэты пакой недаступны для гасцей. Вы можаце далучыцца, калі вы зарэгіструецеся",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Гэты пакой недаступны для гасцей. Вы можаце далучыцца, калі вы зарэгіструецеся.",
     " to room": " ў пакоі"
 }
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 780d0bbb41..4cd6c4b008 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -7,7 +7,7 @@
     "Create new room": "Opret nyt rum",
     "Couldn't find a matching Matrix room": "Kunne ikke finde et matchende Matrix-rum",
     "Custom Server Options": "Brugerdefinerede serverindstillinger",
-    "delete the alias": "Slet aliaset",
+    "delete the alias.": "Slet aliaset.",
     "Delete the room alias": "Slet room alias",
     "Direct Chat": "Personligt Chat",
     "Directory": "Rum fortegnelse",
@@ -39,7 +39,7 @@
     "from the directory": "fra fortegnelsen",
     " from room": " fra rum",
     "Guests can join": "Gæster kan deltage",
-    "Guest users can't invite users. Please register to invite": "Gæstebrugere kan ikke invitere brugere. Tilmeld dig venligst for at invitere",
+    "Guest users can't invite users. Please register to invite.": "Gæstebrugere kan ikke invitere brugere. Tilmeld dig venligst for at invitere.",
     "Invite to this room": "Inviter til dette rum",
     "Keywords": "Søgeord",
     "Leave": "Forlade",
@@ -70,7 +70,7 @@
     "The Home Server may be too old to support third party networks": "Hjemmeserveren kan være for gammel til at understøtte tredjepartsnetværk",
     "There are advanced notifications which are not shown here": "Der er avancerede meddelelser, som ikke vises her",
     "The server may be unavailable or overloaded": "Serveren kan være utilgængelig eller overbelastet",
-    "This room is inaccessible to guests. You may be able to join if you register": "Dette rum er utilgængeligt for gæster. Du kan være i stand til at deltage, hvis du registrerer dig",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Dette rum er utilgængeligt for gæster. Du kan være i stand til at deltage, hvis du registrerer dig.",
     " to room": " til rum",
     "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste",
     "Unable to join network": "Kan ikke deltage i netværket",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f3e19ae9c0..5f030605e6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -29,7 +29,7 @@
     "and remove": "und entfernen",
     "Can't update user notification settings": "Kann Benutzerdefinierte Einstellungen nicht aktualisieren",
     "Couldn't find a matching Matrix room": "Konnte keinen entsprechenden Matrix-Raum finden",
-    "delete the alias": "Lösche den Alias",
+    "delete the alias.": "Lösche den Alias.",
     "Delete the room alias": "Lösche den Raum Alias",
     "Direct Chat": "Privater Chat",
     "Drop here to": "Hier ablegen",
@@ -54,7 +54,7 @@
     "Forget": "Lösche",
     "from the directory": "aus dem Verzeichnis",
     " from room": " aus dem Raum",
-    "Guest users can't invite users. Please register to invite": "Gastnutzer können keine Nutzer einladen. Bitte registriere dich, um Nutzer einzuladen",
+    "Guest users can't invite users. Please register to invite.": "Gastnutzer können keine Nutzer einladen. Bitte registriere dich, um Nutzer einzuladen.",
     "Keywords": "Schlüsselwörter",
     "Leave": "Verlassen",
     "Low Priority": "Niedrige Priorität",
@@ -71,7 +71,7 @@
     "Room not found": "Raum nicht gefunden",
     "There are advanced notifications which are not shown here": "Es existieren erweiterte Benachrichtigungen, welche hier nicht angezeigt werden",
     "The server may be unavailable or overloaded": "Der Server ist vermutlich nicht erreichbar oder überlastet",
-    "This room is inaccessible to guests. You may be able to join if you register": "Dieser Raum ist nicht verfügbar für Gäste. Vermutlich klappt es wenn du dich anmeldest",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Dieser Raum ist nicht verfügbar für Gäste. Vermutlich klappt es wenn du dich anmeldest.",
     "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden",
     "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten",
     "unknown error code": "Unbekannter Fehlercode",
@@ -98,7 +98,7 @@
     "Quote": "Zitat",
     "Redact": "Redaktionell entfernen",
     "Remove %(name)s from the directory?": "Soll der Raum %(name)s  aus dem Verzeichnis entfernt werden?",
-    "remove %(name)s from the directory": "entferne %(name)s aus dem Verzeichnis",
+    "remove %(name)s from the directory.": "entferne %(name)s aus dem Verzeichnis.",
     "Resend": "Erneut senden",
     "Source URL": "Quell-URL",
     "Unable to look up room ID from server": "Es ist nicht möglich, die Raum-ID auf dem Server nachzuschlagen",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ba44de401b..fd95bd2694 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -22,7 +22,7 @@
   "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
   "Custom Server Options": "Custom Server Options",
   "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
-  "delete the alias": "delete the alias",
+  "delete the alias.": "delete the alias.",
   "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
   "Describe your problem here.": "Describe your problem here.",
   "Direct Chat": "Direct Chat",
@@ -60,7 +60,8 @@
   "Forward Message": "Forward Message",
   " from room": " from room",
   "Guests can join": "Guests can join",
-  "Guest users can't invite users. Please register to invite": "Guest users can't invite users. Please register to invite",
+  "Guest users can't invite users. Please register to invite.": "Guest users can't invite users. Please register to invite.",
+  "Hide panel": "Hide panel",
   "I understand the risks and wish to continue": "I understand the risks and wish to continue",
   "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:",
   "Invite to this room": "Invite to this room",
@@ -99,11 +100,11 @@
   "Reject": "Reject",
   "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
   "Remove": "Remove",
-  "remove %(name)s from the directory": "remove %(name)s from the directory",
+  "remove %(name)s from the directory.": "remove %(name)s from the directory.",
   "Remove from Directory": "Remove from Directory",
   "Report a bug": "Report a bug",
   "Resend": "Resend",
-  "Riot Desktop on %(platformName)": "Riot Desktop on %(platformName)",
+  "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s",
   "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
   "Riot is not supported on mobile web. Install the app?": "Riot is not supported on mobile web. Install the app?",
   "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
@@ -122,7 +123,7 @@
   "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
   "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
   "This Room": "This Room",
-  "This room is inaccessible to guests. You may be able to join if you register": "This room is inaccessible to guests. You may be able to join if you register",
+  "This room is inaccessible to guests. You may be able to join if you register.": "This room is inaccessible to guests. You may be able to join if you register.",
   " to room": " to room",
   "Unable to fetch notification target list": "Unable to fetch notification target list",
   "Unable to join network": "Unable to join network",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 616d628dae..31b1699b1f 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -11,7 +11,7 @@
     "Couldn't find a matching Matrix room": "No se encontró una sala Matrix que coincidiera",
     "Custom Server Options": "Opciones de Servidor Personalizado",
     "customServer_text": "Puedes utilizar las opciones de servidor personalizadas para iniciar sesión en otros servidores Matrix especificando una URL de Home server distinta.<br/>Esto te permite usar Riot con una cuenta Matrix existente en un Home server distinto.<br/><br/>También puedes configurar un servidor de identidad personalizado, pero no podrás invitar usuarios por dirección de email, ni ser invitado por email por ti mismo.",
-    "delete the alias": "borrar el alias",
+    "delete the alias.": "borrar el alias.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar la sala alias %(alias)s y retirar %(name)s del directorio?",
     "Direct Chat": "Conversación directa",
     "Directory": "Directorio",
@@ -43,7 +43,7 @@
     "Forget": "Olvidar",
     " from room": " de la sala",
     "Guests can join": "Los invitados se pueden unir",
-    "Guest users can't invite users. Please register to invite": "Los usuarios invitados no pueden invitar usuarios. Por favor, regístrate para poder invitar",
+    "Guest users can't invite users. Please register to invite.": "Los usuarios invitados no pueden invitar usuarios. Por favor, regístrate para poder invitar.",
     "Invite to this room": "Invitar a esta sala",
     "Keywords": "Palabras clave",
     "Leave": "Salir",
@@ -73,7 +73,7 @@
     "Reject": "Rechazar",
     "Remove %(name)s from the directory?": "¿Retirar %(name)s del directorio?",
     "Remove": "Eliminar",
-    "remove %(name)s from the directory": "retirar %(name)s del directorio",
+    "remove %(name)s from the directory.": "retirar %(name)s del directorio.",
     "Remove from Directory": "Retirar del Directorio",
     "Resend": "Reenviar",
     "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red",
@@ -86,7 +86,7 @@
     "The Home Server may be too old to support third party networks": "El Home Server puede ser demasiado antiguo para soportar redes de terceros",
     "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí",
     "The server may be unavailable or overloaded": "El servidor puede estar no disponible o sobrecargado",
-    "This room is inaccessible to guests. You may be able to join if you register": "Esta sala es inaccesible para los invitados. Puedes unirse si te registras",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Esta sala es inaccesible para los invitados. Puedes unirse si te registras.",
     " to room": " a la sala",
     "Unable to fetch notification target list": "No se puede obtener la lista de objetivos de notificación",
     "Unable to join network": "No se puede unir a la red",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index d64602467a..72d8037195 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -10,7 +10,7 @@
     "Create new room": "Créer un nouveau salon",
     "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix",
     "Custom Server Options": "Options de serveur personnalisées",
-    "delete the alias": "Supprimer l'alias",
+    "delete the alias.": "Supprimer l'alias.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?",
     "Direct Chat": "Conversation Directe",
     "Directory": "Répertoire",
@@ -70,7 +70,7 @@
     "Filter room names": "Filtrer les salons par nom",
     "Forget": "Oublier",
     " from room": " du salon",
-    "Guest users can't invite users. Please register to invite": "Les visiteurs ne peuvent démarrer une discussion. Merci de vous enregistrer pour pouvoir démarrer une discussion",
+    "Guest users can't invite users. Please register to invite.": "Les visiteurs ne peuvent démarrer une discussion. Merci de vous enregistrer pour pouvoir démarrer une discussion.",
     "Invite to this room": "Inviter dans ce salon",
     "Keywords": "Mots-clés",
     "Leave": "Quitter",
@@ -94,7 +94,7 @@
     "Off": "Désactivé",
     "On": "Activé",
     "Permalink": "Permalien",
-    "remove %(name)s from the directory": "supprimer %(name)s du répertoire",
+    "remove %(name)s from the directory.": "supprimer %(name)s du répertoire.",
     "Remove from Directory": "Supprimer du répertoire",
     "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau",
     "Room directory": "Répertoire des salons",
@@ -104,7 +104,7 @@
     "The Home Server may be too old to support third party networks": "Le Home Server semble trop ancien pour supporter des réseaux tiers",
     "There are advanced notifications which are not shown here": "Il existe une configuration avancée des notifications qui ne peut être affichée ici",
     "The server may be unavailable or overloaded": "Le serveur est indisponible ou surchargé",
-    "This room is inaccessible to guests. You may be able to join if you register": "Ce salon n'est pas ouvert aux visiteurs. Vous pourrez peut-être le rejoindre si vous vous enregistrez",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Ce salon n'est pas ouvert aux visiteurs. Vous pourrez peut-être le rejoindre si vous vous enregistrez.",
     "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications",
     "Unable to join network": "Impossible de rejoindre le réseau",
     "Unable to look up room ID from server": "Impossible de récupérer l'ID du salon sur le serveur",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 5417bfda06..34e9904af9 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -12,7 +12,7 @@
     "Create new room": "Új szoba készítés",
     "Couldn't find a matching Matrix room": "Nem található a keresett Matrix szoba",
     "Custom Server Options": "Egyedi szerver beállítások",
-    "delete the alias": "becenév törlése",
+    "delete the alias.": "becenév törlése.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Törlöd a(z) %(alias)s szobát és kiveszed a könyvtárból ezt: %(name)s?",
     "Direct Chat": "Közvetlen csevegés",
     "Directory": "Könyvtár",
@@ -46,7 +46,7 @@
     "Forget": "Elfelejt",
     " from room": " szobából",
     "Guests can join": "Vendégek csatlakozhatnak",
-    "Guest users can't invite users. Please register to invite": "Vendég felhasználó nem küldhet meghívót. Kérlek regisztrálj meghívó küldéshez",
+    "Guest users can't invite users. Please register to invite.": "Vendég felhasználó nem küldhet meghívót. Kérlek regisztrálj meghívó küldéshez.",
     "Invite to this room": "Meghívás a szobába",
     "Keywords": "Kulcsszavak",
     "Leave": "Elhagy",
@@ -84,7 +84,7 @@
     "Reject": "Elutasít",
     "Remove %(name)s from the directory?": "Törlöd a %(name)s szobát a listából?",
     "Remove": "Töröl",
-    "remove %(name)s from the directory": "%(name)s szoba törlése a listából",
+    "remove %(name)s from the directory.": "%(name)s szoba törlése a listából.",
     "Remove from Directory": "Törlés a szobák listájából",
     "Resend": "Újraküld",
     "Riot does not know how to join a room on this network": "Riot nem tudja, hogy csatlakozzon ehhez a szobához ezen a hálózaton",
@@ -99,7 +99,7 @@
     "The Home Server may be too old to support third party networks": "A Saját szerver lehet, hogy túl régi ahhoz, hogy más hálózatokhoz tudjon kapcsolódni",
     "There are advanced notifications which are not shown here": "Vannak haladó értesítések amik itt nincsenek megjelenítve",
     "The server may be unavailable or overloaded": "A szerver nem érhető el vagy túl van terhelve",
-    "This room is inaccessible to guests. You may be able to join if you register": "A szoba vendégek számára elérhetetlen. Csak regisztráció után tudsz csatlakozni",
+    "This room is inaccessible to guests. You may be able to join if you register.": "A szoba vendégek számára elérhetetlen. Csak regisztráció után tudsz csatlakozni.",
     " to room": " szobába",
     "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját",
     "Unable to join network": "Nem sikerült kapcsolódni a hálózathoz",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 673c3f2c99..813abc6efb 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -15,7 +15,7 @@
     "Collapse panel": "Skjul panel",
     "Custom Server Options": "Tilpassede serveralternativer",
     "customServer_text": "Du kan benytte de egendefinerte serveralternativene til å logge deg på andre Matrix-servere ved å spesifisere en annen Hjemmeserver-URL.<br/>Dette lar deg benytte Riot med en eksisterende Matrix konto på en annen hjemmeserver.<br/><br/>Du kan også angi en egendefinert identitetsserver, men du vil ikke kunne invitere brukere via e-post, eller bli invitert via e-post selv.",
-    "delete the alias": "Slett aliaset",
+    "delete the alias.": "Slett aliaset.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slett rom alias %(alias)s og fjern %(name)s fra katalogen?",
     "Direct Chat": "Direkte Chat",
     "Directory": "Katalog",
@@ -49,7 +49,7 @@
     "Forget": "Glem",
     " from room": " fra rommet",
     "Guests can join": "Gjester kan bli med",
-    "Guest users can't invite users. Please register to invite": "Gjester kan ikke invitere brukere. Vennligst registrer deg for å invitere",
+    "Guest users can't invite users. Please register to invite.": "Gjester kan ikke invitere brukere. Vennligst registrer deg for å invitere.",
     "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker å fortsette",
     "Invite to this room": "Inviter til dette rommet",
     "Keywords": "Nøkkelord",
@@ -80,7 +80,7 @@
     "Reject": "Avvis",
     "Remove %(name)s from the directory?": "Fjern %(name)s fra katalogen?",
     "Remove": "Fjern",
-    "remove %(name)s from the directory": "fjern %(name)s fra katalogen",
+    "remove %(name)s from the directory.": "fjern %(name)s fra katalogen.",
     "Remove from Directory": "Fjern fra katalogen",
     "Resend": "Send på nytt",
     "Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket",
@@ -95,7 +95,7 @@
     "The Home Server may be too old to support third party networks": "Hjemme-serveren kan være for gammel til å støtte tredjeparts-nettverk",
     "There are advanced notifications which are not shown here": "Det er avanserte varsler som ikke vises her",
     "The server may be unavailable or overloaded": "Serveren kan være utilgjengelig eller overbelastet",
-    "This room is inaccessible to guests. You may be able to join if you register": "Dette rommet er ikke tilgjengelig for gjester. Du kan kanskje komme inn om du registrerer deg",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Dette rommet er ikke tilgjengelig for gjester. Du kan kanskje komme inn om du registrerer deg.",
     " to room": " til rom",
     "Unable to fetch notification target list": "Kunne ikke hente varsel-mål liste",
     "Unable to join network": "Kunne ikke bli med i nettverket",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 28e0ac3010..d449c446c5 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -13,7 +13,7 @@
     "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix kamer te vinden",
     "Custom Server Options": "Aangepaste server instellingen",
     "customServer_text": "Je kunt de aangepaste server instellingen gebruiken om in te loggen bij andere Matrix servers door een andere home server URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix account op een andere home server.<br/><br/>Je kunt ook een aangepaste identiteit server instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een email adres of zelf uitgenodigt te worden met een email adres.",
-    "delete the alias": "verwijder de alias",
+    "delete the alias.": "verwijder de alias.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Verwijder de alias %(alias)s en verwijder %(name)s uit de map?",
     "Direct Chat": "Privé gesprek",
     "Directory": "Kamer lijst",
@@ -45,7 +45,7 @@
     "Forget": "Vergeten",
     " from room": " van kamer",
     "Guests can join": "Gasten kunnen toe treden",
-    "Guest users can't invite users. Please register to invite": "Gasten kunnen geen gebruikers uitnodigen. Om anderen uit te nodigen zult u moeten registreren",
+    "Guest users can't invite users. Please register to invite.": "Gasten kunnen geen gebruikers uitnodigen. Om anderen uit te nodigen zult u moeten registreren.",
     "Invite to this room": "Uitnodigen voor deze kamer",
     "Keywords": "Trefwoorden",
     "Leave": "Verlaten",
@@ -76,7 +76,7 @@
     "Reject": "Afwijzen",
     "Remove %(name)s from the directory?": "Verwijder %(name)s uit de kamer lijst?",
     "Remove": "Verwijder",
-    "remove %(name)s from the directory": "verwijder %(name)s uit de kamer lijst",
+    "remove %(name)s from the directory.": "verwijder %(name)s uit de kamer lijst.",
     "Remove from Directory": "Verwijder uit de kamer lijst",
     "Resend": "Opnieuw verzenden",
     "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet toetreden tot een kamer op dit netwerk",
@@ -89,7 +89,7 @@
     "The Home Server may be too old to support third party networks": "De home server is misschien te oud om netwerken van derde partijen te ondersteunen",
     "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet worden laten zien",
     "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbeladen",
-    "This room is inaccessible to guests. You may be able to join if you register": "Deze kamer is niet toegankelijk voor gasten. Je zou misschien toe kunnen treden als je geregistreerd bent",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Deze kamer is niet toegankelijk voor gasten. Je zou misschien toe kunnen treden als je geregistreerd bent.",
     " to room": " naar kamer",
     "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatie doelen op te halen",
     "Unable to join network": "Het is mislukt om toe te treden tot dit netwerk",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index d55488059c..c5e79f0d55 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -9,7 +9,7 @@
     "Create new room": "Criar nova sala",
     "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
     "Custom Server Options": "Opções de customização do servidor",
-    "delete the alias": "apagar o apelido da sala",
+    "delete the alias.": "apagar o apelido da sala.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
     "Direct Chat": "Conversa pessoal",
     "Directory": "Diretório",
@@ -43,7 +43,7 @@
     "Forget": "Esquecer",
     " from room": " da sala",
     "Guests can join": "Convidados podem entrar",
-    "Guest users can't invite users. Please register to invite": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites",
+    "Guest users can't invite users. Please register to invite.": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites.",
     "Invite to this room": "Convidar para esta sala",
     "Keywords": "Palavras-chave",
     "Leave": "Sair",
@@ -69,7 +69,7 @@
     "Reject": "Rejeitar",
     "Remove": "Remover",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
-    "remove %(name)s from the directory": "remover %(name)s da lista pública de salas",
+    "remove %(name)s from the directory.": "remover %(name)s da lista pública de salas.",
     "Remove from Directory": "Remover da lista pública de salas",
     "Resend": "Reenviar",
     "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede",
@@ -82,7 +82,7 @@
     "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros",
     "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui",
     "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
-    "This room is inaccessible to guests. You may be able to join if you register": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre.",
     " to room": " na sala",
     "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
     "Unable to join network": "Não foi possível conectar na rede",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index f8537502eb..f2bad93818 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -10,7 +10,7 @@
     "Create new room": "Criar nova sala",
     "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
     "Custom Server Options": "Opções para Servidor Personalizado",
-    "delete the alias": "apagar o apelido da sala",
+    "delete the alias.": "apagar o apelido da sala.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
     "Direct Chat": "Conversa pessoal",
     "Directory": "Diretório",
@@ -45,7 +45,7 @@
     "Forward Message": "Encaminhar",
     " from room": " da sala",
     "Guests can join": "Convidados podem entrar",
-    "Guest users can't invite users. Please register to invite": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites",
+    "Guest users can't invite users. Please register to invite.": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites.",
     "Invite to this room": "Convidar para esta sala",
     "Keywords": "Palavras-chave",
     "Leave": "Sair",
@@ -77,7 +77,7 @@
     "Reject": "Rejeitar",
     "Remove": "Remover",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
-    "remove %(name)s from the directory": "remover %(name)s da lista pública de salas",
+    "remove %(name)s from the directory.": "remover %(name)s da lista pública de salas.",
     "Remove from Directory": "Remover da lista pública de salas",
     "Resend": "Reenviar",
     "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede",
@@ -90,7 +90,7 @@
     "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros",
     "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui",
     "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
-    "This room is inaccessible to guests. You may be able to join if you register": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre.",
     " to room": " para sala",
     "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
     "Unable to join network": "Não foi possível conectar na rede",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index f2f2dbdf36..50df719c2e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -7,7 +7,7 @@
     "Create new room": "Создать комнату",
     "Couldn't find a matching Matrix room": "Не возможно найти подходящую Матрикс комнату",
     "Custom Server Options": "Настройки пользовательского сервера",
-    "delete the alias": "удалить привязку",
+    "delete the alias.": "удалить привязку.",
     "Delete the room alias": "Удалить привязку комнаты",
     "Direct Chat": "Персональное сообщение",
     "Directory": "Каталог",
@@ -39,7 +39,7 @@
     "from the directory": "из каталога",
     " from room": " из комнаты",
     "Guests can join": "Гость может присоединиться",
-    "Guest users can't invite users. Please register to invite": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглошений",
+    "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглошений.",
     "Invite to this room": "Пригласить в эту комнату",
     "Keywords": "Ключевые слова",
     "Leave": "Покинуть",
@@ -70,7 +70,7 @@
     "The Home Server may be too old to support third party networks": "Пользовательский сервер может быть слишком старым для поддержки сторонних сетей",
     "There are advanced notifications which are not shown here": "Здесь расширенные уведомления, которые здесь не показаны",
     "The server may be unavailable or overloaded": "Возможно сервер недоступен или перегружен",
-    "This room is inaccessible to guests. You may be able to join if you register": "Эта комната недоступна для гостей. Вы можете присоединиться, если зарегистрируетесь",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Эта комната недоступна для гостей. Вы можете присоединиться, если зарегистрируетесь.",
     " to room": " к комнате",
     "Unable to fetch notification target list": "Не удалось получить список целей уведомления",
     "Unable to join network": "Не возможно присоединиться к сети",
@@ -112,7 +112,7 @@
     "Quote": "Цитата",
     "Redact": "Удалить",
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
-    "remove %(name)s from the directory": "удалить %(name)s из каталога",
+    "remove %(name)s from the directory.": "удалить %(name)s из каталога.",
     "Resend": "Переслать снова",
     "Source URL": "Исходный URL",
     "Welcome page": "Домашняя страница",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0d03a87806..2e1d29eef5 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -13,7 +13,7 @@
     "Couldn't find a matching Matrix room": "Kunde inte hitta ett matchande Matrix-rum",
     "Custom Server Options": "Egna serverinställningar",
     "customServer_text": "Du kan använda serverinställningarna för att logga in i en annan Matrix-server genom att specifiera en URL till en annan hemserver.<br/>Så här kan du använda Riot med ett existerande Matrix-konto på en annan hemserver.<br/><br/>Du kan också specifiera en egen identitetsserver, men du kommer inte att kunna bjuda in andra via epostadress, eller bli inbjuden via epostadress.",
-    "delete the alias": "radera adressen",
+    "delete the alias.": "radera adressen.",
     "Direct Chat": "Direkt chatt",
     "Directory": "Katalog",
     "Dismiss": "Avvisa",

From 0fbd73a3c944a60813e2b2207344602f51c19e36 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Jun 2017 02:16:57 +0100
Subject: [PATCH 15/15] bump js & react sdk

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

diff --git a/package.json b/package.json
index 951a9fc5fd..52b0fd747b 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
+    "matrix-js-sdk": "0.7.9",
+    "matrix-react-sdk": "0.9.0-rc.1",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",