fix english sentence 'from from'

reported on irc

1 files changed, 125 insertions, 125 deletions

diff --git a/langs/zh-cn/cauldron.po b/langs/zh-cn/cauldron.po
index c62dd5357..cc8866b68 100644
--- a/langs/zh-cn/cauldron.po
+++ b/langs/zh-cn/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ./langs/zh-cn/cauldron.zh-cn.lang\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-06-12 20:43:42+0000\n"
+"POT-Creation-Date: 2014-09-10 17:54:50+0000\n"
 "PO-Revision-Date: 2014-03-22 14:48+0100\n"
 "Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,405 +12,405 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: "/web/en/5/download_index.php +35"
+#: "/web/en/5/download_index.php +36"
 msgid "32 bit"
 msgstr ""
 
-#: "/web/en/5/download_index.php +38"
+#: "/web/en/5/download_index.php +39"
 msgid "64 bit"
 msgstr ""
 
-#: "/web/en/5/download_index.php +41"
-#, fuzzy
+#: "/web/en/5/download_index.php +42"
+
 msgid "Dualarch"
 msgstr "dualarch"
 
-#: "/web/en/5/download_index.php +48"
+#: "/web/en/5/download_index.php +49"
 msgid "forthcoming"
 msgstr "即将到来的"
 
-#: "/web/en/5/download_index.php +61"
+#: "/web/en/5/download_index.php +67"
 msgid "Download"
 msgstr "下载"
 
-#: "/web/en/5/download_index.php +62"
-#, fuzzy
+#: "/web/en/5/download_index.php +68"
+
 msgid "Download %s DVD, CD, LiveCD, network install ISO images."
 msgstr "下载 Mageia 4 DVD，CD，LiveCD，网络安装ISO 镜像。"
 
-#: "/web/en/5/download_index.php +63"
-#, fuzzy
+#: "/web/en/5/download_index.php +69"
+
 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 +132"
-#, fuzzy
+#: "/web/en/5/download_index.php +144"
+
 msgid "Be careful! This is an alpha, unstable release."
 msgstr "当心！这是一个测试版，不稳定的发行版。"
 
-#: "/web/en/5/download_index.php +133"
+#: "/web/en/5/download_index.php +145"
 msgid "Be careful! This is a beta, unstable release."
 msgstr "当心！这是一个测试版，不稳定的发行版。"
 
-#: "/web/en/5/download_index.php +134"
+#: "/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>"
 msgstr "这仅供开发人员使用。<strong>请不用于生产环境或者官方审查</strong>"
 
-#: "/web/en/5/download_index.php +135"
-#, fuzzy
+#: "/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 December 2014."
 msgstr "这是一个候选版本。候选发布版是从 Beta testing 的升级，适合高级用户和审核人的待发布产品。然而，初级用户和关键应用程序用户可能希望等待计划在2014年2月发行的最终版。"
 
-#: "/web/en/5/download_index.php +135"
+#: "/web/en/5/download_index.php +147"
 msgid "Release Candidate is intended to identify any remaining bugs or missing packages."
 msgstr "候选版本旨在确定任何遗留的bug或者缺失的软件包。"
 
-#: "/web/en/5/download_index.php +142"
+#: "/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."
 msgstr ""
 
-#: "/web/en/5/download_index.php +148"
+#: "/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>."
 msgstr ""
 
-#: "/web/en/5/download_index.php +150"
+#: "/web/en/5/download_index.php +162"
 msgid "All ISOs can also be launched from a <a %s>USB drive</a>."
 msgstr ""
 
-#: "/web/en/5/download_index.php +151"
+#: "/web/en/5/download_index.php +163"
 msgid "Unetbootin is not supported."
 msgstr ""
 
-#: "/web/en/5/download_index.php +154"
+#: "/web/en/5/download_index.php +166"
 msgid "Dump Mageia ISO on a USB flash drive"
 msgstr ""
 
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +168"
 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 +157"
+#: "/web/en/5/download_index.php +169"
 msgid "Unetbootin should not be used to copy the iso image to a USB drive (see below)."
 msgstr ""
 
-#: "/web/en/5/download_index.php +158"
+#: "/web/en/5/download_index.php +170"
 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 +160"
+#: "/web/en/5/download_index.php +172"
 msgid "IsoDumper, available since Mageia 4 inside repo, for Mageia 3, it's <a href=\"%s\">here</a>."
 msgstr ""
 
