Fix Chinese (Simplified) translation

20 files changed, 297 insertions, 258 deletions

diff --git a/langs/zh-cn/2.po b/langs/zh-cn/2.po
index b06867493..2d6c25aa7 100644
--- a/langs/zh-cn/2.po
+++ b/langs/zh-cn/2.po
@@ -14,17 +14,17 @@
 # en/2/nav.php
 # 
 # Translators:
-# Sicong Kevin Jiang <kevin4313@163.com>, 2014
+# Sicong Kevin Jiang, 2014
 # xiao wenming <xwm-citcc5@hotmail.com>, 2015
-# 周潇波 <zhouxiaobo.500@gmail.com>, 2014
+# xiaobo zhou <zhouxiaobo.500@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-20 19:38:15+0000\n"
-"PO-Revision-Date: 2015-01-20 08:01+0000\n"
+"PO-Revision-Date: 2016-05-01 14:51+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/3.po b/langs/zh-cn/3.po
index 4ff0c4b30..28ac0264c 100644
--- a/langs/zh-cn/3.po
+++ b/langs/zh-cn/3.po
@@ -20,9 +20,9 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-11-27 19:38:42+0000\n"
-"PO-Revision-Date: 2015-01-20 12:12+0000\n"
+"PO-Revision-Date: 2016-05-01 14:51+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/404.po b/langs/zh-cn/404.po
index 021203f45..8b2f4a375 100644
--- a/langs/zh-cn/404.po
+++ b/langs/zh-cn/404.po
@@ -17,7 +17,7 @@ msgstr ""
 "POT-Creation-Date: 2014-03-16 20:51:22+0000\n"
 "PO-Revision-Date: 2014-03-17 17:59+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/about.po b/langs/zh-cn/about.po
index 812d3e9c8..addab38c4 100644
--- a/langs/zh-cn/about.po
+++ b/langs/zh-cn/about.po
@@ -2,27 +2,28 @@
 # Copyright (C) 2014 - 2015 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-#
+# 
 # Generated by extract2gettext.php
 # Domain: about
-#
+# 
 # include translation strings from:
 # en/about/index.php
-#
+# 
 # Translators:
 # xiao wenming <xwm-citcc5@hotmail.com>, 2015
+# zwpwjwtz <zwpwjwtz@126.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2015-06-19 20:15:07+0000\n"
-"PO-Revision-Date: 2015-03-21 23:25+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2016-08-16 13:36+0000\n"
+"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/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/about/index.php +12"
@@ -34,7 +35,8 @@ msgid "Mageia is a Free Software, community-led project. Learn more about it."
 msgstr "Mageia 是自由软件，以社区领导的项目。此页列出了有关更多信息。"
 
 #: "/web/en/about/index.php +14"
-msgid "mageia, mageia.org, about, mission, contacts, governance, values, timeline"
+msgid ""
+"mageia, mageia.org, about, mission, contacts, governance, values, timeline"
 msgstr "mageia, mageia.org, about, mission, contacts, governance, values, timeline"
 
 #: "/web/en/about/index.php +34"
@@ -42,7 +44,9 @@ msgid "Mageia is a GNU/Linux-based, Free Software operating system."
 msgstr "Mageia 是基于 GNU/Linux 的自由软件操作系统。"
 
 #: "/web/en/about/index.php +35"
-msgid "It is a <a href=\"../community/\">community project</a>, supported by <a href=\"#mageia.org\">a nonprofit organisation</a> of elected contributors."
+msgid ""
+"It is a <a href=\"../community/\">community project</a>, supported by <a "
+"href=\"#mageia.org\">a nonprofit organisation</a> of elected contributors."
 msgstr "这是一项<a href=\"../community/\">社区项目</a>，由经推选的志愿者组成的<a href=\"#mageia.org\">非营利性机构</a>所支持。"
 
 #: "/web/en/about/index.php +38"
@@ -50,7 +54,10 @@ msgid "Our mission: to build great tools for people."
 msgstr "我们的目标：为大家创造好用的工具。"
 
 #: "/web/en/about/index.php +39"
-msgid "Further than just delivering a secure, stable and sustainable operating system, the goal is to set up a stable and trustable governance to direct collaborative projects."
+msgid ""
+"Further than just delivering a secure, stable and sustainable operating "
+"system, the goal is to set up a stable and trustable governance to direct "
+"collaborative projects."
 msgstr "除了发布安全稳定适用的操作系统，我们的目标还在于创立可指导协作项目的稳定可信的管理机制。"
 
 #: "/web/en/about/index.php +40"
@@ -58,28 +65,41 @@ msgid "To date, Mageia:"
 msgstr "Mageia 大事记："
 
 #: "/web/en/about/index.php +43"
-msgid "<a href=\"2010-sept-announcement.html\">started in September 2010 as a fork</a> of Mandriva Linux,"
+msgid ""
+"<a href=\"2010-sept-announcement.html\">started in September 2010 as a "
+"fork</a> of Mandriva Linux,"
 msgstr "<a href=\"2010-sept-announcement.html\">始于2010年9月对 Mandriva Linux 的分支</a>，"
 
 #: "/web/en/about/index.php +45"
-msgid "gathered <a href=\"../community/\">hundreds of careful individuals and several companies worldwide</a>,"
+msgid ""
+"gathered <a href=\"../community/\">hundreds of careful individuals and "
+"several companies worldwide</a>,"
 msgstr "聚集了<a href=\"../community/\">全球各地数以百计的个人和公司</a>，"
 
 #: "/web/en/about/index.php +46"
-msgid "who coproduce the infrastructure, the distribution itself, <a href=\"https://wiki.mageia.org/\">documentation</a>, <a href=\"../downloads/\">delivery</a> and <a href=\"../support/\">support</a>, using Free Software tools;"
+msgid ""
+"who coproduce the infrastructure, the distribution itself, <a "
+"href=\"https://wiki.mageia.org/\">documentation</a>, <a "
+"href=\"../downloads/\">delivery</a> and <a href=\"../support/\">support</a>,"
+" using Free Software tools;"
 msgstr "这些个人和公司使用自由软件工具共同维护了社区的组织架构、发行版、<a href=\"https://wiki.mageia.org/\">文档</a>、<a href=\"../downloads/\">分发</a>和<a href=\"../support/\">支持</a>；"
 
 #: "/web/en/about/index.php +48"
