From 8d4a32dc27ec65b0467b88fac6a9c06b1fd92514 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Tue, 28 Mar 2017 09:24:51 +0000 Subject: [PATCH] Latest translations and fallbacks --- public/language/es/search.json | 2 +- public/language/zh-CN/admin/manage/flags.json | 2 +- public/language/zh-CN/admin/manage/users.json | 8 +++---- .../zh-CN/admin/settings/reputation.json | 2 +- public/language/zh-CN/groups.json | 2 +- public/language/zh-CN/notifications.json | 24 +++++++++---------- public/language/zh-CN/user.json | 2 +- public/language/zh-CN/users.json | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/public/language/es/search.json b/public/language/es/search.json index bcdf74fc68..0d2d0a26b9 100644 --- a/public/language/es/search.json +++ b/public/language/es/search.json @@ -8,7 +8,7 @@ "posted-by": "Publicado por", "in-categories": "En categorías", "search-child-categories": "Buscar categorías hijas", - "has-tags": "Has tags", + "has-tags": "Hay etiquetas", "reply-count": "Número de Respuestas", "at-least": "De mínimo", "at-most": "De máximo", diff --git a/public/language/zh-CN/admin/manage/flags.json b/public/language/zh-CN/admin/manage/flags.json index 7c5a744488..882722c716 100644 --- a/public/language/zh-CN/admin/manage/flags.json +++ b/public/language/zh-CN/admin/manage/flags.json @@ -4,7 +4,7 @@ "by-user-search": "根据用户名搜索被举报帖子", "category": "版块", "sort-by": "排序", - "sort-by.most-flags": "最多举报", + "sort-by.most-flags": "举报最多", "sort-by.most-recent": "最近", "search": "搜索", "dismiss-all": "全部忽略", diff --git a/public/language/zh-CN/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json index bb4ceadcbd..d8570e5977 100644 --- a/public/language/zh-CN/admin/manage/users.json +++ b/public/language/zh-CN/admin/manage/users.json @@ -10,7 +10,7 @@ "temp-ban": "暂时封禁用户", "unban": "解禁用户", "reset-lockout": "重设闭锁", - "reset-flags": "重设标记", + "reset-flags": "重设举报", "delete": "删除用户", "purge": "删除用户和内容", "download-csv": "下载CSV", @@ -23,7 +23,7 @@ "pills.top-posters": "发帖最多", "pills.top-rep": "声望最高", "pills.inactive": "不活跃", - "pills.flagged": "最多举报", + "pills.flagged": "举报最多", "pills.banned": "被封禁", "pills.search": "搜寻用户", @@ -43,7 +43,7 @@ "users.username": "用户名", "users.email": "电子邮件", "users.postcount": "发帖数", - "users.reputation": "威望", + "users.reputation": "声望", "users.flags": "举报", "users.joined": "注册时间", "users.last-online": "最后在线", @@ -67,7 +67,7 @@ "alerts.button-ban-x": "封禁 %1 名用户", "alerts.unban-success": "用户已解封!", "alerts.lockout-reset-success": "闭锁已重置！", - "alerts.flag-reset-success": "标记已重置！", + "alerts.flag-reset-success": "举报已重置！", "alerts.no-remove-yourself-admin": "你无法撤销自己的管理员身份！", "alerts.make-admin-success": "这些用户现在是管理员了。", "alerts.confirm-remove-admin": "你确定要移除管理员吗？", diff --git a/public/language/zh-CN/admin/settings/reputation.json b/public/language/zh-CN/admin/settings/reputation.json index 97876e5a1b..e6f9640f81 100644 --- a/public/language/zh-CN/admin/settings/reputation.json +++ b/public/language/zh-CN/admin/settings/reputation.json @@ -5,5 +5,5 @@ "votes-are-public": "所有投票是公开的", "thresholds": "活动阈值", "min-rep-downvote": "踩帖子所需要声望的最小值", - "min-rep-flag": "举报帖子所需要声望的最小值" + "min-rep-flag": "举报帖子需要的最小声望" } \ No newline at end of file diff --git a/public/language/zh-CN/groups.json b/public/language/zh-CN/groups.json index 04d79c4fe2..f99c7d23b1 100644 --- a/public/language/zh-CN/groups.json +++ b/public/language/zh-CN/groups.json @@ -27,7 +27,7 @@ "details.disableJoinRequests": "禁止申请加入用户组", "details.grant": "授予/取消管理权", "details.kick": "踢出用户组", - "details.kick_confirm": "您确定要将此成员从群组中移除吗？", + "details.kick_confirm": "您确定要将此成员从用户组中移除吗？", "details.owner_options": "用户组管理", "details.group_name": "用户组名", "details.member_count": "用户组成员数", diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json index 56564fc7cd..ae58756a48 100644 --- a/public/language/zh-CN/notifications.json +++ b/public/language/zh-CN/notifications.json @@ -10,15 +10,15 @@ "return_to": "返回 %1", "new_notification": "新通知", "you_have_unread_notifications": "您有未读的通知。", - "all": "All", - "topics": "Topics", - "replies": "Replies", - "chat": "Chats", - "follows": "Follows", - "upvote": "Upvotes", - "new-flags": "New Flags", - "my-flags": "Flags assigned to me", - "bans": "Bans", + "all": "所有", + "topics": "主题", + "replies": "回复", + "chat": "聊天", + "follows": "关注", + "upvote": "顶", + "new-flags": "新举报", + "my-flags": "指派举报给我", + "bans": "封禁", "new_message_from": "来自 %1 的新消息", "upvoted_your_post_in": "%1 在 %2 点赞了您的帖子。", "upvoted_your_post_in_dual": "%1 和 %2 在 %3 赞了您的帖子。", @@ -26,8 +26,8 @@ "moved_your_post": "您的帖子已被 %1 移动到了 %2", "moved_your_topic": "%1 移动到了 %2", "user_flagged_post_in": "%1 在 %2 标记了一个帖子", - "user_flagged_post_in_dual": "%1 和 %2 在 %3 标记了一个帖子", - "user_flagged_post_in_multiple": "%1 和 %2 个其他人在 %3 标记了一个帖子", + "user_flagged_post_in_dual": "%1 和 %2 在 %3 举报了一个帖子", + "user_flagged_post_in_multiple": "%1 和 %2 个其他人在 %3 举报了一个帖子", "user_flagged_user": "%1 举报了 (%2) 的用户资料", "user_flagged_user_dual": "%1 和 %2 举报了 (%3) 的用户资料", "user_flagged_user_multiple": "%1 和其他 %2 人举报了 (%3) 的用户资料", @@ -40,7 +40,7 @@ "user_started_following_you_multiple": "%1 和 %2 个其他人关注了您。", "new_register": "%1 发出了注册请求", "new_register_multiple": "有 %1 条注册申请等待批准。", - "flag_assigned_to_you": "Flag %1 has been assigned to you", + "flag_assigned_to_you": "举报 %1 已经被指派给你", "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已全面激活。", "email-confirm-error-message": "验证您电子邮箱地址时出现了问题。可能是因为验证码无效或已过期。", diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json index 46bacccea6..1b0307e789 100644 --- a/public/language/zh-CN/user.json +++ b/public/language/zh-CN/user.json @@ -131,5 +131,5 @@ "info.email-history": "历史邮箱", "info.moderation-note": "版主留言", "info.moderation-note.success": "修改未保存", - "info.moderation-note.add": "Add note" + "info.moderation-note.add": "添加注解" } \ No newline at end of file diff --git a/public/language/zh-CN/users.json b/public/language/zh-CN/users.json index 253d4db756..a6a2267467 100644 --- a/public/language/zh-CN/users.json +++ b/public/language/zh-CN/users.json @@ -2,7 +2,7 @@ "latest_users": "最新会员", "top_posters": "发帖排行", "most_reputation": "声望排行", - "most_flags": "最多举报", + "most_flags": "举报最多", "search": "搜索", "enter_username": "输入用户名搜索", "load_more": "加载更多",