reword Bug Squad on Marja's and Marcel's suggestion

1 files changed, 75 insertions, 153 deletions

diff --git a/langs/zh-cn/contribute.po b/langs/zh-cn/contribute.po
index b65af5b2b..11ea670e7 100644
--- a/langs/zh-cn/contribute.po
+++ b/langs/zh-cn/contribute.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2014 - 2017 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-# 
+#
 # Generated by extract2gettext.php
 # Domain: contribute
-# 
+#
 # include translation strings from:
 # en/contribute/index.php
-# 
+#
 # Translators:
 # xiao wenming <xwm-citcc5@hotmail.com>, 2015
 # zwpwjwtz <zwpwjwtz@126.com>, 2018
@@ -16,263 +16,185 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2017-10-25 21:02:08+0000\n"
+"POT-Creation-Date: 2021-07-25 15:34:05+0000\n"
 "PO-Revision-Date: 2018-04-05 11:52+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: "/web/en/contribute/index.php +12"
+#: "/web/en/contribute/index.php +13"
 msgid "Contribute to Mageia"
 msgstr "协助 Mageia"
 
-#: "/web/en/contribute/index.php +13"
+#: "/web/en/contribute/index.php +14"
 msgid "Here you can find out, how to contribute to the Mageia project"
 msgstr "在这里您可以找到如何协助 Mageia 项目"
 
-#: "/web/en/contribute/index.php +14"
+#: "/web/en/contribute/index.php +15"
 msgid "mageia, contribute, howto, operating system"
 msgstr "mageia, contribute, howto, operating system"
 
-#: "/web/en/contribute/index.php +27"
-msgid ""
-"Many people from all over the world gather to build Mageia &ndash; a Linux-"
-"based operating system <em>and</em> a <a href=\"../about/code-of-"
-"conduct/\">lively, fun community</a> for <a "
-"href=\"../about/values/\">building Free Software projects</a>."
+#: "/web/en/contribute/index.php +28"
+msgid "Many people from all over the world gather to build Mageia &ndash; a Linux-based operating system <em>and</em> a <a href=\"../about/code-of-conduct/\">lively, fun community</a> for <a href=\"../about/values/\">building Free Software projects</a>."
 msgstr "来自世界各地的人们一起建立了 Mageia &ndash; 一个以 Linux 为核心的操作系统<em>以及</em>一个<a href=\"../about/code-of-conduct/\">充满活力，且有趣的社区</a> 来 <a href=\"../about/values/\">进行 Free Software 项目</a>."
 
-#: "/web/en/contribute/index.php +28"
-msgid ""
-"Contributing is open to anyone, this is Free Software! If you are curious "
-"and willing to join, there are things you can do, depending on your time and"
-" skills; you will always find someone to welcome and help/mentor you if "
-"needed so that your contribution to the project can be as good as it can be!"
+#: "/web/en/contribute/index.php +29"
+msgid "Contributing is open to anyone, this is Free Software! If you are curious and willing to join, there are things you can do, depending on your time and skills; you will always find someone to welcome and help/mentor you if needed so that your contribution to the project can be as good as it can be!"
 msgstr "这就是 Free Software，任何人都可以贡献！如果您有兴趣且希望加入，总是有您可以参与的事务，根据您的时间和技能而定；您总是能找到人欢迎并愿意协助和指导您，让您对这个项目的贡献达到极致！"
 
-#: "/web/en/contribute/index.php +29"
+#: "/web/en/contribute/index.php +30"
 msgid "Check what you could do below!"
 msgstr "看看您可以做什么！"
 
-#: "/web/en/contribute/index.php +33"
+#: "/web/en/contribute/index.php +34"
 msgid "Contribution entry points"
 msgstr "想要和 Mageia 共同进步，看这里"
 
-#: "/web/en/contribute/index.php +36"
+#: "/web/en/contribute/index.php +37"
 msgid "Do you want to join Mageia community?"
 msgstr "您希望加入 Mageia 社区吗？"
 
