From a98792b05e134c07a365c7a7bed145ec8eed07b4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 May 2017 15:52:08 +0100
Subject: [PATCH 01/34] auto-launch support, ux =checkbox in
 UserSettings[Electron] settings are sorta generic, probably reusable for
 proxy settings

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

diff --git a/electron_app/package.json b/electron_app/package.json
index df9c3bd261..8da35d8438 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -6,6 +6,7 @@
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {
+    "auto-launch": "^5.0.1",
     "electron-window-state": "^4.1.0"
   }
 }
diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index ab844bd371..6b63d741b9 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -24,6 +24,7 @@ const check_squirrel_hooks = require('./squirrelhooks');
 if (check_squirrel_hooks()) return;
 
 const electron = require('electron');
+const AutoLaunch = require('auto-launch');
 const url = require('url');
 
 const tray = require('./tray');
@@ -202,6 +203,44 @@ if (shouldQuit) {
     electron.app.quit()
 }
 
+
+const launcher = new AutoLaunch({
+    name: vectorConfig.brand || 'Riot',
+    isHidden: true,
+});
+
+const settings = {
+    'auto-launch': {
+        get: launcher.isEnabled,
+        set: function(bool) {
+            if (bool) {
+                return launcher.enable();
+            } else {
+                return launcher.disable();
+            }
+        },
+    },
+};
+
+electron.ipcMain.on('settings_get', async function(ev) {
+    const data = {};
+
+    try {
+        await Promise.all(Object.keys(settings).map(async function (setting) {
+            data[setting] = await settings[setting].get();
+        }));
+
+        ev.sender.send('settings', data);
+    } catch(e) { console.error(e); }
+});
+
+electron.ipcMain.on('settings_set', function(ev, key, value) {
+    console.log(key, value);
+    if (settings[key] && settings[key].set) {
+        settings[key].set(value);
+    }
+});
+
 electron.app.on('ready', () => {
     if (vectorConfig.update_base_url) {
         console.log("Starting auto update with base URL: " + vectorConfig.update_base_url);
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index 5710e66e4a..f52a5ddc93 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -138,6 +138,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
         return null;
     }
 
+    isElectron(): boolean { return true; }
+
     requestNotificationPermission(): Promise<string> {
         return q('granted');
     }

From 61a67c52c555faddccef50f9a38ba451aac43541 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 27 May 2017 20:39:52 +0100
Subject: [PATCH 02/34] initial piwik stuff

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RightPanel.js | 11 ++++++----
 src/vector/index.js                     | 28 +++++++++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index c7f5394bf1..8d5fc36e40 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -22,6 +22,7 @@ import sdk from 'matrix-react-sdk';
 import Matrix from "matrix-js-sdk";
 import dis from 'matrix-react-sdk/lib/dispatcher';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+import Analytics from 'matrix-react-sdk/lib/Analytics';
 import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
 import Modal from 'matrix-react-sdk/lib/Modal';
 import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
@@ -61,24 +62,26 @@ module.exports = React.createClass({
             return {
                 phase: this.Phase.MemberInfo,
                 member: member,
-            }
-        }
-        else {
+            };
+        } else {
             return {
                 phase: this.Phase.MemberList
-            }
+            };
         }
     },
 
     onMemberListButtonClick: function() {
+        Analytics.trackEvent('RightPanel', 'memberListButtonClick');
         this.setState({ phase: this.Phase.MemberList });
     },
 
     onFileListButtonClick: function() {
+        Analytics.trackEvent('RightPanel', 'fileListButtonClick');
         this.setState({ phase: this.Phase.FilePanel });
     },
 
     onNotificationListButtonClick: function() {
+        Analytics.trackEvent('RightPanel', 'notificationListButtonClick');
         this.setState({ phase: this.Phase.NotificationPanel });
     },
 
diff --git a/src/vector/index.js b/src/vector/index.js
index 14f8bb4b36..d1752356a9 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -56,7 +56,8 @@ if (process.env.NODE_ENV !== 'production') {
 var RunModernizrTests = require("./modernizr"); // this side-effects a global
 var ReactDOM = require("react-dom");
 var sdk = require("matrix-react-sdk");
-var PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg");
+const PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg");
+const Analytics = require("matrix-react-sdk/lib/Analytics");
 sdk.loadSkin(require('../component-index'));
 var VectorConferenceHandler = require('../VectorConferenceHandler');
 var UpdateChecker = require("./updater");
@@ -143,7 +144,7 @@ var onNewScreen = function(screen) {
     var hash = '#/' + screen;
     lastLocationHashSet = hash;
     window.location.hash = hash;
-}
+};
 
 // We use this to work out what URL the SDK should
 // pass through when registering to allow the user to
@@ -279,6 +280,26 @@ async function loadApp() {
     } else if (validBrowser) {
         UpdateChecker.start();
 
+        let doNotTrack = navigator.doNotTrack;
+        if (typeof navigator.doNotTrack === 'string') {
+            doNotTrack = navigator.doNotTrack === 'yes';
+        }
+        if (!doNotTrack && configJson.piwik && configJson.piwik.url && configJson.piwik.siteId) {
+            (function() {
+                const g = document.createElement('script');
+                const s = document.getElementsByTagName('script')[0];
+                g.type='text/javascript'; g.async=true; g.defer=true; g.src=configJson.piwik.url+'piwik.js';
+
+                g.onload = function() {
+                    const tracker = window.Piwik.getTracker(configJson.piwik.url+'piwik.php', configJson.piwik.siteId);
+                    console.log('Initialised anonymous analytics');
+                    Analytics.set(tracker);
+                };
+
+                s.parentNode.insertBefore(g, s);
+            })();
+        }
+
         const MatrixChat = sdk.getComponent('structures.MatrixChat');
         window.matrixChat = ReactDOM.render(
             <MatrixChat
@@ -295,8 +316,7 @@ async function loadApp() {
             />,
             document.getElementById('matrixchat')
         );
-    }
-    else {
+    } else {
         console.error("Browser is missing required features.");
         // take to a different landing page to AWOOOOOGA at the user
         var CompatibilityPage = sdk.getComponent("structures.CompatibilityPage");

From 195fcba69608ce2cb3a6e424de5c194d4e2b54b7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 27 May 2017 20:56:25 +0100
Subject: [PATCH 03/34] correct DNT check

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/vector/index.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/vector/index.js b/src/vector/index.js
index d1752356a9..7674dd4789 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -280,10 +280,7 @@ async function loadApp() {
     } else if (validBrowser) {
         UpdateChecker.start();
 
-        let doNotTrack = navigator.doNotTrack;
-        if (typeof navigator.doNotTrack === 'string') {
-            doNotTrack = navigator.doNotTrack === 'yes';
-        }
+        const doNotTrack = navigator.doNotTrack === 'yes' || navigator.doNotTrack === '1' || navigator.doNotTrack === 1;
         if (!doNotTrack && configJson.piwik && configJson.piwik.url && configJson.piwik.siteId) {
             (function() {
                 const g = document.createElement('script');

From 2e75640cdde4f790acee7c1ff87778abbacd3dec Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 11:27:33 +0100
Subject: [PATCH 04/34] sample piwik config

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 config.sample.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config.sample.json b/config.sample.json
index 3c513f7ab2..bf5da247d5 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -10,5 +10,9 @@
         "servers": [
             "matrix.org"
         ]
+    },
+    "piwik": {
+        "url": "//piwik.riot.im/",
+        "siteId": 1
     }
 }

From c2c417b207a8ec8356fcff6201439432341e54f8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 13:07:56 +0100
Subject: [PATCH 05/34] add piwik config to riot.im electron build config

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 electron_app/riot.im/config.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index 80526f4ab8..a31f77e4c5 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -12,5 +12,9 @@
         "servers": [
             "matrix.org"
         ]
+    },
+    "piwik": {
+        "url": "//piwik.riot.ovh/",
+        "siteId": 2
     }
 }

From 6969baa5a6b7717e1319f24c76d11e109dc3b47a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 13:08:09 +0100
Subject: [PATCH 06/34] change event wording

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

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 8d5fc36e40..230572002d 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -71,17 +71,17 @@ module.exports = React.createClass({
     },
 
     onMemberListButtonClick: function() {
-        Analytics.trackEvent('RightPanel', 'memberListButtonClick');
+        Analytics.trackEvent('Right Panel', 'Member List Button', 'click');
         this.setState({ phase: this.Phase.MemberList });
     },
 
     onFileListButtonClick: function() {
-        Analytics.trackEvent('RightPanel', 'fileListButtonClick');
+        Analytics.trackEvent('Right Panel', 'File List Button', 'click');
         this.setState({ phase: this.Phase.FilePanel });
     },
 
     onNotificationListButtonClick: function() {
-        Analytics.trackEvent('RightPanel', 'notificationListButtonClick');
+        Analytics.trackEvent('Right Panel', 'Notification List Button', 'click');
         this.setState({ phase: this.Phase.NotificationPanel });
     },
 

From 28d929f9015c44acec2b47da5b7a7d83bf06a3bb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 13:10:13 +0100
Subject: [PATCH 07/34] correct electron config to not point at personal piwik

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 electron_app/riot.im/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index a31f77e4c5..023e6a02e6 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -14,7 +14,7 @@
         ]
     },
     "piwik": {
-        "url": "//piwik.riot.ovh/",
-        "siteId": 2
+        "url": "//piwik.riot.im/",
+        "siteId": 1
     }
 }

From 00cf1da758070531f42bd420f5dd197aef1ce685 Mon Sep 17 00:00:00 2001
From: Strix Aluco <strixaluco@rocketmail.com>
Date: Mon, 29 May 2017 06:57:54 +0000
Subject: [PATCH 08/34] Added translation using Weblate (Ukrainian)

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

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/uk.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 3e7ef112f02f1abec561d3e8a3dc29b68cc90ab4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 May 2017 13:17:12 +0100
Subject: [PATCH 09/34] opt out based on analyticsOptOut localSetting

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

