git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "02ae5285"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "649a5c01"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I870ad468fba026cc5abf3c5699ed1e12ff28b32b
diff --git a/mailcow/src/mailcow-dockerized/data/web/lang/lang.zh.json b/mailcow/src/mailcow-dockerized/data/web/lang/lang.zh.json
index 9dea0af..8993cb9 100644
--- a/mailcow/src/mailcow-dockerized/data/web/lang/lang.zh.json
+++ b/mailcow/src/mailcow-dockerized/data/web/lang/lang.zh.json
@@ -437,20 +437,20 @@
"chart_this_server": "图表 (此服务器)",
"containers_info": "容器信息",
"disk_usage": "磁盘使用",
- "external_logs": "外部日至",
+ "external_logs": "外部日志",
"history_all_servers": "历史 (所有服务器)",
- "in_memory_logs": "内存日至",
+ "in_memory_logs": "内存日志",
"jvm_memory_solr": "JVM内存使用",
- "log_info": "<p>mailcow <b>内存日志</b> 收集于Redis列表中并且每分钟地修整到 LOG_LINES (%d) 以减少错误(Rowhammer)。\r\n <br>内存日志不是为了持久化，所有使用内存日志的应用同时也会写入日志到Docker守护程序的默认日志驱动中。\r\n <br>内存日志应该用于debug容器中的不明显问题。</p>\r\n <p><b>外部日志</b> 通过相应应用提供的API收集。</p>\r\n <p><b>静态日志</b> 大多为不写入日志到Dockerd但仍然需要被持久化的活动日志(API日志外的)。</p>",
+ "log_info": "<p>mailcow <b>内存日志</b> 收集于Redis列表中并且每分钟自动缩减到 LOG_LINES (%d) 以减少错误(Rowhammer)。\r\n <br>内存日志不是为了持久化，所有使用内存日志的应用同时也会写入日志到Docker守护程序的默认日志驱动中。\r\n <br>内存日志应该用于debug容器中的不明显问题。</p>\r\n <p><b>外部日志</b> 通过相应应用提供的API收集。</p>\r\n <p><b>静态日志</b> 大多为不写入日志到Dockerd但仍然需要被持久化的活动日志(API日志外的)。</p>",
"logs": "日志",
"restart_container": "重启",
"solr_dead": "Solr在启动中、已关闭或已停止运行",
- "solr_docs": "文档",
- "solr_last_modified": "最后修改",
- "solr_size": "大小",
- "solr_started_at": "开始于",
+ "docs": "文档",
+ "last_modified": "最后修改",
+ "size": "大小",
+ "started_at": "开始于",
"solr_status": "Solr状态",
- "solr_uptime": "运行时间",
+ "uptime": "运行时间",
"started_on": "启动于",
"static_logs": "静态日志",
"system_containers": "系统和容器"
@@ -544,7 +544,7 @@
"save": "保存更改",
"scope": "范围",
"sender_acl": "允许发送为",
- "sender_acl_disabled": "↳ <span class=\"label label-danger\">发件人检查已关闭</span>",
+ "sender_acl_disabled": "<span class=\"label label-danger\">发件人检查已关闭</span>",
"sender_acl_info": "如果允许邮箱用户A作为邮箱用户B发送邮件，发件人的地址不会在SOGo中\"来自\"区域自动地作为下拉可选项显示。<br>\r\n 邮箱用户B需要添加授权以允许邮箱用户A选择B的地址作为发件人；授权方法为，在SOGo中点击左上方邮箱地址右边的菜单按钮(三个点)并授权。",
"sieve_desc": "简短描述",
"sieve_type": "过滤器类型",
@@ -711,7 +711,6 @@
"sieve_preset_7": "重定向邮件并保留/删除",
"sieve_preset_8": "删除发件人发送给自己别名地址的邮件",
"sieve_preset_header": "请看下方的示例预设。 查看 <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a> 以了解更多细节。",
- "sogo_allow_admin_hint": "只允许存在个人资料的邮箱帐号以SOGo管理员登录，即用户需要在先前至少登录过一次。",
"sogo_visible": "SOGo别名显示",
"sogo_visible_n": "在SOGo中隐藏别名",
"sogo_visible_y": "在SOGo中显示别名",
@@ -1033,7 +1032,7 @@
"warning": {
"cannot_delete_self": "不能删除已登录用户",
"domain_added_sogo_failed": "域名已添加但是重启Dovecot失败，请检查日志。",
- "dovecot_restart_failed": "Dovecot重启失败，请检查日至",
+ "dovecot_restart_failed": "Dovecot重启失败，请检查日志",
"fuzzy_learn_error": "模糊特征学习失败: %s",
"hash_not_found": "找不到特征或已被删除",
"ip_invalid": "跳过的非法IP: %s",