-#: "/web/en/contribute/index.php +38"
-msgid ""
-"Stop by the <a href=\"https://forums.mageia.org/\">forums</a> support "
-"section and check if you can answer a question."
+#: "/web/en/contribute/index.php +39"
+msgid "Stop by the <a href=\"https://forums.mageia.org/\">forums</a> support section and check if you can answer a question."
 msgstr "去<a href=\"https://forums.mageia.org/\">论坛</a> 支持板块，看看有没有什么你可以回答的问题。"
 
-#: "/web/en/contribute/index.php +39"
-msgid ""
-"Talk about the project to people around you, on your blog, your Twitter "
-"account, at your work place."
+#: "/web/en/contribute/index.php +40"
+msgid "Talk about the project to people around you, on your blog, your Twitter account, at your work place."
 msgstr "在您的blog或微博上，在您的办公室内，与您身边的人聊聊这个项目。"
 
-#: "/web/en/contribute/index.php +40"
-msgid ""
-"If you encounter a bug you can reproduce consistently, <a "
-"href=\"https://bugs.mageia.org/\">submit a bug report</a>."
+#: "/web/en/contribute/index.php +41"
+msgid "If you encounter a bug you can reproduce consistently, <a href=\"https://bugs.mageia.org/\">submit a bug report</a>."
 msgstr "如果您遇到一个可以重现的 bug，<a href=\"https://bugs.mageia.org/\"> 请提交这个错误报告</a>。"
 
-#: "/web/en/contribute/index.php +41"
+#: "/web/en/contribute/index.php +42"
 msgid "Make a <a href=\"../donate/\">donation</a>!"
 msgstr "给我们<a href=\"../donate/\">捐款</a>!"
 
-#: "/web/en/contribute/index.php +42"
-msgid ""
-"Stop by a Mageia event, like a test day to find, reproduce and help resolve "
-"bugs."
+#: "/web/en/contribute/index.php +43"
+msgid "Stop by a Mageia event, like a test day to find, reproduce and help resolve bugs."
 msgstr "来参加 Mageia 的活动，如测试日去发现、重现并帮助解决错误。"
 
-#: "/web/en/contribute/index.php +43"
-msgid ""
-"Subscribe to a team discussion list and follow what happens there, try to "
-"see how you can bring something useful to it."
+#: "/web/en/contribute/index.php +44"
+msgid "Subscribe to a team discussion list and follow what happens there, try to see how you can bring something useful to it."
 msgstr "订阅团队讨论的邮件，查阅有什么问题，并提供您的宝贵意见。"
 
-#: "/web/en/contribute/index.php +44"
-msgid ""
-"Learn about free software, open source collaboration in general, and Mageia "
-"in particular."
+#: "/web/en/contribute/index.php +45"
+msgid "Learn about free software, open source collaboration in general, and Mageia in particular."
 msgstr "学习关于一般自由软件，开源软件协作的方式，特别是 Mageia。"
 
-#: "/web/en/contribute/index.php +45"
-msgid ""
-"If you are a student, consider talking to your tutor about participating "
-"into the project as part of your studies; you don't specifically need to be "
-"studying Computer Science to do so."
+#: "/web/en/contribute/index.php +46"
+msgid "If you are a student, consider talking to your tutor about participating into the project as part of your studies; you don't specifically need to be studying Computer Science to do so."
 msgstr "如果您是学生，请考虑与您的导师讨论能否将参与此项目作为您学习的一部分；您不必非得是主修计算机科学才能向老师提出这想法。"
 
-#: "/web/en/contribute/index.php +53"
+#: "/web/en/contribute/index.php +54"
 msgid "Roles"
 msgstr "角色"
 