diff --git a/src/vector/index.js b/src/vector/index.js
index 7674dd4789..571fecfa42 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -280,8 +280,8 @@ async function loadApp() {
     } else if (validBrowser) {
         UpdateChecker.start();
 
-        const doNotTrack = navigator.doNotTrack === 'yes' || navigator.doNotTrack === '1' || navigator.doNotTrack === 1;
-        if (!doNotTrack && configJson.piwik && configJson.piwik.url && configJson.piwik.siteId) {
+        const analyticsEnabled = !UserSettingsStore.getLocalSetting('analyticsOptOut', false);
+        if (analyticsEnabled && configJson.piwik && configJson.piwik.url && configJson.piwik.siteId) {
             (function() {
                 const g = document.createElement('script');
                 const s = document.getElementsByTagName('script')[0];

From 3e7b738b11a4250dc83b91d4c53bc023bd0c3083 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 May 2017 14:22:35 +0100
Subject: [PATCH 10/34] move all piwik init stuff to MatrixChat/Analytics as it
 now relies on SDKConfig

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/vector/index.js | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/vector/index.js b/src/vector/index.js
index 571fecfa42..432710fbc2 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -57,7 +57,6 @@ var RunModernizrTests = require("./modernizr"); // this side-effects a global
 var ReactDOM = require("react-dom");
 var sdk = require("matrix-react-sdk");
 const PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg");
-const Analytics = require("matrix-react-sdk/lib/Analytics");
 sdk.loadSkin(require('../component-index'));
 var VectorConferenceHandler = require('../VectorConferenceHandler');
 var UpdateChecker = require("./updater");
@@ -280,23 +279,6 @@ async function loadApp() {
     } else if (validBrowser) {
         UpdateChecker.start();
 
-        const analyticsEnabled = !UserSettingsStore.getLocalSetting('analyticsOptOut', false);
-        if (analyticsEnabled && configJson.piwik && configJson.piwik.url && configJson.piwik.siteId) {
-            (function() {
-                const g = document.createElement('script');
-                const s = document.getElementsByTagName('script')[0];
-                g.type='text/javascript'; g.async=true; g.defer=true; g.src=configJson.piwik.url+'piwik.js';
-
-                g.onload = function() {
-                    const tracker = window.Piwik.getTracker(configJson.piwik.url+'piwik.php', configJson.piwik.siteId);
-                    console.log('Initialised anonymous analytics');
-                    Analytics.set(tracker);
-                };
-
-                s.parentNode.insertBefore(g, s);
-            })();
-        }
-
         const MatrixChat = sdk.getComponent('structures.MatrixChat');
         window.matrixChat = ReactDOM.render(
             <MatrixChat

From 7674a43e7fff3fcbec5dca88dfaf207f2fabfb6d Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Mon, 29 May 2017 13:13:56 +0000
Subject: [PATCH 11/34] Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d030e29d1a..cbe617b20c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -5,15 +5,15 @@
     "Files": "Dateien",
     "Notifications": "Benachrichtigungen",
     "Invite to this room": "In diesen Raum einladen",
-    "Filter room names": "Raum Namen filtern",
+    "Filter room names": "Raum-Namen filtern",
     "Start chat": "Neuen Chat starten",
     "Room directory": "Raum-Verzeichnis",
     "Create new room": "Neuen Raum erstellen",
     "Settings": "Einstellungen",
-    "powered by Matrix": "gebaut mit Matrix",
+    "powered by Matrix": "basierend auf Matrix",
     "Custom Server Options": "Optionen für eigenen Server",
     "Dismiss": "ausblenden",
-    "Failed to get protocol list from Home Server": "Fehler beim Abrufen der Protokollliste vom Home Server",
+    "Failed to get protocol list from Home Server": "Fehler beim Abrufen der Protokoll-Liste vom Home-Server",
     "The Home Server may be too old to support third party networks": "Der Home-Server ist eventuell zu alt, um Drittanbieter-Netzwerke zu unterstützen",
     "Directory": "Raum Verzeichnis",
     "#example:": "#beispiel:",
@@ -21,25 +21,25 @@
     "No rooms to show": "Keine Räume zum anzeigen",
     "World readable": "Jeder kann lesen",
     "Guests can join": "Gäste können beitreten",
-    "You are not receiving desktop notifications": "Du erhältst keine Desktop Benachrichtigungen",
+    "You are not receiving desktop notifications": "Du erhältst keine Desktop-Benachrichtigungen",
     "Enable them now": "Aktiviere diese jetzt",
     "Add an email address above to configure email notifications": "Füge eine E-Mail Adresse hinzu um Benachrichtigungen via E-Mail zu erhalten",
     "All notifications are currently disabled for all targets.": "Im Moment sind alle Benachrichtigungen für alle Ziele deaktiviert.",
-    "An error occurred whilst saving your email notification preferences.": "Ein Fehler trat auf während deine E-Mail Einstellungen gespeichert wurden.",
+    "An error occurred whilst saving your email notification preferences.": "Beim Speichern deiner E-Mail-Benachrichtigungseinstellungen ist ein Fehler aufgetreten.",
     "and remove": "und entfernen",
     "Can't update user notification settings": "Kann Benutzerdefinierte Einstellungen nicht aktualisieren",
-    "Couldn't find a matching Matrix room": "Kann keinen entsprechenden Matrix Raum finden",
+    "Couldn't find a matching Matrix room": "Konnte keinen entsprechenden Matrix-Raum finden",
     "delete the alias": "Lösche den Alias",
     "Delete the room alias": "Lösche den Raum Alias",
     "Direct Chat": "Privater Chat",
     "Drop here to": "Hier ablegen",
-    "Enable audible notifications in web client": "Aktiviere Audio Benachrichtigungen",
-    "Enable desktop notifications": "Aktiviere Desktop Benachrichtigungen",
+    "Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren",
+    "Enable desktop notifications": "Desktop-Benachrichtigungen aktivieren",
     "Enable email notifications": "Aktiviere E-Mail Benachrichtigungen",
     "Enable notifications for this account": "Aktiviere Benachrichtigungen für diesen Benutzer",
-    "Enter keywords separated by a comma:": "Trage Schlagworte, mit Komma getrennt, ein",
+    "Enter keywords separated by a comma:": "Kommagetrennte Schlagworte eingeben:",
     "Error": "Fehler",
-    "Error saving email notification preferences": "Fehler beim Speichern der E-Mail Benachrichtigungseinstellungen",
+    "Error saving email notification preferences": "Fehler beim Speichern der E-Mail-Benachrichtigungseinstellungen",
     "#example": "#Beispiel",
     "Failed to": "Konnte nicht",
     "Failed to add tag ": "Konnte Tag nicht hinzufügen ",
@@ -55,18 +55,18 @@
     "from the directory": "aus dem Verzeichnis",
     " from room": " aus dem Raum",
     "Guest users can't invite users. Please register to invite": "Gastnutzer können keine Nutzer einladen. Bitte registriere dich um Nutzer einzuladen",
-    "Keywords": "Suchbegriff",
+    "Keywords": "Schlüsselwörter",
     "Leave": "Verlassen",
     "Low Priority": "Niedrige Priorität",
     "Noisy": "Laut",
-    "Notification targets": "Benachrichtigungsziel",
+    "Notification targets": "Benachrichtigungsziele",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Benachrichtigungen zu folgenden Stichwörtern folgen Regeln, die hier nicht angezeigt werden können:",
-    "Notify for all other messages/rooms": "Benachrichtigung für alle anderen Mitteilungen/ Räume",
+    "Notify for all other messages/rooms": "Benachrichtigungen für alle anderen Mitteilungen/Räume aktivieren",
     "Operation failed": "Aktion fehlgeschlagen",
     "Reject": "ablehnen",
-    "Remove": "Entferne",
+    "Remove": "Entfernen",
     "remove": "Entferner",
-    "Remove from Directory": "Vom Raum Verzeichnis entfernen",
+    "Remove from Directory": "Aus dem Raum-Verzeichnis entfernen",
     "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
     "Room not found": "Raum nicht gefunden",
     "There are advanced notifications which are not shown here": "Es existieren erweiterte Benachrichtigungen, welche hier nicht angezeigt werden",
@@ -79,9 +79,9 @@
     "Notify me for anything else": "Benachrichtige mich für alles andere",
     "Off": "Aus",
     "On": "An",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Client als Riot konfiguriert. Sie sind in Riot nicht anpassbar gelten aber trotzdem",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Client als Riot konfiguriert. Sie können in Riot nicht verändert werden, gelten aber trotzdem",
     " to room": " an Raum",
-    "Drop here %(toAction)s": "%(toAction)s hierher ziehen",
+    "Drop here %(toAction)s": "Hierher ziehen:  %(toAction)s",
     "All messages": "Alle Nachrichten",
     "All messages (loud)": "Alle Nachrichten (laut)",
     "Cancel Sending": "Senden abbrechen",
@@ -107,7 +107,7 @@
     "View Decrypted Source": "Entschlüsselten Quellcode ansehen",
     "View Source": "Quellcode ansehen",
     "You cannot delete this image. (%(code)s)": "Das Bild kann nicht gelöscht werden. (%(code)s)",
-    "You cannot delete this message. (%(code)s)": "Die Nachricht kann nicht gelöscht werden. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Diese Nachricht kann nicht gelöscht werden. (%(code)s)",
     "Today": "Heute",
     "Wednesday": "Mittwoch",
     "Thursday": "Donnerstag",
@@ -122,10 +122,10 @@
     "Call invitation": "Anruf-Einladung",
     "Messages containing my display name": "Nachrichten, die meinen Anzeigenamen enthalten",
     "Messages containing my user name": "Nachrichten, die meinen Nutzernamen enthalten",
-    "Messages in group chats": "Nachrichten in Chat-Gruppen",
+    "Messages in group chats": "Nachrichten in Gruppen-Chats",
     "Messages in one-to-one chats": "Nachrichten in Eins-zu-Eins-Chats",
     "Messages sent by bot": "Nachrichten von Bots",
     "more": "mehr",
     "When I'm invited to a room": "Wenn ich in einen Raum eingeladen werde",
-    "customServer_text": "Du kannst die erweiterten Server-Optioen nutzen um dich an anderen Matrix-Servern mittels anderer Heimserver-URL anzumelden. <br/>Dies erlaubt dir Riot mit einem existierendem Konto auf einem anderen Heimserver zu nutzen.<br/><br/>Du kannst auch einen benutzerdefinierten Identitäts-Server setzen, aber du wirst dann nicht in der Lage sein, Nutzer per E-Mail-Adresse einzuladen oder selbst mit E-Mail-Adresse eingeladen zu werden."
+    "customServer_text": "Du kannst die erweiterten Server-Optionen nutzen, um dich auf anderen Matrix-Servern anzumelden, indem du eine andere Heimserver-URL eingibst. <br/>Dies ermöglicht es dir, Riot mit einem bereits existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.<br/><br/>Du kannst auch einen benutzerdefinierten Identitäts-Server eingeben, allerdings wirst du dann nicht in der Lage sein, andere Benutzer per E-Mail-Adresse einzuladen oder selbst Einladungen per E-Mail-Adresse zu erhalten."
 }

From dda73cecf9d574c332b7163168bb4190d2049504 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 May 2017 19:12:04 +0100
Subject: [PATCH 12/34] make eslint happy about MatrixToolbar

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

diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
index 6d47ad1b9e..488b5def47 100644
--- a/src/components/views/globals/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -16,11 +16,10 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+import React from 'react';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
-var Notifier = require("matrix-react-sdk/lib/Notifier");
-var sdk = require('matrix-react-sdk')
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
+import Notifier from 'matrix-react-sdk/lib/Notifier';
+import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
 
 module.exports = React.createClass({
     displayName: 'MatrixToolbar',
@@ -43,5 +42,5 @@ module.exports = React.createClass({
                 <AccessibleButton className="mx_MatrixToolbar_close" onClick={ this.hideToolbar } ><img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
             </div>
         );
-    }
+    },
 });

From 8a59acb5c3308a1df4e76af5e01915d1d3d2d852 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 May 2017 19:32:44 +0100
Subject: [PATCH 13/34] explicit protocol in configs, otherwise breaks in
 Electron when it tries file://

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 config.sample.json               | 2 +-
 electron_app/riot.im/config.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.sample.json b/config.sample.json
index bf5da247d5..c9b3d65b0f 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -12,7 +12,7 @@
         ]
     },
     "piwik": {
-        "url": "//piwik.riot.im/",
+        "url": "https://piwik.riot.im/",
         "siteId": 1
     }
 }
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index 023e6a02e6..1303985ecd 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -14,7 +14,7 @@
         ]
     },
     "piwik": {
-        "url": "//piwik.riot.im/",
+        "url": "https://piwik.riot.im/",
         "siteId": 1
     }
 }