-#: "/web/en/5/download_index.php +162"
-#, fuzzy
+#: "/web/en/5/download_index.php +174"
+
 msgid "For windows use <a href=\"%s\">usbdumper.</a>"
 msgstr "她在 <a href=\"%s\">这里</a>."
 
-#: "/web/en/5/download_index.php +163"
+#: "/web/en/5/download_index.php +175"
 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 +173"
+#: "/web/en/5/download_index.php +185"
 msgid "Classical Installation Flavours"
 msgstr "经典安装风格"
 
-#: "/web/en/5/download_index.php +175"
+#: "/web/en/5/download_index.php +187"
 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 +177"
+#: "/web/en/5/download_index.php +189"
 msgid "Up to 167 locales are supported:"
 msgstr "支持多至 167 种语系："
 
-#: "/web/en/5/download_index.php +179"
+#: "/web/en/5/download_index.php +191"
 msgid "and so much more!"
 msgstr "更多!"
 
-#: "/web/en/5/download_index.php +180"
+#: "/web/en/5/download_index.php +192"
 msgid "See the comprehensive list"
 msgstr "查看详细列表"
 
-#: "/web/en/5/download_index.php +183"
-#, fuzzy
+#: "/web/en/5/download_index.php +195"
+
 msgid "These ISOs contains Free Software and some proprietary drivers."
 msgstr "这些 DVD 和 CD ISOs 包含自由软件和某些私有驱动程序。"
 
-#: "/web/en/5/download_index.php +184"
+#: "/web/en/5/download_index.php +196"
 msgid "You will be asked of which kind of Software you want to install."
 msgstr "安装时会询问您想要安装哪种软件。"
 
-#: "/web/en/5/download_index.php +185"
+#: "/web/en/5/download_index.php +197"
 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 +188"
+#: "/web/en/5/download_index.php +200"
 msgid "For 32 and 64bit, size of the ISOs is about 4GB. For the dualarch it's about 1GB."
 msgstr ""
 
-#: "/web/en/5/download_index.php +196"
+#: "/web/en/5/download_index.php +208"
 msgid "LiveCDs and LiveDVDs"
 msgstr "LiveCDs and LiveDVDs"
 
-#: "/web/en/5/download_index.php +198"
+#: "/web/en/5/download_index.php +210"
 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 \tone of the graphical user interfaces such as GNOME or KDE."
 msgstr ""
 
-#: "/web/en/5/download_index.php +199"
+#: "/web/en/5/download_index.php +211"
 msgid "If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media."
 msgstr ""
 
-#: "/web/en/5/download_index.php +201"
+#: "/web/en/5/download_index.php +213"
 msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
 msgstr "LiveCDs 和 LiveDVDs 仅适用于全新安装。"
 
-#: "/web/en/5/download_index.php +202"
-#, fuzzy
-msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+#: "/web/en/5/download_index.php +214"
+
+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 +203"
-#, fuzzy
+#: "/web/en/5/download_index.php +215"
+
 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 +206"
+#: "/web/en/5/download_index.php +218"
 msgid "For LiveDVDs, size of the ISOs is about 1.4GB. For the LiveCDs it's about 700MB."
 msgstr ""
 
-#: "/web/en/5/download_index.php +211"
+#: "/web/en/5/download_index.php +223"
 msgid "Wired Network-based Installation CD"
 msgstr "有线网络安装 CD"
 
-#: "/web/en/5/download_index.php +212"
+#: "/web/en/5/download_index.php +224"
 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 +213"
+#: "/web/en/5/download_index.php +225"
 msgid "Have a look in the <a href=\"%s\">wiki</a> to get a list of possibilities."
 msgstr ""
 
-#: "/web/en/5/download_index.php +214"
+#: "/web/en/5/download_index.php +226"
 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 +215"
+#: "/web/en/5/download_index.php +227"
 msgid "Size of the ISOs is about 50MB."
 msgstr ""
 
-#: "/web/en/5/download_index.php +220"
-#, fuzzy
+#: "/web/en/5/download_index.php +232"
+
 msgid "Classic Installation"
 msgstr "经典安装风格"
 
-#: "/web/en/5/download_index.php +222"
+#: "/web/en/5/download_index.php +234"
 msgid "Live Media"
 msgstr ""
 
-#: "/web/en/5/download_index.php +224"
-#, fuzzy
+#: "/web/en/5/download_index.php +236"
+
 msgid "Network Installation"
 msgstr "有线网络安装 CD"
 
-#: "/web/en/5/download_index.php +228"
+#: "/web/en/5/download_index.php +240"
 msgid "The dualarch is not yet available."
 msgstr ""
 
