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, 67 insertions, 72 deletions

diff --git a/perl-install/install/help/po/zh_CN.po b/perl-install/install/help/po/zh_CN.po
index 7525aa257..b70524fbc 100644
--- a/perl-install/install/help/po/zh_CN.po
+++ b/perl-install/install/help/po/zh_CN.po
@@ -11,21 +11,21 @@ msgstr ""
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
 "PO-Revision-Date: 2006-04-22 15:41+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 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"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../help.pm:14
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandriva Linux distribution. If you agree with all the\n"
+"covers the entire Mageia distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
-"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandriva Linux发行"
+"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mageia发行"
 "版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重"
 "新启动您的计算机。"
 
@@ -175,15 +175,15 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:88
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mageia installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandriva Linux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "
+"Mageia 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "
 "DrakX 将弹出当前\n"
 "CD, 并要求您插入所需的正确 CD。如果您手中没有所请求的 CD, 只需单击\"%s\", 就"
 "不会安装相应的软件包了。"
@@ -193,12 +193,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandriva Linux, and to make "
-"it\n"
+"There are thousands of packages available for Mageia, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandriva Linux sorts package groups in four categories. You can mix and\n"
+"Mageia sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -248,11 +247,11 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"现在该指定要在您的系统中安装哪些程序了。Mandriva Linux\n"
+"现在该指定要在您的系统中安装哪些程序了。Mageia\n"
 "为您准备了数千个软件包。而为了使管理软件包更加容易, 软件包已经按相似程度分成"
 "了多个组。\n"
 "\n"
-"Mandriva Linux\n"
+"Mageia\n"
 "按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说, "
 "``工作站''中也可以选择安装``服务器''分类中的应用程序。\n"
 "\n"
@@ -310,7 +309,7 @@ msgstr "真正的最小安装"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If you choose to install packages individually, the installer will present\n"
 "a tree containing all packages classified by groups and subgroups. While\n"
@@ -323,10 +322,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandriva Linux will automatically start any installed\n"
+"installed. By default Mageia will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandriva Linux was\n"
+"security holes were discovered after this version of Mageia was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -354,9 +353,9 @@ msgstr ""
 "\n"
 "!!\n"
 "如果选择了服务器软件包, 不管是您特意选中的, 还是因为该软件包是某组的成员, 您"
-"都需要确认是否真的想要安装这些服务器。默认情况下, Mandriva Linux\n"
+"都需要确认是否真的想要安装这些服务器。默认情况下, Mageia\n"
 "会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的, 但完"
-"全有可能在此版本 Mandriva Linux\n"
+"全有可能在此版本 Mageia\n"
 "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途, 或者不知道为什"
 "么要安装这些服务, 请单击\"%s\"。单击\"%s\"将安装列出的服务, 并且启动时这些服"
 "务会被自动启动。\n"
@@ -473,11 +472,11 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:234
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mageia rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -531,7 +530,7 @@ msgid ""
 "want to check \"%s\" if your machine is to act as a server, or if you were\n"
 "not successful in getting the display configured."
 msgstr ""
-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandriva Linux\n"
+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mageia\n"
 "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
 "\n"
 "您将会看到不同的参数列表, 以便进行图形显示选项的更改来达到最佳状态。其中包"
@@ -638,14 +637,14 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:319
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandriva Linux\n"
+"You now need to decide where you want to install the Mageia\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandriva Linux system.\n"
+"Mageia system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -672,7 +671,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mageia and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -681,8 +680,7 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandriva Linux system, "
-"choose\n"
+"your hard drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -702,11 +700,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"在这一步里, 您需要决定您想要将 Mandriva Linux\n"
+"在这一步里, 您需要决定您想要将 Mageia\n"
 "操作系统安装到硬盘的何处。如果您的硬盘完全是空的, 或者已有操作系统使用了所有"
 "的空间, 您就必须要对硬盘进行分区。粗略的说, 对硬盘进行分区就是将其划分成几个"
 "逻辑上不同的部分, 以便创建安装您新的\n"
-"Mandriva Linux 系统所需的空间。\n"
+"Mageia 系统所需的空间。\n"
 "\n"
 "由于对硬盘进行分区通常是不可恢复的, 并且可能导致数据丢失, 所以对于没有经验的"
 "用户来说, 分区是十分危险的操作。所幸的是, DrakX\n"
