Update i18n

4 files changed, 163 insertions, 187 deletions

diff --git a/langs/zh-cn/calendar.po b/langs/zh-cn/calendar.po
index b44f60921..e298b0a70 100644
--- a/langs/zh-cn/calendar.po
+++ b/langs/zh-cn/calendar.po
@@ -2,101 +2,89 @@
 # Copyright (C) 2014 - 2014 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-# 
+#
 # Generated by extract2gettext.php
 # Domain: calendar
-# 
+#
 # include translation strings from:
 # en/calendar/index.php
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-16 20:51:20+0000\n"
+"POT-Creation-Date: 2021-07-16 16:12:48+0200\n"
 "PO-Revision-Date: 2017-09-20 01:01+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\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/calendar/index.php +13"
+#: "/web/en/calendar/index.php +14"
 msgid "events"
 msgstr "活动"
 
-#: "/web/en/calendar/index.php +18"
+#: "/web/en/calendar/index.php +19"
 msgid "meetings &amp; organization"
 msgstr "会议 &amp; 组织"
 
-#: "/web/en/calendar/index.php +23"
+#: "/web/en/calendar/index.php +24"
 msgid "development &amp; release plan"
 msgstr "开发 &amp; 发布计划"
 
-#: "/web/en/calendar/index.php +28"
+#: "/web/en/calendar/index.php +29"
 msgid "mentoring"
 msgstr "指导"
 
-#: "/web/en/calendar/index.php +60"
+#: "/web/en/calendar/index.php +61"
 msgid "Mageia calendar"
 msgstr "Mageia 日历"
 
-#: "/web/en/calendar/index.php +61"
-msgid ""
-"Mageia calendar for organization, events, development schedule and more."
+#: "/web/en/calendar/index.php +62"
+msgid "Mageia calendar for organization, events, development schedule and more."
 msgstr "Mageia 日历，用于组织管理、活动、开发计划等更多方面。"
 
-#: "/web/en/calendar/index.php +62"
+#: "/web/en/calendar/index.php +63"
 msgid "mageia, linux, calendar, events"
 msgstr "mageia, linux, calendar, events，日历，活动"
 
-#: "/web/en/calendar/index.php +71"
+#: "/web/en/calendar/index.php +73"
 msgid "Calendar"
 msgstr "日历"
 
-#: "/web/en/calendar/index.php +83"
-msgid ""
-"This calendar shows all Mageia events, <a "
-"href=\"https://wiki.mageia.org/en/Meetings\">team meetings</a>, development "
-"planning milestones and possibly more."
+#: "/web/en/calendar/index.php +85"
+msgid "This calendar shows all Mageia events, <a href=\"https://wiki.mageia.org/en/Meetings\">team meetings</a>, development planning milestones and possibly more."
 msgstr "该日历显示全部的 Mageia 活动，<a href=\"https://wiki.mageia.org/en/Meetings\">团队会议</a>、开发计划里程碑和更多的活动。"
 
-#: "/web/en/calendar/index.php +84"
-msgid ""
-"It is public and available to all. Only Mageia Board and Council members and"
-" team leaders have a write access to it."
+#: "/web/en/calendar/index.php +86"
+msgid "It is public and available to all. Only Mageia Board and Council members and team leaders have a write access to it."
 msgstr "它向公众开放，每个人都可以获取该日历。仅 Mageia 董事会和委员会成员和团队领导者对此拥有写入权限。"
 
-#: "/web/en/calendar/index.php +85"
-msgid ""
-"For any comment, addition, change to this calendar, feel free to contact us "
-"through:"
+#: "/web/en/calendar/index.php +87"
+msgid "For any comment, addition, change to this calendar, feel free to contact us through:"
 msgstr "如对该日历有任何评论、增加或改动，请随时通过下面方式联系我们："
 
-#: "/web/en/calendar/index.php +87"
-msgid ""
-"your <a href=\"https://wiki.mageia.org/en/\">team</a> leader or "
-"representative,"
+#: "/web/en/calendar/index.php +89"
+msgid "your <a href=\"https://wiki.mageia.org/en/\">team</a> leader or representative,"
 msgstr "您所在 <a href=\"https://wiki.mageia.org/en/\">团队</a> 领导者或代表，"
 