-#: "/web/en/contribute/index.php +56"
+#: "/web/en/contribute/index.php +57"
 msgid "Helping users &amp; advocating the project"
 msgstr "帮助用户 &amp; 拥护这个项目"
 
-#: "/web/en/contribute/index.php +57"
-msgid ""
-"Want to welcome and help new users or share tips with experienced ones? In "
-"<a href=\"https://wiki.mageia.org/en/IRC\">IRC channels</a>, <a "
-"href=\"https://forums.mageia.org/\">forums</a>, <a "
-"href=\"https://wiki.mageia.org/en/Mailing_lists\">mailing-lists</a>, local "
-"events? Just get in touch with us via one of these channels and share the "
-"fun!"
+#: "/web/en/contribute/index.php +58"
+msgid "Want to welcome and help new users or share tips with experienced ones? In <a href=\"https://wiki.mageia.org/en/IRC\">IRC channels</a>, <a href=\"https://forums.mageia.org/\">forums</a>, <a href=\"https://wiki.mageia.org/en/Mailing_lists\">mailing-lists</a>, local events? Just get in touch with us via one of these channels and share the fun!"
 msgstr "想要欢迎并帮助新用户或者和其他人分享您的小技巧?在 <a href=\"https://wiki.mageia.org/en/IRC\">IRC 频道</a>, <a href=\"https://forums.mageia.org/\">论坛</a>, <a href=\"https://wiki.mageia.org/en/Mailing_lists\">邮件列表</a>,本地活动？赶快通过上述方式与我们保持联络，一起分享快乐！"
 
-#: "/web/en/contribute/index.php +60"
+#: "/web/en/contribute/index.php +61"
 msgid "Writing, copywriting and documenting"
 msgstr "写文章、文案与文档"
 
-#: "/web/en/contribute/index.php +61"
-msgid ""
-"You have a taste for practical, clear, concise, proofread, nice writing? You"
-" like to take the challenge of explaining clearly complex ideas or systems "
-"and teaching others? You know how to mix form &amp; content to push the "
-"right message? Get in touch with our <a "
-"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
-"team</a>!"
+#: "/web/en/contribute/index.php +62"
+msgid "You have a taste for practical, clear, concise, proofread, nice writing? You like to take the challenge of explaining clearly complex ideas or systems and teaching others? You know how to mix form &amp; content to push the right message? Get in touch with our <a href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation team</a>!"
 msgstr "您喜欢简洁、实用、好读的文章吗？您喜欢挑战怎么将复杂的想法或系统清楚地向其他人解释并教学吗？您指导如何结合表单格式&amp; 内容，将正确的资讯推行出去吗？请与我们的<a href=\"https://wiki.mageia.org/en/Documentation_team\">文档组</a>联系！"
 
-#: "/web/en/contribute/index.php +64"
+#: "/web/en/contribute/index.php +65"
 msgid "Translating"
 msgstr "翻译"
 
-#: "/web/en/contribute/index.php +65"
-msgid ""
-"Mageia is localized in more than 180 languages! Clarifying, completing, "
-"improving translations of software, guides, tutorials, Web sites, marketing "
-"material, etc. happens thanks to the effort of so many contributors. Join <a"
-" "
-"href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">them</a>!"
+#: "/web/en/contribute/index.php +66"
+msgid "Mageia is localized in more than 180 languages! Clarifying, completing, improving translations of software, guides, tutorials, Web sites, marketing material, etc. happens thanks to the effort of so many contributors. Join <a href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">them</a>!"
 msgstr "Mageia 已经被翻译超过 180 种语言！整理，完成，改善软件、指南、教程、站点、营销资料。感谢这么多贡献者的付出。加入<a href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">他们</a>!"
 
-#: "/web/en/contribute/index.php +68"
+#: "/web/en/contribute/index.php +69"
 msgid "Triaging"
 msgstr "分类"
 
