Merge branch 'master' of https://github.com/NodeBB/NodeBB

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

public/language/fa_IR/error.json

@@ -28,8 +28,8 @@
     "username-too-short": "نام کاربری خیلی کوتاه است.",
     "username-too-long": "نام کاربری بسیار طولانیست",
     "password-too-long": "کلمه عبور بسیار طولانیست",
-    "user-banned": "کاربر محروم شد.",
-    "user-banned-reason": "User banned (Reason: %1)",
+    "user-banned": "کاربر اخراج شد",
+    "user-banned-reason": "کاربر اخراج شده (دلیل: %1)",
     "user-too-new": "با عرض پوزش، شما باید %1 ثانیه پیش از فرستادن پست نخست خود صبر کنید",
     "blacklisted-ip": "با عرض پوزش فراوان، نشانی آی پی شما در این انجمن مسدود شده است، اگر فکر می‌کنید اشتباهی رخ داده با مدیریت انجمن تماس بگیرید.",
     "ban-expiry-missing": "لطفا تاریخ پایان برای این مسدود کردن ارائه دهید",

public/language/zh_CN/error.json

@@ -122,9 +122,9 @@
     "no-session-found": "未登录!",
     "not-in-room": "用户已不在聊天室中",
     "no-users-in-room": "这个聊天室中没有用户",
-    "cant-kick-self": "你不能把自己踢出群组",
+    "cant-kick-self": "您不能把自己踢出群组",
     "no-users-selected": "尚未选择用户",
     "invalid-home-page-route": "无效的首页路径",
-    "invalid-session": "Session Mismatch",
-    "invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page."
+    "invalid-session": "Session 无法匹配",
+    "invalid-session-text": "您的登入状态已经失效，或者是与服务器信息不匹配。请刷新此页面。"
 }

public/language/zh_CN/global.json

@@ -96,5 +96,5 @@
     "upload": "上传",
     "allowed-file-types": "允许的文件类型有 %1",
     "unsaved-changes": "您有未保存的更改，您确定您要离开么？",
-    "reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect."
+    "reconnecting-message": "与 %1 的连接断开，我们正在尝试重连，请耐心等待"
 }

public/language/zh_CN/user.json

@@ -27,7 +27,7 @@
     "watched": "已订阅",
     "followers": "粉丝",
     "following": "关注",
-    "aboutme": "About me",
+    "aboutme": "关于我",
     "signature": "签名档",
     "birthday": "生日",
     "chat": "聊天",
@@ -89,10 +89,10 @@
     "topics_per_page": "每页主题数",
     "posts_per_page": "每页帖子数",
     "notification_sounds": "收到通知时播放提示音",
-    "notifications_and_sounds": "Notifications & Sounds",
-    "incoming-message-sound": "Incoming message sound",
-    "outgoing-message-sound": "Outgoing message sound",
-    "notification-sound": "Notification sound",
+    "notifications_and_sounds": "通知 & 提示音",
+    "incoming-message-sound": "消息到达提示音",
+    "outgoing-message-sound": "消息送出提示音",
+    "notification-sound": "通知提示音",
     "browsing": "浏览设置",
     "open_links_in_new_tab": "在新标签打开外部链接",
     "enable_topic_searching": "启用主题内搜索",
@@ -119,6 +119,6 @@
     "info.no-ban-history": "该用户从未被封禁",
     "info.banned-until": "封禁到 %1",
     "info.banned-permanently": "永久封禁",
-    "info.banned-reason-label": "Reason",
-    "info.banned-no-reason": "No reason given."
+    "info.banned-reason-label": "原因",
+    "info.banned-no-reason": "没有原因"
 }