-#, fuzzy
-msgid "released five major stable releases <a href=\"../1/\">in June 2011</a>, <a href=\"../2/\">in May 2012</a>, <a href=\"../3/\">in May 2013</a>, <a href=\"../4/\">in February 2014</a> and <a href=\"../5/\">in June 2015</a>."
-msgstr "发布了四个稳定版本 <a href=\"../1/\">于2011年6月</a>, <a href=\"../2/\">于2012年5月</a>, <a href=\"../3/\">于2013年5月</a> and <a href=\"../4/\">于2014年2月</a>。"
+msgid ""
+"released five major stable releases <a href=\"../1/\">in June 2011</a>, <a "
+"href=\"../2/\">in May 2012</a>, <a href=\"../3/\">in May 2013</a>, <a "
+"href=\"../4/\">in February 2014</a> and <a href=\"../5/\">in June 2015</a>."
+msgstr "于 <a href=\"../1/\">2011 年 6 月</a>、<a href=\"../2/\">2012 年 5 月</a>、<a href=\"../3/\">2013 年 5 月</a>、<a href=\"../4/\">2014 年 2 月</a>和<a href=\"../5/\">2015 年 6 月</a> 发布了五个稳定版本。"
 
 #: "/web/en/about/index.php +69"
-msgid "is the French, Paris-based legal structure supporting the Mageia project."
+msgid ""
+"is the French, Paris-based legal structure supporting the Mageia project."
 msgstr "是支持 Mageia 项目法律机构，位于法国巴黎。"
 
 #: "/web/en/about/index.php +72"
-msgid "<a href=%s>Mageia.Org's legal constitution</a> and <a href=%s>governance</a> rules;"
+msgid ""
+"<a href=%s>Mageia.Org's legal constitution</a> and <a href=%s>governance</a>"
+" rules;"
 msgstr "是支持 Mageia 项目法律机构，位于法国巴黎。"
 
 #: "/web/en/about/index.php +73"
@@ -87,7 +107,9 @@ msgid "\"https://wiki.mageia.org/en/Org\""
 msgstr "\"https://wiki.mageia.org/en/Org\""
 
 #: "/web/en/about/index.php +74"
-msgid "<a href=\"../about/reports/\">financial reports</a>, <a href=\"../thank-you/\">donators</a>."
+msgid ""
+"<a href=\"../about/reports/\">financial reports</a>, <a href=\"../thank-"
+"you/\">donators</a>."
 msgstr "<a href=\"../about/reports/\">财务报告</a>，<a href=\"../thank-you/\">资助者</a>。"
 
 #: "/web/en/about/index.php +78"
@@ -96,7 +118,7 @@ msgstr "Mageia 许可证"
 
 #: "/web/en/about/index.php +79"
 msgid "Our contributions are based on <a href=%s>our license</a>."
-msgstr ""
+msgstr "我们的贡献基于 <a href=%s>Mageia 许可协议</a>。"
 
 #: "/web/en/about/index.php +82"
 msgid "Code of conduct"
@@ -104,7 +126,7 @@ msgstr "规范"
 
 #: "/web/en/about/index.php +83"
 msgid "In our community we use <a href=%s>Code of conduct</a>."
-msgstr ""
+msgstr "在我们的社区中，我们 <a href=%s>以此</a> 作为行为守则。"
 
 #: "/web/en/about/index.php +86"
 msgid "Media &amp; artwork"
diff --git a/langs/zh-cn/about/code-of-conduct.po b/langs/zh-cn/about/code-of-conduct.po
index 8153ff044..976fd7fad 100644
--- a/langs/zh-cn/about/code-of-conduct.po
+++ b/langs/zh-cn/about/code-of-conduct.po
@@ -17,7 +17,7 @@ msgstr ""
 "POT-Creation-Date: 2014-03-16 20:51:23+0000\n"
 "PO-Revision-Date: 2014-04-03 12:09+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/about/constitution.po b/langs/zh-cn/about/constitution.po
index ea5847cd6..181fb3e56 100644
--- a/langs/zh-cn/about/constitution.po
+++ b/langs/zh-cn/about/constitution.po
@@ -17,7 +17,7 @@ msgstr ""
 "POT-Creation-Date: 2014-03-23 14:19:23+0000\n"
 "PO-Revision-Date: 2014-03-24 17:42+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/about/media.po b/langs/zh-cn/about/media.po
index d7b45b0b8..c0b8fce94 100644
--- a/langs/zh-cn/about/media.po
+++ b/langs/zh-cn/about/media.po
@@ -18,7 +18,7 @@ msgstr ""
 "POT-Creation-Date: 2014-05-04 21:24:54+0000\n"
 "PO-Revision-Date: 2015-01-23 13:52+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/about/reports.po b/langs/zh-cn/about/reports.po
index 14e25d2a2..a0f06f7da 100644
--- a/langs/zh-cn/about/reports.po
+++ b/langs/zh-cn/about/reports.po
@@ -10,14 +10,15 @@
 # en/about/reports/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: 2014-04-21 16:18:39+0000\n"
-"PO-Revision-Date: 2014-04-22 09:44+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"PO-Revision-Date: 2016-08-16 13:32+0000\n"
+"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,11 +49,11 @@ msgstr "在这里，您可以看到我们每年的各种活动和财政报告。
 
 #: "/web/en/about/reports/index.php +27"
 msgid "%sFinancial report</a>%s."
-msgstr ""
+msgstr "%s财务报告</a>%s。"
 
 #: "/web/en/about/reports/index.php +27"
 msgid "(in progress)"
