Merge branch 'develop' into travis/pl_enhancements

This commit is contained in:
Travis Ralston
2017-10-11 08:42:45 -06:00
53 changed files with 815 additions and 270 deletions

View File

@@ -379,7 +379,7 @@
"Moderator": "Moderador",
"Must be viewing a room": "Debe estar viendo una sala",
"Mute": "Silenciar",
"my Matrix ID": "Mi ID de Matrix",
"%(serverName)s Matrix ID": "%(serverName)s ID de Matrix",
"Name": "Nombre",
"Never send encrypted messages to unverified devices from this device": "No enviar nunca mensajes cifrados, desde este dispositivo, a dispositivos sin verificar",
"Never send encrypted messages to unverified devices in this room": "No enviar nunca mensajes cifrados a dispositivos no verificados, en esta sala",