-#: "/web/en/5/download_index.php +229"
-#, fuzzy
+#: "/web/en/5/download_index.php +241"
+
 msgid "LiveCDs and LiveDVDs are not yet available."
 msgstr "LiveCDs 和 LiveDVDs 仅适用于全新安装。"
 
-#: "/web/en/5/download_index.php +230"
-#, fuzzy
+#: "/web/en/5/download_index.php +242"
+
 msgid "Classical Installation flavours is not yet available."
 msgstr "经典安装风格"
 
-#: "/web/en/5/download_index.php +240"
+#: "/web/en/5/download_index.php +252"
 msgid "LiveCDs"
 msgstr ""
 
-#: "/web/en/5/download_index.php +241"
+#: "/web/en/5/download_index.php +253"
 msgid "LiveCDs contain only English and is available only in 32bit."
 msgstr ""
 
-#: "/web/en/5/download_index.php +245"
+#: "/web/en/5/download_index.php +257"
 msgid "LiveDVDs"
 msgstr ""
 
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +258"
 msgid "LiveDVDs contain all languages and is available in both 32 and 64bit."
 msgstr ""
 
-#: "/web/en/5/download_index.php +251"
-#, fuzzy
+#: "/web/en/5/download_index.php +263"
+
 msgid "English only (CD)"
 msgstr "只有英语"
 
-#: "/web/en/5/download_index.php +259"
+#: "/web/en/5/download_index.php +271"
 msgid "Desktop"
 msgstr "桌面"
 
-#: "/web/en/5/download_index.php +262"
-#, fuzzy
+#: "/web/en/5/download_index.php +274"
+
 msgid "GNOME Desktop"
 msgstr "桌面"
 
-#: "/web/en/5/download_index.php +266"
-#, fuzzy
+#: "/web/en/5/download_index.php +278"
+
 msgid "KDE Desktop"
 msgstr "桌面"
 
-#: "/web/en/5/download_index.php +279"
-#, fuzzy
+#: "/web/en/5/download_index.php +291"
+
 msgid "Network installer"
 msgstr "网络安装，自由软件 CD"
 
-#: "/web/en/5/download_index.php +282"
+#: "/web/en/5/download_index.php +294"
 msgid "Network installer, Free Software CD"
 msgstr "网络安装，自由软件 CD"
 
-#: "/web/en/5/download_index.php +283"
+#: "/web/en/5/download_index.php +295"
 msgid "Contain only free software"
 msgstr ""
 
-#: "/web/en/5/download_index.php +286"
+#: "/web/en/5/download_index.php +298"
 msgid "Network installer + nonfree firmware CD"
 msgstr "网络安装 + 非自由固件 CD"
 
-#: "/web/en/5/download_index.php +287"
-#, fuzzy
+#: "/web/en/5/download_index.php +299"
+
 msgid "Contain nonfree drivers needed for some disc controllers, some network cards, etc."
 msgstr "某些磁盘控制器、网卡可能需要。"
 
-#: "/web/en/5/download_index.php +291"
-#, fuzzy
+#: "/web/en/5/download_index.php +303"
+
 msgid "Free Software CD"
 msgstr "网络安装，自由软件 CD"
 
-#: "/web/en/5/download_index.php +293"
-#, fuzzy
+#: "/web/en/5/download_index.php +305"
+
 msgid "Nonfree Firmware CD"
 msgstr "网络安装 + 非自由固件 CD"
 
-#: "/web/en/5/download_index.php +298"
+#: "/web/en/5/download_index.php +310"
 msgid "Supported Architecture"
 msgstr ""
 
-#: "/web/en/5/download_index.php +301"
+#: "/web/en/5/download_index.php +313"
 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 +305"
+#: "/web/en/5/download_index.php +317"
 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 +311"
-#, fuzzy
+#: "/web/en/5/download_index.php +323"
+
 msgid "The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on 1GB."
 msgstr "CD 仅包含少数软件包。"
 
-#: "/web/en/5/download_index.php +312"
+#: "/web/en/5/download_index.php +324"
 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 +313"
+#: "/web/en/5/download_index.php +325"
 msgid "This ISO is generally for advanced users and system administrator for fast deployment of Mageia."
 msgstr ""
 
-#: "/web/en/5/download_index.php +327"
-#, fuzzy
+#: "/web/en/5/download_index.php +339"
+
 msgid "Download Method"
 msgstr "下载"
 
