push mga5 support from October 31th, 2017 to December 31st, 2017

1 files changed, 79 insertions, 105 deletions

diff --git a/langs/zh-cn/support.po b/langs/zh-cn/support.po
index aab35e35f..ac71e2603 100644
--- a/langs/zh-cn/support.po
+++ b/langs/zh-cn/support.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: support
-# 
+#
 # include translation strings from:
 # en/support/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-07-16 15:15:54+0200\n"
+"POT-Creation-Date: 2017-11-08 21:36:24+0000\n"
 "PO-Revision-Date: 2017-10-22 14:05+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/support/index.php +11"
@@ -71,9 +71,7 @@ msgid "Bugs Reports"
 msgstr "故障报告"
 
 #: "/web/en/support/index.php +38"
-msgid ""
-"You can look up existing %sdocumentation here%s. You may too look into our "
-"%sWiki%s."
+msgid "You can look up existing %sdocumentation here%s. You may too look into our %sWiki%s."
 msgstr "您可以%s在此查看文档%s，或者看看我们的 %sWiki%s。"
 
 #: "/web/en/support/index.php +40"
@@ -81,15 +79,11 @@ msgid "https://wiki.mageia.org"
 msgstr "https://wiki.mageia.org"
 
 #: "/web/en/support/index.php +43"
-msgid ""
-"Updates are available for %s and %s (security and bug fixes) and published "
-"on an ongoing basis."
+msgid "Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis."
 msgstr "%s 和 %s (安全和缺陷修复) 的更新可用，在持续改进的基础上发布。."
 
 #: "/web/en/support/index.php +44"
-msgid ""
-"Updates are available for %s (security and bug fixes) and published on an "
-"ongoing basis."
+msgid "Updates are available for %s (security and bug fixes) and published on an ongoing basis."
 msgstr "%s (安全和缺陷修复) 的更新可用，在持续改进的基础上发布。."
 
 #: "/web/en/support/index.php +45"
@@ -112,163 +106,143 @@ msgstr "Mageia 6 将被支持到 2019 年 1 月 16 日。"
 msgid "Mageia 6 was supported until January 16th, 2019."
 msgstr "Mageia 6 的支持于 2019 年 1 月 16 日结束。"
 
-#: "/web/en/support/index.php +53"
-msgid "Mageia 5 will be supported until October 31th, 2017."
-msgstr "Mageia 5 的支持于 2017 年 10 月 31 日结束。"
+#: "/web/en/support/index.php +54"
+#, fuzzy
+msgid "Mageia 5 EOL is postponed until December 31st, 2017."
+msgstr "Mageia 1 支持到2012年12月1日。"
 
-#: "/web/en/support/index.php +53"
-msgid "Mageia 5 was supported until October 31th, 2017."
-msgstr "Mageia 5 将被支持到 2017 年 10 月 31 日。"
+#: "/web/en/support/index.php +55"
+msgid "More details including a helpfull advice and %sa wiki page%s on %sour blog%s."
+msgstr ""
 
-#: "/web/en/support/index.php +54"
+#: "/web/en/support/index.php +56"
+#, fuzzy
+msgid "https://wiki.mageia.org/en/From_Mageia_5_to_6"
+msgstr "https://wiki.mageia.org/en/QA_Team"
+
+#: "/web/en/support/index.php +57"
+msgid "https://blog.mageia.org/en/2017/11/07/mageia-5-eol-postponed/"
+msgstr ""
+
+#: "/web/en/support/index.php +58"
+#, fuzzy
+msgid "Mageia 5 was supported until December 31st, 2017."
+msgstr "Mageia 1 支持到2012年12月1日。"
+
+#: "/web/en/support/index.php +60"
 msgid "Mageia 4 was supported until September 19th, 2015."
 msgstr "Mageia 4 的支持于 2015 年 9 月 19 日结束。"
 
-#: "/web/en/support/index.php +55"
+#: "/web/en/support/index.php +61"
 msgid "Mageia 3 was supported until November 26th, 2014."
 msgstr "Mageia 3 支持到2014年11月26日。"
 
-#: "/web/en/support/index.php +56"
+#: "/web/en/support/index.php +62"
 msgid "Mageia 2 was supported until November 22nd, 2013."
 msgstr "Mageia 2 支持到2013年11月22日。"
 
-#: "/web/en/support/index.php +57"
+#: "/web/en/support/index.php +63"
 msgid "Mageia 1 was supported until December 1st, 2012."
 msgstr "Mageia 1 支持到2012年12月1日。"
 