-#: "/web/en/contribute/index.php +69"
-msgid ""
-"Bugs happen! And some get reported. So, logically they need to be triaged to"
-" make the task of the packagers/developers fixing them easier: validation "
-"(is the bug reproducible?), collecting the needed debugging info from the "
-"reporter, assigning the report properly. <a "
-"href=\"https://wiki.mageia.org/en/Bug_Squad\">Grow the Triage team</a> and "
-"be the link between users who report bugs in the forums or mailing-lists, "
-"and the <a href=\"https://bugs.mageia.org/\">Mageia Bugzilla</a> used by "
-"developers."
+#: "/web/en/contribute/index.php +70"
+#, fuzzy
+msgid "Bugs happen! And some get reported. So, logically they need to be triaged to make the task of the packagers/developers fixing them easier: validation (is the bug reproducible?), collecting the needed debugging info from the reporter, assigning the report properly."
 msgstr "出现错误！其中有些被回报。因此，理论上它们需要被分类以便让打包者与开发者能较容易的修复：验证（此问题能否被重现？），从报告者那里收集必要的调试信息，制定给负责人等等。<a href=\"https://wiki.mageia.org/en/Bug_Squad\">请加入分类团队</a> 来作为在论坛或者邮件列表中回报错误的用户，与使用<a href=\"https://bugs.mageia.org/\">Mageia Bugzilla</a> 的开发者间的桥梁。"
 
+#: "/web/en/contribute/index.php +71"
+msgid "Our %sBug Squad%s takes care of that and more, grow this team and play an essential part in %sMageia's bug%s solving."
+msgstr ""
+
 #: "/web/en/contribute/index.php +72"
+msgid "https://wiki.mageia.org/en/Bug_Squad"
+msgstr ""
+
+#: "/web/en/contribute/index.php +76"
 msgid "Testing &amp; <abbr title=\"Quality Assurance\">QA</abbr>"
 msgstr "测试 &amp; <abbr title=\"Quality Assurance\">QA</abbr>"
 
-#: "/web/en/contribute/index.php +73"
-msgid ""
-"We can't ship software if we are not confident it works well! <a "
-"href=\"https://wiki.mageia.org/en/QA_Team\">Testers and QA</a> people make "
-"sure what we do (software, packages, ISO's, Web sites) match our "
-"expectations for quality before they reach users."
+#: "/web/en/contribute/index.php +77"
+msgid "We can't ship software if we are not confident it works well! <a href=\"https://wiki.mageia.org/en/QA_Team\">Testers and QA</a> people make sure what we do (software, packages, ISO's, Web sites) match our expectations for quality before they reach users."
 msgstr "如果我们不能确信软件正确运作，我们不能发布它！<a href=\"https://wiki.mageia.org/en/QA_Team\">测试人员和 QA </a>在做的就是这件事，确认我们的软件、包、ISO镜像与网站等的质量没有问题。"
 
-#: "/web/en/contribute/index.php +76"
+#: "/web/en/contribute/index.php +80"
 msgid "Marketing, Communication &amp; Evangelism"
 msgstr "宣传、交流与推广"
 
-#: "/web/en/contribute/index.php +76"
+#: "/web/en/contribute/index.php +80"
 msgid "Graphic &amp; UI design"
 msgstr "平面 &amp; UI 设计"
 
-#: "/web/en/contribute/index.php +77"
-msgid ""
-"Better understanding of who uses and contributes to the project to help them"
-" even more, making sure the Mageia voice is consistent and heard, that's a "
-"job for the <a href=\"https://wiki.mageia.org/en/Atelier_Team\">Atelier "
-"team</a> (Marketing and Communication), on both global and local scales."
+#: "/web/en/contribute/index.php +81"
+msgid "Better understanding of who uses and contributes to the project to help them even more, making sure the Mageia voice is consistent and heard, that's a job for the <a href=\"https://wiki.mageia.org/en/Atelier_Team\">Atelier team</a> (Marketing and Communication), on both global and local scales."
 msgstr "<a href=\"https://wiki.mageia.org/en/Atelier_Team\">Atelier 团队</a>（市场与联络团队）需要充分了解 Mageia 用户和开发者的想法，以便使 Mageia 在地区和世界范围内保持良好的声誉和影响力。"
 
