From c6262d62a63fee8aad8546141e5898c400f73284 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 28 Apr 2017 18:21:22 +0100
Subject: [PATCH 01/58] webrtc config electron

init on LoggedInView mounting
configurable via UserSettings
new class: CallMediaHandler

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CallMediaHandler.js                   | 63 ++++++++++++++++++
 src/components/structures/LoggedInView.js |  5 ++
 src/components/structures/UserSettings.js | 78 ++++++++++++++++++++++-
 3 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 src/CallMediaHandler.js

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
new file mode 100644
index 0000000000..9133a6548d
--- /dev/null
+++ b/src/CallMediaHandler.js
@@ -0,0 +1,63 @@
+/*
+ Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+import UserSettingsStore from './UserSettingsStore';
+import * as Matrix from 'matrix-js-sdk';
+import q from 'q';
+
+export default {
+    getDevices: function() {
+        // Only needed for Electron atm, though should work in modern browsers
+        // once permission has been granted to the webapp
+        return navigator.mediaDevices.enumerateDevices().then(function(devices) {
+            const audioIn = {};
+            const videoIn = {};
+
+            devices.forEach((device) => {
+                switch (device.kind) {
+                    case 'audioinput': audioIn[device.deviceId] = device.label; break;
+                    case 'videoinput': videoIn[device.deviceId] = device.label; break;
+                }
+            });
+
+            // console.log("Loaded WebRTC Devices", mediaDevices);
+            return {
+                audioinput: audioIn,
+                videoinput: videoIn,
+            };
+        }, (error) => { console.log('Unable to refresh WebRTC Devices: ', error); });
+    },
+
+    loadDevices: function() {
+    //     this.getDevices().then((devices) => {
+        const localSettings = UserSettingsStore.getLocalSettings();
+    //         // if deviceId is not found, automatic fallback is in spec
+    //         // recall previously stored inputs if any
+        Matrix.setMatrixCallAudioInput(localSettings['webrtc_audioinput']);
+        Matrix.setMatrixCallVideoInput(localSettings['webrtc_videoinput']);
+        // });
+    },
+
+    setAudioInput: function(deviceId) {
+        UserSettingsStore.setLocalSetting('webrtc_audioinput', deviceId);
+        Matrix.setMatrixCallAudioInput(deviceId);
+    },
+
+    setVideoInput: function(deviceId) {
+        UserSettingsStore.setLocalSetting('webrtc_videoinput', deviceId);
+        Matrix.setMatrixCallVideoInput(deviceId);
+    },
+};
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 9f01b0082b..8d18e92a0d 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -21,6 +21,7 @@ import React from 'react';
 import KeyCode from '../../KeyCode';
 import Notifier from '../../Notifier';
 import PageTypes from '../../PageTypes';
+import CallMediaHandler from '../../CallMediaHandler';
 import sdk from '../../index';
 import dis from '../../dispatcher';
 
@@ -71,6 +72,10 @@ export default React.createClass({
         // RoomView.getScrollState()
         this._scrollStateMap = {};
 
+        // Only run these in electron, at least until a better mechanism for perms exists
+        // https://w3c.github.io/permissions/#dom-permissionname-device-info
+        if (window && window.process && window.process.type) CallMediaHandler.loadDevices();
+
         document.addEventListener('keydown', this._onKeyDown);
     },
 
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index ba5d5780b4..05410e866f 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -24,6 +24,7 @@ var dis = require("../../dispatcher");
 var q = require('q');
 var package_json = require('../../../package.json');
 var UserSettingsStore = require('../../UserSettingsStore');
+var CallMediaHandler = require('../../CallMediaHandler');
 var GeminiScrollbar = require('react-gemini-scrollbar');
 var Email = require('../../email');
 var AddThreepid = require('../../AddThreepid');
@@ -109,7 +110,6 @@ const THEMES = [
     }
 ];
 
-
 module.exports = React.createClass({
     displayName: 'UserSettings',
 
@@ -147,6 +147,7 @@ module.exports = React.createClass({
             email_add_pending: false,
             vectorVersion: null,
             rejectingInvites: false,
+            mediaDevices: null,
         };
     },
 
@@ -167,6 +168,18 @@ module.exports = React.createClass({
             });
         }
 
+        q().then(() => {
+            return CallMediaHandler.getDevices();
+        }).then((mediaDevices) => {
+            console.log("got mediaDevices", mediaDevices, this._unmounted);
+            if (this._unmounted) return;
+            this.setState({
+                mediaDevices,
+                activeAudioInput: this._localSettings['webrtc_audioinput'] || 'default',
+                activeVideoInput: this._localSettings['webrtc_videoinput'] || 'default',
+            });
+        });
+
         // Bulk rejecting invites:
         // /sync won't have had time to return when UserSettings re-renders from state changes, so getRooms()
         // will still return rooms with invites. To get around this, add a listener for
@@ -187,6 +200,8 @@ module.exports = React.createClass({
         this._syncedSettings = syncedSettings;
 
         this._localSettings = UserSettingsStore.getLocalSettings();
+        this._setAudioInput = this._setAudioInput.bind(this);
+        this._setVideoInput = this._setVideoInput.bind(this);
     },
 
     componentDidMount: function() {
@@ -775,6 +790,66 @@ module.exports = React.createClass({
         </div>;
     },
 
+    _mapWebRtcDevicesToSpans: function(devices) {
+        return Object.keys(devices).map(
+            (deviceId) => <span key={deviceId}>{devices[deviceId]}</span>
+        );
+    },
+
+    _setAudioInput: function(deviceId) {
+        this.setState({activeAudioInput: deviceId});
+        CallMediaHandler.setAudioInput(deviceId);
+    },
+
+    _setVideoInput: function(deviceId) {
+        this.setState({activeVideoInput: deviceId});
+        CallMediaHandler.setVideoInput(deviceId);
+    },
+
+    _renderWebRtcSettings: function() {
+        if (!(window && window.process && window.process.type)
+         || !this.state.mediaDevices) return;
+
+        const Dropdown = sdk.getComponent('elements.Dropdown');
+
+        let microphoneDropdown = <h5>No Microphones detected</h5>;
+        let webcamDropdown = <h5>No Webcams detected</h5>;
+
+        const audioInputs = this.state.mediaDevices.audioinput;
+        if ('default' in audioInputs) {
+            microphoneDropdown = <div>
+                <h4>Microphone</h4>
+                <Dropdown
+                    className="mx_UserSettings_webRtcDevices_dropdown"
+                    value={this.state.activeAudioInput}
+                    onOptionChange={this._setAudioInput}>
+                    {this._mapWebRtcDevicesToSpans(audioInputs)}
+                </Dropdown>
+            </div>;
+        }
+
+        const videoInputs = this.state.mediaDevices.videoinput;
+        if ('default' in videoInputs) {
+            webcamDropdown = <div>
+                <h4>Cameras</h4>
+                <Dropdown
+                    className="mx_UserSettings_webRtcDevices_dropdown"
+                    value={this.state.activeVideoInput}
+                    onOptionChange={this._setVideoInput}>
+                    {this._mapWebRtcDevicesToSpans(videoInputs)}
+                </Dropdown>
+            </div>;
+        }
+
+        return <div>
+            <h3>WebRTC</h3>
+            <div className="mx_UserSettings_section">
+                {microphoneDropdown}
+                {webcamDropdown}
+            </div>
+        </div>;
+    },
+
     _showSpoiler: function(event) {
         const target = event.target;
         const hidden = target.getAttribute('data-spoiler');
@@ -973,6 +1048,7 @@ module.exports = React.createClass({
 
                 {this._renderUserInterfaceSettings()}
                 {this._renderLabs()}
+                {this._renderWebRtcSettings()}
                 {this._renderDevicesPanel()}
                 {this._renderCryptoInfo()}
                 {this._renderBulkOptions()}

From b944fff5c5f97193c55dc1255545179be820fcef Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Fri, 5 May 2017 20:57:18 +0100
Subject: [PATCH 02/58] unscrew merge

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 06103eae55..9d53bfda31 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -24,6 +24,7 @@ const dis = require("../../dispatcher");
 const q = require('q');
 const packageJson = require('../../../package.json');
 const UserSettingsStore = require('../../UserSettingsStore');
+const CallMediaHandler = require('../../CallMediaHandler');
 const GeminiScrollbar = require('react-gemini-scrollbar');
 const Email = require('../../email');
 const AddThreepid = require('../../AddThreepid');

From 09d0ab7df5f9e6602ca2e8e705e4d59a1304f94e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 25 May 2017 01:01:40 +0100
Subject: [PATCH 03/58] attempt to make media selector work everywhere (TM)
 loadDevices not only in electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CallMediaHandler.js                   |  2 +
 src/components/structures/LoggedInView.js |  4 +-
 src/components/structures/UserSettings.js | 52 ++++++++++++++++-------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index 9133a6548d..4f82e003b9 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -26,6 +26,8 @@ export default {
             const audioIn = {};
             const videoIn = {};
 
+            if (devices.some((device) => !device.label)) return false;
+
             devices.forEach((device) => {
                 switch (device.kind) {
                     case 'audioinput': audioIn[device.deviceId] = device.label; break;
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index a84661bcd2..1a7b7e06e4 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -72,9 +72,7 @@ export default React.createClass({
         // RoomView.getScrollState()
         this._scrollStateMap = {};
 
-        // Only run these in electron, at least until a better mechanism for perms exists
-        // https://w3c.github.io/permissions/#dom-permissionname-device-info
-        if (window && window.process && window.process.type) CallMediaHandler.loadDevices();
+        CallMediaHandler.loadDevices();
 
         document.addEventListener('keydown', this._onKeyDown);
     },
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index de88566300..58c6bb7c20 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -178,17 +178,7 @@ module.exports = React.createClass({
             });
         }
 
-        q().then(() => {
-            return CallMediaHandler.getDevices();
-        }).then((mediaDevices) => {
-            console.log("got mediaDevices", mediaDevices, this._unmounted);
-            if (this._unmounted) return;
-            this.setState({
-                mediaDevices,
-                activeAudioInput: this._localSettings['webrtc_audioinput'] || 'default',
-                activeVideoInput: this._localSettings['webrtc_videoinput'] || 'default',
-            });
-        });
+        this._refreshMediaDevices();
 
         // Bulk rejecting invites:
         // /sync won't have had time to return when UserSettings re-renders from state changes, so getRooms()
@@ -210,8 +200,6 @@ module.exports = React.createClass({
         this._syncedSettings = syncedSettings;
 
         this._localSettings = UserSettingsStore.getLocalSettings();
-        this._setAudioInput = this._setAudioInput.bind(this);
-        this._setVideoInput = this._setVideoInput.bind(this);
     },
 
     componentDidMount: function() {
@@ -233,6 +221,20 @@ module.exports = React.createClass({
         }
     },
 
+    _refreshMediaDevices: function() {
+        q().then(() => {
+            return CallMediaHandler.getDevices();
+        }).then((mediaDevices) => {
+            // console.log("got mediaDevices", mediaDevices, this._unmounted);
+            if (this._unmounted) return;
+            this.setState({
+                mediaDevices,
+                activeAudioInput: this._localSettings['webrtc_audioinput'] || 'default',
+                activeVideoInput: this._localSettings['webrtc_videoinput'] || 'default',
+            });
+        });
+    },
+
     _refreshFromServer: function() {
         const self = this;
         q.all([
@@ -818,9 +820,29 @@ module.exports = React.createClass({
         CallMediaHandler.setVideoInput(deviceId);
     },
 
+    _requestMediaPermissions: function() {
+        console.log("Request media perms");
+        const getUserMedia = (
+            window.navigator.getUserMedia || window.navigator.webkitGetUserMedia || window.navigator.mozGetUserMedia
+        );
+        if (getUserMedia) {
+            return getUserMedia.apply(window.navigator, [
+                { video: true, audio: true },
+                this._refreshMediaDevices,
+                function() {},
+            ]);
+        }
+    },
+
     _renderWebRtcSettings: function() {
-        if (!(window && window.process && window.process.type)
-         || !this.state.mediaDevices) return;
+        if (this.state.mediaDevices === false) {
+            return <div>
+                <h3>WebRTC</h3>
+                <div className="mx_UserSettings_section">
+                    <h5 onClick={this._requestMediaPermissions}>Missing Media Permissions, click to request.</h5>
+                </div>
+            </div>;
+        } else if (!this.state.mediaDevices) return;
 
         const Dropdown = sdk.getComponent('elements.Dropdown');
 

From 8158ec6d54c062c6a3c49b92ee5c1fe1e64e969b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 25 May 2017 01:25:17 +0100
Subject: [PATCH 04/58] touchups

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 58c6bb7c20..0d182b27ab 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -820,8 +820,7 @@ module.exports = React.createClass({
         CallMediaHandler.setVideoInput(deviceId);
     },
 
-    _requestMediaPermissions: function() {
-        console.log("Request media perms");
+    _requestMediaPermissions: function(event) {
         const getUserMedia = (
             window.navigator.getUserMedia || window.navigator.webkitGetUserMedia || window.navigator.mozGetUserMedia
         );
@@ -829,7 +828,13 @@ module.exports = React.createClass({
             return getUserMedia.apply(window.navigator, [
                 { video: true, audio: true },
                 this._refreshMediaDevices,
-                function() {},
+                function() {
+                    const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+                    Modal.createDialog(ErrorDialog, {
+                        title: "No media permissions",
+                        description: "You may need to manually permit Riot to access your microphone/webcam",
+                    });
+                },
             ]);
         }
     },
@@ -839,15 +844,17 @@ module.exports = React.createClass({
             return <div>
                 <h3>WebRTC</h3>
                 <div className="mx_UserSettings_section">
-                    <h5 onClick={this._requestMediaPermissions}>Missing Media Permissions, click to request.</h5>
+                    <p className="mx_UserSettings_link" onClick={this._requestMediaPermissions}>
+                        Missing Media Permissions, click here to request.
+                    </p>
                 </div>
             </div>;
         } else if (!this.state.mediaDevices) return;
 
         const Dropdown = sdk.getComponent('elements.Dropdown');
 
-        let microphoneDropdown = <h5>No Microphones detected</h5>;
-        let webcamDropdown = <h5>No Webcams detected</h5>;
+        let microphoneDropdown = <p>No Microphones detected</p>;
+        let webcamDropdown = <p>No Webcams detected</p>;
 
         const audioInputs = this.state.mediaDevices.audioinput;
         if ('default' in audioInputs) {

From 396545b783ecd92496b9bb0a56d0855b484c90c5 Mon Sep 17 00:00:00 2001
From: Jean GB <jeangb@hotmail.fr>
Date: Wed, 31 May 2017 12:14:30 +0000
Subject: [PATCH 05/58] Translated using Weblate (French)

Currently translated at 99.3% (763 of 768 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 3d85aefbc7..9462a9c557 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -119,7 +119,7 @@
     "zh-sg": "Chinese (Singapore)",
     "zh-tw": "Chinese (Taiwan)",
     "zu": "Zulu",
-    "anyone": "anyone",
+    "anyone": "n'importe qui",
     "Direct Chat": "Conversation Directe",
     "Direct chats": "Conversations directes",
     "Disable inline URL previews by default": "Désactiver l’aperçu des URLs",
@@ -764,5 +764,6 @@
     "Online": "En ligne",
     "Offline": "Hors ligne",
     "Disable URL previews for this room (affects only you)": "Désactiver les aperçus d'URL pour ce salon (n'affecte que vous)",
-    "Desktop specific": "Spécifique à la version bureau"
+    "Desktop specific": "Spécifique à la version bureau",
+    "Start automatically after system login": "Démarrer automatiquement après la phase d'authentification du système."
 }

From 53502c9640a5678adeb1f7f344105459e06a7328 Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Wed, 31 May 2017 10:48:57 +0000
Subject: [PATCH 06/58] Translated using Weblate (German)

Currently translated at 100.0% (768 of 768 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 89e7f97515..96dd38c78f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -40,7 +40,7 @@
     "Change Password": "Passwort ändern",
     "Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse",
     "Commands": "Kommandos",
-    "Emoji": "Smileys",
+    "Emoji": "Emoji",
     "Sorry, this homeserver is using a login which is not recognised ": "Entschuldigung, dieser Homeserver nutzt eine Anmeldetechnik, die nicht bekannt ist ",
     "Login as guest": "Anmelden als Gast",
     "Return to app": "Zurück zur Anwendung",
@@ -93,7 +93,7 @@
     "Encryption is enabled in this room": "Verschlüsselung ist in diesem Raum aktiviert",
     "Encryption is not enabled in this room": "Verschlüsselung ist in diesem Raum nicht aktiviert",
     "ended the call.": "beendete den Anruf.",
-    "End-to-end encryption is in beta and may not be reliable": "Ende-zu-Ende-Verschlüsselung ist im Beta-Status und ist evtl. nicht zuverlässig",
+    "End-to-end encryption is in beta and may not be reliable": "Die Ende-zu-Ende-Verschlüsselung befindet sich im Beta-Stadium und ist eventuell nicht hundertprozentig zuverlässig",
     "Failed to send email": "Fehler beim Senden der E-Mail",
     "Account": "Konto",
     "Add phone number": "Füge Telefonnummer hinzu",
@@ -360,7 +360,7 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\".",
     "/ddg is not a command": "/ddg ist kein Kommando",
-    "%(senderName)s ended the call.": "%(senderName)s beendete den Anruf.",
+    "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.",
     "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
     "Failed to send request.": "Anfrage zu senden schlug fehl.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
@@ -401,9 +401,9 @@
     "Error changing language": "Fehler beim Ändern der Sprache",
     "Riot was unable to find the correct Data for the selected Language.": "Riot war nicht in der Lage die korrekten Daten für die ausgewählte Sprache zu finden.",
     "Connectivity to the server has been lost.": "Verbindung zum Server untergebrochen.",
-    "Sent messages will be stored until your connection has returned.": "Gesendete Nachrichten werden gespeichert bis die Verbindung wiederhergestellt wurde.",
+    "Sent messages will be stored until your connection has returned.": "Gesendete Nachrichten werden gespeichert, bis die Internetverbindung wiederhergestellt wurde.",
     "Auto-complete": "Autovervollständigung",
-    "Resend all": "Alles erneut senden",
+    "Resend all": "Alle erneut senden",
     "cancel all": "alles abbrechen",
     "now. You can also select individual messages to resend or cancel.": "jetzt. Du kannst auch einzelne Nachrichten zum erneuten Senden oder Abbrechen auswählen.",
     "Active call": "Aktiver Anruf",
@@ -515,7 +515,7 @@
     "pt": "Portugiesisch",
     "rm": "Rätoromanisch",
     "ro-mo": "Rumänisch (Republik Moldau/Moldawien)",
-    "ro": "Romanian",
+    "ro": "Rumänisch",
     "ru-mo": "Russisch",
     "sb": "Sorbisch",
     "sk": "Slowakisch",
@@ -559,7 +559,7 @@
     "and one other...": "und ein(e) weitere(r)...",
     "Are you sure?": "Bist du sicher?",
     "Attachment": "Anhang",
-    "Ban": "Banne",
+    "Ban": "Verbannen",
     "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Kann nicht zum Heimserver verbinden - bitte checke eine Verbindung und stelle sicher, dass dem %(urlStart)s SSL-Zertifikat deines Heimservers  %(urlEnd)s vertraut wird",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Kann nicht zum Heimserver via HTTP verbinden, wenn eine HTTPS-Url in deiner Adresszeile steht. Nutzer HTTPS oder %(urlStart)s aktiviere unsichere Skripte %(urlEnd)s",
     "changing room on a RoomView is not supported": "Das Ändern eines Raumes in einer RaumAnsicht wird nicht unterstützt",
@@ -607,10 +607,10 @@
     "Revoke Moderator": "Moderator zurückziehen",
     "Search": "Suche",
     "Search failed": "Suche fehlgeschlagen",
-    "Server error": "Serverfehler",
-    "Server may be unavailable, overloaded, or search timed out :(": "Server ist entweder nicht verfügbar, überlastet oder die Suchezeit ist abgelaufen :(",
+    "Server error": "Server-Fehler",
+    "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(",
     "Server may be unavailable, overloaded, or the file too big": "Server ist entweder nicht verfügbar, überlastet oder die Datei ist zu groß",
-    "Server unavailable, overloaded, or something else went wrong": "Server ist entweder nicht verfügbar, überlastet oder etwas anderes schlug fehl",
+    "Server unavailable, overloaded, or something else went wrong": "Der Server ist entweder nicht verfügbar, überlastet oder es liegt ein anderweitiger Fehler vor",
     "Some of your messages have not been sent": "Einige deiner Nachrichten wurden noch nicht gesendet",
     "Submit": "Absenden",
     "The main address for this room is: %(canonical_alias_section)s": "Die Hauptadresse für diesen Raum ist: %(canonical_alias_section)s",

From e9cb13035b0057ed7174f4cd3473743eb5d8b934 Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Wed, 31 May 2017 15:59:30 +0000
Subject: [PATCH 07/58] Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9462a9c557..61c75512d0 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -79,7 +79,7 @@
     "it": "Italian",
     "ja": "Japanese",
     "ji": "Yiddish",
-    "ko": "Korean (Johab)",
+    "ko": "Coréen",
     "lt": "Lithuanian",
     "lv": "Latvian",
     "mk": "Macedonian (FYROM)",
@@ -100,7 +100,7 @@
     "sk": "Slovak",
     "sl": "Slovenian",
     "sq": "Albanian",
-    "sr": "Serbian (Latin)",
+    "sr": "Serbe",
     "sv-fi": "Swedish (Finland)",
     "sv": "Swedish",
     "sx": "Sutu",
@@ -149,7 +149,7 @@
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
     "Failed to change power level": "Failed to change power level",
     "Failed to delete device": "Failed to delete device",
-    "Failed to forget room %(errCode)s": "Echec lors de l'oublie du salon %(errCode)s",
+    "Failed to forget room %(errCode)s": "Échec lors de l'oubli du salon %(errCode)s",
     "Please Register": "Veuillez vous enregistrer",
     "Remove": "Supprimer",
     "was banned": "a été banni(e)",
@@ -758,12 +758,17 @@
     "Disable URL previews by default for participants in this room": "Désactiver les aperçus d'URL par défaut pour les participants de ce salon",
     "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Les aperçus d'URL sont %(globalDisableUrlPreview)s par défaut pour les participants de ce salon.",
     "Enable URL previews for this room (affects only you)": "Activer les aperçus d'URL pour ce salon (n'affecte que vous)",
-    "Drop file here to upload": "Déposer le fichier ici pour téléchargement",
+    "Drop file here to upload": "Déposer le fichier ici pour le télécharger",
     " (unsupported)": " (non supporté)",
     "Ongoing conference call%(supportedText)s. %(joinText)s": "Appel conférence en cours%(supportedText)s. %(joinText)s",
     "Online": "En ligne",
-    "Offline": "Hors ligne",
+    "Offline": "Déconnecté",
     "Disable URL previews for this room (affects only you)": "Désactiver les aperçus d'URL pour ce salon (n'affecte que vous)",
     "Desktop specific": "Spécifique à la version bureau",
-    "Start automatically after system login": "Démarrer automatiquement après la phase d'authentification du système."
+    "Start automatically after system login": "Démarrer automatiquement après la phase d'authentification du système.",
+    "Idle": "Inactif",
+    "Jump to first unread message.": "Aller au premier message non-lu.",
+    "Options": "Options",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez vous continuer ?",
+    "Removed or unknown message type": "Type de message inconnu ou supprimé"
 }

From f2db6dd16836180001dd178e4de9a611afc3d6e4 Mon Sep 17 00:00:00 2001
From: "Iru Cai (vimacs)" <mytbk920423@gmail.com>
Date: Wed, 31 May 2017 16:59:24 +0000
Subject: [PATCH 08/58] Translated using Weblate (Chinese (Simplified))

Currently translated at 26.8% (207 of 770 strings)

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 33a44210de..91adec837f 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -154,5 +154,56 @@
     "The email address linked to your account must be entered.": "必须输入和你账号关联的邮箱地址。",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "文件 '%(fileName)s' 超过了此主服务器的上传大小限制",
     "The file '%(fileName)s' failed to upload": "文件 '%(fileName)s' 上传失败",
-    "Guests can't use labs features. Please register.": "游客不能使用实验性功能。请注册。"
+    "Disable URL previews for this room (affects only you)": "在这个房间禁止URL预览（只影响你）",
+    "af": "南非荷兰语",
+    "ca": "加泰罗尼亚语",
+    "cs": "捷克语",
+    "da": "丹麦语",
+    "de-at": "德语（奥地利）",
+    "de-ch": "德语（瑞士）",
+    "de": "德语",
+    "de-lu": "德语（卢森堡）",
+    "el": "希腊语",
+    "en-au": "英语（澳大利亚）",
+    "en": "英语",
+    "zh-cn": "中文（中国）",
+    "zh-hk": "中文（香港）",
+    "zh-sg": "中文（新加坡）",
+    "zh-tw": "中国（台湾）",
+    "Add email address": "添加邮件地址",
+    "Add phone number": "添加电话号码",
+    "Advanced": "高级",
+    "Algorithm": "算法",
+    "Always show message timestamps": "总是显示消息时间戳",
+    "all room members": "所有聊天室成员",
+    "all room members, from the point they are invited": "所有聊天室成员，从他们被邀请开始",
+    "all room members, from the point they joined": "所有聊天室成员，从他们加入开始",
+    "an address": "一个地址",
+    "and": "和",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在打字",
+    "%(names)s and %(count)s others are typing": "%(names)s 和另外 %(count)s 个人正在打字",
+    "An email has been sent to": "一封邮件已经被发送到",
+    "A new password must be entered.": "一个新的密码必须被输入。",
+    "%(senderName)s answered the call.": "%(senderName)s 接了通话。",
+    "An error has occurred.": "一个错误出现了。",
+    "Attachment": "附件",
+    "Autoplay GIFs and videos": "自动播放GIF和视频",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s.",
+    "Ban": "封禁",
+    "Banned users": "被封禁的用户",
+    "Click here": "点击这里",
+    "Click here to fix": "点击这里修复",
+    "Confirm password": "确认密码",
+    "Confirm your new password": "确认你的新密码",
+    "Continue": "继续",
+    "Ed25519 fingerprint": "Ed25519指纹",
+    "Invite new room members": "邀请新的聊天室成员",
+    "Join Room": "加入聊天室",
+    "joined": "加入了",
+    "%(targetName)s joined the room.": "%(targetName)s 加入了聊天室。",
+    "Jump to first unread message.": "跳到第一条未读消息。",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。",
+    "Leave room": "离开聊天室",
+    "Login as guest": "以游客的身份登录",
+    "New password": "新密码"
 }

From 30dc5f8117eb85e493dded8d58a86249f4cd93ba Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Wed, 31 May 2017 18:15:59 +0000
Subject: [PATCH 09/58] Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 61c75512d0..47ab9c7573 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -132,7 +132,7 @@
     "Drop here to tag %(section)s": "Déposer ici pour marque comme %(section)s",
     "Ed25519 fingerprint": "Empreinte Ed25519",
     "Email Address": "Adresse e-mail",
-    "Email, name or matrix ID": "E-mail, nom or identifiant Matrix",
+    "Email, name or matrix ID": "E-mail, nom ou identifiant Matrix",
     "Emoji": "Emoticône",
     "Enable encryption": "Activer l'encryption",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Les messages encryptés ne seront pas visibles dans les clients qui n’implémentent pas encore l’encryption",
@@ -176,7 +176,7 @@
     "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
     "Account": "Compte",
     "Add email address": "Ajouter une adresse e-mail",
-    "Add phone number": "Ajouter un numéro de téléphone",
+    "Add phone number": "Ajouter un numéro",
     "Admin": "Admin",
     "Advanced": "Avancé",
     "Algorithm": "Algorithme",
@@ -246,15 +246,15 @@
     "Current password": "Mot de passe actuel",
     "Curve25519 identity key": "Clé d’identité Curve25519",
     "/ddg is not a command": "/ddg n'est pas une commande",
-    "Deactivate Account": "Désactiver le compte",
-    "Deactivate my account": "Désactiver mon compte",
+    "Deactivate Account": "Supprimer le compte",
+    "Deactivate my account": "Supprimer mon compte",
     "decline": "décliner",
     "Decrypt %(text)s": "Décrypter %(text)s",
     "Decryption error": "Erreur de décryptage",
     "Delete": "Supprimer",
     "demote": "rétrograder",
     "Deops user with given id": "Retire les privilèges d’opérateur d’un utilisateur avec un ID donné",
-    "Device ID": "ID de l'appareil",
+    "Device ID": "Identifiant de l'appareil",
     "Devices": "Appareils",
     "Devices will not yet be able to decrypt history from before they joined the room": "Les appareils ne seront pas capables de décrypter l’historique précédant leur adhésion au salon",
     "ml": "Malayalam",
@@ -379,7 +379,7 @@
     "Permissions": "Permissions",
     "Phone": "Numéro de téléphone",
     "Operation failed": "L'opération a échoué",
-    "Bulk Options": "Option en vrac",
+    "Bulk Options": "Options de masse",
     "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changer le mot de passe actuellement réinitialise les clés d’encryption sur tous les appareils, rendant l’historique encrypté illisible, à moins d’exporter les clés du salon en avance de phase puis de les ré-importer. Ceci sera amélioré prochainement.",
     "Default": "Défaut",
     "Email address": "Adresse e-mail",
@@ -392,13 +392,13 @@
     "Invalid file%(extra)s": "Fichier %(extra)s invalide",
     "Mute": "Couper le son",
     "No users have specific privileges in this room": "Aucun utilisateur n’a de privilège spécifique dans ce salon",
-    "olm version:": "Version de olm :",
+    "olm version:": "version de olm :",
     "Once you&#39;ve followed the link it contains, click below": "Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s a placé un appel %(callType)s.",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Merci de vérifier vos e-mail et cliquer sur le lien quil contient. Une fois que cela est fait, cliquez sur continuer.",
-    "Power level must be positive integer.": "Le niveau de pouvoir doit être un entier positif.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez vérifier vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
+    "Power level must be positive integer.": "Le niveau d'autorité doit être un entier positif.",
     "Press": "Cliquer",
-    "Privacy warning": "Alerte vie privée",
+    "Privacy warning": "Alerte de confidentialité",
     "Privileged Users": "Utilisateur Privilégié",
     "Profile": "Profil",
     "Reason": "Raison",
@@ -425,8 +425,8 @@
     "Room Colour": "Couleur du salon",
     "Room name (optional)": "Nom du salon (optionnel)",
     "Rooms": "Salons",
-    "Scroll to bottom of page": "Défiler jusqu’au bas de la page",
-    "Scroll to unread messages": "Défiler jusqu’aux messages non-lus",
+    "Scroll to bottom of page": "Aller en bas de la page",
+    "Scroll to unread messages": "Aller aux messages non-lus",
     "Search": "Rechercher",
     "Search failed": "Erreur lors de la recherche",
     "Searches DuckDuckGo for results": "Recherche des résultats dans DuckDuckGo",
@@ -531,7 +531,7 @@
     "Upload avatar": "Télécharger une photo de profil",
     "Upload Failed": "Erreur lors du téléchargement",
     "Upload Files": "Télécharger les fichiers",
-    "Upload file": "Télécharger le fichier",
+    "Upload file": "Télécharger un fichier",
     "Usage": "Utilisation",
     "Use with caution": "Utiliser avec prudence",
     "User ID": "Identifiant d'utilisateur",
@@ -709,10 +709,10 @@
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Pour vérifier que vous pouvez faire confiance à cet appareil, merci de contacter son propriétaire par un autre moyen (par ex. en personne ou par téléphone) et demandez lui si la clé qu’il/elle voit dans ses Paramètres Utilisateur pour cet appareil correspond à la clé ci-dessous :",
     "Device name": "Nom de l'appareil",
     "Device key": "Clé de l'appareil",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si les clés correspondent, cliquer sur le bouton ’Vérifier’ ci-dessous. Si non, alors quelqu’un d’autre est en train d’intercepter cet appareil et vous devriez certainement cliquer sur le bouton ’Ajouter à la liste noire’ à la place.",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si les clés correspondent, cliquer sur le bouton ’Vérifier’ ci-dessous. Si non, alors quelqu’un d’autre est en train d’intercepter cet appareil et vous devriez certainement cliquer sur le bouton ’Blacklister' (Ajouter à la liste noire) à la place.",
     "In future this verification process will be more sophisticated.": "À l’avenir ce processus de vérification sera simplifié et plus sophistiqué.",
     "Verify device": "Vérifier cet appareil",
-    "I verify that the keys match": "J’ai vérifié que les clés correspondait",
+    "I verify that the keys match": "J’ai vérifié que les clés correspondaient",
     "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Nous avons rencontré une erreur en essayant de rétablir votre session précédente. Si vous continuez, vous devrez vous identifier à nouveau et l’historique encrypté de vos conversations sera illisible.",
     "Unable to restore session": "Impossible de restaurer la session",
     "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si vous avez utilisé une version plus récente de Riot précédemment, votre session risque d’être incompatible avec cette version. Fermez cette fenêtre et retournez à la version plus récente.",
@@ -724,7 +724,7 @@
     "Unknown devices": "Appareils inconnus",
     "Unknown Address": "Adresse inconnue",
     "Unblacklist": "Supprimer de la liste noire",
-    "Blacklist": "Ajouter à la liste noire",
+    "Blacklist": "Blacklister",
     "Unverify": "Non-vérifié",
     "Verify...": "Vérifier...",
     "ex. @bob:example.com": "ex. @bob:exemple.com",
@@ -764,8 +764,8 @@
     "Online": "En ligne",
     "Offline": "Déconnecté",
     "Disable URL previews for this room (affects only you)": "Désactiver les aperçus d'URL pour ce salon (n'affecte que vous)",
-    "Desktop specific": "Spécifique à la version bureau",
-    "Start automatically after system login": "Démarrer automatiquement après la phase d'authentification du système.",
+    "Desktop specific": "Spécifique à l'application de bureau",
+    "Start automatically after system login": "Démarrer automatiquement après la phase d'authentification du système",
     "Idle": "Inactif",
     "Jump to first unread message.": "Aller au premier message non-lu.",
     "Options": "Options",

From 7af2f615bd79615b0bf9cf203acf88295c4acd18 Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Wed, 31 May 2017 17:18:52 +0000
Subject: [PATCH 10/58] Translated using Weblate (German)

Currently translated at 99.7% (768 of 770 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 96dd38c78f..5850f8e3e4 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -386,7 +386,7 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s hat ein Bild gesendet.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sandte eine Einladung an %(targetDisplayName)s um diesem Raum beizutreten.",
     "%(senderName)s set a profile picture.": "%(senderName)s setzte ein Profilbild.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s setzte den Anzeigenamen zu %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s hat den Anzeigenamen geändert in %(displayName)s.",
     "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
     "These are experimental features that may break in unexpected ways": "Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können",
     "To use it, just wait for autocomplete results to load and tab through them.": "Um dies zu nutzen, warte auf die Autovervollständigungsergebnisse und benutze die TAB Taste.",
@@ -428,7 +428,7 @@
     "to tag direct chat": "als direkten Chat markieren",
     "You're not in any rooms yet! Press": "Du bist noch keinem Raum beigetreten! Drücke",
     "click to reveal": "Klicke zum anzeigen",
-    "To remove other users' messages": "Um Nachrichten anderer zu verbergen",
+    "To remove other users' messages": "Um Nachrichten anderer Nutzer zu verbergen",
     "You are trying to access %(roomName)s": "Du versuchst auf %(roomName)s zuzugreifen",
     "af": "Afrikaans",
     "ar-ae": "Arabisch (U.A.E.)",
@@ -580,7 +580,7 @@
     "Failed to kick": "Kicken fehlgeschlagen",
     "Failed to mute user": "Nutzer lautlos zu stellen fehlgeschlagen",
     "Failed to reject invite": "Einladung abzulehnen fehlgeschlagen",
-    "Failed to save settings": "Einstellungen speichern fehlgeschlagen",
+    "Failed to save settings": "Einstellungen konnten nicht gespeichert werden",
     "Failed to set display name": "Anzeigenamen zu ändern fehlgeschlagen",
     "Fill screen": "Fülle Bildschirm",
     "Guest users can't upload files. Please register to upload": "Gäste können keine Dateien hochladen. Bitte zunächst registrieren",
@@ -600,7 +600,7 @@
     "New address (e.g. #foo:%(localDomain)s)": "Neue Adresse (z.B. #foo:%(localDomain)s)",
     "not set": "nicht gesetzt",
     "not specified": "nicht spezifiziert",
-    "No devices with registered encryption keys": "Keine Geräte mit registrierten Verschlüsselungsschlüsseln",
+    "No devices with registered encryption keys": "Keine Geräte mit registrierten Verschlüsselungs-Schlüsseln",
     "No more results": "Keine weiteren Ergebnisse",
     "No results": "Keine Ergebnisse",
     "OK": "OK",
@@ -640,10 +640,10 @@
     "code": "Code",
     "quote": "Zitat",
     "bullet": "Aufzählung",
-    "Click to unmute video": "Klicke um Video zu reaktivieren",
+    "Click to unmute video": "Klicken, um die Video-Stummschaltung zu deaktivieren",
     "Click to unmute audio": "Klicke um Ton zu reaktivieren",
     "Failed to load timeline position": "Laden der Position im Zeitstrahl fehlgeschlagen",
-    "Failed to toggle moderator status": "Umschalten des Moderatorstatus fehlgeschlagen",
+    "Failed to toggle moderator status": "Umschalten des Moderator-Status fehlgeschlagen",
     "Enable encryption": "Verschlüsselung aktivieren",
     "The main address for this room is": "Die Hauptadresse für diesen Raum ist",
     "Autoplay GIFs and videos": "GIF-Dateien und Videos automatisch abspielen",
@@ -734,7 +734,7 @@
     "Passphrases must match": "Passphrase muss übereinstimmen",
     "Passphrase must not be empty": "Passphrase darf nicht leer sein",
     "Export room keys": "Exportiere Raum-Schlüssel",
-    "Enter passphrase": "Gebe Passphrase ein",
+    "Enter passphrase": "Passphrase eingeben",
     "Confirm passphrase": "Bestätige Passphrase",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Die Export-Datei wird mit einer Passphrase geschützt sein. Du solltest die Passphrase hier eingeben um die Datei zu entschlüsseln.",
     "You must join the room to see its files": "Du musst dem Raum beitreten um seine Dateien zu sehen",

From b63adc9b105605d87a37ddfeaccbf0bae123cc36 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Jun 2017 02:15:48 +0100
Subject: [PATCH 11/58] Prepare changelog for v0.9.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b9ecdb325..23098c4749 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,115 @@
+Changes in [0.9.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.0-rc.1) (2017-06-01)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.9...v0.9.0-rc.1)
+
+ * Fix rare case where presence duration is undefined
+   [\#982](https://github.com/matrix-org/matrix-react-sdk/pull/982)
+ * add concept of platform handling loudNotifications (bings/pings/whatHaveYou)
+   [\#985](https://github.com/matrix-org/matrix-react-sdk/pull/985)
+ * Fixes to i18n code
+   [\#984](https://github.com/matrix-org/matrix-react-sdk/pull/984)
+ * Update from Weblate.
+   [\#978](https://github.com/matrix-org/matrix-react-sdk/pull/978)
+ * Add partial support for RTL languages
+   [\#955](https://github.com/matrix-org/matrix-react-sdk/pull/955)
+ * Added two strings to translate
+   [\#975](https://github.com/matrix-org/matrix-react-sdk/pull/975)
+ * Update from Weblate.
+   [\#976](https://github.com/matrix-org/matrix-react-sdk/pull/976)
+ * Update from Weblate.
+   [\#974](https://github.com/matrix-org/matrix-react-sdk/pull/974)
+ * Initial Electron Settings - for Auto Launch
+   [\#920](https://github.com/matrix-org/matrix-react-sdk/pull/920)
+ * Fix missing string in the room settings
+   [\#973](https://github.com/matrix-org/matrix-react-sdk/pull/973)
+ * fix error in i18n string
+   [\#972](https://github.com/matrix-org/matrix-react-sdk/pull/972)
+ * Update from Weblate.
+   [\#970](https://github.com/matrix-org/matrix-react-sdk/pull/970)
+ * Support 12hr time in full date
+   [\#971](https://github.com/matrix-org/matrix-react-sdk/pull/971)
+ * Add _tJsx()
+   [\#968](https://github.com/matrix-org/matrix-react-sdk/pull/968)
+ * Update from Weblate.
+   [\#966](https://github.com/matrix-org/matrix-react-sdk/pull/966)
+ * Remove space between time and AM/PM
+   [\#969](https://github.com/matrix-org/matrix-react-sdk/pull/969)
+ * Piwik Analytics
+   [\#948](https://github.com/matrix-org/matrix-react-sdk/pull/948)
+ * Update from Weblate.
+   [\#965](https://github.com/matrix-org/matrix-react-sdk/pull/965)
+ * Improve ChatInviteDialog perf by ditching fuse, using indexOf and
+   lastActiveTs()
+   [\#960](https://github.com/matrix-org/matrix-react-sdk/pull/960)
+ * Say "X removed the room name" instead of showing nothing
+   [\#958](https://github.com/matrix-org/matrix-react-sdk/pull/958)
+ * roomview/roomheader fixes
+   [\#959](https://github.com/matrix-org/matrix-react-sdk/pull/959)
+ * Update from Weblate.
+   [\#953](https://github.com/matrix-org/matrix-react-sdk/pull/953)
+ * fix i18n in a situation where navigator.languages=[]
+   [\#956](https://github.com/matrix-org/matrix-react-sdk/pull/956)
+ * `t_` -> `_t` fix typo
+   [\#957](https://github.com/matrix-org/matrix-react-sdk/pull/957)
+ * Change redact -> remove for clarity
+   [\#831](https://github.com/matrix-org/matrix-react-sdk/pull/831)
+ * Update from Weblate.
+   [\#950](https://github.com/matrix-org/matrix-react-sdk/pull/950)
+ * fix mis-linting - missed it in code review :(
+   [\#952](https://github.com/matrix-org/matrix-react-sdk/pull/952)
+ * i18n fixes
+   [\#951](https://github.com/matrix-org/matrix-react-sdk/pull/951)
+ * Message Forwarding
+   [\#812](https://github.com/matrix-org/matrix-react-sdk/pull/812)
+ * don't focus_composer on window focus
+   [\#944](https://github.com/matrix-org/matrix-react-sdk/pull/944)
+ * Fix vector-im/riot-web#4042
+   [\#947](https://github.com/matrix-org/matrix-react-sdk/pull/947)
+ * import _t, drop two unused imports
+   [\#946](https://github.com/matrix-org/matrix-react-sdk/pull/946)
+ * Fix punctuation in TextForEvent to be i18n'd consistently
+   [\#945](https://github.com/matrix-org/matrix-react-sdk/pull/945)
+ * actually wire up alwaysShowTimestamps
+   [\#940](https://github.com/matrix-org/matrix-react-sdk/pull/940)
+ * Update from Weblate.
+   [\#943](https://github.com/matrix-org/matrix-react-sdk/pull/943)
+ * Update from Weblate.
+   [\#942](https://github.com/matrix-org/matrix-react-sdk/pull/942)
+ * Update from Weblate.
+   [\#941](https://github.com/matrix-org/matrix-react-sdk/pull/941)
+ * Update from Weblate.
+   [\#938](https://github.com/matrix-org/matrix-react-sdk/pull/938)
+ * Fix PM being AM
+   [\#939](https://github.com/matrix-org/matrix-react-sdk/pull/939)
+ * pass call state through dispatcher, for poor electron
+   [\#918](https://github.com/matrix-org/matrix-react-sdk/pull/918)
+ * Translations!
+   [\#934](https://github.com/matrix-org/matrix-react-sdk/pull/934)
+ * Remove suffix and prefix from login input username
+   [\#906](https://github.com/matrix-org/matrix-react-sdk/pull/906)
+ * Kierangould/12hourtimestamp
+   [\#903](https://github.com/matrix-org/matrix-react-sdk/pull/903)
+ * Don't include src in the test resolve root
+   [\#931](https://github.com/matrix-org/matrix-react-sdk/pull/931)
+ * Make the linked versions open a new tab, turt2live complained :P
+   [\#910](https://github.com/matrix-org/matrix-react-sdk/pull/910)
+ * Fix lint errors in SlashCommands
+   [\#919](https://github.com/matrix-org/matrix-react-sdk/pull/919)
+ * autoFocus input box
+   [\#911](https://github.com/matrix-org/matrix-react-sdk/pull/911)
+ * Make travis test against riot-web new-guest-access
+   [\#917](https://github.com/matrix-org/matrix-react-sdk/pull/917)
+ * Add right-branch logic to travis test script
+   [\#916](https://github.com/matrix-org/matrix-react-sdk/pull/916)
+ * Group e2e keys into blocks of 4 characters
+   [\#914](https://github.com/matrix-org/matrix-react-sdk/pull/914)
+ * Factor out DeviceVerifyDialog
+   [\#913](https://github.com/matrix-org/matrix-react-sdk/pull/913)
+ * Fix 'missing page_type' error
+   [\#909](https://github.com/matrix-org/matrix-react-sdk/pull/909)
+ * code style update
+   [\#904](https://github.com/matrix-org/matrix-react-sdk/pull/904)
+
 Changes in [0.8.9](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.9) (2017-05-22)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.9-rc.1...v0.8.9)

From bceef2db916c519d637923b2dd8f504cbd0c0cea Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Jun 2017 02:15:49 +0100
Subject: [PATCH 12/58] v0.9.0-rc.1

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

diff --git a/package.json b/package.json
index a6076a56d2..c17c8e83a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.8.9",
+  "version": "0.9.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 92d1a9a6ff0487b019cd3f63ddc30218522f3616 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@muchlearning.org>
Date: Wed, 31 May 2017 22:00:30 -0400
Subject: [PATCH 13/58] enable useCompactLayout user setting an add a class
 when it's enabled

Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
---
 src/components/structures/LoggedInView.js | 21 +++++++++++++++++++++
 src/components/structures/UserSettings.js |  2 +-
 src/i18n/strings/en_EN.json               |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 5f1aa0d32a..b9ef73dd42 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -18,6 +18,7 @@ limitations under the License.
 import * as Matrix from 'matrix-js-sdk';
 import React from 'react';
 
+import UserSettingsStore from '../../UserSettingsStore';
 import KeyCode from '../../KeyCode';
 import Notifier from '../../Notifier';
 import PageTypes from '../../PageTypes';
@@ -63,6 +64,13 @@ export default React.createClass({
         };
     },
 
+    getInitialState: function() {
+        return {
+            // use compact timeline view
+            useCompactLayout: UserSettingsStore.getSyncedSetting('useCompactLayout'),
+        };
+    },
+
     componentWillMount: function() {
         // stash the MatrixClient in case we log out before we are unmounted
         this._matrixClient = this.props.matrixClient;
@@ -72,10 +80,12 @@ export default React.createClass({
         this._scrollStateMap = {};
 
         document.addEventListener('keydown', this._onKeyDown);
+        this._matrixClient.on("accountData", this.onAccountData);
     },
 
     componentWillUnmount: function() {
         document.removeEventListener('keydown', this._onKeyDown);
+        this._matrixClient.removeListener("accountData", this.onAccountData);
     },
 
     getScrollStateForRoom: function(roomId) {
@@ -89,6 +99,14 @@ export default React.createClass({
         return this.refs.roomView.canResetTimeline();
     },
 
+    onAccountData: function(event) {
+        if (event.getType() === "im.vector.web.settings") {
+            this.setState({
+                useCompactLayout: event.getContent().useCompactLayout
+            });
+        }
+    },
+
     _onKeyDown: function(ev) {
             /*
             // Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers
@@ -245,6 +263,9 @@ export default React.createClass({
         if (topBar) {
             bodyClasses += ' mx_MatrixChat_toolbarShowing';
         }
+        if (this.state.useCompactLayout) {
+            bodyClasses += ' mx_MatrixChat_useCompactLayout';
+        }
 
         return (
             <div className='mx_MatrixChat_wrapper'>
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 725139de64..c545a75d45 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -79,11 +79,11 @@ const SETTINGS_LABELS = [
         id: 'showTwelveHourTimestamps',
         label: 'Show timestamps in 12 hour format (e.g. 2:30pm)',
     },
-/*
     {
         id: 'useCompactLayout',
         label: 'Use compact timeline layout',
     },
+/*
     {
         id: 'useFixedWidthFont',
         label: 'Use fixed width font',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4cf16b3d5d..a52082a236 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -517,6 +517,7 @@
   "Upload Files": "Upload Files",
   "Upload file": "Upload file",
   "Usage": "Usage",
+  "Use compact timeline layout": "Use compact timeline layout",
   "Use with caution": "Use with caution",
   "User ID": "User ID",
   "User Interface": "User Interface",

From 63c9ec7d532f1871876a5f6496758540f4dadea9 Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Thu, 1 Jun 2017 08:48:32 +0000
Subject: [PATCH 14/58] Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 47ab9c7573..5a0d16fcc3 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -128,7 +128,7 @@
     "Displays action": "Affiche l'action",
     "Don't send typing notifications": "Ne pas envoyer les notifications de saisie",
     "Download %(text)s": "Télécharger %(text)s",
-    "Drop here %(toAction)s": "Déposer ici %(toAction)s",
+    "Drop here %(toAction)s": "Déposer ici pour %(toAction)s",
     "Drop here to tag %(section)s": "Déposer ici pour marque comme %(section)s",
     "Ed25519 fingerprint": "Empreinte Ed25519",
     "Email Address": "Adresse e-mail",
@@ -723,7 +723,7 @@
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contient des appareils que vous n'avez encore jamais vus.",
     "Unknown devices": "Appareils inconnus",
     "Unknown Address": "Adresse inconnue",
-    "Unblacklist": "Supprimer de la liste noire",
+    "Unblacklist": "Réhabiliter",
     "Blacklist": "Blacklister",
     "Unverify": "Non-vérifié",
     "Verify...": "Vérifier...",

From 84fa154016df9777683fa7c8712cf9d806aec8a6 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Thu, 1 Jun 2017 11:02:48 +0000
Subject: [PATCH 15/58] Translated using Weblate (German)

Currently translated at 100.0% (770 of 770 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 5850f8e3e4..7f79633a58 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -822,5 +822,7 @@
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf eine Drittanbieter-Website weitergeleitet, damit du dein Konto authentifizieren kannst für die Verwendung mit %(integrationsUrl)s. Möchtest du fortfahren?",
     "Disable URL previews for this room (affects only you)": "Deaktiviere die URL-Vorschau für diesen Raum (betrifft nur dich)",
     "Start automatically after system login": "Starte automatisch nach System-Login",
-    "Desktop specific": "Desktopspezifisch"
+    "Desktop specific": "Desktopspezifisch",
+    "Jump to first unread message.": "Springe zur ersten ungelesenen Nachricht.",
+    "Options": "Optionen"
 }

From b26f4ba578d3c7422033273a9b6ee78a7e37eafa Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 1 Jun 2017 12:09:07 +0100
Subject: [PATCH 16/58] First lot of translations

---
 src/async-components/views/dialogs/ExportE2eKeysDialog.js | 4 ++--
 src/async-components/views/dialogs/ImportE2eKeysDialog.js | 2 +-
 src/i18n/strings/en_EN.json                               | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/ExportE2eKeysDialog.js b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
index 5abd758fa8..d6f16a7105 100644
--- a/src/async-components/views/dialogs/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
@@ -166,11 +166,11 @@ export default React.createClass({
                         </div>
                     </div>
                     <div className='mx_Dialog_buttons'>
-                        <input className='mx_Dialog_primary' type='submit' value='Export'
+                        <input className='mx_Dialog_primary' type='submit' value={_t('Export')}
                              disabled={disableForm}
                         />
                         <button onClick={this._onCancelClick} disabled={disableForm}>
-                            Cancel
+                            {_t("Cancel")}
                         </button>
                     </div>
                 </form>
diff --git a/src/async-components/views/dialogs/ImportE2eKeysDialog.js b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
index 75b66e2969..2622084222 100644
--- a/src/async-components/views/dialogs/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
@@ -164,7 +164,7 @@ export default React.createClass({
                         </div>
                     </div>
                     <div className='mx_Dialog_buttons'>
-                        <input className='mx_Dialog_primary' type='submit' value='Import'
+                        <input className='mx_Dialog_primary' type='submit' value={_t('Import')}
                             disabled={!this.state.enableSubmit || disableForm}
                         />
                         <button onClick={this._onCancelClick} disabled={disableForm}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 15aa3916bc..6112d4356e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -246,6 +246,7 @@
   "Error decrypting attachment": "Error decrypting attachment",
   "Event information": "Event information",
   "Existing Call": "Existing Call",
+  "Export": "Export",
   "Export E2E room keys": "Export E2E room keys",
   "Failed to ban user": "Failed to ban user",
   "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
@@ -296,6 +297,7 @@
   "Homeserver is": "Homeserver is",
   "Identity Server is": "Identity Server is",
   "I have verified my email address": "I have verified my email address",
+  "Import": "Import",
   "Import E2E room keys": "Import E2E room keys",
   "Incorrect verification code": "Incorrect verification code",
   "Interface Language": "Interface Language",

From f75e714c3ad660ead1eded117bc210b18ec32d96 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 1 Jun 2017 15:18:06 +0100
Subject: [PATCH 17/58] More translations..

---
 src/CallHandler.js                       | 12 ++++++------
 src/Login.js                             | 11 ++++++-----
 src/PasswordReset.js                     |  2 +-
 src/autocomplete/AutocompleteProvider.js | 16 ++++++++++++++++
 src/autocomplete/Autocompleter.js        | 16 ++++++++++++++++
 src/autocomplete/CommandProvider.js      | 16 ++++++++++++++++
 src/autocomplete/Components.js           | 16 ++++++++++++++++
 src/autocomplete/DuckDuckGoProvider.js   | 19 ++++++++++++++++++-
 src/autocomplete/EmojiProvider.js        | 16 ++++++++++++++++
 src/autocomplete/RoomProvider.js         | 16 ++++++++++++++++
 src/autocomplete/UserProvider.js         | 16 ++++++++++++++++
 src/createRoom.js                        |  4 ++--
 src/i18n/strings/en_EN.json              | 23 ++++++++++++++---------
 13 files changed, 159 insertions(+), 24 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index ca913528ed..b2ccf65df7 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -226,7 +226,7 @@ function _onAction(payload) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
                     title: _t('Existing Call'),
-                    description: _t('You are already in a call') + '.',
+                    description: _t('You are already in a call.'),
                 });
                 return; // don't allow >1 call to be placed.
             }
@@ -236,7 +236,7 @@ function _onAction(payload) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
                     title: _t('VoIP is unsupported'),
-                    description: _t('You cannot place VoIP calls in this browser') + '.',
+                    description: _t('You cannot place VoIP calls in this browser.'),
                 });
                 return;
             }
@@ -251,7 +251,7 @@ function _onAction(payload) {
             if (members.length <= 1) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    description: _t('You cannot place a call with yourself') + '.',
+                    description: _t('You cannot place a call with yourself.'),
                 });
                 return;
             }
@@ -284,7 +284,7 @@ function _onAction(payload) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
                     title: _t('VoIP is unsupported'),
-                    description: _t('You cannot place VoIP calls in this browser') + '.',
+                    description: _t('You cannot place VoIP calls in this browser.'),
                 });
             }
             else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
@@ -303,7 +303,7 @@ function _onAction(payload) {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createDialog(QuestionDialog, {
                     title: _t('Warning!'),
-                    description: _t('Conference calling is in development and may not be reliable') + '.',
+                    description: _t('Conference calling is in development and may not be reliable.'),
                     onFinished: confirm=>{
                         if (confirm) {
                             ConferenceHandler.createNewMatrixCall(
@@ -315,7 +315,7 @@ function _onAction(payload) {
                                 console.error("Conference call failed: " + err);
                                 Modal.createDialog(ErrorDialog, {
                                     title: _t('Failed to set up conference call'),
-                                    description: _t('Conference call failed') + '. ' + ((err && err.message) ? err.message : ''),
+                                    description: _t('Conference call failed.') + ' ' + ((err && err.message) ? err.message : ''),
                                 });
                             });
                         }
diff --git a/src/Login.js b/src/Login.js
index 107a8825e9..93985605f9 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import Matrix from "matrix-js-sdk";
+import { _t } from "./languageHandler";
 
 import q from 'q';
 import url from 'url';
@@ -97,9 +98,9 @@ export default class Login {
             };
         }, (error) => {
             if (error.httpStatus === 403) {
-                error.friendlyText = "Guest access is disabled on this Home Server.";
+                error.friendlyText = _t("Guest access is disabled on this Home Server.");
             } else {
-                error.friendlyText = "Failed to register as guest: " + error.data;
+                error.friendlyText = _t("Failed to register as guest:") + ' ' + error.data;
             }
             throw error;
         });
@@ -158,12 +159,12 @@ export default class Login {
         }, function(error) {
             if (error.httpStatus == 400 && loginParams.medium) {
                 error.friendlyText = (
-                    'This Home Server does not support login using email address.'
+                    _t('This Home Server does not support login using email address.');
                 );
             }
             else if (error.httpStatus === 403) {
                 error.friendlyText = (
-                    'Incorrect username and/or password.'
+                    _t('Incorrect username and/or password.')
                 );
                 if (self._fallbackHsUrl) {
                     var fbClient = Matrix.createClient({
@@ -187,7 +188,7 @@ export default class Login {
             }
             else {
                 error.friendlyText = (
-                    'There was a problem logging in. (HTTP ' + error.httpStatus + ")"
+                    _t("There was a problem logging in.") + ' (HTTP ' + error.httpStatus + ")"
                 );
             }
             throw error;
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index 668b8f67da..0739ca0a24 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -82,7 +82,7 @@ class PasswordReset {
                 err.message = _t('Failed to verify email address: make sure you clicked the link in the email');
             }
             else if (err.httpStatus === 404) {
-                err.message = _t('Your email address does not appear to be associated with a Matrix ID on this Homeserver') + '.';
+                err.message = _t('Your email address does not appear to be associated with a Matrix ID on this Homeserver.');
             }
             else if (err.httpStatus) {
                 err.message += ` (Status ${err.httpStatus})`;
diff --git a/src/autocomplete/AutocompleteProvider.js b/src/autocomplete/AutocompleteProvider.js
index 5c90990295..7988ab8a02 100644
--- a/src/autocomplete/AutocompleteProvider.js
+++ b/src/autocomplete/AutocompleteProvider.js
@@ -1,3 +1,19 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
 import type {Completion, SelectionRange} from './Autocompleter';
 
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index 1bf1b1dc14..8678321ab2 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -1,3 +1,19 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 // @flow
 
 import type {Component} from 'react';
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index fef0544b8a..fe9a7bae12 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -1,3 +1,19 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
diff --git a/src/autocomplete/Components.js b/src/autocomplete/Components.js
index 4595f7456d..e553fef079 100644
--- a/src/autocomplete/Components.js
+++ b/src/autocomplete/Components.js
@@ -1,3 +1,19 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js
index bffd924976..5dae1b46d4 100644
--- a/src/autocomplete/DuckDuckGoProvider.js
+++ b/src/autocomplete/DuckDuckGoProvider.js
@@ -1,4 +1,21 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
+import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import 'whatwg-fetch';
 
@@ -75,7 +92,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
     }
 
     getName() {
-        return '🔍 Results from DuckDuckGo';
+        return '🔍 ' + _t('Results from DuckDuckGo');
     }
 
     static getInstance(): DuckDuckGoProvider {
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 7b9e8fb669..ca434072cb 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -1,3 +1,19 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 4a2dd09eb5..b6c8c2f263 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -1,3 +1,19 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 281b6fd40d..4dc867ba55 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -1,3 +1,19 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
diff --git a/src/createRoom.js b/src/createRoom.js
index 0a21f68208..cd8cd7bac3 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -45,7 +45,7 @@ function createRoom(opts) {
         setTimeout(()=>{
             Modal.createDialog(NeedToRegisterDialog, {
                 title: _t('Please Register'),
-                description: _t('Guest users can\'t create new rooms. Please register to create room and start a chat') + '.'
+                description: _t('Guest users can\'t create new rooms. Please register to create room and start a chat.')
             });
         }, 0);
         return q(null);
@@ -106,7 +106,7 @@ function createRoom(opts) {
         console.error("Failed to create room " + roomId + " " + err);
         Modal.createDialog(ErrorDialog, {
             title: _t("Failure to create room"),
-            description: _t("Server may be unavailable, overloaded, or you hit a bug") + ".",
+            description: _t("Server may be unavailable, overloaded, or you hit a bug."),
         });
         return null;
     });
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6112d4356e..85e6343359 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -192,8 +192,8 @@
   "Click to unmute audio": "Click to unmute audio",
   "Command error": "Command error",
   "Commands": "Commands",
-  "Conference call failed": "Conference call failed",
-  "Conference calling is in development and may not be reliable": "Conference calling is in development and may not be reliable",
+  "Conference call failed.": "Conference call failed.",
+  "Conference calling is in development and may not be reliable.": "Conference calling is in development and may not be reliable.",
   "Conference calls are not supported in encrypted rooms": "Conference calls are not supported in encrypted rooms",
   "Conference calls are not supported in this client": "Conference calls are not supported in this client",
   "Confirm password": "Confirm password",
@@ -260,6 +260,7 @@
   "Failed to load timeline position": "Failed to load timeline position",
   "Failed to lookup current room": "Failed to lookup current room",
   "Failed to mute user": "Failed to mute user",
+  "Failed to register as guest:": "Failed to register as guest:",
   "Failed to reject invite": "Failed to reject invite",
   "Failed to reject invitation": "Failed to reject invitation",
   "Failed to save settings": "Failed to save settings",
@@ -284,8 +285,9 @@
   "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.",
   "Found a bug?": "Found a bug?",
   "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
+  "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
   "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
-  "Guest users can't create new rooms. Please register to create room and start a chat": "Guest users can't create new rooms. Please register to create room and start a chat",
+  "Guest users can't create new rooms. Please register to create room and start a chat.": "Guest users can't create new rooms. Please register to create room and start a chat.",
   "Guest users can't upload files. Please register to upload": "Guest users can't upload files. Please register to upload",
   "Guests can't use labs features. Please register.": "Guests can't use labs features. Please register.",
   "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
@@ -299,6 +301,7 @@
   "I have verified my email address": "I have verified my email address",
   "Import": "Import",
   "Import E2E room keys": "Import E2E room keys",
+  "Incorrect username and/or password.": "Incorrect username and/or password.",
   "Incorrect verification code": "Incorrect verification code",
   "Interface Language": "Interface Language",
   "Invalid alias format": "Invalid alias format",
@@ -404,6 +407,7 @@
   "Report it": "Report it",
   "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.",
   "restore": "restore",
+  "Results from DuckDuckGo": "Results from DuckDuckGo",
   "Return to app": "Return to app",
   "Return to login screen": "Return to login screen",
   "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
@@ -431,7 +435,7 @@
   "Server may be unavailable or overloaded": "Server may be unavailable or overloaded",
   "Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
   "Server may be unavailable, overloaded, or the file too big": "Server may be unavailable, overloaded, or the file too big",
-  "Server may be unavailable, overloaded, or you hit a bug": "Server may be unavailable, overloaded, or you hit a bug",
+  "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
   "Server unavailable, overloaded, or something else went wrong": "Server unavailable, overloaded, or something else went wrong",
   "Session ID": "Session ID",
   "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
@@ -464,6 +468,8 @@
   "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
   "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
   "The remote side failed to pick up": "The remote side failed to pick up",
+  "This Home Server does not support login using email address.": "This Home Server does not support login using email address.",
+  "There was a problem logging in.": "There was a problem logging in.",
   "This room has no local addresses": "This room has no local addresses",
   "This room is not recognised.": "This room is not recognised.",
   "This room is private or inaccessible to guests. You may be able to join if you register": "This room is private or inaccessible to guests. You may be able to join if you register",
@@ -545,11 +551,11 @@
   "Who would you like to communicate with?": "Who would you like to communicate with?",
   "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
   "Would you like to": "Would you like to",
-  "You are already in a call": "You are already in a call",
+  "You are already in a call.": "You are already in a call.",
   "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",
   "You are trying to access %(roomName)s": "You are trying to access %(roomName)s",
-  "You cannot place a call with yourself": "You cannot place a call with yourself",
-  "You cannot place VoIP calls in this browser": "You cannot place VoIP calls in this browser",
+  "You cannot place a call with yourself.": "You cannot place a call with yourself.",
+  "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
   "You do not have permission to post to this room": "You do not have permission to post to this room",
   "You have been invited to join this room by %(inviterName)s": "You have been invited to join this room by %(inviterName)s",
   "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device",
@@ -559,7 +565,7 @@
   "You need to be logged in.": "You need to be logged in.",
   "You need to enter a user name.": "You need to enter a user name.",
   "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.",
-  "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Your email address does not appear to be associated with a Matrix ID on this Homeserver",
+  "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
   "Your password has been reset": "Your password has been reset",
   "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
   "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
@@ -700,7 +706,6 @@
   "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.",
   "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
   "You must join the room to see its files": "You must join the room to see its files",
-  "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
   "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
   "Start new Chat": "Start new Chat",
   "Guest users can't invite users. Please register.": "Guest users can't invite users. Please register.",

From 5300aa40f987b4f22f29d4b309819719cfcf6435 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Thu, 1 Jun 2017 14:29:39 +0000
Subject: [PATCH 18/58] Translated using Weblate (German)

Currently translated at 100.0% (778 of 778 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 815212ab84..7c4b6bcab3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -822,5 +822,13 @@
     "Start automatically after system login": "Starte automatisch nach System-Login",
     "Desktop specific": "Desktopspezifisch",
     "Jump to first unread message.": "Springe zur ersten ungelesenen Nachricht.",
-    "Options": "Optionen"
+    "Options": "Optionen",
+    "disabled": "deaktiviert",
+    "enabled": "aktiviert",
+    "Invited": "Eingeladen",
+    "Set a Display Name": "Setze einen Anzeigenamen",
+    "for %(amount)ss": "für %(amount)ss",
+    "for %(amount)sm": "für %(amount)sm",
+    "for %(amount)sh": "für %(amount)sh",
+    "for %(amount)sd": "für %(amount)sd"
 }

From e266edf35070dfe6ffbdbe774797f8f8b9c44d06 Mon Sep 17 00:00:00 2001
From: Jean GB <jeangb@hotmail.fr>
Date: Thu, 1 Jun 2017 13:28:53 +0000
Subject: [PATCH 19/58] Translated using Weblate (French)

Currently translated at 99.1% (771 of 778 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7ab80de73c..fd22a54f57 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -436,7 +436,7 @@
     "Sender device information": "Information de l'appareil de l'expéditeur",
     "Send Invites": "Envoyer les invitations",
     "Send Reset Email": "Envoyer l'e-mail de réinitialisation",
-    "sent an image": "envoyer une image",
+    "sent an image": "a envoyé une image",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s a envoyé une image.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s a invité %(targetDisplayName)s à rejoindre le salon.",
     "sent a video": "a envoyé une vidéo",

From 547f10bcbb9efa1d2f69e9a27f7330869f66ad67 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 1 Jun 2017 15:44:56 +0100
Subject: [PATCH 20/58] Add translations for slash command failures

---
 src/SlashCommands.js                          | 29 ++++++++++++-------
 .../views/rooms/MessageComposerInput.js       |  2 +-
 .../views/rooms/MessageComposerInputOld.js    |  2 +-
 src/i18n/strings/en_EN.json                   | 10 ++++++-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index ae619a1359..185ea504ac 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -186,7 +186,7 @@ const commands = {
                     if (targetRoomId) { break; }
                 }
                 if (!targetRoomId) {
-                    return reject("Unrecognised room alias: " + roomAlias);
+                    return reject(_t("Unrecognised room alias:") +  ' ' + roomAlias);
                 }
             }
         }
@@ -303,14 +303,14 @@ const commands = {
 
                 const device = MatrixClientPeg.get().getStoredDevice(userId, deviceId);
                 if (!device) {
-                    return reject(`Unknown (user, device) pair: (${userId}, ${deviceId})`);
+                    return reject(_t(`Unknown (user, device) pair:`) + ` (${userId}, ${deviceId})`);
                 }
 
                 if (device.isVerified()) {
                     if (device.getFingerprint() === fingerprint) {
-                        return reject(`Device already verified!`);
+                        return reject(_t(`Device already verified!`));
                     } else {
-                        return reject(`WARNING: Device already verified, but keys do NOT MATCH!`);
+                        return reject(_t(`WARNING: Device already verified, but keys do NOT MATCH!`));
                     }
                 }
 
@@ -322,12 +322,15 @@ const commands = {
                     // Tell the user we verified everything!
                     const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                     Modal.createDialog(QuestionDialog, {
-                        title: "Verified key",
+                        title: _t("Verified key"),
                         description: (
                             <div>
                                 <p>
-                                    The signing key you provided matches the signing key you received
-                                    from { userId }'s device { deviceId }. Device marked as verified.
+                                {
+                                    _t("The signing key you provided matches the signing key you received " +
+                                    "from %(userId)s's device %(deviceId)s. Device marked as verified.",
+                                    {userId: userId, deviceId: deviceId})
+                                }
                                 </p>
                             </div>
                         ),
@@ -336,9 +339,13 @@ const commands = {
 
                     return success();
                 } else {
-                    return reject(`WARNING: KEY VERIFICATION FAILED! The signing key for ${userId} and device
-                            ${deviceId} is "${device.getFingerprint()}" which does not match the provided key
-                            "${fingerprint}". This could mean your communications are being intercepted!`);
+                    const fprint = device.getFingerprint();
+                    return reject(
+                        _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' +
+                           ' %(deviceId)s is "%(fprint)s" which does not match the provided key' +
+                           ' "%(fingerprint)s". This could mean your communications are being intercepted!',
+                            {deviceId: deviceId, fprint: fprint, userId: userId, fingerprint: fingerprint})
+                    );
                 }
             }
         }
@@ -383,7 +390,7 @@ module.exports = {
             if (commands[cmd]) {
                 return commands[cmd].run(roomId, args);
             } else {
-                return reject("Unrecognised command: " + input);
+                return reject(_t("Unrecognised command:") + ' ' + input);
             }
         }
         return null; // not a command
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index a79f71c92d..65148f91ef 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -506,7 +506,7 @@ export default class MessageComposerInput extends React.Component {
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createDialog(ErrorDialog, {
                         title: _t("Server error"),
-                        description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong") + "."),
+                        description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong.")),
                     });
                 });
             }
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index b664ef4bd3..f6af20c03b 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -316,7 +316,7 @@ export default React.createClass({
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createDialog(ErrorDialog, {
                         title: _t("Server error"),
-                        description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong") + "."),
+                        description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong.")),
                     });
                 });
             }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 85e6343359..301e62c2db 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -215,6 +215,7 @@
   "demote": "demote",
   "Deops user with given id": "Deops user with given id",
   "Default": "Default",
+  "Device already verified!": "Device already verified!",
   "Device ID": "Device ID",
   "Devices": "Devices",
   "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
@@ -436,7 +437,7 @@
   "Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
   "Server may be unavailable, overloaded, or the file too big": "Server may be unavailable, overloaded, or the file too big",
   "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-  "Server unavailable, overloaded, or something else went wrong": "Server unavailable, overloaded, or something else went wrong",
+  "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
   "Session ID": "Session ID",
   "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
   "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
@@ -460,6 +461,7 @@
   "tag direct chat": "tag direct chat",
   "The default role for new room members is": "The default role for new room members is",
   "The main address for this room is": "The main address for this room is",
+  "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
   "This action cannot be performed by a guest user. Please register to be able to do this": "This action cannot be performed by a guest user. Please register to be able to do this",
   "This email address is already in use": "This email address is already in use",
   "This email address was not found": "This email address was not found",
@@ -521,8 +523,11 @@
   "unknown device": "unknown device",
   "unknown error code": "unknown error code",
   "Unknown room %(roomId)s": "Unknown room %(roomId)s",
+  "Unknown (user, device) pair:": "Unknown (user, device) pair:",
   "unknown": "unknown",
   "Unmute": "Unmute",
+  "Unrecognised command:": "Unrecognised command:",
+  "Unrecognised room alias:": "Unrecognised room alias:",
   "uploaded a file": "uploaded a file",
   "Upload avatar": "Upload avatar",
   "Upload Failed": "Upload Failed",
@@ -538,6 +543,7 @@
   "Verification Pending": "Verification Pending",
   "Verification": "Verification",
   "verified": "verified",
+  "Verified key": "Verified key",
   "Video call": "Video call",
   "Voice call": "Voice call",
   "VoIP conference finished.": "VoIP conference finished.",
@@ -545,6 +551,8 @@
   "VoIP is unsupported": "VoIP is unsupported",
   "(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
   "Warning!": "Warning!",
+  "WARNING: Device already verified, but keys do NOT MATCH!": "WARNING: Device already verified, but keys do NOT MATCH!",
+  "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!",
   "Who can access this room?": "Who can access this room?",
   "Who can read history?": "Who can read history?",
   "Who would you like to add to this room?": "Who would you like to add to this room?",

From a0c21854a9f0cb412e3434ff65284ad617b32e66 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 1 Jun 2017 15:45:31 +0100
Subject: [PATCH 21/58] Make it compile

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

diff --git a/src/Login.js b/src/Login.js
index 93985605f9..87731744e9 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -159,7 +159,7 @@ export default class Login {
         }, function(error) {
             if (error.httpStatus == 400 && loginParams.medium) {
                 error.friendlyText = (
-                    _t('This Home Server does not support login using email address.');
+                    _t('This Home Server does not support login using email address.')
                 );
             }
             else if (error.httpStatus === 403) {

From ced68f2719fd3a503b1246d0d8c02a5f9078233f Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 1 Jun 2017 15:53:08 +0100
Subject: [PATCH 22/58] Find a way to translate the name of RTE in user
 settings

I never said it was a *nice* way...
---
 src/UserSettingsStore.js                  | 12 +++++++-----
 src/components/structures/UserSettings.js |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 5b96692dc9..84d85e7565 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -17,24 +17,26 @@ limitations under the License.
 import q from 'q';
 import MatrixClientPeg from './MatrixClientPeg';
 import Notifier from './Notifier';
+import { _t } from './languageHandler';
 
 /*
  * TODO: Make things use this. This is all WIP - see UserSettings.js for usage.
  */
 
