Merge branch 'master' of https://github.com/NodeBB/NodeBB

install/package.json

@@ -83,13 +83,13 @@
         "nodebb-plugin-dbsearch": "4.0.7",
         "nodebb-plugin-emoji": "^3.0.0",
         "nodebb-plugin-emoji-android": "2.0.0",
-        "nodebb-plugin-markdown": "8.10.4",
+        "nodebb-plugin-markdown": "8.11.0",
         "nodebb-plugin-mentions": "2.7.3",
         "nodebb-plugin-soundpack-default": "1.0.0",
         "nodebb-plugin-spam-be-gone": "0.6.7",
         "nodebb-rewards-essentials": "0.1.2",
         "nodebb-theme-lavender": "5.0.11",
-        "nodebb-theme-persona": "10.1.29",
+        "nodebb-theme-persona": "10.1.30",
         "nodebb-theme-slick": "1.2.28",
         "nodebb-theme-vanilla": "11.1.11",
         "nodebb-widget-essentials": "4.0.17",

public/language/sr/error.json

@@ -26,9 +26,9 @@
     "invalid-pagination-value": "Неважећа вредност приликом нумерисања страница, мора бити најмање %1 а највише %2 ",
     "username-taken": "Корисничко име је заузето",
     "email-taken": "Адреса е-поште је заузета",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Није вам дозвољено да шаљете поруке док не потврдите вашу е-пошту, кликните овде да то учините.",
-    "email-not-confirmed-chat": "Није вам дозвољено да ћаскате док не оверите вашу е-пошту, кликните овде да то учините.",
+    "email-not-confirmed-chat": "Није вам дозвољено да ћаскате док не потврдите вашу е-пошту, кликните овде да то учините.",
-    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
+    "email-not-confirmed-email-sent": "Ваша е-пошта још увек није потврђена, проверите ваше пријемно сандуче. Неће вам бити дозвољено да шаљете поруке или ћаскате док не потврдите е-пошту.",
     "no-email-to-confirm": "Форум захтева потврду е-поште, кликните овде да бисте навели е-пошту",
     "email-confirm-failed": "Потврда е-поште није успела, молимо вас да покушате касније.",
     "confirm-email-already-sent": "Е-порука за потврду је већ послата, молимо вас да сачекате %1 минут(а) да бисте послали други.",

public/language/zh-CN/admin/manage/digest.json

@@ -1,21 +1,21 @@
 {
 	"lead": "以下是摘要发送状态及时间列表",
-	"disclaimer": "Please be advised that email delivery is not guaranteed, due to the nature of email technology. Many variables factor into whether an email sent to the recipient server is ultimately delivered into the user's inbox, including server reputation, blacklisted IP addresses, and whether DKIM/SPF/DMARC is configured.",
+	"disclaimer": "请注意，由于email技术本身的原因，邮件发送无法保证送达。有很多因素都会导致邮件无法送达用户的收件箱，比如服务拒绝，IP地址黑名单，DNS记录DKIM/SPF/DMARC类型配置。",
 	"disclaimer-continued": "成功发送意味道消息被 NodeBB 成功发送且被接收人服务器收到。但这并不等同于邮件发送到了收件箱中。为了确保消息可以准确送达，我们建议使用第三方的邮件服务，例如<a href=\"https://sendgrid.com/why-sendgrid/\">SendGrid</a>。",
 
 	"user": "用户",
 	"subscription": "订阅类型",
 	"last-delivery": "上次成功通知",
 	"default": "系统默认",
-	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
+	"default-help": "<em>System default</em> 表示用户尚未明确覆盖摘要的全局论坛设置，该设置当前为： “<strong>%1</strong>“",
 	"resend": "重发摘要",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "您确认要手动执行这个摘要吗？",
 	"resent-single": "摘要重发操作完成",
-	"resent-day": "Daily digest resent",
+	"resent-day": "已发送每日摘要",
-	"resent-week": "Weekly digest resent",
+	"resent-week": "已发送每周摘要",
-	"resent-month": "Monthly digest resent",
+	"resent-month": "已发送每月摘要",
 	"null": "从不",
 	"manual-run": "手动运行摘要：",
 
-	"no-delivery-data": "No delivery data found"
+	"no-delivery-data": "找不到递交的数据"
 }

public/language/zh-CN/admin/settings/post.json

@@ -12,7 +12,7 @@
 	"restrictions-new": "新用户限制",
 	"restrictions.post-queue": "启用发帖队列",
 	"restrictions.post-queue-rep-threshold": "忽略发帖队列的威望值",
-	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
+	"restrictions.groups-exempt-from-post-queue": "选择会被从提交队列豁免的分组",
 	"restrictions-new.post-queue": "启用新用户限制",
 	"restrictions.post-queue-help": "启用发帖队列会将新用户的发帖放入审核队列",
 	"restrictions-new.post-queue-help": "启用新用户限制将对新用户创建的帖子设置限制",

public/language/zh-CN/email.json

@@ -34,7 +34,7 @@
     "notif.chat.cta": "点击这里继续会话",
     "notif.chat.unsub.info": "根据您的订阅设置，为您发送此聊天提醒。",
     "notif.post.unsub.info": "根据您的订阅设置，为您发送此回帖提醒。",
-    "notif.post.unsub.one-click": "Alternatively, unsubscribe from future emails like this, by clicking",
+    "notif.post.unsub.one-click": "或者通过点击来取消订阅邮件",
     "notif.cta": "点击这里前往论坛",
     "notif.cta-new-reply": "查看帖子",
     "notif.cta-new-chat": "查看聊天",

public/language/zh-CN/error.json

@@ -26,9 +26,9 @@
     "invalid-pagination-value": "无效的分页数值，必须介于 %1 和 %2 之间",
     "username-taken": "此用户名已被占用",
     "email-taken": "此电子邮箱已被占用",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "在您的电子邮件账户被确认前，您不能发帖。",
     "email-not-confirmed-chat": "您的电子邮箱尚未确认，无法聊天，请点击这里确认您的电子邮箱。",
-    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
+    "email-not-confirmed-email-sent": "您的电子邮件账户尚未确认，请检查您的收件箱。在电子邮件帐户被确认前您不能发帖和聊天。",
     "no-email-to-confirm": "本论坛需要电子邮箱确认，请点击这里输入电子邮箱地址",
     "email-confirm-failed": "我们无法确认您的电子邮箱，请重试",
     "confirm-email-already-sent": "确认邮件已发出，如需重新发送请等待 %1 分钟后再试。",