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 @@
"Failed to set Direct Message status of room": "Nepodarilo sa nastaviť stav miestnosti priama konverzácia",
"unknown error code": "neznámy kód chyby",
"Failed to forget room %(errCode)s": "Nepodarilo sa zabudnuť miestnosť %(errCode)s",
"All messages (loud)": "Všetky správy (hlučné)",
"All messages (noisy)": "Všetky správy (hlučné)",
"All messages": "Všetky správy",
"Mentions only": "Len zmienky",
"Mute": "Umlčať",