Merge branch 'develop' of https://github.com/vector-im/riot-web into develop

Conflicts:
	src/i18n/strings/eo.json
This commit is contained in:
Weblate 2018-02-01 10:24:21 +00:00
commit a6155c98ec
47 changed files with 261 additions and 131 deletions

View file

@ -135,7 +135,7 @@
"You have successfully set a password and an email address!": "¡Has establecido una nueva contraseña y dirección de correo electrónico!",
"You have successfully set a password!": "¡Has establecido una nueva contraseña!",
"%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s en %(osName)s",
"All messages (loud)": "Todos los mensajes (ruidoso)",
"All messages (noisy)": "Todos los mensajes (ruidoso)",
"All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas para todos los objetivos.",
"Collecting app version information": "Recolectando información de la versión de la aplicación",
"Collecting logs": "Recolectando registros",