diff --git a/apps/dav/l10n/zh_CN.js b/apps/dav/l10n/zh_CN.js
index 16a9bf2dba..b50eecf11b 100644
--- a/apps/dav/l10n/zh_CN.js
+++ b/apps/dav/l10n/zh_CN.js
@@ -43,9 +43,24 @@ OC.L10N.register(
     "A <strong>calendar</strong> was modified" : "<strong>日历</strong>已经修改",
     "A calendar <strong>event</strong> was modified" : "日历中<strong>事件</strong>已经修改",
     "A calendar <strong>todo</strong> was modified" : "列表中<strong>待办事项</strong>已经修改",
+    "Death of %s" : "%s 的忌日",
     "Contact birthdays" : "联系人生日",
+    "Calendar:" : "日历：",
+    "Date:" : "日期：",
     "Where:" : "地点：",
     "Description:" : "描述：",
+    "Untitled event" : "未命名事件",
+    "_%n year_::_%n years_" : ["%n 年"],
+    "_%n month_::_%n months_" : ["%n 月"],
+    "_%n day_::_%n days_" : ["%n 天"],
+    "_%n hour_::_%n hours_" : ["%n 小时"],
+    "_%n minute_::_%n minutes_" : ["%n 分钟"],
+    "%s (in %s)" : "%s （在 %s）",
+    "%s (%s ago)" : "%s （%s 前）",
+    "Calendar: %s" : "日历：%s",
+    "Date: %s" : "日期：%s",
+    "Description: %s" : "描述：%s",
+    "Where: %s" : "地点：%s",
     "%1$s via %2$s" : "%1$s 通过 %2$s",
     "Invitation canceled" : "邀请已取消",
     "Hello %s," : "您好，%s，",
@@ -81,6 +96,8 @@ OC.L10N.register(
     "Automatically generate a birthday calendar" : "自动生成生日日历",
     "Birthday calendars will be generated by a background job." : "生日日历将由后台作业生成。",
     "Hence they will not be available immediately after enabling but will show up after some time." : "因此，它们在启用后不会立即可用，但会在一段时间后显示出来。",
+    "Send notifications for events" : "发送事件通知",
+    "Notifications will be send through background jobs, so these need to happen often enough." : "通知将通过后台任务发送，所以任务的频率有足够高。",
     "%s via %s" : "%s通过%s",
     "The meeting »%s« with %s was canceled." : "与%s的会议 »%s« 已取消。",
     "The meeting »%s« with %s was updated." : "与%s的会议 »%s« 已更新。",
diff --git a/apps/dav/l10n/zh_CN.json b/apps/dav/l10n/zh_CN.json
index 942bbccb11..d34645b5c5 100644
--- a/apps/dav/l10n/zh_CN.json
+++ b/apps/dav/l10n/zh_CN.json
@@ -41,9 +41,24 @@
     "A <strong>calendar</strong> was modified" : "<strong>日历</strong>已经修改",
     "A calendar <strong>event</strong> was modified" : "日历中<strong>事件</strong>已经修改",
     "A calendar <strong>todo</strong> was modified" : "列表中<strong>待办事项</strong>已经修改",
+    "Death of %s" : "%s 的忌日",
     "Contact birthdays" : "联系人生日",
+    "Calendar:" : "日历：",
+    "Date:" : "日期：",
     "Where:" : "地点：",
     "Description:" : "描述：",
+    "Untitled event" : "未命名事件",
+    "_%n year_::_%n years_" : ["%n 年"],
+    "_%n month_::_%n months_" : ["%n 月"],
+    "_%n day_::_%n days_" : ["%n 天"],
+    "_%n hour_::_%n hours_" : ["%n 小时"],
+    "_%n minute_::_%n minutes_" : ["%n 分钟"],
+    "%s (in %s)" : "%s （在 %s）",
+    "%s (%s ago)" : "%s （%s 前）",
+    "Calendar: %s" : "日历：%s",
+    "Date: %s" : "日期：%s",
+    "Description: %s" : "描述：%s",
+    "Where: %s" : "地点：%s",
     "%1$s via %2$s" : "%1$s 通过 %2$s",
     "Invitation canceled" : "邀请已取消",
     "Hello %s," : "您好，%s，",
@@ -79,6 +94,8 @@
     "Automatically generate a birthday calendar" : "自动生成生日日历",
     "Birthday calendars will be generated by a background job." : "生日日历将由后台作业生成。",
     "Hence they will not be available immediately after enabling but will show up after some time." : "因此，它们在启用后不会立即可用，但会在一段时间后显示出来。",
+    "Send notifications for events" : "发送事件通知",
+    "Notifications will be send through background jobs, so these need to happen often enough." : "通知将通过后台任务发送，所以任务的频率有足够高。",
     "%s via %s" : "%s通过%s",
     "The meeting »%s« with %s was canceled." : "与%s的会议 »%s« 已取消。",
     "The meeting »%s« with %s was updated." : "与%s的会议 »%s« 已更新。",
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index 55893d26a3..98385c85de 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -33,6 +33,8 @@ OC.L10N.register(
     "Copy" : "复制",
     "Choose target folder" : "选择目标文件夹",
     "Open" : "打开",
+    "Delete file" : "删除文件",
+    "Delete folder" : "删除文件夹",
     "Disconnect storage" : "断开存储的连接",
     "Unshare" : "取消共享",
     "Could not load info for file \"{file}\"" : "无法加载文件 \"{file}\" 的信息",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index 6d29603be5..81889adb7f 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -31,6 +31,8 @@
     "Copy" : "复制",
     "Choose target folder" : "选择目标文件夹",
     "Open" : "打开",
+    "Delete file" : "删除文件",
+    "Delete folder" : "删除文件夹",
     "Disconnect storage" : "断开存储的连接",
     "Unshare" : "取消共享",
     "Could not load info for file \"{file}\"" : "无法加载文件 \"{file}\" 的信息",
diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js
index 765c893301..a81812d511 100644
--- a/apps/files_sharing/l10n/zh_CN.js
+++ b/apps/files_sharing/l10n/zh_CN.js
@@ -37,10 +37,12 @@ OC.L10N.register(
     "Removed share for group {group}" : "到群组 {group} 的共享已被移除 ",
     "{actor} shared with group {group}" : "{actor}  被共享到群组 {group}",
     "{actor} removed share for group {group}" : "{actor} 删除了群组 {group} 的共享",
+    "Share for group {group} expired" : "给分组 {group} 的共享已过期",
     "You shared {file} with group {group}" : "您与群组 {group} 共享了 {file} ",
     "You removed group {group} from {file}" : "已从 {file} 移除组 {group}",
     "{actor} shared {file} with group {group}" : " {actor} 与群组 {group} 共享了 {file} ",
     "{actor} removed group {group} from {file}" : "{actor} 从 {file} 删除群组 {group} ",
+    "Share for file {file} with group {group} expired" : "与分组 {group} 的文件共享 {file} 已过期",
     "Shared as public link" : "共享为公开链接",
     "Removed public link" : "移除公开链接",
     "Public link expired" : "公开链接已过期",
@@ -67,6 +69,8 @@ OC.L10N.register(
     "{actor} removed share for {user}" : "{actor} 删除了与 {user} 的共享",
     "Shared by {actor}" : "由 {actor} 共享",
     "{actor} removed share" : "{actor} 移除共享",
+    "Share for {user} expired" : "给 {user} 的共享已过期",
+    "Share expired" : "共享已过期",
     "You shared {file} with {user}" : "您与 {user} 共享了 {file} ",
     "You removed {user} from {file}" : "您从 {file} 移除了 {user} ",
     "You removed yourself from {file}" : "您从 {file} 移除了您自己",
@@ -75,6 +79,8 @@ OC.L10N.register(
     "{actor} removed {user} from {file}" : "{actor} 从 {file} 移除了 {user}",
     "{actor} shared {file} with you" : "{actor} 与您共享了 {file} ",
     "{actor} removed you from the share named {file}" : "{actor} 从名为 {file} 的共享中移除了您",
+    "Share for file {file} with {user} expired" : "与 {user} 的文件共享 {file} 已过期",
+    "Share for file {file} expired" : "文件 {file} 的共享已过期",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "通过邮件或公共链接共享的文件或文件夹<strong>已下载</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "<strong>其它服务器</strong> 中一个文件或者文件夹被共享 ",
     "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。",
diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json
index 36769e6638..67b608a26c 100644
--- a/apps/files_sharing/l10n/zh_CN.json
+++ b/apps/files_sharing/l10n/zh_CN.json
@@ -35,10 +35,12 @@
     "Removed share for group {group}" : "到群组 {group} 的共享已被移除 ",
     "{actor} shared with group {group}" : "{actor}  被共享到群组 {group}",
     "{actor} removed share for group {group}" : "{actor} 删除了群组 {group} 的共享",
+    "Share for group {group} expired" : "给分组 {group} 的共享已过期",
     "You shared {file} with group {group}" : "您与群组 {group} 共享了 {file} ",
     "You removed group {group} from {file}" : "已从 {file} 移除组 {group}",
     "{actor} shared {file} with group {group}" : " {actor} 与群组 {group} 共享了 {file} ",
     "{actor} removed group {group} from {file}" : "{actor} 从 {file} 删除群组 {group} ",
+    "Share for file {file} with group {group} expired" : "与分组 {group} 的文件共享 {file} 已过期",
     "Shared as public link" : "共享为公开链接",
     "Removed public link" : "移除公开链接",
     "Public link expired" : "公开链接已过期",
@@ -65,6 +67,8 @@
     "{actor} removed share for {user}" : "{actor} 删除了与 {user} 的共享",
     "Shared by {actor}" : "由 {actor} 共享",
     "{actor} removed share" : "{actor} 移除共享",
+    "Share for {user} expired" : "给 {user} 的共享已过期",
+    "Share expired" : "共享已过期",
     "You shared {file} with {user}" : "您与 {user} 共享了 {file} ",
     "You removed {user} from {file}" : "您从 {file} 移除了 {user} ",
     "You removed yourself from {file}" : "您从 {file} 移除了您自己",
@@ -73,6 +77,8 @@
     "{actor} removed {user} from {file}" : "{actor} 从 {file} 移除了 {user}",
     "{actor} shared {file} with you" : "{actor} 与您共享了 {file} ",
     "{actor} removed you from the share named {file}" : "{actor} 从名为 {file} 的共享中移除了您",
+    "Share for file {file} with {user} expired" : "与 {user} 的文件共享 {file} 已过期",
+    "Share for file {file} expired" : "文件 {file} 的共享已过期",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "通过邮件或公共链接共享的文件或文件夹<strong>已下载</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "<strong>其它服务器</strong> 中一个文件或者文件夹被共享 ",
     "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index e7becb9bc8..e2bb996c81 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -107,6 +107,7 @@ OC.L10N.register(
     "The \"{header}\" HTTP header doesn't contain \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "HTTP 头 \"{header}\" 未包含 \"{expected}\"。这是一种潜在的安全或隐私风险，因此推荐调整此项设置。",
     "The \"{header}\" HTTP header is not set to \"{val1}\", \"{val2}\", \"{val3}\", \"{val4}\" or \"{val5}\". This can leak referer information. See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{link}\">W3C Recommendation ↗</a>." : "HTTP 头 \"{header}\" 未设置成 \"{val1}\"，\"{val2}\"，\"{val3}\"，\"{val4}\" 或 \"{val5}\"。这会泄露更多的信息。请查阅 <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{link}\">W3C 建议↗</a>。",
     "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>." : "HTTP的请求头 \"Strict-Transport-Security\" 未设置为至少 \"{seconds}\" 秒。为了提高安全性，建议参照<a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>中的说明启用HSTS。",
+    "Accessing site insecurely via HTTP. You are strongly advised to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips ↗</a>." : "通过 HTTP 访问网站不安全。强烈建议您将服务器设置成要求使用HTTPS 协议，请查阅 <a href=\"{docUrl}\">安全贴士↗</a>。",
     "Shared" : "已共享",
     "Shared with" : "共享给",
     "Shared by" : "共享人",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 47e57f3d56..cd5767f275 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -105,6 +105,7 @@
     "The \"{header}\" HTTP header doesn't contain \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "HTTP 头 \"{header}\" 未包含 \"{expected}\"。这是一种潜在的安全或隐私风险，因此推荐调整此项设置。",
     "The \"{header}\" HTTP header is not set to \"{val1}\", \"{val2}\", \"{val3}\", \"{val4}\" or \"{val5}\". This can leak referer information. See the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{link}\">W3C Recommendation ↗</a>." : "HTTP 头 \"{header}\" 未设置成 \"{val1}\"，\"{val2}\"，\"{val3}\"，\"{val4}\" 或 \"{val5}\"。这会泄露更多的信息。请查阅 <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{link}\">W3C 建议↗</a>。",
     "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the <a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>." : "HTTP的请求头 \"Strict-Transport-Security\" 未设置为至少 \"{seconds}\" 秒。为了提高安全性，建议参照<a href=\"{docUrl}\" rel=\"noreferrer noopener\">security tips ↗</a>中的说明启用HSTS。",
+    "Accessing site insecurely via HTTP. You are strongly advised to set up your server to require HTTPS instead, as described in the <a href=\"{docUrl}\">security tips ↗</a>." : "通过 HTTP 访问网站不安全。强烈建议您将服务器设置成要求使用HTTPS 协议，请查阅 <a href=\"{docUrl}\">安全贴士↗</a>。",
     "Shared" : "已共享",
     "Shared with" : "共享给",
     "Shared by" : "共享人",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index c079907b54..be8d3486db 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -747,6 +747,8 @@ OC.L10N.register(
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "为了优化性能，正确配置后台任务非常重要。对于较大的实例，推荐配置为 'Cron'。详情请参考相关文档。",
     "Pick background job setting" : "选择后台任务设置",
     "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
+    "cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP." : "cron.php注册到 webcron 服务上，每5分钟通过HTTP执行一次cron.php。",
+    "Use system cron service to call the cron.php file every 5 minutes." : "使用系统定时任务服务每5分钟执行一次cron.php文件。",
     "The cron.php needs to be executed by the system user \"%s\"." : "cron.php 需要被系统用户 \"%s\" 执行。",
     "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "为了运行该功能，您需要 PHP posix 扩展。请参考 {linkstart}PHP 文档{linkend} 获取更多信息。",
     "Sharing" : "共享",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 74df3c728d..c64ea6c031 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -745,6 +745,8 @@
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "为了优化性能，正确配置后台任务非常重要。对于较大的实例，推荐配置为 'Cron'。详情请参考相关文档。",
     "Pick background job setting" : "选择后台任务设置",
     "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
+    "cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP." : "cron.php注册到 webcron 服务上，每5分钟通过HTTP执行一次cron.php。",
+    "Use system cron service to call the cron.php file every 5 minutes." : "使用系统定时任务服务每5分钟执行一次cron.php文件。",
     "The cron.php needs to be executed by the system user \"%s\"." : "cron.php 需要被系统用户 \"%s\" 执行。",
     "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "为了运行该功能，您需要 PHP posix 扩展。请参考 {linkstart}PHP 文档{linkend} 获取更多信息。",
     "Sharing" : "共享",