Merge branch 'develop' into travis/room-list/hover-state

This commit is contained in:
Travis Ralston 2020-06-10 07:42:41 -06:00
commit a3391d9a08
23 changed files with 806 additions and 54 deletions

View file

@ -1069,6 +1069,7 @@
"Replying": "Replying",
"Room %(name)s": "Room %(name)s",
"Recent rooms": "Recent rooms",
"No recently visited rooms": "No recently visited rooms",
"No rooms to show": "No rooms to show",
"Unnamed room": "Unnamed room",
"World readable": "World readable",
@ -1142,6 +1143,8 @@
"List options": "List options",
"Add room": "Add room",
"Show %(n)s more": "Show %(n)s more",
"Show %(count)s more|other": "Show %(count)s more",
"Show %(count)s more|one": "Show %(count)s more",
"Options": "Options",
"%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
"%(count)s unread messages including mentions.|one": "1 unread mention.",