Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line

Add drakx structure on the SVN
------------------------------------------------------------------------
r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned advertising
------------------------------------------------------------------------
r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line

Import Clean perl-install
------------------------------------------------------------------------
r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line

Add cleaned files
------------------------------------------------------------------------
r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned kernel
------------------------------------------------------------------------
r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned tools
------------------------------------------------------------------------
r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line

Import stage1
------------------------------------------------------------------------
r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line

Import images
------------------------------------------------------------------------
r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines

readd missing file

------------------------------------------------------------------------
r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line

Import rescue
------------------------------------------------------------------------
r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines

import cleaned rescue for Mageia

------------------------------------------------------------------------
r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line

import (cleaned) doc
------------------------------------------------------------------------

1 files changed, 43 insertions, 43 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 6645e8efc..e49b667c8 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2010-06-05 23:30+0200\n"
 "PO-Revision-Date: 2009-04-09 11:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Mageia Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -541,11 +541,11 @@ msgstr "请选择要使用的语言。"
 #: any.pm:1135
 #, c-format
 msgid ""
-"Mandriva Linux can support multiple languages. Select\n"
+"Mageia Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"Mandriva Linux 可以支持多种语言。请选择您想要安装的语言。\n"
+"Mageia Linux 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
 #: any.pm:1138
@@ -2574,10 +2574,10 @@ msgstr "您需要改变哪个分区的大小?"
 msgid ""
 "Your Microsoft Windows® partition is too fragmented. Please reboot your "
 "computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
-"the Mandriva Linux installation."
+"the Mageia Linux installation."
 msgstr ""
 "您的 Microsoft Windows® 分区有太多碎片, 请重新启动, 进入 Microsoft Windows®, "
-"运行磁盘碎片整理程序, 然后重新开始安装 Mandriva Linux"
+"运行磁盘碎片整理程序, 然后重新开始安装 Mageia Linux"
 
 #: fs/partitioning_wizard.pm:180
 #, c-format
@@ -4744,15 +4744,15 @@ msgstr "引导程序无法识别多个物理卷上的 /boot"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandriva "
+"The operating system and the different components available in the Mageia "
 "Linux 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 Mandriva Linux distribution, and "
+"system and the different components of the Mageia Linux distribution, and "
 "any applications \n"
-"distributed with these products provided by Mandriva's licensors or "
+"distributed with these products provided by Mageia's licensors or "
 "suppliers.\n"
 "\n"
 "\n"
@@ -4760,7 +4760,7 @@ msgid ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandriva S.A. which applies to the Software Products.\n"
+"Mageia which applies to the Software Products.\n"
 "By installing, duplicating or using any of the Software Products in any "
 "manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -4782,7 +4782,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"Neither Mageia nor its licensors or suppliers will, in any "
 "circumstances and to the extent \n"
 "permitted by law, be liable for any special, incidental, direct or indirect "
 "damages whatsoever \n"
@@ -4791,14 +4791,14 @@ msgid ""
 "loss, legal fees and penalties resulting from a court judgment, or any other "
 "consequential loss) \n"
 "arising out of  the use or inability to use the Software Products, even if "
-"Mandriva S.A. or its \n"
+"Mageia or its \n"
 "licensors or suppliers have been advised of the possibility or occurrence of "
 "such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"To the extent permitted by law, neither Mageia nor its licensors, "
 "suppliers or\n"
 "distributors will, in any circumstances, be liable for any special, "
 "incidental, direct or indirect \n"
@@ -4808,7 +4808,7 @@ 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 Mandriva Linux "
+"arising out of  downloading software components from one of Mageia Linux "
 "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 "
@@ -4830,10 +4830,10 @@ msgid ""
 "agreement for each component \n"
 "before using any component. Any question on a component license should be "
 "addressed to the component \n"
-"licensor or supplier and not to Mandriva.\n"
-"The programs developed by Mandriva S.A. are governed by the GPL License. "
+"licensor or supplier and not to Mageia.\n"
+"The programs developed by Mageia are governed by the GPL License. "
 "Documentation written \n"
-"by Mandriva S.A. is governed by a specific license. Please refer to the "
+"by Mageia is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -4844,11 +4844,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"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"
-"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
-"Mandriva S.A.  \n"
+"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
+"Mageia  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -4864,18 +4864,18 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandriva S.A."
+"For any question on this document, please contact Mageia"
 msgstr ""
 "简介\n"
 "\n"
-"Mandriva Linux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"
-"产品包括但不限于 Mandriva 许可商或供应商提供的与 Mandriva Linux 发行版的操作"
+"Mageia Linux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"
+"产品包括但不限于 Mageia 许可商或供应商提供的与 Mageia Linux 发行版的操作"
 "系统和各个部分有关的程序、方法、规则和文档。\n"
 "\n"
 "\n"
 "1. 许可协议\n"
 "\n"
-"请仔细阅读此文档。此文档是您与 Mandriva S.A. 之间关于本软件产品的一个许可协"
+"请仔细阅读此文档。此文档是您与 Mageia 之间关于本软件产品的一个许可协"
 "议。如果您安装、复制或使用本软件产品, 即表明您接受并完全同意遵守本许可协议的"
 "内容和条件。如果您不同意本许可协议中的任何部分, 您将无权安装、复制或使用本软"
 "件产品任何试图不遵守本许可协议的内容和条件, 而安装、复制或使用本软件产品的行"
@@ -4886,14 +4886,14 @@ msgstr ""
 "2. 有限担保\n"
 "\n"
 "本软件产品和附带的文档是一经发表即“不再修改”, 在法律允许的范围内没有任何担"
