switch from MandrakeSoft to Mandriva

1 files changed, 245 insertions, 245 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index d28b4518b..245016d13 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2005-04-21 14:27+0200\n"
 "PO-Revision-Date: 2005-03-27 06:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
+"Language-Team: Mandrivalinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,13 +64,13 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB 密钥盘好像启用了写保护, 但是现在无法安全拔出该密钥盘。\n"
 "\n"
 "\n"
 "请单击按钮重新启动计算机, 拔出该密钥盘之后, 去掉写保护后再插入, \n"
-"然后再次调用 Mandrake Move。"
+"然后再次调用 Mandriva Move。"
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -88,7 +88,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "您的 USB 密钥盘中没有有效的 Windows(FAT) 分区。而要继续使用此系\n"
@@ -98,13 +98,13 @@ msgstr ""
 "\n"
 "\n"
 "没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
-"操作系统一样使用 Mandrake Move。"
+"操作系统一样使用 Mandriva Move。"
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -112,17 +112,17 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "我们没有在您的系统中检测到任何 USB 密钥盘。如果您现在插入一块这\n"
-"样的盘的话, Mandrake Move 将可以将您主目录和系统级配置中的数据透\n"
+"样的盘的话, Mandriva Move 将可以将您主目录和系统级配置中的数据透\n"
 "明的保存在该密钥盘中, 以备下次启动此计算机之用。注意: 如果您刚刚\n"
 "插入了密钥盘, 请在再次检测之前稍等几秒。\n"
 "\n"
 "\n"
 "没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
-"操作系统一样使用 Mandrake Move。"
+"操作系统一样使用 Mandriva Move。"
 
 #: ../move/move.pm:494
 #, c-format
@@ -246,7 +246,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -261,7 +261,7 @@ msgstr ""
 "%s\n"
 "\n"
 "这可能是 USB 密钥盘中的系统配置文件已经损坏。此时只需删除这些文\n"
-"件, 然后重新启动 Mandrake Move 即可解决此问题。要完成这一操作, \n"
+"件, 然后重新启动 Mandriva Move 即可解决此问题。要完成这一操作, \n"
 "只需点击下面的按钮。\n"
 "\n"
 "\n"
@@ -1287,11 +1287,11 @@ msgstr "语言选择"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux 可以支持多种语言。请选择您想要安装的语言。\n"
+"Mandrivalinux 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
 #: any.pm:752 any.pm:773 help.pm:647
@@ -3648,11 +3648,11 @@ msgstr "启用无线电支持"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux 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 ""
-"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux发行"
+"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrivalinux发行"
 "版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重"
 "新启动您的计算机。"
 
@@ -3818,13 +3818,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 ""
-"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "
+"Mandrivalinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "
 "DrakX 将弹出当前\n"
 "CD, 并要求您插入所需的正确 CD。如果您手中没有所请求的 CD, 只需单击\"%s\", 就"
 "不会安装相应的软件包了。"
@@ -3835,11 +3835,11 @@ msgstr ""
 #, 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 Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux 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"
@@ -3890,11 +3890,11 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"
+"现在该指定要在您的系统中安装哪些程序了。Mandrivalinux\n"
 "为您准备了数千个软件包。而为了使管理软件包更加容易, 软件包已经按相似程度分成"
 "了多个组。\n"
 "\n"
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说, "
 "``工作站''中也可以选择安装``服务器''分类中的应用程序。\n"
 "\n"
@@ -3992,10 +3992,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 Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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 Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux 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"
@@ -4023,9 +4023,9 @@ msgstr ""
 "\n"
 "!!\n"
 "如果选择了服务器软件包, 不管是您特意选中的, 还是因为该软件包是某组的成员, 您"
-"都需要确认是否真的想要安装这些服务器。默认情况下, Mandrakelinux\n"
+"都需要确认是否真的想要安装这些服务器。默认情况下, Mandrivalinux\n"
 "会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的, 但完"
-"全有可能在此版本 Mandrakelinux\n"
+"全有可能在此版本 Mandrivalinux\n"
 "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途, 或者不知道为什"
 "么要安装这些服务, 请单击\"%s\"。单击\"%s\"将安装列出的服务, 并且启动时这些服"
 "务会被自动启动。\n"
@@ -4172,7 +4172,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4226,7 +4226,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 图形界面的核心部分。Mandrakelinux\n"
+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrivalinux\n"
 "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
 "\n"
 "您将会看到不同的参数列表, 以便进行图形显示选项的更改来达到最佳状态。其中包"
