Update Chinese (Simplified) translation

2 files changed, 114 insertions, 97 deletions

diff --git a/langs/zh-cn/4.po b/langs/zh-cn/4.po
index 365330081..d9926aeb9 100644
--- a/langs/zh-cn/4.po
+++ b/langs/zh-cn/4.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2015-09-19 19:37:12+0000\n"
-"PO-Revision-Date: 2016-03-08 15:13+0000\n"
+"PO-Revision-Date: 2016-04-26 11:59+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"
@@ -65,7 +65,7 @@ msgstr "但是请记住它已经 <a href=\"%s\">不受支持</a>."
 msgid ""
 "http://blog.mageia.org/en/2015/09/10/mageia-4-about-to-reach-its-end-of-"
 "life/"
-msgstr ""
+msgstr "http://blog.mageia.org/en/2015/09/10/mageia-4-about-to-reach-its-end-of-life/"
 
 #: "/web/en/4/download_index.php +67"
 msgid ""
@@ -77,7 +77,7 @@ msgstr "如果要把ISO文件导入U盘, <span class=\"warn\">绝不要使用 Un
 #: "/web/en/4/download_index.php +67"
 msgid ""
 "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
-msgstr ""
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
 
 #: "/web/en/4/download_index.php +68"
 msgid ""
@@ -363,7 +363,7 @@ msgstr "为了帮助用户配置和使用Mageia, 提供一些关于社区和本�
 
 #: "/web/en/4/index.php +51"
 msgid "https://wiki.mageia.org/en/Feature:MageiaWelcome"
-msgstr ""
+msgstr "https://wiki.mageia.org/en/Feature:MageiaWelcome"
 
 #: "/web/en/4/index.php +54"
 msgid ""
diff --git a/langs/zh-cn/cauldron.po b/langs/zh-cn/cauldron.po
index a9af4fd1e..c94c03f1c 100644
--- a/langs/zh-cn/cauldron.po
+++ b/langs/zh-cn/cauldron.po
@@ -1,15 +1,15 @@
 # gettext catalog for cauldron 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: cauldron
-#
+# 
 # include translation strings from:
-# en/5/download_index.php
-# en/5/nav.php
-#
+# 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-03-27 19:39:02+0000\n"
-"PO-Revision-Date: 2016-03-08 15:20+0000\n"
-"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"PO-Revision-Date: 2016-04-26 11:59+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\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 +36"
@@ -51,7 +51,9 @@ msgid "Download %s DVD, CD, LiveCD, network install ISO images."
 msgstr "下载 Mageia 4 DVD，CD，LiveCD，网络安装ISO 镜像。"
 
 #: "/web/en/6/download_index.php +69"
-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 +143"
@@ -63,11 +65,17 @@ msgid "Be careful! This is a beta, unstable release."
 msgstr "当心！这是一个测试版，不稳定的发行版。"
 
 #: "/web/en/6/download_index.php +145"
-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 +146"
-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."
+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 ""
 
 #: "/web/en/6/download_index.php +146"
@@ -75,15 +83,22 @@ msgid "May 2015"
 msgstr "2015 年五月"
 
 #: "/web/en/6/download_index.php +146"
-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 +155"
-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 +161"
-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 +161"
@@ -95,14 +110,15 @@ 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 +163"
-#, fuzzy
-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.3F"
+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 +165"
-#, fuzzy
-msgid "To <a %s>dump</a> a Mageia installation ISO on a USB stick, you may try one of several tools:"
-msgstr "要将 Mageia 安装 ISO 写入 U 盘，您需要使用下列工具之一："
+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 +167"
 msgid "For Linux, IsoDumper, available inside repo. Or any tools based on dd."
@@ -113,21 +129,29 @@ msgid "Unetbootin is not supported."
 msgstr "不支持 Unetbootin。"
 
 #: "/web/en/6/download_index.php +170"
