sync l10n with support

1 files changed, 59 insertions, 93 deletions

diff --git a/langs/zh-cn/support.po b/langs/zh-cn/support.po
index 77bea8982..f209d6e68 100644
--- a/langs/zh-cn/support.po
+++ b/langs/zh-cn/support.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: support
-# 
+#
 # include translation strings from:
 # en/support/index.php
-# 
+#
 # Translators:
 # xiao wenming <xwm-citcc5@hotmail.com>, 2015
 # zwpwjwtz <zwpwjwtz@126.com>, 2016
@@ -16,14 +16,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2016-11-15 21:39:57+0000\n"
+"POT-Creation-Date: 2017-07-16 15:15:54+0200\n"
 "PO-Revision-Date: 2016-11-17 13:16+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"
@@ -38,83 +38,84 @@ msgstr "列出 Mageia 发行版的支持资源。"
 msgid "mageia, linux, support, help, hardware, qa, test"
 msgstr "mageia, linux, 支持, 帮助, 硬件, qa, 测试"
 
-#: "/web/en/support/index.php +22"
+#: "/web/en/support/index.php +21"
 msgid "Support"
 msgstr "支持"
 
-#: "/web/en/support/index.php +24"
+#: "/web/en/support/index.php +23"
 msgid "Community Support"
 msgstr "社区支持"
 
-#: "/web/en/support/index.php +25"
+#: "/web/en/support/index.php +24"
 msgid "Professional Support"
 msgstr "专业支持"
 
-#: "/web/en/support/index.php +26"
+#: "/web/en/support/index.php +25"
 msgid "Documentation"
 msgstr "文档"
 
-#: "/web/en/support/index.php +27"
+#: "/web/en/support/index.php +26"
 msgid "Updates"
 msgstr "更新"
 
-#: "/web/en/support/index.php +28"
+#: "/web/en/support/index.php +27"
 msgid "Lifecycle"
 msgstr "生命周期"
 
-#: "/web/en/support/index.php +29"
+#: "/web/en/support/index.php +28"
 msgid "Hardware Requirements"
 msgstr "硬件需求"
 
-#: "/web/en/support/index.php +30"
+#: "/web/en/support/index.php +29"
 msgid "Bugs Reports"
 msgstr "故障报告"
 
-#: "/web/en/support/index.php +39"
-msgid ""
-"You can look up existing %sdocumentation here%s. You may too look into our "
-"%sWiki%s."
+#: "/web/en/support/index.php +38"
+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 +41"
+#: "/web/en/support/index.php +40"
 msgid "https://wiki.mageia.org"
 msgstr "https://wiki.mageia.org"
 
-#: "/web/en/support/index.php +44"
-msgid ""
-"Updates are available for %s and %s (security and bug fixes) and published "
-"on an ongoing basis."
+#: "/web/en/support/index.php +43"
+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 +45"
-msgid ""
-"Updates are available for %s (security and bug fixes) and published on an "
-"ongoing basis."
+#: "/web/en/support/index.php +44"
+msgid "Updates are available for %s (security and bug fixes) and published on an ongoing basis."
 msgstr "%s (安全和缺陷修复) 的更新可用，在持续改进的基础上发布。."
 
-#: "/web/en/support/index.php +46"
+#: "/web/en/support/index.php +45"
 msgid "You can install these from the Mageia Control Center."
 msgstr "您可以从 Mageia 控制中心安装这些功能。"
 
-#: "/web/en/support/index.php +47"
+#: "/web/en/support/index.php +46"
 msgid "You may subscribe to our %s announce list to be notified of these."
 msgstr "您可以订阅我们的 %s 公告邮件列表，以便获知有关信息。"
 
-#: "/web/en/support/index.php +51"
+#: "/web/en/support/index.php +50"
 msgid "Mageia releases are supported at least for 18 months."
 msgstr "Mageia 版本至少支持十八个月。"
 
-#: "/web/en/support/index.php +53"
-msgid ""
-"Mageia 5 will be supported until 3 months after the release of Mageia 6."
-msgstr "Mageia 5 的支持将会延续到 Mageia 6 发布后的第三个月。"
+#: "/web/en/support/index.php +52"
+#, fuzzy
+msgid "Mageia 6 will be supported until January 16th, 2019."
+msgstr "Mageia 5 的支持于 2016 年 12 月 16 日结束。"
+
+#: "/web/en/support/index.php +52"
+#, fuzzy
+msgid "Mageia 6 was supported until January 16th, 2019."
+msgstr "Mageia 5 的支持于 2016 年 12 月 16 日结束。"
 
 #: "/web/en/support/index.php +53"
-msgid "Exact date to be determined when Mageia 6 is released."
-msgstr "具体日期将会在 Mageia 6 发布后确定。"
+#, fuzzy
+msgid "Mageia 5 will be supported until October 31th, 2017."
+msgstr "Mageia 5 的支持于 2016 年 12 月 16 日结束。"
 
 #: "/web/en/support/index.php +53"
-msgid "Mageia 5 was supported until December 16th, 2016."
+#, fuzzy
+msgid "Mageia 5 was supported until October 31th, 2017."
 msgstr "Mageia 5 的支持于 2016 年 12 月 16 日结束。"
 
 #: "/web/en/support/index.php +54"
@@ -134,50 +135,31 @@ 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:"
+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;"
+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>;"
+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!);"
+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>;"
+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>."
+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."
+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"
@@ -189,9 +171,7 @@ 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."
+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"
@@ -207,32 +187,23 @@ 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;"
+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."
+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."
+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);"
+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;"
+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"
@@ -240,20 +211,11 @@ 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>)."
+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."
+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"
@@ -265,7 +227,11 @@ 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>."
+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 3 months after the release of Mageia 6."
+#~ msgstr "Mageia 5 的支持将会延续到 Mageia 6 发布后的第三个月。"
+
+#~ msgid "Exact date to be determined when Mageia 6 is released."
+#~ msgstr "具体日期将会在 Mageia 6 发布后确定。"