-msgstr ""
+msgstr "（进行中）"
 
 #: "/web/en/about/reports/index.php +30"
 msgid ""
diff --git a/langs/zh-cn/about/values.po b/langs/zh-cn/about/values.po
index 11b86cd86..81568082f 100644
--- a/langs/zh-cn/about/values.po
+++ b/langs/zh-cn/about/values.po
@@ -18,7 +18,7 @@ msgstr ""
 "POT-Creation-Date: 2014-03-16 20:51:26+0000\n"
 "PO-Revision-Date: 2015-01-20 12:12+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/calendar.po b/langs/zh-cn/calendar.po
index 7461d1f90..d9e9ffa4e 100644
--- a/langs/zh-cn/calendar.po
+++ b/langs/zh-cn/calendar.po
@@ -17,7 +17,7 @@ msgstr ""
 "POT-Creation-Date: 2014-03-16 20:51:20+0000\n"
 "PO-Revision-Date: 2014-03-17 18:11+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/cauldron.po b/langs/zh-cn/cauldron.po
index de1846f80..24573f10c 100644
--- a/langs/zh-cn/cauldron.po
+++ b/langs/zh-cn/cauldron.po
@@ -2,14 +2,14 @@
 # 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: cauldron
-#
+# 
 # include translation strings from:
 # en/6/download_index.php
 # en/6/nav.php
-#
+# 
 # Translators:
 # zwpwjwtz <zwpwjwtz@126.com>, 2016
 msgid ""
@@ -17,13 +17,13 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2016-07-01 20:37:31+0000\n"
-"PO-Revision-Date: 2016-04-26 11:59+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2016-08-16 13:42+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/6/download_index.php +35"
@@ -43,12 +43,13 @@ msgid "Download"
 msgstr "下载"
 
 #: "/web/en/6/download_index.php +64"
-#, fuzzy
 msgid "Download %s DVD, LiveDVD, network install ISO images."
-msgstr "下载 Mageia 4 DVD，CD，LiveCD，网络安装ISO 镜像。"
+msgstr "下载 %s DVD、Live DVD、网络安装 ISO 镜像。"
 
 #: "/web/en/6/download_index.php +65"
-msgid "mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
+msgid ""
+"mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, "
+"bittorrent"
 msgstr "mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
 
 #: "/web/en/6/download_index.php +140"
@@ -60,27 +61,40 @@ msgid "Be careful! This is a beta, unstable release."
 msgstr "当心！这是一个测试版，不稳定的发行版。"
 
 #: "/web/en/6/download_index.php +142"
-msgid "It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>"
+msgid ""
+"It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION"
+" OR FOR OFFICIAL REVIEW.</strong>"
 msgstr "这仅供开发人员使用。<strong>请不用于生产环境或者官方审查</strong>"
 
 #: "/web/en/6/download_index.php +143"
-msgid "This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s."
-msgstr ""
+msgid ""
+"This is a Release Candidate. Release Candidate software is software that has"
+" graduated Beta testing, and should be a release-ready product suitable for "
+"advanced users and reviewers. However, beginning users and critical-"
+"applications users may wish to wait for the final release planned for %s."
+msgstr "本版本是 RC 版。RC 版是指通过了 Beta 测试、即将发布的软件产品，适用于高级用户和评论者。不过，新手和需要运行重要程序的用户应当等到 %s 的最终版本发布后再做决定。"
 
 #: "/web/en/6/download_index.php +143"
 msgid "May 2015"
 msgstr "2015 年五月"
 
 #: "/web/en/6/download_index.php +143"
-msgid "Release Candidate is intended to identify any remaining bugs or missing packages."
+msgid ""
+"Release Candidate is intended to identify any remaining bugs or missing "
+"packages."
 msgstr "候选版本旨在确定任何遗留的bug或者缺失的软件包。"
 
 #: "/web/en/6/download_index.php +152"
-msgid "It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> it to have better render. At the <a href=\"%s\">end</a> of this page there will be download link for you. But what is written between is important."
+msgid ""
+"It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> "
+"it to have better render. At the <a href=\"%s\">end</a> of this page there "
+"will be download link for you. But what is written between is important."
 msgstr "您似乎禁用了 JavaScript。请<a href=\"%s\">启用</a>它来渲染页面。在本页<a href=\"%s\">末尾</a>将会提供下载链接，但建议您先阅读本页中的内容。"
 
 #: "/web/en/6/download_index.php +158"
-msgid "Mageia is provided as ISO image files that have to be written to blank <a href=\"%s\">CD or DVD discs</a>."
+msgid ""
+"Mageia is provided as ISO image files that have to be written to blank <a "
+"href=\"%s\">CD or DVD discs</a>."
 msgstr "Mageia 以 ISO 镜像文件的形式提供，应当将镜像文件写入空白的 <a href=\"%s\">CD 或 DVD 光盘</a>中以便使用。"
 
 #: "/web/en/6/download_index.php +158"
@@ -92,11 +106,14 @@ msgid "All ISOs can also be launched from a <a %s>USB drive</a>."
 msgstr "所有的 ISO 都可以 <a %s>USB 盘</a>启动。"
 
 #: "/web/en/6/download_index.php +160"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgid ""
+"https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
 msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
 
 #: "/web/en/6/download_index.php +162"
-msgid "To <a %s>dump</a> a Mageia installation ISO on a USB stick, you may try one of several tools:"
+msgid ""
+"To <a %s>dump</a> a Mageia installation ISO on a USB stick, you may try one "
+"of several tools:"
 msgstr "要将 Mageia 安装镜像 <a %s>烧录</a> 至 U 盘，您需要以下工具："
 
 #: "/web/en/6/download_index.php +164"
@@ -108,19 +125,29 @@ msgid "Unetbootin is not supported."
 msgstr "不支持 Unetbootin。"
 
 #: "/web/en/6/download_index.php +167"
