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

src/i18n/strings/zh_Hans.json

@@ -549,11 +549,11 @@
     "Seen by %(userName)s at %(dateTime)s": "在 %(dateTime)s 被 %(userName)s 看到",
     "Show Apps": "显示应用",
     "Tagged as: ": "标记为：",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "验证码将发送到+%(msisdn)，请输入接收到的验证码",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName) 接受了 %(displayName)的邀请。",
-    "Active call (%(roomName)s)": "%(roomName)的呼叫",
-    "And %(count)s more...": "添加%(count)个...",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName) 将级别调整到%(powerLevelDiffText)。",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "验证码将发送到+%(msisdn)s，请输入接收到的验证码",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 接受了 %(displayName)s 的邀请。",
+    "Active call (%(roomName)s)": "%(roomName)s 的呼叫",
+    "And %(count)s more...": "添加%(count)s 个...",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 将级别调整到%(powerLevelDiffText)s 。",
     "Changes colour scheme of current room": "修改了样式",
     "changing room on a RoomView is not supported": "暂不支持修改",
     "demote": "降级",
@@ -568,11 +568,9 @@
     "Profile": "个人配置",
     "Public Chat": "公开的",
     "Refer a friend to Riot:": "介绍朋友加入Riot：",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName) 删除了显示名称。",
-    "%(roomName)s is not accessible at this time.": "%(roomName)此时无法访问。",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s 此时无法访问。",
     "Set": "设置",
     "Start authentication": "开始认证",
-    "tag as %(tagName)s": "标签",
     "tag direct chat": "标签",
     "The maximum permitted number of widgets have already been added to this room.": "小部件的最大允许数量已经添加到这个房间了。",
     "The phone number entered looks invalid": "输入的电话号码看起来无效",