-#: "/web/en/support/index.php +62"
-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:"
+#: "/web/en/support/index.php +68"
+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 +65"
-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;"
+#: "/web/en/support/index.php +71"
+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 +66"
-msgid ""
-"IRC channels where you can discuss live with other Mageia users and "
-"contributors: <a href=\"irc://irc.freenode.net/#mageia\" "
-"hreflang=\"en\">#mageia</a> or other localized <a "
-"href=\"https://wiki.mageia.org/en/IRC#channels_in_other_languages\">channels</a>;"
+#: "/web/en/support/index.php +72"
+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 +67"
-msgid ""
-"our <a href=\"https://wiki.mageia.org/en/\">Wiki</a> (still rough at the "
-"time, we are working on it!);"
+#: "/web/en/support/index.php +73"
+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 +68"
-msgid ""
-"our <a href=\"https://wiki.mageia.org/en/Mailing_lists\" hreflang=\"en"
-"\">mailing-lists</a>;"
+#: "/web/en/support/index.php +74"
+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 +69"
-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>."
+#: "/web/en/support/index.php +75"
+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 +74"
-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."
+#: "/web/en/support/index.php +80"
+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 +75"
+#: "/web/en/support/index.php +81"
 msgid "Please check the <a href=\"%s\">commercial vendors</a> list"
 msgstr "请检索 <a href=\"%s\">商业经销商</a>清单"
 
-#: "/web/en/support/index.php +75"
+#: "/web/en/support/index.php +81"
 msgid "https://wiki.mageia.org/en/Commercial_vendors"
 msgstr "https://wiki.mageia.org/en/Commercial_vendors"
 
-#: "/web/en/support/index.php +80"
-msgid ""
-"Mageia software runs on most x86 computer systems available as of today, "
-"April 2011."
+#: "/web/en/support/index.php +86"
+msgid "Mageia software runs on most x86 computer systems available as of today, April 2011."
 msgstr "Mageia软件可以在今日（2011年4月）大多数x86计算机上运行。"
 
-#: "/web/en/support/index.php +81"
+#: "/web/en/support/index.php +87"
 msgid "You can follow this hardware requirements list:"
 msgstr "您可以按照以下硬件要求清单："
 
-#: "/web/en/support/index.php +84"
+#: "/web/en/support/index.php +90"
 msgid "Processor: any AMD, Intel or VIA processor;"
 msgstr "处理器：任何 AMD、Intel 或 VIA 处理器；"
 
-#: "/web/en/support/index.php +85"
+#: "/web/en/support/index.php +91"
 msgid "Memory (RAM): 512MB minimum, 2GB recommended;"
 msgstr "内存：至少 512MB，建议 2GB；"
 
-#: "/web/en/support/index.php +86"
-msgid ""
-"Storage (HDD or SSD): 5GB for a minimal installation, 20GB for a casual "
-"setup;"
+#: "/web/en/support/index.php +92"
+msgid "Storage (HDD or SSD): 5GB for a minimal installation, 20GB for a casual setup;"
 msgstr "存储设备（磁盘或固态硬盘）：至少 5GB，推荐 20GB。"
 
-#: "/web/en/support/index.php +87"
-msgid ""
-"This includes a few GB for user files. If you need more than you should take"
-" that in account too."
+#: "/web/en/support/index.php +93"
+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 +88"
-msgid ""
-"Custom installations on less space are possible but this requires "
-"intermediate linux knowledge."
+#: "/web/en/support/index.php +94"
+msgid "Custom installations on less space are possible but this requires intermediate linux knowledge."
 msgstr "在自定义安装中您可以指定更少的磁盘空间，但这需要相关的 Linux 知识。"
 
-#: "/web/en/support/index.php +89"
-msgid ""
-"Optical drive: CD or DVD depending on the ISO you use (network, USB key "
-"installation available);"
+#: "/web/en/support/index.php +95"
+msgid "Optical drive: CD or DVD depending on the ISO you use (network, USB key installation available);"
 msgstr "光驱：CD 或 DVD，取决于您使用的 ISO(也可以通过网络或U盘安装)；"
 
-#: "/web/en/support/index.php +90"
-msgid ""
-"Graphic card: any AMD/ATI, Intel, Matrox, Nvidia, SiS or VIA graphic card;"
+#: "/web/en/support/index.php +96"
+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 +91"
+#: "/web/en/support/index.php +97"
 msgid "Sound card: any AC97, HDA or Sound Blaster sound card."
 msgstr "声卡：任何 AC97、HDA 或 Sound Blaster 声卡。"
 
-#: "/web/en/support/index.php +94"
-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>)."
+#: "/web/en/support/index.php +100"
+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 +95"
-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."
+#: "/web/en/support/index.php +101"
+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 +95"
+#: "/web/en/support/index.php +101"
 msgid "https://wiki.mageia.org/en/Web_team"
 msgstr "https://wiki.mageia.org/en/Web_team"
 
-#: "/web/en/support/index.php +95"
+#: "/web/en/support/index.php +101"
 msgid "https://wiki.mageia.org/en/QA_Team"
 msgstr "https://wiki.mageia.org/en/QA_Team"
 
-#: "/web/en/support/index.php +99"
-msgid ""
-"You may check and report bugs on <a href=\"%s\">our Bugzilla "
-"(bugs.mageia.org)</a>."
+#: "/web/en/support/index.php +105"
+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>查看和报告缺陷。"
+
+#~ msgid "Mageia 5 will be supported until October 31th, 2017."
+#~ msgstr "Mageia 5 的支持于 2017 年 10 月 31 日结束。"
+
+#~ msgid "Mageia 5 was supported until October 31th, 2017."
+#~ msgstr "Mageia 5 将被支持到 2017 年 10 月 31 日。"