release date i18n fix added

1 files changed, 37 insertions, 84 deletions

diff --git a/langs/zh-cn/cauldron.po b/langs/zh-cn/cauldron.po
index e18bd0dc4..c29811a13 100644
--- a/langs/zh-cn/cauldron.po
+++ b/langs/zh-cn/cauldron.po
@@ -2,28 +2,28 @@
 # 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: cauldron
-# 
+#
 # include translation strings from:
 # en/6/download_index.php
 # en/6/nav.php
-# 
+#
 # Translators:
 # zwpwjwtz <zwpwjwtz@126.com>, 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2017-03-07 00:41:48+0000\n"
+"POT-Creation-Date: 2017-05-24 23:25:23+0000\n"
 "PO-Revision-Date: 2017-03-12 09:37+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"
@@ -47,9 +47,7 @@ msgid "Download %s DVD, LiveDVD, network install ISO images."
 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"
@@ -61,40 +59,27 @@ 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."
+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 年五月"
+msgid "June 2017"
+msgstr ""
 
 #: "/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"
@@ -106,19 +91,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 +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"
-msgid ""
-"For Linux, IsoDumper, available inside repo. Or any tools based on %sdd%s."
+msgid "For Linux, IsoDumper, available inside repo. Or any tools based on %sdd%s."
 msgstr "Linux 下，可使用 IsoDumper（仓库中有提供）。或任意基于 %sdd%s 的工具。"
 
 #: "/web/en/6/download_index.php +165"
@@ -126,29 +107,19 @@ 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"
@@ -164,9 +135,7 @@ 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"
@@ -190,10 +159,7 @@ 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"
@@ -205,16 +171,11 @@ msgid "LiveDVDs"
 msgstr "Live DVD"
 
 #: "/web/en/6/download_index.php +206"
-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, Plasma or Xfce."
+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, Plasma or Xfce."
 msgstr "Live ISO 允许您试用 %s 而不进行安装。您可以直接从 DVD 或 USB 设备直接启动 Mageia，然后试用 KDE、Xfce 等图形化用户界面。"
 
 #: "/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"
@@ -226,9 +187,7 @@ msgid "DO NOT use these LiveDVDs to upgrade from the prior Mageia release!"
 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"
@@ -240,9 +199,7 @@ 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"
@@ -310,9 +267,7 @@ msgid "Network installer + nonfree firmware CD"
 msgstr "网络安装 + 非自由固件 CD"
 
 #: "/web/en/6/download_index.php +279"
-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 +283"
@@ -328,15 +283,11 @@ msgid "Supported Architecture"
 msgstr "支持的架构"
 
 #: "/web/en/6/download_index.php +293"
-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 +297"
-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 +309"
@@ -356,9 +307,7 @@ msgid "BitTorrent"
 msgstr "BitTorrent"
 
 #: "/web/en/6/download_index.php +319"
-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 +319"
@@ -419,7 +368,9 @@ msgstr "她在 <a href=\"%s\">这里</a>."
 
 #: "/web/en/6/download_index.php +455"
 msgid "Upgrading<br>from %s ?"
-msgstr "升级<br>\n自 %s？"
+msgstr ""
+"升级<br>\n"
+"自 %s？"
 
 #: "/web/en/6/download_index.php +457"
 msgid "<strong>do not</strong> use LiveDVDs;"
@@ -438,8 +389,7 @@ msgid "https://wiki.mageia.org/en/Mageia_6_Errata"
 msgstr "https://wiki.mageia.org/en/Mageia_6_Errata"
 
 #: "/web/en/6/nav.php +9"
-msgid ""
-"https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5"
+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"
@@ -465,3 +415,6 @@ msgstr "勘误表"
 #: "/web/en/6/nav.php +16"
 msgid "Bugs Reports"
 msgstr "错误报告"
+
+#~ msgid "May 2015"
+#~ msgstr "2015 年五月"