Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-04-30 16:57:26 +00:00
commit be1c121e37
5 changed files with 23 additions and 1 deletions

View file

@ -201,6 +201,7 @@
"Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
"Always show message timestamps": "Always show message timestamps",
"Autoplay GIFs and videos": "Autoplay GIFs and videos",
"Always show encryption icons": "Always show encryption icons",
"Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
"Hide avatars in user and room mentions": "Hide avatars in user and room mentions",
"Disable big emoji in chat": "Disable big emoji in chat",