-#: "/web/en/contribute/index.php +78"
-msgid ""
-"Software isn't only about code neither is Mageia only about technology. So "
-"make it human, practical and beautiful! If you have a talent and experience "
-"in graphic design, ergonomics <a "
-"href=\"https://wiki.mageia.org/en/Atelier_Team\">join the Atelier team</a>!"
+#: "/web/en/contribute/index.php +82"
+msgid "Software isn't only about code neither is Mageia only about technology. So make it human, practical and beautiful! If you have a talent and experience in graphic design, ergonomics <a href=\"https://wiki.mageia.org/en/Atelier_Team\">join the Atelier team</a>!"
 msgstr "软件不只是代码，Mageia 也不只限于技术。因此，我们希望它能够更人性化、更实用、更美观。如果您在图形界面设计或人体工程学方面有独到的见解和经历，那就加入<a href=\"https://wiki.mageia.org/en/Atelier_Team\">Atelier 团队</a>吧！"
 
-#: "/web/en/contribute/index.php +81"
+#: "/web/en/contribute/index.php +85"
 msgid "Coding &amp; packaging"
 msgstr "编程 &amp; 打包"
 
-#: "/web/en/contribute/index.php +82"
-msgid ""
-"Contribute to the core of the distribution with your technical skills! "
-"Adding, fixing, patching and maintaining software to be included in the "
-"distribution, from upstream projects or from Mageia-specific sources. Join "
-"the <a href=\"https://wiki.mageia.org/en/Packagers_Team\">Packagers "
-"team</a>!"
+#: "/web/en/contribute/index.php +86"
+msgid "Contribute to the core of the distribution with your technical skills! Adding, fixing, patching and maintaining software to be included in the distribution, from upstream projects or from Mageia-specific sources. Join the <a href=\"https://wiki.mageia.org/en/Packagers_Team\">Packagers team</a>!"
 msgstr "通过您的技术支持，直接贡献到核心发行版！加入、修复、打补丁与维护将要加入到发行版的软件，不论是来自上游的项目或者 Mageia 专属的来源。加入<a href=\"https://wiki.mageia.org/en/Packagers_Team\">打包团队</a>!"
 
-#: "/web/en/contribute/index.php +85"
+#: "/web/en/contribute/index.php +89"
 msgid "Web, tools, systems design &amp; administration"
 msgstr "网络、工具、系统设计&amp; 管理"
 
-#: "/web/en/contribute/index.php +86"
-msgid ""
-"Mageia depends on infrastructure and tools that enable everyone to "
-"collaborate. These need experts to build, maintain, develop, provide and "
-"manage servers, connections, security, applications, data flow, etc. It "
-"takes from <a href=\"https://wiki.mageia.org/en/Sysadmin_Team\">system "
-"administrators</a> to <a "
-"href=\"https://wiki.mageia.org/en/Atelier_Team\">Web "
-"designers/developers/integrators</a> to manage this huge task."
+#: "/web/en/contribute/index.php +90"
+msgid "Mageia depends on infrastructure and tools that enable everyone to collaborate. These need experts to build, maintain, develop, provide and manage servers, connections, security, applications, data flow, etc. It takes from <a href=\"https://wiki.mageia.org/en/Sysadmin_Team\">system administrators</a> to <a href=\"https://wiki.mageia.org/en/Atelier_Team\">Web designers/developers/integrators</a> to manage this huge task."
 msgstr "Mageia依赖于每个人都能协作的基础架构和工具。这需要专家去构建、维护、开发、提供和管理服务器、网络连接、安全、应用程序、数据流量等等。这需要 <a href=\"https://wiki.mageia.org/en/Sysadmin_Team\">系统管理组</a>以及 <a href=\"https://wiki.mageia.org/en/Atelier_Team\">网站设计师/开发者/集成者</a> 去完成这个大任务。"
 
