spell Mandrakelinux in one word

1 files changed, 42 insertions, 42 deletions

diff --git a/perl-install/share/po/help-zh_CN.pot b/perl-install/share/po/help-zh_CN.pot
index c19a2cb28..4a525267a 100644
--- a/perl-install/share/po/help-zh_CN.pot
+++ b/perl-install/share/po/help-zh_CN.pot
@@ -10,7 +10,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have 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 Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -46,7 +46,7 @@ msgid ""
 "Windows 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 Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -64,9 +64,9 @@ 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 ""
-"在这一步里，您需要决定您想要将 Mandrake Linux\n"
+"在这一步里，您需要决定您想要将 Mandrakelinux\n"
 "操作系统安装到硬盘的何处。如果您的硬盘完全是空的，或者已有操作系统使用了所有的空间，您就必须要对硬盘进行分区。粗略的说，对硬盘进行分区就是将其划分成几个逻辑上不同的部分，以便创建安装您新的\n"
-"Mandrake Linux 系统所需的空间。\n"
+"Mandrakelinux 系统所需的空间。\n"
 "\n"
 "\n"
 "对硬盘进行分区通常是不可恢复的。并且，如果在该硬盘上已经安装了操作系统的话，将可能最终导致数据丢失。所以，对于没有经验的用户来说，分区是十分危险的操作。所幸的是，DrakX\n"
@@ -82,13 +82,13 @@ msgstr ""
 " * \"%s\"：如果在您的硬盘上安装了 Microsoft Windows，而该操作系统占用了所有的空间，您就需要为 GNU/Linux\n"
 "创建剩余空间。要完成这一操作，您可以删除您的 Microsoft Windows 分区和数据(参看“删除整个磁盘”方案)，或者更改\n"
 "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢失，但您必须事先对 Windows\n"
-"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrake Linux 和 Microsoft\n"
+"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrakelinux 和 Microsoft\n"
 "Windows，则推荐使用此选项。\n"
 "\n"
 "   注意，在执行这一过程之后，您原有的 Microsoft Windows 分区将会被先前小一些。而您在 Microsoft Windows\n"
 "下可用来存储数据或安装新软件的剩余空间也会变少。\n"
 "\n"
-" * \"%s\"：如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 Mandrake Linux\n"
+" * \"%s\"：如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 Mandrakelinux\n"
 "系统，请选择此选项。请额外小心，因为在您确认之后，此操作无法撤销。\n"
 "\n"
 "   !! 如果您选择了此选项，您硬盘上的全部数据都将被删除。 !!\n"
@@ -234,7 +234,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -242,26 +242,26 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "仅当在您的计算机上发现了已有的 GNU/Linux 分区，才会激活这一步骤。\n"
 "\n"
-"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrake Linux 系统：\n"
+"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrakelinux 系统：\n"
 "\n"
 " *\n"
 "\"%s\"：总体来说，这将完全销毁旧系统。如果您想要更改硬盘的分区方案，或者更该文件系统，您就应该使用此选项。但是，根据您选择的分区方案，您可以让现有的数据免于覆盖。\n"
 "\n"
-" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrake Linux\n"
+" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrakelinux\n"
 "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可用，与标准安装类似。\n"
 "\n"
-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrake Linux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"
-"Mandrake Linux 系统上执行升级。"
+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"
+"Mandrakelinux 系统上执行升级。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -293,7 +293,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -319,7 +319,7 @@ msgstr ""
 "\n"
 " * \"%s\"：如果您在您的计算机上遇到了硬件问题(IRQ 冲突、不稳定、死机……)您可以选中此框来试着禁用 APIC。\n"
 "\n"
-"!! 注意：如果您在这里选择不安装开机引导程序(选择\"%s\")，您必须保证您可以通过其它方法引导您的 Mandrake Linux\n"
+"!! 注意：如果您在这里选择不安装开机引导程序(选择\"%s\")，您必须保证您可以通过其它方法引导您的 Mandrakelinux\n"
 "系统！不管修改任何选项，一定要清楚您在做什么！ !!\n"
 "\n"
 "单击此对话框中的\"%s\"按钮可为专家用户提供高级的选项。"
@@ -327,7 +327,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -339,7 +339,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"在您安装 Mandrake Linux\n"
+"在您安装 Mandrakelinux\n"
 "的这个时候，很可能有些软件包在发行之后已经更新。有些故障已经被修正，有些问题已经被解决。为了利用这些更新，您最好从 Internet\n"
 "上下载它们。如果您的 Internet 连接已经可以使用，请选择\"%s\"。如果您愿意以后再升级，请选择\"%s\"。\n"
 "\n"
@@ -351,7 +351,7 @@ msgstr ""
 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 Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -403,7 +403,7 @@ msgid ""
 "\"%s\" if your machine is to act as a server, or if you were not successful\n"
 "in getting the display configured."
 msgstr ""