-#: "/web/en/calendar/index.php +88"
-msgid ""
-"<a href=\"irc://irc.freenode.net/#mageia-dev\">#mageia-dev</a> on Freenode,"
+#: "/web/en/calendar/index.php +90"
+#, fuzzy
+msgid "<a href=\"ircs://irc.libera.chat:6697/#mageia-dev\">#mageia-dev</a> on Libera.Chat,"
 msgstr "Freenode 频道 <a href=\"irc://irc.freenode.net/#mageia-dev\">#mageia-dev</a>，"
 
-#: "/web/en/calendar/index.php +89"
-msgid ""
-"<a href=\"mailto:mageia-contact@mageia.org\">mageia-contact@mageia.org</a> "
-"in last resort."
+#: "/web/en/calendar/index.php +91"
+msgid "<a href=\"mailto:mageia-contact@mageia.org\">mageia-contact@mageia.org</a> in last resort."
 msgstr "最后 <a href=\"mailto:mageia-contact@mageia.org\">mageia-contact@mageia.org</a>。"
 
-#: "/web/en/calendar/index.php +93"
+#: "/web/en/calendar/index.php +95"
 msgid "ICS files"
 msgstr "ICS 文件"
 
-#: "/web/en/calendar/index.php +94"
+#: "/web/en/calendar/index.php +96"
 msgid "You may get read-only access directly to these .ics files:"
 msgstr "您可以对这些 .ics 文件直接进行只读访问："
diff --git a/langs/zh-cn/community.po b/langs/zh-cn/community.po
index ee68965f7..a3ccf4d2b 100644
--- a/langs/zh-cn/community.po
+++ b/langs/zh-cn/community.po
@@ -2,300 +2,292 @@
 # Copyright (C) 2014 - 2018 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-# 
+#
 # Generated by extract2gettext.php
 # Domain: community
-# 
+#
 # include translation strings from:
 # en/community/index.php
-# 
+#
 # Translators:
 # zwpwjwtz <zwpwjwtz@126.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2018-04-27 23:24:40+0000\n"
+"POT-Creation-Date: 2021-07-16 16:12:52+0200\n"
 "PO-Revision-Date: 2018-10-01 15:45+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/community/index.php +13"
+#: "/web/en/community/index.php +14"
 msgid "Mageia Community"
 msgstr "Mageia 社区"
 
-#: "/web/en/community/index.php +14"
-msgid ""
-"Mageia Community Central is the place where all contributors and users can "
-"find the latest news about Mageia and learn more about what to do in the "
-"project."
+#: "/web/en/community/index.php +15"
+msgid "Mageia Community Central is the place where all contributors and users can find the latest news about Mageia and learn more about what to do in the project."
 msgstr "Mageia 社区中心是贡献者与用户获取 Mageia 最新消息和了解本项目的地方。"
 
-#: "/web/en/community/index.php +15"
+#: "/web/en/community/index.php +16"
 msgid "mageia, community, news, tools, tasks"
 msgstr "mageia，社区, 新闻, 工具, 任务"
 
-#: "/web/en/community/index.php +31"
+#: "/web/en/community/index.php +32"
 msgid "Mageia Community Central"
 msgstr "Mageia 社区中心"
 
-#: "/web/en/community/index.php +33"
+#: "/web/en/community/index.php +34"
 msgid "https://blog.mageia.org/en/"
 msgstr "https://blog.mageia.org/en/"
 
-#: "/web/en/community/index.php +33"
+#: "/web/en/community/index.php +34"
 msgid "Blog"
 msgstr "Blog"
 
-#: "/web/en/community/index.php +34"
+#: "/web/en/community/index.php +35"
 msgid "https://planet.mageia.org/en/"
 msgstr "https://planet.mageia.org/en/"
 
-#: "/web/en/community/index.php +34"
+#: "/web/en/community/index.php +35"
 msgid "Planet"
 msgstr "星球"
 
-#: "/web/en/community/index.php +35"
+#: "/web/en/community/index.php +36"
 msgid "https://wiki.mageia.org/en/IRC"
 msgstr "https://wiki.mageia.org/en/IRC"
 
-#: "/web/en/community/index.php +36"
+#: "/web/en/community/index.php +37"
 msgid "https://forum.mageia.org/en/"
 msgstr "https://forum.mageia.org/en/"
 
-#: "/web/en/community/index.php +36"
+#: "/web/en/community/index.php +37"
 msgid "Forums"
 msgstr "论坛"
 
