feat: merge alex version

public/locales/en/chat.json

@@ -40,6 +40,8 @@
 
   "new_msg": "{{num}} new messages",
   "mark_read": "Mark As Read",
+  "pin_chat": "Sticky on top",
+  "unpin_chat": "Unsticky",
 
   "reply_msg_del": "This message has been deleted.",
 
@@ -54,5 +56,10 @@
   "unmute": "Unmute",
   "camera_on": "Turn on camera",
   "camera_off": "Turn off camera",
-  "leave_voice": "Leave Voice Chat"
+  "leave_voice": "Leave Voice Chat",
+  "add_contact": "Add to contacts",
+  "block": "Block",
+  "unblock": "Unblock",
+  "contact_tip": "This user is not in your contact",
+  "contact_block_tip": "This user has been blocked by you"
 }

public/locales/en/common.json

@@ -17,6 +17,7 @@
     "new_private_channel": "New Private Channel",
     "new_msg": "New Message",
     "invite_people": "Invite People",
+    "search_people": "Search People",
     "create": "Create",
     "open": "Open",
     "update": "Update",

public/locales/en/member.json

@@ -13,14 +13,19 @@
   "new_pwd": "New Password",
   "confirm_new_pwd": "Confirm New Password",
 
-  "manage_members": "Manage Members",
+  "manage_members": "Manage Contacts",
   "manage_tip": "Disabling your account means you can recover it at any time after taking this action.",
   "admin": "Admin",
   "user": "User",
   "copy_email": "Copy Email",
   "send_msg": "Send Message",
-  "remove": "Remove",
+  "remove": "Remove from Server",
+  "remove_from_contact": "Remove From Contact",
   "remove_account": "Remove Account",
   "remove_account_desc": "Are you sure remove this account?",
-  "remove_from_channel": "Remove From Channel"
+  "remove_from_channel": "Remove From Channel",
+
+  "search_not_found": "Not found, or this user is not allowed to be searched.",
+  "search_by_id": "Search by ID",
+  "search_by_email": "Search by Email"
 }

public/locales/en/setting.json

@@ -6,7 +6,7 @@
   "nav": {
     "general": "General",
     "overview": "Overview",
-    "members": "Members",
+    "members": "Contacts",
     "auto_delete_msg": "Auto-delete Messages",
     "user": "User",
     "my_account": "My Account",
@@ -21,9 +21,7 @@
     "license": "License",
     "about": "About",
     "api_doc": "API Document",
-    "version": "Version",
-    "faq": "FAQ",
-    "feedback": "Feedback"
+    "version": "Version"
   },
   "channel": {
     "leave": "Leave Channel",

public/locales/en/welcome.json

@@ -1,6 +1,6 @@
 {
   "title": "Welcome to {{name}} server",
-  "desc": "Here are some steps to help you get started. For more, check out our Getting Started guide",
+  "desc": "Here are some steps to help you get started.",
   "invite": "Invite your friends or teammates",
   "start_by_channel": "Create a Channel to Start a Conversation",
   "start_by_dm": "Send a Direct Message",

public/locales/zh/chat.json

@@ -41,7 +41,8 @@
 
   "new_msg": "{{num}} 条新消息",
   "mark_read": "设为已读",
-
+  "pin_chat": "置顶",
+  "unpin_chat": "取消置顶",
   "reply_msg_del": "被回复的消息已删除！",
 
   "file": "文件",
@@ -55,5 +56,10 @@
   "unmute": "取消静音",
   "camera_on": "开启摄像头",
   "camera_off": "关闭摄像头",
-  "leave_voice": "离开"
+  "leave_voice": "离开",
+  "add_contact": "加为联系人",
+  "block": "屏蔽",
+  "unblock": "解除屏蔽",
+  "contact_tip": "该用户不在您的联系人列表中",
+  "contact_block_tip": "该用户已被你屏蔽"
 }

public/locales/zh/common.json

@@ -1,6 +1,6 @@
 {
   "chat": "聊天",
-  "members": "成员",
+  "members": "联系人",
   "favs": "收藏",
   "files": "文件",
   "setting": "设置",
@@ -16,6 +16,7 @@
     "new_private_channel": "新建私有频道",
     "new_msg": "发消息",
     "invite_people": "邀请TA人",
+    "search_people": "搜索用户",
     "search": "搜索",
     "create": "创建",
     "open": "打开",

public/locales/zh/member.json

@@ -12,14 +12,19 @@
   "current_pwd": "当前密码",
   "new_pwd": "新密码",
   "confirm_new_pwd": "确认密码",
-  "manage_members": "成员管理",
-  "manage_tip": "请在此管理你的成员",
+  "manage_members": "联系人管理",
+  "manage_tip": "请在此管理你的联系人",
   "admin": "管理员",
   "user": "普通用户",
   "copy_email": "复制邮箱",
   "send_msg": "发消息",
-  "remove": "删除",
+  "remove": "从服务器删除",
+  "remove_from_contact": "从联系人中移除",
   "remove_account": "注销账号",
   "remove_account_desc": "确定永久注销该账号？",
-  "remove_from_channel": "从频道移除"
+  "remove_from_channel": "从频道移除",
+
+  "search_not_found": "用户不存在，或者不允许搜索",
+  "search_by_id": "用户ID",
+  "search_by_email": "用户邮箱"
 }

public/locales/zh/setting.json

@@ -6,7 +6,7 @@
   "nav": {
     "general": "通用",
     "overview": "概况",
-    "members": "成员",
+    "members": "联系人",
     "auto_delete_msg": "自动删除消息",
     "my_account": "我的账号",
     "config": "配置",