-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrake Linux\n"
+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrakelinux\n"
 "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
 "\n"
 "您将会看到不同的参数列表，以便进行图形显示选项的更改来达到最佳状态。其中包括： 显示卡\n"
@@ -444,7 +444,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -468,7 +468,7 @@ msgid ""
 "system you may change it by running PrinterDrake from the Mandrake Control\n"
 "Center and clicking the expert button."
 msgstr ""
-"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 Mandrake Linux\n"
+"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 Mandrakelinux\n"
 "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
 "\n"
 " * \"%s\" --\n"
@@ -488,12 +488,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -535,10 +535,10 @@ msgid ""
 "to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
-"现在该指定要在您的系统中安装哪些程序了。Mandrake Linux\n"
+"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"
 "为您准备了数千个软件包。而为了使管理软件包更加容易，软件包已经按组重新进行了分配。\n"
 "\n"
-"软件包已经根据您计算机的不同用途被分成了不同的组。Mandrake Linux\n"
+"软件包已经根据您计算机的不同用途被分成了不同的组。Mandrakelinux\n"
 "将软件包组分成了四个类别。您可以从不同的类别混合选择应用程序。也就是说，``工作站''中也可以选择安装``开发''分类中的应用程序。\n"
 "\n"
 " * \"%s\"：如果您计划将您的计算机用作工作站，请选择工作站分类中的一个或多个组。\n"
@@ -565,11 +565,11 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux 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 correct CD as required."
 msgstr ""
-"Mandrake Linux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，DrakX 将弹出当前\n"
+"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，DrakX 将弹出当前\n"
 "CD，并要求您插入所需的正确 CD。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -646,10 +646,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 will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux 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 that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -675,7 +675,7 @@ msgstr ""
 "只要您在左侧的树中选择了软件包，右侧就会出现该软件包用途的描述。\n"
 "\n"
 "!! 如果选择了服务器软件包，不管是您特意选中的，还是因为该软件包是某组的成员，您都需要确认是否真的想要安装这些服务器。默认情况下，Mandrake\n"
-"Linux 会在启动时自动启动所有安装的服务。尽管在发行版送出时这些服务是安全的，但完全有可能在此版本 Mandrake Linux\n"
+"Linux 会在启动时自动启动所有安装的服务。尽管在发行版送出时这些服务是安全的，但完全有可能在此版本 Mandrakelinux\n"
 "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途，或者不知道为什么要安装这些服务，请单击\"%s\"。单击\"%s\"将安装列出的服务，并且在默认启动时这些服务会被自动启动。\n"
 "!!\n"
 "\n"
@@ -846,7 +846,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -878,7 +878,7 @@ msgstr ""
 "单击\"%s\"按钮以后，您可以选择要在您的工作站上安装哪些额外的语言，即为系统文档和应用程序安装特定语言的文件。例如，如果您的计算机要为繁体中文的用户提供服务，请在树视图中选择简体中文作为默认语言，然后在高级选项中选择\"%s\"。\n"
 "\n"
 "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码，该编码可支持所有现存的语言。但是，在 GNU/Linux 下完全支持\n"
-"Unicode，仍然在开发和完善中。由此原因，Mandrake Linux 会根据用户的选择是否使用 UTF-8：\n"
+"Unicode，仍然在开发和完善中。由此原因，Mandrakelinux 会根据用户的选择是否使用 UTF-8：\n"
 "\n"
 " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、泰语、希腊语、土耳其语及大多数 iso-8859-2\n"
 "语言)，则会默认使用强制编码；\n"
@@ -1104,11 +1104,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
-"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrake Linux\n"
+"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux\n"
 "发行版。如果您同意其中的全部条款，请选中\"%s\"框。如果不同意，单击\"%s\"按钮将重新启动您的计算机。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1135,7 +1135,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -1150,7 +1150,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -1327,7 +1327,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -1343,7 +1343,7 @@ msgstr ""
 "\n"
 "如果您准备好格式化分区了，请单击 \"%s\"。\n"
 "\n"
-"如果您想要选择其它分区用于安装 Mandrake Linux 操作系统，请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统，请单击\"%s\"。\n"
 "\n"
 "如果您想要选择要检测磁盘上的坏块，请单击单击\"%s\"。"
 
@@ -1430,7 +1430,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux 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"
@@ -1500,7 +1500,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrake Linux 系统。如果已经定义了分区，不管是先前安装的 GNU/Linux\n"
+"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果已经定义了分区，不管是先前安装的 GNU/Linux\n"
 "还是由其它分区工具划分的，您都可以使用已有的分区。否则，必须对硬盘分区进行定义。\n"
 "\n"
 "要创建分区，您必须先选择硬盘。您可以单击 ``hda'' 选择第一个 IDE 硬盘进行分区，``hdb'' 选择第二个 IDE 硬盘，``sda''\n"