-"保。在法律允许的范围内 Mandriva S.A. 对因使用或不能使用本软件产品而引起的特"
+"保。在法律允许的范围内 Mageia 对因使用或不能使用本软件产品而引起的特"
 "定、偶然、直接、间接的无论任何损失(包括但不限于生意的丧失、生意的中断、财务损"
 "失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任, 即使 "
-"Mandriva S.A. 已经被告知有发生这种损失的可能性。\n"
+"Mageia 已经被告知有发生这种损失的可能性。\n"
 "\n"
 "在某些国家中关于拥有和使用被禁止的软件的有限责任\n"
 "\n"
-"在法律允许的范围内 Mandriva S.A. 或其分销者对因拥有或使用, 或从任何 Mandriva "
+"在法律允许的范围内 Mageia 或其分销者对因拥有或使用, 或从任何 Mageia "
 "Linux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、偶然、直"
 "接、间接的无论任何损失 (包括但不限于生意的丧失、生意的中断、财务损失、因法院"
 "裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任。这种有限责任适用但"
@@ -4906,16 +4906,16 @@ msgstr ""
 "本软件产品由不同个人或组织所创作的各部分组成。%s这些许可协议大多允许您使用、"
 "复制、修改或重新发表协议所覆盖的部分。使用这些软件之前, 请仔细阅读有关许可协"
 "议的条款和条件。如果对任何部分的许可协议有疑问, 应该与该部分的作者联系, "
-"Mandriva 无法解答这些问题。由 Mandriva S.A. 开发的各个程序受 GPL 许可协议保"
-"护。由 Mandriva S.A. 创作的文档采用一个特别的许可协议。详情见有关的文档。\n"
+"Mageia 无法解答这些问题。由 Mageia 开发的各个程序受 GPL 许可协议保"
+"护。由 Mageia 创作的文档采用一个特别的许可协议。详情见有关的文档。\n"
 "\n"
 "\n"
 "4. 知识产权\n"
 "\n"
 "本软件产品的各个组件的所有权利属于它们各自的作者, 并受到所有可适用于软件程序"
-"的知识产权和版权法律的保护。Mandriva S.A. 保留对本软件产品进行全面或部分的更"
+"的知识产权和版权法律的保护。Mageia 保留对本软件产品进行全面或部分的更"
 "改或调整的权利, 不论采用任何方法, 不论出于任何目的。\n"
-"“Mandriva”, “Mandriva Linux”和相关的标志是 Mandriva S.A. 的商标。\n"
+"“Mageia”, “Mageia Linux”和相关的标志是 Mageia 的商标。\n"
 "\n"
 "\n"
 "5. 适用法律\n"
@@ -4923,7 +4923,7 @@ msgstr ""
 "如果本协议的任何部分被法院裁定为无效、非法或不适用, 该部分将被排除在本协议之"
 "外。您仍然需要遵守本协议的其它可使用的部分。本协议的内容和条件受法国法律管"
 "辖。有关本协议的任何争议最好在法庭外解决。作为最后的手段, 争议将被提交法国巴"
-"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandriva S.A.。"
+"黎适当的法院审理。对本文档有任何疑问, 请联系 Mageia。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:90
@@ -5050,7 +5050,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 Mandriva "
+"For information on fixes which are available for this release of Mageia "
 "Linux,\n"
 "consult the Errata available from:\n"
 "\n"
@@ -5059,18 +5059,18 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandriva Linux User's Guide."
+"install chapter of the Official Mageia Linux User's Guide."
 msgstr ""
 "恭喜。安装完成了。请取出启动介质, 然后按 Enter 重新启动。\n"
 "\n"
 "\n"
-"要了解此版本 Mandriva Linux 的修订, 请访问以下勘误表: \n"
+"要了解此版本 Mageia Linux 的修订, 请访问以下勘误表: \n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"关于安装后如何配置您的系统, 请查看 Mandriva Linux 官方用户手册。"
+"关于安装后如何配置您的系统, 请查看 Mageia Linux 官方用户手册。"
 
 #: modules/interactive.pm:19
 #, c-format
@@ -6686,15 +6686,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of Mandriva Linux tools\n"
-"  --incident        - program should be one of Mandriva Linux tools"
+"  --report          - program should be one of Mageia Linux tools\n"
+"  --incident        - program should be one of Mageia Linux tools"
 msgstr ""
 "[选项] [程序名]\n"
 "\n"
 "选项:\n"
 "  --help            - 打印此帮助信息。\n"
-"  --report          - 程序应该是 Mandriva Linux 工具之一\n"
-"  --incident        - 程序应该是 Mandriva Linux 工具之一"
+"  --report          - 程序应该是 Mageia Linux 工具之一\n"
+"  --incident        - 程序应该是 Mageia Linux 工具之一"
 
 #: standalone.pm:66
 #, c-format
@@ -6748,7 +6748,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandriva Linux Terminal Server Configurator\n"
+"Mageia Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -6762,7 +6762,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[选项]...\n"
-"Mandriva Linux 终端服务器配置\n"
+"Mageia Linux 终端服务器配置\n"
 "--enable         :启用 MTS\n"
 "--disable        :禁用 MTS\n"
 "--start          :启动 MTS\n"
@@ -6809,7 +6809,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in Mandriva "
+"  --no-confirmation      do not ask first confirmation question in Mageia "
 "Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
@@ -6817,7 +6817,7 @@ msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[选项]...\n"
-"  --no-confirmation      不询问 Mandriva Update 模块中的第一个确认问题\n"
+"  --no-confirmation      不询问 Mageia Update 模块中的第一个确认问题\n"
 "  --no-verify-rpm        不校验包签名\n"
 "  --changelog-first      在描述窗口中的文件列表前显示更改日志\n"
 "  --merge-all-rpmnew     计划合并找到的所有 .rpmnew/.rpmsave 文件"