-#: "/web/en/community/index.php +37"
+#: "/web/en/community/index.php +38"
 msgid "Mailing-lists"
 msgstr "邮件列表"
 
-#: "/web/en/community/index.php +38"
+#: "/web/en/community/index.php +39"
 msgid "https://wiki.mageia.org/"
 msgstr "https://wiki.mageia.org/"
 
-#: "/web/en/community/index.php +40"
+#: "/web/en/community/index.php +41"
 msgid "Mageia Applications Database"
 msgstr "Mageia 应用程序数据库"
 
-#: "/web/en/community/index.php +41"
+#: "/web/en/community/index.php +42"
 msgid "Calendar"
 msgstr "日历"
 
-#: "/web/en/community/index.php +42"
+#: "/web/en/community/index.php +43"
 msgid "People"
 msgstr "人士"
 
-#: "/web/en/community/index.php +61"
+#: "/web/en/community/index.php +62"
 msgid "Localised news"
 msgstr "本地新闻"
 
-#: "/web/en/community/index.php +64"
+#: "/web/en/community/index.php +65"
 msgid "News in English"
 msgstr "国际区新闻"
 
-#: "/web/en/community/index.php +79"
+#: "/web/en/community/index.php +80"
 msgid "How to contribute?"
 msgstr "如何贡献？"
 
-#: "/web/en/community/index.php +81"
+#: "/web/en/community/index.php +82"
 msgid "Start here"
 msgstr "从这里开始"
 
-#: "/web/en/community/index.php +82"
+#: "/web/en/community/index.php +83"
 msgid "and meet us on <a href=\"https://wiki.mageia.org/en/IRC\">IRC</a>."
 msgstr "在 <a href=\"https://wiki.mageia.org/en/IRC\">IRC</a>上与我们交流。"
 
-#: "/web/en/community/index.php +83"
+#: "/web/en/community/index.php +84"
 msgid "You can also <a href=\"../donate/\">support financially</a> the project!"
 msgstr "您也可以对本项目进行 <a href=\"../donate/\">资金支持</a>！"
 
-#: "/web/en/community/index.php +86"
+#: "/web/en/community/index.php +87"
 msgid "Toolbox"
 msgstr "工具箱"
 
-#: "/web/en/community/index.php +88"
+#: "/web/en/community/index.php +89"
 msgid "Wiki</a> &larr; collaborative documentation"
 msgstr "维基</a> &larr; 协作文档"
 
-#: "/web/en/community/index.php +89"
+#: "/web/en/community/index.php +90"
 msgid "Bugzilla</a> &larr; to report bugs"
 msgstr "Bugzilla</a> &larr; 报告问题"
 
-#: "/web/en/community/index.php +95"
+#: "/web/en/community/index.php +96"
 msgid "For developers &amp; packagers"
 msgstr "适用于开发者 &amp; 打包者"
 
-#: "/web/en/community/index.php +97"
+#: "/web/en/community/index.php +98"
 msgid "Subversion"
 msgstr "Subversion"
 
-#: "/web/en/community/index.php +98"
+#: "/web/en/community/index.php +99"
 msgid "Git</a> code repositories"
 msgstr "Git</a> 代码仓库"
 
-#: "/web/en/community/index.php +99"
+#: "/web/en/community/index.php +100"
 msgid "Packages submission queue"
 msgstr "软件包提交队列"
 
-#: "/web/en/community/index.php +100"
+#: "/web/en/community/index.php +101"
 msgid "unmaintained packages"
 msgstr "未维护的软件包"
 
-#: "/web/en/community/index.php +101"
+#: "/web/en/community/index.php +102"
 msgid "Global QA report"
 msgstr "全面 QA 报告"
 
-#: "/web/en/community/index.php +106"
+#: "/web/en/community/index.php +107"
 msgid "Conversations"
 msgstr "会话"
 
-#: "/web/en/community/index.php +107"
+#: "/web/en/community/index.php +108"
 msgid "... or, how to get in touch with us? Easy:"
 msgstr "... 或者说，如何与我们取得联系？容易得很："
 
-#: "/web/en/community/index.php +109"
-msgid "IRC</a> on Freenode"
-msgstr "IRC</a> on Freenode"
-
 #: "/web/en/community/index.php +110"
+msgid "IRC</a> on Libera.Chat"
+msgstr ""
+
+#: "/web/en/community/index.php +111"
 msgid "\"https://wiki.mageia.org/en/Mailing_lists\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Mailing_lists\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +113"
