synch about, map and timeline translations

3 files changed, 82 insertions, 82 deletions

diff --git a/langs/zh-cn/about.po b/langs/zh-cn/about.po
index 92da75466..f3354367c 100644
--- a/langs/zh-cn/about.po
+++ b/langs/zh-cn/about.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2014 - 2017 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-# 
+#
 # Generated by extract2gettext.php
 # Domain: about
-# 
+#
 # include translation strings from:
 # en/about/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: 2017-03-26 19:25:11+0000\n"
+"POT-Creation-Date: 2017-07-16 22:57:55+0000\n"
 "PO-Revision-Date: 2017-04-02 13:46+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/about/index.php +12"
@@ -35,8 +35,7 @@ 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 +35"
@@ -44,9 +43,7 @@ msgid "Mageia is a GNU/Linux-based, Free Software operating system."
 msgstr "Mageia 是基于 GNU/Linux 的自由软件操作系统。"
 
 #: "/web/en/about/index.php +36"
-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 +39"
@@ -54,10 +51,7 @@ msgid "Our mission: to build great tools for people."
 msgstr "我们的目标：为大家创造好用的工具。"
 
 #: "/web/en/about/index.php +40"
-msgid ""
-"Beyond just delivering a secure, stable and sustainable operating system, "
-"the goal is also to become and maintain a credible and recognized community "
-"in the free software world."
+msgid "Beyond just delivering a secure, stable and sustainable operating system, the goal is also to become and maintain a credible and recognized community in the free software world."
 msgstr "除了发布安全、稳定、适用的操作系统，我们的目标还在于在自由软件世界中创建和维护一个公认且可信的社区。"
 
 #: "/web/en/about/index.php +41"
@@ -65,41 +59,28 @@ msgid "To date, Mageia:"
 msgstr "Mageia 大事记："
 
 #: "/web/en/about/index.php +44"
-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 +46"
-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 +47"
-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 +49"
-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>."
+#, fuzzy
+msgid "released six 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>, <a href=\"../5/\">in June 2015</a> and <a href=\"../6/\">in July 2017</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 +70"
-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 +73"
-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 +74"
@@ -107,9 +88,7 @@ msgid "\"https://wiki.mageia.org/en/Org\""
 msgstr "\"https://wiki.mageia.org/en/Org\""
 
 #: "/web/en/about/index.php +75"
-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 +79"
diff --git a/langs/zh-cn/map.po b/langs/zh-cn/map.po
index 941e1f244..ddc4014ea 100644
--- a/langs/zh-cn/map.po
+++ b/langs/zh-cn/map.po
@@ -2,27 +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: 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"
+"POT-Creation-Date: 2017-07-16 22:57:55+0000\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"
@@ -110,8 +110,9 @@ msgid "Downloads"
 msgstr "下载"
 
 #: "/web/en/map/index.php +40"
-msgid "6 (in development)"
-msgstr "6（正在开发）"
+#, fuzzy
+msgid "6 (July 2017)"
+msgstr "5（2015 年 6 月）"
 
 #: "/web/en/map/index.php +41"
 msgid "5 (June 2015)"
@@ -269,11 +270,13 @@ msgstr "Mageia.org 网站地图"
 msgid "mageia, web site, map, sitemap"
 msgstr "mageia, 网站, 地图, 网站地图"
 
-#: "/web/en/map/index.php +134"
+#: "/web/en/map/index.php +133"
 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:"
+#: "/web/en/map/index.php +140"
+msgid "You still can not find what you were looking for? Try searching mageia.org:"
 msgstr "您还没有找到想要查看的内容吗？请搜索 mageia.org:"
+
+#~ msgid "6 (in development)"
+#~ msgstr "6（正在开发）"
diff --git a/langs/zh-cn/timeline.po b/langs/zh-cn/timeline.po
index 7ffd8005f..59f5daa2c 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: 2016-12-06 23:08:58+0000\n"
+"POT-Creation-Date: 2017-07-16 22:57:54+0000\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"
@@ -27,17 +27,16 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: "/web/en/timeline/index.php +39"
-msgid "2016"
+msgid "2017"
 msgstr ""
 
 #: "/web/en/timeline/index.php +40"
-#, fuzzy
-msgid "December"
-msgstr "九月"
+msgid "July"
+msgstr ""
 
 #: "/web/en/timeline/index.php +40"
 #, fuzzy
-msgid "<a href=%s>Mageia 5</a> updated to 5.1."
+msgid "<a href=%s>Mageia 6</a> is released."
 msgstr "<a href=%s>Mageia 5</a> 发布。"
 
 #: "/web/en/timeline/index.php +41"
@@ -45,118 +44,137 @@ msgid "February"
 msgstr "二月"
 
 #: "/web/en/timeline/index.php +41"
+#, fuzzy
+msgid "Seventh General Assembly during FOSDEM in Brussels, Belgium."
+msgstr "第二次在比利时首都布鲁塞尔的FOSDEM集体聚会"
+
+#: "/web/en/timeline/index.php +43"
+msgid "2016"
+msgstr ""
+
+#: "/web/en/timeline/index.php +44"
+#, fuzzy
+msgid "December"
+msgstr "九月"
+
+#: "/web/en/timeline/index.php +44"
+#, fuzzy
+msgid "<a href=%s>Mageia 5</a> updated to 5.1."
+msgstr "<a href=%s>Mageia 5</a> 发布。"
+
+#: "/web/en/timeline/index.php +45"
 msgid "Sixth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr ""
 