From e991461e8dcb379613606afc167322bbc01527cb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 May 2017 19:51:28 +0100
Subject: [PATCH 14/34] add new BasePlatform method, Analytics fun on the
 Webpack train

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/vector/platform/ElectronPlatform.js   | 4 ++++
 src/vector/platform/VectorBasePlatform.js | 4 ++++
 src/vector/platform/WebPlatform.js        | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index bf930a674f..a12de530ba 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -67,6 +67,10 @@ export default class ElectronPlatform extends VectorBasePlatform {
         dis.register(_onAction);
     }
 
+    getHumanReadableName() {
+        return 'Electron Platform';
+    }
+
     setNotificationCount(count: number) {
         if (this.notificationCount === count) return;
         super.setNotificationCount(count);
diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js
index 00c9c47c30..4ff3c222f2 100644
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -35,6 +35,10 @@ export default class VectorBasePlatform extends BasePlatform {
         this._updateFavicon();
     }
 
+    getHumanReadableName() {
+        return 'Vector Base Platform';
+    }
+
     _updateFavicon() {
         try {
             // This needs to be in in a try block as it will throw
diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js
index cdff7344a6..1db024edd3 100644
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -31,6 +31,10 @@ export default class WebPlatform extends VectorBasePlatform {
         this.runningVersion = null;
     }
 
+    getHumanReadableName() {
+        return 'Web Platform';
+    }
+
     /**
      * Returns true if the platform supports displaying
      * notifications, otherwise false.

From b9ec25b32f53659f4b35e0ed348838e62badcb0b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 May 2017 20:03:21 +0100
Subject: [PATCH 15/34] add flow annotation

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/vector/platform/ElectronPlatform.js   | 2 +-
 src/vector/platform/VectorBasePlatform.js | 2 +-
 src/vector/platform/WebPlatform.js        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index a12de530ba..13604cdabe 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -67,7 +67,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
         dis.register(_onAction);
     }
 
-    getHumanReadableName() {
+    getHumanReadableName(): string {
         return 'Electron Platform';
     }
 
diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js
index 4ff3c222f2..04caecdc2d 100644
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -35,7 +35,7 @@ export default class VectorBasePlatform extends BasePlatform {
         this._updateFavicon();
     }
 
-    getHumanReadableName() {
+    getHumanReadableName(): string {
         return 'Vector Base Platform';
     }
 
diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js
index 1db024edd3..1a3c46fb0b 100644
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -31,7 +31,7 @@ export default class WebPlatform extends VectorBasePlatform {
         this.runningVersion = null;
     }
 
-    getHumanReadableName() {
+    getHumanReadableName(): string {
         return 'Web Platform';
     }
 

From 9c25aab5095f8ec9272fa0a14fe4138ff26c2585 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 May 2017 22:12:36 +0100
Subject: [PATCH 16/34] Fix bad merge (3993 before 4021 broke things)

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

diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 03c3d07dd1..d739a8d0c2 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -46,47 +46,6 @@ const INITIAL_UPDATE_DELAY_MS = 30 * 1000;
 let mainWindow = null;
 let appQuitting = false;
 
-function safeOpenURL(target) {
-    // openExternal passes the target to open/start/xdg-open,
-    // so put fairly stringent limits on what can be opened
-    // (for instance, open /bin/sh does indeed open a terminal
-    // with a shell, albeit with no arguments)
-    const parsedUrl = url.parse(target);
-    if (PERMITTED_URL_SCHEMES.indexOf(parsedUrl.protocol) > -1) {
-        // explicitly use the URL re-assembled by the url library,
-        // so we know the url parser has understood all the parts
-        // of the input string
-        const newTarget = url.format(parsedUrl);
-        electron.shell.openExternal(newTarget);
-    }
-}
-
-function onWindowOrNavigate(ev, target) {
-    // always prevent the default: if something goes wrong,
-    // we don't want to end up opening it in the electron
-    // app, as we could end up opening any sort of random
-    // url in a window that has node scripting access.
-    ev.preventDefault();
-    safeOpenURL(target);
-}
-
-function onLinkContextMenu(ev, params) {
-    const popupMenu = new electron.Menu();
-
-    popupMenu.append(new electron.MenuItem({
-        label: params.linkURL,
-        click() { safeOpenURL(params.linkURL); },
-    }));
-
-    popupMenu.append(new electron.MenuItem({
-        label: 'Copy Link Address',
-        click() { electron.clipboard.writeText(params.linkURL); },
-    }));
-
-    popupMenu.popup();
-    ev.preventDefault();
-}
-
 function installUpdate() {
     // for some reason, quitAndInstall does not fire the
     // before-quit event, so we need to set the flag here.

From b27600adbe0f186a22a94e6c49e72a1f07ffbf10 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 30 May 2017 10:53:01 +0100
Subject: [PATCH 17/34] Improve for Mac - Tested on 10.10.5

---
 electron_app/src/electron-main.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index d739a8d0c2..92b59304ff 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -173,6 +173,9 @@ if (shouldQuit) {
 const launcher = new AutoLaunch({
     name: vectorConfig.brand || 'Riot',
     isHidden: true,
+    mac: {
+        useLaunchAgent: true,
+    },
 });
 
 const settings = {

From c54e2a30b6a9493a83ce3ce98d46f2aab745bab1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 30 May 2017 12:33:32 +0100
Subject: [PATCH 18/34] explicitly hide because setApplicationMenu on Linux
 otherwise shows... https://github.com/electron/electron/issues/9621

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

diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index d739a8d0c2..cef16f21bc 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -236,6 +236,10 @@ electron.app.on('ready', () => {
     mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`);
     electron.Menu.setApplicationMenu(vectorMenu);
 
+    // explicitly hide because setApplicationMenu on Linux otherwise shows...
+    // https://github.com/electron/electron/issues/9621
+    mainWindow.hide();
+
     // Create trayIcon icon
     tray.create(mainWindow, {
         icon_path: iconPath,

From 0e96968c4eaed192bf197ee62a8597747c939797 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 30 May 2017 12:35:57 +0100
Subject: [PATCH 19/34] explicitly call install:electron in case
 electron-builder is silly (which has hit me once)

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

diff --git a/package.json b/package.json
index 29b5beee07..951a9fc5fd 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "build:compile": "npm run reskindex && babel --source-maps -d lib src",
     "build:bundle": "cross-env NODE_ENV=production webpack -p --progress",
     "build:bundle:dev": "webpack --optimize-occurence-order --progress",
-    "build:electron": "npm run clean && npm run build && build -wml --ia32 --x64",
+    "build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
     "build": "npm run reskindex && npm run build:res && npm run build:bundle",
     "build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
     "dist": "scripts/package.sh",

From 83926eefce313ad3a4b652e93e696b5ee1ec565c Mon Sep 17 00:00:00 2001
From: Bhuvan Krishna <bhuvan@swecha.org>
Date: Tue, 30 May 2017 12:22:01 +0000
Subject: [PATCH 20/34] Added translation using Weblate (Telugu)

---
 src/i18n/strings/de_DE.json |  2 +-
 src/i18n/strings/es.json    |  8 ++++----
 src/i18n/strings/fr.json    | 15 +++++++--------
 src/i18n/strings/pt_BR.json |  7 ++++---
 src/i18n/strings/te.json    |  1 +
 5 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 src/i18n/strings/te.json

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index cbe617b20c..f9deef5b32 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -91,7 +91,7 @@
     "Failed to add tag %(tagName)s to room": "Das Hinzufügen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums %(errCode)s aus deiner Liste ist fehlgeschlagen",
     "Failed to remove tag %(tagName)s from room": "Das Entfernen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
-    "Failed to set direct chat tag": "Fehler beim setzen der Direct Chat Kennzeichnung",
+    "Failed to set direct chat tag": "Fehler beim Setzen der \"Direkter Chat\"-Kennzeichnung",
     "Mentions only": "Nur, wenn du erwähnt wirst",
     "Mute": "Stummschalten",
     "Permalink": "Permanenter Link",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index beef27c12f..616d628dae 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -13,10 +13,10 @@
     "customServer_text": "Puedes utilizar las opciones de servidor personalizadas para iniciar sesión en otros servidores Matrix especificando una URL de Home server distinta.<br/>Esto te permite usar Riot con una cuenta Matrix existente en un Home server distinto.<br/><br/>También puedes configurar un servidor de identidad personalizado, pero no podrás invitar usuarios por dirección de email, ni ser invitado por email por ti mismo.",
     "delete the alias": "borrar el alias",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar la sala alias %(alias)s y retirar %(name)s del directorio?",
-    "Direct Chat": "Chat Directo",
+    "Direct Chat": "Conversación directa",
     "Directory": "Directorio",
     "Download this file": "Descargar este archivo",
-    "Drop here %(toAction)s": "Soltar aquí %(toAction)s",
+    "Drop here %(toAction)s": "Suelta aquí para %(toAction)s",
     "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web",
     "Enable desktop notifications": "Habilitar notificaciones de escritorio",
     "Enable email notifications": "Habilitar notificaciones por email",
@@ -28,11 +28,11 @@
     "#example": "#ejemplo",
     "Failed to add tag %(tagName)s to room": "Error al añadir la etiqueta %(tagName)s a la sala",
     "Failed to change settings": "Error al cambiar la configuración",
-    "Failed to forget room %(errCode)s": "No se pudo olvidar la habitación %(errCode)s",
+    "Failed to forget room %(errCode)s": "Falló al olvidar la sala %(errCode)s",
     "Failed to update keywords": "Error al actualizar las palabras clave",
     "Failed to get protocol list from Home Server": "Error al obtener la lista de protocolos de Home Server",
     "Failed to get public room list": "No se pudo obtener la lista de salas públicas",
-    "Failed to join the room": "No se puede unir a la habitación",
+    "Failed to join the room": "Falló al unirse a la sala",
     "Failed to remove tag %(tagName)s from room": "Error al eliminar la etiqueta %(tagName)s de la sala",
     "Failed to set direct chat tag": "Error al establecer la etiqueta de chat directo",
     "Failed to set Direct Message status of room": "No se pudo establecer el estado de Mensaje Directo de la sala",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index dfd38e868a..08d578a55c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -3,7 +3,7 @@
     "All messages": "Tous les messages",
     "All messages (loud)": "Tous les messages (fort)",
     "All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.",
-    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications par e-mail",
+    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications mail.",
     "Cancel Sending": "Annuler l'envoi",
     "Can't update user notification settings": "Impossible de mettre à jour les notifications utilisateur",
     "Close": "Fermer",
@@ -67,10 +67,10 @@
     "Failed to set Direct Message status of room": "Échec de la configuration de l'état de Message Direct du salon",
     "Fetching third party location failed": "Échec de la récupération de la localisation tierce",
     "Files": "Fichiers",
-    "Filter room names": "Filtrer les noms des salons",
+    "Filter room names": "Filtrer les salons par nom",
     "Forget": "Oublier",
     " from room": " du salon",
-    "Guest users can't invite users. Please register to invite": "Les invités ne peuvent démarrer une discussion. Merci de vous enregistrer pour pouvoir démarrer une discussion",
+    "Guest users can't invite users. Please register to invite": "Les visiteurs ne peuvent démarrer une discussion. Merci de vous enregistrer pour pouvoir démarrer une discussion",
     "Invite to this room": "Inviter dans ce salon",
     "Keywords": "Mots-clés",
     "Leave": "Quitter",
@@ -83,7 +83,7 @@
     "Messages in one-to-one chats": "Messages dans les conversations directes",
     "Messages sent by bot": "Messages envoyés par des robots",
     "more": "plus",
-    "Mute": "Muet",
+    "Mute": "Couper le son",
     "No rooms to show": "Aucun salon à afficher",
     "Noisy": "Sonore",
     "Notification targets": "Appareils recevant les notifications",
@@ -104,7 +104,7 @@
     "The Home Server may be too old to support third party networks": "Le Home Server semble trop ancien pour supporter des réseaux tiers",
     "There are advanced notifications which are not shown here": "Il existe une configuration avancée des notifications qui ne peut être affichée ici",
     "The server may be unavailable or overloaded": "Le serveur est indisponible ou surchargé",
-    "This room is inaccessible to guests. You may be able to join if you register": "Ce salon n'est pas ouvert aux invités. Vous pourrez peut-être le rejoindre si vous vous enregistrez",
+    "This room is inaccessible to guests. You may be able to join if you register": "Ce salon n'est pas ouvert aux visiteurs. Vous pourrez peut-être le rejoindre si vous vous enregistrez",
     "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications",
     "Unable to join network": "Impossible de rejoindre le réseau",
     "Unable to look up room ID from server": "Impossible de récupérer l'ID du salon sur le serveur",
@@ -115,10 +115,9 @@
     "When I'm invited to a room": "Quand je suis invité dans un salon",
     "World readable": "Visible par tout le monde",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vous les avez probablement configurées dans un autre client que Riot. Vous ne pouvez pas les configurer dans Riot mais elles s'appliquent quand même",
-    "Guests can join": "Ouvert aux invités",
+    "Guests can join": "Ouvert aux visiteurs",
     " to room": " au salon",
     "Advanced notification settings": "Paramètres de notifications avancés",
-    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications mail.",
-    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse différente pour Home serveur.<br/>Cela permet d'utiliser Riot avec un compte existant sur un Home serveur différent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
+    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.<br/>Cela permet d'utiliser Riot avec un compte existant sur un homeserverdifférent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots clés suivant répondent à des critères qui ne peuvent pas être affichés ici :"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 545ed11a3d..a4297ad9d2 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2,7 +2,7 @@
     "Add an email address above to configure email notifications": "Insira um endereço de email no campo acima para configurar suas notificações por email",
     "All messages": "Todas as mensagens",
     "All messages (loud)": "Todas as mensagens (alto)",
-    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desativadas para todos os destinos",
+    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os destinatários.",
     "An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto o sistema estava salvando suas preferências de notificação por email.",
     "Call invitation": "Convite para chamada",
     "Cancel Sending": "Cancelar o envio",
@@ -116,8 +116,9 @@
     "Saturday": "Sábado",
     "Today": "Hoje",
     "Yesterday": "Ontem",
-    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os destinatários.",
     "#example": "#exemplo",
     "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala",
-    "Welcome page": "Página de boas vindas"
+    "Welcome page": "Página de boas vindas",
+    "Advanced notification settings": "Configurações avançadas de notificação",
+    "customServer_text": "Você pode usar as opções de servidor personalizado para entrar em outros servidores Matrix, especificando uma URL de outro Servidor de Base. Isso permite que você use Riot com uma conta Matrix que exista em outro Servidor de Base. Você também pode configurar um servidor de Identidade personalizado, mas neste caso não poderá convidar usuárias(os) pelo endereço de e-mail, ou ser convidado(a) pelo seu endereço de e-mail."
 }
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/te.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From e15d070e8fe4f442c159876d04595b92cfa63374 Mon Sep 17 00:00:00 2001
From: RiotTranslate <info@nordgedanken.de>
Date: Tue, 30 May 2017 13:11:04 +0000
Subject: [PATCH 21/34] [WEBLATE] fix issues.

---
 .../views/context_menus/MessageContextMenu.js | 31 +++++++++++++++++--
 .../views/settings/Notifications.js           |  1 +
 src/i18n/strings/pt.json                      |  1 -
 src/i18n/strings/pt_BR.json                   |  1 -
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index e135557209..56758b2f30 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -40,6 +40,31 @@ module.exports = React.createClass({
         onFinished: React.PropTypes.func,
     },
 
+    getInitialState: function() {
+        return {
+            canRedact: false,
+        };
+    },
+
+    componentWillMount: function() {
+        MatrixClientPeg.get().on('RoomMember.powerLevel', this._checkCanRedact);
+        this._checkCanRedact();
+    },
+
+    componentWillUnmount: function() {
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener('RoomMember.powerLevel', this._checkCanRedact);
+        }
+    },
+
+    _checkCanRedact: function() {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(this.props.mxEvent.getRoomId());
+        const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId);
+        this.setState({canRedact});
+    },
+
     onResendClick: function() {
         Resend.resend(this.props.mxEvent);
         if (this.props.onFinished) this.props.onFinished();
@@ -136,10 +161,10 @@ module.exports = React.createClass({
             );
         }
 
-        if (!eventStatus && !this.props.mxEvent.isRedacted()) { // sent and not redacted
+        if (this.state.canRedact) {
             redactButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
-                    { _t('Redact') }
+                    { _t('Remove') }
                 </div>
             );
         }
@@ -206,7 +231,7 @@ module.exports = React.createClass({
           externalURLButton = (
               <div className="mx_MessageContextMenu_field">
                   <a href={ this.props.mxEvent.event.content.external_url }
-                    rel="noopener" target="_blank"  onClick={ this.closeMenu }>{ _t('Source URL') }</a>
+                    rel="noopener" target="_blank" onClick={ this.closeMenu }>{ _t('Source URL') }</a>
               </div>
           );
         }
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 11948acebe..74b9c24a74 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -178,6 +178,7 @@ module.exports = React.createClass({
         Modal.createDialog(TextInputDialog, {
             title: _t('Keywords'),
             description: _t('Enter keywords separated by a comma:'),
+            button: _t('OK'),
             value: keywords,
             onFinished: function onFinished(should_leave, newValue) {
 
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 44041bc8fc..d55488059c 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -2,7 +2,6 @@
     "Add an email address above to configure email notifications": "Adicione um endereço de email acima para configurar as notificações por email",
     "All messages": "Todas as mensagens",
     "All messages (loud)": "Todas as mensagens (alto)",
-    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desativadas para todos os destinos",
     "An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto salvava suas preferências de notificação por email.",
     "Cancel Sending": "Cancelar o envio",
     "Can't update user notification settings": "Não é possível atualizar as preferências de notificação",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index a4297ad9d2..7687d4c4c6 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2,7 +2,6 @@
     "Add an email address above to configure email notifications": "Insira um endereço de email no campo acima para configurar suas notificações por email",
     "All messages": "Todas as mensagens",
     "All messages (loud)": "Todas as mensagens (alto)",
-    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os destinatários.",
     "An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto o sistema estava salvando suas preferências de notificação por email.",
     "Call invitation": "Convite para chamada",
     "Cancel Sending": "Cancelar o envio",

From 6a577423433e3185dc3b45cafe48f51e54f33eaf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 30 May 2017 14:19:33 +0100
Subject: [PATCH 22/34] managed to eat the eventStatus check, can't redact a
 local-echo etc

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

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 56758b2f30..5445fd4fb8 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -161,7 +161,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (this.state.canRedact) {
+        if (!eventStatus && this.state.canRedact) {
             redactButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
                     { _t('Remove') }

From 33b95d4965284d5f40f07de4d98ee017da2849bf Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 30 May 2017 15:11:17 +0100
Subject: [PATCH 23/34] Standardise on node v6/v7

---
 .travis.yml | 13 ++++++++++++-
 README.md   | 15 ++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ff58bf374c..c68279a269 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,17 @@
 language: node_js
 node_js:
-    - 6   # node v6, to match jenkins
+    # make sure we work with a range of node versions.
+    # As of the time of writing:
+    #  - 4.x is still in LTS (until April 2018), but some of our deps (notably
+    #    extract-zip) don't work with it
+    #  - 5.x has been EOLed for nearly a year.
+    #  - 6.x is the current 'LTS' version
+    #  - 7.x is the current 'current' version (until October 2017)
+    #
+    # see: https://github.com/nodejs/LTS/
+    - 6.0
+    - 6
+    - 7
 install:
     - scripts/fetch-develop.deps.sh
     - npm install
diff --git a/README.md b/README.md
index 4c5452e146..be3f3a8b4b 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,10 @@ Building From Source
 Riot is a modular webapp built with modern ES6 and requires a npm build system
 to build.
 
-1. Install or update `node.js` so that your `npm` is at least at version `2.0.0`
-1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`
-1. Switch to the riot-web directory: `cd riot-web`
+1. Install or update `node.js` so that your `node` is at least v6.0.0 (and `npm`
+   is at least v3.8.6).
+1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`.
+1. Switch to the riot-web directory: `cd riot-web`.
 1. If you're using the `develop` branch, install the develop versions of the
    dependencies, as the released ones will be too old:
    ```
@@ -65,7 +66,7 @@ to build.
    ```
    Whenever you git pull on riot-web you will also probably need to force an update
    to these dependencies - the simplest way is to re-run the script, but you can also
-   manually update and reuild them:
+   manually update and rebuild them:
    ```
    cd matrix-js-sdk
    git pull
@@ -85,10 +86,10 @@ to build.
    up-to-date.  Or just use https://riot.im/develop - the continuous integration
    release of the develop branch.
    (Note that we don't reference the develop versions in git directly due to
-   https://github.com/npm/npm/issues/3055)
-1. Install the prerequisites: `npm install`
+   https://github.com/npm/npm/issues/3055.)
+1. Install the prerequisites: `npm install`.
 1. Configure the app by copying `config.sample.json` to `config.json` and
-   modifying it (see below for details)
+   modifying it (see below for details).
 1. `npm run dist` to build a tarball to deploy. Untaring this file will give
    a version-specific directory containing all the files that need to go on your
    web server.

From 7e21e00c99e888a48193b99a4b66aa5e94ebb904 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 30 May 2017 16:27:48 +0100
Subject: [PATCH 24/34] Translate src/components/structures

---
 .../structures/CompatibilityPage.js           | 35 +++++++++++++------
 src/components/structures/RightPanel.js       |  4 +--
 src/components/structures/RoomDirectory.js    |  6 ++--
 src/components/structures/SearchBox.js        |  4 +--
 src/i18n/strings/en_EN.json                   |  8 ++++-
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/components/structures/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
index bae33803aa..88b01cb2bb 100644
--- a/src/components/structures/CompatibilityPage.js
+++ b/src/components/structures/CompatibilityPage.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+import { _t, _tJsx } from 'matrix-react-sdk/lib/languageHandler';
 
 module.exports = React.createClass({
     displayName: 'CompatibilityPage',
@@ -39,23 +40,37 @@ module.exports = React.createClass({
         return (
         <div className="mx_CompatibilityPage">
             <div className="mx_CompatibilityPage_box">
-                <p>Sorry, your browser is <b>not</b> able to run Riot.</p>
+                <p>{ _tJsx("Sorry, your browser is <b>not</b> able to run Riot.", /<b>(.*?)<\/b>/, (sub) => <b>{sub}</b>) } </p>
                 <p>
-                Riot uses many advanced browser features, some of which are not
-                available or experimental in your current browser.
+                { _t("Riot uses many advanced browser features, some of which are not available or experimental in your current browser.") }
                 </p>
                 <p>
-                Please install <a href="https://www.google.com/chrome">Chrome</a> or <a href="https://getfirefox.com">Firefox</a> for
-                the best experience. <a href="http://apple.com/safari">Safari</a> and <a href="http://opera.com">Opera</a> work too.
+                { _tJsx('Please install <a href="https://www.google.com/chrome">Chrome</a> or <a href="https://getfirefox.com">Firefox</a> for the best experience.',
+                    [
+                        /<a href="https:\/\/www.google.com\/chrome">(.*?)<\/a>/,
+                        /<a href="https:\/\/getfirefox.com">(.*?)<\/a>/,
+                    ],
+                    [
+                        (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
+                        (sub) => <a href="https://getfirefox.com">{sub}</a>,
+                    ]
+                )}
+                { _tJsx('<a href="http://apple.com/safari">Safari</a> and <a href="http://opera.com">Opera</a> work too.',
+                    [
+                        /<a href="http:\/\/apple\.com\/safari">(.*?)<\/a>/,
+                        /<a href="http:\/\/opera\.com">(.*?)<\/a>/,
+                    ],
+                    [
+                        (sub) => <a href="http://apple.com/safari">{sub}</a>,
+                        (sub) => <a href="http://opera.com">{sub}</a>,
+                    ]
+                )}
                 </p>
                 <p>
-                With your current browser, the look and feel of the application may
-                be completely incorrect, and some or all features may not function.
-                If you want to try it anyway you can continue, but you are on your own
-                in terms of any issues you may encounter!
+                { _t("With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!") }
                 </p>
                 <button onClick={this.onAccept}>
-                    I understand the risks and wish to continue
+                    { _t("I understand the risks and wish to continue") }
                 </button>
             </div>
         </div>
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index c7f5394bf1..b4b82cfaef 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -93,7 +93,7 @@ module.exports = React.createClass({
             var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
             Modal.createDialog(NeedToRegisterDialog, {
                 title: _t('Please Register'),
-                description: _t('Guest users can\'t invite users. Please register to invite') + '.'
+                description: _t('Guest users can\'t invite users. Please register to invite.')
             });
             return;
         }
@@ -218,7 +218,7 @@ module.exports = React.createClass({
                             <TintableSvg src="img/icons-notifications.svg" width="25" height="25"/>
                             { notificationsHighlight }
                         </AccessibleButton>
-                        <div className="mx_RightPanel_headerButton mx_RightPanel_collapsebutton" title="Hide panel" onClick={ this.onCollapseClick }>
+                        <div className="mx_RightPanel_headerButton mx_RightPanel_collapsebutton" title={ _t("Hide panel") } onClick={ this.onCollapseClick }>
                             <TintableSvg src="img/minimise.svg" width="10" height="16"/>
                         </div>
                   </div>;
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index e935084742..257fdbd5cd 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -213,11 +213,11 @@ module.exports = React.createClass({
 
                 var Loader = sdk.getComponent("elements.Spinner");
                 var modal = Modal.createDialog(Loader);
-                var step = _t('remove %(name)s from the directory', {name: name}) + '.';
+                var step = _t('remove %(name)s from the directory.', {name: name});
 
                 MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
                     if (!alias) return;
-                    step = _t('delete the alias') + '.';
+                    step = _t('delete the alias.');
                     return MatrixClientPeg.get().deleteAlias(alias);
                 }).done(() => {
                     modal.close();
@@ -356,7 +356,7 @@ module.exports = React.createClass({
                     var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                     Modal.createDialog(NeedToRegisterDialog, {
                         title: _t('Failed to join the room'),
-                        description: _t('This room is inaccessible to guests. You may be able to join if you register') + '.'
+                        description: _t('This room is inaccessible to guests. You may be able to join if you register.')
                     });
                     return;
                 }
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index faee0b5f71..99c4486690 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -100,13 +100,13 @@ module.exports = React.createClass({
         if (this.props.collapsed) {
             toggleCollapse =
                 <AccessibleButton className="mx_SearchBox_maximise" tabIndex={collapseTabIndex} onClick={ this.onToggleCollapse.bind(this, true) }>
-                    <TintableSvg src="img/maximise.svg" width="10" height="16" alt="Expand panel"/>
+                    <TintableSvg src="img/maximise.svg" width="10" height="16" alt={ _t("Expand panel") }/>
                 </AccessibleButton>
         }
         else {
             toggleCollapse =
                 <AccessibleButton className="mx_SearchBox_minimise" tabIndex={collapseTabIndex} onClick={ this.onToggleCollapse.bind(this, false) }>
-                    <TintableSvg src="img/minimise.svg" width="10" height="16" alt="Collapse panel"/>
+                    <TintableSvg src="img/minimise.svg" width="10" height="16" alt={ _t("Collapse panel") }/>
                 </AccessibleButton>
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 039f5b76d3..7f1b8bf4c5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,4 +1,5 @@
 {
+  "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.",
   "Add an email address above to configure email notifications": "Add an email address above to configure email notifications",
   "Advanced notification settings": "Advanced notification settings",
   "All messages": "All messages",
@@ -48,6 +49,7 @@
   " from room": " from room",
   "Guests can join": "Guests can join",
   "Guest users can't invite users. Please register to invite": "Guest users can't invite users. Please register to invite",
+  "I understand the risks and wish to continue": "I understand the risks and wish to continue",
   "Invite to this room": "Invite to this room",
   "Keywords": "Keywords",
   "Leave": "Leave",
@@ -72,6 +74,7 @@
   "On": "On",
   "Operation failed": "Operation failed",
   "Permalink": "Permalink",
+  "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.",
   "Please Register": "Please Register",
   "powered by Matrix": "powered by Matrix",
   "Quote": "Quote",
@@ -83,11 +86,13 @@
   "Remove from Directory": "Remove from Directory",
   "Resend": "Resend",
   "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
+  "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
   "Room directory": "Room directory",
   "Room not found": "Room not found",
   "Search for a room": "Search for a room",
   "Settings": "Settings",
   "Source URL": "Source URL",
+  "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
   "Start chat": "Start chat",
   "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
   "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
@@ -118,5 +123,6 @@
   "Saturday": "Saturday",
   "Today": "Today",
   "Yesterday": "Yesterday",
-  "Welcome page": "Welcome page"
+  "Welcome page": "Welcome page",
+  "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!"
 }

From 1b4444cc73ef78de69c20bf96f2bffb1f991d251 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 30 May 2017 16:30:56 +0100
Subject: [PATCH 25/34] Add missing translations

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7f1b8bf4c5..4f3467ae0b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -10,6 +10,7 @@
   "Cancel Sending": "Cancel Sending",
   "Can't update user notification settings": "Can't update user notification settings",
   "Close": "Close",
+  "Collapse panel": "Collapse panel",
   "Create new room": "Create new room",
   "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
   "Custom Server Options": "Custom Server Options",
@@ -30,6 +31,7 @@
   "Error": "Error",
   "Error saving email notification preferences": "Error saving email notification preferences",
   "#example": "#example",
+  "Expand panel": "Expand panel",
   "Failed to": "Failed to",
   "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
   "Failed to change settings": "Failed to change settings",

From 3f04a4222996c48d89c94863f938bace1e6c0508 Mon Sep 17 00:00:00 2001
From: turt2live <travpc@gmail.com>
Date: Tue, 30 May 2017 09:32:27 -0600
Subject: [PATCH 26/34] Smaller font size on timestamp to better fit in the
 available space

Part of addressing vector-im/riot-web#4046

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

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index 9d970ad454..d853f9396f 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -62,7 +62,7 @@ limitations under the License.
     visibility: hidden;
     white-space: nowrap;
     color: $event-timestamp-color;
-    font-size: 11px;
+    font-size: 10px;
     left: 8px;
     position: absolute;
 }

From 2a122a25faf0fd67574cfc5394f4bc5ce5c6c6ef Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 30 May 2017 17:39:41 +0100
Subject: [PATCH 27/34] Translate notification strings

---
 src/components/views/settings/Notifications.js | 18 ++++++++++++++----
 src/i18n/strings/en_EN.json                    |  1 +
 .../VectorPushRulesDefinitions.js              | 14 +++++++-------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 74b9c24a74..1b8de52d9d 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 'use strict';
 var React = require('react');
-import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import { _t, _tJsx } from 'matrix-react-sdk/lib/languageHandler';
 var q = require("q");
 var sdk = require('matrix-react-sdk');
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
@@ -535,7 +535,16 @@ module.exports = React.createClass({
                     // it corresponds to all content push rules (stored in self.state.vectorContentRule)
                     self.state.vectorPushRules.push({
                         "vectorRuleId": "_keywords",
-                        "description" : (<span>Messages containing <span className="mx_UserNotifSettings_keywords" onClick={ self.onKeywordsClicked }>keywords</span></span>),
+                        "description" : (
+                            <span>
+                            { _tJsx('Messages containing <span>keywords</span>',
+                                /<span>(.*?)<\/span>/,
+                                (sub) => {
+                                    return <span className="mx_UserNotifSettings_keywords" onClick={ self.onKeywordsClicked }>{sub}</span>;
+                                }
+                            )}
+                            </span>
+                        ),
                         "vectorState": self.state.vectorContentRules.vectorState
                     });
                 }
@@ -549,7 +558,7 @@ module.exports = React.createClass({
 
                     self.state.vectorPushRules.push({
                         "vectorRuleId": vectorRuleId,
-                        "description" : ruleDefinition.description,
+                        "description" : _t(ruleDefinition.description), // Text from VectorPushRulesDefinitions.js
                         "rule": rule,
                         "vectorState": vectorState,
                     });
@@ -590,6 +599,7 @@ module.exports = React.createClass({
                 phase: self.phases.DISPLAY
             });
         }, function(error) {
+            console.error(error);
             self.setState({
                 phase: self.phases.ERROR
             });
@@ -624,7 +634,7 @@ module.exports = React.createClass({
         return (
             <tr key={ className }>
                 <th>
-                    {title}
+                    { title }
                 </th>
 
                 <th>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4f3467ae0b..adf0800d3e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -59,6 +59,7 @@
   "Members": "Members",
   "Mentions only": "Mentions only",
   "Messages containing my display name": "Messages containing my display name",
+  "Messages containing <span>keywords</span>": "Messages containing <span>keywords</span>",
   "Messages containing my user name": "Messages containing my user name",
   "Messages in group chats": "Messages in group chats",
   "Messages in one-to-one chats": "Messages in one-to-one chats",
diff --git a/src/notifications/VectorPushRulesDefinitions.js b/src/notifications/VectorPushRulesDefinitions.js
index d696451d56..df6db6c354 100644
--- a/src/notifications/VectorPushRulesDefinitions.js
+++ b/src/notifications/VectorPushRulesDefinitions.js
@@ -65,7 +65,7 @@ module.exports = {
     // Messages containing user's display name
     ".m.rule.contains_display_name": new VectorPushRuleDefinition({
         kind: "override",
-        description: "Messages containing my display name",
+        description: "Messages containing my display name", // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
@@ -76,7 +76,7 @@ module.exports = {
     // Messages containing user's username (localpart/MXID)
     ".m.rule.contains_user_name": new VectorPushRuleDefinition({
         kind: "override",
-        description: "Messages containing my user name",
+        description: "Messages containing my user name", // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
@@ -87,7 +87,7 @@ module.exports = {
     // Messages just sent to the user in a 1:1 room
     ".m.rule.room_one_to_one": new VectorPushRuleDefinition({
         kind: "underride",
-        description: "Messages in one-to-one chats",
+        description: "Messages in one-to-one chats", // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
@@ -100,7 +100,7 @@ module.exports = {
     // By opposition, all other room messages are from group chat rooms.
     ".m.rule.message": new VectorPushRuleDefinition({
         kind: "underride",
-        description: "Messages in group chats",
+        description: "Messages in group chats", // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
@@ -111,7 +111,7 @@ module.exports = {
     // Invitation for the user
     ".m.rule.invite_for_me": new VectorPushRuleDefinition({
         kind: "underride",
-        description: "When I'm invited to a room",
+        description: "When I'm invited to a room", // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
@@ -122,7 +122,7 @@ module.exports = {
     // Incoming call
     ".m.rule.call": new VectorPushRuleDefinition({
         kind: "underride",
-        description: "Call invitation",
+        description: "Call invitation", // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_NOTIFY_RING_SOUND,
@@ -133,7 +133,7 @@ module.exports = {
     // Notifications from bots
     ".m.rule.suppress_notices": new VectorPushRuleDefinition({
         kind: "override",
-        description: "Messages sent by bot",
+        description: "Messages sent by bot", // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             // .m.rule.suppress_notices is a "negative" rule, we have to invert its enabled value for vector UI
             on: StandardActions.ACTION_DISABLED,

From 88edd1620c5bc86e3f477c5251729e18caff2ff2 Mon Sep 17 00:00:00 2001
From: RiotTranslate <info@nordgedanken.de>
Date: Tue, 30 May 2017 19:09:39 +0200
Subject: [PATCH 28/34] Update from Weblate. (#4083)

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 99.1% (119 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f9deef5b32..a26f352eb1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -10,9 +10,9 @@
     "Room directory": "Raum-Verzeichnis",
     "Create new room": "Neuen Raum erstellen",
     "Settings": "Einstellungen",
-    "powered by Matrix": "basierend auf Matrix",
-    "Custom Server Options": "Optionen für eigenen Server",
-    "Dismiss": "ausblenden",
+    "powered by Matrix": "betrieben mit Matrix",
+    "Custom Server Options": "Erweiterte Server-Optionen",
+    "Dismiss": "Ablehnen",
     "Failed to get protocol list from Home Server": "Fehler beim Abrufen der Protokoll-Liste vom Home-Server",
     "The Home Server may be too old to support third party networks": "Der Home-Server ist eventuell zu alt, um Drittanbieter-Netzwerke zu unterstützen",
     "Directory": "Raum Verzeichnis",
@@ -45,7 +45,7 @@
     "Failed to add tag ": "Konnte Tag nicht hinzufügen ",
     "Failed to change settings": "Einstellungen konnten nicht geändert werden",
     "Failed to update keywords": "Konnte Suchbegriff nicht aktualisieren",
-    "Failed to get public room list": "Konnte keine öffentliche Raumliste laden",
+    "Failed to get public room list": "Die Liste der öffentlichen Räume konnte nicht geladen werden",
     "Failed to join the room": "Fehler beim Betreten des Raumes",
     "Failed to remove tag ": "Konnte Tag nicht entfernen ",
     "Failed to set Direct Message status of room": "Konnte den direkten Benachrichtigungsstatus nicht setzen",
@@ -54,7 +54,7 @@
     "Forget": "Lösche",
     "from the directory": "aus dem Verzeichnis",
     " from room": " aus dem Raum",
-    "Guest users can't invite users. Please register to invite": "Gastnutzer können keine Nutzer einladen. Bitte registriere dich um Nutzer einzuladen",
+    "Guest users can't invite users. Please register to invite": "Gastnutzer können keine Nutzer einladen. Bitte registriere dich, um Nutzer einzuladen",
     "Keywords": "Schlüsselwörter",
     "Leave": "Verlassen",
     "Low Priority": "Niedrige Priorität",
@@ -99,7 +99,7 @@
     "Redact": "Redaktionell entfernen",
     "Remove %(name)s from the directory?": "Soll der Raum %(name)s  aus dem Verzeichnis entfernt werden?",
     "remove %(name)s from the directory": "entferne %(name)s aus dem Verzeichnis",
-    "Resend": "Erneut Senden",
+    "Resend": "Erneut senden",
     "Source URL": "Quell-URL",
     "Unable to look up room ID from server": "Es ist nicht möglich, die Raum-ID auf dem Server nachzuschlagen",
     "Unhide Preview": "Vorschau wieder anzeigen",

From 045c32bd2e3ee4c2ccd2b9802ed50457325a9e58 Mon Sep 17 00:00:00 2001
From: RiotTranslate <info@nordgedanken.de>
Date: Tue, 30 May 2017 19:48:06 +0200
Subject: [PATCH 29/34] Update from Weblate. (#4089)

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 99.1% (119 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a26f352eb1..c13504a43b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -23,7 +23,7 @@
     "Guests can join": "Gäste können beitreten",
     "You are not receiving desktop notifications": "Du erhältst keine Desktop-Benachrichtigungen",
     "Enable them now": "Aktiviere diese jetzt",
-    "Add an email address above to configure email notifications": "Füge eine E-Mail Adresse hinzu um Benachrichtigungen via E-Mail zu erhalten",
+    "Add an email address above to configure email notifications": "Füge oben eine E-Mail-Adresse hinzu, um die E-Mail-Benachrichtigungseinstellungen zu konfigurieren",
     "All notifications are currently disabled for all targets.": "Im Moment sind alle Benachrichtigungen für alle Ziele deaktiviert.",
     "An error occurred whilst saving your email notification preferences.": "Beim Speichern deiner E-Mail-Benachrichtigungseinstellungen ist ein Fehler aufgetreten.",
     "and remove": "und entfernen",
@@ -72,7 +72,7 @@
     "There are advanced notifications which are not shown here": "Es existieren erweiterte Benachrichtigungen, welche hier nicht angezeigt werden",
     "The server may be unavailable or overloaded": "Der Server ist vermutlich nicht erreichbar oder überlastet",
     "This room is inaccessible to guests. You may be able to join if you register": "Dieser Raum ist nicht verfügbar für Gäste. Vermutlich klappt es wenn du dich anmeldest",
-    "Unable to fetch notification target list": "Nicht möglich die Zielliste für Benachrichtigungen zu erhalten",
+    "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden",
     "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten",
     "unknown error code": "Unbekannter Fehlercode",
     "Unnamed room": "Unbenannter Raum",

From 676bd6196f486be71016a11b7ffb3ac84637291e Mon Sep 17 00:00:00 2001
From: turt2live <travpc@gmail.com>
Date: Tue, 30 May 2017 13:07:49 -0600
Subject: [PATCH 30/34] Show 12hr time on hover too

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/messages/MessageTimestamp.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index dacfad925a..586ca94cc8 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 'use strict';
 
-import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
 const React = require('react');
 const DateUtils = require('matrix-react-sdk/lib/DateUtils');
 
@@ -30,7 +29,7 @@ module.exports = React.createClass({
     render: function() {
         const date = new Date(this.props.ts);
         return (
-            <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
+            <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
                 { DateUtils.formatTime(date, this.props.showTwelveHour) }
             </span>
         );

From e79df6a947ef56533138a6f001abbe0c84a567dd Mon Sep 17 00:00:00 2001
From: RiotTranslate <info@nordgedanken.de>
Date: Tue, 30 May 2017 21:14:23 +0200
Subject: [PATCH 31/34] Update from Weblate. (#4091)

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 99.1% (119 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c13504a43b..32d0f81510 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -37,7 +37,7 @@
     "Enable desktop notifications": "Desktop-Benachrichtigungen aktivieren",
     "Enable email notifications": "Aktiviere E-Mail Benachrichtigungen",
     "Enable notifications for this account": "Aktiviere Benachrichtigungen für diesen Benutzer",
-    "Enter keywords separated by a comma:": "Kommagetrennte Schlagworte eingeben:",
+    "Enter keywords separated by a comma:": "Schlagworte kommagetrennt eingeben:",
     "Error": "Fehler",
     "Error saving email notification preferences": "Fehler beim Speichern der E-Mail-Benachrichtigungseinstellungen",
     "#example": "#Beispiel",

From 020d496cb129c298e4896c84cdda3e2e60cbad5b Mon Sep 17 00:00:00 2001
From: RiotTranslate <info@nordgedanken.de>
Date: Wed, 31 May 2017 01:38:30 +0200
Subject: [PATCH 32/34] Update from Weblate. (#4094)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 99.1% (119 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

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

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (128 of 128 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 92.9% (119 of 128 strings)

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

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 87.5% (112 of 128 strings)

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

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (129 of 129 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (129 of 129 strings)

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

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 94.5% (122 of 129 strings)

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

* Translated using Weblate (French)

Currently translated at 93.0% (120 of 129 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/fr/
---
 src/i18n/strings/de_DE.json |  11 +++-
 src/i18n/strings/fr.json    |   4 +-
 src/i18n/strings/hu.json    |  65 +++++++++++++++++++-
 src/i18n/strings/nb_NO.json | 114 +++++++++++++++++++++++++++++++++++-
 src/i18n/strings/pt_BR.json |   6 +-
 5 files changed, 192 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 32d0f81510..f3e19ae9c0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -127,5 +127,14 @@
     "Messages sent by bot": "Nachrichten von Bots",
     "more": "mehr",
     "When I'm invited to a room": "Wenn ich in einen Raum eingeladen werde",
-    "customServer_text": "Du kannst die erweiterten Server-Optionen nutzen, um dich auf anderen Matrix-Servern anzumelden, indem du eine andere Heimserver-URL eingibst. <br/>Dies ermöglicht es dir, Riot mit einem bereits existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.<br/><br/>Du kannst auch einen benutzerdefinierten Identitäts-Server eingeben, allerdings wirst du dann nicht in der Lage sein, andere Benutzer per E-Mail-Adresse einzuladen oder selbst Einladungen per E-Mail-Adresse zu erhalten."
+    "customServer_text": "Du kannst die erweiterten Server-Optionen nutzen, um dich auf anderen Matrix-Servern anzumelden, indem du eine andere Heimserver-URL eingibst. <br/>Dies ermöglicht es dir, Riot mit einem bereits existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.<br/><br/>Du kannst auch einen benutzerdefinierten Identitäts-Server eingeben, allerdings wirst du dann nicht in der Lage sein, andere Benutzer per E-Mail-Adresse einzuladen oder selbst Einladungen per E-Mail-Adresse zu erhalten.",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> und <a href=\"http://opera.com\">Opera</a> funktionieren ebenfalls.",
+    "I understand the risks and wish to continue": "Ich verstehe das Risiko und möchte fortfahren",
+    "Messages containing <span>keywords</span>": "Nachrichten, die definierte <span>Schlagworte</span> enthalten",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Bitte installiere <a href=\"https://www.google.com/chrome\">Chrome</a> oder <a href=\"https://getfirefox.com\">Firefox</a> für die beste Erfahrung.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot nutzt manche erweiterten Browser-Funktionen - manche sind deinem aktuellen Browser nicht verfügbar oder im experimentellen Status.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Es tut uns leid, aber dein Browser kann Riot <b>nicht</b> ausführen.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "In deinem aktuellen Browser kann das Aussehen und Gefühl der Anwendung komplett inkorrekt sein und einige oder alle Funktionen funktionieren evtl. nicht. Du kannst es trotzdem versuchen und fortfahren, aber du bist alleine mit allen Problemen auf die du stößt!",
+    "Expand panel": "Panel ausklappen",
+    "Collapse panel": "Panel einklappen"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 08d578a55c..55c0671bbe 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -9,12 +9,12 @@
     "Close": "Fermer",
     "Create new room": "Créer un nouveau salon",
     "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix",
-    "Custom Server Options": "Options de Serveur Personnalisé",
+    "Custom Server Options": "Options de serveur personnalisées",
     "delete the alias": "Supprimer l'alias",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?",
     "Direct Chat": "Conversation Directe",
     "Directory": "Répertoire",
-    "Dismiss": "Rejeter",
+    "Dismiss": "Ignorer",
     "Download this file": "Télécharger ce fichier",
     "Drop here %(toAction)s": "Déposer ici pour %(toAction)s",
     "Enable audible notifications in web client": "Activer les notifications sonores pour le client web",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 09fa3df9e0..5417bfda06 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -64,5 +64,68 @@
     "Noisy": "Hangos",
     "Notification targets": "Értesítések célpontja",
     "Notifications": "Értesítések",
-    "Notify for all other messages/rooms": "Értesítés minden más üzenethez/szobához"
+    "Notify for all other messages/rooms": "Értesítés minden más üzenethez/szobához",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a>val és <a href=\"http://opera.com\">Opera</a>val is működik.",
+    "Collapse panel": "Panel bezárása",
+    "customServer_text": "Egyedi Matrix szervert használhatsz a Saját szerver URL beállításával.<br/> Ezzel meglévő Matrix fiókot használhatsz Riot klienssel és egyedi szerverrel.<br/><br/>Beállíthatsz egyedi \"identity\" szervert de akkor nem tudsz e-maillel meghívni felhasználót és téged sem tudnak meghívni e-maillel.",
+    "Expand panel": "Panel kinyitása",
+    "I understand the risks and wish to continue": "Megértettem a kockázatot és folytatom",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "A kulcsszavakhoz tartozó értesítések olyan szabályokat követnek amiket nem lehet itt megjeleníteni:",
+    "Notify me for anything else": "Értesíts minden egyéb esetben",
+    "Off": "Ki",
+    "On": "Be",
+    "Operation failed": "Művelet sikertelen",
+    "Permalink": "Állandó hivatkozás",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "A legjobb élmény érdekében telepíts <a href=\"https://www.google.com/chrome\">Chrome</a>ot vagy <a href=\"https://getfirefox.com\">Firefox</a>ot.",
+    "Please Register": "Regisztrálj",
+    "powered by Matrix": "Matrixon alapul",
+    "Quote": "Idézet",
+    "Redact": "Szerkeszt",
+    "Reject": "Elutasít",
+    "Remove %(name)s from the directory?": "Törlöd a %(name)s szobát a listából?",
+    "Remove": "Töröl",
+    "remove %(name)s from the directory": "%(name)s szoba törlése a listából",
+    "Remove from Directory": "Törlés a szobák listájából",
+    "Resend": "Újraküld",
+    "Riot does not know how to join a room on this network": "Riot nem tudja, hogy csatlakozzon ehhez a szobához ezen a hálózaton",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot sok haladó képességét használja a böngészőnek amik közül lehet, hogy nem mind érhető el a most használt böngészőben vagy még csak kísérleti jellegű.",
+    "Room directory": "Szobák listája",
+    "Room not found": "A szoba nem található",
+    "Search for a room": "Szoba keresése",
+    "Settings": "Beállítások",
+    "Source URL": "Forrás URL",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Elnézést, a böngésződ <b>nem</b> képes futtatni a Riotot.",
+    "Start chat": "Csevegés indítása",
+    "The Home Server may be too old to support third party networks": "A Saját szerver lehet, hogy túl régi ahhoz, hogy más hálózatokhoz tudjon kapcsolódni",
+    "There are advanced notifications which are not shown here": "Vannak haladó értesítések amik itt nincsenek megjelenítve",
+    "The server may be unavailable or overloaded": "A szerver nem érhető el vagy túl van terhelve",
+    "This room is inaccessible to guests. You may be able to join if you register": "A szoba vendégek számára elérhetetlen. Csak regisztráció után tudsz csatlakozni",
+    " to room": " szobába",
+    "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját",
+    "Unable to join network": "Nem sikerült kapcsolódni a hálózathoz",
+    "Unable to look up room ID from server": "Nem lehet lekérdezni a szoba ID-ját a szervertől",
+    "Unhide Preview": "Előkép felfedése",
+    "unknown error code": "ismeretlen hiba kód",
+    "Unnamed room": "Név nélküli szoba",
+    "Uploaded on %(date)s by %(user)s": "Feltöltés: %(date)s, %(user)s",
+    "View Decrypted Source": "Visszafejtett forrás megjelenítése",
+    "View Source": "Forrás megjelenítése",
+    "When I'm invited to a room": "Amikor meghívtak a szobába",
+    "World readable": "Mindenki olvashatja",
+    "You cannot delete this image. (%(code)s)": "Nem törölheted ezt a képet. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Nem törölheted ezt az üzenetet. (%(code)s)",
+    "You are not receiving desktop notifications": "Nem fogadsz asztali értesítéseket",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Valószínűleg Riottól eltérő klienssel állítottad be. Riotból nem állítható de érvényben van",
+    "Sunday": "Vasárnap",
+    "Monday": "Hétfő",
+    "Tuesday": "Kedd",
+    "Wednesday": "Szerda",
+    "Thursday": "Csütörtök",
+    "Friday": "Péntek",
+    "Saturday": "Szombat",
+    "Today": "Ma",
+    "Yesterday": "Tegnap",
+    "Welcome page": "Üdvözlő oldal",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "A jelenlegi bőngésződdel teljesen hibás lehet az alkalmazás kinézete és bizonyos funkciók, ha nem az összes, nem fog működni. Ha mindenképpen ki akarod próbálni, folytathatod de egyedül vagy minden felbukkanó problémával!",
+    "Messages containing <span>keywords</span>": "Az üzenet <span>kulcsszavakat</span> tartalmaz"
 }
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index ed503025b3..673c3f2c99 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -9,5 +9,117 @@
     "Can't update user notification settings": "Kan ikke oppdatere brukervarsel innstillinger",
     "Close": "Lukk",
     "Create new room": "Opprett nytt rom",
-    "Couldn't find a matching Matrix room": "Kunne ikke finne et samsvarende Matrix rom"
+    "Couldn't find a matching Matrix room": "Kunne ikke finne et samsvarende Matrix rom",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> og <a href=\"http://opera.com\">Opera</a> fungerer også.",
+    "Call invitation": "Anropsinvitasjon",
+    "Collapse panel": "Skjul panel",
+    "Custom Server Options": "Tilpassede serveralternativer",
+    "customServer_text": "Du kan benytte de egendefinerte serveralternativene til å logge deg på andre Matrix-servere ved å spesifisere en annen Hjemmeserver-URL.<br/>Dette lar deg benytte Riot med en eksisterende Matrix konto på en annen hjemmeserver.<br/><br/>Du kan også angi en egendefinert identitetsserver, men du vil ikke kunne invitere brukere via e-post, eller bli invitert via e-post selv.",
+    "delete the alias": "Slett aliaset",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slett rom alias %(alias)s og fjern %(name)s fra katalogen?",
+    "Direct Chat": "Direkte Chat",
+    "Directory": "Katalog",
+    "Download this file": "Last ned filen",
+    "Drop here %(toAction)s": "Dra hit %(toAction)s",
+    "Enable audible notifications in web client": "Aktiver lyd-varsel i webklient",
+    "Enable desktop notifications": "Aktiver skrivebordsvarsler",
+    "Enable email notifications": "Aktiver e-postvarsler",
+    "Enable notifications for this account": "Aktiver varsler for denne konto",
+    "Enable them now": "Aktiver dem nå",
+    "Enter keywords separated by a comma:": "Angi nøkkelord adskilt med komma:",
+    "Error": "Feil",
+    "Error saving email notification preferences": "Feil ved lagring av e-postvarselinnstillinger",
+    "#example": "#eksempel",
+    "Expand panel": "Utvid panel",
+    "Failed to": "Feilet å",
+    "Failed to add tag %(tagName)s to room": "Kunne ikke legge til tagg %(tagName)s til rom",
+    "Failed to change settings": "Kunne ikke endre innstillingene",
+    "Failed to forget room %(errCode)s": "Kunne ikke glemme rommet %(errCode)s",
+    "Failed to update keywords": "Kunne ikke oppdatere nøkkelord",
+    "Failed to get protocol list from Home Server": "Kunne ikke hente protokolliste fra Hjemme-Server",
+    "Failed to get public room list": "Kunne ikke hente offentlig romliste",
+    "Failed to join the room": "Kunne ikke bli med på rommet",
+    "Failed to remove tag %(tagName)s from room": "Kunne ikke fjerne tagg %(tagName)s fra rommet",
+    "Failed to set direct chat tag": "Kunne ikke angi direkte chat-tagg",
+    "Failed to set Direct Message status of room": "Kunne ikke angi status for direkte melding i rommet",
+    "Favourite": "Favoritt",
+    "Fetching third party location failed": "Kunne ikke hente tredjeparts lokalisering",
+    "Files": "Filer",
+    "Filter room names": "Filtrer romnavn",
+    "Forget": "Glem",
+    " from room": " fra rommet",
+    "Guests can join": "Gjester kan bli med",
+    "Guest users can't invite users. Please register to invite": "Gjester kan ikke invitere brukere. Vennligst registrer deg for å invitere",
+    "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker å fortsette",
+    "Invite to this room": "Inviter til dette rommet",
+    "Keywords": "Nøkkelord",
+    "Leave": "Forlat",
+    "Low Priority": "Lav Prioritet",
+    "Members": "Medlemmer",
+    "Messages containing my display name": "Meldinger som inneholder mitt visningsnavn",
+    "Messages containing my user name": "Meldinger som inneholder mitt brukernavn",
+    "Messages in group chats": "Meldinger i gruppesamtaler",
+    "Messages in one-to-one chats": "Meldinger i en-til-en samtaler",
+    "Messages sent by bot": "Meldinger sendt av bot",
+    "more": "mer",
+    "No rooms to show": "Ingen rom å vise",
+    "Noisy": "Bråkete",
+    "Notification targets": "Mål for varsel",
+    "Notifications": "Varsler",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Varsler på de følgende nøkkelordene følger regler som ikke kan vises her:",
+    "Notify for all other messages/rooms": "Varsler om alle andre meldinger/rom",
+    "Notify me for anything else": "Varsle meg om alt annet",
+    "Off": "Av",
+    "On": "På",
+    "Permalink": "Permanent lenke",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Vennligst installer <a href=\"https://www.google.com/chrome\">Chrome</a> eller <a href=\"https://getfirefox.com\">Firefox</a> for den beste opplevelsen.",
+    "Please Register": "Vennligst registrer deg",
+    "powered by Matrix": "benytter seg av Matrix",
+    "Quote": "Sitat",
+    "Redact": "Maskere",
+    "Reject": "Avvis",
+    "Remove %(name)s from the directory?": "Fjern %(name)s fra katalogen?",
+    "Remove": "Fjern",
+    "remove %(name)s from the directory": "fjern %(name)s fra katalogen",
+    "Remove from Directory": "Fjern fra katalogen",
+    "Resend": "Send på nytt",
+    "Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot benytter mange avanserte nettleserfunksjoner, og noen av disse er ikke tilgjengelige eller er eksperimentelle på din nåværende nettleser.",
+    "Room directory": "Rom katalog",
+    "Room not found": "Rommet ble ikke funnet",
+    "Search for a room": "Søk etter et rom",
+    "Settings": "Innstillinger",
+    "Source URL": "Kilde URL",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Beklager, din nettleser er <b>ikke</b> i stand til å kjøre Riot.",
+    "Start chat": "Start chat",
+    "The Home Server may be too old to support third party networks": "Hjemme-serveren kan være for gammel til å støtte tredjeparts-nettverk",
+    "There are advanced notifications which are not shown here": "Det er avanserte varsler som ikke vises her",
+    "The server may be unavailable or overloaded": "Serveren kan være utilgjengelig eller overbelastet",
+    "This room is inaccessible to guests. You may be able to join if you register": "Dette rommet er ikke tilgjengelig for gjester. Du kan kanskje komme inn om du registrerer deg",
+    " to room": " til rom",
+    "Unable to fetch notification target list": "Kunne ikke hente varsel-mål liste",
+    "Unable to join network": "Kunne ikke bli med i nettverket",
+    "Unable to look up room ID from server": "Kunne ikke slå opp rom-ID fra serveren",
+    "Unhide Preview": "Vis forhåndsvisning",
+    "unknown error code": "ukjent feilkode",
+    "Unnamed room": "Rom uten navn",
+    "Uploaded on %(date)s by %(user)s": "Lastet opp den %(date)s av %(user)s",
+    "View Decrypted Source": "Vis dekryptert kilde",
+    "View Source": "Vis kilde",
+    "When I'm invited to a room": "Når jeg blir invitert til et rom",
+    "World readable": "Verden lesbar",
+    "You cannot delete this image. (%(code)s)": "Du kan ikke slette dette bildet. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Du kan ikke slette denne meldingen. (%(code)s)",
+    "You are not receiving desktop notifications": "Du mottar ikke skrivebords varsler",
+    "Messages containing <span>keywords</span>": "Meldinger som inneholder <span>nøkkelord</span>",
+    "Sunday": "Søndag",
+    "Monday": "Mandag",
+    "Tuesday": "Tirsdag",
+    "Wednesday": "Onsdag",
+    "Thursday": "Torsdag",
+    "Friday": "Fredag",
+    "Saturday": "Lørdag",
+    "Today": "I dag",
+    "Yesterday": "I går",
+    "Welcome page": "Velkomst side"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 7687d4c4c6..3bfb0f0a63 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -9,12 +9,12 @@
     "Close": "Fechar",
     "Create new room": "Criar nova sala",
     "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
-    "Custom Server Options": "Opções de personalização do servidor",
+    "Custom Server Options": "Opções para Servidor Personalizado",
     "delete the alias": "apagar o apelido da sala",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
     "Direct Chat": "Conversa pessoal",
     "Directory": "Diretório",
-    "Dismiss": "Encerrar",
+    "Dismiss": "Descartar",
     "Download this file": "Baixar este arquivo",
     "Drop here %(toAction)s": "Arraste aqui para %(toAction)s",
     "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
@@ -70,7 +70,7 @@
     "Operation failed": "A operação falhou",
     "Permalink": "Link permanente",
     "Please Register": "Por favor, cadastre-se",
-    "powered by Matrix": "distribuído por Matrix",
+    "powered by Matrix": "rodando a partir do Matrix",
     "Quote": "Citar",
     "Redact": "Remover",
     "Reject": "Rejeitar",

From 0e742cec277ff3aa708ecaf4028627b3350a74ae Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Wed, 31 May 2017 15:37:30 +0100
Subject: [PATCH 33/34] scripts/fetch-develop.deps.sh: set -e (#4120)

... so that when the git clone fails, it doesn't plough on regardless.
---
 scripts/fetch-develop.deps.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
index bbbc834152..29309f2117 100755
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -6,6 +6,8 @@
 # the branch the current checkout is on, use that branch. Otherwise,
 # use develop.
 
+set -e
+
 # Look in the many different CI env vars for which branch we're
 # building
 if [[ "$TRAVIS" == true ]]; then

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

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

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