-/*
- * TODO: Find a way to translate the names of LABS_FEATURES. In other words, guarantee that languages were already loaded before building this array.
- */
-
 export default {
     LABS_FEATURES: [
         {
-            name: "New Composer & Autocomplete",
+            name: "-",
             id: 'rich_text_editor',
             default: false,
         },
     ],
 
+    // horrible but it works. The locality makes this somewhat more palatable.
+    doTranslations: function() {
+        this.LABS_FEATURES[0].name = _t("New Composer & Autocomplete");
+    },
+
     loadProfileInfo: function() {
         const cli = MatrixClientPeg.get();
         return cli.getProfileInfo(cli.credentials.userId);
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 101ec2c378..a4238fe392 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -767,6 +767,7 @@ module.exports = React.createClass({
     _renderLabs: function() {
         // default to enabled if undefined
         if (this.props.enableLabs === false) return null;
+        UserSettingsStore.doTranslations();
 
         const features = UserSettingsStore.LABS_FEATURES.map((feature) => (
             <div key={feature.id} className="mx_UserSettings_toggle">

From 0c7040e190ff3eca9da2f7bd50dcd5c8f2496039 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 1 Jun 2017 16:08:42 +0100
Subject: [PATCH 23/58] Missed one

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

diff --git a/src/async-components/views/dialogs/ImportE2eKeysDialog.js b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
index 2622084222..61d2aeec74 100644
--- a/src/async-components/views/dialogs/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
@@ -168,7 +168,7 @@ export default React.createClass({
                             disabled={!this.state.enableSubmit || disableForm}
                         />
                         <button onClick={this._onCancelClick} disabled={disableForm}>
-                            Cancel
+                            {_t("Cancel")}
                         </button>
                     </div>
                 </form>

From 312109e846e92ccfee7175206dfaa065422d3db2 Mon Sep 17 00:00:00 2001
From: Jean GB <jeangb@hotmail.fr>
Date: Thu, 1 Jun 2017 14:59:45 +0000
Subject: [PATCH 24/58] Translated using Weblate (French)

Currently translated at 98.7% (771 of 781 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index fd22a54f57..00f4a74a37 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -128,7 +128,7 @@
     "Displays action": "Affiche l'action",
     "Don't send typing notifications": "Ne pas envoyer les notifications de saisie",
     "Download %(text)s": "Télécharger %(text)s",
-    "Drop here %(toAction)s": "Déposer ici pour %(toAction)s",
+    "Drop here %(toAction)s": "Déposer ici %(toAction)s",
     "Drop here to tag %(section)s": "Déposer ici pour marque comme %(section)s",
     "Ed25519 fingerprint": "Empreinte Ed25519",
     "Email Address": "Adresse e-mail",

From 66bce35918d10ca9a6babb09fa1571cf61e71908 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 1 Jun 2017 17:29:40 +0100
Subject: [PATCH 25/58] copyright adjustments

---
 src/autocomplete/AutocompleteProvider.js | 1 +
 src/autocomplete/Autocompleter.js        | 2 +-
 src/autocomplete/CommandProvider.js      | 1 +
 src/autocomplete/Components.js           | 2 +-
 src/autocomplete/DuckDuckGoProvider.js   | 1 +
 src/autocomplete/EmojiProvider.js        | 1 +
 src/autocomplete/RoomProvider.js         | 1 +
 src/autocomplete/UserProvider.js         | 1 +
 8 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/autocomplete/AutocompleteProvider.js b/src/autocomplete/AutocompleteProvider.js
index 7988ab8a02..cbdb839ce3 100644
--- a/src/autocomplete/AutocompleteProvider.js
+++ b/src/autocomplete/AutocompleteProvider.js
@@ -1,4 +1,5 @@
 /*
+Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index 8678321ab2..f8564a43a0 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Vector Creations Ltd
+Copyright 2016 Aviral Dasgupta
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index fe9a7bae12..205a3737dc 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -1,4 +1,5 @@
 /*
+Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/autocomplete/Components.js b/src/autocomplete/Components.js
index e553fef079..b26a217ec6 100644
--- a/src/autocomplete/Components.js
+++ b/src/autocomplete/Components.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Vector Creations Ltd
+Copyright 2016 Aviral Dasgupta
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js
index 5dae1b46d4..9c996bb1cc 100644
--- a/src/autocomplete/DuckDuckGoProvider.js
+++ b/src/autocomplete/DuckDuckGoProvider.js
@@ -1,4 +1,5 @@
 /*
+Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index ca434072cb..810212315b 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -1,4 +1,5 @@
 /*
+Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index b6c8c2f263..be35c53e5d 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -1,4 +1,5 @@
 /*
+Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 4dc867ba55..fedebb3618 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -1,4 +1,5 @@
 /*
+Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");

From a2b931ee911f2b7dcb81166e3afe4710790e7dbd Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Thu, 1 Jun 2017 17:09:46 +0000
Subject: [PATCH 26/58] Translated using Weblate (French)

Currently translated at 100.0% (781 of 781 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 00f4a74a37..695c3b7222 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -771,5 +771,15 @@
     "Jump to first unread message.": "Aller au premier message non-lu.",
     "Options": "Options",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez vous continuer ?",
-    "Removed or unknown message type": "Type de message inconnu ou supprimé"
+    "Removed or unknown message type": "Type de message inconnu ou supprimé",
+    "disabled": "désactivé",
+    "enabled": "activé",
+    "Set a Display Name": "Définir un nom d’affichage",
+    "for %(amount)ss": "depuis %(amount)ss",
+    "for %(amount)sm": "depuis %(amount)sm",
+    "for %(amount)sh": "depuis %(amount)sh",
+    "for %(amount)sd": "depuis %(amount)sj",
+    "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName a changé l’image de profil du salon en <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l’image de profil du salon.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’image de profil de %(roomName)s"
 }

From 3ffa3d82c64972ce90de0e069847a479470aacef Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Thu, 1 Jun 2017 17:08:10 +0000
Subject: [PATCH 27/58] Translated using Weblate (German)

Currently translated at 99.6% (778 of 781 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7c4b6bcab3..00de1617a1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -18,7 +18,7 @@
     "Name": "Name",
     "Device ID": "Geräte-ID",
     "Verification": "Verifizierung",
-    "Ed25519 fingerprint": "Ed25519 Fingerprint",
+    "Ed25519 fingerprint": "Ed25519-Fingerprint",
     "User ID": "Benutzer-ID",
     "Curve25519 identity key": "Curve25519-Identitäts-Schlüssel",
     "Claimed Ed25519 fingerprint key": "Geforderter Ed25519 Fingerprint Schlüssel",
@@ -110,7 +110,7 @@
     "*️⃣ Commands": "*️⃣ Befehle",
     "Default": "Standard",
     "demote": "Zum zurückstufen",
-    "Export E2E room keys": "Exportiere E2E-Raum-Schlüssel",
+    "Export E2E room keys": "E2E-Raum-Schlüssel exportieren",
     "Failed to change password. Is your password correct?": "Passwort-Änderung schlug fehl. Ist dein Passwort korrekt?",
     "Failed to forget room": "Vergessen des Raums schlug fehl",
     "Failed to leave room": "Verlassen des Raums fehlgeschlagen",
@@ -150,7 +150,7 @@
     "Logged in as": "Angemeldet als",
     "Logout": "Abmelden",
     "made future room history visible to": "mache kommende Raum-Historie sichtbar für",
-    "Manage Integrations": "Verwalte Integrationen",
+    "Manage Integrations": "Integrationen verwalten",
     "Members only": "Nur Mitglieder",
     "Mobile phone number": "Mobile Telefonnummer",
     "Moderator": "Moderator",
@@ -182,7 +182,7 @@
     "Once you&#39;ve followed the link it contains, click below": "Nachdem du dem darin enthaltenen Link gefolgt bist, klicke unten",
     "rejected the invitation.": "lehnte die Einladung ab.",
     "Reject invitation": "Einladung ablehnen",
-    "Remove Contact Information?": "Lösche Kontakt-Informationen?",
+    "Remove Contact Information?": "Kontakt-Informationen löschen?",
     "removed their display name": "löschte den eigenen Anzeigenamen",
     "Remove": "Entfernen",
     "requested a VoIP conference": "hat eine VoIP-Konferenz angefordert",
@@ -192,8 +192,8 @@
     "Room Colour": "Raumfarbe",
     "Room name (optional)": "Raumname (optional)",
     "Scroll to unread messages": "Scrolle zu ungelesenen Nachrichten",
-    "Send Invites": "Sende Einladungen",
-    "Send Reset Email": "Sende Rücksetz-E-mail",
+    "Send Invites": "Einladungen senden",
+    "Send Reset Email": "E-Mail für das Zurücksetzen senden",
     "sent an image": "sandte ein Bild",
     "sent an invitation to": "sandte eine Einladung an",
     "sent a video": "sandte ein Video",
@@ -216,7 +216,7 @@
     "their invitation": "ihre Einladung",
     "These are experimental features that may break in unexpected ways. Use with caution": "Dies sind experimentelle Funktionen die in unerwarteter Weise Fehler verursachen können. Mit Vorsicht benutzen",
     "The visibility of existing history will be unchanged": "Die Sichtbarkeit der existenten Historie bleibt unverändert",
-    "This doesn't appear to be a valid email address": "Die scheint keine valide E-Mail-Adresse zu sein",
+    "This doesn't appear to be a valid email address": "Dies scheint keine gültige E-Mail-Adresse zu sein",
     "this invitation?": "diese Einladung?",
     "This is a preview of this room. Room interactions have been disabled": "Dies ist eine Vorschau dieses Raumes. Raum-Interaktionen wurden deaktiviert",
     "This room is not accessible by remote Matrix servers": "Dieser Raum ist über entfernte Matrix-Server nicht zugreifbar",
@@ -239,7 +239,7 @@
     "To reset your password, enter the email address linked to your account": "Um dein Passwort zurückzusetzen, gib bitte die mit deinem Account verknüpfte E-Mail-Adresse ein",
     "To send messages": "Zum Nachrichten senden",
     "turned on end-to-end encryption (algorithm": "aktivierte Ende-zu-Ende-Verschlüsselung (Algorithmus",
-    "Unable to add email address": "Unfähig die E-Mail-Adresse hinzuzufügen",
+    "Unable to add email address": "E-Mail-Adresse konnte nicht hinzugefügt werden",
     "Unable to remove contact information": "Unfähig die Kontakt-Informationen zu löschen",
     "Unable to verify email address.": "Unfähig die E-Mail-Adresse zu verifizieren.",
     "Unban": "Entbannen",
@@ -257,7 +257,7 @@
     "Verification Pending": "Verifizierung ausstehend",
     "Video call": "Videoanruf",
     "Voice call": "Sprachanruf",
-    "VoIP conference finished.": "VoIP-Konferenz beendet.",
+    "VoIP conference finished.": "VoIP-Konferenz wurde beendet.",
     "VoIP conference started.": "VoIP-Konferenz gestartet.",
     "(warning: cannot be disabled again!)": "(Warnung: Kann nicht wieder deaktiviert werden!)",
     "was banned": "wurde aus dem Raum verbannt",
@@ -266,7 +266,7 @@
     "was unbanned": "wurde entbannt",
     "was": "wurde",
     "Who can access this room?": "Wer hat Zugang zu diesem Raum?",
-    "Who can read history?": "Wer kann die Historie lesen?",
+    "Who can read history?": "Wer kann die Chat-Historie lesen?",
     "Who would you like to add to this room?": "Wen möchtest du zu diesem Raum hinzufügen?",
     "Who would you like to communicate with?": "Mit wem möchtest du kommunizieren?",
     "Would you like to": "Möchtest du",
@@ -285,8 +285,8 @@
     "Conference calls are not supported in encrypted rooms": "Konferenzgespräche sind in verschlüsselten Räumen nicht unterstützt",
     "Conference calls are not supported in this client": "Konferenzgespräche sind in diesem Client nicht unterstützt",
     "Existing Call": "Existierender Anruf",
-    "Failed to set up conference call": "Aufbau des Konferenzgesprächs fehlgeschlagen",
-    "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail anklickt hast",
+    "Failed to set up conference call": "Konferenzgespräch konnte nicht gestartet werden",
+    "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast",
     "Failure to create room": "Raumerstellung fehlgeschlagen",
     "Guest users can't create new rooms. Please register to create room and start a chat": "Gäste können keine neuen Räume erstellen. Bitte registrieren um einen Raum zu erstellen und einen Chat zu starten",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot hat keine Berechtigung Benachrichtigungen zu senden - bitte prüfe deine Browser-Einstellungen",
@@ -301,7 +301,7 @@
     "Unable to capture screen": "Unfähig den Bildschirm aufzunehmen",
     "Unable to enable Notifications": "Unfähig Benachrichtigungen zu aktivieren",
     "Upload Failed": "Upload fehlgeschlagen",
-    "VoIP is unsupported": "VoIP ist nicht unterstützt",
+    "VoIP is unsupported": "VoIP wird nicht unterstützt",
     "You are already in a call": "Du bist bereits bei einem Anruf",
     "You cannot place a call with yourself": "Du kannst keinen Anruf mit dir selbst starten",
     "You cannot place VoIP calls in this browser": "Du kannst kein VoIP-Gespräch in diesem Browser starten",
@@ -328,7 +328,7 @@
     "Dec": "Dez",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "Set a display name:": "Setze einen Anzeigenamen:",
+    "Set a display name:": "Anzeigename eingeben:",
     "Upload an avatar:": "Lade einen Avatar hoch:",
     "This server does not support authentication with a phone number.": "Dieser Server unterstützt keine Authentifizierung mittels Telefonnummer.",
     "Missing password.": "Fehlendes Passwort.",
@@ -352,7 +352,7 @@
     "%(names)s and %(count)s others are typing": "%(names)s und %(count)s weitere Personen tippen",
     "%(senderName)s answered the call.": "%(senderName)s beantwortete den Anruf.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s aus dem Raum verbannt.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s änderte den Anzeigenamen von %(oldDisplayName)s zu %(displayName)s.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von %(oldDisplayName)s auf %(displayName)s geändert.",
     "%(senderName)s changed their profile picture.": "%(senderName)s änderte das Profilbild.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s.",
@@ -579,7 +579,7 @@
     "Failed to mute user": "Nutzer lautlos zu stellen fehlgeschlagen",
     "Failed to reject invite": "Einladung abzulehnen fehlgeschlagen",
     "Failed to save settings": "Einstellungen konnten nicht gespeichert werden",
-    "Failed to set display name": "Anzeigenamen zu ändern fehlgeschlagen",
+    "Failed to set display name": "Anzeigename konnte nicht gesetzt werden",
     "Fill screen": "Fülle Bildschirm",
     "Guest users can't upload files. Please register to upload": "Gäste können keine Dateien hochladen. Bitte zunächst registrieren",
     "Hide Text Formatting Toolbar": "Verberge Text-Formatierungs-Toolbar",
@@ -709,7 +709,7 @@
     "Interface Language": "Oberflächen-Sprache",
     "Logged in as:": "Angemeldet als:",
     "matrix-react-sdk version:": "Version von matrix-react-sdk:",
-    "New passwords don't match": "Neue Passwörter nicht gleich",
+    "New passwords don't match": "Die neuen Passwörter stimmen nicht überein",
     "olm version:": "Version von olm:",
     "Passwords can't be empty": "Passwortfelder dürfen nicht leer sein",
     "Registration required": "Registrierung benötigt",
@@ -735,7 +735,7 @@
     "Enter passphrase": "Passphrase eingeben",
     "Confirm passphrase": "Bestätige Passphrase",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Die Export-Datei wird mit einer Passphrase geschützt sein. Du solltest die Passphrase hier eingeben um die Datei zu entschlüsseln.",
-    "You must join the room to see its files": "Du musst dem Raum beitreten um seine Dateien zu sehen",
+    "You must join the room to see its files": "Du musst dem Raum beitreten, um die Raum-Dateien sehen zu können",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Fehler gestoßen.",
     "Reject all %(invitedRooms)s invites": "Lehne alle %(invitedRooms)s Einladungen ab",
     "Start new Chat": "Starte neuen Chat",
@@ -749,7 +749,7 @@
     "To continue, please enter your password.": "Zum fortfahren bitte Passwort eingeben.",
     "Device name": "Geräte-Name",
     "Device key": "Geräte-Schlüssel",
-    "In future this verification process will be more sophisticated.": "In Zukunft wird der Verifikationsprozess eleganter.",
+    "In future this verification process will be more sophisticated.": "Zukünftig wird dieser Verifizierungsprozess technisch ausgereifter und eleganter gestaltet werden.",
     "Verify device": "Gerät verifizieren",
     "I verify that the keys match": "Ich bestätige, dass die Schlüssel passen",
     "Unable to restore session": "Sitzungswiederherstellung fehlgeschlagen",
@@ -764,7 +764,7 @@
     "Add User": "Nutzer hinzufügen",
     "Sign in with CAS": "Mit CAS anmelden",
     "Custom Server Options": "Erweiterte Server-Optionen",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Du kannst die erweiterten Server-Optionen nutzen um dich an anderen Matrix-Servern anzumelden indem die eine andere Heimserver-URL angibst.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Du kannst die erweiterten Server-Optionen nutzen, um dich an anderen Matrix-Servern anzumelden, indem du eine andere Heimserver-URL angibst.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Dies erlaubt dir diese App mit einem existierenden Matrix-Konto auf einem anderen Heimserver zu verwenden.",
     "Dismiss": "Ablehnen",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Du kannst auch einen angepassten Idantitätsserver angeben aber dies wird typischerweise Interaktionen mit anderen Nutzern auf Basis der E-Mail-Adresse verhindern.",
@@ -779,7 +779,7 @@
     "Custom server": "Angepasster Server",
     "Home server URL": "Heimserver-URL",
     "Identity server URL": "Identitätsserver-URL",
-    "What does this mean?": "Was bedeutet es?",
+    "What does this mean?": "Was bedeutet das?",
     "Error decrypting audio": "Audio-Entschlüsselung fehlgeschlagen",
     "Error decrypting image": "Bild-Entschlüsselung fehlgeschlagen",
     "Image '%(Body)s' cannot be displayed.": "Das Bild '%(Body)s' kann nicht angezeigt werden.",
@@ -808,7 +808,7 @@
     "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Um zu bestätigen, dass diesem Gerät vertraut werden kann, kontaktiere bitte den Eigentümer über einen anderen Weg (z.B. Telefon-Anruf) und frage, ob der Schlüssel, den sie in den Nutzer-Einstellungen für dieses Gerät sehen dem folgenden gleicht:",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Wenn er passt, betätige den Bestätigen-Button unten. Wenn nicht, fängt jemand anderes dieses Gerät ab und du möchtest wahrscheinlich lieber den Blacklist-Button betätigen.",
     "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Bei der Wiederherstellung deiner vorherigen Sitzung ist ein Fehler aufgetreten. Um fortzufahren, musst du dich erneut anmelden. Eine zuvor verschlüsselte Chat-Historie wird in der Folge nicht mehr lesbar sein.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Wenn du vorher eine aktuellere Version von Riot verwendet hast, ist deine Sitzung wohlmöglich inkompatibel mit dieser Version. Schließe dieses Fenster und kehre zur aktuelleren Version zurück.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Wenn du zuvor eine aktuellere Version von Riot verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.",
     "Blacklist": "Blockieren",
     "Unblacklist": "Entblockieren",
     "Unverify": "Entverifizieren",
@@ -817,7 +817,7 @@
     "Idle": "inaktiv",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen dir für jedes Gerät durch den Verifizierungsprozess zu gehen um zu bestätigen, dass sie ihrem legitimierten Besitzer gehören, aber du kannst die Nachrichten ohne Verifizierung erneut senden, wenn du es vorziehst.",
     "Ongoing conference call%(supportedText)s. %(joinText)s": "Laufendes Konferenzgespräch%(supportedText)s. %(joinText)s",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf eine Drittanbieter-Website weitergeleitet, damit du dein Konto authentifizieren kannst für die Verwendung mit %(integrationsUrl)s. Möchtest du fortfahren?",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Konto  für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
     "Disable URL previews for this room (affects only you)": "Deaktiviere die URL-Vorschau für diesen Raum (betrifft nur dich)",
     "Start automatically after system login": "Starte automatisch nach System-Login",
     "Desktop specific": "Desktopspezifisch",

From 9f8b2ba4ba1d31ee92a6ae1340daabfb63722d57 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 18:58:07 +0100
Subject: [PATCH 28/58] maybe fixxy?

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 karma.conf.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/karma.conf.js b/karma.conf.js
index 4ad72b4927..d544248332 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -177,6 +177,11 @@ module.exports = function (config) {
                 ],
             },
             devtool: 'inline-source-map',
+            externals: {
+                // Don't try to bundle electron: leave it as a commonjs dependency
+                // (the 'commonjs' here means it will output a 'require')
+                "electron": "commonjs electron",
+            },
         },
 
         webpackMiddleware: {

From 46750c4b9b5efe8a812df3b989c84642088920e4 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 20:40:27 +0200
Subject: [PATCH 29/58] Fix tests for PR #989

---
 test/i18n/languages.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/i18n/languages.json b/test/i18n/languages.json
index bdb46584b9..e3a2595370 100644
--- a/test/i18n/languages.json
+++ b/test/i18n/languages.json
@@ -1,3 +1,4 @@
 {
-    "en": "en_EN.json"
+    "fileName": "en_EN.json",
+    "label": "English"
 }

From 8e34b59d32929828c91b44a1cd5e11601d02f635 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Thu, 1 Jun 2017 19:46:25 +0100
Subject: [PATCH 30/58] Revert "Revert "add labels to language picker""

---
 .../views/elements/LanguageDropdown.js        |  9 +--------
 src/languageHandler.js                        | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 25a920d2e0..49f89aa469 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -40,14 +40,7 @@ export default class LanguageDropdown extends React.Component {
     }
 
     componentWillMount() {
-        languageHandler.getAllLanguageKeysFromJson().then((langKeys) => {
-            const langs = [];
-            langKeys.forEach((languageKey) => {
-                langs.push({
-                    value: languageKey,
-                    label: _t(languageKey)
-                });
-            });
+        languageHandler.getAllLanguagesFromJson().then((langs) => {
             langs.sort(function(a, b){
                 if(a.label < b.label) return -1;
                 if(a.label > b.label) return 1;
diff --git a/src/languageHandler.js b/src/languageHandler.js
index 1c3acab082..ab29dd926e 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -133,7 +133,7 @@ export function setLanguage(preferredLangs) {
             throw new Error("Unable to find an appropriate language");
         }
 
-        return getLanguage(i18nFolder + availLangs[langToUse]);
+        return getLanguage(i18nFolder + availLangs[langToUse].fileName);
     }).then((langData) => {
         counterpart.registerTranslations(langToUse, langData);
         counterpart.setLocale(langToUse);
@@ -142,16 +142,25 @@ export function setLanguage(preferredLangs) {
 
         // Set 'en' as fallback language:
         if (langToUse != "en") {
-            return getLanguage(i18nFolder + availLangs['en']);
+            return getLanguage(i18nFolder + availLangs['en'].fileName);
         }
     }).then((langData) => {
         if (langData) counterpart.registerTranslations('en', langData);
     });
 };
 
-export function getAllLanguageKeysFromJson() {
-    return getLangsJson().then((langs) => {
-        return Object.keys(langs);
+export function getAllLanguagesFromJson() {
+    return getLangsJson().then((langsObject) => {
+        var langs = [];
+        for (var langKey in langsObject) {
+            if (langsObject.hasOwnProperty(langKey)) {
+                langs.push({
+                    'value': langKey,
+                    'label': langsObject[langKey].label
+                });
+            }
+        }
+        return langs;
     });
 }
 

From cbf967a86d9cc5de38a4e600b8c67f76450d39a4 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 20:53:59 +0200
Subject: [PATCH 31/58] Fix tests

We do not have a en.json but a en_EN.json
---
 src/languageHandler.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index ab29dd926e..65e82a7c81 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -141,11 +141,11 @@ export function setLanguage(preferredLangs) {
         console.log("set language to " + langToUse);
 
         // Set 'en' as fallback language:
-        if (langToUse != "en") {
-            return getLanguage(i18nFolder + availLangs['en'].fileName);
+        if (langToUse != "en_EN") {
+            return getLanguage(i18nFolder + availLangs['en_EN'].fileName);
         }
     }).then((langData) => {
-        if (langData) counterpart.registerTranslations('en', langData);
+        if (langData) counterpart.registerTranslations('en_EN', langData);
     });
 };
 

From 51131ef7a54e52e6bafd3a37fcea4d8357fdc66a Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 21:02:40 +0200
Subject: [PATCH 32/58] Fix translation tests part 2

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

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 65e82a7c81..feb91cf2ef 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -130,7 +130,9 @@ export function setLanguage(preferredLangs) {
             }
         }
         if (!langToUse) {
-            throw new Error("Unable to find an appropriate language");
+            // Fallback to en_EN if none is found
+            langToUse = 'en_EN'
+            console.error("Unable to find an appropriate language");
         }
 
         return getLanguage(i18nFolder + availLangs[langToUse].fileName);
@@ -142,7 +144,7 @@ export function setLanguage(preferredLangs) {
 
         // Set 'en' as fallback language:
         if (langToUse != "en_EN") {
-            return getLanguage(i18nFolder + availLangs['en_EN'].fileName);
+            return getLanguage(i18nFolder + availLangs[langToUse].fileName);
         }
     }).then((langData) => {
         if (langData) counterpart.registerTranslations('en_EN', langData);

From 924a8d1be041f83eeef9650e3b0798b710812bb4 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 21:03:43 +0200
Subject: [PATCH 33/58] Fix line change that should not happen

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

diff --git a/src/languageHandler.js b/src/languageHandler.js
index feb91cf2ef..33f9781f99 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -144,7 +144,7 @@ export function setLanguage(preferredLangs) {
 
         // Set 'en' as fallback language:
         if (langToUse != "en_EN") {
-            return getLanguage(i18nFolder + availLangs[langToUse].fileName);
+            return getLanguage(i18nFolder + availLangs['en_EN'].fileName);
         }
     }).then((langData) => {
         if (langData) counterpart.registerTranslations('en_EN', langData);

From 1b35f816fba21e880577c26eb03f3a0792e96c09 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 21:10:32 +0200
Subject: [PATCH 34/58] Fix languages.json

---
 test/i18n/languages.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/i18n/languages.json b/test/i18n/languages.json
index e3a2595370..5dc02003f7 100644
--- a/test/i18n/languages.json
+++ b/test/i18n/languages.json
@@ -1,4 +1,6 @@
 {
-    "fileName": "en_EN.json",
-    "label": "English"
+    "en": {
+        "fileName": "en_EN.json",
+        "label": "English"
+    }
 }

From 8c2728ffc52a6ae60b3c19934e94cdc934cb0995 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 21:10:58 +0200
Subject: [PATCH 35/58] Revert changes of the key used

---
 src/languageHandler.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 33f9781f99..798798b6e5 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -131,7 +131,7 @@ export function setLanguage(preferredLangs) {
         }
         if (!langToUse) {
             // Fallback to en_EN if none is found
-            langToUse = 'en_EN'
+            langToUse = 'en'
             console.error("Unable to find an appropriate language");
         }
 
@@ -143,11 +143,11 @@ export function setLanguage(preferredLangs) {
         console.log("set language to " + langToUse);
 
         // Set 'en' as fallback language:
-        if (langToUse != "en_EN") {
-            return getLanguage(i18nFolder + availLangs['en_EN'].fileName);
+        if (langToUse != "en") {
+            return getLanguage(i18nFolder + availLangs['en'].fileName);
         }
     }).then((langData) => {
-        if (langData) counterpart.registerTranslations('en_EN', langData);
+        if (langData) counterpart.registerTranslations('en', langData);
     });
 };
 

From 650d45466c78c69d00fd1c61d55debfe70a0d21d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Jun 2017 22:06:02 +0100
Subject: [PATCH 36/58] fix up missing strings caused by punctuation changes

---
 scripts/fix-i18n.pl           |  9 +++++++++
 src/i18n/strings/de_DE.json   | 18 +++++++++---------
 src/i18n/strings/es.json      |  6 +++---
 src/i18n/strings/fr.json      | 18 +++++++++---------
 src/i18n/strings/nl.json      |  4 ++--
 src/i18n/strings/pt.json      | 16 ++++++++--------
 src/i18n/strings/pt_BR.json   | 18 +++++++++---------
 src/i18n/strings/ru.json      | 14 +++++++-------
 src/i18n/strings/zh_Hans.json | 36 +++++++++++++++++------------------
 src/i18n/strings/zh_Hant.json |  6 +++---
 10 files changed, 77 insertions(+), 68 deletions(-)

diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
index 9a12c9d909..247b2b663f 100755
--- a/scripts/fix-i18n.pl
+++ b/scripts/fix-i18n.pl
@@ -52,6 +52,15 @@ Guest users can't invite users. Please register to invite.
 This room is inaccessible to guests. You may be able to join if you register.
 delete the alias.
 remove %(name)s from the directory.
+Conference call failed.
+Conference calling is in development and may not be reliable.
+Guest users can't create new rooms. Please register to create room and start a chat.
+Server may be unavailable, overloaded, or you hit a bug.
+Server unavailable, overloaded, or something else went wrong.
+You are already in a call.
+You cannot place VoIP calls in this browser.
+You cannot place a call with yourself.
+Your email address does not appear to be associated with a Matrix ID on this Homeserver.
 EOT
 )];
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 00de1617a1..baf2b317cf 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -227,7 +227,7 @@
     "to join the discussion": "um an der Diskussion teilzunehmen",
     "To kick users": "Um Nutzer zu entfernen",
     "Admin": "Administrator",
-    "Server may be unavailable, overloaded, or you hit a bug": "Server könnte nicht verfügbar oder überlastet sein oder du bist auf einen Fehler gestoßen",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server könnte nicht verfügbar oder überlastet sein oder du bist auf einen Fehler gestoßen.",
     "Could not connect to the integration server": "Konnte keine Verbindung zum Integrations-Server herstellen",
     "Disable inline URL previews by default": "URL-Vorschau im Chat standardmäßig deaktivieren",
     "Guests can't use labs features. Please register.": "Gäste können keine Labor-Funktionen nutzen. Bitte registrieren.",
@@ -280,15 +280,15 @@
     "times": "mal",
     "Bulk Options": "Bulk-Optionen",
     "Call Timeout": "Anruf-Timeout",
-    "Conference call failed": "Konferenzgespräch fehlgeschlagen",
-    "Conference calling is in development and may not be reliable": "Konferenzgespräche sind in Entwicklung und evtl. nicht zuverlässig",
+    "Conference call failed.": "Konferenzgespräch fehlgeschlagen.",
+    "Conference calling is in development and may not be reliable.": "Konferenzgespräche sind in Entwicklung und evtl. nicht zuverlässig.",
     "Conference calls are not supported in encrypted rooms": "Konferenzgespräche sind in verschlüsselten Räumen nicht unterstützt",
     "Conference calls are not supported in this client": "Konferenzgespräche sind in diesem Client nicht unterstützt",
     "Existing Call": "Existierender Anruf",
     "Failed to set up conference call": "Konferenzgespräch konnte nicht gestartet werden",
     "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast",
     "Failure to create room": "Raumerstellung fehlgeschlagen",
-    "Guest users can't create new rooms. Please register to create room and start a chat": "Gäste können keine neuen Räume erstellen. Bitte registrieren um einen Raum zu erstellen und einen Chat zu starten",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Gäste können keine neuen Räume erstellen. Bitte registrieren um einen Raum zu erstellen und einen Chat zu starten.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot hat keine Berechtigung Benachrichtigungen zu senden - bitte prüfe deine Browser-Einstellungen",
     "Riot was not given permission to send notifications - please try again": "Riot hat das Recht nicht bekommen Benachrichtigungen zu senden. Bitte erneut probieren",
     "This email address is already in use": "Diese E-Mail-Adresse wird bereits verwendet",
@@ -302,11 +302,11 @@
     "Unable to enable Notifications": "Unfähig Benachrichtigungen zu aktivieren",
     "Upload Failed": "Upload fehlgeschlagen",
     "VoIP is unsupported": "VoIP wird nicht unterstützt",
-    "You are already in a call": "Du bist bereits bei einem Anruf",
-    "You cannot place a call with yourself": "Du kannst keinen Anruf mit dir selbst starten",
-    "You cannot place VoIP calls in this browser": "Du kannst kein VoIP-Gespräch in diesem Browser starten",
+    "You are already in a call.": "Du bist bereits bei einem Anruf.",
+    "You cannot place a call with yourself.": "Du kannst keinen Anruf mit dir selbst starten.",
+    "You cannot place VoIP calls in this browser.": "Du kannst kein VoIP-Gespräch in diesem Browser starten.",
     "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "Du musst dich erneut anmelden, um Ende-zu-Ende-Verschlüsselungs-Schlüssel für dieses Gerät zu generieren und um den öffentlichen Schlüssel auf deinem Homeserver zu hinterlegen. Dies muss nur einmal durchgeführt werden, bitte entschuldige die Unannehmlichkeiten.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Homeserver verknüpft zu sein",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Homeserver verknüpft zu sein.",
     "Sun": "So",
     "Mon": "Mo",
     "Tue": "Di",
@@ -608,7 +608,7 @@
     "Server error": "Server-Fehler",
     "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(",
     "Server may be unavailable, overloaded, or the file too big": "Server ist entweder nicht verfügbar, überlastet oder die Datei ist zu groß",
-    "Server unavailable, overloaded, or something else went wrong": "Der Server ist entweder nicht verfügbar, überlastet oder es liegt ein anderweitiger Fehler vor",
+    "Server unavailable, overloaded, or something else went wrong.": "Der Server ist entweder nicht verfügbar, überlastet oder es liegt ein anderweitiger Fehler vor.",
     "Some of your messages have not been sent": "Einige deiner Nachrichten wurden noch nicht gesendet",
     "Submit": "Absenden",
     "The main address for this room is: %(canonical_alias_section)s": "Die Hauptadresse für diesen Raum ist: %(canonical_alias_section)s",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 849a685667..e071e63a3a 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -191,8 +191,8 @@
     "Click to unmute audio": "Haz clic para activar sonido de audio",
     "Command error": "Error de comando",
     "Commands": "Comandos",
-    "Conference call failed": "La llamada de conferencia falló",
-    "Conference calling is in development and may not be reliable": "La llamada en conferencia esta en desarrollo y no podría ser segura",
+    "Conference call failed.": "La llamada de conferencia falló.",
+    "Conference calling is in development and may not be reliable.": "La llamada en conferencia esta en desarrollo y no podría ser segura.",
     "Conference calls are not supported in encrypted rooms": "Las llamadas en conferencia no son soportadas en salas encriptadas",
     "Conference calls are not supported in this client": "Las llamadas en conferencia no son soportadas en este navegador",
     "Confirm password": "Confirmar clave",
@@ -281,7 +281,7 @@
     "Found a bug?": "¿Encontraste un error?",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
     "Guests can't set avatars. Please register.": "Invitados no puedes establecer avatares. Por favor regístrate.",
-    "Guest users can't create new rooms. Please register to create room and start a chat": "Usuarios invitados no pueden crear nuevas salas. Por favor regístrate para crear la sala y iniciar la conversación",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Usuarios invitados no pueden crear nuevas salas. Por favor regístrate para crear la sala y iniciar la conversación.",
     "Guest users can't upload files. Please register to upload": "Usuarios invitados no puedes subir archivos. Por favor regístrate para subir tus archivos",
     "Guests can't use labs features. Please register.": "Invitados no puedes usar las características en desarrollo. Por favor regístrate.",
     "Guests cannot join this room even if explicitly invited.": "Invitados no pueden unirse a esta sala aun cuando han sido invitados explícitamente.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 695c3b7222..fbcc04e881 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -232,8 +232,8 @@
     "Click to unmute audio": "Cliquer pour rétablir le son",
     "Command error": "Erreur de commande",
     "Commands": "Commandes",
-    "Conference call failed": "Échec de la conférence",
-    "Conference calling is in development and may not be reliable": "Les appels en conférence sont encore en développement et sont potentiellement peu fiables",
+    "Conference call failed.": "Échec de la conférence.",
+    "Conference calling is in development and may not be reliable.": "Les appels en conférence sont encore en développement et sont potentiellement peu fiables.",
     "Conference calls are not supported in encrypted rooms": "Les appels en conférence ne sont pas supportés dans les salons encryptés",
     "Conference calls are not supported in this client": "Les appels en conférence ne sont pas supportés avec ce client",
     "Confirm password": "Confirmer le mot de passe",
@@ -293,7 +293,7 @@
     "For security, this session has been signed out. Please sign in again.": "Par sécurité, la session a expiré. Merci de vous authentifer à nouveau.",
     "Found a bug?": "Trouvé un problème ?",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s à %(toPowerLevel)s",
-    "Guest users can't create new rooms. Please register to create room and start a chat": "Les visiteurs ne peuvent créer de nouveaux salons. Merci de vous enregistrer pour commencer une discussion",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Les visiteurs ne peuvent créer de nouveaux salons. Merci de vous enregistrer pour commencer une discussion.",
     "Guest users can't upload files. Please register to upload": "Les visiteurs ne peuvent telécharger de fichiers. Merci de vous enregistrer pour télécharger",
     "had": "avait",
     "Hangup": "Raccrocher",
@@ -444,8 +444,8 @@
     "Server may be unavailable or overloaded": "Le serveur semble être inaccessible ou surchargé",
     "Server may be unavailable, overloaded, or search timed out :(": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
     "Server may be unavailable, overloaded, or the file too big": "Le serveur semble être inaccessible, surchargé ou le fichier trop important",
-    "Server may be unavailable, overloaded, or you hit a bug": "Le serveur semble être inaccessible, surchargé ou vous avez rencontré un problème",
-    "Server unavailable, overloaded, or something else went wrong": "Le serveur semble être inaccessible, surchargé ou quelque chose s'est mal passé",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être inaccessible, surchargé ou vous avez rencontré un problème.",
+    "Server unavailable, overloaded, or something else went wrong.": "Le serveur semble être inaccessible, surchargé ou quelque chose s'est mal passé.",
     "Session ID": "Identifiant de session",
     "%(senderName)s set a profile picture.": "%(senderName)s a défini une photo de profil.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a défini son nom d’affichage comme %(displayName)s.",
@@ -556,11 +556,11 @@
     "Who would you like to communicate with?": "Avec qui voulez-vous communiquer ?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a révoqué l’invitation de %(targetName)s.",
     "Would you like to": "Voulez-vous",
-    "You are already in a call": "Vous êtes déjà dans un appel",
+    "You are already in a call.": "Vous êtes déjà dans un appel.",
     "You're not in any rooms yet! Press": "Vous n’êtes dans aucun salon ! Cliquez",
     "You are trying to access %(roomName)s": "Vous essayez d'accéder à %(roomName)s",
-    "You cannot place a call with yourself": "Vous ne pouvez pas passer d'appel avec vous-même",
-    "You cannot place VoIP calls in this browser": "Vous ne pouvez pas passer d'appel voix dans cet explorateur",
+    "You cannot place a call with yourself.": "Vous ne pouvez pas passer d'appel avec vous-même.",
+    "You cannot place VoIP calls in this browser.": "Vous ne pouvez pas passer d'appel voix dans cet explorateur.",
     "You do not have permission to post to this room": "Vous n’avez pas la permission de poster dans ce salon",
     "You have been invited to join this room by %(inviterName)s": "Vous avez été invité à joindre ce salon par %(inviterName)s",
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Vous avez été déconnecté de tous vos appareils et ne recevrez plus de notifications. Pour réactiver les notificationsm identifiez vous à nouveau sur tous les appareils",
@@ -570,7 +570,7 @@
     "You need to be logged in.": "Vous devez être connecté.",
     "You need to enter a user name.": "Vous devez entrer un nom d’utilisateur.",
     "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "Vous devez vous connecter à nouveau pour générer les clés d’encryption pour cet appareil, et soumettre la clé publique à votre homeserver. Cette action ne se reproduira pas; veuillez nous excuser pour la gêne occasionnée.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Votre adresse e-mail ne semble pas associée à un identifiant Matrix sur ce homeserver",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Votre adresse e-mail ne semble pas associée à un identifiant Matrix sur ce homeserver.",
     "Your password has been reset": "Votre mot de passe a été réinitialisé",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Votre mot de passe a été mis à jour avec succès. Vous ne recevrez plus de notification sur vos appareils jusqu’à ce que vous vous identifiez à nouveau",
     "You seem to be in a call, are you sure you want to quit?": "Vous semblez avoir un appel en cours, êtes-vous sûr(e) de vouloir quitter ?",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 668fd2ba32..b89c360792 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -191,8 +191,8 @@
     "Click to unmute audio": "Klik om het dempen van het geluid op te heffen",
     "Command error": "Opdracht fout",
     "Commands": "Opdrachten",
-    "Conference call failed": "Conferentie gesprek mislukt",
-    "Conference calling is in development and may not be reliable": "Conferentie gesprekken zijn nog in ontwikkelingen en kunnen onbetrouwbaar zijn",
+    "Conference call failed.": "Conferentie gesprek mislukt.",
+    "Conference calling is in development and may not be reliable.": "Conferentie gesprekken zijn nog in ontwikkelingen en kunnen onbetrouwbaar zijn.",
     "Conference calls are not supported in encrypted rooms": "Conferentie gesprekken worden niet ondersteunt in versleutelde kamers",
     "Conference calls are not supported in this client": "Conferentie gesprekken worden niet ondersteunt in deze client",
     "Confirm password": "Bevestigen wachtwoord",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index f57ee4109a..ad4a9774d6 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -188,7 +188,7 @@
     "sent an invitation to": "enviou um convite para",
     "sent a video": "enviou um vídeo",
     "Server may be unavailable or overloaded": "Servidor pode estar indisponível ou sobrecarregado",
-    "Server may be unavailable, overloaded, or you hit a bug": "Servidor pode estar indisponível, sobrecarregado ou aconteceu um erro de execução",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Servidor pode estar indisponível, sobrecarregado ou aconteceu um erro de execução.",
     "Session ID": "Identificador de sessão",
     "set a profile picture": "colocou uma foto de perfil",
     "set their display name to": "configurou seu nome para",
@@ -320,8 +320,8 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s alterou o tópico para \"%(topic)s\".",
     "click to reveal": "clique para ver",
-    "Conference call failed": "Chamada de conferência falhou",
-    "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
+    "Conference call failed.": "Chamada de conferência falhou.",
+    "Conference calling is in development and may not be reliable.": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar.",
     "Conference calls are not supported in encrypted rooms": "Chamadas de conferência não são possíveis em salas criptografadas",
     "Conference calls are not supported in this client": "Chamadas de conferência não são possíveis neste navegador",
     "/ddg is not a command": "/ddg não é um comando",
@@ -336,7 +336,7 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
     "Failure to create room": "Não foi possível criar a sala",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
-    "Guest users can't create new rooms. Please register to create room and start a chat": "Visitantes não podem criar novas salas. Por favor, registre-se para criar uma sala e iniciar uma conversa",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Visitantes não podem criar novas salas. Por favor, registre-se para criar uma sala e iniciar uma conversa.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
     "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
@@ -392,15 +392,15 @@
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s's.",
-    "You are already in a call": "Você já está em  uma chamada",
+    "You are already in a call.": "Você já está em  uma chamada.",
     "You're not in any rooms yet! Press": "Você ainda não está em nenhuma sala! Pressione",
     "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
-    "You cannot place a call with yourself": "Você não pode iniciar uma chamada",
-    "You cannot place VoIP calls in this browser": "Você não pode fazer chamadas de voz neste navegador",
+    "You cannot place a call with yourself.": "Você não pode iniciar uma chamada.",
+    "You cannot place VoIP calls in this browser.": "Você não pode fazer chamadas de voz neste navegador.",
     "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
     "You need to be logged in.": "Você tem que estar logado.",
     "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor.",
     "Set a display name:": "Defina um nome público para você:",
     "Upload an avatar:": "Envie uma imagem de perfil para identificar você:",
     "This server does not support authentication with a phone number.": "Este servidor não permite a autenticação através de números de telefone.",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 3846d5ba03..f987a0cd68 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -193,7 +193,7 @@
     "sent an invitation to": "enviou um convite para",
     "sent a video": "enviou um vídeo",
     "Server may be unavailable or overloaded": "Servidor pode estar indisponível ou sobrecarregado",
-    "Server may be unavailable, overloaded, or you hit a bug": "Servidor pode estar indisponível, sobrecarregado ou aconteceu um erro de execução",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Servidor pode estar indisponível, sobrecarregado ou aconteceu um erro de execução.",
     "Session ID": "Identificador de sessão",
     "set a profile picture": "colocou uma foto de perfil",
     "set their display name to": "configurou seu nome para",
@@ -324,8 +324,8 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "click to reveal": "clique para ver",
-    "Conference call failed": "Chamada de conferência falhou",
-    "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
+    "Conference call failed.": "Chamada de conferência falhou.",
+    "Conference calling is in development and may not be reliable.": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar.",
     "Conference calls are not supported in encrypted rooms": "Chamadas de conferência não são possíveis em salas criptografadas",
     "Conference calls are not supported in this client": "Chamadas de conferência não são possíveis neste navegador",
     "/ddg is not a command": "/ddg não é um comando",
@@ -340,7 +340,7 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
     "Failure to create room": "Não foi possível criar a sala",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
-    "Guest users can't create new rooms. Please register to create room and start a chat": "Visitantes não podem criar novas salas. Por favor, registre-se para criar uma sala e iniciar uma conversa",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Visitantes não podem criar novas salas. Por favor, registre-se para criar uma sala e iniciar uma conversa.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
     "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
@@ -397,15 +397,15 @@
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
-    "You are already in a call": "Você já está em  uma chamada",
+    "You are already in a call.": "Você já está em  uma chamada.",
     "You're not in any rooms yet! Press": "Você ainda não está em nenhuma sala! Pressione",
     "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
-    "You cannot place a call with yourself": "Você não pode iniciar uma chamada",
-    "You cannot place VoIP calls in this browser": "Você não pode fazer chamadas de voz neste navegador",
+    "You cannot place a call with yourself.": "Você não pode iniciar uma chamada.",
+    "You cannot place VoIP calls in this browser.": "Você não pode fazer chamadas de voz neste navegador.",
     "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
     "You need to be logged in.": "Você tem que estar logado.",
     "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor.",
     "Set a display name:": "Defina um nome público para você:",
     "Upload an avatar:": "Envie uma imagem de perfil para identificar você:",
     "This server does not support authentication with a phone number.": "Este servidor não permite a autenticação através de números de telefone.",
@@ -626,7 +626,7 @@
     "Server error": "Erro no servidor",
     "Server may be unavailable, overloaded, or search timed out :(": "O servidor pode estar indisponível, sobrecarregado, ou a busca ultrapassou o tempo limite :(",
     "Server may be unavailable, overloaded, or the file too big": "O servidor pode estar indisponível, sobrecarregado, ou o arquivo é muito grande",
-    "Server unavailable, overloaded, or something else went wrong": "O servidor pode estar indisponível, sobrecarregado, ou alguma outra coisa não funcionou",
+    "Server unavailable, overloaded, or something else went wrong.": "O servidor pode estar indisponível, sobrecarregado, ou alguma outra coisa não funcionou.",
     "Some of your messages have not been sent": "Algumas das suas mensagens não foram enviadas",
     "Submit": "Enviar",
     "The main address for this room is": "O endereço principal desta sala é",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1ae4719402..30672aeab1 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -232,8 +232,8 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s уровень мощности изменен на %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s имя комнаты измененно на %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s измененная тема на %(topic)s.",
-    "Conference call failed": "Конференц-вызов прервался",
-    "Conference calling is in development and may not be reliable": "Конференц-вызов находится в процессе и может не быть надежным",
+    "Conference call failed.": "Конференц-вызов прервался.",
+    "Conference calling is in development and may not be reliable.": "Конференц-вызов находится в процессе и может не быть надежным.",
     "Conference calls are not supported in encrypted rooms": "Конференц-вызовы не поддерживаются в зашифрованных комнатах",
     "Conference calls are not supported in this client": "Конференц-вызовы не поддерживаются в этом клиенте",
     "/ddg is not a command": "/ddg не команда",
@@ -247,7 +247,7 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Не удалось подтвердить email-адрес: убедитесь что вы щелкнули по ссылке электронной почты",
     "Failure to create room": "Не удалось создать комнату",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s из %(fromPowerLevel)s до %(toPowerLevel)s",
-    "Guest users can't create new rooms. Please register to create room and start a chat": "Гостевые пользователи не могут создавать новые комнаты. Зарегистрируйтесь для создания комнаты и чата",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "Гостевые пользователи не могут создавать новые комнаты. Зарегистрируйтесь для создания комнаты и чата.",
     "click to reveal": "нажать для открытия",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s вводит текст",
@@ -359,11 +359,11 @@
     "Upload an avatar:": "Загрузить аватар",
     "You need to be logged in.": "Вы должны быть зарегистрированы",
     "You need to be able to invite users to do that.": "Вам необходимо пригласить пользователей чтобы сделать это.",
-    "You cannot place VoIP calls in this browser": "Вы не можете сделать вызовы VoIP с этим браузером",
-    "You are already in a call": "Вы уже находитесь в разговоре",
+    "You cannot place VoIP calls in this browser.": "Вы не можете сделать вызовы VoIP с этим браузером.",
+    "You are already in a call.": "Вы уже находитесь в разговоре.",
     "You're not in any rooms yet! Press": "Вы еще не находитесь ни в каких комнатах! Нажать",
     "You are trying to access %(roomName)s": "Вы пытаетесь получить доступ %(roomName)s",
-    "You cannot place a call with yourself": "Вы не можете позвонить самим себе",
+    "You cannot place a call with yourself.": "Вы не можете позвонить самим себе.",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s анулировал %(targetName)s's преглашение.",
     "Sep": "Сен.",
     "Jan": "Янв.",
@@ -386,7 +386,7 @@
     "Fri": "Пя",
     "Sat": "Сб",
     "You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.": "Вам необходимо снова войти в генерировать сквозное шифрование (е2е) ключей для этого устройства и предоставить публичный ключ Вашему домашнему серверу. Это после выключения; приносим извинения за причиненные неудобства.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Ваш адрес электронной почты, кажется, не связан с Matrix ID на этом Homeserver",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш адрес электронной почты, кажется, не связан с Matrix ID на этом Homeserver.",
     "to start a chat with someone": "Начать чат с кем-то",
     "to tag direct chat": "Пометить прямой чат",
     "To use it, just wait for autocomplete results to load and tab through them.": "Для его использования, просто подождите результатов автозаполнения для загрузки на вкладке и через них.",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 91adec837f..54a6886b35 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -30,7 +30,7 @@
     "Enable encryption": "启用加密",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "不支持加密的客户端将看不到加密的消息",
     "Encrypted room": "加密聊天室",
-    "%(senderName)s ended the call.": "%(senderName)s 结束了通话。",
+    "%(senderName)s ended the call.": "%(senderName)s 结束了通话。.",
     "End-to-end encryption information": "端到端加密信息",
     "End-to-end encryption is in beta and may not be reliable": "端到端加密现为测试版，不一定可靠",
     "Enter Code": "输入代码",
@@ -55,7 +55,7 @@
     "Failed to save settings": "保存设置失败",
     "Failed to send email": "发送邮件失败",
     "Failed to send request.": "发送请求失败。",
-    "Failed to set avatar.": "设置头像失败。",
+    "Failed to set avatar.": "设置头像失败。.",
     "Failed to set display name": "设置昵称失败",
     "Failed to set up conference call": "无法启动群组通话",
     "Failed to toggle moderator status": "无法切换管理员权限",
@@ -70,15 +70,15 @@
     "Filter room members": "过滤聊天室成员",
     "Forget room": "忘记聊天室",
     "Forgot your password?": "忘记密码？",
-    "For security, this session has been signed out. Please sign in again.": "出于安全考虑，此会话已被注销。请重新登录。",
+    "For security, this session has been signed out. Please sign in again.": "出于安全考虑，此会话已被注销。请重新登录。.",
     "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "出于安全考虑，用户注销时会清除浏览器里的端到端加密密钥。如果你想要下次登录 Riot 时能解密过去的聊天记录，请导出你的聊天室密钥。",
     "Found a bug?": "发现漏洞？",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 从 %(fromPowerLevel)s 变为 %(toPowerLevel)s",
-    "Guests can't set avatars. Please register.": "游客不能设置头像。请注册。",
-    "Guest users can't create new rooms. Please register to create room and start a chat": "游客不能创建聊天室。请注册以创建聊天室和聊天",
+    "Guests can't set avatars. Please register.": "游客不能设置头像。请注册。.",
+    "Guest users can't create new rooms. Please register to create room and start a chat.": "游客不能创建聊天室。请注册以创建聊天室和聊天.",
     "Guest users can't upload files. Please register to upload": "游客不能上传文件。请注册以上传文件",
-    "Guests can't use labs features. Please register.": "游客不能使用实验性功能。请注册。",
-    "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主动邀请。",
+    "Guests can't use labs features. Please register.": "游客不能使用实验性功能。请注册。.",
+    "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主动邀请。.",
     "had": "已经",
     "Hangup": "挂断",
     "Hide read receipts": "隐藏已读回执",
@@ -95,7 +95,7 @@
     "Invalid Email Address": "邮箱地址格式错误",
     "Invalid file%(extra)s": "非法文件%(extra)s",
     "Report it": "报告",
-    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "重设密码会导致所有设备上的端到端加密密钥被重置，使得加密的聊天记录不可读，除非你事先导出密钥，修改密码后再导入。此问题将来会得到改善。",
+    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "重设密码会导致所有设备上的端到端加密密钥被重置，使得加密的聊天记录不可读，除非你事先导出密钥，修改密码后再导入。此问题将来会得到改善。.",
     "restore": "恢复",
     "Return to app": "返回 App",
     "Return to login screen": "返回登录页面",
@@ -117,18 +117,18 @@
     "Send Invites": "发送邀请",
     "Send Reset Email": "发送密码重设邮件",
     "sent an image": "发了一张图片",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 发了一张图片。",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 发了加入聊天室的邀请。",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 发了一张图片。.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 发了加入聊天室的邀请。.",
     "sent a video": "发了一个视频",
     "Server error": "服务器错误",
     "Server may be unavailable or overloaded": "服务器可能不可用或者超载",
     "Server may be unavailable, overloaded, or search timed out :(": "服务器可能不可用、超载，或者搜索超时 :(",
     "Server may be unavailable, overloaded, or the file too big": "服务器可能不可用、超载，或者文件过大",
-    "Server may be unavailable, overloaded, or you hit a bug": "服务器可能不可用、超载，或者你遇到了一个漏洞",
-    "Server unavailable, overloaded, or something else went wrong": "服务器可能不可用、超载，或者其他东西出错了",
+    "Server may be unavailable, overloaded, or you hit a bug.": "服务器可能不可用、超载，或者你遇到了一个漏洞.",
+    "Server unavailable, overloaded, or something else went wrong.": "服务器可能不可用、超载，或者其他东西出错了.",
     "Session ID": "会话 ID",
-    "%(senderName)s set a profile picture.": "%(senderName)s 设置了头像。",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 将昵称改为了 %(displayName)s。",
+    "%(senderName)s set a profile picture.": "%(senderName)s 设置了头像。.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 将昵称改为了 %(displayName)s。.",
     "Settings": "设置",
     "Show panel": "显示侧边栏",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小时制显示时间戳 （如：下午 2:30）",
@@ -183,8 +183,8 @@
     "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在打字",
     "%(names)s and %(count)s others are typing": "%(names)s 和另外 %(count)s 个人正在打字",
     "An email has been sent to": "一封邮件已经被发送到",
-    "A new password must be entered.": "一个新的密码必须被输入。",
-    "%(senderName)s answered the call.": "%(senderName)s 接了通话。",
+    "A new password must be entered.": "一个新的密码必须被输入。.",
+    "%(senderName)s answered the call.": "%(senderName)s 接了通话。.",
     "An error has occurred.": "一个错误出现了。",
     "Attachment": "附件",
     "Autoplay GIFs and videos": "自动播放GIF和视频",
@@ -200,9 +200,9 @@
     "Invite new room members": "邀请新的聊天室成员",
     "Join Room": "加入聊天室",
     "joined": "加入了",
-    "%(targetName)s joined the room.": "%(targetName)s 加入了聊天室。",
+    "%(targetName)s joined the room.": "%(targetName)s 加入了聊天室。.",
     "Jump to first unread message.": "跳到第一条未读消息。",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "离开聊天室",
     "Login as guest": "以游客的身份登录",
     "New password": "新密码"
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f98bf452af..5238e647b1 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1,6 +1,6 @@
 {
     "An email has been sent to": "電郵已經發送至",
-    "A new password must be entered.": "必須輸入新密碼。",
+    "A new password must be entered.": "必須輸入新密碼。.",
     "anyone": "任何人",
     "An error has occurred.": "發生了一個錯誤。",
     "Anyone who knows the room's link, apart from guests": "任何知道房間連結的人，但訪客除外",
@@ -10,7 +10,7 @@
     "Are you sure you want to upload the following files?": "您確認要上傳以下文件嗎？",
     "Attachment": "附件",
     "Autoplay GIFs and videos": "自動播放GIF和影片",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s。",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s。.",
     "Ban": "封禁",
     "Banned users": "已被封禁的使用者",
     "Blacklisted": "已列入黑名單",
@@ -20,5 +20,5 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "當瀏覽器網址列里有 HTTPS URL 時，不能使用 HTTP 連結主伺服器。請採用 HTTPS 或者 <a>允許不安全的腳本</a>",
     "Can't load user settings": "無法載入使用者設定",
     "Change Password": "變更密碼",
-    "%(targetName)s left the room.": "%(targetName)s 離開了聊天室。"
+    "%(targetName)s left the room.": "%(targetName)s 離開了聊天室。."
 }

From 0b6d20a62ef523e0155f666bdfc0acb909609428 Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Thu, 1 Jun 2017 20:46:07 +0000
Subject: [PATCH 37/58] Translated using Weblate (German)

Currently translated at 99.6% (778 of 781 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 00de1617a1..8dc0cdd9a7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -64,7 +64,7 @@
     "Anyone who knows the room's link, including guests": "Jeder der den Raum-Link kennt - auch Gäste",
     "Are you sure you want to leave the room?": "Bist du sicher, dass du den Raum verlassen willst?",
     "Are you sure you want to reject the invitation?": "Bist du sicher, dass die die Einladung ablehnen willst?",
-    "Are you sure you want to upload the following files?": "Bist du sicher, dass du die folgenden Dateien hochladen willst?",
+    "Are you sure you want to upload the following files?": "Bist du sicher, dass du die folgenden Dateien hochladen möchtest?",
     "banned": "gebannt",
     "Banned users": "Gebannte Nutzer",
     "Bug Report": "Fehlerbericht",
@@ -93,7 +93,7 @@
     "Encryption is enabled in this room": "Verschlüsselung ist in diesem Raum aktiviert",
     "Encryption is not enabled in this room": "Verschlüsselung ist in diesem Raum nicht aktiviert",
     "ended the call.": "beendete den Anruf.",
-    "End-to-end encryption is in beta and may not be reliable": "Die Ende-zu-Ende-Verschlüsselung befindet sich im Beta-Stadium und ist eventuell nicht hundertprozentig zuverlässig",
+    "End-to-end encryption is in beta and may not be reliable": "Die Ende-zu-Ende-Verschlüsselung befindet sich aktuell im Beta-Stadium und ist eventuell noch nicht hundertprozentig zuverlässig",
     "Failed to send email": "Fehler beim Senden der E-Mail",
     "Account": "Konto",
     "Add phone number": "Füge Telefonnummer hinzu",
@@ -117,7 +117,7 @@
     "Failed to reject invitation": "Fehler beim Abweisen der Einladung",
     "Failed to set avatar.": "Fehler beim Setzen des Avatars.",
     "Failed to unban": "Entbannen fehlgeschlagen",
-    "Failed to upload file": "Dateiupload fehlgeschlagen",
+    "Failed to upload file": "Datei-Upload fehlgeschlagen",
     "Favourite": "Favorit",
     "favourite": "Favoriten",
     "Forget room": "Raum vergessen",
@@ -152,7 +152,7 @@
     "made future room history visible to": "mache kommende Raum-Historie sichtbar für",
     "Manage Integrations": "Integrationen verwalten",
     "Members only": "Nur Mitglieder",
-    "Mobile phone number": "Mobile Telefonnummer",
+    "Mobile phone number": "Mobiltelefonnummer",
     "Moderator": "Moderator",
     "my Matrix ID": "Meine Matrix-ID",
     "Never send encrypted messages to unverified devices from this device": "Niemals verschlüsselte Nachrichten an unverifizierte Geräte von diesem Gerät aus versenden",
@@ -164,7 +164,7 @@
     "No users have specific privileges in this room": "Kein Benutzer hat in diesem Raum besondere Berechtigungen",
     "olm version": "OLM-Version",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Sobald Verschlüsselung für einen Raum aktiviert wird, kann diese (aktuell noch) nicht wieder deaktiviert werden",
-    "Only people who have been invited": "Nur Personen die eingeladen wurden",
+    "Only people who have been invited": "Nur Personen, die eingeladen wurden",
     "or": "oder",
     "other": "weiteres",
     "others": "andere",
@@ -197,7 +197,7 @@
     "sent an image": "sandte ein Bild",
     "sent an invitation to": "sandte eine Einladung an",
     "sent a video": "sandte ein Video",
-    "Server may be unavailable or overloaded": "Server könnte nicht verfügbar oder überlastet sein",
+    "Server may be unavailable or overloaded": "Server ist eventuell nicht verfügbar oder überlastet",
     "set a profile picture": "setzte ein Profilbild",
     "set their display name to": "setzte den Anzeigenamen auf",
     "Settings": "Einstellungen",
@@ -215,7 +215,7 @@
     "their invitations": "ihre Einladungen",
     "their invitation": "ihre Einladung",
     "These are experimental features that may break in unexpected ways. Use with caution": "Dies sind experimentelle Funktionen die in unerwarteter Weise Fehler verursachen können. Mit Vorsicht benutzen",
-    "The visibility of existing history will be unchanged": "Die Sichtbarkeit der existenten Historie bleibt unverändert",
+    "The visibility of existing history will be unchanged": "Die Sichtbarkeit der bereits vorhandenen Chat-Historie bleibt unverändert",
     "This doesn't appear to be a valid email address": "Dies scheint keine gültige E-Mail-Adresse zu sein",
     "this invitation?": "diese Einladung?",
     "This is a preview of this room. Room interactions have been disabled": "Dies ist eine Vorschau dieses Raumes. Raum-Interaktionen wurden deaktiviert",
@@ -284,7 +284,7 @@
     "Conference calling is in development and may not be reliable": "Konferenzgespräche sind in Entwicklung und evtl. nicht zuverlässig",
     "Conference calls are not supported in encrypted rooms": "Konferenzgespräche sind in verschlüsselten Räumen nicht unterstützt",
     "Conference calls are not supported in this client": "Konferenzgespräche sind in diesem Client nicht unterstützt",
-    "Existing Call": "Existierender Anruf",
+    "Existing Call": "Bereits bestehender Anruf",
     "Failed to set up conference call": "Konferenzgespräch konnte nicht gestartet werden",
     "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast",
     "Failure to create room": "Raumerstellung fehlgeschlagen",
@@ -342,7 +342,7 @@
     "An error occured: %(error_string)s": "Ein Fehler trat auf: %(error_string)s",
     "Topic": "Thema",
     "Make this room private": "Mache diesen Raum privat",
-    "Share message history with new users": "Teile Nachrichtenhistorie mit neuen Nutzern",
+    "Share message history with new users": "Nachrichtenhistorie mit neuen Nutzern teilen",
     "Encrypt room": "Raum verschlüsseln",
     "To send events of type": "Zum Senden von Ereignissen mit Typ",
     "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
@@ -353,17 +353,17 @@
     "%(senderName)s answered the call.": "%(senderName)s beantwortete den Anruf.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s aus dem Raum verbannt.",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von %(oldDisplayName)s auf %(displayName)s geändert.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s änderte das Profilbild.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".",
     "/ddg is not a command": "/ddg ist kein Kommando",
     "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.",
     "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
     "Failed to send request.": "Anfrage zu senden schlug fehl.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s lud %(targetName)s ein.",
-    "%(displayName)s is typing": "%(displayName)s tippt",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s hat %(targetName)s eingeladen.",
+    "%(displayName)s is typing": "%(displayName)s schreibt",
     "%(targetName)s joined the room.": "%(targetName)s trat dem Raum bei.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickte %(targetName)s.",
     "%(targetName)s left the room.": "%(targetName)s verließ den Raum.",
@@ -372,14 +372,14 @@
     "Missing user_id in request": "Fehlende user_id in Anfrage",
     "Must be viewing a room": "Muss einen Raum ansehen",
     "New Composer & Autocomplete": "Neuer Eingabeverarbeiter & Autovervollständigung",
-    "(not supported by this browser)": "(nicht von diesem Browser unterstützt)",
+    "(not supported by this browser)": "(wird von diesem Browser nicht unterstützt)",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s startete einen %(callType)s-Anruf.",
     "Power level must be positive integer.": "Berechtigungslevel muss eine positive ganze Zahl sein.",
     "Reason": "Grund",
-    "%(targetName)s rejected the invitation.": "%(targetName)s lehnte die Einladung ab.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s hat die Einladung abgelehnt.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s löschte den Anzeigenamen (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s löschte das Profilbild.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s fragte nach einer VoIP-Konferenz.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s möchte eine VoIP-Konferenz beginnen.",
     "Room %(roomId)s not visible": "Raum %(roomId)s ist nicht sichtbar",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s hat ein Bild gesendet.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sandte eine Einladung an %(targetDisplayName)s um diesem Raum beizutreten.",
@@ -466,7 +466,7 @@
     "es-ar": "Spanisch (Argentinien)",
     "es-bo": "Spanisch (Bolivien)",
     "es-cl": "Spanisch (Chile)",
-    "es-co": "Spanisch (Kolombien)",
+    "es-co": "Spanisch (Kolumbien)",
     "es-cr": "Spanisch (Costa Rica)",
     "es-do": "Spanisch (Dominikanische Republik)",
     "es-ec": "Spanisch (Ecuador)",
@@ -583,7 +583,7 @@
     "Fill screen": "Fülle Bildschirm",
     "Guest users can't upload files. Please register to upload": "Gäste können keine Dateien hochladen. Bitte zunächst registrieren",
     "Hide Text Formatting Toolbar": "Verberge Text-Formatierungs-Toolbar",
-    "Incorrect verification code": "Falscher Verifizierungsscode",
+    "Incorrect verification code": "Falscher Verifizierungscode",
     "Invalid alias format": "Ungültiges Alias-Format",
     "Invalid address format": "Ungültiges Adressformat",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' ist kein gültiges Adressformat",
@@ -639,14 +639,14 @@
     "quote": "Zitat",
     "bullet": "Aufzählung",
     "Click to unmute video": "Klicken, um die Video-Stummschaltung zu deaktivieren",
-    "Click to unmute audio": "Klicke um Ton zu reaktivieren",
+    "Click to unmute audio": "Klicken, um den Ton wieder einzuschalten",
     "Failed to load timeline position": "Laden der Position im Zeitstrahl fehlgeschlagen",
     "Failed to toggle moderator status": "Umschalten des Moderator-Status fehlgeschlagen",
     "Enable encryption": "Verschlüsselung aktivieren",
     "The main address for this room is": "Die Hauptadresse für diesen Raum ist",
     "Autoplay GIFs and videos": "GIF-Dateien und Videos automatisch abspielen",
-    "Don't send typing notifications": "Nicht senden, wenn ich tippe",
-    "Hide read receipts": "Verberge Lesebestätigungen",
+    "Don't send typing notifications": "Schreibbenachrichtigungen unterdrücken",
+    "Hide read receipts": "Lesebestätigungen verbergen",
     "Never send encrypted messages to unverified devices in this room": "In diesem Raum keine verschlüsselten Nachrichten an unverifizierte Geräte senden",
     "numbullet": "Nummerierung",
     "%(items)s and %(remaining)s others": "%(items)s und %(remaining)s weitere",
@@ -697,10 +697,10 @@
     "%(severalUsers)schanged their avatar": "%(severalUsers)sänderten ihre Avatare",
     "%(oneUser)schanged their avatar": "%(oneUser)sänderte seinen/ihren Avatar",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
-    "%(oneUser)sleft and rejoined": "%(oneUser)s ging und trat erneut bei",
+    "%(oneUser)sleft and rejoined": "%(oneUser)sverließ den Raum und trat erneut bei",
     "A registered account is required for this action": "Für diese Aktion ist ein registrierter Account notwendig",
     "Access Token:": "Zugangs-Token:",
-    "Always show message timestamps": "Immer Nachrichten-Zeitstempel anzeigen",
+    "Always show message timestamps": "Nachrichten-Zeitstempel immer anzeigen",
     "Authentication": "Authentifikation",
     "An error has occurred.": "Ein Fehler passierte.",
     "Confirm password": "Passwort bestätigen",
@@ -712,7 +712,7 @@
     "New passwords don't match": "Die neuen Passwörter stimmen nicht überein",
     "olm version:": "Version von olm:",
     "Passwords can't be empty": "Passwortfelder dürfen nicht leer sein",
-    "Registration required": "Registrierung benötigt",
+    "Registration required": "Registrierung erforderlich",
     "Report it": "Melde ihn",
     "riot-web version:": "Version von riot-web:",
     "Scroll to bottom of page": "Zum Ende der Seite springen",
@@ -731,13 +731,13 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s löschte den Raumnamen.",
     "Passphrases must match": "Passphrase muss übereinstimmen",
     "Passphrase must not be empty": "Passphrase darf nicht leer sein",
-    "Export room keys": "Exportiere Raum-Schlüssel",
+    "Export room keys": "Raum-Schlüssel exportieren",
     "Enter passphrase": "Passphrase eingeben",
     "Confirm passphrase": "Bestätige Passphrase",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Die Export-Datei wird mit einer Passphrase geschützt sein. Du solltest die Passphrase hier eingeben um die Datei zu entschlüsseln.",
     "You must join the room to see its files": "Du musst dem Raum beitreten, um die Raum-Dateien sehen zu können",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Fehler gestoßen.",
-    "Reject all %(invitedRooms)s invites": "Lehne alle %(invitedRooms)s Einladungen ab",
+    "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s Einladungen ablehnen",
     "Start new Chat": "Starte neuen Chat",
     "Guest users can't invite users. Please register.": "Gäste können keine Nutzer einladen. Bitte registrieren.",
     "Failed to invite": "Einladen fehlgeschlagen",
@@ -760,7 +760,7 @@
     "Unknown devices": "Unbekannte Geräte",
     "Unknown Address": "Unbekannte Adresse",
     "Verify...": "Verifizieren...",
-    "ex. @bob:example.com": "z.B. @bob:example.com",
+    "ex. @bob:example.com": "z. B. @bob:example.com",
     "Add User": "Nutzer hinzufügen",
     "Sign in with CAS": "Mit CAS anmelden",
     "Custom Server Options": "Erweiterte Server-Optionen",
@@ -814,7 +814,7 @@
     "Unverify": "Entverifizieren",
     "This Home Server would like to make sure you are not a robot": "Dieser Heimserver möchte sicherstellen, dass du kein Roboter bist",
     "Drop file here to upload": "Datei hier loslassen zum hochladen",
-    "Idle": "inaktiv",
+    "Idle": "Untätig",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen dir für jedes Gerät durch den Verifizierungsprozess zu gehen um zu bestätigen, dass sie ihrem legitimierten Besitzer gehören, aber du kannst die Nachrichten ohne Verifizierung erneut senden, wenn du es vorziehst.",
     "Ongoing conference call%(supportedText)s. %(joinText)s": "Laufendes Konferenzgespräch%(supportedText)s. %(joinText)s",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Konto  für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",

From 10095af4d91fca5f5cba36d9bfd757f22e57f79e Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Thu, 1 Jun 2017 21:41:45 +0000
Subject: [PATCH 38/58] Translated using Weblate (French)

Currently translated at 100.0% (797 of 797 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index fbcc04e881..3b4c754965 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -444,7 +444,7 @@
     "Server may be unavailable or overloaded": "Le serveur semble être inaccessible ou surchargé",
     "Server may be unavailable, overloaded, or search timed out :(": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
     "Server may be unavailable, overloaded, or the file too big": "Le serveur semble être inaccessible, surchargé ou le fichier trop important",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être inaccessible, surchargé ou vous avez rencontré un problème.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé, ou vous avez rencontré un problème.",
     "Server unavailable, overloaded, or something else went wrong.": "Le serveur semble être inaccessible, surchargé ou quelque chose s'est mal passé.",
     "Session ID": "Identifiant de session",
     "%(senderName)s set a profile picture.": "%(senderName)s a défini une photo de profil.",
@@ -693,7 +693,6 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ce processus vous permet d’importer les clés d’encryption que vous avez précédemment exportées depuis un autre client Matrix. Vous serez alors capable de décrypter n’importe quel messages que l’autre client peut décrypter.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Le fichier exporté est protégé par une phrase secrète. Vous devez entrer cette phrase secrète ici pour décrypter le fichier.",
     "You must join the room to see its files": "Vous devez joindre le salon pour voir ses fichiers",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé, ou vous avez rencontré un problème.",
     "Reject all %(invitedRooms)s invites": "Rejeter la totalité des %(invitedRooms)s invitations",
     "Start new Chat": "Démarrer une nouvelle conversation",
     "Guest users can't invite users. Please register.": "Les visiteurs ne peuvent inviter d’autres utilisateurs. Merci de vous enregistrer.",
@@ -781,5 +780,22 @@
     "for %(amount)sd": "depuis %(amount)sj",
     "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName a changé l’image de profil du salon en <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l’image de profil du salon.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’image de profil de %(roomName)s"
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’image de profil de %(roomName)s",
+    "Device already verified!": "Appareil déjà vérifié !",
+    "Export": "Exporter",
+    "Failed to register as guest:": "Échec de l’inscription en tant que visiteur :",
+    "Guest access is disabled on this Home Server.": "L’accès en tant que visiteur est désactivé sur ce serveur.",
+    "Import": "Importer",
+    "Incorrect username and/or password.": "Nom d’utilisateur et/ou mot de passe incorrect.",
+    "Results from DuckDuckGo": "Résultats de DuckDuckGo",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Les clés de signature que vous avez transmises correspondent aux clés que vous avez reçues de l’appareil %(deviceId)s de %(userId)s. L’appareil est vérifié.",
+    "This Home Server does not support login using email address.": "Ce serveur ne supporte pas l’identification par e-mail.",
+    "There was a problem logging in.": "Un problème a été rencontré lors de l’identification.",
+    "Unknown (user, device) pair:": "Couple (utilisateur, appareil) inconnu :",
+    "Unrecognised command:": "Commande non-reconnue :",
+    "Unrecognised room alias:": "Alias de salon non-reconnu :",
+    "Use compact timeline layout": "Utiliser l'affichage compact",
+    "Verified key": "Clé vérifiée",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ATTENTION : Appareil déjà vérifié mais les clés NE CORRESPONDENT PAS !",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATTENTION : ERREUR DE VÉRIFICATION DES CLÉS ! La clé de signature pour %(userId)s et l'appareil %(deviceId)s est “%(fprint)s” et ne correspond pas à la clé “%(fingerprint)s” qui a été fournie. Cela peut signifier que vos communications sont interceptées !"
 }

From dbba1dedb6a529ce1198f2b2d85ec8e7b046c981 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 22:58:17 +0100
Subject: [PATCH 39/58] i18nize all the things and change show logic

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js | 22 ++++++++++------------
 src/i18n/strings/en_EN.json               |  6 ++++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 4cb49d8c1e..b33bdd271d 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -902,9 +902,7 @@ module.exports = React.createClass({
     },
 
     _mapWebRtcDevicesToSpans: function(devices) {
-        return Object.keys(devices).map(
-            (deviceId) => <span key={deviceId}>{devices[deviceId]}</span>
-        );
+        return Object.keys(devices).map((deviceId) => <span key={deviceId}>{devices[deviceId]}</span>);
     },
 
     _setAudioInput: function(deviceId) {
@@ -928,8 +926,8 @@ module.exports = React.createClass({
                 function() {
                     const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
                     Modal.createDialog(ErrorDialog, {
-                        title: "No media permissions",
-                        description: "You may need to manually permit Riot to access your microphone/webcam",
+                        title: _t('No media permissions'),
+                        description: _t('You may need to manually permit Riot to access your microphone/webcam'),
                     });
                 },
             ]);
@@ -939,10 +937,10 @@ module.exports = React.createClass({
     _renderWebRtcSettings: function() {
         if (this.state.mediaDevices === false) {
             return <div>
-                <h3>WebRTC</h3>
+                <h3>{_t('VoIP')}</h3>
                 <div className="mx_UserSettings_section">
                     <p className="mx_UserSettings_link" onClick={this._requestMediaPermissions}>
-                        Missing Media Permissions, click here to request.
+                        {_t('Missing Media Permissions, click here to request.')}
                     </p>
                 </div>
             </div>;
@@ -950,11 +948,11 @@ module.exports = React.createClass({
 
         const Dropdown = sdk.getComponent('elements.Dropdown');
 
-        let microphoneDropdown = <p>No Microphones detected</p>;
-        let webcamDropdown = <p>No Webcams detected</p>;
+        let microphoneDropdown = <p>{_t('No Microphones detected')}</p>;
+        let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
 
         const audioInputs = this.state.mediaDevices.audioinput;
-        if ('default' in audioInputs) {
+        if (Object.keys(videoInputs).length > 0) {
             microphoneDropdown = <div>
                 <h4>Microphone</h4>
                 <Dropdown
@@ -967,7 +965,7 @@ module.exports = React.createClass({
         }
 
         const videoInputs = this.state.mediaDevices.videoinput;
-        if ('default' in videoInputs) {
+        if (Object.keys(videoInputs).length > 0) {
             webcamDropdown = <div>
                 <h4>Cameras</h4>
                 <Dropdown
@@ -980,7 +978,7 @@ module.exports = React.createClass({
         }
 
         return <div>
-            <h3>WebRTC</h3>
+            <h3>{_t('VoIP')}</h3>
             <div className="mx_UserSettings_section">
                 {microphoneDropdown}
                 {webcamDropdown}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 211d164c2a..44a1af57fa 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -129,6 +129,12 @@
   "Add email address": "Add email address",
   "Add phone number": "Add phone number",
   "Admin": "Admin",
+  "VoIP": "VoIP",
+  "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
+  "No Microphones detected": "No Microphones detected",
+  "No Webcams detected": "No Webcams detected",
+  "No media permissions": "No media permissions",
+    "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",

From 0c367783691629c551cea9ec02e1cd4fa6f5ccbe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 22:59:37 +0100
Subject: [PATCH 40/58] fix bad indentation

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 44a1af57fa..dcf3670dd9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -134,7 +134,7 @@
   "No Microphones detected": "No Microphones detected",
   "No Webcams detected": "No Webcams detected",
   "No media permissions": "No media permissions",
-    "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
+  "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",

From aa90d6b097d4b541b1d260f4655482d4c2d117fb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 23:00:25 +0100
Subject: [PATCH 41/58] fix **AMAZING** C&P derp

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b33bdd271d..f660cf71e1 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -952,7 +952,7 @@ module.exports = React.createClass({
         let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
 
         const audioInputs = this.state.mediaDevices.audioinput;
-        if (Object.keys(videoInputs).length > 0) {
+        if (Object.keys(audioInputs).length > 0) {
             microphoneDropdown = <div>
                 <h4>Microphone</h4>
                 <Dropdown

From dd4480f8c30994979e7767e93f7c2b7b5d0c9ab7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 23:25:44 +0100
Subject: [PATCH 42/58] change device data structure to array of objects       
                         so that we can set falsey values, for unsetting
 device                                most dolphinately needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CallMediaHandler.js                   |  8 ++++----
 src/components/structures/UserSettings.js | 17 ++++++++++++-----
 src/i18n/strings/en_EN.json               |  1 +
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index 4f82e003b9..45ca5dc30d 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -23,15 +23,15 @@ export default {
         // Only needed for Electron atm, though should work in modern browsers
         // once permission has been granted to the webapp
         return navigator.mediaDevices.enumerateDevices().then(function(devices) {
-            const audioIn = {};
-            const videoIn = {};
+            const audioIn = [];
+            const videoIn = [];
 
             if (devices.some((device) => !device.label)) return false;
 
             devices.forEach((device) => {
                 switch (device.kind) {
-                    case 'audioinput': audioIn[device.deviceId] = device.label; break;
-                    case 'videoinput': videoIn[device.deviceId] = device.label; break;
+                    case 'audioinput': audioIn.push(device); break;
+                    case 'videoinput': videoIn.push(device); break;
                 }
             });
 
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index f660cf71e1..fcb7a70559 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -269,8 +269,8 @@ module.exports = React.createClass({
             if (this._unmounted) return;
             this.setState({
                 mediaDevices,
-                activeAudioInput: this._localSettings['webrtc_audioinput'] || 'default',
-                activeVideoInput: this._localSettings['webrtc_videoinput'] || 'default',
+                activeAudioInput: this._localSettings['webrtc_audioinput'],
+                activeVideoInput: this._localSettings['webrtc_videoinput'],
             });
         });
     },
@@ -902,7 +902,7 @@ module.exports = React.createClass({
     },
 
     _mapWebRtcDevicesToSpans: function(devices) {
-        return Object.keys(devices).map((deviceId) => <span key={deviceId}>{devices[deviceId]}</span>);
+        return devices.map((device) => <span key={device.deviceId}>{devices[device.deviceId]}</span>);
     },
 
     _setAudioInput: function(deviceId) {
@@ -951,8 +951,14 @@ module.exports = React.createClass({
         let microphoneDropdown = <p>{_t('No Microphones detected')}</p>;
         let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
 
+        const defaultOption = {
+            deviceId: undefined,
+            label: _t('Default Device'),
+        };
+
         const audioInputs = this.state.mediaDevices.audioinput;
-        if (Object.keys(audioInputs).length > 0) {
+        if (audioInputs.length > 0) {
+            audioInputs.unshift(defaultOption);
             microphoneDropdown = <div>
                 <h4>Microphone</h4>
                 <Dropdown
@@ -965,7 +971,8 @@ module.exports = React.createClass({
         }
 
         const videoInputs = this.state.mediaDevices.videoinput;
-        if (Object.keys(videoInputs).length > 0) {
+        if (videoInputs.length > 0) {
+            videoInputs.unshift(defaultOption);
             webcamDropdown = <div>
                 <h4>Cameras</h4>
                 <Dropdown
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index dcf3670dd9..3a8752fd5d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -135,6 +135,7 @@
   "No Webcams detected": "No Webcams detected",
   "No media permissions": "No media permissions",
   "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
+  "Default Device": "Default Device",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",

From 4e36c10c3829cd5315665970f5424dc96bb9fe34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 23:33:36 +0100
Subject: [PATCH 43/58] only unshift default if there is no deviceId===default

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index fcb7a70559..5dd6a7fec2 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -958,7 +958,9 @@ module.exports = React.createClass({
 
         const audioInputs = this.state.mediaDevices.audioinput;
         if (audioInputs.length > 0) {
-            audioInputs.unshift(defaultOption);
+            if (!audioInputs.some((input) => input.deviceId === 'default')) {
+                audioInputs.unshift(defaultOption);
+            }
             microphoneDropdown = <div>
                 <h4>Microphone</h4>
                 <Dropdown
@@ -972,7 +974,9 @@ module.exports = React.createClass({
 
         const videoInputs = this.state.mediaDevices.videoinput;
         if (videoInputs.length > 0) {
-            videoInputs.unshift(defaultOption);
+            if (!videoInputs.some((input) => input.deviceId === 'default')) {
+                videoInputs.unshift(defaultOption);
+            }
             webcamDropdown = <div>
                 <h4>Cameras</h4>
                 <Dropdown

From 0f2c89d5256f93b94ecc21fd7c3548e7dae2c04a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 23:39:54 +0100
Subject: [PATCH 44/58] lets actually make things work, eh?

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 5dd6a7fec2..9a55094edf 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -902,7 +902,7 @@ module.exports = React.createClass({
     },
 
     _mapWebRtcDevicesToSpans: function(devices) {
-        return devices.map((device) => <span key={device.deviceId}>{devices[device.deviceId]}</span>);
+        return devices.map((device) => <span key={device.deviceId}>{device.label}</span>);
     },
 
     _setAudioInput: function(deviceId) {

From beedeec1636e0d43938b0edeaf688a98b78117ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 23:50:14 +0100
Subject: [PATCH 45/58] copy the arrays so we're not making a mess

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 9a55094edf..b5d5c23296 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -956,7 +956,7 @@ module.exports = React.createClass({
             label: _t('Default Device'),
         };
 
-        const audioInputs = this.state.mediaDevices.audioinput;
+        const audioInputs = this.state.mediaDevices.audioinput.slice(0);
         if (audioInputs.length > 0) {
             if (!audioInputs.some((input) => input.deviceId === 'default')) {
                 audioInputs.unshift(defaultOption);
@@ -972,7 +972,7 @@ module.exports = React.createClass({
             </div>;
         }
 
-        const videoInputs = this.state.mediaDevices.videoinput;
+        const videoInputs = this.state.mediaDevices.videoinput.slice(0);
         if (videoInputs.length > 0) {
             if (!videoInputs.some((input) => input.deviceId === 'default')) {
                 videoInputs.unshift(defaultOption);

From 3eb519b2275de34461edb67c99ab1af493b96c33 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 23:54:17 +0100
Subject: [PATCH 46/58] this is just endless

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b5d5c23296..b8567fc180 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -958,14 +958,18 @@ module.exports = React.createClass({
 
         const audioInputs = this.state.mediaDevices.audioinput.slice(0);
         if (audioInputs.length > 0) {
+            let defaultInput;
             if (!audioInputs.some((input) => input.deviceId === 'default')) {
                 audioInputs.unshift(defaultOption);
+            } else {
+                defaultInput = 'default';
             }
+
             microphoneDropdown = <div>
                 <h4>Microphone</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
-                    value={this.state.activeAudioInput}
+                    value={this.state.activeAudioInput || defaultInput}
                     onOptionChange={this._setAudioInput}>
                     {this._mapWebRtcDevicesToSpans(audioInputs)}
                 </Dropdown>
@@ -974,14 +978,18 @@ module.exports = React.createClass({
 
         const videoInputs = this.state.mediaDevices.videoinput.slice(0);
         if (videoInputs.length > 0) {
+            let defaultInput;
             if (!videoInputs.some((input) => input.deviceId === 'default')) {
                 videoInputs.unshift(defaultOption);
+            } else {
+                defaultInput = 'default';
             }
+
             webcamDropdown = <div>
                 <h4>Cameras</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
-                    value={this.state.activeVideoInput}
+                    value={this.state.activeVideoInput || defaultInput}
                     onOptionChange={this._setVideoInput}>
                     {this._mapWebRtcDevicesToSpans(videoInputs)}
                 </Dropdown>

From b411c8f97e88f79e37e52adc9700db216cb8642f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Jun 2017 00:10:54 +0100
Subject: [PATCH 47/58] shorten signin label to aid fr i18n

---
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 src/i18n/strings/es.json    | 2 +-
 src/i18n/strings/fr.json    | 2 +-
 src/i18n/strings/pt.json    | 2 +-
 src/i18n/strings/pt_BR.json | 2 +-
 src/i18n/strings/ru.json    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index baf2b317cf..cd3d82b112 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -139,7 +139,7 @@
     "Invite new room members": "Lade neue Raum-Mitglieder ein",
     "is a": "ist ein",
     "is trusted": "wird vertraut",
-    "I want to sign in with": "Ich möchte mich anmelden mit",
+    "Sign in with": "Ich möchte mich anmelden mit",
     "joined and left": "trat bei und ging",
     "joined": "trat bei",
     "joined the room": "trat dem Raum bei",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 211d164c2a..5d6a010638 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -318,7 +318,7 @@
   "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
   "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
   "%(displayName)s is typing": "%(displayName)s is typing",
-  "I want to sign in with": "I want to sign in with",
+  "Sign in with": "Sign in with",
   "Join Room": "Join Room",
   "joined and left": "joined and left",
   "joined": "joined",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index e071e63a3a..df6f0dd011 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -308,7 +308,7 @@
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' no es un formato válido para una dirección",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' no es un formato válido para un alias",
     "%(displayName)s is typing": "%(displayName)s esta escribiendo",
-    "I want to sign in with": "Quiero iniciar sesión con",
+    "Sign in with": "Quiero iniciar sesión con",
     "Join Room": "Unirte a la sala",
     "joined and left": "unido y dejado",
     "joined": "unido",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index fbcc04e881..a2c008c00d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -318,7 +318,7 @@
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' n'est pas un format valide pour une adresse",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' n'est pas un format valide pour un alias",
     "%(displayName)s is typing": "%(displayName)s est en train de taper",
-    "I want to sign in with": "Je veux m'identifier avec",
+    "Sign in with": "Je veux m'identifier avec",
     "Join Room": "Rejoindre le salon",
     "joined and left": "a joint et quitté",
     "joined": "a joint",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index ad4a9774d6..830952bd57 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -112,7 +112,7 @@
     "Invites": "Convidar",
     "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
     "is a": "é um(a)",
-    "I want to sign in with": "Quero entrar",
+    "Sign in with": "Quero entrar",
     "joined and left": "entrou e saiu",
     "joined": "entrou",
     "joined the room": "entrou na sala",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index f987a0cd68..a44bf0c955 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -115,7 +115,7 @@
     "Invites": "Convidar",
     "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
     "is a": "é um(a)",
-    "I want to sign in with": "Quero entrar",
+    "Sign in with": "Quero entrar",
     "joined and left": "entrou e saiu",
     "joined": "entrou",
     "joined the room": "entrou na sala",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 30672aeab1..743aade542 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -103,7 +103,7 @@
     "Invites": "Приглашать",
     "Invites user with given id to current room": "Пригласить пользователя с данным id в текущую комнату",
     "is a": "является",
-    "I want to sign in with": "Я хочу регистрироваться с",
+    "Sign in with": "Я хочу регистрироваться с",
     "joined and left": "присоединенный и оставленный",
     "joined": "присоединенный",
     "joined the room": "joined the room",

From 6a225d1ac20bcf00275bcc252835632a090516c8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Jun 2017 00:16:17 +0100
Subject: [PATCH 48/58] use new sign-in string

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

diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 11d8f2cc7c..dff6fb0b58 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -182,7 +182,7 @@ class PasswordLogin extends React.Component {
             <div>
                 <form onSubmit={this.onSubmitForm}>
                 <div className="mx_Login_type_container">
-                    <label className="mx_Login_type_label">{ _t('I want to sign in with') }</label>
+                    <label className="mx_Login_type_label">{ _t('Sign in with') }</label>
                     <Dropdown
                         className="mx_Login_type_dropdown"
                         value={this.state.loginType}

From 46a93266073ba60644d335665417a3e2aa36392f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 2 Jun 2017 00:20:34 +0100
Subject: [PATCH 49/58] special case default - CallMediaHandler can figure it
 out

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CallMediaHandler.js                   | 24 +++++++++++++++++++++++
 src/components/structures/UserSettings.js | 16 +++++----------
 src/i18n/strings/en_EN.json               |  2 ++
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index 45ca5dc30d..780df60846 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -53,12 +53,36 @@ export default {
         // });
     },
 
+    _findDefault: function(devices) {
+        return devices.some((device) => device.deviceId === 'default') ? 'default' : undefined;
+    },
+
+    setAudioInputDefault: async function() {
+        const devices = await this.getDevices();
+        const audioDefault = this._findDefault(devices.audioinput);
+        this._setAudioInput(audioDefault);
+    },
+
     setAudioInput: function(deviceId) {
+        this[deviceId === 'default' ? 'setAudioInputDefault' : '_setAudioInput'](deviceId);
+    },
+
+    _setAudioInput: function(deviceId) {
         UserSettingsStore.setLocalSetting('webrtc_audioinput', deviceId);
         Matrix.setMatrixCallAudioInput(deviceId);
     },
 
+    setVideoInputDefault: async function() {
+        const devices = await this.getDevices();
+        const videoDefault = this._findDefault(devices.videoinput);
+        this._setVideoInput(videoDefault);
+    },
+
     setVideoInput: function(deviceId) {
+        this[deviceId === 'default' ? 'setVideoInputDefault' : '_setVideoInput']();
+    },
+
+    _setVideoInput: function(deviceId) {
         UserSettingsStore.setLocalSetting('webrtc_videoinput', deviceId);
         Matrix.setMatrixCallVideoInput(deviceId);
     },
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b8567fc180..99b02b59f9 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -952,24 +952,21 @@ module.exports = React.createClass({
         let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
 
         const defaultOption = {
-            deviceId: undefined,
+            deviceId: 'default',
             label: _t('Default Device'),
         };
 
         const audioInputs = this.state.mediaDevices.audioinput.slice(0);
         if (audioInputs.length > 0) {
-            let defaultInput;
             if (!audioInputs.some((input) => input.deviceId === 'default')) {
                 audioInputs.unshift(defaultOption);
-            } else {
-                defaultInput = 'default';
             }
 
             microphoneDropdown = <div>
-                <h4>Microphone</h4>
+                <h4>{_t('Microphone')}</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
-                    value={this.state.activeAudioInput || defaultInput}
+                    value={this.state.activeAudioInput || 'default'}
                     onOptionChange={this._setAudioInput}>
                     {this._mapWebRtcDevicesToSpans(audioInputs)}
                 </Dropdown>
@@ -978,18 +975,15 @@ module.exports = React.createClass({
 
         const videoInputs = this.state.mediaDevices.videoinput.slice(0);
         if (videoInputs.length > 0) {
-            let defaultInput;
             if (!videoInputs.some((input) => input.deviceId === 'default')) {
                 videoInputs.unshift(defaultOption);
-            } else {
-                defaultInput = 'default';
             }
 
             webcamDropdown = <div>
-                <h4>Cameras</h4>
+                <h4>{_t('Camera')}</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
-                    value={this.state.activeVideoInput || defaultInput}
+                    value={this.state.activeVideoInput || 'default'}
                     onOptionChange={this._setVideoInput}>
                     {this._mapWebRtcDevicesToSpans(videoInputs)}
                 </Dropdown>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3a8752fd5d..b9ac79d362 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -136,6 +136,8 @@
   "No media permissions": "No media permissions",
   "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
   "Default Device": "Default Device",
+  "Microphone": "Microphone",
+  "Cameras": "Cameras",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",

From c7285b905321a12d760a316c49012144a2ef6f2d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Jun 2017 00:21:00 +0100
Subject: [PATCH 50/58] fix fr layout

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

diff --git a/src/components/views/login/ServerConfig.js b/src/components/views/login/ServerConfig.js
index 3abe64cd2f..a63d02416c 100644
--- a/src/components/views/login/ServerConfig.js
+++ b/src/components/views/login/ServerConfig.js
@@ -132,7 +132,7 @@ module.exports = React.createClass({
         var toggleButton;
         if (this.props.withToggleButton) {
             toggleButton = (
-                <div style={{ textAlign: 'center' }}>
+                <div className="mx_ServerConfig_selector">
                     <input className="mx_Login_radio" id="basic" name="configVisible" type="radio"
                         checked={!this.state.configVisible}
                         onChange={this.onServerConfigVisibleChange.bind(this, false)} />

From 4976cbb4240acc32bc2cc88c36c48d2d06a847ec Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 2 Jun 2017 00:21:34 +0100
Subject: [PATCH 51/58] missed a thing

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

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index 780df60846..d5813c1d5c 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -79,7 +79,7 @@ export default {
     },
 
     setVideoInput: function(deviceId) {
-        this[deviceId === 'default' ? 'setVideoInputDefault' : '_setVideoInput']();
+        this[deviceId === 'default' ? 'setVideoInputDefault' : '_setVideoInput'](deviceId);
     },
 
     _setVideoInput: function(deviceId) {

From 0bafd6458a0a6a06b8d9f14dff097cffc75e297e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 2 Jun 2017 00:26:31 +0100
Subject: [PATCH 52/58] Revert voodoo

---
 src/CallMediaHandler.js                   | 24 -----------------------
 src/components/structures/UserSettings.js | 16 ++++++++++-----
 src/i18n/strings/en_EN.json               |  2 --
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index d5813c1d5c..45ca5dc30d 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -53,36 +53,12 @@ export default {
         // });
     },
 
-    _findDefault: function(devices) {
-        return devices.some((device) => device.deviceId === 'default') ? 'default' : undefined;
-    },
-
-    setAudioInputDefault: async function() {
-        const devices = await this.getDevices();
-        const audioDefault = this._findDefault(devices.audioinput);
-        this._setAudioInput(audioDefault);
-    },
-
     setAudioInput: function(deviceId) {
-        this[deviceId === 'default' ? 'setAudioInputDefault' : '_setAudioInput'](deviceId);
-    },
-
-    _setAudioInput: function(deviceId) {
         UserSettingsStore.setLocalSetting('webrtc_audioinput', deviceId);
         Matrix.setMatrixCallAudioInput(deviceId);
     },
 
-    setVideoInputDefault: async function() {
-        const devices = await this.getDevices();
-        const videoDefault = this._findDefault(devices.videoinput);
-        this._setVideoInput(videoDefault);
-    },
-
     setVideoInput: function(deviceId) {
-        this[deviceId === 'default' ? 'setVideoInputDefault' : '_setVideoInput'](deviceId);
-    },
-
-    _setVideoInput: function(deviceId) {
         UserSettingsStore.setLocalSetting('webrtc_videoinput', deviceId);
         Matrix.setMatrixCallVideoInput(deviceId);
     },
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 99b02b59f9..b8567fc180 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -952,21 +952,24 @@ module.exports = React.createClass({
         let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
 
         const defaultOption = {
-            deviceId: 'default',
+            deviceId: undefined,
             label: _t('Default Device'),
         };
 
         const audioInputs = this.state.mediaDevices.audioinput.slice(0);
         if (audioInputs.length > 0) {
+            let defaultInput;
             if (!audioInputs.some((input) => input.deviceId === 'default')) {
                 audioInputs.unshift(defaultOption);
+            } else {
+                defaultInput = 'default';
             }
 
             microphoneDropdown = <div>
-                <h4>{_t('Microphone')}</h4>
+                <h4>Microphone</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
-                    value={this.state.activeAudioInput || 'default'}
+                    value={this.state.activeAudioInput || defaultInput}
                     onOptionChange={this._setAudioInput}>
                     {this._mapWebRtcDevicesToSpans(audioInputs)}
                 </Dropdown>
@@ -975,15 +978,18 @@ module.exports = React.createClass({
 
         const videoInputs = this.state.mediaDevices.videoinput.slice(0);
         if (videoInputs.length > 0) {
+            let defaultInput;
             if (!videoInputs.some((input) => input.deviceId === 'default')) {
                 videoInputs.unshift(defaultOption);
+            } else {
+                defaultInput = 'default';
             }
 
             webcamDropdown = <div>
-                <h4>{_t('Camera')}</h4>
+                <h4>Cameras</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
-                    value={this.state.activeVideoInput || 'default'}
+                    value={this.state.activeVideoInput || defaultInput}
                     onOptionChange={this._setVideoInput}>
                     {this._mapWebRtcDevicesToSpans(videoInputs)}
                 </Dropdown>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b9ac79d362..3a8752fd5d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -136,8 +136,6 @@
   "No media permissions": "No media permissions",
   "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
   "Default Device": "Default Device",
-  "Microphone": "Microphone",
-  "Cameras": "Cameras",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",

From 6b4daf02a9d6522d695b9b8be440f46be7685df8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 2 Jun 2017 00:27:20 +0100
Subject: [PATCH 53/58] i18 missed things

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js | 4 ++--
 src/i18n/strings/en_EN.json               | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b8567fc180..837cf99f1a 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -966,7 +966,7 @@ module.exports = React.createClass({
             }
 
             microphoneDropdown = <div>
-                <h4>Microphone</h4>
+                <h4>{_t('Microphone')}</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
                     value={this.state.activeAudioInput || defaultInput}
@@ -986,7 +986,7 @@ module.exports = React.createClass({
             }
 
             webcamDropdown = <div>
-                <h4>Cameras</h4>
+                <h4>{_t('Camera')}</h4>
                 <Dropdown
                     className="mx_UserSettings_webRtcDevices_dropdown"
                     value={this.state.activeVideoInput || defaultInput}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3a8752fd5d..6a41f39065 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -136,6 +136,8 @@
   "No media permissions": "No media permissions",
   "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
   "Default Device": "Default Device",
+  "Microphone": "Microphone",
+  "Camera": "Camera",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",

From f4db83a03114b4fdb9d5d4e1c64c3513773d440c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 2 Jun 2017 00:31:43 +0100
Subject: [PATCH 54/58] try empty string as falsey key

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 837cf99f1a..389f08fd3b 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -952,7 +952,7 @@ module.exports = React.createClass({
         let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
 
         const defaultOption = {
-            deviceId: undefined,
+            deviceId: '',
             label: _t('Default Device'),
         };
 

From b1973d799860535577ee1234277540f2ed3a71b5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 2 Jun 2017 00:42:19 +0100
Subject: [PATCH 55/58] undefined =/= ''

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 389f08fd3b..7300d82541 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -958,7 +958,7 @@ module.exports = React.createClass({
 
         const audioInputs = this.state.mediaDevices.audioinput.slice(0);
         if (audioInputs.length > 0) {
-            let defaultInput;
+            let defaultInput = '';
             if (!audioInputs.some((input) => input.deviceId === 'default')) {
                 audioInputs.unshift(defaultOption);
             } else {
@@ -978,7 +978,7 @@ module.exports = React.createClass({
 
         const videoInputs = this.state.mediaDevices.videoinput.slice(0);
         if (videoInputs.length > 0) {
-            let defaultInput;
+            let defaultInput = '';
             if (!videoInputs.some((input) => input.deviceId === 'default')) {
                 videoInputs.unshift(defaultOption);
             } else {

From 73f97b46614261e19e92f178b9336c48b99465d4 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Jun 2017 01:05:09 +0100
Subject: [PATCH 56/58] bump js-sdk for webrtc

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

diff --git a/package.json b/package.json
index a6076a56d2..33f7314fc6 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.9",
+    "matrix-js-sdk": "0.7.10",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^15.4.0",

From 3c5d0f82c901db5f01a9267cc6b60a9de2c37d11 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Jun 2017 01:14:13 +0100
Subject: [PATCH 57/58] Prepare changelog for v0.9.0-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23098c4749..7102c43f24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+Changes in [0.9.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.0-rc.2) (2017-06-02)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.0-rc.1...v0.9.0-rc.2)
+
+ * Update from Weblate.
+   [\#1002](https://github.com/matrix-org/matrix-react-sdk/pull/1002)
+ * webrtc config electron
+   [\#850](https://github.com/matrix-org/matrix-react-sdk/pull/850)
+ * enable useCompactLayout user setting an add a class when it's enabled
+   [\#986](https://github.com/matrix-org/matrix-react-sdk/pull/986)
+ * Update from Weblate.
+   [\#987](https://github.com/matrix-org/matrix-react-sdk/pull/987)
+ * Translation fixes for everything but src/components
+   [\#990](https://github.com/matrix-org/matrix-react-sdk/pull/990)
+ * Fix tests
+   [\#1001](https://github.com/matrix-org/matrix-react-sdk/pull/1001)
+ * Fix tests for PR #989
+   [\#999](https://github.com/matrix-org/matrix-react-sdk/pull/999)
+ * Revert "Revert "add labels to language picker""
+   [\#1000](https://github.com/matrix-org/matrix-react-sdk/pull/1000)
+ * maybe fixxy [Electron] external thing?
+   [\#997](https://github.com/matrix-org/matrix-react-sdk/pull/997)
+ * travisci: Don't run the riot-web tests if the react-sdk tests fail
+   [\#992](https://github.com/matrix-org/matrix-react-sdk/pull/992)
+ * Support 12hr time on DateSeparator
+   [\#991](https://github.com/matrix-org/matrix-react-sdk/pull/991)
+ * Revert "add labels to language picker"
+   [\#994](https://github.com/matrix-org/matrix-react-sdk/pull/994)
+ * Call MatrixClient.clearStores on logout
+   [\#983](https://github.com/matrix-org/matrix-react-sdk/pull/983)
+ * Matthew/room avatar event
+   [\#988](https://github.com/matrix-org/matrix-react-sdk/pull/988)
+ * add labels to language picker
+   [\#989](https://github.com/matrix-org/matrix-react-sdk/pull/989)
+ * Update from Weblate.
+   [\#981](https://github.com/matrix-org/matrix-react-sdk/pull/981)
+
 Changes in [0.9.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.0-rc.1) (2017-06-01)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.9...v0.9.0-rc.1)

From 8add074dbfaa54d02e8bef3fcc9d02c327633cc2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Jun 2017 01:14:13 +0100
Subject: [PATCH 58/58] v0.9.0-rc.2

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

diff --git a/package.json b/package.json
index 3cb87ce716..1b00a57d52 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.9.0-rc.1",
+  "version": "0.9.0-rc.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {