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

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, 25 insertions, 25 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index 4aeb16986..6ff3c2178 100644
--- a/perl-install/install/share/po/zh_CN.po
+++ b/perl-install/install/share/po/zh_CN.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2010-05-01 16:50+0200\n"
 "PO-Revision-Date: 2009-04-09 11:49+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"
@@ -24,23 +24,23 @@ msgstr "U 盘上的桌面"
 
 #: ../../advertising/IM_free.pl:1
 #, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% 开放源代码的 Mandriva Linux 发行版"
+msgid "The 100%% open source Mageia Linux distribution"
+msgstr "100%% 开放源代码的 Mageia Linux 发行版"
 
 #: ../../advertising/IM_one.pl:1
 #, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "用 Mandriva One 轻松探索 Linux"
+msgid "Explore Linux easily with Mageia One"
+msgstr "用 Mageia One 轻松探索 Linux"
 
 #: ../../advertising/IM_pwp.pl:1
 #, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Mandriva Linux 桌面旗舰产品，附带完善的售后服务支持"
+msgid "A full Mageia Linux desktop, with support"
+msgstr "Mageia Linux 桌面旗舰产品，附带完善的售后服务支持"
 
 #: ../../advertising/IM_range.pl:1
 #, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva 在手，应用无忧"
+msgid "Mageia: distributions for everybody's needs"
+msgstr "Mageia 在手，应用无忧"
 
 #: any.pm:109
 #, c-format
@@ -94,15 +94,15 @@ msgstr "URL 必须以 ftp:// 或 http:// 开始"
 #: any.pm:182
 #, c-format
 msgid ""
-"Contacting Mandriva Linux web site to get the list of available mirrors..."
-msgstr "正在连接 Mandriva Linux 网站获得可用镜像的列表..."
+"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgstr "正在连接 Mageia Linux 网站获得可用镜像的列表..."
 
 #: any.pm:187
 #, c-format
 msgid ""
-"Failed contacting Mandriva Linux web site to get the list of available "
+"Failed contacting Mageia Linux web site to get the list of available "
 "mirrors"
-msgstr "连接 Mandriva Linux 网站以获得可用镜像的列表失败"
+msgstr "连接 Mageia Linux 网站以获得可用镜像的列表失败"
 
 #: any.pm:197
 #, c-format
@@ -663,8 +663,8 @@ msgstr "监视工具、进程统计、tcpdump、nmap……"
 
 #: share/meta-task/compssUsers.pl:190
 #, c-format
-msgid "Mandriva Wizards"
-msgstr "Mandriva 向导"
+msgid "Mageia Wizards"
+msgstr "Mageia 向导"
 
 #: share/meta-task/compssUsers.pl:191
 #, c-format
@@ -699,8 +699,8 @@ msgstr "进入步骤“%s”\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mandriva Linux Installation %s"
-msgstr "Mandriva Linux 安装 %s"
+msgid "Mageia Linux Installation %s"
+msgstr "Mageia Linux 安装 %s"
 
 #: steps_curses.pm:32
 #, c-format
@@ -716,23 +716,23 @@ msgstr "Xorg 启动很慢，请稍候..."
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandriva Linux. If that occurs, you can try a text install instead. For "
+"Mageia Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您系统的资源过低。您在安装 Mandriva Linux 的过程中可能遇到问题。\n"
+"您系统的资源过低。您在安装 Mageia Linux 的过程中可能遇到问题。\n"
 "如果您真的遇到问题的话，可以试试文本安装。要进入文本安装，请在启动时按“F1”，"
 "然后输入“text”。"
 
 #: steps_gtk.pm:239
 #, c-format
-msgid "Install Mandriva KDE Desktop"
-msgstr "安装 Mandriva KDE 桌面"
+msgid "Install Mageia KDE Desktop"
+msgstr "安装 Mageia KDE 桌面"
 
 #: steps_gtk.pm:240
 #, c-format
-msgid "Install Mandriva GNOME Desktop"
-msgstr "安装 Mandriva GNOME 桌面"
+msgid "Install Mageia GNOME Desktop"
+msgstr "安装 Mageia GNOME 桌面"
 
 #: steps_gtk.pm:241
 #, c-format
@@ -1028,7 +1028,7 @@ msgstr "升级先前的安装(不推荐)"
 #: steps_interactive.pm:211
 #, c-format
 msgid ""
-"Installer has detected that your installed Mandriva Linux system could not\n"
+"Installer has detected that your installed Mageia Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1036,7 +1036,7 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"安装程序检测到您所安装的 Mandriva Linux 系统无法安全升级到 %s。\n"
+"安装程序检测到您所安装的 Mageia Linux 系统无法安全升级到 %s。\n"
 "\n"
 "我们建议您进行全新安装，以便替换您先前的系统。\n"
 "\n"