-#: "/web/en/5/download_index.php +329"
+#: "/web/en/5/download_index.php +341"
 msgid "Direct Link"
 msgstr ""
 
-#: "/web/en/5/download_index.php +330"
+#: "/web/en/5/download_index.php +342"
 msgid "You will be redirected to a HTTP or FTP mirror."
 msgstr ""
 
-#: "/web/en/5/download_index.php +336"
+#: "/web/en/5/download_index.php +348"
 msgid "BitTorrent"
 msgstr "BitTorrent"
 
-#: "/web/en/5/download_index.php +337"
+#: "/web/en/5/download_index.php +349"
 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 +338"
+#: "/web/en/5/download_index.php +350"
 msgid "BitTorrent link are not yet available."
 msgstr ""
 
-#: "/web/en/5/download_index.php +355"
+#: "/web/en/5/download_index.php +367"
 msgid "Format"
 msgstr "Format"
 
-#: "/web/en/5/download_index.php +356"
+#: "/web/en/5/download_index.php +368"
 msgid "link"
 msgstr "链接"
 
-#: "/web/en/5/download_index.php +477"
+#: "/web/en/5/download_index.php +489"
 msgid "Release notes"
 msgstr "版本通告"
 
-#: "/web/en/5/download_index.php +478"
+#: "/web/en/5/download_index.php +490"
 msgid "Errata"
 msgstr "Errata"
 
-#: "/web/en/5/download_index.php +479"
+#: "/web/en/5/download_index.php +491"
 msgid "<a href=\"%s\">Which to choose</a>"
 msgstr "<a href=\"%s\">选择哪一个</a>"
 
-#: "/web/en/5/download_index.php +480"
-#, fuzzy
+#: "/web/en/5/download_index.php +492"
+
 msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
 msgstr "<a href=\"%s\">转储 ISO 到 U盘</a>"
 
-#: "/web/en/5/download_index.php +481"
+#: "/web/en/5/download_index.php +493"
 msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
 msgstr ""
 
-#: "/web/en/5/download_index.php +482"
-#, fuzzy
+#: "/web/en/5/download_index.php +494"
+
 msgid "Help us on %s"
 msgstr "帮助我们完成 <a href=\"%s\">Mageia 4</a>"
 
-#: "/web/en/5/download_index.php +486"
+#: "/web/en/5/download_index.php +498"
 msgid "Looking for a stable release?"
 msgstr "需要稳定发型版?"
 
-#: "/web/en/5/download_index.php +488"
+#: "/web/en/5/download_index.php +500"
 msgid "It is <a href=\"%s\">here</a>."
 msgstr "她在 <a href=\"%s\">这里</a>."
 
-#: "/web/en/5/download_index.php +491"
+#: "/web/en/5/download_index.php +503"
 msgid "Upgrading<br>from %s ?"
 msgstr ""
 
-#: "/web/en/5/download_index.php +493"
+#: "/web/en/5/download_index.php +505"
 msgid "<strong>do not</strong> use LiveCDs;"
 msgstr ""
 
-#: "/web/en/5/download_index.php +494"
-#, fuzzy
+#: "/web/en/5/download_index.php +506"
+
 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 +497"
-#, fuzzy
+#: "/web/en/5/download_index.php +509"
+
 msgid "Looking for %s ?"
 msgstr "需要稳定发型版?"
 
-#: "/web/en/5/download_index.php +500"
+#: "/web/en/5/download_index.php +512"
 msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
 msgstr ""
 
-#: "/web/en/5/download_index.php +503"
+#: "/web/en/5/download_index.php +515"
 msgid "Need more challenge?"
 msgstr ""
 
-#: "/web/en/5/download_index.php +504"
+#: "/web/en/5/download_index.php +516"
 msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
 msgstr ""
 
@@ -438,11 +438,11 @@ msgstr "特性回顾"
 msgid "Bugs Reports"
 msgstr "错误报告"
 
-#, fuzzy
+
 #~ msgid "Gnome Desktop"
 #~ msgstr "桌面"
 
-#, fuzzy
+
 #~ msgid "Kde Desktop"
 #~ msgstr "桌面"
 
@@ -467,6 +467,6 @@ msgstr "错误报告"
 #~ msgid "<a href=\"%s\">Errata</a>"
 #~ msgstr "<a href=\"%s\">Errata</a>"
 
-#, fuzzy
+
 #~ msgid "It is <a href=\"%s\">here now</a>."
 #~ msgstr "她在 <a href=\"%s\">这里</a>."