+#: "/web/en/community/index.php +114"
 msgid "in real life!"
 msgstr "真实生活中！"
 
-#: "/web/en/community/index.php +114"
+#: "/web/en/community/index.php +115"
 msgid "\"https://wiki.mageia.org/en/Events\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Events\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +114"
+#: "/web/en/community/index.php +115"
 msgid "during events!"
 msgstr "重大活动！"
 
-#: "/web/en/community/index.php +124"
+#: "/web/en/community/index.php +125"
 msgid "Teams you can join!"
 msgstr "您可以加入的团队！"
 
-#: "/web/en/community/index.php +126"
+#: "/web/en/community/index.php +127"
 msgid "\"https://wiki.mageia.org/en/Atelier_team\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Atelier_team\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +126"
+#: "/web/en/community/index.php +127"
 msgid "Atelier"
 msgstr "工作室"
 
-#: "/web/en/community/index.php +127"
+#: "/web/en/community/index.php +128"
 msgid "\"https://wiki.mageia.org/en/Documentation_team\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Documentation_team\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +127"
+#: "/web/en/community/index.php +128"
 msgid "Documentation"
 msgstr "文档"
 
-#: "/web/en/community/index.php +128"
+#: "/web/en/community/index.php +129"
 msgid "\"https://wiki.mageia.org/en/Packagers_Team\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Packagers_Team\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +128"
+#: "/web/en/community/index.php +129"
 msgid "Packaging"
 msgstr "打包"
 
-#: "/web/en/community/index.php +129"
+#: "/web/en/community/index.php +130"
 msgid "\"https://wiki.mageia.org/en/QA_Team\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/QA_Team\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +129"
+#: "/web/en/community/index.php +130"
 msgid "Testing &amp; <abbr title=\"Quality Assurance\">QA</abbr>"
 msgstr "测试 &amp; <abbr title=\"Quality Assurance\">QA</abbr>"
 
-#: "/web/en/community/index.php +130"
-msgid ""
-"\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\" "
-"hreflang=\"en\""
+#: "/web/en/community/index.php +131"
+msgid "\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +130"
+#: "/web/en/community/index.php +131"
 msgid "Translation"
 msgstr "翻译"
 
-#: "/web/en/community/index.php +131"
+#: "/web/en/community/index.php +132"
 msgid "\"https://wiki.mageia.org/en/Sysadmin_Team\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Sysadmin_Team\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +131"
+#: "/web/en/community/index.php +132"
 msgid "Systems &amp; infrastructure administration"
 msgstr "系统 &amp; 架构管理"
 
-#: "/web/en/community/index.php +132"
+#: "/web/en/community/index.php +133"
 msgid "\"https://wiki.mageia.org/en/Bugsquad\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Bugsquad\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +132"
+#: "/web/en/community/index.php +133"
 msgid "Bugs triaging"
 msgstr "Bugs 筛选"
 
-#: "/web/en/community/index.php +136"
+#: "/web/en/community/index.php +137"
 msgid "Mageia"
 msgstr "Mageia"
 
-#: "/web/en/community/index.php +138"
+#: "/web/en/community/index.php +139"
 msgid "More about Mageia"
 msgstr "更多关于 Mageia"
 
-#: "/web/en/community/index.php +139"
-msgid ""
-"Our <a href=\"../about/code-of-conduct/\">code of conduct</a> and <a "
-"href=\"../about/values/\">values</a>"
+#: "/web/en/community/index.php +140"
+msgid "Our <a href=\"../about/code-of-conduct/\">code of conduct</a> and <a href=\"../about/values/\">values</a>"
 msgstr "我们的 <a href=\"../about/code-of-conduct/\">行为准则</a> 与 <a href=\"../about/values/\">价值观</a>"
 
-#: "/web/en/community/index.php +140"
+#: "/web/en/community/index.php +141"
 msgid "\"https://wiki.mageia.org/en/Org\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Org\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +140"
+#: "/web/en/community/index.php +141"
 msgid "Our governance model</a> and structure:"
 msgstr "我们的管理模式</a> 与结构："
 
-#: "/web/en/community/index.php +142"
+#: "/web/en/community/index.php +143"
 msgid "\"https://wiki.mageia.org/en/Special:Search?search=teams\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Special:Search?search=teams\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +142"