-msgid "For Windows please have a look on our <a href=\"%s\">wiki</a> for your options."
+msgid ""
+"For Windows please have a look on our <a href=\"%s\">wiki</a> for your "
+"options."
 msgstr "Windows 用户请参考我们的 <a href=\"%s\">wiki</a>。"
 
 #: "/web/en/6/download_index.php +167"
-msgid "https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-_Alternative_tools"
+msgid ""
+"https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-"
+"_Alternative_tools"
 msgstr "https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-_Alternative_tools"
 
 #: "/web/en/6/download_index.php +170"
-msgid "\"Dumping\" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk."
+msgid ""
+"\"Dumping\" an image onto a flash device destroys any prior file-system in "
+"the partition; access to any data not destroyed will be lost, and partition "
+"capacity will be reduced to the image size. In other words, all prior data "
+"on the device is at risk."
 msgstr "“写入”镜像至闪存设备的操作将清除设备上原先存在的任何文件系统或分区；分区上没有被覆盖的数据也会丢失，分区容量将与镜像大小一致。换句话说，设备上的所有数据都会丢失。"
 
 #: "/web/en/6/download_index.php +173"
-msgid "If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a href=\"%s\">wiki</a>."
+msgid ""
+"If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a "
+"href=\"%s\">wiki</a>."
 msgstr "若您使用 <a href=\"%s\">UEFI</a>，可以在此 <a href=\"%s\">wiki</a> 中找到相应的操作方法。"
 
 #: "/web/en/6/download_index.php +173"
@@ -136,7 +163,9 @@ msgid "Classical Installation Flavours"
 msgstr "经典安装风格"
 
 #: "/web/en/6/download_index.php +183"
-msgid "The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href=\"%s\">documentation</a> for this installer."
+msgid ""
+"The Classical ISO is the traditional way to install Mageia directly. Take a "
+"look at the complete <a href=\"%s\">documentation</a> for this installer."
 msgstr "经典的 ISO 是直接安装 Mageia 的传统方法。请参考完整的 <a href=\"%s\">documentation</a> 来进行安装。"
 
 #: "/web/en/6/download_index.php +185"
@@ -160,52 +189,59 @@ msgid "You will be asked of which kind of Software you want to install."
 msgstr "安装时会询问您想要安装哪种软件。"
 
 #: "/web/en/6/download_index.php +193"
-msgid "The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO."
+msgid ""
+"The installer includes the capability of adding the online Mageia "
+"repositories during the installation, which means you can install even more "
+"packages than those available on the ISO."
 msgstr "可以在安装时添加在线 Mageia 仓库，使得可安装的软件包不只限于 ISO 提供的内容。"
 
 #: "/web/en/6/download_index.php +196"
-#, fuzzy
 msgid "For 32 and 64bit, size of the ISOs is about %sGB."
-msgstr "32 位和 64 位的 ISO 大小约为 %sGB。双架构的 ISO 大小约为 %s GB。"
+msgstr "对于 32 位 和 64 位的 ISO，其大小约为 %sGB。"
 
 #: "/web/en/6/download_index.php +204"
 msgid "LiveDVDs"
 msgstr "Live DVD"
 
 #: "/web/en/6/download_index.php +206"
-#, fuzzy
-msgid "Live ISO's let you try %s without installation. You can run Mageia directly from a DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or PLASMA."
-msgstr "Live ISO 允许您试用 %s 而不进行安装。您可以直接从 CD、DVD 或 USB 设备直接启动 Mageia，然后试用 GNOME、KDE 等图形化用户界面。"
+msgid ""
+"Live ISO's let you try %s without installation. You can run Mageia directly "
+"from a DVD or USB device, and try it using one of the graphical user "
+"interfaces such as GNOME or PLASMA."
+msgstr "Live ISO 可用于在不安装的情况下体验 %s。您可以从 DVD 或 USB 设备上直接启动 Mageia，并使用其图形界面（如 GNOME 或 PLASMA）。"
 
 #: "/web/en/6/download_index.php +207"
-msgid "If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media."
+msgid ""
+"If you are happy with the Mageia experience, you can then install it onto "
+"your hard drive from the Live media."
 msgstr "如果您的Mageia体验愉快，您可以把它从live介质安装到您的硬盘。"
 
 #: "/web/en/6/download_index.php +209"
-#, fuzzy
 msgid "Use LiveDVDs for fresh new installs ONLY."
-msgstr "LiveCDs 和 LiveDVDs 仅适用于全新安装。"
+msgstr "LiveDVD 仅能用于全新安装。"
 
 #: "/web/en/6/download_index.php +210"
-#, fuzzy
 msgid "DO NOT use these LiveDVDs to upgrade from the prior Mageia release!"
-msgstr "不要将这些 LiveCDs or LiveDVDs 用于从 Mageia 3 升级！"
+msgstr "请不要使用 LiveDVD 来升级旧版本的 Mageia！"
 
 #: "/web/en/6/download_index.php +211"
-msgid "Use a classical installation and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
+msgid ""
+"Use a classical installation and see <a href=\"%s\" hreflang=\"en\">upgrade "
+"guide</a>."
 msgstr "使用上面列出的 DVD 或 CD 进行升级，详情参阅<a href=\"%s\" hreflang=\"en\">升级指南</a>."
 
 #: "/web/en/6/download_index.php +214"
-#, fuzzy
 msgid "For LiveDVDs, size of the ISOs is about %sGB."
-msgstr "Live DVD 的大小约为 %sGB。Live CD 的大小约为 %sMB。"
+msgstr "对于 LiveDVD 的 ISO 镜像，其大小约为 %sGB。"
 
 #: "/web/en/6/download_index.php +219"
 msgid "Wired Network-based Installation CD"
 msgstr "有线网络安装 CD"
 
 #: "/web/en/6/download_index.php +220"
-msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
+msgid ""
+"Download quickly and immediately boot into install mode from <em>wired</em> "
+"network or a local disk."
 msgstr "快速下载，启动后将立即进入从<em>有线</em>网络或从本地磁盘的安装模式。"
 
 #: "/web/en/6/download_index.php +221"