-#, fuzzy
-msgid "For Windows please have a look on our <a href=\"%s\">wiki</a> for your options."
-msgstr "<a href=\"%s\">wiki</a> 中提供了一个可用镜像的列表。"
+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 +170"
-#, fuzzy
-msgid "https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-_Alternative_tools"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+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 +173"
-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 +176"
-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 +176"
@@ -143,7 +167,9 @@ msgid "Classical Installation Flavours"
 msgstr "经典安装风格"
 
 #: "/web/en/6/download_index.php +186"
-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 +188"
@@ -167,11 +193,16 @@ msgid "You will be asked of which kind of Software you want to install."
 msgstr "安装时会询问您想要安装哪种软件。"
 
 #: "/web/en/6/download_index.php +196"
-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 +199"
-msgid "For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it's about %sGB."
+msgid ""
+"For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it's "
+"about %sGB."
 msgstr "32 位和 64 位的 ISO 大小约为 %sGB。双架构的 ISO 大小约为 %s GB。"
 
 #: "/web/en/6/download_index.php +207"
@@ -179,11 +210,16 @@ msgid "LiveCDs and LiveDVDs"
 msgstr "LiveCDs and LiveDVDs"
 
 #: "/web/en/6/download_index.php +209"
-msgid "Live ISO's let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE."
+msgid ""
+"Live ISO's let you try %s without installation. You can run Mageia directly "
+"from a CD, DVD or USB device, and try it using one of the graphical user "
+"interfaces such as GNOME or KDE."
 msgstr "Live ISO 允许您试用 %s 而不进行安装。您可以直接从 CD、DVD 或 USB 设备直接启动 Mageia，然后试用 GNOME、KDE 等图形化用户界面。"
 
 #: "/web/en/6/download_index.php +210"
-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 +212"
@@ -191,15 +227,21 @@ msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
 msgstr "LiveCDs 和 LiveDVDs 仅适用于全新安装。"
 
 #: "/web/en/6/download_index.php +213"
-msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia release!"
+msgid ""
+"DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia "
+"release!"
 msgstr "不要将这些 LiveCDs or LiveDVDs 用于从 Mageia 3 升级！"
 
 #: "/web/en/6/download_index.php +214"
-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 +217"
-msgid "For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it's about %sMB."
+msgid ""
+"For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it's about "
+"%sMB."
 msgstr "Live DVD 的大小约为 %sGB。Live CD 的大小约为 %sMB。"
 
 #: "/web/en/6/download_index.php +222"
@@ -207,7 +249,9 @@ msgid "Wired Network-based Installation CD"
 msgstr "有线网络安装 CD"
 
 #: "/web/en/6/download_index.php +223"
-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 +224"
@@ -263,8 +307,9 @@ msgid "LiveCDs contain only English and is available only in 32bit."
 msgstr "Live CD 仅包含英语和 32 位软件。"
 
 #: "/web/en/6/download_index.php +258"
-msgid "Do not use unless you really DON'T NEED any other language than English."
-msgstr ""
+msgid ""
+"Do not use unless you really DON'T NEED any other language than English."
+msgstr "除非您确实不需要除英语以外的其他语言，否则请不要使用此项。"
 
 #: "/web/en/6/download_index.php +265"
 msgid "English only (CD)"
@@ -299,7 +344,9 @@ msgid "Network installer + nonfree firmware CD"
 msgstr "网络安装 + 非自由固件 CD"
 
 #: "/web/en/6/download_index.php +298"
-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 +302"
@@ -315,19 +362,27 @@ msgid "Supported Architecture"
 msgstr "支持的架构"
 
 #: "/web/en/6/download_index.php +312"
-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 +316"
-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 +322"
-msgid "The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB."
+msgid ""
+"The dualarch DVD contains only a minimal list of packages and a lite "
+"desktop, %s, to fit on %sGB."
 msgstr "双架构 DVD 仅包含最小的软件包集，以及一个轻量级的桌面——%s，以便将大小限制在 %sGB。"
 
 #: "/web/en/6/download_index.php +324"
