Sync l10n with last change

2 files changed, 80 insertions, 96 deletions

diff --git a/langs/zh-cn/downloads/get.po b/langs/zh-cn/downloads/get.po
index 86ddebaec..72124a235 100644
--- a/langs/zh-cn/downloads/get.po
+++ b/langs/zh-cn/downloads/get.po
@@ -2,194 +2,177 @@
 # Copyright (C) 2014 - 2016 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-# 
+#
 # Generated by extract2gettext.php
 # Domain: downloads/get
-# 
+#
 # include translation strings from:
 # en/downloads/get/index.php
-# 
+#
 # Translators:
 # zwpwjwtz <zwpwjwtz@126.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2016-05-18 21:13:52+0000\n"
+"POT-Creation-Date: 2017-07-16 12:46:42+0200\n"
 "PO-Revision-Date: 2016-12-13 03:04+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/downloads/get/index.php +142"
+#: "/web/en/downloads/get/index.php +143"
 msgid "This <a href=\"%s\">%s</a> download mirror is located in %s (%s)."
 msgstr "下载镜像站点 <a href=\"%s\">%s</a> 位于 %s (%s)."
 
-#: "/web/en/downloads/get/index.php +148"
-msgid ""
-"If it does not work well for you, <a href=\"#om\" "
-"id=\"other_mirrors_btn\">check out these other mirrors</a>."
+#: "/web/en/downloads/get/index.php +149"
+msgid "If it does not work well for you, <a href=\"#om\" id=\"other_mirrors_btn\">check out these other mirrors</a>."
 msgstr "如果它不适合您,可以 <a href=\"#om\" id=\"other_mirrors_btn\">查看其他镜像站点</a>."
 
-#: "/web/en/downloads/get/index.php +163"
+#: "/web/en/downloads/get/index.php +164"
 msgid "Your IP address is %s and you seem to be in %s, %s."
 msgstr "您的 IP 是 %s，貌似是在 %s, %s。"
 
-#: "/web/en/downloads/get/index.php +207"
+#: "/web/en/downloads/get/index.php +208"
 msgid "Mageia Downloads"
 msgstr "Mageia 下载"
 
-#: "/web/en/downloads/get/index.php +219"
+#: "/web/en/downloads/get/index.php +220"
 msgid "Download %s"
 msgstr "下载 %s"
 
-#: "/web/en/downloads/get/index.php +226"
+#: "/web/en/downloads/get/index.php +227"
 msgid "Your download of %s should start within a few seconds"
 msgstr "%s 下载即将于几秒钟之后开始。"
 
-#: "/web/en/downloads/get/index.php +227"
+#: "/web/en/downloads/get/index.php +228"
 msgid "(download size is about %s)."
 msgstr "(下载大小约为 %s)。"
 
-#: "/web/en/downloads/get/index.php +228"
-msgid ""
-"If the download does not start, <a href=\"%s\" rel=\"nofollow\" "
-"title=\"%s\">click here</a>."
+#: "/web/en/downloads/get/index.php +229"
+msgid "If the download does not start, <a href=\"%s\" rel=\"nofollow\" title=\"%s\">click here</a>."
 msgstr "如果下载没有开始, <a href=\"%s\" rel=\"nofollow\" title=\"%s\">请点击此处</a>。"
 
-#: "/web/en/downloads/get/index.php +252"
-msgid ""
-"As soon as your download is complete, you should check that the checksums "
-"match:"
+#: "/web/en/downloads/get/index.php +254"
+msgid "As soon as your download is complete, you should check that the checksums match:"
 msgstr "在下载完成后，您应当检验镜像的校验值是否与我们所提供的值相匹配。"
 
-#: "/web/en/downloads/get/index.php +257"
-msgid ""
-"If checksums do not match, <strong>DO NOT use this ISO</strong>. Double-"
-"check and try to download again."
+#: "/web/en/downloads/get/index.php +259"
+msgid "If checksums do not match, <strong>DO NOT use this ISO</strong>. Double-check and try to download again."
 msgstr "若校验值不匹配，<strong>请不要使用此 ISO</strong>。请再次检验；若仍不符合，请尝试重新下载。"
 