+#: "/web/en/community/index.php +143"
 msgid "Teams"
 msgstr "团队"
 
-#: "/web/en/community/index.php +143"
+#: "/web/en/community/index.php +144"
 msgid "\"https://wiki.mageia.org/en/Org_Council\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Org_Council\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +143"
+#: "/web/en/community/index.php +144"
 msgid "the Council"
 msgstr "委员会"
 
-#: "/web/en/community/index.php +144"
+#: "/web/en/community/index.php +145"
 msgid "\"https://wiki.mageia.org/en/Org_Board\" hreflang=\"en\""
 msgstr "\"https://wiki.mageia.org/en/Org_Board\" hreflang=\"en\""
 
-#: "/web/en/community/index.php +144"
+#: "/web/en/community/index.php +145"
 msgid "the Board"
 msgstr "董事会"
 
-#: "/web/en/community/index.php +146"
-msgid ""
-"<a href=\"../donate/\">Donations</a> &amp; <a "
-"href=\"../about/reports/\">reports</a>."
+#: "/web/en/community/index.php +147"
+msgid "<a href=\"../donate/\">Donations</a> &amp; <a href=\"../about/reports/\">reports</a>."
 msgstr "<a href=\"../donate/\">捐助</a> &amp; <a href=\"../about/reports/\">报告</a>。"
 
-#: "/web/en/community/index.php +150"
-msgid ""
-"This page needs you! <a href=\"https://wiki.mageia.org/en/Web_team\">Join "
-"the Web team</a>!"
+#: "/web/en/community/index.php +151"
+msgid "This page needs you! <a href=\"https://wiki.mageia.org/en/Web_team\">Join the Web team</a>!"
 msgstr "该页面需要您的帮助！<a href=\"https://wiki.mageia.org/en/Web_team\">加入网络团队吧</a>！"
+
+#~ msgid "IRC</a> on Freenode"
+#~ msgstr "IRC</a> on Freenode"
diff --git a/langs/zh-cn/downloads/get.po b/langs/zh-cn/downloads/get.po
index 99a663d64..585223495 100644
--- a/langs/zh-cn/downloads/get.po
+++ b/langs/zh-cn/downloads/get.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2021-03-06 18:20:47+0000\n"
+"POT-Creation-Date: 2021-07-16 16:12:50+0200\n"
 "PO-Revision-Date: 2021-02-17 00:21+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
@@ -187,7 +187,8 @@ msgid "If you still encounter this error and think IT SHOULD NOT HAPPEN &ndash;
 msgstr "如果您持续遇到此类觉得不应该出现的错误，请告知我们："
 
 #: "/web/en/downloads/get/index.php +357"
-msgid "directly on <a href=\"irc://irc.freenode.net/#mageia-atelier\">#mageia-atelier on Freenode IRC</a>,"
+#, fuzzy
+msgid "directly on <a href=\"ircs://irc.libera.chat:6697/#mageia-atelier\">#mageia-atelier on Libera.Chat IRC</a>,"
 msgstr "在 <a href=\"irc://irc.freenode.net/#mageia-atelier\">Freenode IRC 的 #mageia-atelier</a> 里直接上报，"
 
 #: "/web/en/downloads/get/index.php +358"
diff --git a/langs/zh-cn/support.po b/langs/zh-cn/support.po
index 64f28f581..00a24fe27 100644
--- a/langs/zh-cn/support.po
+++ b/langs/zh-cn/support.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2021-02-28 13:34:04+0000\n"
+"POT-Creation-Date: 2021-07-16 16:12:45+0200\n"
 "PO-Revision-Date: 2018-01-24 17:46+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
@@ -107,179 +107,174 @@ msgstr ""
 msgid "Mageia 8 will be supported until August 31st, 2022."
 msgstr "Mageia 1 支持到2012年12月1日。"
 
-#: "/web/en/support/index.php +58"
+#: "/web/en/support/index.php +57"
 #, fuzzy
-msgid "Mageia 7 will be supported until May 31st, 2021."
+msgid "Mageia 7 was supported until June 30th, 2021."
 msgstr "Mageia 6 的支持于 2019 年 1 月 16 日结束。"
 
 #: "/web/en/support/index.php +58"