@@ -729,7 +727,7 @@ msgstr ""
 "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢"
 "失, 但您必须事先对 Windows\n"
 "分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计"
-"算机上使用 Mandriva Linux 和 Microsoft\n"
+"算机上使用 Mageia 和 Microsoft\n"
 "Windows, 则推荐使用此选项。\n"
 "\n"
 "   注意, 在执行这一过程之后, 您原有的 Microsoft Windows 分区将会比先前小一"
@@ -737,7 +735,7 @@ msgstr ""
 "下可用来存储数据或安装新软件的剩余空间也会变少。\n"
 "\n"
 " * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区, 并将其替换为全新的 "
-"Mandriva Linux\n"
+"Mageia\n"
 "系统, 请选择此选项。请额外小心, 因为在您确认之后, 此操作无法撤销。\n"
 "\n"
 "   !! 如果您选择了此选项, 您硬盘上的全部数据都将被删除。 !!\n"
@@ -856,7 +854,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:408
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
 "reformat some of them and erase any data they contain. To do so, please\n"
@@ -875,7 +873,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandriva Linux operating system installation.\n"
+"Mageia operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -893,15 +891,15 @@ msgstr ""
 "\n"
 "如果您准备好格式化分区了, 请单击\"%s\"。\n"
 "\n"
-"如果您想要选择其它分区用于安装 Mandriva Linux 操作系统, 请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mageia 操作系统, 请单击\"%s\"。\n"
 "\n"
 "如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"By the time you install Mandriva Linux, it's likely that some packages will\n"
+"By the time you install Mageia, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -913,7 +911,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"在您安装 Mandriva Linux\n"
+"在您安装 Mageia\n"
 "的这个时候, 很可能有些软件包在发行之后已经更新。有些故障已经被修正, 有些安全"
 "问题已经被解决。为了让您能够享用这些更新, 您现在可以从 Internet\n"
 "上下载它们。如果您的 Internet 连接已经可以使用, 请选择\"%s\"。如果您愿意以后"
@@ -926,7 +924,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:450
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, DrakX will allow you to choose the security level you desire\n"
 "for your machine. As a rule of thumb, the security level should be set\n"
@@ -935,7 +933,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandriva Linux\n"
+"to change it later with the draksec tool, which is part of Mageia\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -945,7 +943,7 @@ msgstr ""
 "包含关键数据, 或者将直接暴露于 Internet\n"
 "之下, 则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"
 "\n"
-"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandriva Linux 控制中心"
+"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mageia 控制中心"
 "的一部分 draksec\n"
 "来更改安全级别。\n"
 "\n"
@@ -958,10 +956,10 @@ msgstr "安全管理员"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:464
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandriva Linux system. If partitions have already been\n"
+"installation of your Mageia system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -1031,7 +1029,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandriva Linux 系统。如"
+"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mageia 系统。如"
 "果已经定义了分区, 不管是先前安装的 GNU/Linux\n"
 "还是由其它分区工具划分的, 您都可以使用已有的分区。否则, 必须对硬盘分区进行定"
 "义。\n"
@@ -1126,11 +1124,11 @@ msgid "Toggle between normal/expert mode"
 msgstr "在正常/专家模式间切换"
 
 #: ../help.pm:536
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandriva Linux operating system.\n"
+"Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -1159,7 +1157,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小, 以便安装您新\n"
-"的 Mandriva Linux 操作系统。\n"
+"的 Mageia 操作系统。\n"
 "\n"
 "每个分区都是按“Linux 名称”、“Windows 名称”、“容量”顺序列出的。\n"
 "\n"
@@ -1198,13 +1196,13 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:572
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandriva Linux system:\n"
+"upgrade of an existing Mageia system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -1213,18 +1211,17 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandriva Linux system. Your current "
-"partitioning\n"
+"currently installed on your Mageia system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mageia systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandriva Linux version \"8.1\" is not recommended."
+"to Mageia version \"8.1\" is not recommended."
 msgstr ""
 "仅当在您的计算机上发现了已有的 GNU/Linux 分区, 才会激活这一步骤。\n"
 "\n"
