Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop

Conflicts:
	src/i18n/strings/en_EN.json
	src/i18n/strings/fr.json
	src/i18n/strings/ru.json

src/i18n/strings/fr.json

@@ -188,11 +188,13 @@
     "%(items)s and %(remaining)s others": "%(items)s et %(remaining)s autres",
     "%(items)s and one other": "%(items)s et un autre",
     "%(items)s and %(lastItem)s": "%(items)s et %(lastItem)s",
-    "and %(overflowCount)s others...": "et %(overflowCount)s autres...",
-    "and one other...": "et un autre...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s et %(lastPerson)s sont en train d'écrire",
     "%(names)s and one other are typing": "%(names)s et un autre sont en train d'écrire",
     "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train d'écrire",
+    "and %(count)s others...": {
+        "other": "et %(count)s autres...",
+        "one": "et un autre..."
+    },
     "An email has been sent to": "Un e-mail a été envoyé à",
     "A new password must be entered.": "Un nouveau mot de passe doit être entré.",
     "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les visiteurs",
@@ -520,7 +522,6 @@
     "Unable to load device list": "Impossible de charger la liste d'appareils",
     "Unencrypted room": "Salon non chiffré",
     "unencrypted": "non chiffré",
-    "Unknown command": "Commande inconnue",
     "unknown device": "appareil inconnu",
     "Unknown room %(roomId)s": "Salon inconnu %(roomId)s",
     "unknown": "inconnu",