@@ -4338,12 +4338,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\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"
-"Mandrakelinux system.\n"
+"Mandrivalinux 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"
@@ -4370,7 +4370,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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4379,7 +4379,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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4399,11 +4399,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 ""
-"在这一步里, 您需要决定您想要将 Mandrakelinux\n"
+"在这一步里, 您需要决定您想要将 Mandrivalinux\n"
 "操作系统安装到硬盘的何处。如果您的硬盘完全是空的, 或者已有操作系统使用了所有"
 "的空间, 您就必须要对硬盘进行分区。粗略的说, 对硬盘进行分区就是将其划分成几个"
 "逻辑上不同的部分, 以便创建安装您新的\n"
-"Mandrakelinux 系统所需的空间。\n"
+"Mandrivalinux 系统所需的空间。\n"
 "\n"
 "由于对硬盘进行分区通常是不可恢复的, 并且可能导致数据丢失, 所以对于没有经验的"
 "用户来说, 分区是十分危险的操作。所幸的是, DrakX\n"
@@ -4426,7 +4426,7 @@ msgstr ""
 "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢"
 "失, 但您必须事先对 Windows\n"
 "分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计"
-"算机上使用 Mandrakelinux 和 Microsoft\n"
+"算机上使用 Mandrivalinux 和 Microsoft\n"
 "Windows, 则推荐使用此选项。\n"
 "\n"
 "   注意, 在执行这一过程之后, 您原有的 Microsoft Windows 分区将会比先前小一"
@@ -4434,7 +4434,7 @@ msgstr ""
 "下可用来存储数据或安装新软件的剩余空间也会变少。\n"
 "\n"
 " * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区, 并将其替换为全新的 "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "系统, 请选择此选项。请额外小心, 因为在您确认之后, 此操作无法撤销。\n"
 "\n"
 "   !! 如果您选择了此选项, 您硬盘上的全部数据都将被删除。 !!\n"
@@ -4589,7 +4589,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"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux 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."
@@ -4607,7 +4607,7 @@ msgstr ""
 "\n"
 "如果您准备好格式化分区了, 请单击\"%s\"。\n"
 "\n"
-"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统, 请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mandrivalinux 操作系统, 请单击\"%s\"。\n"
 "\n"
 "如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。"
 
@@ -4625,7 +4625,7 @@ msgstr "上一步"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, 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"
@@ -4637,7 +4637,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"在您安装 Mandrakelinux\n"
+"在您安装 Mandrivalinux\n"
 "的这个时候, 很可能有些软件包在发行之后已经更新。有些故障已经被修正, 有些安全"
 "问题已经被解决。为了让您能够享用这些更新, 您现在可以从 Internet\n"
 "上下载它们。如果您的 Internet 连接已经可以使用, 请选择\"%s\"。如果您愿意以后"
@@ -4666,7 +4666,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 Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4676,7 +4676,7 @@ msgstr ""
 "包含关键数据, 或者将直接暴露于 Internet\n"
 "之下, 则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"
 "\n"
-"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandrakelinux 控制中心的"
+"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandrivalinux 控制中心的"
 "一部分 draksec\n"
 "来更改安全级别。\n"
 "\n"
@@ -4693,7 +4693,7 @@ msgstr "安全管理员"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4763,7 +4763,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果"
+"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandrivalinux 系统。如果"
 "已经定义了分区, 不管是先前安装的 GNU/Linux\n"
 "还是由其它分区工具划分的, 您都可以使用已有的分区。否则, 必须对硬盘分区进行定"
 "义。\n"
@@ -4837,7 +4837,7 @@ msgstr "在正常/专家模式间切换"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4866,7 +4866,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小, 以便安装您新\n"
-"的 Mandrakelinux 操作系统。\n"
+"的 Mandrivalinux 操作系统。\n"
 "\n"
 "每个分区都是按“Linux 名称”、“Windows 名称”、“容量”顺序列出的。\n"
 "\n"
@@ -4913,7 +4913,7 @@ msgid ""
 "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 Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux 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"
@@ -4922,30 +4922,30 @@ 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 Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux 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 Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "仅当在您的计算机上发现了已有的 GNU/Linux 分区, 才会激活这一步骤。\n"
 "\n"
-"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandrakelinux 系统：\n"
+"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandrivalinux 系统：\n"
 "\n"
 " *\n"
 "\"%s\"：总体来说, 这将完全销毁旧系统。但是, 根据您选择的分区方案, 您可以让现"
 "有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案, 或者更该文件"
 "系统, 您就应该使用此选项。\n"
 "\n"
-" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrakelinux\n"
+" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrivalinux\n"
 "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可"
 "用, 与标准安装类似。\n"
 "\n"
-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不"
+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrivalinux 系统上工作正常。不"
 "推荐在先于 \"8.1\" 版本的\n"
-"Mandrakelinux 系统上执行升级。"
+"Mandrivalinux 系统上执行升级。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -5002,7 +5002,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, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux'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"
@@ -5040,7 +5040,7 @@ msgstr ""
 "\n"
 "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码, 该编码可支持所有现存的"
 "语言。但是, 在 GNU/Linux 下完全支持\n"
-"Unicode, 仍然在开发和完善中。由此原因, Mandrakelinux 会根据用户的选择是否使"
+"Unicode, 仍然在开发和完善中。由此原因, Mandrivalinux 会根据用户的选择是否使"
 "用 UTF-8：\n"
 "\n"
 " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、"
@@ -5269,7 +5269,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux 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"
@@ -5290,11 +5290,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 Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "现在, 应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择, 但 "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
 "\n"
 " * \"%s\" --\n"
@@ -5313,7 +5313,7 @@ msgstr ""
 "还包括一个图形界面, 可用来打印或选择打印机选项, 以及管理打印机。\n"
 "\n"
 "如果您现在进行了选择, 但稍后又发现您并不喜欢所选择的打印系统, 可以轻松修改。"
-"只需从 Mandrakelinux Control Center中选择\n"
+"只需从 Mandrivalinux Control Center中选择\n"
 "PrinterDrake, 然后单击\"%s\"按钮。"
 
 #: help.pm:765
@@ -5430,7 +5430,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"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux 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"
@@ -5447,7 +5447,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"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux 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"
@@ -5490,7 +5490,7 @@ msgstr ""
 "分辨率。如果这不适合您的话, 请单击\"%s\"重新配置您的图形界面。\n"
 "\n"
 " * \"%s\"：如果您想要配置您的 Internet 或局域网访问, 现在就可以进行。请参考印"
-"刷文档或在安装完成后使用 Mandrakelinux\n"
+"刷文档或在安装完成后使用 Mandrivalinux\n"
 "Control Center来获得完整的在线帮助。\n"
 "\n"
 " * \"%s\"：如果您所安装的计算机位于代理服务器之后, 这里将允许您配置 HTTP 和 "
@@ -5503,7 +5503,7 @@ msgstr ""
 "指南''中的相应章节, 以获得关于防火墙设置的细节。\n"
 "\n"
 " * \"%s\"：如果您想要更改您的引导程序配置, 请单击此按钮。这仅适用于高级用户。"
-"请参考印刷文档或 Mandrakelinux 控制中心中关于引导程序配置的帮助。\n"
+"请参考印刷文档或 Mandrivalinux 控制中心中关于引导程序配置的帮助。\n"
 "\n"
 " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机"
 "用作服务器, 那么应该复查这一设置。"
@@ -5563,10 +5563,10 @@ msgstr "服务"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"请选择您为了安装新的 Mandrakelinux 分区想要删除的硬盘分区。\n"
+"请选择您为了安装新的 Mandrivalinux 分区想要删除的硬盘分区。\n"
 "注意, 该硬盘分区上的所有数据将丢失并且无法恢复！"
 
 #: help.pm:863
@@ -5909,11 +5909,11 @@ msgstr "正在计算 Windows 分区的大小"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "您的 Windows 分区有太多碎片, 请重新启动, 进入 Windows, 运行磁盘碎片整理程序, "
-"然后重新开始安装 Mandrakelinux"
+"然后重新开始安装 Mandrivalinux"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6024,19 +6024,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6058,7 +6058,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6066,14 +6066,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6083,7 +6083,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6103,10 +6103,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6117,11 +6117,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6137,18 +6137,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 Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "简介\n"
 "\n"
-"Mandrakelinux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"
-"产品包括但不限于与 Mandrakelinux 发行版的操作系统和各个部分有关的程序、方法、"
+"Mandrivalinux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"
+"产品包括但不限于与 Mandrivalinux 发行版的操作系统和各个部分有关的程序、方法、"
 "规则和文档。\n"
 "\n"
 "\n"
 "1. 许可协议\n"
 "\n"