-#: "/web/en/timeline/index.php +43"
+#: "/web/en/timeline/index.php +47"
 msgid "2015"
 msgstr "2015"
 
-#: "/web/en/timeline/index.php +44"
+#: "/web/en/timeline/index.php +48"
 msgid "June"
 msgstr "六月"
 
-#: "/web/en/timeline/index.php +44"
+#: "/web/en/timeline/index.php +48"
 msgid "<a href=%s>Mageia 5</a> is released."
 msgstr "<a href=%s>Mageia 5</a> 发布。"
 
-#: "/web/en/timeline/index.php +45"
+#: "/web/en/timeline/index.php +49"
 msgid "Fifth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "在 FSODEM 会议期间举行第五届常规会议，于比利时布鲁塞尔。"
 
-#: "/web/en/timeline/index.php +47"
+#: "/web/en/timeline/index.php +51"
 msgid "2014"
 msgstr "2014"
 
-#: "/web/en/timeline/index.php +48"
+#: "/web/en/timeline/index.php +52"
 #, fuzzy
 msgid "<a href=%s>Mageia 4</a> updated to 4.1."
 msgstr "<a href=%s>Mageia 5</a> 发布。"
 
-#: "/web/en/timeline/index.php +50"
+#: "/web/en/timeline/index.php +54"
 msgid "<a href=\"/4/\">Mageia 4</a> is released."
 msgstr "<a href=\"/4/\">Mageia 4</a> 已经发布."
 
-#: "/web/en/timeline/index.php +51"
+#: "/web/en/timeline/index.php +55"
 msgid "Fourth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "第四次全体大会，在FOSDEM期间，于比利时布鲁塞尔。"
 
-#: "/web/en/timeline/index.php +54"
+#: "/web/en/timeline/index.php +58"
 msgid "2013"
 msgstr "2013"
 
-#: "/web/en/timeline/index.php +55"
+#: "/web/en/timeline/index.php +59"
 msgid "May"
 msgstr "五月"
 
-#: "/web/en/timeline/index.php +55"
+#: "/web/en/timeline/index.php +59"
 msgid "<a href=\"/3/\">Mageia 3</a> is released."
 msgstr "<a href=\"/3/\">Mageia 3</a> 已经发布."
 
-#: "/web/en/timeline/index.php +56"
+#: "/web/en/timeline/index.php +60"
 msgid "Third General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "第三次全体大会，在FOSDEM期间，于比利时布鲁塞尔。"
 
-#: "/web/en/timeline/index.php +58"
+#: "/web/en/timeline/index.php +62"
 msgid "2012"
 msgstr "2012"
 
-#: "/web/en/timeline/index.php +59"
+#: "/web/en/timeline/index.php +63"
 msgid "<a href=\"/2/\">Mageia 2</a> is released."
 msgstr "<a href=\"/2/\">Mageia 2</a> 已经发布."
 
-#: "/web/en/timeline/index.php +60"
+#: "/web/en/timeline/index.php +64"
 msgid "Second General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "第二次在比利时首都布鲁塞尔的FOSDEM集体聚会"
 
-#: "/web/en/timeline/index.php +62"
+#: "/web/en/timeline/index.php +66"
 msgid "2011"
 msgstr "2011"
 
-#: "/web/en/timeline/index.php +63"
+#: "/web/en/timeline/index.php +67"
 msgid "<a href=\"/1/\">Mageia 1</a> is released."
 msgstr "<a href=\"/1/\">Mageia 1</a> 发布。"
 
-#: "/web/en/timeline/index.php +64"
+#: "/web/en/timeline/index.php +68"
 msgid "First General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "第一次全体大会，在FOSDEM期间，于比利时布鲁塞尔。"
 
-#: "/web/en/timeline/index.php +65"
+#: "/web/en/timeline/index.php +69"
 msgid "January"
 msgstr "一月"
 
-#: "/web/en/timeline/index.php +65"
+#: "/web/en/timeline/index.php +69"
 msgid "Build system is ready to run for the first alpha ISOs."
 msgstr "构建系统已可用于运行首个 alpha 镜像。"
 
-#: "/web/en/timeline/index.php +67"
+#: "/web/en/timeline/index.php +71"
 msgid "2010"
 msgstr "2010"
 
-#: "/web/en/timeline/index.php +68"
+#: "/web/en/timeline/index.php +72"
 msgid "End of year"
 msgstr "年底"
 
-#: "/web/en/timeline/index.php +69"
+#: "/web/en/timeline/index.php +73"
 msgid "With an incredible response, first donations and discussions abound."
 msgstr "响应非常热烈，收获了首笔捐款和讨论会。"
 
-#: "/web/en/timeline/index.php +70"
+#: "/web/en/timeline/index.php +74"
 msgid "Project gets structured, governance takes slowly shape (first board, teams)."
 msgstr "项目和社区组织开始成型（首个管理和开发团队）"
 
-#: "/web/en/timeline/index.php +72"
+#: "/web/en/timeline/index.php +76"
 msgid "September"
 msgstr "九月"
 
-#: "/web/en/timeline/index.php +73"
+#: "/web/en/timeline/index.php +77"
 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 +74"
+#: "/web/en/timeline/index.php +78"
 msgid "Mageia.Org is registered in Paris, France."
 msgstr "Mageia.Org 已在法国巴黎注册。"
 
-#: "/web/en/timeline/index.php +83"
+#: "/web/en/timeline/index.php +87"
 msgid "Mageia Timeline"
 msgstr "Mageia 时间轴"