-msgid "Plus three months after Mageia 8 release."
-msgstr ""
-
-#: "/web/en/support/index.php +58"
-#, fuzzy
-msgid "Mageia 7 was supported until May 31st, 2021."
-msgstr "Mageia 6 的支持于 2019 年 1 月 16 日结束。"
-
-#: "/web/en/support/index.php +60"
-#, fuzzy
-msgid "Mageia 6 will be supported until September 30th, 2019."
-msgstr "Mageia 4 的支持于 2015 年 9 月 19 日结束。"
-
-#: "/web/en/support/index.php +60"
 #, fuzzy
 msgid "Mageia 6 was supported until September 30th, 2019."
 msgstr "Mageia 4 的支持于 2015 年 9 月 19 日结束。"
 
-#: "/web/en/support/index.php +62"
+#: "/web/en/support/index.php +60"
 msgid "Mageia 5 was supported until December 31st, 2017."
 msgstr "Mageia 5 的支持于 2017 年 12 月 31 日结束。"
 
-#: "/web/en/support/index.php +63"
+#: "/web/en/support/index.php +61"
 msgid "More details and advice are available on our %swiki page%s and from %sour blog%s."
 msgstr "您可以在我们的 %s wiki 页面 %s 及 %s博客%s 上找到更多的细节和建议。"
 
-#: "/web/en/support/index.php +64"
+#: "/web/en/support/index.php +62"
 msgid "https://wiki.mageia.org/en/From_Mageia_5_to_6"
 msgstr "https://wiki.mageia.org/en/From_Mageia_5_to_6"
 
-#: "/web/en/support/index.php +65"
+#: "/web/en/support/index.php +63"
 msgid "https://blog.mageia.org/en/2017/11/07/mageia-5-eol-postponed/"
 msgstr "https://blog.mageia.org/en/2017/11/07/mageia-5-eol-postponed/"
 
-#: "/web/en/support/index.php +68"
+#: "/web/en/support/index.php +66"
 msgid "Mageia 4 was supported until September 19th, 2015."
 msgstr "Mageia 4 的支持于 2015 年 9 月 19 日结束。"
 
-#: "/web/en/support/index.php +69"
+#: "/web/en/support/index.php +67"
 msgid "Mageia 3 was supported until November 26th, 2014."
 msgstr "Mageia 3 支持到2014年11月26日。"
 
-#: "/web/en/support/index.php +70"
+#: "/web/en/support/index.php +68"
 msgid "Mageia 2 was supported until November 22nd, 2013."
 msgstr "Mageia 2 支持到2013年11月22日。"
 
-#: "/web/en/support/index.php +71"
+#: "/web/en/support/index.php +69"
 msgid "Mageia 1 was supported until December 1st, 2012."
 msgstr "Mageia 1 支持到2012年12月1日。"
 
-#: "/web/en/support/index.php +76"
+#: "/web/en/support/index.php +74"
 msgid "If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:"
 msgstr "如果您需要关于您所安装的Mageia发行版或本项目的帮助、信息或指导，您可以通过以下方式联系我们："
 
-#: "/web/en/support/index.php +79"
+#: "/web/en/support/index.php +77"
 msgid "<a href=\"https://forums.mageia.org/en/\">Community support forums</a> in English &ndash; see <a href=\"https://forums.mageia.org/en/viewforum.php?f=20\">other Mageia community forums</a> for support in your language;"
 msgstr "<a href=\"https://forums.mageia.org/en/\">社区支持论坛</a> （英语） &ndash; 到您使用的语言的<a href=\"https://forums.mageia.org/en/viewforum.php?f=20\">其他 Mageia 社区论坛</a> 寻求支持;"
 
-#: "/web/en/support/index.php +80"
-msgid "IRC channels where you can discuss live with other Mageia users and contributors: <a href=\"irc://irc.freenode.net/#mageia\" hreflang=\"en\">#mageia</a> or other localized <a href=\"https://wiki.mageia.org/en/IRC#channels_in_other_languages\">channels</a>;"
+#: "/web/en/support/index.php +78"
+#, fuzzy
+msgid "IRC channels where you can discuss live with other Mageia users and contributors: <a href=\"ircs://irc.libera.chat:6697/#mageia\" hreflang=\"en\">#mageia</a> or other localized <a href=\"https://wiki.mageia.org/en/IRC#channels_in_other_languages\">channels</a>;"
 msgstr "您可以和其他Mageia用户和贡献者在线讨论的IRC频道： <a href=\"irc://irc.freenode.net/#mageia\" hreflang=\"en\">#mageia</a>或其他本地化的 <a href=\"https://wiki.mageia.org/en/IRC#channels_in_other_languages\">频道</a>;"
 