@@ -233,9 +269,8 @@ msgid "Network Installation"
 msgstr "有线网络安装 CD"
 
 #: "/web/en/6/download_index.php +236"
-#, fuzzy
 msgid "LiveDVDs are not yet available."
-msgstr "LiveCDs 和 LiveDVDs 仅适用于全新安装。"
+msgstr "LiveDVD 尚不可用。"
 
 #: "/web/en/6/download_index.php +237"
 msgid "Classical Installation flavours is not yet available."
@@ -250,9 +285,8 @@ msgid "GNOME Desktop"
 msgstr "桌面"
 
 #: "/web/en/6/download_index.php +252"
-#, fuzzy
 msgid "PLASMA Desktop"
-msgstr "桌面"
+msgstr "PLASMA 桌面"
 
 #: "/web/en/6/download_index.php +265"
 msgid "Network installer"
@@ -271,7 +305,9 @@ msgid "Network installer + nonfree firmware CD"
 msgstr "网络安装 + 非自由固件 CD"
 
 #: "/web/en/6/download_index.php +273"
-msgid "Contain nonfree drivers needed for some disc controllers, some network cards, etc."
+msgid ""
+"Contain nonfree drivers needed for some disc controllers, some network "
+"cards, etc."
 msgstr "某些磁盘控制器、网卡可能需要。"
 
 #: "/web/en/6/download_index.php +277"
@@ -287,11 +323,15 @@ msgid "Supported Architecture"
 msgstr "支持的架构"
 
 #: "/web/en/6/download_index.php +287"
-msgid "Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it."
+msgid ""
+"Most new computers support x86-64 (also known as AMD64 and Intel64), but "
+"some laptop processors and netbook processors do not support it."
 msgstr "许多新计算机都支持 x86_64（也叫做 AMD64 或 Intel64），但是一些笔记本和上网本处理器可能不支持它。"
 
 #: "/web/en/6/download_index.php +291"
-msgid "This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though."
+msgid ""
+"This version runs on all PCs including those that support 64 Bit. If you "
+"have more than 3 GB of RAM you should prefer the 64 Bit version though."
 msgstr "这个版本可以在全部计算机上运行，包括那些支持 64 位的计算机。若您有大于 3GB 的内存，您可能会倾向于选择 64 位的版本。"
 
 #: "/web/en/6/download_index.php +303"
@@ -311,7 +351,9 @@ msgid "BitTorrent"
 msgstr "BitTorrent"
 
 #: "/web/en/6/download_index.php +313"
-msgid "We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files."
+msgid ""
+"We recommend you to use <a href=%s>BitTorrent</a> for downloading as it "
+"usually give a higher speeds and more reliable download of large files."
 msgstr "我们建议您使用 <a href=%s>BitTorrent</a> 来下载它，通常这样能够提高下载速度和可靠性。"
 
 #: "/web/en/6/download_index.php +313"
@@ -372,51 +414,44 @@ msgstr "她在 <a href=\"%s\">这里</a>."
 
 #: "/web/en/6/download_index.php +444"
 msgid "Upgrading<br>from %s ?"
-msgstr ""
-"升级<br>\n"
-"自 %s？"
+msgstr "升级<br>\n自 %s？"
 
 #: "/web/en/6/download_index.php +446"
-#, fuzzy
 msgid "<strong>do not</strong> use LiveDVDs;"
-msgstr "<strong>不要</strong>使用 LiveCD;"
+msgstr "<strong>请不要</strong>使用 LiveDVD；"
 
 #: "/web/en/6/download_index.php +447"
 msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
 msgstr "使用上面列出的 DVD 或 CD 进行升级，详情参阅<a href=\"%s\" hreflang=\"en\">升级指南</a>."
 
 #: "/web/en/6/nav.php +7"
-#, fuzzy
 msgid "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
-msgstr "https://wiki.mageia.org/en/Newcomers_start_here"
+msgstr "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
 
 #: "/web/en/6/nav.php +8"
-#, fuzzy
 msgid "https://wiki.mageia.org/en/Mageia_6_Errata"
-msgstr "https://wiki.mageia.org/en/Boot.iso_install"
+msgstr "https://wiki.mageia.org/en/Mageia_6_Errata"
 
 #: "/web/en/6/nav.php +9"
-#, fuzzy
-msgid "https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5"
-msgstr "https://wiki.mageia.org/en/Installation_Media"
+msgid ""
+"https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5"
+msgstr "https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5"
 
 #: "/web/en/6/nav.php +12"
 msgid "Development roadmap"
 msgstr "开发进度"
 
 #: "/web/en/6/nav.php +12"
-#, fuzzy
 msgid "https://wiki.mageia.org/en/Mageia_6_Development"
-msgstr "https://wiki.mageia.org/en/Boot.iso_install"
+msgstr "https://wiki.mageia.org/en/Mageia_6_Development"
 
 #: "/web/en/6/nav.php +13"
 msgid "Features review"
 msgstr "特性回顾"
 
 #: "/web/en/6/nav.php +13"
-#, fuzzy
 msgid "https://wiki.mageia.org/en/FeatureMageia6_Review"
-msgstr "https://wiki.mageia.org/en/Installation_Media"
+msgstr "https://wiki.mageia.org/en/FeatureMageia6_Review"
 
 #: "/web/en/6/nav.php +15"
 msgid "Errata"
@@ -425,48 +460,3 @@ msgstr "Errata"
 #: "/web/en/6/nav.php +16"
 msgid "Bugs Reports"
 msgstr "错误报告"
