Merge branches 'develop' and 't3chguy/i18n-1' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n-1

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/nl.json
#	src/i18n/strings/zh_Hans.json

src/i18n/strings/es.json

@@ -38,7 +38,7 @@
     "Banned users": "Usuarios bloqueados",
     "Bans user with given id": "Bloquear usuario por ID",
     "Blacklisted": "En lista negra",
-    "Bug Report": "Reporte de error",
+    "Bug Report": "Reporte de fallo",
     "Bulk Options": "Opciones masivas",
     "Call Timeout": "Tiempo de espera de la llamada",
     "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "No se puede conectar con el servidor - Por favor verifique su conexión y asegúrese de que su <a>certificado SSL del servidor</a> sea confiable.",
@@ -124,7 +124,7 @@
     "Failed to delete device": "Falló al borrar el dispositivo",
     "Failed to forget room %(errCode)s": "Falló al olvidar la sala %(errCode)s",
     "Failed to join room": "Falló al unirse a la sala",
-    "Failed to join the room": "Falló al unirse a la sala",
+    "Failed to join the room": "Error al unirse a la sala",
     "Failed to kick": "Falló al expulsar",
     "Failed to leave room": "Falló al dejar la sala",
     "Failed to load timeline position": "Falló al cargar el historico",