-#: "/web/en/support/index.php +81"
+#: "/web/en/support/index.php +79"
 msgid "our <a href=\"https://wiki.mageia.org/en/\">Wiki</a> (still rough at the time, we are working on it!);"
 msgstr "我们的 <a href=\"https://wiki.mageia.org/en/\">Wiki</a> (目前很粗糙, 我们正在努力改进！);"
 
-#: "/web/en/support/index.php +82"
+#: "/web/en/support/index.php +80"
 msgid "our <a href=\"https://wiki.mageia.org/en/Mailing_lists\" hreflang=\"en\">mailing-lists</a>;"
 msgstr "我们的<a href=\"https://wiki.mageia.org/en/Mailing_lists\" hreflang=\"en\">邮件列表</a>;"
 
-#: "/web/en/support/index.php +83"
+#: "/web/en/support/index.php +81"
 msgid "local events: follow our <a href=\"https://blog.mageia.org/en/\">blog</a> and <a href=\"https://www.mageia.org/en/calendar/\">calendar</a>."
 msgstr "当前进展：关注我们的 <a href=\"https://blog.mageia.org/en/\">博客</a> 和 <a href=\"https://www.mageia.org/en/calendar/\">日程表</a>."
 
-#: "/web/en/support/index.php +88"
+#: "/web/en/support/index.php +86"
 msgid "Mageia.Org does not provide or endorse commercial/professional support or other services around the distribution. But there are organizations providing such services and more."
 msgstr "Mageia.Org并不提供和授权此发行版相关的商业/专业支持或其他服务。但是有机构此类服务及其他服务。"
 
-#: "/web/en/support/index.php +89"
+#: "/web/en/support/index.php +87"
 msgid "Please check the <a href=\"%s\">commercial vendors</a> list"
 msgstr "请检索 <a href=\"%s\">商业经销商</a>清单"
 
-#: "/web/en/support/index.php +89"
+#: "/web/en/support/index.php +87"
 msgid "https://wiki.mageia.org/en/Commercial_vendors"
 msgstr "https://wiki.mageia.org/en/Commercial_vendors"
 
-#: "/web/en/support/index.php +94"
+#: "/web/en/support/index.php +92"
 msgid "Each release of Mageia software runs on most i586 and x86_64 computer systems available at the release time."
 msgstr "Mageia 可以在如今大多数的 x86 和 x86_64 计算机上运行。"
 
-#: "/web/en/support/index.php +95"
+#: "/web/en/support/index.php +93"
 msgid "You can follow this hardware requirements list:"
 msgstr "您可以按照以下硬件要求清单："
 
-#: "/web/en/support/index.php +98"
+#: "/web/en/support/index.php +96"
 msgid "Processor: any AMD, Intel or VIA processor;"
 msgstr "处理器：任何 AMD、Intel 或 VIA 处理器；"
 
-#: "/web/en/support/index.php +99"
+#: "/web/en/support/index.php +97"
 msgid "Memory (RAM): 512MB minimum, 2GB recommended;"
 msgstr "内存：至少 512MB，建议 2GB；"
 
-#: "/web/en/support/index.php +100"
+#: "/web/en/support/index.php +98"
 msgid "For headless systems that minimum can be usable."
 msgstr ""
 
-#: "/web/en/support/index.php +101"
+#: "/web/en/support/index.php +99"
 msgid "For low memory intensive programs and light graphical Desktop Environments like Xfce the minimum is 1GB."
 msgstr ""
 
-#: "/web/en/support/index.php +102"
+#: "/web/en/support/index.php +100"
 msgid "For more feature rich like Gnome and Plasma the minimum is 2GB."
 msgstr ""
 
-#: "/web/en/support/index.php +103"
+#: "/web/en/support/index.php +101"
 msgid "Storage (HDD or SSD): 5GB for a minimal installation, 20GB for a casual setup;"
 msgstr "存储设备（磁盘或固态硬盘）：至少 5GB，推荐 20GB。"
 
-#: "/web/en/support/index.php +104"
+#: "/web/en/support/index.php +102"
 msgid "This includes a few GB for user files. If you need more than you should take that in account too."
 msgstr "其中包含用于存储用户文件的数 GB 空间。如果您有额外需要，也应当在分配空间时予以考虑。"
 