-"请仔细阅读此文档。此文档是您与 Mandrakesoft S.A. 之间关于本软件产品的一个许可"
+"请仔细阅读此文档。此文档是您与 Mandriva S.A. 之间关于本软件产品的一个许可"
 "协议。如果您安装、复制或使用本软件产品, 即表明您接受并完全同意遵守本许可协议"
 "的内容和条件。如果您不同意本许可协议中的任何部分, 您将无权安装、复制或使用本"
 "软件产品任何试图不遵守本许可协议的内容和条件, 而安装、复制或使用本软件产品的"
@@ -6159,15 +6159,15 @@ msgstr ""
 "2. 有限担保\n"
 "\n"
 "本软件产品和附带的文档是一经发表即“不再修改”, 在法律允许的范围内没有任何担"
-"保。在法律允许的范围内 Mandrakesoft S.A. 对因使用或不能使用本软件产品而引起的"
+"保。在法律允许的范围内 Mandriva S.A. 对因使用或不能使用本软件产品而引起的"
 "特定、偶然、直接、间接的无论任何损失(包括但不限于生意的丧失、生意的中断、财务"
 "损失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任, 即使 "
-"Mandrakesoft S.A. 已经被告知有发生这种损失的可能性。\n"
+"Mandriva S.A. 已经被告知有发生这种损失的可能性。\n"
 "\n"
 "在某些国家中关于拥有和使用被禁止的软件的有限责任\n"
 "\n"
-"在法律允许的范围内 Mandrakesoft S.A. 或其分销者对因拥有或使用, 或从任何 "
-"Mandrakelinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、"
+"在法律允许的范围内 Mandriva S.A. 或其分销者对因拥有或使用, 或从任何 "
+"Mandrivalinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、"
 "偶然、直接、间接的无论任何损失 (包括但不限于生意的丧失、生意的中断、财务损"
 "失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任。这种有限"
 "责任适用但不限于本软件产品所包括的强大数据加密组件。\n"
@@ -6179,17 +6179,17 @@ msgstr ""
 "共许可协议(GNU General Public Licence), 此后简称为“GPL”, 或其它类似的许可协议"
 "的条款和条件。这些许可协议大多允许您使用、复制、修改或重新发表协议所覆盖的部"
 "分。使用这些软件之前, 请仔细阅读有关许可协议的条款和条件。如果对任何部分的许"
-"可协议有疑问, 应该与该部分的作者联系, Mandrakesoft 无法解答这些问题。由 "
-"Mandrakesoft S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"
+"可协议有疑问, 应该与该部分的作者联系, Mandriva 无法解答这些问题。由 "
+"Mandriva S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"
 "作的文档采用一个特别的许可协议。详情见有关的文档。\n"
 "\n"
 "\n"
 "4. 知识产权\n"
 "\n"
 "本软件产品的各个组件的所有权利属于它们各自的作者, 并受到所有可适用于软件程序"
-"的知识产权和版权法律的保护。Mandrakesoft S.A. 保留对本软件产品进行全面或部分"
+"的知识产权和版权法律的保护。Mandriva S.A. 保留对本软件产品进行全面或部分"
 "的更改或调整的权利, 不论采用任何方法, 不论出于任何目的。\n"
-"“Mandrake”, “Mandrakelinux”和相关的标志是 Mandrakesoft S.A. 的商标。\n"
+"“Mandrake”, “Mandrivalinux”和相关的标志是 Mandriva S.A. 的商标。\n"
 "\n"
 "\n"
 "5. 适用法律\n"
@@ -6197,7 +6197,7 @@ msgstr ""
 "如果本协议的任何部分被法院裁定为无效、非法或不适用, 该部分将被排除在本协议之"
 "外。您仍然需要遵守本协议的其它可使用的部分。本协议的内容和条件受法国法律管"
 "辖。有关本协议的任何争议最好在法庭外解决。作为最后的手段, 争议将被提交法国巴"
-"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandrakesoft S.A.。\n"
+"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandriva S.A.。\n"
 "\n"
 "以上中文翻译仅为方便您理解, 不能作为法律用途, 请以协议英文文本为准。\n"
 
@@ -6278,7 +6278,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6286,19 +6286,19 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "恭喜。安装完成了。\n"
 "请取出启动介质, 然后按 ENTER 重新启动。\n"
 "\n"
 "\n"