-"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandriva Linux 系"
+"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mageia 系"
 "统：\n"
 "\n"
 " *\n"
@@ -1232,13 +1229,13 @@ msgstr ""
 "有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案, 或者更该文件"
 "系统, 您就应该使用此选项。\n"
 "\n"
-" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandriva Linux\n"
+" * \"%s\"：这一安装级别允许您更新目前安装在您 Mageia\n"
 "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可"
 "用, 与标准安装类似。\n"
 "\n"
-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandriva Linux 系统上工作正常。不"
+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mageia 系统上工作正常。不"
 "推荐在先于 \"8.1\" 版本的\n"
-"Mandriva Linux 系统上执行升级。"
+"Mageia 系统上执行升级。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:594
@@ -1277,7 +1274,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:612
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1293,8 +1290,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandriva Linux's use of UTF-8 "
-"will\n"
+"still under development. For that reason, Mageia's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -1332,7 +1328,7 @@ msgstr ""
 "\n"
 "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码, 该编码可支持所有现存的"
 "语言。但是, 在 GNU/Linux 下完全支持\n"
-"Unicode, 仍然在开发和完善中。由此原因, Mandriva Linux 会根据用户的选择是否使"
+"Unicode, 仍然在开发和完善中。由此原因, Mageia 会根据用户的选择是否使"
 "用 UTF-8：\n"
 "\n"
 " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、"
@@ -1484,10 +1480,10 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 #: ../help.pm:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
+"operating systems may offer you one, but Mageia offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -1508,11 +1504,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandriva Linux\n"
+"system you may change it by running PrinterDrake from the Mageia\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "现在, 应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择, 但 "
-"Mandriva Linux\n"
+"Mageia\n"
 "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
 "\n"
 " * \"%s\" --\n"
@@ -1531,7 +1527,7 @@ msgstr ""
 "还包括一个图形界面, 可用来打印或选择打印机选项, 以及管理打印机。\n"
 "\n"
 "如果您现在进行了选择, 但稍后又发现您并不喜欢所选择的打印系统, 可以轻松修改。"
-"只需从 Mandriva Linux Control Center中选择\n"
+"只需从 Mageia Control Center中选择\n"
 "PrinterDrake, 然后单击\"%s\"按钮。"
 
 #: ../help.pm:768
@@ -1635,8 +1631,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandriva Linux Control Center after the installation has finished to "
-"benefit\n"
+"Mageia Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -1653,7 +1648,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandriva Linux Control Center.\n"
+"Mageia Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -1696,7 +1691,7 @@ msgstr ""
 "分辨率。如果这不适合您的话, 请单击\"%s\"重新配置您的图形界面。\n"
 "\n"
 " * \"%s\"：如果您想要配置您的 Internet 或局域网访问, 现在就可以进行。请参考印"
-"刷文档或在安装完成后使用 Mandriva Linux\n"
+"刷文档或在安装完成后使用 Mageia\n"
 "Control Center来获得完整的在线帮助。\n"
 "\n"
 " * \"%s\"：如果您所安装的计算机位于代理服务器之后, 这里将允许您配置 HTTP 和 "
@@ -1709,7 +1704,7 @@ msgstr ""
 "指南''中的相应章节, 以获得关于防火墙设置的细节。\n"
 "\n"
 " * \"%s\"：如果您想要更改您的引导程序配置, 请单击此按钮。这仅适用于高级用户。"
-"请参考印刷文档或 Mandriva Linux 控制中心中关于引导程序配置的帮助。\n"
+"请参考印刷文档或 Mageia 控制中心中关于引导程序配置的帮助。\n"
 "\n"
 " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机"
 "用作服务器, 那么应该复查这一设置。"
@@ -1730,13 +1725,13 @@ msgid "Graphical Interface"
 msgstr "图形界面"
 
 #: ../help.pm:861
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
+"Mageia partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"请选择您为了安装新的 Mandriva Linux 分区想要删除的硬盘分区。\n"
+"请选择您为了安装新的 Mageia 分区想要删除的硬盘分区。\n"
 "注意, 该硬盘分区上的所有数据将丢失并且无法恢复！"
 
 #: ../help.pm:866