-#: "/web/en/contribute/index.php +89"
+#: "/web/en/contribute/index.php +93"
 msgid "Mirroring"
 msgstr "镜像"
 
-#: "/web/en/contribute/index.php +90"
-msgid ""
-"Making all the software provided by Mageia available requires <a "
-"href=\"https://mirrors.mageia.org/\">several mirrors around the world</a>, "
-"to distribute ISO's and software packages. If you have some disk space and "
-"bandwidth to share, please <a "
-"href=\"https://wiki.mageia.org/en/Mirrors_policy#How_to_.28become_a.29_mirror.3F\">see"
-" how you can provide an official Mageia mirror</a>."
+#: "/web/en/contribute/index.php +94"
+msgid "Making all the software provided by Mageia available requires <a href=\"https://mirrors.mageia.org/\">several mirrors around the world</a>, to distribute ISO's and software packages. If you have some disk space and bandwidth to share, please <a href=\"https://wiki.mageia.org/en/Mirrors_policy#How_to_.28become_a.29_mirror.3F\">see how you can provide an official Mageia mirror</a>."
 msgstr "让 Mageia 提供的所有软件可以被获取，需要<a href=\"https://mirrors.mageia.org/\">世界各地有镜像</a>, 协助分发 ISO 和软件包。如果您有多余的磁盘空间与贷款分享给大家，请到<a href=\"https://wiki.mageia.org/en/Mirrors_policy#How_to_.28become_a.29_mirror.3F\">查看如何建立一个 Mageia 官方镜像站</a>。"
 
-#: "/web/en/contribute/index.php +93"
+#: "/web/en/contribute/index.php +97"
 msgid "Donating"
 msgstr "捐助"
 
-#: "/web/en/contribute/index.php +94"
-msgid ""
-"Financial donations help us allocate specific tasks, secure our "
-"infrastructure, fund events, goodies &amp; transportation. <a href"
-"=\"../thank-you/\">200+ persons already expressed their trust in us</a> with"
-" their money, hardware or other resources. We keep a <a "
-"href=\"../about/reports/\">public record of what we get and how we use "
-"it</a>."
+#: "/web/en/contribute/index.php +98"
+msgid "Financial donations help us allocate specific tasks, secure our infrastructure, fund events, goodies &amp; transportation. <a href=\"../thank-you/\">200+ persons already expressed their trust in us</a> with their money, hardware or other resources. We keep a <a href=\"../about/reports/\">public record of what we get and how we use it</a>."
 msgstr "财务捐款可以帮助我们分配特殊任务，确保我们的基础架构，赞助活动，商品&amp; 交通。 <a href=\"../thank-you/\">超过200人基于信任</a> 赞助了他们的金钱，硬件或者其他资源。我们保持<a href=\"../about/reports/\">公开资金的收入与流向</a>。"
 
-#: "/web/en/contribute/index.php +97"
+#: "/web/en/contribute/index.php +101"
 msgid "Designing, experimenting, revealing the unknown"
 msgstr "设计、实验、发现未知领域"
 
-#: "/web/en/contribute/index.php +98"
-msgid ""
-"Ideas are great, actionable prototypes are even better. The Mageia project "
-"is not only about making a different Linux distribution but also about "
-"building new products and experiences with it and with the data around it."
+#: "/web/en/contribute/index.php +102"
+msgid "Ideas are great, actionable prototypes are even better. The Mageia project is not only about making a different Linux distribution but also about building new products and experiences with it and with the data around it."
 msgstr "提出您的想法，若有可行的方案更好。Mageia 项目并不只是做一个不一样的 Linux 发行版，也是一个新的产品与体验的建立。"