Improve zh_CN Translations. (#652)

Author: johnzhou721

databags/translate.ini

@@ -57,6 +57,7 @@ click_here_listen = Click here to listen
 
 ; Resources
 by = by
+space_after_by = true
 published = published
 as_seen_at = As seen at
 unknown_resource = Unknown resource type
@@ -189,6 +190,7 @@ click_here_listen = إضغط هنا للاستماع
 
 ; Resources
 by = بواسطة
+space_after_by = true
 published = نُشِرَ
 as_seen_at = كما رُئِيَ في
 unknown_resource = نوع المصدر غير معروف
@@ -303,6 +305,7 @@ click_here_listen = Clique aqui para ouvir
 
 ; Resources
 by = por
+space_after_by = true
 published = publicado
 as_seen_at = Como visto em
 unknown_resource = Tipo de recurso desconhecido
@@ -417,6 +420,7 @@ click_here_listen = Click here to listen
 
 ; Resources
 by = by
+space_after_by = true
 published = published
 as_seen_at = As seen at
 unknown_resource = Unknown resource type
@@ -531,6 +535,7 @@ click_here_listen = Haz clic aquí para escuchar
 
 ; Resources
 by = por
+space_after_by = true
 published = publicado
 as_seen_at = Como visto en
 unknown_resource = Recurso desconocido
@@ -645,6 +650,7 @@ click_here_listen = Cliquez ici pour écouter
 
 ; Resources
 by = par
+space_after_by = true
 published = publié
 as_seen_at = Vu à
 unknown_resource = Ressource de type inconnu
@@ -759,6 +765,7 @@ click_here_listen = Clicca qui per ascoltare
 
 ; Resources
 by = di
+space_after_by = true
 published = pubblicato
 as_seen_at = Come visto a
 unknown_resource = Tipo di risorsa sconosciuto
@@ -873,6 +880,7 @@ click_here_listen = Kliknij tu aby posłuchać
 
 ; Resources
 by = autor:
+space_after_by = true
 published = opublikowany
 as_seen_at = Widziane na
 unknown_resource = Nieznany typ zasobu
@@ -940,27 +948,29 @@ update_translation = 在Github上更新翻译
 ; Footer
 sitemap = 站点地图
 
-; Pagination
-previous = 上一次
-next = 下一次
+; Pagination (translated as previous page, next page)
+previous = 上一页
+next = 下一页
 
 ; Incomplete
 incomplete_text = 此页内容不完整。您可以帮助我们
 incomplete_link = 扩充
-incomplete_after_link_text = .
-incomplete_space_before_link = true
+incomplete_after_link_text = 。
+; no spaces between anything in Chinese
+incomplete_space_before_link = false
 incomplete_space_after_link = false
 
 ; Home
 welcome = 欢迎
 projects = 项目
 latest_news = 最新新闻
-meet_team = 遇见我们的蜜蜂团队
-keynoting = 正在成为主题！
-speaking = 正在演讲！
-tutorial = 正在给出一份教程！
+; meet our bee team at the following events
+meet_team = 在以下事件见到我们的蜜蜂团队
+keynoting = 将发表主题演讲！
+speaking = 将演讲！
+tutorial = 将讲授一个教程！
 come_see_us = 欢迎光临我们的展位！
-sprinting = 我们要竞赛了！
+sprinting = 我们将要冲刺了！
 ad_hoc_sponsor = 特设赞助商
 
 ; Projects
@@ -971,63 +981,72 @@ pun_before = 所以，为什么它被称为
 pun_after = ?
 attic_before = 该项目被分类为
 attic_link = 在阁楼里
-attic_after = . 它已不再被积极维护
-cookie_before = 本项目是
-cookie_after = 存根项目的模板。
-source_code = Source Code
-documentation = 源代码
+attic_after = 。它已不再被积极维护
+; lit. This project is a template project that can be used for Cookiecutter.
+; actual usage is <cookie_before> Cookiecutter <cookie_after>
+cookie_before = 本项目是可用于
+cookie_after = 的模板项目。
+source_code = 源代码
+documentation = 文档
 project_type = 项目类型
 maturity = 成熟度
-language = 语言
+; lit. programming language
+language = 编程语言
 platform = 平台
 
 ; Resources
 click_here_full_article = 点击此处阅读全文
 click_here_listen = 点击此处收听
 
 ; Resources
-by = 使用
-published = 已发布的
-as_seen_at = 如图所示
+by = 作者：
+space_after_by = false
+published = 发布于
+; lit. recorded at, since it's only videos AFAIK
+as_seen_at = 录于
 unknown_resource = 未知资源类型
 
 ; Members
-superpower = 超级成员
+superpower = 超能力
 member = 成员
 thanks_before_name = 非常感谢
-thanks_after_name = 他们的贡献！
+thanks_after_name = 所做的贡献！
 
 ; Blog
 posted_by = 由
-on = 发布在
+on = 在
+; chinese-specific
+post_posted_date = 发布
 next_entry = 下一个条目
-previous_entry = 当前条目
+previous_entry = 上一个条目
 
 ; News
 more_articles = ... 更多文章
 
 ; Events
 past_events = 过去的活动
 upcoming_events = 即将到来的活动
-running_sprint = BeeWare 将会举行一场竞赛
-what_is_a_sprint = 什么是竞赛
-sprint_description = 代码竞赛是通常在会议结束后举行的活动，与会者可以使用会议场地分组处理各种项目。了解更多关于竞赛如何与
-sprint_pycon_video = PyCon US 什么是竞赛 视频
+running_sprint = BeeWare 将会举行一场冲刺
+what_is_a_sprint = 什么是冲刺
+sprint_description = 代码冲刺是通常在会议结束后举行的活动，与会者可以使用会议场地分组处理各种项目。用
+sprint_pycon_video = PyCon US 什么是冲刺视频
+; chinese-specific
+post_sprint_pycon_video = 了解更多关于冲刺是如何工作的。
 challenge_coin = 挑战币
 date = 日期
 speakers = 演讲者
-sprinters = 竞赛者
+sprinters = 冲刺者
 and = 和
 event_more_info = 有关更多信息，请查看
 website = 网站
-speaking_before_title = 将发表演讲在
-speaking_after_title = ，发表题为
-keynoting_before_title = 将成为主题
-keynoting_after_title = ，发表题为
-tutorial_before_title = 将提供一份教程
-tutorial_ater_title = 题为
-sprint_helping = 将处于竞赛阶段，并将非常愿意帮助首次贡献者获得自己的辉煌
-sprint_helping_plural = 将处于竞赛阶段，并将非常愿意帮助首次贡献者获得自己的辉煌
+speaking_before_title = 将在
+speaking_after_title = 发表演讲，题为
+keynoting_before_title = 将在
+keynoting_after_title = 发表主题演讲，题为
+tutorial_before_title = 将在
+tutorial_after_title = 讲授一个教程，题为
+sprint_helping = 将在冲刺，并将非常愿意帮助首次贡献者获得自己的辉煌
+sprint_helping_plural = 将在冲刺，并将非常愿意帮助首次贡献者获得自己的辉煌
 
 ; Keep in touch
 required = 指明必填项

i18n/contents.pot

@@ -1293,8 +1293,8 @@ msgstr ""
 #: (content/community/behavior/code-of-conduct/contents+en.lr:page.gutter)
 msgid ""
 "This Code of Conduct is adapted from the [Contributor Covenant, version\n"
-"1.3.0](https://www.contributor-covenant.org/version/1/3/0/code-of-conduct."
-"html)"
+"1.3.0](https://www.contributor-covenant.org/version/1/3/0/code-of-"
+"conduct.html)"
 msgstr ""
 
 #: https://beeware.org/community/behavior/code-of-conduct/
@@ -3761,8 +3761,8 @@ msgid ""
 "  tutorial](https://github.com/search?"
 "q=repo%3Abeeware%2Fbeeware+label%3A%22good+first+issue%22+is%3Aissue+is%3Aopen&type=issues)\n"
 "- [The BeeWare\n"
-"  website](https://github.com/search?q=repo%3Abeeware%2Fbeeware.github."
-"io+label%3A%22good+first+issue%22+is%3Aissue+is%3Aopen&type=issues)"
+"  website](https://github.com/search?"
+"q=repo%3Abeeware%2Fbeeware.github.io+label%3A%22good+first+issue%22+is%3Aissue+is%3Aopen&type=issues)"
 msgstr ""
 
 #: https://beeware.org/contributing/first-time/what/
@@ -4240,8 +4240,8 @@ msgid ""
 "can be found on Read the Docs. For example, [Briefcase's\n"
 "documentation](https://briefcase.readthedocs.io) contains contribution\n"
 "guides for both\n"
-"[code](https://briefcase.readthedocs.io/en/stable/how-to/contribute-code."
-"html)\n"
+"[code](https://briefcase.readthedocs.io/en/stable/how-to/contribute-"
+"code.html)\n"
 "and\n"
 "[documentation](https://briefcase.readthedocs.io/en/stable/how-to/contribute-"
 "docs.html)."
@@ -4430,8 +4430,8 @@ msgstr ""
 msgid ""
 "- [Briefcase](https://briefcase.readthedocs.io/en/latest/how-to/contribute/"
 "index.html)\n"
-"- [Toga](https://toga.readthedocs.io/en/latest/how-to/contribute/index."
-"html)\n"
+"- [Toga](https://toga.readthedocs.io/en/latest/how-to/contribute/"
+"index.html)\n"
 "- [Rubicon\n"
 "  ObjC](https://rubicon-objc.readthedocs.io/en/latest/how-to/contribute/"
 "index.html)"
@@ -5781,8 +5781,8 @@ msgstr ""
 msgid ""
 "So you want to contribute to an Open Source project? Batavia is a great\n"
 "place to start. [Here are instructions on contributing to\n"
-"Batavia.](http://batavia.readthedocs.io/en/latest/how-to/contribute-code."
-"html)"
+"Batavia.](http://batavia.readthedocs.io/en/latest/how-to/contribute-"
+"code.html)"
 msgstr ""
 
 #: https://beeware.org/project/attic/batavia/
@@ -6314,8 +6314,8 @@ msgstr ""
 msgid ""
 "If you'd like to contribute to VOC development, we have a [guide for\n"
 "first time\n"
-"contributors](https://voc.readthedocs.io/en/latest/how-to/contribute-code."
-"html)."
+"contributors](https://voc.readthedocs.io/en/latest/how-to/contribute-"
+"code.html)."
 msgstr ""
 
 #: https://beeware.org/project/attic/voc/

templates/event.html

@@ -7,6 +7,7 @@
 {% set t_challenge_coin = transbag('translate', this.alt, 'challenge_coin') %}
 {% set t_sprint_description = transbag('translate', this.alt, 'sprint_description') %}
 {% set t_sprint_video = transbag('translate', this.alt, 'sprint_pycon_video') %}
+{% set t_post_sprint_pycon_video = transbag('translate', this.alt, 'post_sprint_pycon_video') %}
 {% set t_date = transbag('translate', this.alt, 'date') %}
 {% set t_speakers = transbag('translate', this.alt, 'speakers') %}
 {% set t_sprinters = transbag('translate', this.alt, 'sprinters') %}
@@ -44,7 +45,7 @@ <h1>{{ this.title }} ({{ this.event_type|title }})</h1>
   <p>{{ this.speaker|join(t_and) }} {% if this.speaker|length > 1 %}{{ t_sprint_helping_plural }}{% else %}{{ t_sprint_helping }}{% endif %} <a href="{{ '/contributing/challenge-coins/'|url(alt=this.alt) }}">{{ t_challenge_coin }}</a>.
   <p>{{ t_event_more_info }}<a href="{{ this.url }}">{{ this.title }} {{ t_website }}</a></p>
   <h3>{{ t_what_is_a_sprint }}</h3>
-  <p>{{ t_sprint_description }} <a href="https://www.youtube.com/watch?v=hOtKgFaFcz0">{{ t_sprint_video }}</a> </p>
+  <p>{{ t_sprint_description }} <a href="https://www.youtube.com/watch?v=hOtKgFaFcz0">{{ t_sprint_video }}</a> {{ t_post_sprint_pycon_video }} </p>
 {% endif %}
 <p><em>{{ this.description }}</em></p>
 {% endblock %}

templates/macros/article.html

@@ -2,17 +2,22 @@
 
 {% macro render_article_index(article) %}
   {% set t_click_here_article = transbag('translate', article.alt, 'click_here_full_article') %}
-  {% set t_by = transbag('translate', article.alt, 'by') %}
-  {% set t_by = transbag('translate', article.alt, 'published') %}
+  {% set t_by = transbag('translate', article.alt, 'by').strip() %}
+  {% set t_published = transbag('translate', article.alt, 'published') %}
+  {% set t_space_after_by = transbag('translate', article.alt, 'space_after_by').strip() %}
 
   <h2><a href="{{ article.url }}"><i class="fa fa-file-text" aria-hidden="true"></i> {{ article.title }}</a></h2>
-  <p>{{ t_by }} {{ article.author }}; {{ t_published }} {{ article.pub_date.strftime('%-d %B %Y') }}</p>
+  <p>
+    {{ t_by }}{% if t_space_after_by != 'false' %} {% endif %}{{ article.author }};
+    {{ t_published }} {{ article.pub_date.strftime('%-d %B %Y') }}
+  </p>
   <p>{{ article.description }}</p>
-  <h6><a href="{{ article.url }}">{{ t_click_here_article  }}</a></h6>
+  <h6><a href="{{ article.url }}">{{ t_click_here_article }}</a></h6>
 {% endmacro %}
 
 {% macro render_article(article) %}
+  {% set t_click_here_article = transbag('translate', article.alt, 'click_here_full_article') %}
   {{ article.description }}
 
-  <h6><a href="{{ article.url }}"></a>{{ t_click_here_article  }}</h6>
+  <h6><a href="{{ article.url }}">{{ t_click_here_article }}</a></h6>
 {% endmacro %}

templates/macros/blog.html

@@ -4,6 +4,7 @@
 
   {% set t_posted_by = transbag('translate', post.alt, 'posted_by') %}
   {% set t_on = transbag('translate', post.alt, 'on') %}
+  {% set t_post_posted_date = transbag('translate', post.alt, 'post_posted_date') %}
 
   {% if from_index %}
   <h2><a href="{{ post|url(alt=post.alt) }}">{{ post.title }}</a></h2>
@@ -16,7 +17,7 @@ <h2><a href="{{ post|url(alt=post.alt) }}">{{ post.title }}</a></h2>
     {% else %}
       {{ post.author }}
     {% endif %}
-    {{ t_on }} {{ post.pub_date.strftime('%-d %B %Y') }}
+    {{ t_on }} {{ post.pub_date.strftime('%-d %B %Y') }} {{ t_post_posted_date }}
   </p>
   {% endif %}
   {{ post.body }}

templates/macros/podcast.html

@@ -2,9 +2,15 @@
 
 {% macro render_podcast_index(episode) %}
   {% set t_click_here_listen = transbag('translate', episode.alt, 'click_here_listen') %}
+  {% set t_by = transbag('translate', episode.alt, 'by').strip() %}
+  {% set t_published = transbag('translate', episode.alt, 'published') %}
+  {% set t_space_after_by = transbag('translate', episode.alt, 'space_after_by').strip() %}
 
   <h2><a href="{{ episode.url }}"><i class="fa fa-headphones" aria-hidden="true"></i> {{ episode.title }}</a></h2>
-  <p>by {{ episode.author }}; published {{ episode.pub_date.strftime('%-d %B %Y') }}</p>
+  <p>
+    {{ t_by }}{% if t_space_after_by != 'false' %} {% endif %}{{ episode.author }};
+    {{ t_published }} {{ episode.pub_date.strftime('%-d %B %Y') }}
+  </p>
   <p>{{ episode.description }}</p>
   <h6><a href="{{ episode.url }}">{{ t_click_here_listen }}</a></h6>
 {% endmacro %}

templates/macros/video.html

@@ -2,11 +2,15 @@
 
 {% macro render_video_index(video) %}
   {% set t_as_seen_at = transbag('translate', video.alt, 'as_seen_at') %}
-  {% set t_by = transbag('translate', video.alt, 'by') %}
+  {% set t_by = transbag('translate', video.alt, 'by').strip() %}
   {% set t_published = transbag('translate', video.alt, 'published') %}
+  {% set t_space_after_by = transbag('translate', video.alt, 'space_after_by').strip() %}
 
   <h2><i class="fa fa-video-camera" aria-hidden="true"></i> {{ video.title }}</h2>
-  <p>{{ t_by }} {{ video.author }}; {{ t_published }} {{ video.pub_date.strftime('%-d %B %Y') }}</p>
+  <p>
+    {{ t_by }}{% if t_space_after_by != 'false' %} {% endif %}{{ video.author }};
+    {{ t_published }} {{ video.pub_date.strftime('%-d %B %Y') }}
+  </p>
   <iframe class="video" src="{{ video.url }}" frameborder="0" allowfullscreen></iframe>
   <p>{{ video.description }}</p>
   {% if video.event_url %}

templates/news.html

@@ -4,6 +4,7 @@
 {% set t_more_articles = transbag('translate', this.alt, 'more_articles') %}
 {% set t_on = transbag('translate', this.alt, 'on') %}
 {% set t_posted_by = transbag('translate', this.alt, 'posted_by') %}
+{% set t_post_posted_date = transbag('translate', this.alt, 'post_posted_date') %}
 
 {% block title %}{{ this.title }}{% endblock %}
 
@@ -45,7 +46,7 @@ <h3><a href="{{ child|url(alt=this.alt) }}">{{ child.title }}</a></h3>
       {% else %}
       {{ child.author }}
       {% endif %}
-      {{ t_on }} {{ child.pub_date }}
+      {{ t_on }} {{ child.pub_date }} {{ t_post_posted_date }}
     </p>
     {% endfor %}
     <a href="{{ '/news/buzz/'|url(alt=this.alt) }}">{{ t_more_articles }}</a>