-
-#~ msgid "LiveDVDs contain all languages and is available in both 32 and 64bit."
-#~ msgstr "Live DVD 包含所有语言和 32/64 位软件。"
-
-#~ msgid "Dualarch"
-#~ msgstr "dualarch"
-
-#~ msgid "LiveCDs and LiveDVDs"
-#~ msgstr "LiveCDs and LiveDVDs"
-
-#~ msgid "The dualarch is not yet available."
-#~ msgstr "尚不支持双架构。"
-
-#~ msgid "LiveCDs"
-#~ msgstr "Live CD"
-
-#~ msgid "LiveCDs contain only English and is available only in 32bit."
-#~ msgstr "Live CD 仅包含英语和 32 位软件。"
-
-#~ msgid "Do not use unless you really DON'T NEED any other language than English."
-#~ msgstr "除非您确实不需要除英语以外的其他语言，否则请不要使用此项。"
-
-#~ msgid "English only (CD)"
-#~ msgstr "只有英语"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "桌面"
-
-#~ msgid "The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB."
-#~ msgstr "双架构 DVD 仅包含最小的软件包集，以及一个轻量级的桌面——%s，以便将大小限制在 %sGB。"
-
-#~ msgid "Dual iso size is intended to be small for advanced users, only network proprietary drivers are included."
-#~ msgstr "我们尽量控制双架构 ISO 的尺寸以方便高级用户。其中仅包含网络相关的私有驱动。"
-
-#~ msgid "You will have to add remote nonfree media if you need some more."
-#~ msgstr "若需要 nonfree 软件包，您可以添加 远程 nonfree 媒体。"
-
-#~ msgid "Furthermore UEFI is not supported."
-#~ msgstr "此外，也不支持 UEFI。"
-
-#~ msgid "It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU."
-#~ msgstr "可用于安装 32 位或 64 位系统，若检测到了 64 位CPU 则会自动安装 x86_64 架构的软件包。"
-
-#~ msgid "This ISO is generally for advanced users and system administrator for fast deployment of Mageia."
-#~ msgstr "此 ISO 一般用于高级用户和系统管理员进行 Mageia 的快速部署。"
diff --git a/langs/zh-cn/common_footer.po b/langs/zh-cn/common_footer.po
index 27e0b435d..9ebdaae44 100644
--- a/langs/zh-cn/common_footer.po
+++ b/langs/zh-cn/common_footer.po
@@ -2,28 +2,27 @@
 # 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: common_footer
-#
+# 
 # include translation strings from:
 # langs.php
-#
+# 
 # Translators:
-# xiao wenming <xwm-citcc5@hotmail.com>, 2015
-# zwpwjwtz <zwpwjwtz@126.com>, 2016
+# Filip Komar <filip.komar@gmail.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Mageia\n"
+"Project-Id-Version: common_footer\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2016-06-27 22:17:18+0000\n"
-"PO-Revision-Date: 2016-04-26 12:03+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"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Filip Komar <filip.komar@gmail.com>, 2016\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/MageiaLinux/teams/9361/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/langs.php +100"
diff --git a/langs/zh-cn/contribute.po b/langs/zh-cn/contribute.po
index 706b3d47c..8d8f78e79 100644
--- a/langs/zh-cn/contribute.po
+++ b/langs/zh-cn/contribute.po
@@ -18,7 +18,7 @@ msgstr ""
 "POT-Creation-Date: 2014-03-20 18:32:10+0000\n"
 "PO-Revision-Date: 2015-01-20 09:32+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/documentation.po b/langs/zh-cn/documentation.po
index cddbf7bd8..519ff24be 100644
--- a/langs/zh-cn/documentation.po
+++ b/langs/zh-cn/documentation.po
@@ -1,29 +1,29 @@
 # gettext catalog for documentation web page(s)
-# Copyright (C) 2014 - 2014 Mageia
+# 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: documentation
-#
+# 
 # include translation strings from:
 # en/doc/index.php
 # en/doc/archive.php
 # en/doc/doc.php
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2016-08-15 12:25:54+0000\n"
-"PO-Revision-Date: 2014-05-07 16:51+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2016-08-15 12:38+0000\n"
+"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/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/doc/index.php +14"
@@ -43,15 +43,23 @@ msgid "Find your documentation"
 msgstr ""
 
 #: "/web/en/doc/index.php +29"
-msgid "Select the manual, the release of Mageia and the language you want to see."
+msgid ""
+"Select the manual, the release of Mageia and the language you want to see."
 msgstr ""
 
 #: "/web/en/doc/index.php +30"
-msgid "Documentation of old versions are available in the <a href=\"archive.php\">archive page</a>."
+msgid ""
+"Documentation of old versions are available in the <a "
+"href=\"archive.php\">archive page</a>."
 msgstr ""
 
 #: "/web/en/doc/index.php +31"
-msgid "Those manuals are the result of common work of <a href=\"https://wiki.mageia.org/en/Documentation_team\">documentation</a> and <a href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">translation</a> teams."
+msgid ""
+"Those manuals are the result of common work of <a "
+"href=\"https://wiki.mageia.org/en/Documentation_team\">documentation</a> and"
+" <a "
+"href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">translation</a>"
+" teams."
 msgstr ""
 
 #: "/web/en/doc/index.php +32"
@@ -75,7 +83,8 @@ msgid "Mageia Documentation's Archive"
 msgstr ""
 
 #: "/web/en/doc/archive.php +13"
-msgid "Documentation for previous releases of Mageia distribution and its tools."
+msgid ""
+"Documentation for previous releases of Mageia distribution and its tools."
 msgstr ""
 
 #: "/web/en/doc/archive.php +26"
@@ -83,11 +92,15 @@ msgid "Some More documentation"
 msgstr ""
 
 #: "/web/en/doc/archive.php +27"
-msgid "Here you will find the documentation for the versions of Mageia that have reached their End-Of-Life."
+msgid ""
+"Here you will find the documentation for the versions of Mageia that have "
+"reached their End-Of-Life."
 msgstr ""
 
 #: "/web/en/doc/archive.php +28"
-msgid "If you are looking for the current versions, see <a href=\"index.php\">here</a>."
+msgid ""
+"If you are looking for the current versions, see <a "
+"href=\"index.php\">here</a>."
 msgstr ""
 
 #: "/web/en/doc/doc.php +92"
