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, 46 insertions, 39 deletions

diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index af0f5b099..50e048493 100644
--- a/perl-install/standalone/po/zh_CN.po
+++ b/perl-install/standalone/po/zh_CN.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2010-05-01 16:52+0200\n"
 "PO-Revision-Date: 2009-04-09 11:56+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"
@@ -175,13 +175,13 @@ msgstr "“%s”程序已崩溃，并抛出如下错误："
 
 #: drakbug:76
 #, c-format
-msgid "Mandriva Linux Bug Report Tool"
-msgstr "Mandriva Linux 故障报告工具"
+msgid "Mageia Linux Bug Report Tool"
+msgstr "Mageia Linux 故障报告工具"
 
 #: drakbug:81
 #, c-format
-msgid "Mandriva Linux Control Center"
-msgstr "Mandriva Linux 控制中心"
+msgid "Mageia Linux Control Center"
+msgstr "Mageia Linux 控制中心"
 
 #: drakbug:82
 #, c-format
@@ -200,8 +200,8 @@ msgstr "独立工具"
 
 #: drakbug:86 drakbug:87
 #, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva 在线"
+msgid "Mageia Online"
+msgstr "Mageia 在线"
 
 #: drakbug:88
 #, c-format
@@ -225,8 +225,8 @@ msgstr "配置向导"
 
 #: drakbug:113
 #, c-format
-msgid "Select Mandriva Tool:"
-msgstr "选择 Mandriva 工具:"
+msgid "Select Mageia Tool:"
+msgstr "选择 Mageia 工具:"
 
 #: drakbug:114
 #, c-format
@@ -664,7 +664,7 @@ msgstr "Drakfont"
 #: drakfont:522 harddrake2:234
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
-msgstr "版权 (C) %s Mandriva"
+msgstr "版权 (C) %s Mageia"
 
 #: drakfont:524
 #, c-format
@@ -673,8 +673,8 @@ msgstr "字体安装程序。"
 
 #: drakfont:526 harddrake2:238
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -824,7 +824,7 @@ msgid ""
 "Usage: \n"
 msgstr ""
 " Drak 帮助 0.1\n"
-"版权 (C) %s Mandriva.\n"
+"版权 (C) %s Mageia.\n"
 "这是自由软件, 可按照 GNU GPL 协议条款再发放。\n"
 "\n"
 "用法: \n"
@@ -849,8 +849,8 @@ msgstr " --doc <link>          - 链接到其他网页 ( 给 WM 欢迎的前端�
 
 #: drakhelp:52
 #, c-format
-msgid "Mandriva Linux Help Center"
-msgstr "Mandriva Linux 帮助中心"
+msgid "Mageia Linux Help Center"
+msgstr "Mageia Linux 帮助中心"
 
 #: drakhelp:52
 #, c-format
@@ -1155,8 +1155,8 @@ msgstr "安全级别和检查"
 
 #: draksec:114
 #, c-format
-msgid "Configure authentication required to access Mandriva tools"
-msgstr "配置访问 Mandriva 工具所需的身份认证"
+msgid "Configure authentication required to access Mageia tools"
+msgstr "配置访问 Mageia 工具所需的身份认证"
 
 #: draksec:117
 #, c-format
@@ -1180,8 +1180,8 @@ msgstr "软件管理"
 
 #: draksec:150
 #, c-format
-msgid "Mandriva Update"
-msgstr "Mandriva 更新"
+msgid "Mageia Update"
+msgstr "Mageia 更新"
 
 #: draksec:151
 #, c-format
@@ -1300,25 +1300,19 @@ msgstr "没有发现声卡！"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: draksound:51
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
 "supported Sound Card is correctly plugged in.\n"
-"\n"
-"\n"
-"You can visit our hardware database at:\n"
-"\n"
-"\n"
-"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
-"在您的机器上没有检测到声卡。请检查您是否正确的安装了您的声卡, 它是否被 Linux "
-"支持。\n"
+"没有在您的计算机上检测到电视卡。请检查是否正确安装了 Linux 支持的视频/电视"
+"卡。\n"
 "\n"
 "\n"
-"您可以访问硬件数据库: \n"
+"请您访问我们的硬件数据库:\n"
 "\n"
 "\n"
-"http://www.mandrivalinux.com/zh_CN/hardware.php3"
+"http://www.mandarkelinux.com/zh_CN/hardware.php3"
 
 #: draksound:58
 #, c-format
@@ -1545,16 +1539,10 @@ msgstr "没有发现电视卡！"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: drakxtv:69
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
 "supported Video/TV Card is correctly plugged in.\n"
-"\n"
-"\n"
-"You can visit our hardware database at:\n"
-"\n"
-"\n"
-"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "没有在您的计算机上检测到电视卡。请检查是否正确安装了 Linux 支持的视频/电视"
 "卡。\n"
@@ -2403,8 +2391,8 @@ msgstr "、"
 
 #: logdrake:51
 #, c-format
-msgid "Mandriva Linux Tools Logs"
-msgstr "Mandriva Linux 工具日志"
+msgid "Mageia Linux Tools Logs"
+msgstr "Mageia Linux 工具日志"
 
 #: logdrake:65
 #, c-format
@@ -3305,6 +3293,25 @@ msgid "Regional Settings"
 msgstr "区域设置"
 
 #~ msgid ""
+#~ "No Sound Card has been detected on your machine. Please verify that a "
+#~ "Linux-supported Sound Card is correctly plugged in.\n"
+#~ "\n"
+#~ "\n"
+#~ "You can visit our hardware database at:\n"
+#~ "\n"
+#~ "\n"
+#~ "http://www.mandrivalinux.com/en/hardware.php3"
+#~ msgstr ""
+#~ "在您的机器上没有检测到声卡。请检查您是否正确的安装了您的声卡, 它是否被 "
+#~ "Linux 支持。\n"
+#~ "\n"
+#~ "\n"
+#~ "您可以访问硬件数据库: \n"
+#~ "\n"
+#~ "\n"
+#~ "http://www.mandrivalinux.com/zh_CN/hardware.php3"
+
+#~ msgid ""
 #~ "Display theme\n"
 #~ "under console"
 #~ msgstr ""