sync with code

1 files changed, 20 insertions, 22 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index c8fabf990..f1fa7daf5 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
-"POT-Creation-Date: 2011-04-17 17:24+0300\n"
+"POT-Creation-Date: 2011-04-29 01:59+0200\n"
 "PO-Revision-Date: 2009-04-09 11:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #: any.pm:258 any.pm:955 diskdrake/interactive.pm:648
 #: diskdrake/interactive.pm:871 diskdrake/interactive.pm:931
@@ -549,7 +549,7 @@ msgstr ""
 "Mageia 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:1140
+#: any.pm:1140 fs/partitioning_wizard.pm:172
 #, c-format
 msgid "Mageia"
 msgstr ""
@@ -2580,10 +2580,10 @@ msgstr "您需要改变哪个分区的大小?"
 msgid ""
 "Your Microsoft Windows® partition is too fragmented. Please reboot your "
 "computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
-"the Mageia installation."
+"the %s installation."
 msgstr ""
 "您的 Microsoft Windows® 分区有太多碎片, 请重新启动, 进入 Microsoft Windows®, "
-"运行磁盘碎片整理程序, 然后重新开始安装 Mageia"
+"运行磁盘碎片整理程序, 然后重新开始安装 %s"
 
 #: fs/partitioning_wizard.pm:180
 #, c-format
@@ -4754,13 +4754,13 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the Mageia "
-"Linux distribution \n"
+"distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mageia distribution, and "
-"any applications \n"
+"system and the different components of the Mageia distribution, and any "
+"applications \n"
 "distributed with these products provided by Mageia's licensors or "
 "suppliers.\n"
 "\n"
@@ -4817,8 +4817,8 @@ msgid ""
 "judgment, or any \n"
 "other consequential loss) arising out of the possession and use of software "
 "components or \n"
-"arising out of  downloading software components from one of Mageia "
-"sites which are \n"
+"arising out of  downloading software components from one of Mageia sites "
+"which are \n"
 "prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -4856,8 +4856,7 @@ msgid ""
 "Mageia and its suppliers and licensors reserves their rights to modify or "
 "adapt the Software \n"
 "Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mageia\", \"Mageia\" and associated logos are trademarks of "
-"Mageia  \n"
+"\"Mageia\", \"Mageia\" and associated logos are trademarks of Mageia  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -4877,9 +4876,9 @@ msgid ""
 msgstr ""
 "简介\n"
 "\n"
-"Mageia 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件产"
-"品包括但不限于 Mageia 许可商或供应商提供的与 Mageia 发行版的操作系统和"
-"各个部分有关的程序、方法、规则和文档。\n"
+"Mageia 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件产品包括"
+"但不限于 Mageia 许可商或供应商提供的与 Mageia 发行版的操作系统和各个部分有关"
+"的程序、方法、规则和文档。\n"
 "\n"
 "\n"
 "1. 许可协议\n"
@@ -4902,11 +4901,11 @@ msgstr ""
 "\n"
 "在某些国家中关于拥有和使用被禁止的软件的有限责任\n"
 "\n"
-"在法律允许的范围内 Mageia 或其分销者对因拥有或使用, 或从任何 Mageia 的"
-"网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、偶然、直接、间接"
-"的无论任何损失 (包括但不限于生意的丧失、生意的中断、财务损失、因法院裁决产生"
-"的法律费用和处罚或其他因此产生的损失)将不承担责任。这种有限责任适用但不限于本"
-"软件产品所包括的强大数据加密组件。\n"
+"在法律允许的范围内 Mageia 或其分销者对因拥有或使用, 或从任何 Mageia 的网站下"
+"载在某些国家中被当地法律禁止或限制的软件而引起的特定、偶然、直接、间接的无论"
+"任何损失 (包括但不限于生意的丧失、生意的中断、财务损失、因法院裁决产生的法律"
+"费用和处罚或其他因此产生的损失)将不承担责任。这种有限责任适用但不限于本软件产"
+"品所包括的强大数据加密组件。\n"
 "\n"
 "%s\n"
 "\n"
@@ -4958,8 +4957,7 @@ msgid ""
 "Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mageia "
-"Linux,\n"
+"For information on fixes which are available for this release of Mageia,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"