justjavac · genment · Dec 8, 2018
diff --git a/LICENSE b/LICENSE
@@ -1,8 +1,8 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 Jsthon Wong
+Copyright (c) 2015-2017 Jsthon Wong, 2018 genment
 
-Based on English resources, copyright (c) 2015-2016 Toby Zerner
+Based on English resources, copyright (c) Toby Zerner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/composer.json b/composer.json
@@ -4,18 +4,18 @@
     "description": "Simplified Chinese language pack.",
     "keywords": ["locale"],
     "license": "MIT",
-    "version": "v0.1.0-beta.7",
+    "version": "v0.1.0-beta.8",
     "authors": [
         {
             "name": "Jsthon Wong",
             "email": "[email protected]"
         }
     ],
     "support": {
-        "source": "https://github.com/jsthon/flarum-ext-simplified-chinese"
+        "source": "https://github.com/Flarum-Chinese/flarum-ext-simplified-chinese"
     },
     "require": {
-        "flarum/core": "^0.1.0-beta.7"
+        "flarum/core": "^0.1.0-beta.8"
     },
     "extra": {
         "flarum-extension": {

diff --git a/extend.php b/extend.php
@@ -0,0 +1,12 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return new Flarum\Extend\LanguagePack;
diff --git a/locale/core.yml b/locale/core.yml
diff --git a/locale/flarum-akismet.yml b/locale/flarum-akismet.yml
@@ -19,3 +19,4 @@ flarum-akismet:
     post:
       akismet_flagged_text: Akismet 标记为垃圾内容
       not_spam_button: 非垃圾
+
diff --git a/locale/flarum-approval.yml b/locale/flarum-approval.yml
@@ -11,7 +11,7 @@ flarum-approval:
     permissions:
       approve_posts_label: 审核内容
       reply_without_approval_label: 回复无需审核
-      start_discussions_without_approval_label: 话题无需审核
+      start_discussions_without_approval_label: 发表话题无需审核
 
   # Translations in this namespace are used by the forum user interface.
   forum:
@@ -34,4 +34,4 @@ flarum-approval:
 
   # Translations in this namespace are referenced by two or more unique keys.
   ref:
-    awaiting_approval: 等待审核中
+    awaiting_approval: 等待审核中
diff --git a/locale/flarum-auth-facebook.yml b/locale/flarum-auth-facebook.yml
@@ -18,4 +18,4 @@ flarum-auth-facebook:
 
     # These translations are used in the Log In modal dialog.
     log_in:
-      with_facebook_button: 使用 Facebook 登入
+      with_facebook_button: 使用 Facebook 登录
diff --git a/locale/flarum-auth-github.yml b/locale/flarum-auth-github.yml
@@ -18,4 +18,4 @@ flarum-auth-github:
 
     # These translations are used in the Log In modal dialog.
     log_in:
-      with_github_button: 使用 GitHub 登入
+      with_github_button: 使用 GitHub 登录
diff --git a/locale/flarum-auth-twitter.yml b/locale/flarum-auth-twitter.yml
@@ -18,4 +18,4 @@ flarum-auth-twitter:
 
     # These translations are used in the Log In modal dialog.
     log_in:
-      with_twitter_button: 使用 Twitter 登入
+      with_twitter_button: 使用 Twitter 登录
diff --git a/locale/flarum-emoji.yml b/locale/flarum-emoji.yml
@@ -0,0 +1,13 @@
+flarum-emoji:
+
+  ##
+  # UNIQUE KEYS - The following keys are used in only one location each.
+  ##
+
+  # Translations in this namespace are used by the forum user interface.
+  forum:
+
+    # These translations are used by the composer (emoji autocompletion function).
+    composer:
+      emoji_tooltip: 插入 emoji 表情
+      type_to_search_text: 搜索 emoji 表情
diff --git a/locale/flarum-flags.yml b/locale/flarum-flags.yml
@@ -1,4 +1,9 @@
 flarum-flags:
+  ##
+  # 此处的 Flag 代表的是需要处理的事情，包括举报、审核。
+  # 我会根据不同的情况，翻译成相应的比较合适的词语。如果有误，请指出，谢谢。
+  # ---- genment 2018年12月05日，当前版本 0.1.0-beta.8
+  ##
 
   ##
   # UNIQUE KEYS - The following keys are used in only one location each.
@@ -9,53 +14,53 @@ flarum-flags:
 
     # These translations are used in the Permissions page of the admin interface.
     permissions:
-      flag_posts_label: 发起报告
-      view_flags_label: 查看报告
+      flag_posts_label: 发起举报
+      view_flags_label: 查看被举报的内容
 
     # These translations are used in the Flags Settings modal dialog.
     settings:
       guidelines_url_label: 社区规则 URL
-      title: 报告设置
+      title: 举报设置
 
   # Translations in this namespace are used by the forum user interface.
   forum:
 
     # These translations are used by the Flag Post modal dialog.
     flag_post:
-      confirmation_message: 谢谢你的提醒，我们很快会处理。
+      confirmation_message: 感谢你的举报，我们将尽快处理。
       dismiss_button: => core.ref.okay
       reason_inappropriate_label: 不恰当的言辞
-      reason_inappropriate_text: "内容的言辞不恰当 或违反了<a>社区规则</a>"
+      reason_inappropriate_text: "内容的言辞不恰当，辱骂、冒犯他人，或违反了我们的<a>社区规则</a>。"
       reason_off_topic_label: "主题分类不当"
-      reason_off_topic_text: 内容与主题分类不一致 应当移动到其它地方
+      reason_off_topic_text: 该话题与所在的话题分类不一致，应当发表到其他相应的分类中。
       reason_other_label: 其它原因
       reason_spam_label: 无意义的内容
-      reason_spam_text: 这些内容没有太多的意义
+      reason_spam_text: 对该话题毫无帮助、纯灌水、广告等等。
       submit_button: => flarum-flags.ref.flag_post
       title: => flarum-flags.ref.flag_post
 
     # These translations are used by the Flagged Posts dropdown, a.k.a. "the flag".
     flagged_posts:
-      empty_text: 没有新报告
-      item_text: "{username} 在 <em>{discussion}</em>"
+      empty_text: 没有待处理的报告
+      item_text: "{username} 发表于 <em>{discussion}</em>"
       title: => flarum-flags.ref.flagged_posts
       tooltip: => flarum-flags.ref.flagged_posts
 
     # These translations are used by the frame displayed around flagged posts.
     post:
-      dismiss_flag_button: 忽略报告
-      flagged_by_text: "由 {username} 报告"
-      flagged_by_with_reason_text: "{username} 报告了 {reason}"
+      dismiss_flag_button: 忽略该报告
+      flagged_by_text: "由 {username} 举报"
+      flagged_by_with_reason_text: "{username} 举报为 {reason}"
 
     # These translations are used by the post control buttons.
     post_controls:
-      flag_button: 报告
+      flag_button: 举报
 
   ##
-  # REUSED STRINGS - These keys should not be used directly in code!
+  # REUSED TRANSLATIONS - These keys should not be used directly in code!
   ##
 
   # Translations in this namespace are referenced by two or more unique keys.
   ref:
-    flag_post: 报告
-    flagged_posts: 内容报告
+    flag_post: 举报
+    flagged_posts: 待处理的报告
diff --git a/locale/flarum-likes.yml b/locale/flarum-likes.yml
@@ -17,13 +17,13 @@ flarum-likes:
     # These translations are used by the Notifications dropdown, a.k.a. "the bell".
     notifications:
       others_text: => core.ref.some_others
-      post_liked_text: "{username} 赞了你"  # Can be pluralized to agree with the number of users!
+      post_liked_text: "{username} 赞了你。"  # Can be pluralized to agree with the number of users!
 
     # These translations are displayed beneath individual posts.
     post:
       like_link: 点赞
-      liked_by_self_text: "{users} 赞了"  # Can be pluralized to agree with the number of users!
-      liked_by_text: "{users} 赞了|{users} 赞了"
+      liked_by_self_text: "{users} 赞了。"  # Can be pluralized to agree with the number of users!
+      liked_by_text: "{users} 赞了。|{users} 赞了。"
       others_link: => core.ref.some_others
       unlike_link: 取消赞
       you_text: => core.ref.you
@@ -34,4 +34,4 @@ flarum-likes:
 
     # These translations are used in the Settings page.
     settings:
-      notify_post_liked_label: 有人点赞我的内容
+      notify_post_liked_label: 有人点赞了我的内容
diff --git a/locale/flarum-lock.yml b/locale/flarum-lock.yml
@@ -16,7 +16,7 @@ flarum-lock:
 
     # These translations are displayed as tooltips for discussion badges.
     badge:
-      locked_tooltip: 锁定
+      locked_tooltip: 已被锁定
 
     # These translations are used by the discussion control buttons.
     discussion_controls:
@@ -29,9 +29,9 @@ flarum-lock:
 
     # These translations are displayed between posts in the post stream.
     post_stream:
-      discussion_locked_text: "{username} 锁定了话题"
-      discussion_unlocked_text: "{username} 解锁了话题"
+      discussion_locked_text: "{username} 锁定了话题。"
+      discussion_unlocked_text: "{username} 解锁了话题。"
 
     # These translations are used in the Settings page.
     settings:
-      notify_discussion_locked_label: 我的话题被锁定
+      notify_discussion_locked_label: 我发起的话题被锁定了
diff --git a/locale/flarum-markdown.yml b/locale/flarum-markdown.yml
@@ -0,0 +1,19 @@
+flarum-markdown:
+
+  ##
+  # UNIQUE KEYS - The following keys are used in only one location each.
+  ##
+
+  # Translations in this namespace are used by the forum user interface.
+  forum:
+
+    # These translations are used by the composer (emoji autocompletion function).
+    composer:
+      bold_tooltip: 添加粗体文字
+      code_tooltip: 插入代码
+      header_tooltip: 添加标题文字
+      italic_tooltip: 添加斜体文字
+      link_tooltip: 添加链接
+      ordered_list_tooltip: 添加有序列表
+      quote_tooltip: 插入引用
+      unordered_list_tooltip: 添加无序列表
diff --git a/locale/flarum-mentions.yml b/locale/flarum-mentions.yml
@@ -9,6 +9,7 @@ flarum-mentions:
 
     # These translations are used by the composer (reply autocompletion function).
     composer:
+      mention_tooltip: "@用户或者回复指定内容"
       reply_to_post_text: "回复 #{number}"
 
     # These translations are used by the Notifications dropdown, a.k.a. "the bell".
@@ -19,8 +20,8 @@ flarum-mentions:
 
     # These translations are displayed beneath individual posts.
     post:
-      mentioned_by_self_text: "{users} 回复了它"  # Can be pluralized to agree with the number of users!
-      mentioned_by_text: "{users} 回复了它"       # Can be pluralized to agree with the number of users!
+      mentioned_by_self_text: "{users} 回复了此内容。"  # Can be pluralized to agree with the number of users!
+      mentioned_by_text: "{users} 回复了此内容。"       # Can be pluralized to agree with the number of users!
       others_text: => core.ref.some_others
       quote_button: 引用
       reply_link: => core.ref.reply
@@ -33,4 +34,4 @@ flarum-mentions:
 
     # These translations are used in the user profile page and profile popup.
     user:
-      mentions_link: 提到用户
+      mentions_link: 被提到
diff --git a/locale/flarum-pusher.yml b/locale/flarum-pusher.yml
diff --git a/locale/flarum-statistics.yml b/locale/flarum-statistics.yml
@@ -0,0 +1,20 @@
+flarum-statistics:
+
+  ##
+  # UNIQUE KEYS - The following keys are used in only one location each.
+  ##
+
+  # Translations in this namespace are used by the admin interface.
+  admin:
+
+    # These translations are used in the Statistics dashboard widget.
+    statistics:
+      active_users_text: "{count} 个活跃用户"
+      discussions_heading: => core.ref.discussions
+      last_12_months_label: 最近 12 个月
+      last_28_days_label: 最近 28 天
+      last_7_days_label: 最近 7 天
+      posts_heading: => core.ref.posts
+      today_label: 今天
+      total_label: 总数
+      users_heading: => core.ref.users
diff --git a/locale/flarum-sticky.yml b/locale/flarum-sticky.yml
@@ -20,16 +20,16 @@ flarum-sticky:
 
     # These translations are used by the discussion control buttons.
     discussion_controls:
-      sticky_button: 置顶话题
+      sticky_button: => flarum-sticky.ref.sticky
       unsticky_button: 取消置顶
 
     # These translations are displayed between posts in the post stream.
     post_stream:
-      discussion_stickied_text: "{username} 置顶了话题"
-      discussion_unstickied_text: "{username} 取消置顶话题"
+      discussion_stickied_text: "{username} 置顶了话题。"
+      discussion_unstickied_text: "{username} 取消置顶话题。"
 
   ##
-  # REUSED STRINGS - These keys should not be used directly in code!
+  # REUSED TRANSLATIONS - These keys should not be used directly in code!
   ##
 
   # Translations in this namespace are referenced by two or more unique keys.

diff --git a/locale/flarum-subscriptions.yml b/locale/flarum-subscriptions.yml
@@ -28,27 +28,27 @@ flarum-subscriptions:
 
     # These translations are used in the Settings page.
     settings:
-      follow_after_reply_label: 自动关注我回复的话题
-      notify_new_post_label: 关注的话题被回复
+      follow_after_reply_label: 自动关注我回复过的话题
+      notify_new_post_label: 我关注的话题有新的回复
 
     # These translations are used in the subscription menu displayed to the right of the post stream.
     sub_controls:
       follow_button: => flarum-subscriptions.ref.follow
       following_button: => flarum-subscriptions.ref.following
-      following_text: 当有人回复此话题时提醒我
+      following_text: 当有人回复此话题时提醒我。
       ignoring_button: => flarum-subscriptions.ref.ignoring
-      ignoring_text: 不接收任何提醒并隐藏话题
+      ignoring_text: 不接收任何提醒，并隐藏该话题。（除非知道链接，否则将再也看不到该话题）
       not_following_button: 常规
-      not_following_text: "仅在有人@提到我时提醒我"
-      notify_alert_tooltip: 有新回复时通知提醒
-      notify_email_tooltip: 有新回复时发送邮件
+      not_following_text: "仅在有人@提到我时提醒我。"
+      notify_alert_tooltip: 有新回复时通过站内通知提醒
+      notify_email_tooltip: 有新回复时发送邮件提醒
 
   ##
-  # REUSED STRINGS - These keys should not be used directly in code!
+  # REUSED TRANSLATIONS - These keys should not be used directly in code!
   ##
 
   # Translations in this namespace are referenced by two or more unique keys.
   ref:
     follow: 关注
     following: 关注
-    ignoring: 忽视
+    ignoring: 忽视
diff --git a/locale/flarum-suspend.yml b/locale/flarum-suspend.yml
@@ -9,25 +9,29 @@ flarum-suspend:
 
     # These translations are used in the Permissions page of the admin interface.
     permissions:
-      suspend_users_label: 冻结用户
+      suspend_users_label: 禁言用户
 
   # Translations in this namespace are used by the forum user interface.
   forum:
+    # These translations are used in the suspension notifications
+    notifications:
+      user_suspended_text: "{username} 将你禁言 {timeReadable}。"
+      user_unsuspended_text: "{username} 将你解除禁言。"
 
     # These translations are used in the Suspend User modal dialog (admin function).
     suspend_user:
-      indefinitely_label: 永久冻结
-      limited_time_label: 自定义时间
+      indefinitely_label: 永久禁言
       limited_time_days_text: " 天"
-      not_suspended_label: 不冻结
-      status_heading: 冻结用户状态
+      limited_time_label: 自定义时间...
+      not_suspended_label: 不禁言
+      status_heading: 禁言状态
       submit_button: => core.ref.save_changes
-      title: "冻结 {username}"
+      title: "对 {username} 禁言"
 
     # These translations are displayed as tooltips for user badges.
     user_badge:
-      suspended_tooltip: 冻结
+      suspended_tooltip: 该用户已被禁言
 
     # These translations are found on the user profile page (admin function).
     user_controls:
-      suspend_button: 冻结
+      suspend_button: 禁言
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ flarum-akismet:
		post:
		akismet_flagged_text: Akismet 标记为垃圾内容
		not_spam_button: 非垃圾