-#: "/web/en/support/index.php +105"
+#: "/web/en/support/index.php +103"
 msgid "Custom installations on less space are possible but this requires intermediate linux knowledge."
 msgstr "在自定义安装中您可以指定更少的磁盘空间，但这需要相关的 Linux 知识。"
 
-#: "/web/en/support/index.php +106"
+#: "/web/en/support/index.php +104"
 msgid "Bootable USB port or optical drive capable of using media with a storage capacity of at least 4GB used for installation."
 msgstr "您需要一个支持 4GB 以上存储媒介的可引导 USB 设备（或光驱）来安装系统。"
 
-#: "/web/en/support/index.php +107"
+#: "/web/en/support/index.php +105"
 msgid "Smaller media capacity is used for network installation, but a reliable Internet connection is needed."
 msgstr "也可以选择用较小的存储媒介来进行网络安装，但您需要确保网络连接正常。"
 
-#: "/web/en/support/index.php +108"
+#: "/web/en/support/index.php +106"
 msgid "More information at %sdownloads page%s."
 msgstr "更多信息请访问%s下载页%s。"
 
-#: "/web/en/support/index.php +109"
+#: "/web/en/support/index.php +107"
 msgid "Graphic card: any AMD/ATI, Intel, Matrox, Nvidia, SiS or VIA graphic card;"
 msgstr "显示卡：任何 AMD/ATI、Intel、Matrox、Nvidia、SiS 或 VIA 显示卡；"
 
-#: "/web/en/support/index.php +110"
+#: "/web/en/support/index.php +108"
 msgid "Sound card: any AC97, HDA or Sound Blaster sound card."
 msgstr "声卡：任何 AC97、HDA 或 Sound Blaster 声卡。"
 
-#: "/web/en/support/index.php +113"
+#: "/web/en/support/index.php +111"
 msgid "For some kinds of hardware (Wi-Fi chipsets, 3D graphic cards) to work properly, specific firmware or software may be needed, this is available in a specific online repository called \"nonfree\" (<a href=\"https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media\">learn more</a>)."
 msgstr "为了某些硬件 (Wi-Fi芯片, 3D显卡) 能正常工作, 可能需要特定的固件和软件, 这在一个叫做 \"nonfree\"的特定在线软件仓库中可以找到 (<a href=\"https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media\">了解更多</a>)."
 
-#: "/web/en/support/index.php +114"
+#: "/web/en/support/index.php +112"
 msgid "We may set up a hardware compatibility list/directory as well as a hardware certification process; but that's still at the planning stage. Feel free to join/contact our <a href=\"%s\">Web</a> and <a href=\"%s\">QA</a> teams if you would like to help in this regard."
 msgstr "我们可能会做一个硬件兼容性列表或目录和硬件认证计划; 但是这仍然还在计划中。如果您乐于提供帮助，可自由加入或联系我们的 <a href=\"%s\">Web</a> 和 <a href=\"%s\">QA</a>小组。"
 
-#: "/web/en/support/index.php +114"
+#: "/web/en/support/index.php +112"
 msgid "https://wiki.mageia.org/en/Web_team"
 msgstr "https://wiki.mageia.org/en/Web_team"
 
-#: "/web/en/support/index.php +114"
+#: "/web/en/support/index.php +112"
 msgid "https://wiki.mageia.org/en/QA_Team"
 msgstr "https://wiki.mageia.org/en/QA_Team"
 
-#: "/web/en/support/index.php +118"
+#: "/web/en/support/index.php +116"
 msgid "You may check and report bugs on <a href=\"%s\">our Bugzilla (bugs.mageia.org)</a>."
 msgstr "您可以在 <a href=\"%s\">我们的 Bugzilla (bugs.mageia.org)</a>查看和报告缺陷。"
 
 #, fuzzy
+#~ msgid "Mageia 7 will be supported until May 31st, 2021."
+#~ msgstr "Mageia 6 的支持于 2019 年 1 月 16 日结束。"
+
+#, fuzzy
+#~ msgid "Mageia 6 will be supported until September 30th, 2019."
+#~ msgstr "Mageia 4 的支持于 2015 年 9 月 19 日结束。"
+
+#, fuzzy
 #~ msgid "Mageia 7 will be supported until December 30th, 2020."
 #~ msgstr "Mageia 1 支持到2012年12月1日。"