-#: "/web/en/downloads/get/index.php +258"
+#: "/web/en/downloads/get/index.php +260"
 msgid "and"
 msgstr "和"
 
-#: "/web/en/downloads/get/index.php +258"
+#: "/web/en/downloads/get/index.php +260"
 msgid ","
 msgstr "，"
 
-#: "/web/en/downloads/get/index.php +260"
+#: "/web/en/downloads/get/index.php +262"
 msgid "Checksums are available for download as files:"
 msgstr "下载文件的校验值："
 
-#: "/web/en/downloads/get/index.php +264"
+#: "/web/en/downloads/get/index.php +266"
 msgid "You can also verify the signature of an ISO."
 msgstr "您也可以检验 ISO 的签名。"
 
-#: "/web/en/downloads/get/index.php +265"
+#: "/web/en/downloads/get/index.php +267"
 msgid "They are also available for download as files:"
 msgstr "下载文件的镜像签名："
 
-#: "/web/en/downloads/get/index.php +267"
-msgid ""
-"First you need to import the \"Mageia Release\" key from a <a "
-"href=\"%s\">MIT PGP Public Key Server</a>:"
+#: "/web/en/downloads/get/index.php +269"
+msgid "First you need to import the \"Mageia Release\" key from a <a href=\"%s\">MIT PGP Public Key Server</a>:"
 msgstr "您首先需要从 <a href=\"%s\">MIT PGP 公钥服务器中</a> 导入”Mageia Release“密钥："
 
-#: "/web/en/downloads/get/index.php +271"
+#: "/web/en/downloads/get/index.php +273"
 msgid "In response there should be one of the following lines:"
 msgstr "在服务器的响应内容中，应当包含下列行之一："
 
-#: "/web/en/downloads/get/index.php +275"
+#: "/web/en/downloads/get/index.php +277"
 msgid "or if you already imported the key before:"
 msgstr "若您已经导入了密钥，则："
 
-#: "/web/en/downloads/get/index.php +279"
+#: "/web/en/downloads/get/index.php +281"
 msgid "Then you need to verify the signature for the ISO."
 msgstr "然后，您需要检验 ISO 的签名。"
 
-#: "/web/en/downloads/get/index.php +283"
+#: "/web/en/downloads/get/index.php +285"
 msgid "In response there should be lines like:"
 msgstr "应当有类似下列内容的响应："
 
-#: "/web/en/downloads/get/index.php +290"
+#: "/web/en/downloads/get/index.php +292"
 msgid "The warning about uncertified signature is expected."
 msgstr "有关”未认证签名“的警告是正常的。"
 
-#: "/web/en/downloads/get/index.php +298"
+#: "/web/en/downloads/get/index.php +300"
 msgid "Country"
 msgstr "国家/地区"
 
-#: "/web/en/downloads/get/index.php +299"
+#: "/web/en/downloads/get/index.php +301"
 msgid "City"
 msgstr "城市"
 
-#: "/web/en/downloads/get/index.php +300"
+#: "/web/en/downloads/get/index.php +302"
 msgid "Download mirrors"
 msgstr "下载镜像"
 
-#: "/web/en/downloads/get/index.php +311"
-msgid ""
-"The making and the distribution of Mageia worldwide is made possible by all "
-"the <a href=\"%s\">people and organizations that mirror our software</a> and"
-" that <a href=\"%s\">donate money, hardware, hosting and more</a>."
+#: "/web/en/downloads/get/index.php +313"
+msgid "The making and the distribution of Mageia worldwide is made possible by all the <a href=\"%s\">people and organizations that mirror our software</a> and that <a href=\"%s\">donate money, hardware, hosting and more</a>."
 msgstr "所有 <a href=\"%s\">做镜像站点</a>，<a href=\"%s\">捐助资金、硬件以及托管等的人员和组织</a>使得 Mageia 的制作和全球发行得以实现。"
 
-#: "/web/en/downloads/get/index.php +312"
+#: "/web/en/downloads/get/index.php +314"
 msgid "Want to help? %sJoin Us!%s"
 msgstr "想要帮忙？%s快加入我们！%s"
 
-#: "/web/en/downloads/get/index.php +317"
+#: "/web/en/downloads/get/index.php +319"
 msgid "Sorry!"
 msgstr "抱歉！"
 
