aboutsummaryrefslogtreecommitdiffstats
path: root/langs/zh-cn
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2021-02-25 21:01:27 +0100
committerManuel Hiebel <leuhmanu@mageia.org>2021-02-25 21:01:27 +0100
commit28e66dbb983b0405f0295bdc5fd31ece537f3a27 (patch)
tree89bad75e154ef42d0a8c3dede73adb3b6a3c5c38 /langs/zh-cn
parentfb9ebe68af816f71fac67c43209332f6e105acfe (diff)
downloadwww-28e66dbb983b0405f0295bdc5fd31ece537f3a27.tar
www-28e66dbb983b0405f0295bdc5fd31ece537f3a27.tar.gz
www-28e66dbb983b0405f0295bdc5fd31ece537f3a27.tar.bz2
www-28e66dbb983b0405f0295bdc5fd31ece537f3a27.tar.xz
www-28e66dbb983b0405f0295bdc5fd31ece537f3a27.zip
rebuild for i18n
Diffstat (limited to 'langs/zh-cn')
-rw-r--r--langs/zh-cn/index.po84
-rw-r--r--langs/zh-cn/map.po137
-rw-r--r--langs/zh-cn/support.po102
-rw-r--r--langs/zh-cn/timeline.po101
4 files changed, 220 insertions, 204 deletions
diff --git a/langs/zh-cn/index.po b/langs/zh-cn/index.po
index bbc8e99c8..bd4a55555 100644
--- a/langs/zh-cn/index.po
+++ b/langs/zh-cn/index.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-08 19:31:05+0100\n"
+"POT-Creation-Date: 2021-02-25 21:00:15+0100\n"
"PO-Revision-Date: 2018-12-10 15:42+0000\n"
"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
@@ -46,116 +46,112 @@ msgstr "Mageia 博客(English)"
msgid "https://blog.mageia.org/en/?feed=rss"
msgstr "https://blog.mageia.org/en/?feed=rss"
-#: "/web/en/index.php +227"
+#: "/web/en/index.php +306"
msgid "Mageia, a free, community-based Linux distribution for desktop & server."
msgstr "Mageia,自由、基于社区的 Linux 发行版,适用于桌面和服务器。"
-#: "/web/en/index.php +235"
+#: "/web/en/index.php +314"
msgid "https://planet.mageia.org/en/"
msgstr "https://planet.mageia.org/en/"
-#: "/web/en/index.php +236"
+#: "/web/en/index.php +315"
msgid "https://blog.mageia.org/en/"
msgstr "https://blog.mageia.org/en/"
-#: "/web/en/index.php +248"
+#: "/web/en/index.php +327"
msgid "Latest news from our <a href=\"%s\">localized planet</a>:"
msgstr "本地化的<a href=\"%s\">社区</a>新闻:"
-#: "/web/en/index.php +250"
+#: "/web/en/index.php +329"
msgid "Latest news from our <a href=\"%s\">localized blog</a>:"
msgstr "本地化的<a href=\"%s\">博客</a>新闻:"
-#: "/web/en/index.php +252"
+#: "/web/en/index.php +331"
msgid "Latest news from our <a href=\"%s\">English planet</a>:"
msgstr "<a href=\"%s\">国际区</a>新闻:"
-#: "/web/en/index.php +254"
+#: "/web/en/index.php +333"
msgid "Latest news from our <a href=\"%s\">English blog</a>:"
msgstr "<a href=\"%s\">英文博客</a>上的新闻:"
-#: "/web/en/index.php +269"
+#: "/web/en/index.php +348"
msgid "Change your perspective"
msgstr "颠覆你的视野"
-#: "/web/en/index.php +271"
+#: "/web/en/index.php +350"
msgid "Stable, secure operating system for desktop &amp; server"
msgstr "无论桌面还是服务器使用,都是可靠安全的操作系统"
-#: "/web/en/index.php +272"
+#: "/web/en/index.php +351"
msgid "Free Software, coproduced by hundreds of people"
msgstr "万众一心打造的自由软件"
-#: "/web/en/index.php +273"
+#: "/web/en/index.php +352"
msgid "Elected governance, nonprofit organization"
msgstr "选举自治的非盈利机构"
-#: "/web/en/index.php +274"
+#: "/web/en/index.php +353"
msgid "You can be part of it"
msgstr "您也可以成为其中一员"
-#: "/web/en/index.php +283"
-#, fuzzy
-msgid "Mageia 7.1"
-msgstr "Mageia 6.1"
-
-#: "/web/en/index.php +283"
+#: "/web/en/index.php +364"
#, fuzzy
msgid "Mageia 8"
msgstr "Mageia 6"
-#: "/web/en/index.php +284"
+#: "/web/en/index.php +364"
#, fuzzy
-msgid "released in July 2019"
-msgstr "于2017年6月发布"
+msgid "Mageia 8.1"
+msgstr "Mageia 6.1"
-#: "/web/en/index.php +284"
+#: "/web/en/index.php +365"
#, fuzzy
msgid "released in February 2021"
msgstr "于2017年6月发布"
-#: "/web/en/index.php +284"
-#, fuzzy
-msgid "released in March 2021"
-msgstr "于2017年6月发布"
-
-#: "/web/en/index.php +288"
+#: "/web/en/index.php +369"
msgid "<a href=\"%s\" hreflang=\"en\">Release notes</a>"
msgstr "<a href=\"%s\" hreflang=\"en\">发行注记</a>"
-#: "/web/en/index.php +288"
-#, fuzzy
-msgid "https://wiki.mageia.org/en/Mageia_7_Release_Notes"
-msgstr "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
-
-#: "/web/en/index.php +288"
+#: "/web/en/index.php +369"
#, fuzzy
msgid "https://wiki.mageia.org/en/Mageia_8_Release_Notes"
msgstr "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
-#: "/web/en/index.php +289"
+#: "/web/en/index.php +370"
msgid "<a href=\"%s\" hreflang=\"en\">errata</a>"
msgstr "<a href=\"%s\" hreflang=\"en\">errata</a>"
-#: "/web/en/index.php +289"
-#, fuzzy
-msgid "https://wiki.mageia.org/en/Mageia_7_Errata"
-msgstr "https://wiki.mageia.org/en/Mageia_6_Errata"
-
-#: "/web/en/index.php +289"
+#: "/web/en/index.php +370"
#, fuzzy
msgid "https://wiki.mageia.org/en/Mageia_8_Errata"
msgstr "https://wiki.mageia.org/en/Mageia_6_Errata"
-#: "/web/en/index.php +294"
+#: "/web/en/index.php +375"
msgid "<strong>Get involved</strong> in the next version"
msgstr "<strong>融入</strong> 下一版本"
-#: "/web/en/index.php +296"
+#: "/web/en/index.php +377"
msgid "Test"
msgstr "测试"
#, fuzzy
+#~ msgid "released in July 2019"
+#~ msgstr "于2017年6月发布"
+
+#, fuzzy
+#~ msgid "released in March 2021"
+#~ msgstr "于2017年6月发布"
+
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Mageia_7_Release_Notes"
+#~ msgstr "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
+
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Mageia_7_Errata"
+#~ msgstr "https://wiki.mageia.org/en/Mageia_6_Errata"
+
+#, fuzzy
#~ msgid "Mageia 7.2"
#~ msgstr "Mageia 6.1"
diff --git a/langs/zh-cn/map.po b/langs/zh-cn/map.po
index cb3090d51..fadfba94f 100644
--- a/langs/zh-cn/map.po
+++ b/langs/zh-cn/map.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2019-06-30 16:58:01+0200\n"
+"POT-Creation-Date: 2021-02-25 21:00:17+0100\n"
"PO-Revision-Date: 2018-12-10 15:40+0000\n"
"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
@@ -25,263 +25,268 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: "/web/en/map/index.php +9"
+#: "/web/en/map/index.php +10"
msgid "About Mageia"
msgstr "关于 Mageia"
-#: "/web/en/map/index.php +12"
+#: "/web/en/map/index.php +13"
msgid "Mission"
msgstr "使命"
-#: "/web/en/map/index.php +13"
+#: "/web/en/map/index.php +14"
msgid "News"
msgstr "新闻"
-#: "/web/en/map/index.php +14"
+#: "/web/en/map/index.php +15"
msgid "Contacts"
msgstr "联系"
-#: "/web/en/map/index.php +15"
+#: "/web/en/map/index.php +16"
msgid "Supporters"
msgstr "支持者"
-#: "/web/en/map/index.php +16"
+#: "/web/en/map/index.php +17"
msgid "Governance"
msgstr "组织架构"
-#: "/web/en/map/index.php +16"
+#: "/web/en/map/index.php +17"
msgid "https://wiki.mageia.org/en/Org"
msgstr "https://wiki.mageia.org/en/Org"
-#: "/web/en/map/index.php +18"
+#: "/web/en/map/index.php +19"
msgid "Board"
msgstr "主席团"
-#: "/web/en/map/index.php +18"
+#: "/web/en/map/index.php +19"
msgid "https://wiki.mageia.org/en/Org_Board"
msgstr "https://wiki.mageia.org/en/Org_Board"
-#: "/web/en/map/index.php +19"
+#: "/web/en/map/index.php +20"
msgid "Council"
msgstr "委员会"
-#: "/web/en/map/index.php +19"
+#: "/web/en/map/index.php +20"
msgid "https://wiki.mageia.org/en/Org_Council"
msgstr "https://wiki.mageia.org/en/Org_Council"
-#: "/web/en/map/index.php +20"
+#: "/web/en/map/index.php +21"
msgid "Teams"
msgstr "团队"
-#: "/web/en/map/index.php +20"
+#: "/web/en/map/index.php +21"
msgid "https://wiki.mageia.org/en/Contributing"
msgstr "https://wiki.mageia.org/en/Contributing"
-#: "/web/en/map/index.php +23"
+#: "/web/en/map/index.php +24"
msgid "Values"
msgstr "价值"
-#: "/web/en/map/index.php +24"
+#: "/web/en/map/index.php +25"
msgid "Code of conduct"
msgstr "规范"
-#: "/web/en/map/index.php +27"
+#: "/web/en/map/index.php +28"
msgid "Constitution"
msgstr "章程"
-#: "/web/en/map/index.php +28"
+#: "/web/en/map/index.php +29"
msgid "Reports"
msgstr "报告"
-#: "/web/en/map/index.php +31"
+#: "/web/en/map/index.php +32"
msgid "License"
msgstr "许可协议"
-#: "/web/en/map/index.php +32"
+#: "/web/en/map/index.php +33"
msgid "Timeline"
msgstr "时间线"
-#: "/web/en/map/index.php +33"
+#: "/web/en/map/index.php +34"
msgid "Financial Infos"
msgstr "财务信息"
-#: "/web/en/map/index.php +37"
+#: "/web/en/map/index.php +38"
msgid "Downloads"
msgstr "下载"
-#: "/web/en/map/index.php +40"
+#: "/web/en/map/index.php +41"
+#, fuzzy
+msgid "8 (February 2021)"
+msgstr "4(2014年2月)"
+
+#: "/web/en/map/index.php +42"
#, fuzzy
msgid "7 (June 2019)"
msgstr "5(2015年6月)"
-#: "/web/en/map/index.php +41"
+#: "/web/en/map/index.php +43"
msgid "6 (July 2017)"
msgstr "6(2017年7月)"
-#: "/web/en/map/index.php +42"
+#: "/web/en/map/index.php +44"
msgid "5 (June 2015)"
msgstr "5(2015年6月)"
-#: "/web/en/map/index.php +43"
+#: "/web/en/map/index.php +45"
msgid "4 (February 2014)"
msgstr "4(2014年2月)"
-#: "/web/en/map/index.php +44"
+#: "/web/en/map/index.php +46"
msgid "3 (May 2013)"
msgstr "3(2013年5月)"
-#: "/web/en/map/index.php +45"
+#: "/web/en/map/index.php +47"
msgid "2 (May 2012)"
msgstr "2(2012年5月)"
-#: "/web/en/map/index.php +46"
+#: "/web/en/map/index.php +48"
msgid "1 (June 2011)"
msgstr "1(2011年6月)"
-#: "/web/en/map/index.php +47"
+#: "/web/en/map/index.php +49"
msgid "Alternative Downloads"
msgstr "其他下载地址"
-#: "/web/en/map/index.php +48"
+#: "/web/en/map/index.php +50"
msgid "Download mirrors"
msgstr "下载镜像"
-#: "/web/en/map/index.php +52"
+#: "/web/en/map/index.php +54"
msgid "Support"
msgstr "支持"
-#: "/web/en/map/index.php +55"
+#: "/web/en/map/index.php +57"
msgid "Software updates"
msgstr "软件更新"
-#: "/web/en/map/index.php +56"
+#: "/web/en/map/index.php +58"
msgid "Product lifecycle"
msgstr "产品生命周期"
-#: "/web/en/map/index.php +57"
+#: "/web/en/map/index.php +59"
msgid "Official Documentation"
msgstr "官方文档"
-#: "/web/en/map/index.php +58"
+#: "/web/en/map/index.php +60"
msgid "Community support"
msgstr "社区支持"
-#: "/web/en/map/index.php +59"
+#: "/web/en/map/index.php +61"
msgid "Professional support"
msgstr "专业支持"
-#: "/web/en/map/index.php +59"
+#: "/web/en/map/index.php +61"
msgid "https://wiki.mageia.org/en/Commercial_vendors"
msgstr "https://wiki.mageia.org/en/Commercial_vendors"
-#: "/web/en/map/index.php +60"
+#: "/web/en/map/index.php +62"
msgid "Compatible hardware"
msgstr "兼容硬件"
-#: "/web/en/map/index.php +61"
+#: "/web/en/map/index.php +63"
msgid "FAQ"
msgstr "问答"
-#: "/web/en/map/index.php +61"
+#: "/web/en/map/index.php +63"
msgid "https://wiki.mageia.org/en/FAQ"
msgstr "https://wiki.mageia.org/en/FAQ"
-#: "/web/en/map/index.php +65"
+#: "/web/en/map/index.php +67"
msgid "Community"
msgstr "社区"
-#: "/web/en/map/index.php +68"
+#: "/web/en/map/index.php +70"
msgid "Planet"
msgstr "星球"
-#: "/web/en/map/index.php +68"
+#: "/web/en/map/index.php +70"
msgid "https://planet.mageia.org/en/"
msgstr "https://planet.mageia.org/en/"
-#: "/web/en/map/index.php +69"
+#: "/web/en/map/index.php +71"
msgid "Blog"
msgstr "博客"
-#: "/web/en/map/index.php +69"
+#: "/web/en/map/index.php +71"
msgid "https://blog.mageia.org/en/"
msgstr "https://blog.mageia.org/en/"
-#: "/web/en/map/index.php +70"
+#: "/web/en/map/index.php +72"
msgid "Calendar"
msgstr "日历"
-#: "/web/en/map/index.php +71"
+#: "/web/en/map/index.php +73"
msgid "Mailing-lists"
msgstr "邮件列表"
-#: "/web/en/map/index.php +71"
+#: "/web/en/map/index.php +73"
msgid "https://wiki.mageia.org/en/Mailing_lists"
msgstr "https://wiki.mageia.org/en/Mailing_lists"
-#: "/web/en/map/index.php +72"
+#: "/web/en/map/index.php +74"
msgid "https://wiki.mageia.org/en/IRC"
msgstr "https://wiki.mageia.org/en/IRC"
-#: "/web/en/map/index.php +73"
+#: "/web/en/map/index.php +75"
msgid "Forums"
msgstr "论坛"
-#: "/web/en/map/index.php +73"
+#: "/web/en/map/index.php +75"
msgid "https://forums.mageia.org/"
msgstr "https://forums.mageia.org/"
-#: "/web/en/map/index.php +74"
+#: "/web/en/map/index.php +76"
msgid "https://wiki.mageia.org"
msgstr "https://wiki.mageia.org"
-#: "/web/en/map/index.php +76"
+#: "/web/en/map/index.php +78"
msgid "People"
msgstr "人士"
-#: "/web/en/map/index.php +80"
+#: "/web/en/map/index.php +82"
msgid "Contribute"
msgstr "参与"
-#: "/web/en/map/index.php +83"
+#: "/web/en/map/index.php +85"
msgid "Why contribute?"
msgstr "为何参与?"
-#: "/web/en/map/index.php +84"
+#: "/web/en/map/index.php +86"
msgid "How to contribute?"
msgstr "如何参与?"
-#: "/web/en/map/index.php +85"
+#: "/web/en/map/index.php +87"
msgid "Donate"
msgstr "捐助"
-#: "/web/en/map/index.php +89"
+#: "/web/en/map/index.php +91"
msgid "About you"
msgstr "关于你自己"
-#: "/web/en/map/index.php +92"
+#: "/web/en/map/index.php +94"
msgid "Your Mageia id"
msgstr "你的 Mageia 身份"
-#: "/web/en/map/index.php +93"
+#: "/web/en/map/index.php +95"
msgid "Privacy policy"
msgstr "隐私保护"
-#: "/web/en/map/index.php +93"
+#: "/web/en/map/index.php +95"
msgid "https://wiki.mageia.org/en/Privacy_policy"
msgstr "https://wiki.mageia.org/en/Privacy_policy"
-#: "/web/en/map/index.php +126"
+#: "/web/en/map/index.php +128"
msgid "Mageia.org site map"
msgstr "Mageia.org 网站地图"
-#: "/web/en/map/index.php +127"
+#: "/web/en/map/index.php +129"
msgid "mageia, web site, map, sitemap"
msgstr "mageia, 网站, 地图, 网站地图"
-#: "/web/en/map/index.php +135"
+#: "/web/en/map/index.php +137"
msgid "Site Map"
msgstr "网站地图"
-#: "/web/en/map/index.php +142"
+#: "/web/en/map/index.php +144"
msgid "You still can not find what you were looking for? Try searching mageia.org:"
msgstr "您还没有找到想要查看的内容吗?请搜索 mageia.org:"
diff --git a/langs/zh-cn/support.po b/langs/zh-cn/support.po
index 9cf87272b..a675be39c 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-16 22:18:38+0000\n"
+"POT-Creation-Date: 2021-02-25 21:00:13+0100\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"
@@ -102,181 +102,187 @@ msgstr "Mageia 版本至少支持十八个月。"
msgid "And at least three months after the new release is out."
msgstr ""
-#: "/web/en/support/index.php +57"
+#: "/web/en/support/index.php +56"
+#, fuzzy
+msgid "Mageia 8 will be supported until August 31st, 2022."
+msgstr "Mageia 1 支持到2012年12月1日。"
+
+#: "/web/en/support/index.php +58"
#, fuzzy
msgid "Mageia 7 will be supported until December 30th, 2020."
msgstr "Mageia 1 支持到2012年12月1日。"
-#: "/web/en/support/index.php +57"
+#: "/web/en/support/index.php +58"
msgid "Plus three months after Mageia 8 release."
msgstr ""
-#: "/web/en/support/index.php +57"
+#: "/web/en/support/index.php +58"
#, fuzzy
-msgid "Mageia 7 was supported until December 30th, 2020."
-msgstr "Mageia 1 支持到2012年12月1日。"
+msgid "Mageia 7 was supported until May 31st, 2021."
+msgstr "Mageia 6 的支持于 2019 年 1 月 16 日结束。"
-#: "/web/en/support/index.php +59"
+#: "/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 +59"
+#: "/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 +61"
+#: "/web/en/support/index.php +62"
msgid "Mageia 5 was supported until December 31st, 2017."
msgstr "Mageia 5 的支持于 2017 年 12 月 31 日结束。"
-#: "/web/en/support/index.php +62"
+#: "/web/en/support/index.php +63"
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 +63"
+#: "/web/en/support/index.php +64"
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 +64"
+#: "/web/en/support/index.php +65"
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 +67"
+#: "/web/en/support/index.php +68"
msgid "Mageia 4 was supported until September 19th, 2015."
msgstr "Mageia 4 的支持于 2015 年 9 月 19 日结束。"
-#: "/web/en/support/index.php +68"
+#: "/web/en/support/index.php +69"
msgid "Mageia 3 was supported until November 26th, 2014."
msgstr "Mageia 3 支持到2014年11月26日。"
-#: "/web/en/support/index.php +69"
+#: "/web/en/support/index.php +70"
msgid "Mageia 2 was supported until November 22nd, 2013."
msgstr "Mageia 2 支持到2013年11月22日。"
-#: "/web/en/support/index.php +70"
+#: "/web/en/support/index.php +71"
msgid "Mageia 1 was supported until December 1st, 2012."
msgstr "Mageia 1 支持到2012年12月1日。"
-#: "/web/en/support/index.php +75"
+#: "/web/en/support/index.php +76"
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 +78"
+#: "/web/en/support/index.php +79"
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 +79"
+#: "/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>;"
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 +80"
+#: "/web/en/support/index.php +81"
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 +81"
+#: "/web/en/support/index.php +82"
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 +82"
+#: "/web/en/support/index.php +83"
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 +87"
+#: "/web/en/support/index.php +88"
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 +88"
+#: "/web/en/support/index.php +89"
msgid "Please check the <a href=\"%s\">commercial vendors</a> list"
msgstr "请检索 <a href=\"%s\">商业经销商</a>清单"
-#: "/web/en/support/index.php +88"
+#: "/web/en/support/index.php +89"
msgid "https://wiki.mageia.org/en/Commercial_vendors"
msgstr "https://wiki.mageia.org/en/Commercial_vendors"
-#: "/web/en/support/index.php +93"
+#: "/web/en/support/index.php +94"
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 +94"
+#: "/web/en/support/index.php +95"
msgid "You can follow this hardware requirements list:"
msgstr "您可以按照以下硬件要求清单:"
-#: "/web/en/support/index.php +97"
+#: "/web/en/support/index.php +98"
msgid "Processor: any AMD, Intel or VIA processor;"
msgstr "处理器:任何 AMD、Intel 或 VIA 处理器;"
-#: "/web/en/support/index.php +98"
+#: "/web/en/support/index.php +99"
msgid "Memory (RAM): 512MB minimum, 2GB recommended;"
msgstr "内存:至少 512MB,建议 2GB;"
-#: "/web/en/support/index.php +99"
+#: "/web/en/support/index.php +100"
msgid "For headless systems that minimum can be usable."
msgstr ""
-#: "/web/en/support/index.php +100"
+#: "/web/en/support/index.php +101"
msgid "For low memory intensive programs and light graphical Desktop Environments like Xfce the minimum is 1GB."
msgstr ""
-#: "/web/en/support/index.php +101"
+#: "/web/en/support/index.php +102"
msgid "For more feature rich like Gnome and Plasma the minimum is 2GB."
msgstr ""
-#: "/web/en/support/index.php +102"
+#: "/web/en/support/index.php +103"
msgid "Storage (HDD or SSD): 5GB for a minimal installation, 20GB for a casual setup;"
msgstr "存储设备(磁盘或固态硬盘):至少 5GB,推荐 20GB。"
-#: "/web/en/support/index.php +103"
+#: "/web/en/support/index.php +104"
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 +104"
+#: "/web/en/support/index.php +105"
msgid "Custom installations on less space are possible but this requires intermediate linux knowledge."
msgstr "在自定义安装中您可以指定更少的磁盘空间,但这需要相关的 Linux 知识。"
-#: "/web/en/support/index.php +105"
+#: "/web/en/support/index.php +106"
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 +106"
+#: "/web/en/support/index.php +107"
msgid "Smaller media capacity is used for network installation, but a reliable Internet connection is needed."
msgstr "也可以选择用较小的存储媒介来进行网络安装,但您需要确保网络连接正常。"
-#: "/web/en/support/index.php +107"
+#: "/web/en/support/index.php +108"
msgid "More information at %sdownloads page%s."
msgstr "更多信息请访问%s下载页%s。"
-#: "/web/en/support/index.php +108"
+#: "/web/en/support/index.php +109"
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 +109"
+#: "/web/en/support/index.php +110"
msgid "Sound card: any AC97, HDA or Sound Blaster sound card."
msgstr "声卡:任何 AC97、HDA 或 Sound Blaster 声卡。"
-#: "/web/en/support/index.php +112"
+#: "/web/en/support/index.php +113"
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 +113"
+#: "/web/en/support/index.php +114"
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 +113"
+#: "/web/en/support/index.php +114"
msgid "https://wiki.mageia.org/en/Web_team"
msgstr "https://wiki.mageia.org/en/Web_team"
-#: "/web/en/support/index.php +113"
+#: "/web/en/support/index.php +114"
msgid "https://wiki.mageia.org/en/QA_Team"
msgstr "https://wiki.mageia.org/en/QA_Team"
-#: "/web/en/support/index.php +117"
+#: "/web/en/support/index.php +118"
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 was supported until December 30th, 2020."
+#~ msgstr "Mageia 1 支持到2012年12月1日。"
+
+#, fuzzy
#~ msgid "Mageia 6 will be supported until about 3 months after Mageia 7 is released."
#~ msgstr "Mageia 6 将被支持到 2019 年 1 月 16 日。"
-
-#~ msgid "Mageia 6 was supported until January 16th, 2019."
-#~ msgstr "Mageia 6 的支持于 2019 年 1 月 16 日结束。"
diff --git a/langs/zh-cn/timeline.po b/langs/zh-cn/timeline.po
index 429e20d74..a1db52b12 100644
--- a/langs/zh-cn/timeline.po
+++ b/langs/zh-cn/timeline.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2019-06-30 21:38:35+0000\n"
+"POT-Creation-Date: 2021-02-25 21:00:19+0100\n"
"PO-Revision-Date: 2018-10-01 15:50+0000\n"
"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
@@ -26,171 +26,180 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: "/web/en/timeline/index.php +39"
+#: "/web/en/timeline/index.php +40"
+msgid "2021"
+msgstr ""
+
+#: "/web/en/timeline/index.php +41"
+msgid "February"
+msgstr "二月"
+
+#: "/web/en/timeline/index.php +41"
+#, fuzzy
+msgid "<a href=%s>Mageia 8</a> is released."
+msgstr "<a href=%s>Mageia 6</a>发布。"
+
+#: "/web/en/timeline/index.php +43"
msgid "2019"
msgstr ""
-#: "/web/en/timeline/index.php +40"
+#: "/web/en/timeline/index.php +44"
msgid "June"
msgstr "六月"
-#: "/web/en/timeline/index.php +40"
+#: "/web/en/timeline/index.php +44"
#, fuzzy
msgid "<a href=%s>Mageia 7</a> is released."
msgstr "<a href=%s>Mageia 6</a>发布。"
-#: "/web/en/timeline/index.php +42"
+#: "/web/en/timeline/index.php +46"
msgid "2018"
msgstr "2018"
-#: "/web/en/timeline/index.php +43"
+#: "/web/en/timeline/index.php +47"
msgid "October"
msgstr "十月"
-#: "/web/en/timeline/index.php +43"
+#: "/web/en/timeline/index.php +47"
msgid "<a href=%s>Mageia 6</a> updated to 6.1."
msgstr "<a href=%s>Mageia 6</a>升级至 6.1。"
-#: "/web/en/timeline/index.php +45"
+#: "/web/en/timeline/index.php +49"
msgid "2017"
msgstr "2017"
-#: "/web/en/timeline/index.php +46"
+#: "/web/en/timeline/index.php +50"
msgid "July"
msgstr "七月"
-#: "/web/en/timeline/index.php +46"
+#: "/web/en/timeline/index.php +50"
msgid "<a href=%s>Mageia 6</a> is released."
msgstr "<a href=%s>Mageia 6</a>发布。"
-#: "/web/en/timeline/index.php +47"
-msgid "February"
-msgstr "二月"
-
-#: "/web/en/timeline/index.php +47"
+#: "/web/en/timeline/index.php +51"
msgid "Seventh General Assembly during FOSDEM in Brussels, Belgium."
msgstr "FOSDEM (于比利时布鲁塞尔举办)期间召开了多场全体会议。"
-#: "/web/en/timeline/index.php +49"
+#: "/web/en/timeline/index.php +53"
msgid "2016"
msgstr "2016"
-#: "/web/en/timeline/index.php +50"
+#: "/web/en/timeline/index.php +54"
msgid "December"
msgstr "十二月"
-#: "/web/en/timeline/index.php +50"
+#: "/web/en/timeline/index.php +54"
msgid "<a href=%s>Mageia 5</a> updated to 5.1."
msgstr "<a href=%s>Mageia 5</a>升级至 5.1。"
-#: "/web/en/timeline/index.php +51"
+#: "/web/en/timeline/index.php +55"
msgid "Sixth General Assembly during FOSDEM in Brussels, Belgium."
msgstr "FOSDEM (于比利时布鲁塞尔举办)期间召开了第六届全体会议。"
-#: "/web/en/timeline/index.php +53"
+#: "/web/en/timeline/index.php +57"
msgid "2015"
msgstr "2015"
-#: "/web/en/timeline/index.php +54"
+#: "/web/en/timeline/index.php +58"
msgid "<a href=%s>Mageia 5</a> is released."
msgstr "<a href=%s>Mageia 5</a> 发布。"
-#: "/web/en/timeline/index.php +55"
+#: "/web/en/timeline/index.php +59"
msgid "Fifth General Assembly during FOSDEM in Brussels, Belgium."
msgstr "在 FSODEM 会议期间举行第五届常规会议,于比利时布鲁塞尔。"
-#: "/web/en/timeline/index.php +57"
+#: "/web/en/timeline/index.php +61"
msgid "2014"
msgstr "2014"
-#: "/web/en/timeline/index.php +58"
+#: "/web/en/timeline/index.php +62"
msgid "<a href=%s>Mageia 4</a> updated to 4.1."
msgstr "<a href=%s>Mageia 4</a>升级至 4.1。"
-#: "/web/en/timeline/index.php +60"
+#: "/web/en/timeline/index.php +64"
msgid "<a href=\"/4/\">Mageia 4</a> is released."
msgstr "<a href=\"/4/\">Mageia 4</a> 已经发布."
-#: "/web/en/timeline/index.php +61"
+#: "/web/en/timeline/index.php +65"
msgid "Fourth General Assembly during FOSDEM in Brussels, Belgium."
msgstr "第四次全体大会,在FOSDEM期间,于比利时布鲁塞尔。"
-#: "/web/en/timeline/index.php +64"
+#: "/web/en/timeline/index.php +68"
msgid "2013"
msgstr "2013"
-#: "/web/en/timeline/index.php +65"
+#: "/web/en/timeline/index.php +69"
msgid "May"
msgstr "五月"
-#: "/web/en/timeline/index.php +65"
+#: "/web/en/timeline/index.php +69"
msgid "<a href=\"/3/\">Mageia 3</a> is released."
msgstr "<a href=\"/3/\">Mageia 3</a> 已经发布."
-#: "/web/en/timeline/index.php +66"
+#: "/web/en/timeline/index.php +70"
msgid "Third General Assembly during FOSDEM in Brussels, Belgium."
msgstr "第三次全体大会,在FOSDEM期间,于比利时布鲁塞尔。"
-#: "/web/en/timeline/index.php +68"
+#: "/web/en/timeline/index.php +72"
msgid "2012"
msgstr "2012"
-#: "/web/en/timeline/index.php +69"
+#: "/web/en/timeline/index.php +73"
msgid "<a href=\"/2/\">Mageia 2</a> is released."
msgstr "<a href=\"/2/\">Mageia 2</a> 已经发布."
-#: "/web/en/timeline/index.php +70"
+#: "/web/en/timeline/index.php +74"
msgid "Second General Assembly during FOSDEM in Brussels, Belgium."
msgstr "第二次在比利时首都布鲁塞尔的FOSDEM集体聚会"
-#: "/web/en/timeline/index.php +72"
+#: "/web/en/timeline/index.php +76"
msgid "2011"
msgstr "2011"
-#: "/web/en/timeline/index.php +73"
+#: "/web/en/timeline/index.php +77"
msgid "<a href=\"/1/\">Mageia 1</a> is released."
msgstr "<a href=\"/1/\">Mageia 1</a> 发布。"
-#: "/web/en/timeline/index.php +74"
+#: "/web/en/timeline/index.php +78"
msgid "First General Assembly during FOSDEM in Brussels, Belgium."
msgstr "第一次全体大会,在FOSDEM期间,于比利时布鲁塞尔。"
-#: "/web/en/timeline/index.php +75"
+#: "/web/en/timeline/index.php +79"
msgid "January"
msgstr "一月"
-#: "/web/en/timeline/index.php +75"
+#: "/web/en/timeline/index.php +79"
msgid "Build system is ready to run for the first alpha ISOs."
msgstr "构建系统已可用于运行首个 alpha 镜像。"
-#: "/web/en/timeline/index.php +77"
+#: "/web/en/timeline/index.php +81"
msgid "2010"
msgstr "2010"
-#: "/web/en/timeline/index.php +78"
+#: "/web/en/timeline/index.php +82"
msgid "End of year"
msgstr "年底"
-#: "/web/en/timeline/index.php +79"
+#: "/web/en/timeline/index.php +83"
msgid "With an incredible response, first donations and discussions abound."
msgstr "响应非常热烈,收获了首笔捐款和讨论会。"
-#: "/web/en/timeline/index.php +80"
+#: "/web/en/timeline/index.php +84"
msgid "Project gets structured, governance takes slowly shape (first board, teams)."
msgstr "项目和社区组织开始成型(首个管理和开发团队)"
-#: "/web/en/timeline/index.php +82"
+#: "/web/en/timeline/index.php +86"
msgid "September"
msgstr "九月"
-#: "/web/en/timeline/index.php +83"
+#: "/web/en/timeline/index.php +87"
msgid "Mageia starts as a <a href=\"../about/2010-sept-announcement.html\">fork of Mandriva Linux</a>."
msgstr "Mageia 开始于一个 <a href=\"../about/2010-sept-announcement.html\"> Mandriva Linux 的分支</a>."
-#: "/web/en/timeline/index.php +84"
+#: "/web/en/timeline/index.php +88"
msgid "Mageia.Org is registered in Paris, France."
msgstr "Mageia.Org 已在法国巴黎注册。"
-#: "/web/en/timeline/index.php +93"
+#: "/web/en/timeline/index.php +97"
msgid "Mageia Timeline"
msgstr "Mageia 时间轴"