git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "32243e56"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "e2b4b6f6"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
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 8993cb9..4d58738 100644
--- a/mailcow/src/mailcow-dockerized/data/web/lang/lang.zh.json
+++ b/mailcow/src/mailcow-dockerized/data/web/lang/lang.zh.json
@@ -549,8 +549,6 @@
"sieve_desc": "简短描述",
"sieve_type": "过滤器类型",
"skipcrossduplicates": "跳过其他文件夹中已存在的邮件(保留先存在的邮件)",
- "sogo_access": "授权访问SOGo",
- "sogo_access_info": "授权访问SOGo，此设置既不会影响其他所有服务的访问也不会删除或更改用户在SOGo的上的个人资料。",
"sogo_visible": "SOGo别名显示",
"sogo_visible_info": "此设置只影响SOGo上的可显示对象(指向本地邮箱的共享或非共享别名地址)。如果设为隐藏，别名地址不会作为下拉可选发件人项显示。",
"spam_alias": "添加或更改临时别名地址",
@@ -640,11 +638,11 @@
"bcc_to_rcpt": "切换到收件人映射",
"bcc_to_sender": "切换到发件人映射",
"bcc_type": "BCC类型",
- "booking_0": "永远显示为空闲",
+ "booking_null": "永远显示为空闲",
"booking_0_short": "永远空闲",
"booking_custom": "严格限制登记数",
"booking_custom_short": "严格限制",
- "booking_lt0": "不限制登记数，但会在被登记后显示为繁忙",
+ "booking_ltnull": "不限制登记数，但会在被登记后显示为繁忙",
"booking_lt0_short": "宽松限制",
"daily": "每天",
"deactivate": "禁用",
@@ -958,7 +956,6 @@
"messages": "消息",
"never": "从不",
"new_password": "新密码",
- "new_password_description": "要求: 至少6字符长的字母或数字",
"new_password_repeat": "确认密码 (重复)",
"no_active_filter": "没有启用的过滤器",
"no_last_login": "没有最后UI登录信息",