-#: "/web/en/downloads/get/index.php +318"
-msgid ""
-"Your download could not complete, as we could not find this file. Please try"
-" again from the <a href=\"%s\">main downloads page</a>."
+#: "/web/en/downloads/get/index.php +320"
+msgid "Your download could not complete, as we could not find this file. Please try again from the <a href=\"%s\">main downloads page</a>."
 msgstr "您的下载无法完成，因为我们找不到这个文件。请从<a href=\"%s\">主下载页面</a>再试一次。"
 
-#: "/web/en/downloads/get/index.php +320"
-msgid ""
-"If you still encounter this error and think IT SHOULD NOT HAPPEN &ndash; "
-"please tell us:"
+#: "/web/en/downloads/get/index.php +322"
+msgid "If you still encounter this error and think IT SHOULD NOT HAPPEN &ndash; please tell us:"
 msgstr "如果您持续遇到此类觉得不应该出现的错误，请告知我们："
 
-#: "/web/en/downloads/get/index.php +322"
-msgid ""
-"directly on <a href=\"irc://irc.freenode.net/#mageia-atelier\">#mageia-"
-"atelier on Freenode IRC</a>,"
+#: "/web/en/downloads/get/index.php +324"
+msgid "directly on <a href=\"irc://irc.freenode.net/#mageia-atelier\">#mageia-atelier on Freenode IRC</a>,"
 msgstr "在 <a href=\"irc://irc.freenode.net/#mageia-atelier\">Freenode IRC 的 #mageia-atelier</a> 里直接上报，"
 
-#: "/web/en/downloads/get/index.php +323"
+#: "/web/en/downloads/get/index.php +325"
 msgid "or <a href=\"https://twitter.com/mageia_org\">via our Twitter account</a>,"
 msgstr "或者<a href=\"https://twitter.com/mageia_org\">通过我们的 Twitter 账户</a>，"
 
-#: "/web/en/downloads/get/index.php +324"
-msgid ""
-"or with a <a href=\"https://ml.mageia.org/l/info/atelier-discuss\">notice on"
-" the Atelier team mailing-list</a>,"
+#: "/web/en/downloads/get/index.php +326"
+msgid "or with a <a href=\"https://ml.mageia.org/l/info/atelier-discuss\">notice on the Atelier team mailing-list</a>,"
 msgstr "或者<a href=\"https://ml.mageia.org/l/info/atelier-discuss\">在 Atelier 团队的邮件列表上通知</a>，"
 
-#: "/web/en/downloads/get/index.php +325"
-msgid ""
-"or a <a "
-"href=\"https://bugs.mageia.org/enter_bug.cgi?product=Websites&amp;format=guided&amp;component=www.mageia.org\">bug"
-" report</a>."
+#: "/web/en/downloads/get/index.php +327"
+msgid "or a <a href=\"https://bugs.mageia.org/enter_bug.cgi?product=Websites&amp;format=guided&amp;component=www.mageia.org\">bug report</a>."
 msgstr "或者<a href=\"https://bugs.mageia.org/enter_bug.cgi?product=Websites&amp;format=guided&amp;component=www.mageia.org\">提交错误报告</a>。"
 
-#: "/web/en/downloads/get/index.php +328"
-msgid ""
-"Please copy and report us the above address that returned you to this page."
+#: "/web/en/downloads/get/index.php +330"
+msgid "Please copy and report us the above address that returned you to this page."
 msgstr "请告知我们返回给你这个页面的地址。"
 
-#: "/web/en/downloads/get/index.php +328"
+#: "/web/en/downloads/get/index.php +330"
 msgid "Thanks!"
 msgstr "感谢！"
 
-#: "/web/en/downloads/get/index.php +329"
+#: "/web/en/downloads/get/index.php +331"
 msgid "back to that awesome Mageia home page"
 msgstr "回到 Mageia 首页"
+
+#: "/web/en/downloads/get/index.php +336"
+msgid "By continuing this navigation, you agree to the use of cookies to enable you to share content via social network sharing buttons."
+msgstr ""
+
+#: "/web/en/downloads/get/index.php +336"
+msgid "Share"
+msgstr ""
diff --git a/langs/zh-cn/index.po b/langs/zh-cn/index.po
index d8cbdc822..64f1097f2 100644
--- a/langs/zh-cn/index.po
+++ b/langs/zh-cn/index.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2014 - 2016 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-# 
+#
 # Generated by extract2gettext.php
 # Domain: index
