refresh of gettext files + some i18n simplification

1 files changed, 76 insertions, 130 deletions

diff --git a/langs/zh-cn/cauldron.po b/langs/zh-cn/cauldron.po
index a42c48b9d..c35174bbf 100644
--- a/langs/zh-cn/cauldron.po
+++ b/langs/zh-cn/cauldron.po
@@ -2,27 +2,27 @@
 # Copyright (C) 2014 - 2015 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
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-02-21 20:12:39+0000\n"
+"POT-Creation-Date: 2015-04-21 17:15:52+0000\n"
 "PO-Revision-Date: 2015-02-22 09:03+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/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/5/download_index.php +36"
@@ -50,9 +50,7 @@ msgid "Download %s DVD, CD, LiveCD, network install ISO images."
 msgstr "下载 Mageia 4 DVD，CD，LiveCD，网络安装ISO 镜像。"
 
 #: "/web/en/5/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/5/download_index.php +144"
@@ -64,17 +62,11 @@ msgid "Be careful! This is a beta, unstable release."
 msgstr "当心！这是一个测试版，不稳定的发行版。"
 
 #: "/web/en/5/download_index.php +146"
-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/5/download_index.php +147"
-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/5/download_index.php +147"
@@ -82,22 +74,15 @@ msgid "March 2015"
 msgstr ""
 
 #: "/web/en/5/download_index.php +147"
-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/5/download_index.php +154"
-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 ""
 
 #: "/web/en/5/download_index.php +160"
-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 ""
 
 #: "/web/en/5/download_index.php +160"
@@ -113,9 +98,7 @@ msgid "Unetbootin is not supported."
 msgstr ""
 
 #: "/web/en/5/download_index.php +165"
-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 ""
 
 #: "/web/en/5/download_index.php +165"
@@ -131,23 +114,15 @@ msgid "Dump Mageia ISO on a USB flash drive"
 msgstr ""
 
 #: "/web/en/5/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/5/download_index.php +171"
-msgid ""
-"Unetbootin should not be used to copy the iso image to a USB drive (see "
-"below)."
+msgid "Unetbootin should not be used to copy the iso image to a USB drive (see below)."
 msgstr ""
 
 #: "/web/en/5/download_index.php +172"
-msgid ""
-"To dump a Mageia installation ISO on a USB stick, you may try one of several"
-" tools:"
+msgid "To dump a Mageia installation ISO on a USB stick, you may try one of several tools:"
 msgstr ""
 
 #: "/web/en/5/download_index.php +174"
@@ -159,10 +134,7 @@ msgid "For windows use <a href=\"%s\">usbdumper.</a>"
 msgstr "她在 <a href=\"%s\">这里</a>."
 
 #: "/web/en/5/download_index.php +177"
-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)."
+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 ""
 
 #: "/web/en/5/download_index.php +187"
@@ -170,9 +142,7 @@ msgid "Classical Installation Flavours"
 msgstr "经典安装风格"
 
 #: "/web/en/5/download_index.php +189"
-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 ""
 
 #: "/web/en/5/download_index.php +191"
@@ -196,16 +166,11 @@ msgid "You will be asked of which kind of Software you want to install."
 msgstr "安装时会询问您想要安装哪种软件。"
 
 #: "/web/en/5/download_index.php +199"
-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 ""
 
 #: "/web/en/5/download_index.php +202"
-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 ""
 
 #: "/web/en/5/download_index.php +210"
@@ -213,16 +178,11 @@ msgid "LiveCDs and LiveDVDs"
 msgstr "LiveCDs and LiveDVDs"
 
 #: "/web/en/5/download_index.php +212"
-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 ""
 
 #: "/web/en/5/download_index.php +213"
-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/5/download_index.php +215"
@@ -230,21 +190,15 @@ msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
 msgstr "LiveCDs 和 LiveDVDs 仅适用于全新安装。"
 
 #: "/web/en/5/download_index.php +216"
-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/5/download_index.php +217"
-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/5/download_index.php +220"
-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 ""
 
 #: "/web/en/5/download_index.php +225"
@@ -252,9 +206,7 @@ msgid "Wired Network-based Installation CD"
 msgstr "有线网络安装 CD"
 
 #: "/web/en/5/download_index.php +226"
-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/5/download_index.php +227"
@@ -266,9 +218,7 @@ msgid "https://wiki.mageia.org/en/Boot.iso_install"
 msgstr ""
 
 #: "/web/en/5/download_index.php +228"
-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."
+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 的真正状态，它们可能没法用。如果是这样的情况，使用上面的。"
 
 #: "/web/en/5/download_index.php +229"
@@ -348,9 +298,7 @@ msgid "Network installer + nonfree firmware CD"
 msgstr "网络安装 + 非自由固件 CD"
 
 #: "/web/en/5/download_index.php +301"
-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/5/download_index.php +305"
@@ -366,143 +314,142 @@ msgid "Supported Architecture"
 msgstr ""
 
 #: "/web/en/5/download_index.php +315"
-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 ""
 
 #: "/web/en/5/download_index.php +319"
-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 ""
 
 #: "/web/en/5/download_index.php +325"
-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 ""
 
-#: "/web/en/5/download_index.php +326"
-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."
+#: "/web/en/5/download_index.php +327"
+msgid "Dual iso size is intended to be small for advanced users, only network proprietary drivers are included."
 msgstr ""
 