@@ -107,12 +120,12 @@ msgid "Other languages:"
 msgstr ""
 
 #: "/web/en/doc/doc.php +129"
-msgid "Translation was present in %s before.<br/>Maybe you can check documentation for %s in Mageia %s."
+msgid ""
+"Translation was present in %s before.<br/>Maybe you can check documentation "
+"for %s in Mageia %s."
 msgstr ""
 
 #: "/web/en/doc/doc.php +136"
-msgid "Please help <a href=\"../community/\">us</a> translate it in your language."
+msgid ""
+"Please help <a href=\"../community/\">us</a> translate it in your language."
 msgstr ""
-
-#~ msgid "Support"
-#~ msgstr "支持"
diff --git a/langs/zh-cn/donate.po b/langs/zh-cn/donate.po
index 1cb1933a9..6011e0013 100644
--- a/langs/zh-cn/donate.po
+++ b/langs/zh-cn/donate.po
@@ -17,7 +17,7 @@ msgstr ""
 "POT-Creation-Date: 2014-03-20 17:21:33+0000\n"
 "PO-Revision-Date: 2014-03-21 18:16+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/langs/zh-cn/downloads/get.po b/langs/zh-cn/downloads/get.po
index 2b34026be..f70e06dee 100644
--- a/langs/zh-cn/downloads/get.po
+++ b/langs/zh-cn/downloads/get.po
@@ -1,27 +1,27 @@
 # gettext catalog for downloads/get web page(s)
-# Copyright (C) 2014 - 2014 Mageia
+# 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:
 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"
-"PO-Revision-Date: 2014-03-17 18:19+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2016-05-20 21:26+0000\n"
+"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/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"
@@ -29,7 +29,9 @@ 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>."
+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"
@@ -53,18 +55,22 @@ 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>."
+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"
-#, fuzzy
-msgid "As soon as your download is complete, you should check that the checksums match:"
-msgstr "下载完成后，您应该检查签名是否匹配："
+msgid ""
+"As soon as your download is complete, you should check that the checksums "
+"match:"
+msgstr ""
 
 #: "/web/en/downloads/get/index.php +257"
-#, fuzzy
-msgid "If checksums do not match, <strong>DO NOT use this ISO</strong>. Double-check and try to download again."
-msgstr "如果签名不匹配，<strong>请不要使用此 ISO</strong>。请再次检查然后重新下载。"
+msgid ""
+"If checksums do not match, <strong>DO NOT use this ISO</strong>. Double-"
+"check and try to download again."
+msgstr ""
 
 #: "/web/en/downloads/get/index.php +258"
 msgid "and"
@@ -87,7 +93,9 @@ 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>:"
+msgid ""
+"First you need to import the \"Mageia Release\" key from a <a "
+"href=\"%s\">MIT PGP Public Key Server</a>:"
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +271"
@@ -123,7 +131,10 @@ 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>."
+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"
@@ -135,15 +146,21 @@ 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>."
+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:"
+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>,"
+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"
@@ -151,15 +168,21 @@ 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>,"
+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>."
+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."
+msgid ""
+"Please copy and report us the above address that returned you to this page."
 msgstr "请告知我们返回给你这个页面的地址。"
 
 #: "/web/en/downloads/get/index.php +328"
diff --git a/langs/zh-cn/index.po b/langs/zh-cn/index.po
index 4a79ae6a5..15ef9ade0 100644
--- a/langs/zh-cn/index.po
+++ b/langs/zh-cn/index.po
@@ -1,14 +1,14 @@
 # gettext catalog for index web page(s)
-# Copyright (C) 2014 - 2015 Mageia
+# 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
@@ -17,13 +17,13 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2016-06-27 21:01:03+0000\n"
-"PO-Revision-Date: 2016-04-26 12:03+0000\n"
-"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"PO-Revision-Date: 2016-06-28 16:47+0000\n"
+"Last-Translator: Filip Komar <filip.komar@gmail.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,7 +35,9 @@ 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"
@@ -47,7 +49,8 @@ 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."
+msgid ""
+"Mageia, a free, community-based Linux distribution for desktop & server."
 msgstr "Mageia,自由、基于社区的 Linux 发行版，适用于桌面和服务器。"
 
 #: "/web/en/index.php +237"
@@ -113,18 +116,3 @@ msgstr "<strong>融入</strong> 下一版本"
 #: "/web/en/index.php +274"
 msgid "Test"
 msgstr "测试"
-
-#~ msgid "Support"
-#~ msgstr "支持"
-
-#~ msgid "Community"
-#~ msgstr "社区"
-
-#~ msgid "About&nbsp;Mageia.Org"
-#~ msgstr "关于 &nbsp;Mageia.Org"
-
-#~ msgid "Sitemap"
-#~ msgstr "网站地图"
-
-#~ msgid "Privacy policy"
-#~ msgstr "隐私策略"
diff --git a/langs/zh-cn/map.po b/langs/zh-cn/map.po
index f5a866c38..941e1f244 100644
--- a/langs/zh-cn/map.po
+++ b/langs/zh-cn/map.po
@@ -1,27 +1,28 @@
 # gettext catalog for map web page(s)
-# Copyright (C) 2014 - 2015 Mageia
+# 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: map
-#
+# 
 # include translation strings from:
 # en/map/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-08-06 11:27:22+0000\n"
-"PO-Revision-Date: 2016-06-28 16:46+0000\n"
-"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
+"PO-Revision-Date: 2016-08-16 13:47+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/map/index.php +9"
@@ -50,7 +51,7 @@ msgstr "组织架构"
 
 #: "/web/en/map/index.php +16"
 msgid "https://wiki.mageia.org/en/Org"
-msgstr ""
+msgstr "https://wiki.mageia.org/en/Org"
 
 #: "/web/en/map/index.php +18"
 msgid "Board"
@@ -58,7 +59,7 @@ msgstr "主席团"
 
 #: "/web/en/map/index.php +18"
 msgid "https://wiki.mageia.org/en/Org_Board"
