Merge branch 'develop' into t3chguy/m.relates_to

2018-03-28 08:38:33 +00:00
parent b5ed08eba2 d3e2c4c561
commit fac89d9c58
17 changed files with 116 additions and 51 deletions
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -392,6 +392,7 @@
    "Unknown": "Unknown",
    "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
    "Replying": "Replying",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
    "No rooms to show": "No rooms to show",
    "Unnamed room": "Unnamed room",
    "World readable": "World readable",