-#: "/web/en/5/download_index.php +327"
-msgid ""
-"This ISO is generally for advanced users and system administrator for fast "
-"deployment of Mageia."
+#: "/web/en/5/download_index.php +328"
+msgid "You will have to add remote nonfree media if you need some more."
+msgstr ""
+
+#: "/web/en/5/download_index.php +329"
+msgid "Furthermore UEFI is not supported."
+msgstr ""
+
+#: "/web/en/5/download_index.php +331"
+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 ""
+
+#: "/web/en/5/download_index.php +332"
+msgid "This ISO is generally for advanced users and system administrator for fast deployment of Mageia."
 msgstr ""
 
-#: "/web/en/5/download_index.php +341"
+#: "/web/en/5/download_index.php +346"
 msgid "Download Method"
 msgstr "下载"
 
-#: "/web/en/5/download_index.php +343"
+#: "/web/en/5/download_index.php +348"
 msgid "Direct Link"
 msgstr ""
 
-#: "/web/en/5/download_index.php +344"
+#: "/web/en/5/download_index.php +349"
 msgid "You will be redirected to a HTTP or FTP mirror."
 msgstr ""
 
-#: "/web/en/5/download_index.php +350"
+#: "/web/en/5/download_index.php +355"
 msgid "BitTorrent"
 msgstr "BitTorrent"
 
-#: "/web/en/5/download_index.php +351"
-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."
+#: "/web/en/5/download_index.php +356"
+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 ""
 
-#: "/web/en/5/download_index.php +351"
+#: "/web/en/5/download_index.php +356"
 msgid "http://en.wikipedia.org/wiki/BitTorrent"
 msgstr ""
 
-#: "/web/en/5/download_index.php +352"
+#: "/web/en/5/download_index.php +357"
 msgid "BitTorrent link are not yet available."
 msgstr ""
 
-#: "/web/en/5/download_index.php +369"
+#: "/web/en/5/download_index.php +374"
 msgid "Format"
 msgstr "Format"
 
-#: "/web/en/5/download_index.php +370"
+#: "/web/en/5/download_index.php +375"
 msgid "link"
 msgstr "链接"
 
-#: "/web/en/5/download_index.php +491"
+#: "/web/en/5/download_index.php +496"
 msgid "Release notes"
 msgstr "版本通告"
 
-#: "/web/en/5/download_index.php +492"
+#: "/web/en/5/download_index.php +497"
 msgid "Errata"
 msgstr "Errata"
 
-#: "/web/en/5/download_index.php +493"
+#: "/web/en/5/download_index.php +498"
 msgid "<a href=\"%s\">Which to choose</a>"
 msgstr "<a href=\"%s\">选择哪一个</a>"
 
-#: "/web/en/5/download_index.php +493"
+#: "/web/en/5/download_index.php +498"
 msgid "https://wiki.mageia.org/en/Installation_Media"
 msgstr ""
 
-#: "/web/en/5/download_index.php +494"
+#: "/web/en/5/download_index.php +499"
 msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
 msgstr "<a href=\"%s\">转储 ISO 到 U盘</a>"
 
-#: "/web/en/5/download_index.php +494"
-msgid ""
-"https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#: "/web/en/5/download_index.php +499"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
 msgstr ""
 
-#: "/web/en/5/download_index.php +495"
+#: "/web/en/5/download_index.php +500"
 msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
 msgstr "新用户？ <a href=\"%s\">此wiki页面为您服务。</a>"
 
-#: "/web/en/5/download_index.php +495"
+#: "/web/en/5/download_index.php +500"
 msgid "https://wiki.mageia.org/en/Newcomers_start_here"
 msgstr ""
 
-#: "/web/en/5/download_index.php +496"
+#: "/web/en/5/download_index.php +501"
 msgid "Help us on %s"
 msgstr "帮助我们完成 <a href=\"%s\">Mageia 4</a>"
 
-#: "/web/en/5/download_index.php +500"
+#: "/web/en/5/download_index.php +505"
 msgid "Looking for a stable release?"
 msgstr "需要稳定发型版?"
 
-#: "/web/en/5/download_index.php +502"
+#: "/web/en/5/download_index.php +507"
 msgid "It is <a href=\"%s\">here</a>."
 msgstr "她在 <a href=\"%s\">这里</a>."
 
-#: "/web/en/5/download_index.php +505"
+#: "/web/en/5/download_index.php +510"
 msgid "Upgrading<br>from %s ?"
 msgstr ""
 
-#: "/web/en/5/download_index.php +507"
+#: "/web/en/5/download_index.php +512"
 msgid "<strong>do not</strong> use LiveCDs;"
 msgstr "<strong>不要</strong>使用 LiveCD;"
 
-#: "/web/en/5/download_index.php +508"
+#: "/web/en/5/download_index.php +513"
 msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
 msgstr "使用上面列出的 DVD 或 CD 进行升级，详情参阅<a href=\"%s\" hreflang=\"en\">升级指南</a>."
 
-#: "/web/en/5/download_index.php +511"
+#: "/web/en/5/download_index.php +516"
 msgid "Looking for %s ?"
 msgstr "需要稳定发型版?"
 
-#: "/web/en/5/download_index.php +514"
+#: "/web/en/5/download_index.php +519"
 msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
 msgstr "但是请记住它已经 <a href=\"%s\">不受支持</a>."
 
-#: "/web/en/5/download_index.php +517"
+#: "/web/en/5/download_index.php +522"
 msgid "Need more challenge?"
 msgstr "想要更多挑战？"
 
-#: "/web/en/5/download_index.php +518"
+#: "/web/en/5/download_index.php +523"
 msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
 msgstr ""
 
@@ -515,8 +462,7 @@ msgid "https://wiki.mageia.org/en/Mageia_5_Errata"
 msgstr "https://wiki.mageia.org/en/Mageia_5_Errata"
 
 #: "/web/en/5/nav.php +5"
-msgid ""
-"https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
+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"
 
 #: "/web/en/5/nav.php +8"