-# 
+#
 # include translation strings from:
 # en/index.php
-# 
+#
 # Translators:
 # xiao wenming <xwm-citcc5@hotmail.com>, 2015
 # zwpwjwtz <zwpwjwtz@126.com>, 2016-2017
@@ -16,14 +16,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2016-12-13 18:43:41+0000\n"
+"POT-Creation-Date: 2017-07-16 12:46:40+0200\n"
 "PO-Revision-Date: 2017-01-13 03:49+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/index.php +14"
@@ -35,9 +35,7 @@ msgid "Mageia is a community-based Linux distribution, for desktop & server."
 msgstr "Mageia 是基于社区的 Linux 发行版，适用于桌面和服务器。"
 
 #: "/web/en/index.php +16"
-msgid ""
-"linux, mageia, free software, operating system, computer, laptop, desktop, "
-"server, headless, device, mobile, mandriva, mandrake"
+msgid "linux, mageia, free software, operating system, computer, laptop, desktop, server, headless, device, mobile, mandriva, mandrake"
 msgstr "linux, mageia, free software, operating system, computer, laptop, desktop, server, headless, device, mobile, mandriva, mandrake"
 
 #: "/web/en/index.php +23"
@@ -48,20 +46,19 @@ msgstr "Mageia 博客(English)"
 msgid "https://blog.mageia.org/en/?feed=rss"
 msgstr "https://blog.mageia.org/en/?feed=rss"
 
-#: "/web/en/index.php +228"
-msgid ""
-"Mageia, a free, community-based Linux distribution for desktop & server."
+#: "/web/en/index.php +226"
+msgid "Mageia, a free, community-based Linux distribution for desktop & server."
 msgstr "Mageia,自由、基于社区的 Linux 发行版，适用于桌面和服务器。"
 
-#: "/web/en/index.php +237"
+#: "/web/en/index.php +235"
 msgid "Latest news from our <a href=\"%s\">blog</a>:"
 msgstr "<a href=\"%s\">官方博客</a> 上的新闻："
 
-#: "/web/en/index.php +237"
+#: "/web/en/index.php +235"
 msgid "https://blog.mageia.org/en/"
 msgstr "https://blog.mageia.org/en/"
 
-#: "/web/en/index.php +239"
+#: "/web/en/index.php +237"
 msgid "https://planet.mageia.org/en/"
 msgstr "https://planet.mageia.org/en/"
 
@@ -86,11 +83,13 @@ msgid "You can be part of it"
 msgstr "您也可以成为其中一员"
 
 #: "/web/en/index.php +261"
-msgid "Mageia 5.1"
+#, fuzzy
+msgid "Mageia 6"
 msgstr "Mageia 5.1"
 
 #: "/web/en/index.php +262"
-msgid "released in December 2016"
+#, fuzzy
+msgid "released in July 2017"
 msgstr "于 2016 年 12 月发布"
 
 #: "/web/en/index.php +266"
@@ -98,7 +97,8 @@ msgid "<a href=\"%s\" hreflang=\"en\">Release notes</a>"
 msgstr "<a href=\"%s\" hreflang=\"en\">发行注记</a>"
 
 #: "/web/en/index.php +266"
-msgid "https://wiki.mageia.org/en/Mageia_5.1_Release_Notes"
+#, fuzzy
+msgid "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
 msgstr "https://wiki.mageia.org/en/Mageia_5.1_Release_Notes"
 
 #: "/web/en/index.php +267"
@@ -106,7 +106,8 @@ msgid "<a href=\"%s\" hreflang=\"en\">errata</a>"
 msgstr "<a href=\"%s\" hreflang=\"en\">errata</a>"
 
 #: "/web/en/index.php +267"
-msgid "https://wiki.mageia.org/en/Mageia_5_Errata"
+#, fuzzy
+msgid "https://wiki.mageia.org/en/Mageia_6_Errata"
 msgstr "https://wiki.mageia.org/en/Mageia_5_Errata"
 
 #: "/web/en/index.php +272"