-"要了解此版本 Mandrakelinux 的修订, 请访问以下勘误表: \n"
+"要了解此版本 Mandrivalinux 的修订, 请访问以下勘误表: \n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"关于安装后如何配置您的系统, 请查看 Mandrakelinux 官方用户手册。"
+"关于安装后如何配置您的系统, 请查看 Mandrivalinux 官方用户手册。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6332,11 +6332,11 @@ msgstr "进入步骤“%s”\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您的系统资源不足。您在安装 Mandrakelinux 时可能遇到问题。\n"
+"您的系统资源不足。您在安装 Mandrivalinux 时可能遇到问题。\n"
 "如果这样, 您可以尝试文本模式的安装。\n"
 "在从光盘启动后按“F1”键, 然后输入“text”。"
 
@@ -6865,8 +6865,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "正在连接 Mandrakelinux 网站以获得镜像网站列表..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "正在连接 Mandrivalinux 网站以获得镜像网站列表..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7083,8 +7083,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux 安装 %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux 安装 %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9669,13 +9669,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "“Drak 防火墙”配置\n"
 "\n"
-"此程序可为您的 Mandrakelinux 机器配置个人防火墙。\n"
+"此程序可为您的 Mandrivalinux 机器配置个人防火墙。\n"
 "如果要配置强大的专用防火墙, 请考虑使用专门的\n"
 "MandrakeSecurity 防火墙发行版。"
 
@@ -13588,11 +13588,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"运行 SannerDrake (Mandrakelinux 控制中心中的硬件/扫描仪)可在网络上共向您的扫"
+"运行 SannerDrake (Mandrivalinux 控制中心中的硬件/扫描仪)可在网络上共向您的扫"
 "描仪。\n"
 "\n"
 
