From 0873fc4eb9a18e5d1d2c3df52ecd006fc76d5303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?HouMingtao=20=5B=E4=BE=AF=E6=98=8E=E6=B6=9B=5D?=
 <HouMingtao@kingsoft.cn>
Date: Wed, 8 Nov 2017 17:49:14 +0800
Subject: [PATCH 1/2] add Chinese Simple Language

---
 AUTHORS.md                                    |   2 +-
 .../zh_CN/LC_MESSAGES/messages.po             | 619 ++++++++++++++++++
 2 files changed, 620 insertions(+), 1 deletion(-)
 create mode 100644 admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po

diff --git a/AUTHORS.md b/AUTHORS.md
index 522338c3..765a103b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -20,4 +20,4 @@ Other contributors:
  - Maxime Saddok - French translation
  - "ofthesun9" - French translation
  - "SunMar" - Dutch translation
-
+ - "Marty Hou" - Chinese Simple translation
diff --git a/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po b/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..88f03343
--- /dev/null
+++ b/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
@@ -0,0 +1,619 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Mailu\n"
+"Language: zh-CN\n"
+
+#: mailu/ui/forms.py:32
+msgid "Invalid email address."
+msgstr "无效的邮件地址"
+
+#: mailu/ui/forms.py:36
+msgid "Confirm"
+msgstr "确认"
+
+#: mailu/ui/forms.py:40 mailu/ui/forms.py:67
+msgid "E-mail"
+msgstr "电子邮件"
+
+#: mailu/ui/forms.py:41 mailu/ui/forms.py:68 mailu/ui/forms.py:85
+#: mailu/ui/forms.py:146
+msgid "Password"
+msgstr "密码"
+
+#: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
+#: mailu/ui/templates/sidebar.html:99
+msgid "Sign in"
+msgstr "注册"
+
+#: mailu/ui/forms.py:46 mailu/ui/templates/domain/details.html:21
+#: mailu/ui/templates/domain/list.html:18 mailu/ui/templates/relay/list.html:17
+msgid "Domain name"
+msgstr "域名"
+
+#: mailu/ui/forms.py:47
+msgid "Maximum user count"
+msgstr "最大用户数"
+
+#: mailu/ui/forms.py:48
+msgid "Maximum alias count"
+msgstr "最大别名数"
+
+#: mailu/ui/forms.py:50 mailu/ui/forms.py:62 mailu/ui/forms.py:73
+#: mailu/ui/forms.py:112 mailu/ui/forms.py:124
+#: mailu/ui/templates/alias/list.html:21 mailu/ui/templates/domain/list.html:21
+#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:20
+#: mailu/ui/templates/user/list.html:23
+msgid "Comment"
+msgstr "说明"
+
+#: mailu/ui/forms.py:51 mailu/ui/forms.py:56 mailu/ui/forms.py:63
+#: mailu/ui/forms.py:116 mailu/ui/forms.py:125
+msgid "Create"
+msgstr "创建"
+
+#: mailu/ui/forms.py:69
+msgid "Confirm password"
+msgstr "确认密码"
+
+#: mailu/ui/forms.py:70 mailu/ui/templates/user/list.html:22
+msgid "Quota"
+msgstr "配额"
+
+#: mailu/ui/forms.py:71
+msgid "Allow IMAP access"
+msgstr "允许IMAP访问"
+
+#: mailu/ui/forms.py:72
+msgid "Allow POP3 access"
+msgstr "允许POP3访问"
+
+#: mailu/ui/forms.py:74
+msgid "Save"
+msgstr "保存"
+
+#: mailu/ui/forms.py:78
+msgid "Displayed name"
+msgstr "显示名称"
+
+#: mailu/ui/forms.py:79
+msgid "Enable spam filter"
+msgstr "启用垃圾邮件过滤"
+
+#: mailu/ui/forms.py:80
+msgid "Spam filter threshold"
+msgstr "垃圾邮件过滤器阈值"
+
+#: mailu/ui/forms.py:81
+msgid "Save settings"
+msgstr "保存设置"
+
+#: mailu/ui/forms.py:86
+msgid "Password check"
+msgstr "检查密码"
+
+#: mailu/ui/forms.py:87 mailu/ui/templates/sidebar.html:16
+msgid "Update password"
+msgstr "更新密码"
+
+#: mailu/ui/forms.py:91
+msgid "Enable forwarding"
+msgstr "启用转发"
+
+#: mailu/ui/forms.py:94 mailu/ui/forms.py:123
+#: mailu/ui/templates/alias/list.html:20
+msgid "Destination"
+msgstr "目的地址"
+
+#: mailu/ui/forms.py:96 mailu/ui/forms.py:104
+msgid "Update"
+msgstr "更新"
+
+#: mailu/ui/forms.py:100
+msgid "Enable automatic reply"
+msgstr "启用自动回复"
+
+#: mailu/ui/forms.py:101
+msgid "Reply subject"
+msgstr "回复主题"
+
+#: mailu/ui/forms.py:102
+msgid "Reply body"
+msgstr "回复正文"
+
+#: mailu/ui/forms.py:120
+msgid "Alias"
+msgstr "别名"
+
+#: mailu/ui/forms.py:122
+msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
+msgstr "使用SQL LIKE语法（例如，用于全部别名）"
+
+#: mailu/ui/forms.py:129
+msgid "Admin email"
+msgstr "管理员邮箱"
+
+#: mailu/ui/forms.py:130 mailu/ui/forms.py:135 mailu/ui/forms.py:148
+msgid "Submit"
+msgstr "提交"
+
+#: mailu/ui/forms.py:134
+msgid "Manager email"
+msgstr "管理员邮箱"
+
+#: mailu/ui/forms.py:139
+msgid "Protocol"
+msgstr "协议"
+
+#: mailu/ui/forms.py:142
+msgid "Hostname or IP"
+msgstr "主机名或IP"
+
+#: mailu/ui/forms.py:143
+msgid "TCP port"
+msgstr "TCP端口"
+
+#: mailu/ui/forms.py:144
+msgid "Enable TLS"
+msgstr "启用TLS"
+
+#: mailu/ui/forms.py:145 mailu/ui/templates/fetch/list.html:20
+msgid "Username"
+msgstr "用户名"
+
+#: mailu/ui/templates/confirm.html:4
+msgid "Confirm action"
+msgstr "确认操作"
+
+#: mailu/ui/templates/confirm.html:13
+msgid "You are about to %(action)s. Please confirm your action."
+msgstr "你即将%(action)s。请确认您的操作。"
+
+#: mailu/ui/templates/docker-error.html:4
+msgid "Docker error"
+msgstr "Docker错误"
+
+#: mailu/ui/templates/docker-error.html:12
+msgid "An error occurred while talking to the Docker server."
+msgstr "Docker服务器通信出错"
+
+#: mailu/admin/templates/login.html:6
+msgid "Your account"
+msgstr "你的帐户"
+
+#: mailu/ui/templates/login.html:8
+msgid "to access the administration tools"
+msgstr "访问管理员工具"
+
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:44
+msgid "Services status"
+msgstr "服务状态"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr "服务"
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr "状态"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "进程ID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "镜像"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr "已开始"
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr "最后更新"
+
+#: mailu/ui/templates/sidebar.html:8
+msgid "My account"
+msgstr "我的帐户"
+
+#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+msgid "Settings"
+msgstr "设置"
+
+#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+msgid "Auto-forward"
+msgstr "自动转发"
+
+#: mailu/ui/templates/sidebar.html:26 mailu/ui/templates/user/list.html:36
+msgid "Auto-reply"
+msgstr "自动回复"
+
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:31
+#: mailu/ui/templates/user/list.html:37
+msgid "Fetched accounts"
+msgstr "代收帐户"
+
+#: mailu/ui/templates/sidebar.html:93
+msgid "Sign out"
+msgstr "登出"
+
+#: mailu/ui/templates/sidebar.html:40
+msgid "Administration"
+msgstr "管理"
+
+#: mailu/ui/templates/sidebar.html:54
+msgid "Administrators"
+msgstr "管理员"
+
+#: mailu/ui/templates/sidebar.html:66
+msgid "Mail domains"
+msgstr "邮件域"
+
+#: mailu/ui/templates/sidebar.html:87
+msgid "Help"
+msgstr "帮帮我"
+
+#: mailu/ui/templates/working.html:4
+msgid "We are still working on this feature!"
+msgstr "开发中……"
+
+#: mailu/ui/templates/admin/create.html:4
+msgid "Add a global administrator"
+msgstr "添加超级管理员"
+
+#: mailu/ui/templates/admin/list.html:4
+msgid "Global administrators"
+msgstr "超级管理员"
+
+#: mailu/ui/templates/admin/list.html:9
+msgid "Add administrator"
+msgstr "添加管理员"
+
+#: mailu/ui/templates/admin/list.html:16 mailu/ui/templates/alias/list.html:18
+#: mailu/ui/templates/alternative/list.html:18
+#: mailu/ui/templates/domain/list.html:16 mailu/ui/templates/fetch/list.html:18
+#: mailu/ui/templates/manager/list.html:18
+#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:19
+#: mailu/ui/templates/user/list.html:18
+msgid "Actions"
+msgstr "操作"
+
+#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
+#: mailu/ui/templates/manager/list.html:19 mailu/ui/templates/user/list.html:20
+msgid "Email"
+msgstr "电子邮件"
+
+#: mailu/ui/templates/admin/list.html:22 mailu/ui/templates/alias/list.html:29
+#: mailu/ui/templates/alternative/list.html:25
+#: mailu/ui/templates/domain/list.html:31 mailu/ui/templates/fetch/list.html:31
+#: mailu/ui/templates/manager/list.html:24
+#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:27
+#: mailu/ui/templates/user/list.html:31
+msgid "Delete"
+msgstr "删除"
+
+#: mailu/ui/templates/alias/create.html:4
+msgid "Create alias"
+msgstr "创建别名"
+
+#: mailu/ui/templates/alias/edit.html:4
+msgid "Edit alias"
+msgstr "编辑别名"
+
+#: mailu/ui/templates/alias/list.html:4
+msgid "Alias list"
+msgstr "别名列表"
+
+#: mailu/ui/templates/alias/list.html:12
+msgid "Add alias"
+msgstr "添加别名"
+
+#: mailu/ui/templates/alias/list.html:22
+#: mailu/ui/templates/alternative/list.html:20
+#: mailu/ui/templates/domain/list.html:22 mailu/ui/templates/fetch/list.html:24
+#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:22
+#: mailu/ui/templates/user/list.html:24
+msgid "Created"
+msgstr "创建"
+
+#: mailu/ui/templates/alias/list.html:23 mailu/ui/templates/domain/list.html:23
+#: mailu/ui/templates/fetch/list.html:25 mailu/ui/templates/relay/list.html:21
+#: mailu/ui/templates/user/list.html:25
+msgid "Last edit"
+msgstr "上次编辑"
+
+#: mailu/ui/templates/alias/list.html:28 mailu/ui/templates/domain/list.html:30
+#: mailu/ui/templates/fetch/list.html:30 mailu/ui/templates/relay/list.html:26
+#: mailu/ui/templates/user/list.html:30
+msgid "Edit"
+msgstr "编辑"
+
+#: mailu/ui/templates/domain/create.html:4
+#: mailu/ui/templates/domain/list.html:9
+msgid "New domain"
+msgstr "新域"
+
+#: mailu/ui/templates/domain/details.html:4
+msgid "Domain details"
+msgstr "域详情"
+
+#: mailu/ui/templates/domain/details.html:13
+msgid "Regenerate keys"
+msgstr "重新生成密钥"
+
+#: mailu/ui/templates/domain/details.html:25
+msgid "DNS MX entry"
+msgstr "DNS MX条目"
+
+#: mailu/ui/templates/domain/details.html:29
+msgid "DNS SPF entries"
+msgstr "DNS SPF条目"
+
+#: mailu/ui/templates/domain/details.html:36
+msgid "DKIM public key"
+msgstr "DKIM公钥"
+
+#: mailu/ui/templates/domain/details.html:40
+msgid "DNS DKIM entry"
+msgstr "DNS DKIM条目"
+
+#: mailu/ui/templates/domain/details.html:44
+msgid "DNS DMARC entry"
+msgstr "DNS DMARC条目"
+
+#: mailu/ui/templates/domain/edit.html:4
+msgid "Edit domain"
+msgstr "编辑域"
+
+#: mailu/ui/templates/domain/list.html:4
+msgid "Domain list"
+msgstr "域列表"
+
+#: mailu/ui/templates/domain/list.html:17
+msgid "Manage"
+msgstr "管理"
+
+#: mailu/ui/templates/domain/list.html:19
+msgid "Mailbox count"
+msgstr "邮箱数量"
+
+#: mailu/ui/templates/domain/list.html:20
+msgid "Alias count"
+msgstr "别名数量"
+
+#: mailu/ui/templates/domain/list.html:28
+msgid "Details"
+msgstr "详情"
+
+#: mailu/ui/templates/domain/list.html:35
+msgid "Users"
+msgstr "用户"
+
+#: mailu/ui/templates/domain/list.html:36
+msgid "Aliases"
+msgstr "别名"
+
+#: mailu/ui/templates/domain/list.html:37
+msgid "Managers"
+msgstr "管理员"
+
+#: mailu/ui/templates/fetch/create.html:4
+msgid "Add a fetched account"
+msgstr "添加一个代收帐户"
+
+#: mailu/ui/templates/fetch/edit.html:4
+msgid "Update a fetched account"
+msgstr "更新代收帐户"
+
+#: mailu/ui/templates/fetch/list.html:12
+msgid "Add an account"
+msgstr "添加一个帐户"
+
+#: mailu/ui/templates/fetch/list.html:19
+msgid "Endpoint"
+msgstr "端点"
+
+#: mailu/ui/templates/fetch/list.html:22
+msgid "Last check"
+msgstr "上次检查"
+
+#: mailu/ui/templates/manager/create.html:4
+msgid "Add a manager"
+msgstr "添加一个管理员"
+
+#: mailu/ui/templates/manager/list.html:4
+msgid "Manager list"
+msgstr "管理员列表"
+
+#: mailu/ui/templates/manager/list.html:12
+msgid "Add manager"
+msgstr "添加管理员"
+
+#: mailu/ui/forms.py:152
+msgid "Announcement subject"
+msgstr "公告主题"
+
+#: mailu/ui/forms.py:154
+msgid "Announcement body"
+msgstr "公告正文"
+
+#: mailu/ui/forms.py:156
+msgid "Send"
+msgstr "发送"
+
+#: mailu/ui/templates/announcement.html:4
+msgid "Public announcement"
+msgstr "公告"
+
+#: mailu/ui/templates/announcement.html:8
+msgid "from"
+msgstr "来自"
+
+#: mailu/ui/templates/sidebar.html:49
+msgid "Announcement"
+msgstr "公告"
+
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "新用户"
+
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "编辑用户"
+
+#: mailu/ui/templates/user/forward.html:4
+msgid "Forward emails"
+msgstr "转发电子邮件"
+
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "用户列表"
+
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "添加用户"
+
+#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "用户设置"
+
+#: mailu/ui/templates/user/list.html:21
+msgid "Features"
+msgstr "功能"
+
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "密码更新"
+
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "自动回复"
+
+#: mailu/ui/forms.py:49
+msgid "Maximum user quota"
+msgstr "最大用户容量"
+
+#: mailu/ui/forms.py:92
+msgid "Keep a copy of the emails"
+msgstr "保留电子邮件副本"
+
+#: mailu/ui/forms.py:147
+msgid "Keep emails on the server"
+msgstr "电子邮件保存在服务器上"
+
+#: mailu/ui/templates/fetch/list.html:21
+msgid "Keep emails"
+msgstr "保存电子邮件"
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "yes"
+msgstr "是"
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "no"
+msgstr "否"
+
+#: mailu/ui/forms.py:55
+msgid "Alternative name"
+msgstr "替代名称"
+
+#: mailu/ui/forms.py:60
+msgid "Relayed domain name"
+msgstr "中继域域名"
+
+#: mailu/ui/forms.py:61 mailu/ui/templates/relay/list.html:18
+msgid "Remote host"
+msgstr "远程主机"
+
+#: mailu/ui/templates/sidebar.html:59
+msgid "Relayed domains"
+msgstr "中继域"
+
+#: mailu/ui/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr "创建替代域"
+
+#: mailu/ui/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr "替代域名列表"
+
+#: mailu/ui/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr "添加替代"
+
+#: mailu/ui/templates/alternative/list.html:19
+msgid "Name"
+msgstr "名称"
+
+#: mailu/ui/templates/domain/list.html:39
+msgid "Alternatives"
+msgstr "备择方案"
+
+#: mailu/ui/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr "新的中继域"
+
+#: mailu/ui/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr "编辑中继域"
+
+#: mailu/ui/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr "中继域列表"
+
+#: mailu/ui/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr "新的中继域"
+
+#: mailu/ui/forms.py:109
+msgid "Your token (write it down, as it will never be displayed again)"
+msgstr "您的令牌（请保存下来，它只显示这一次）"
+
+#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:21
+msgid "Authorized IP"
+msgstr "授权IP"
+
+#: mailu/ui/templates/sidebar.html:36 mailu/ui/templates/token/list.html:4
+msgid "Authentication tokens"
+msgstr "认证令牌"
+
+#: mailu/ui/templates/sidebar.html:72
+msgid "Go to"
+msgstr "转到"
+
+#: mailu/ui/templates/sidebar.html:76
+msgid "Webmail"
+msgstr "网页邮箱"
+
+#: mailu/ui/templates/sidebar.html:82
+msgid "Website"
+msgstr "网站"
+
+#: mailu/ui/templates/token/create.html:4
+msgid "Create an authentication token"
+msgstr "创建一个认证令牌"
+
+#: mailu/ui/templates/token/list.html:12
+msgid "New token"
+msgstr "新的令牌"
+
+#: mailu/ui/templates/user/create.html:15
+msgid "General"
+msgstr "一般"
+
+#: mailu/ui/templates/user/create.html:21
+msgid "Features and quotas"
+msgstr "功能和配额"
+
+#: mailu/ui/templates/user/settings.html:14
+msgid "General settings"
+msgstr "常规设置"
+
+#: mailu/ui/templates/user/settings.html:18
+msgid "Antispam"
+msgstr "反垃圾邮件"
+

From b0f8d7ab7806305333f562b8f94f4f123f31765d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?HouMingtao=20=5B=E4=BE=AF=E6=98=8E=E6=B6=9B=5D?=
 <HouMingtao@kingsoft.cn>
Date: Thu, 9 Nov 2017 15:21:00 +0800
Subject: [PATCH 2/2] move to new translation folder

Change-Id: If4b4a25b305aab3d96155283881573a125272f81
---
 .../admin}/mailu/translations/zh_CN/LC_MESSAGES/messages.po       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {admin => core/admin}/mailu/translations/zh_CN/LC_MESSAGES/messages.po (100%)

diff --git a/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po b/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
similarity index 100%
rename from admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
rename to core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po