-msgid "Dual iso size is intended to be small for advanced users, only network proprietary drivers are included."
+msgid ""
+"Dual iso size is intended to be small for advanced users, only network "
+"proprietary drivers are included."
 msgstr "我们尽量控制双架构 ISO 的尺寸以方便高级用户。其中仅包含网络相关的私有驱动。"
 
 #: "/web/en/6/download_index.php +325"
@@ -339,11 +394,15 @@ msgid "Furthermore UEFI is not supported."
 msgstr "此外，也不支持 UEFI。"
 
 #: "/web/en/6/download_index.php +328"
-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."
+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 架构的软件包。"
 
 #: "/web/en/6/download_index.php +329"
-msgid "This ISO is generally for advanced users and system administrator for fast deployment of Mageia."
+msgid ""
+"This ISO is generally for advanced users and system administrator for fast "
+"deployment of Mageia."
 msgstr "此 ISO 一般用于高级用户和系统管理员进行 Mageia 的快速部署。"
 
 #: "/web/en/6/download_index.php +343"
@@ -363,7 +422,9 @@ msgid "BitTorrent"
 msgstr "BitTorrent"
 
 #: "/web/en/6/download_index.php +353"
-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 +353"
@@ -424,9 +485,7 @@ msgstr "她在 <a href=\"%s\">这里</a>."
 
 #: "/web/en/6/download_index.php +506"
 msgid "Upgrading<br>from %s ?"
-msgstr ""
-"升级<br>\n"
-"自 %s？"
+msgstr "升级<br>\n自 %s？"
 
 #: "/web/en/6/download_index.php +508"
 msgid "<strong>do not</strong> use LiveCDs;"
@@ -451,45 +510,3 @@ msgstr "Errata"
 #: "/web/en/6/nav.php +16"
 msgid "Bugs Reports"
 msgstr "错误报告"
-
-#~ msgid "Dump Mageia ISO on a USB flash drive"
-#~ msgstr "写入 Mageia ISO 至 USB 闪存设备"
-
-#~ msgid "Unetbootin should not be used to copy the iso image to a USB drive (see below)."
-#~ msgstr "不应使用 Unetbootin 将 iso 镜像拷贝至 USB 设备（见下）。"
-
-#~ msgid "For windows use <a href=\"%s\">usbdumper.</a>"
-#~ msgstr "她在 <a href=\"%s\">这里</a>."
-
-#~ msgid "If it show \"writing error or access denied\" try the fallowing method: run the console (cmd), then type \"diskpart\", then \"list disk\", then select your disk with \"select disk\", and type \"clean\" (it will erase the key)."
-#~ msgstr "若程序提示“写入错误或拒绝访问”，请尝试下列方法：运行终端（cmd），输入“diskpart”，然后输入“list disk”，然后输入“select disk”来选择磁盘，再输入“clean”（将会清除 U 盘）。"
-
-#~ msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
-#~ msgstr "这些 ISOs 经常变动，因为它给出了 Cauldron 的真正状态，它们可能没法用。如果是这样的情况，使用上面的。"
-
-#~ msgid "Looking for %s ?"
-#~ msgstr "需要稳定发型版?"
-
-#~ msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
-#~ msgstr "但是请记住它已经 <a href=\"%s\">不受支持</a>."
-
-#~ msgid "Need more challenge?"
-#~ msgstr "想要更多挑战？"
-
-#~ msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
-#~ msgstr "你可以<a href=\"%s\">帮助</a>我们，于<a href=\"%s\">on %s</a>。"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_5_Release_Notes"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_5_Release_Notes"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_5_Errata"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_5_Errata"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning"
-
-#~ msgid "https://wiki.mageia.org/en/FeatureMageia5_Review"
-#~ msgstr "https://wiki.mageia.org/en/FeatureMageia5_Review"