@@ -15423,32 +15423,32 @@ msgstr "停止"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>何为 Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>何为 Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "<b>Mandrakelinux</b> 欢迎您!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "<b>Mandrivalinux</b> 欢迎您!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux 是一整套系统的有机组成, 其中不仅包括<b>操作系统</b>(基于 Linux "
+"Mandrivalinux 是一整套系统的有机组成, 其中不仅包括<b>操作系统</b>(基于 Linux "
 "内核), 还包括您梦寐以求的<b>海量应用程序</b>。"
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux 是现今最<b>友好</b>的 Linux 发行版之一。它还是世界上<b>使用最为"
+"Mandrivalinux 是现今最<b>友好</b>的 Linux 发行版之一。它还是世界上<b>使用最为"
 "广泛</b>的 Linux 发行版之一!"
 
 #: share/advertising/02.pl:13
@@ -15464,13 +15464,13 @@ msgstr "欢迎进入<b>开放源代码世界</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux 专注于开放源代码模型。这意味着您现在看到的新版本就是 "
-"<b>Mandrakesoft 开发者团队</b>和来自<b>世界各地 Mandrakelinux 贡献者社区</b>"
+"Mandrivalinux 专注于开放源代码模型。这意味着您现在看到的新版本就是 "
+"<b>Mandriva 开发者团队</b>和来自<b>世界各地 Mandrivalinux 贡献者社区</b>"
 "共同努力的结果。"
 
 #: share/advertising/02.pl:19
@@ -15489,9 +15489,9 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"发行版中包含的绝大多数软件以及 Mandrakelinux 专有的全部工具都以 <b>GPL</b> 协"
+"发行版中包含的绝大多数软件以及 Mandrivalinux 专有的全部工具都以 <b>GPL</b> 协"
 "议放出。"
 
 #: share/advertising/03.pl:17
@@ -15521,13 +15521,13 @@ msgstr "<b>加入社区</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux 拥有的用户和开发者<b>社区人数众多</b>。这样的社区所扮演的角色十"
-"分广泛, 从错误报告到开发新程序。社区在 Mandrakelinux 世界中扮演着<b>至关重要"
+"Mandrivalinux 拥有的用户和开发者<b>社区人数众多</b>。这样的社区所扮演的角色十"
+"分广泛, 从错误报告到开发新程序。社区在 Mandrivalinux 世界中扮演着<b>至关重要"
 "</b>的角色。"
 
 #: share/advertising/04.pl:17
@@ -15549,11 +15549,11 @@ msgstr "<b>下载版本</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"您正在安装 <b>Mandrakelinux 下载版本</b>。这是一种免费下载的版本, "
-"Mandrakesoft 想要将其贡献给<b>每个人</b>。"
+"您正在安装 <b>Mandrivalinux 下载版本</b>。这是一种免费下载的版本, "
+"Mandriva 想要将其贡献给<b>每个人</b>。"
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -15580,8 +15580,8 @@ msgstr "\t* <b>私有软件</b> (诸如 Acrobat® Reader®、RealPlayer®、Flas
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
-msgstr "您也无法访问 Mandrakesoft 其它产品中<b>所赠送的增值服务</b>。"
+"Mandriva products either."
+msgstr "您也无法访问 Mandriva 其它产品中<b>所赠送的增值服务</b>。"
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -15590,8 +15590,8 @@ msgstr "<b>探索, 您的第一个 Linux 桌面</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "您正在安装 <b>Mandrakelinux 探索版</b>。"
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "您正在安装 <b>Mandrivalinux 探索版</b>。"
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -15612,17 +15612,17 @@ msgstr "<b>专业版, Linux 终极桌面</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "您正在安装 <b>Mandrakelinux 专业版</b>。"
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "您正在安装 <b>Mandrivalinux 专业版</b>。"
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"专业版是 Mandrakesoft 的<b>金牌 Linux 桌面</b>产品。除了是最易用最友好的 "
+"专业版是 Mandriva 的<b>金牌 Linux 桌面</b>产品。除了是最易用最友好的 "
 "Linux 发行版, 专业版还包括了<b>数千应用程序</b> - 从最流行程序到最专业的程序"
 "一应俱全。"
 
@@ -15633,8 +15633,8 @@ msgstr "<b>专业版+, 桌面和服务器的 Linux 解决方案</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "您正在安装 <b>Mandrakelinux 专业版+</b>。"
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "您正在安装 <b>Mandrivalinux 专业版+</b>。"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -15649,20 +15649,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft 产品</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva 产品</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
-msgstr "<b>Mandrakesoft</b> 开发了广泛的 <b>Mandrakelinux</b> 产品线。"
+msgstr "<b>Mandriva</b> 开发了广泛的 <b>Mandrivalinux</b> 产品线。"
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux 产品包括:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux 产品包括:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15682,68 +15682,68 @@ msgstr "\t* <b>专业版+</b>, 桌面和服务器的 Linux 解决方案。"
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux for x86-64</b>, 充分发挥您 64 位处理器性能的 "
-"Mandrakelinux 解决方案。"
+"\t* <b>Mandrivalinux for x86-64</b>, 充分发挥您 64 位处理器性能的 "
+"Mandrivalinux 解决方案。"
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft 产品(随身产品)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva 产品(随身产品)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft 开发了两款随身产品, 使得您可以在不安装的情况下<b>在任何计算机上"
-"</b>使用 Mandrakelinux:"
+"Mandriva 开发了两款随身产品, 使得您可以在不安装的情况下<b>在任何计算机上"
+"</b>使用 Mandrivalinux:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
-msgstr "\t* <b>Move</b>, 直接从可启动光盘中运行的 Mandrakelinux 发行版。"
+msgstr "\t* <b>Move</b>, 直接从可启动光盘中运行的 Mandrivalinux 发行版。"
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, 预装于超强压缩的 LaCie 移动硬盘中的 Mandrakelinux 发"
+"\t* <b>GlobeTrotter</b>, 预装于超强压缩的 LaCie 移动硬盘中的 Mandrivalinux 发"
 "行版。"
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft 产品(专业解决方案)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva 产品(专业解决方案)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
-msgstr "下面是 Mandrakesoft 专为适合<b>专业需求</b>所设计的产品:"
+msgstr "下面是 Mandriva 专为适合<b>专业需求</b>所设计的产品:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>企业桌面</b>, 商务适用的 Mandrakelinux 桌面。"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>企业桌面</b>, 商务适用的 Mandrivalinux 桌面。"
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>企业服务器</b>, Mandrakelinux 服务器解决方案。"
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>企业服务器</b>, Mandrivalinux 服务器解决方案。"
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>多网络防火墙</b>, Mandrakelinux 安全解决方案。"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>多网络防火墙</b>, Mandrivalinux 安全解决方案。"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -15786,9 +15786,9 @@ msgstr "<b>选择您喜爱的桌面环境</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"在专业版中, 您可以选择各种<b>图形桌面环境</b>。而 Mandrakesoft 为您预设的桌面"
+"在专业版中, 您可以选择各种<b>图形桌面环境</b>。而 Mandriva 为您预设的桌面"
 "环境是 <b>KDE</b>。"
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15813,9 +15813,9 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"在专业版+中, 您可以选择各种<b>图形桌面环境</b>。而 Mandrakesoft 为您预设的桌"
+"在专业版+中, 您可以选择各种<b>图形桌面环境</b>。而 Mandriva 为您预设的桌"
 "面环境是 <b>KDE</b>。"
 
 #: share/advertising/14.pl:15
@@ -15938,10 +15938,10 @@ msgstr "<b>享受广泛的应用程序</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"在 Mandrakelinux 菜单中, 您可<b>轻而易举</b>的找到完成<b>各种任务</b>的应用程"
+"在 Mandrivalinux 菜单中, 您可<b>轻而易举</b>的找到完成<b>各种任务</b>的应用程"
 "序:"
 
 #: share/advertising/18.pl:16
@@ -16186,17 +16186,17 @@ msgstr "\t* <b>Postfix</b> 和 <b>Sendmail</b>：流行而强大的邮件服务�
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux 控制中心</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux 控制中心</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux 控制中心</b>是 Mandrakelinux 特有工具的大集合, 它可显著简化"
+"<b>Mandrivalinux 控制中心</b>是 Mandrivalinux 特有工具的大集合, 它可显著简化"
 "对计算机的配置。"
 
 #: share/advertising/25.pl:17
@@ -16220,14 +16220,14 @@ msgstr "<b>开放源代码模型</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "与其它软件编程方式相同, 开放源代码软件<b>需要时间和人力</b>进行开发。为了遵从"
-"开放源代码理念, Mandrakesoft 会销售增值产品和服务, 以便进一步<b>改进 "
-"Mandrakelinux</b>。如果您想要<b>支持开放源代码理念</b>以及 Mandrakelinux 的开"
+"开放源代码理念, Mandriva 会销售增值产品和服务, 以便进一步<b>改进 "
+"Mandrivalinux</b>。如果您想要<b>支持开放源代码理念</b>以及 Mandrivalinux 的开"
 "发, <b>请</b>考虑购买我们的产品或服务！"
 
 #: share/advertising/27.pl:13
@@ -16238,10 +16238,10 @@ msgstr "<b>在线商店</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"要了解关于 Mandrakesoft 产品和服务的更多信息, 您可以参观我们的<b>电子商务平台"
+"要了解关于 Mandriva 产品和服务的更多信息, 您可以参观我们的<b>电子商务平台"
 "</b>。"
 
 #: share/advertising/27.pl:17
@@ -16263,21 +16263,21 @@ msgstr "驻足 <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
-msgstr "<b>Mandrakeclub</b> 是您 Mandrakelinux 产品的<b>绝佳拍档</b>..."
+msgstr "<b>Mandriva Club</b> 是您 Mandrivalinux 产品的<b>绝佳拍档</b>..."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
-msgstr "加入 Mandrakeclub, 您可充分享受各项<b>超值回馈</b>, 例如："
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
+msgstr "加入 Mandriva Club, 您可充分享受各项<b>超值回馈</b>, 例如："
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16297,36 +16297,36 @@ msgstr "\t* 访问<b>商业应用程序</b>(例如 NVIDIA® 或 ATI™ 的驱动
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* 参与 Mandrakelinux <b>用户论坛</b>。"
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* 参与 Mandrivalinux <b>用户论坛</b>。"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
-"\t* <b>优先访问</b>, 在公众之前优先访问 Mandrakelinux <b>ISO 映像</b>。"
+"\t* <b>优先访问</b>, 在公众之前优先访问 Mandrivalinux <b>ISO 映像</b>。"
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
-msgstr "<b>Mandrakeonline</b> 是 Mandrakesoft 为客户特别开发的全新金牌服务。"
+msgstr "<b>Mandriva Online</b> 是 Mandriva 为客户特别开发的全新金牌服务。"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline 为<b>轻松更新</b>您的 Mandrakelinux 系统提供了范围广泛的增值服"
+"Mandriva Online 为<b>轻松更新</b>您的 Mandrivalinux 系统提供了范围广泛的增值服"
 "务："
 
 #: share/advertising/29.pl:18
@@ -16349,38 +16349,38 @@ msgstr "\t* 灵活的<b>按计划</b>更新。"
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* 通过一个账户管理<b>您所有的 Mandrakelinux 系统</b>。"
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* 通过一个账户管理<b>您所有的 Mandrivalinux 系统</b>。"
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "您需要<b>帮助</b>吗?您可在<b>我们的技术支持平台</b> www.mandrakeexpert.com "
-"与 Mandrakesoft 的技术专家会面。"
+"与 Mandriva 的技术专家会面。"
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"感谢<b>具有资质认证的 Mandrakelinux 专家</b>的帮助, 您将能够节省大量时间。"
+"感谢<b>具有资质认证的 Mandrivalinux 专家</b>的帮助, 您将能够节省大量时间。"
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"如果有关于 Mandrakelinux 的任何问题, 您都可以在 <b>store.mandrakesoft.com</"
+"如果有关于 Mandrivalinux 的任何问题, 您都可以在 <b>store.mandrakesoft.com</"
 "b> 购买支持事件。"
 
 #: share/compssUsers.pl:25
@@ -16673,8 +16673,8 @@ msgstr "监视工具、进程统计、tcpdump、nmap……"
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft 向导"
+msgid "Mandriva Wizards"
+msgstr "Mandriva 向导"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -16764,8 +16764,8 @@ msgstr ""
 "\n"
 "选项:\n"
 "  --help            - 打印此帮助信息。\n"
-"  --report          - 程序应该是 Mandrakelinux 工具之一\n"
-"  --incident        - 程序应该是 Mandrakelinux 工具之一"
+"  --report          - 程序应该是 Mandrivalinux 工具之一\n"
+"  --incident        - 程序应该是 Mandrivalinux 工具之一"
 
 #: standalone.pm:63
 #, c-format
@@ -16819,7 +16819,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16833,7 +16833,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[选项]...\n"
-"Mandrakelinux 终端服务器配置\n"
+"Mandrivalinux 终端服务器配置\n"
 "--enable         :启用 MTS\n"
 "--disable        :禁用 MTS\n"
 "--start          :启动 MTS\n"
@@ -16886,14 +16886,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[选项]...\n"
-"  --no-confirmation      不询问 MandrakeUpdate 模块中的第一个确认问题\n"
+"  --no-confirmation      不询问 Mandriva Update 模块中的第一个确认问题\n"
 "  --no-verify-rpm        不校验包签名\n"
 "  --changelog-first      在描述窗口中的文件列表前显示更改日志\n"
 "  --merge-all-rpmnew     计划合并找到的所有 .rpmnew/.rpmsave 文件"
@@ -19670,13 +19670,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux 故障报告工具"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux 故障报告工具"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux 控制中心"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux 控制中心"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19696,8 +19696,8 @@ msgstr "Drak 硬盘管理"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19741,8 +19741,8 @@ msgstr "配置向导"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "选择 Mandrakesoft 工具:"
+msgid "Select Mandriva Tool:"
+msgstr "选择 Mandriva 工具:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20163,19 +20163,19 @@ msgstr "开机时启动"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "这块网卡还没有配置过。\n"
-"请从“Mandrakelinux 控制中心”运行“添加网卡”助手"
+"请从“Mandrivalinux 控制中心”运行“添加网卡”助手"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "您从未配置过 Internet 连接。\n"
-"请从 Mandrakelinux 控制中心运行“%s”助手"
+"请从 Mandrivalinux 控制中心运行“%s”助手"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20225,8 +20225,8 @@ msgstr "KDM (KDE 显示管理器)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux 显示管理器)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux 显示管理器)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -20522,7 +20522,7 @@ msgstr "导入"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20531,7 +20531,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"版权 (C) 2001-2002 由 Mandrakesoft 持有\n"
+"版权 (C) 2001-2002 由 Mandriva 持有\n"
 "\n"
 "\n"
 "       DUPONT Sebastien (原始版本)\n"
@@ -21060,14 +21060,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " Drak 帮助 0.1\n"
-"版权 (C) 2003-2004 Mandrakesoft.\n"
+"版权 (C) 2003-2004 Mandriva.\n"
 "这是自由软件, 可按照 GNU GPL 协议条款再发放。\n"
 "\n"
 "用法: \n"
@@ -21092,8 +21092,8 @@ msgstr " --doc <link>          - 链接到其他网页 ( 给 WM 欢迎的前端�
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux 帮助中心"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux 帮助中心"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -24317,8 +24317,8 @@ msgstr "修改已经完成, 不过您必须退出登录修改才会生效"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux 工具日志"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux 工具日志"
 
 #: standalone/logdrake:51
 #, c-format
@@ -24830,10 +24830,10 @@ msgstr "连接完成。"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "连接失败。\n"
-"请在 Mandrakelinux 控制中心中检查您的配置。"
+"请在 Mandrivalinux 控制中心中检查您的配置。"
 
 #: standalone/net_monitor:341
 #, c-format