-msgstr ""
+msgstr "https://wiki.mageia.org/en/Org_Board"
 
 #: "/web/en/map/index.php +19"
 msgid "Council"
@@ -66,7 +67,7 @@ msgstr "委员会"
 
 #: "/web/en/map/index.php +19"
 msgid "https://wiki.mageia.org/en/Org_Council"
-msgstr ""
+msgstr "https://wiki.mageia.org/en/Org_Council"
 
 #: "/web/en/map/index.php +20"
 msgid "Teams"
@@ -74,7 +75,7 @@ msgstr "团队"
 
 #: "/web/en/map/index.php +20"
 msgid "https://wiki.mageia.org/en/Contributing"
-msgstr ""
+msgstr "https://wiki.mageia.org/en/Contributing"
 
 #: "/web/en/map/index.php +23"
 msgid "Values"
@@ -94,7 +95,7 @@ msgstr "报告"
 
 #: "/web/en/map/index.php +31"
 msgid "License"
-msgstr ""
+msgstr "许可协议"
 
 #: "/web/en/map/index.php +32"
 msgid "Timeline"
@@ -102,7 +103,7 @@ msgstr "时间线"
 
 #: "/web/en/map/index.php +33"
 msgid "Financial Infos"
-msgstr ""
+msgstr "财务信息"
 
 #: "/web/en/map/index.php +37"
 msgid "Downloads"
@@ -110,15 +111,15 @@ msgstr "下载"
 
 #: "/web/en/map/index.php +40"
 msgid "6 (in development)"
-msgstr ""
+msgstr "6（正在开发）"
 
 #: "/web/en/map/index.php +41"
 msgid "5 (June 2015)"
-msgstr ""
+msgstr "5（2015 年 6 月）"
 
 #: "/web/en/map/index.php +42"
 msgid "4 (February 2014)"
-msgstr ""
+msgstr "4（2014 年 2 月）"
 
 #: "/web/en/map/index.php +43"
 msgid "3 (May 2013)"
@@ -174,7 +175,7 @@ msgstr "问答"
 
 #: "/web/en/map/index.php +59"
 msgid "https://wiki.mageia.org/en/FAQ"
-msgstr ""
+msgstr "https://wiki.mageia.org/en/FAQ"
 
 #: "/web/en/map/index.php +63"
 msgid "Community"
@@ -218,12 +219,11 @@ msgstr "论坛"
 
 #: "/web/en/map/index.php +71"
 msgid "https://forums.mageia.org/"
-msgstr ""
+msgstr "https://forums.mageia.org/"
 
 #: "/web/en/map/index.php +72"
-#, fuzzy
 msgid "https://wiki.mageia.org"
-msgstr "https://wiki.mageia.org/en/IRC"
+msgstr "https://wiki.mageia.org"
 
 #: "/web/en/map/index.php +74"
 msgid "People"
@@ -274,5 +274,6 @@ msgid "Site Map"
 msgstr "网站地图"
 
 #: "/web/en/map/index.php +141"
-msgid "You still can not find what you were looking for? Try searching mageia.org:"
+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 d0ef7cb85..926daf3fe 100644
--- a/langs/zh-cn/support.po
+++ b/langs/zh-cn/support.po
@@ -17,8 +17,8 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2016-08-06 11:27:23+0000\n"
-"PO-Revision-Date: 2016-08-06 11:52+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2016-08-16 13:31+0000\n"
+"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgstr "您可以%s在此查看文档%s，或者看看我们的 %sWiki%s。"
 
 #: "/web/en/support/index.php +41"
 msgid "https://wiki.mageia.org"
-msgstr ""
+msgstr "https://wiki.mageia.org"
 
 #: "/web/en/support/index.php +44"
 msgid ""
diff --git a/langs/zh-cn/timeline.po b/langs/zh-cn/timeline.po
index 6cdec4620..4115dc472 100644
--- a/langs/zh-cn/timeline.po
+++ b/langs/zh-cn/timeline.po
@@ -1,14 +1,14 @@
 # gettext catalog for timeline web page(s)
-# Copyright (C) 2014 - 2015 Mageia
+# 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: timeline
-#
+# 
 # include translation strings from:
 # en/timeline/index.php
-#
+# 
 # Translators:
 # xiao wenming <xwm-citcc5@hotmail.com>, 2015
 # zwpwjwtz <zwpwjwtz@126.com>, 2016
@@ -17,13 +17,13 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2016-06-29 21:02:49+0000\n"
-"PO-Revision-Date: 2016-03-05 12:56+0000\n"
-"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"PO-Revision-Date: 2016-06-29 21:41+0000\n"
+"Last-Translator: Filip Komar <filip.komar@gmail.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/timeline/index.php +12"
@@ -39,9 +39,8 @@ msgid "February"
 msgstr "二月"
 
 #: "/web/en/timeline/index.php +44"
-#, fuzzy
 msgid "Sixth General Assembly during FOSDEM in Brussels, Belgium."
-msgstr "在 FSODEM 会议期间举行第五届常规会议，于比利时布鲁塞尔。"
+msgstr ""
 
 #: "/web/en/timeline/index.php +50"
 msgid "2015"
@@ -132,7 +131,8 @@ msgid "With an incredible response, first donations and discussions abound."
 msgstr "响应非常热烈，收获了首笔捐款和讨论会。"
 
 #: "/web/en/timeline/index.php +142"
-msgid "Project gets structured, governance takes slowly shape (first board, teams)."
+msgid ""
+"Project gets structured, governance takes slowly shape (first board, teams)."
 msgstr "项目和社区组织开始成型（首个管理和开发团队）"
 
 #: "/web/en/timeline/index.php +146"
@@ -140,7 +140,9 @@ msgid "September"
 msgstr "九月"
 
 #: "/web/en/timeline/index.php +148"
-msgid "Mageia starts as a <a href=\"../about/2010-sept-announcement.html\">fork of Mandriva Linux</a>."
+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 +149"