diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
index c6cc26ab9..28b5875d0 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
@@ -69,7 +69,7 @@
 		"LABEL_STORAGE_USER": "用户",
 		"LABEL_STORAGE_PASSWORD": "密码",
 		"ALERT_NOTICE": "提示!",
-		"SUGGESTIONS_LIMIT": "Suggestions limit",
+		"SUGGESTIONS_LIMIT": "建议数量上限",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "如果有大量的活跃用户，请不要选择此数据库类型。",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "您的系统不支持联系人\n<br>\n您需要在您的服务器上安装或启用<strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> 组件。\n"
 	},
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
index 1ba9587fc..d23451a48 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@@ -22,7 +22,7 @@
 		"NOT_SPAM": "非垃圾邮件",
 		"USERNAME": "用户名",
 		"PASSWORD": "密码",
-		"REMEMBER": "Remember",
+		"REMEMBER": "记住",
 		"REPLY_TO": "回复",
 		"SAVE": "保存",
 		"SAVE_CHANGES": "是否保存修改？",
@@ -227,10 +227,10 @@
 		"BUTTON_REQUEST_READ_RECEIPT": "要求已读回执",
 		"BUTTON_MARK_AS_IMPORTANT": "标记为“重要”",
 		"BUTTON_REQUEST_DSN": "要求送达回执",
-		"BUTTON_REQUIRE_TLS": "Require secure delivery"
+		"BUTTON_REQUIRE_TLS": "要求安全送达"
 	},
 	"POPUPS_ASK": {
-		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
+		"EXIT_ARE_YOU_SURE": "您确定要退出吗？",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "您确定要关闭此窗口吗？",
 		"DESC_WANT_DELETE_MESSAGES": "您确定要删除这条消息吗？"
 	},
@@ -314,7 +314,7 @@
 		"MARK_AS_READ_LABEL": "标记为已读",
 		"REPLY_INTERVAL_LABEL": "答复间隔 (天) ",
 		"KEEP_LABEL": "保留邮件",
-		"STOP_LABEL": "Stop further processing of rules",
+		"STOP_LABEL": "停止处理更多规则",
 		"VACATION_SUBJECT_LABEL": "主题 (可选)",
 		"VACATION_MESSAGE_LABEL": "内容",
 		"VACATION_RECIPIENTS_LABEL": "收件人 (半角逗号“,”分隔)",
@@ -401,27 +401,27 @@
 		"PREFER_HTML": "相比纯文本优先使用 HTML",
 		"PREFER_HTML_INFO": "消息有时以两种格式传送。该选项控制您希望显示 HTML 部分还是纯文本部分。",
 		"REMOVE_COLORS": "从消息中删除背景和文本颜色",
-		"ALLOW_STYLES": "Allow <style> CSS",
+		"ALLOW_STYLES": "允许 <style> CSS",
 		"MESSAGE_PER_PAGE": "每页消息数",
-		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"CHECK_MAIL_INTERVAL": "邮件检查间隔",
 		"MARK_MESSAGE_READ_AFTER": "将消息标记为已读",
 		"MSG_DEFAULT_ACTION": "默认操作",
 		"SECONDS": "秒",
-		"MINUTES": "minutes",
+		"MINUTES": "分",
 		"NOTIFICATIONS": "通知",
 		"SOUND_NOTIFICATION": "提示音",
 		"CHROME_NOTIFICATION_DESC": "显示新邮件弹窗",
 		"CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)",
-		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
-		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"COLLAPSE_BLOCKQUOTES": "折叠引用文本",
+		"MAX_QUOTE_LEVEL": "最多显示的引用文本层级",
 		"LIST_INLINE_ATTACHMENTS": "在列表中显示内联附件",
 		"LIST_SIMPLE_ATTACHMENTS": "简洁附件列表",
-		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
-		"EXTERNAL_IMAGES": "External images",
-		"IMAGES_OPTION_ASK": "Always ask",
-		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
-		"IMAGES_OPTION_ALWAYS": "Show always",
-		"IMAGES_WHITELIST": "Images whitelist"
+		"LIST_MESSAGES_GROUPED": "按分组显示消息 (按时间或发件人排序时)",
+		"EXTERNAL_IMAGES": "外部图片",
+		"IMAGES_OPTION_ASK": "总是询问",
+		"IMAGES_OPTION_WHITELIST": "白名单或询问",
+		"IMAGES_OPTION_ALWAYS": "总是显示",
+		"IMAGES_WHITELIST": "图片白名单"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "自动添加到您的地址簿",