diff options
| author | Pablo Saratxaga <pablo@mandriva.com> | 2005-04-23 17:14:40 +0000 |
|---|---|---|
| committer | Pablo Saratxaga <pablo@mandriva.com> | 2005-04-23 17:14:40 +0000 |
| commit | 51e407e126f0746aed8b86e733da2ef71698ded8 (patch) | |
| tree | ad215f35cd3b3ee195ea42648078f71745c7126b /perl-install/share/po/zh_CN.po | |
| parent | ca012347134ab4eec6f196b5f86c9fc1f25cb5b7 (diff) | |
| download | drakx-backup-do-not-use-51e407e126f0746aed8b86e733da2ef71698ded8.tar drakx-backup-do-not-use-51e407e126f0746aed8b86e733da2ef71698ded8.tar.gz drakx-backup-do-not-use-51e407e126f0746aed8b86e733da2ef71698ded8.tar.bz2 drakx-backup-do-not-use-51e407e126f0746aed8b86e733da2ef71698ded8.tar.xz drakx-backup-do-not-use-51e407e126f0746aed8b86e733da2ef71698ded8.zip | |
various Mandrake -> Mandriva changes
Diffstat (limited to 'perl-install/share/po/zh_CN.po')
| -rw-r--r-- | perl-install/share/po/zh_CN.po | 574 |
1 files changed, 290 insertions, 284 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po index 245016d13..3afd64d66 100644 --- a/perl-install/share/po/zh_CN.po +++ b/perl-install/share/po/zh_CN.po @@ -1,7 +1,7 @@ # drakx messages in Simplified Chinese # Copyright (C) 2000 Free Software Foundation, Inc. # Danny Zeng <danny@zeng.com.cn>, 2000, 2002 -# Jesse Kuang <kjx@mandrakesoft.com>, 2002 +# Jesse Kuang <kjx@mandriva.com>, 2002 # Shiyu Tang <shiyutang@netscape.net>, 2003, 2004 # Funda Wang <fundawang@linux.net.cn>, 2002, 2003, 2004 # @@ -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: Mandrivalinux i18n Team <cooker-i18n@linux-mandrake.com>\n" +"Language-Team: Mandriva 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" @@ -97,7 +97,7 @@ msgstr "" "块含有 Windows 分区的 USB 密钥盘。\n" "\n" "\n" -"没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n" +"没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandriva\n" "操作系统一样使用 Mandriva Move。" #: ../move/move.pm:483 @@ -121,7 +121,7 @@ msgstr "" "插入了密钥盘, 请在再次检测之前稍等几秒。\n" "\n" "\n" -"没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n" +"没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandriva\n" "操作系统一样使用 Mandriva Move。" #: ../move/move.pm:494 @@ -1287,11 +1287,11 @@ msgstr "语言选择" #: any.pm:733 #, c-format msgid "" -"Mandrivalinux can support multiple languages. Select\n" +"Mandriva Linux 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 "" -"Mandrivalinux 可以支持多种语言。请选择您想要安装的语言。\n" +"Mandriva Linux 可以支持多种语言。请选择您想要安装的语言。\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 Mandrivalinux distribution. If you agree with all the\n" +"covers the entire Mandriva Linux 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 "" -"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrivalinux发行" +"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandriva Linux发行" "版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重" "新启动您的计算机。" @@ -3752,7 +3752,7 @@ msgid "Advanced" msgstr "高级" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:54 #, c-format msgid "" @@ -3814,32 +3814,33 @@ msgstr "" "\", 依此类推。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:85 #, c-format msgid "" -"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n" +"The Mandriva Linux 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 "" -"Mandrivalinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, " +"Mandriva Linux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, " "DrakX 将弹出当前\n" "CD, 并要求您插入所需的正确 CD。如果您手中没有所请求的 CD, 只需单击\"%s\", 就" "不会安装相应的软件包了。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:92 #, 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 Mandrivalinux, and to make it\n" +"There are thousands of packages available for Mandriva Linux, and to make " +"it\n" "simpler to manage, they have been placed into groups of similar\n" "applications.\n" "\n" -"Mandrivalinux sorts package groups in four categories. You can mix and\n" +"Mandriva Linux 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 +3891,11 @@ msgid "" "command-line interface. The total size of this installation is about 65\n" "megabytes." msgstr "" -"现在该指定要在您的系统中安装哪些程序了。Mandrivalinux\n" +"现在该指定要在您的系统中安装哪些程序了。Mandriva Linux\n" "为您准备了数千个软件包。而为了使管理软件包更加容易, 软件包已经按相似程度分成" "了多个组。\n" "\n" -"Mandrivalinux\n" +"Mandriva Linux\n" "按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说, " "``工作站''中也可以选择安装``服务器''分类中的应用程序。\n" "\n" @@ -3977,7 +3978,7 @@ msgid "Truly minimal install" msgstr "真正的最小安装" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:149 #, c-format msgid "" @@ -3992,10 +3993,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 Mandrivalinux will automatically start any installed\n" +"installed. By default Mandriva Linux 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 Mandrivalinux was\n" +"security holes were discovered after this version of Mandriva Linux 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 +4024,9 @@ msgstr "" "\n" "!!\n" "如果选择了服务器软件包, 不管是您特意选中的, 还是因为该软件包是某组的成员, 您" -"都需要确认是否真的想要安装这些服务器。默认情况下, Mandrivalinux\n" +"都需要确认是否真的想要安装这些服务器。默认情况下, Mandriva Linux\n" "会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的, 但完" -"全有可能在此版本 Mandrivalinux\n" +"全有可能在此版本 Mandriva Linux\n" "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途, 或者不知道为什" "么要安装这些服务, 请单击\"%s\"。单击\"%s\"将安装列出的服务, 并且启动时这些服" "务会被自动启动。\n" @@ -4047,7 +4048,7 @@ msgid "Automatic dependencies" msgstr "自动依赖性" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:183 #, c-format msgid "" @@ -4068,7 +4069,7 @@ msgid "Configure" msgstr "配置" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:189 #, c-format msgid "" @@ -4104,7 +4105,7 @@ msgstr "" "!!" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:206 #, c-format msgid "" @@ -4143,7 +4144,7 @@ msgid "Automatic time synchronization" msgstr "自动时间同步" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:220 #, c-format msgid "" @@ -4166,13 +4167,13 @@ msgstr "" "择符合您需要的服务器。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:231 #, 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 Mandrivalinux rely upon.\n" +"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n" "\n" "You'll see a list of different parameters to change to get an optimal\n" "graphical display.\n" @@ -4226,7 +4227,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 图形界面的核心部分。Mandrivalinux\n" +"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandriva Linux\n" "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n" "\n" "您将会看到不同的参数列表, 以便进行图形显示选项的更改来达到最佳状态。其中包" @@ -4305,7 +4306,7 @@ msgstr "" "(您在安装完成之后仍可进行修改)。所选配置的例子会显示在显示器上。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:303 #, c-format msgid "" @@ -4317,7 +4318,7 @@ msgstr "" "符合您需要的服务器。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:308 #, c-format msgid "" @@ -4334,16 +4335,16 @@ msgstr "" "用作服务器, 或者您的显示配置还没有成功, 您可能想要选择\"%s\"。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:316 #, c-format msgid "" -"You now need to decide where you want to install the Mandrivalinux\n" +"You now need to decide where you want to install the Mandriva Linux\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" -"Mandrivalinux system.\n" +"Mandriva Linux 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 +4371,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 Mandrivalinux and Microsoft Windows on\n" +"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n" "the same computer.\n" "\n" " Before choosing this option, please understand that after this\n" @@ -4379,7 +4380,8 @@ 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 Mandrivalinux system, choose\n" +"your hard drive and replace them with your new Mandriva Linux system, " +"choose\n" "this option. Be careful, because you will not be able to undo this " "operation\n" "after you confirm.\n" @@ -4399,11 +4401,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 "" -"在这一步里, 您需要决定您想要将 Mandrivalinux\n" +"在这一步里, 您需要决定您想要将 Mandriva Linux\n" "操作系统安装到硬盘的何处。如果您的硬盘完全是空的, 或者已有操作系统使用了所有" "的空间, 您就必须要对硬盘进行分区。粗略的说, 对硬盘进行分区就是将其划分成几个" "逻辑上不同的部分, 以便创建安装您新的\n" -"Mandrivalinux 系统所需的空间。\n" +"Mandriva Linux 系统所需的空间。\n" "\n" "由于对硬盘进行分区通常是不可恢复的, 并且可能导致数据丢失, 所以对于没有经验的" "用户来说, 分区是十分危险的操作。所幸的是, DrakX\n" @@ -4426,7 +4428,7 @@ msgstr "" "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢" "失, 但您必须事先对 Windows\n" "分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计" -"算机上使用 Mandrivalinux 和 Microsoft\n" +"算机上使用 Mandriva Linux 和 Microsoft\n" "Windows, 则推荐使用此选项。\n" "\n" " 注意, 在执行这一过程之后, 您原有的 Microsoft Windows 分区将会比先前小一" @@ -4434,7 +4436,7 @@ msgstr "" "下可用来存储数据或安装新软件的剩余空间也会变少。\n" "\n" " * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区, 并将其替换为全新的 " -"Mandrivalinux\n" +"Mandriva Linux\n" "系统, 请选择此选项。请额外小心, 因为在您确认之后, 此操作无法撤销。\n" "\n" " !! 如果您选择了此选项, 您硬盘上的全部数据都将被删除。 !!\n" @@ -4482,7 +4484,7 @@ msgid "Custom disk partitioning" msgstr "自定义磁盘分区" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:377 #, c-format msgid "" @@ -4568,7 +4570,7 @@ msgid "Save packages selection" msgstr "保存软件包选择" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:412 #, c-format msgid "" @@ -4589,7 +4591,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" -"Mandrivalinux operating system installation.\n" +"Mandriva Linux 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 +4609,7 @@ msgstr "" "\n" "如果您准备好格式化分区了, 请单击\"%s\"。\n" "\n" -"如果您想要选择其它分区用于安装 Mandrivalinux 操作系统, 请单击\"%s\"。\n" +"如果您想要选择其它分区用于安装 Mandriva Linux 操作系统, 请单击\"%s\"。\n" "\n" "如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。" @@ -4621,11 +4623,11 @@ msgid "Previous" msgstr "上一步" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:434 #, c-format msgid "" -"By the time you install Mandrivalinux, it's likely that some packages will\n" +"By the time you install Mandriva Linux, 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 +4639,7 @@ msgid "" "will appear: review the selection, and press \"%s\" to retrieve and install\n" "the selected package(s), or \"%s\" to abort." msgstr "" -"在您安装 Mandrivalinux\n" +"在您安装 Mandriva Linux\n" "的这个时候, 很可能有些软件包在发行之后已经更新。有些故障已经被修正, 有些安全" "问题已经被解决。为了让您能够享用这些更新, 您现在可以从 Internet\n" "上下载它们。如果您的 Internet 连接已经可以使用, 请选择\"%s\"。如果您愿意以后" @@ -4655,7 +4657,7 @@ msgid "Install" msgstr "安装" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:447 #, c-format msgid "" @@ -4666,7 +4668,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 Mandrivalinux\n" +"to change it later with the draksec tool, which is part of Mandriva Linux\n" "Control Center.\n" "\n" "Fill the \"%s\" field with the e-mail address of the person responsible for\n" @@ -4676,8 +4678,8 @@ msgstr "" "包含关键数据, 或者将直接暴露于 Internet\n" "之下, 则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n" "\n" -"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandrivalinux 控制中心的" -"一部分 draksec\n" +"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandriva Linux 控制中心" +"的一部分 draksec\n" "来更改安全级别。\n" "\n" "请在\"%s\"域中填入要负责安全的人的电子邮件地址。安全信息将被发送到该地址。" @@ -4688,12 +4690,12 @@ msgid "Security Administrator" msgstr "安全管理员" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:461 #, c-format msgid "" "At this point, you need to choose which partition(s) will be used for the\n" -"installation of your Mandrivalinux system. If partitions have already been\n" +"installation of your Mandriva Linux 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,8 +4765,8 @@ msgid "" "may find it a useful place to store a spare kernel and ramdisk images for\n" "emergency boot situations." msgstr "" -"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandrivalinux 系统。如果" -"已经定义了分区, 不管是先前安装的 GNU/Linux\n" +"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandriva Linux 系统。如" +"果已经定义了分区, 不管是先前安装的 GNU/Linux\n" "还是由其它分区工具划分的, 您都可以使用已有的分区。否则, 必须对硬盘分区进行定" "义。\n" "\n" @@ -4837,7 +4839,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" -"Mandrivalinux operating system.\n" +"Mandriva Linux operating system.\n" "\n" "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n" "\"Capacity\".\n" @@ -4866,7 +4868,7 @@ msgid "" "disk or partition is called \"C:\")." msgstr "" "在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小, 以便安装您新\n" -"的 Mandrivalinux 操作系统。\n" +"的 Mandriva Linux 操作系统。\n" "\n" "每个分区都是按“Linux 名称”、“Windows 名称”、“容量”顺序列出的。\n" "\n" @@ -4891,7 +4893,7 @@ msgstr "" "“Windows 名称”就是硬盘在 Windows 下的盘符(第一个此盘或分区就是“C:”)。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:564 #, c-format msgid "" @@ -4905,7 +4907,7 @@ msgstr "" "的国家列表。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:569 #, c-format msgid "" @@ -4913,7 +4915,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 Mandrivalinux system:\n" +"upgrade of an existing Mandriva Linux 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,33 +4924,35 @@ 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 Mandrivalinux system. Your current partitioning\n" +"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n" +"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n" "running version \"8.1\" or later. Performing an upgrade on versions prior\n" -"to Mandrivalinux version \"8.1\" is not recommended." +"to Mandriva Linux version \"8.1\" is not recommended." msgstr "" "仅当在您的计算机上发现了已有的 GNU/Linux 分区, 才会激活这一步骤。\n" "\n" -"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandrivalinux 系统：\n" +"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandriva Linux 系" +"统：\n" "\n" " *\n" "\"%s\"：总体来说, 这将完全销毁旧系统。但是, 根据您选择的分区方案, 您可以让现" "有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案, 或者更该文件" "系统, 您就应该使用此选项。\n" "\n" -" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrivalinux\n" +" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandriva Linux\n" "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可" "用, 与标准安装类似。\n" "\n" -"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrivalinux 系统上工作正常。不" +"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandriva Linux 系统上工作正常。不" "推荐在先于 \"8.1\" 版本的\n" -"Mandrivalinux 系统上执行升级。" +"Mandriva Linux 系统上执行升级。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:591 #, c-format msgid "" @@ -4984,7 +4988,7 @@ msgstr "" "非拉丁布局之间的组合键。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:609 #, c-format msgid "" @@ -5002,7 +5006,8 @@ 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, Mandrivalinux's use of UTF-8 will\n" +"still under development. For that reason, Mandriva Linux'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 +5045,7 @@ msgstr "" "\n" "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码, 该编码可支持所有现存的" "语言。但是, 在 GNU/Linux 下完全支持\n" -"Unicode, 仍然在开发和完善中。由此原因, Mandrivalinux 会根据用户的选择是否使" +"Unicode, 仍然在开发和完善中。由此原因, Mandriva Linux 会根据用户的选择是否使" "用 UTF-8：\n" "\n" " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、" @@ -5071,7 +5076,7 @@ msgid "Espanol" msgstr "西班牙" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:650 #, c-format msgid "" @@ -5152,7 +5157,7 @@ msgstr "" "MS Windows 里的 COM1, 在 GNU/Linux 里面叫做 ttyS0。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:688 #, c-format msgid "" @@ -5228,7 +5233,7 @@ msgid "authentication" msgstr "认证" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:725 #, c-format msgid "" @@ -5264,12 +5269,12 @@ msgstr "" "任何引导程序。除非您真的知道自己在做什么的话, 否则不要使用此选项。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:742 #, c-format msgid "" "Now, it's time to select a printing system for your computer. Other\n" -"operating systems may offer you one, but Mandrivalinux offers two. Each of\n" +"operating systems may offer you one, but Mandriva Linux 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 +5295,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 Mandrivalinux\n" +"system you may change it by running PrinterDrake from the Mandriva Linux\n" "Control Center and clicking on the \"%s\" button." msgstr "" "现在, 应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择, 但 " -"Mandrivalinux\n" +"Mandriva Linux\n" "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n" "\n" " * \"%s\" --\n" @@ -5313,7 +5318,7 @@ msgstr "" "还包括一个图形界面, 可用来打印或选择打印机选项, 以及管理打印机。\n" "\n" "如果您现在进行了选择, 但稍后又发现您并不喜欢所选择的打印系统, 可以轻松修改。" -"只需从 Mandrivalinux Control Center中选择\n" +"只需从 Mandriva Linux Control Center中选择\n" "PrinterDrake, 然后单击\"%s\"按钮。" #: help.pm:765 @@ -5365,7 +5370,7 @@ msgstr "" "如果 DrakX 无法检测到适当的参数, 就只好劳驾您亲自配置驱动程序了。" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:786 #, c-format msgid "" @@ -5383,7 +5388,7 @@ msgid "Sound card" msgstr "声卡" # DO NOT BOTHER TO MODIFY HERE, SEE: -# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml +# cvs.mandriva.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml #: help.pm:791 #, c-format msgid "" @@ -5430,7 +5435,8 @@ 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" -"Mandrivalinux Control Center after the installation has finished to benefit\n" +"Mandriva Linux 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 +5453,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" -"Mandrivalinux Control Center.\n" +"Mandriva Linux 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 +5496,7 @@ msgstr "" "分辨率。如果这不适合您的话, 请单击\"%s\"重新配置您的图形界面。\n" "\n" " * \"%s\"：如果您想要配置您的 Internet 或局域网访问, 现在就可以进行。请参考印" -"刷文档或在安装完成后使用 Mandrivalinux\n" +"刷文档或在安装完成后使用 Mandriva Linux\n" "Control Center来获得完整的在线帮助。\n" "\n" " * \"%s\"：如果您所安装的计算机位于代理服务器之后, 这里将允许您配置 HTTP 和 " @@ -5503,7 +5509,7 @@ msgstr "" "指南''中的相应章节, 以获得关于防火墙设置的细节。\n" "\n" " * \"%s\"：如果您想要更改您的引导程序配置, 请单击此按钮。这仅适用于高级用户。" -"请参考印刷文档或 Mandrivalinux 控制中心中关于引导程序配置的帮助。\n" +"请参考印刷文档或 Mandriva Linux 控制中心中关于引导程序配置的帮助。\n" "\n" " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机" "用作服务器, 那么应该复查这一设置。" @@ -5563,10 +5569,10 @@ msgstr "服务" #, c-format msgid "" "Choose the hard drive you want to erase in order to install your new\n" -"Mandrivalinux partition. Be careful, all data on this drive will be lost\n" +"Mandriva Linux partition. Be careful, all data on this drive will be lost\n" "and will not be recoverable!" msgstr "" -"请选择您为了安装新的 Mandrivalinux 分区想要删除的硬盘分区。\n" +"请选择您为了安装新的 Mandriva Linux 分区想要删除的硬盘分区。\n" "注意, 该硬盘分区上的所有数据将丢失并且无法恢复！" #: help.pm:863 @@ -5909,11 +5915,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 Mandrivalinux " +"Windows, run the ``defrag'' utility, then restart the Mandriva Linux " "installation." msgstr "" "您的 Windows 分区有太多碎片, 请重新启动, 进入 Windows, 运行磁盘碎片整理程序, " -"然后重新开始安装 Mandrivalinux" +"然后重新开始安装 Mandriva Linux" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX #: install_interactive.pm:166 @@ -6023,13 +6029,13 @@ msgstr "正在禁用网络" msgid "" "Introduction\n" "\n" -"The operating system and the different components available in the " -"Mandrivalinux distribution \n" +"The operating system and the different components available in the Mandriva " +"Linux 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 Mandrivalinux distribution.\n" +"system and the different components of the Mandriva Linux distribution.\n" "\n" "\n" "1. License Agreement\n" @@ -6058,8 +6064,8 @@ msgid "" "The Software Products and attached documentation are provided \"as is\", " "with no warranty, to the \n" "extent permitted by law.\n" -"Mandriva S.A. will, in no circumstances and to the extent permitted by " -"law, be liable for any special,\n" +"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" "business, interruption of business, financial loss, legal fees and penalties " @@ -6073,8 +6079,8 @@ msgid "" "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME " "COUNTRIES\n" "\n" -"To the extent permitted by law, Mandriva S.A. or its distributors will, " -"in no circumstances, be \n" +"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" "limitation damages for loss of business, interruption of business, financial " @@ -6083,7 +6089,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 Mandrivalinux sites which are prohibited or restricted in some " +"from one of Mandriva Linux 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" @@ -6117,10 +6123,10 @@ msgid "" "respective authors and are \n" "protected by intellectual property and copyright laws applicable to software " "programs.\n" -"Mandriva S.A. reserves its rights to modify or adapt the Software " -"Products, as a whole or in \n" +"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" -"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of " +"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of " "Mandriva S.A. \n" "\n" "\n" @@ -6141,36 +6147,36 @@ msgid "" msgstr "" "简介\n" "\n" -"Mandrivalinux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件" -"产品包括但不限于与 Mandrivalinux 发行版的操作系统和各个部分有关的程序、方法、" -"规则和文档。\n" +"Mandriva Linux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件" +"产品包括但不限于与 Mandriva Linux 发行版的操作系统和各个部分有关的程序、方" +"法、规则和文档。\n" "\n" "\n" "1. 许可协议\n" "\n" -"请仔细阅读此文档。此文档是您与 Mandriva S.A. 之间关于本软件产品的一个许可" -"协议。如果您安装、复制或使用本软件产品, 即表明您接受并完全同意遵守本许可协议" -"的内容和条件。如果您不同意本许可协议中的任何部分, 您将无权安装、复制或使用本" -"软件产品任何试图不遵守本许可协议的内容和条件, 而安装、复制或使用本软件产品的" -"行为都是非法的, 并将导致本许可协议赋予您的各种权利立即作废, 根据许可协议的条" +"请仔细阅读此文档。此文档是您与 Mandriva S.A. 之间关于本软件产品的一个许可协" +"议。如果您安装、复制或使用本软件产品, 即表明您接受并完全同意遵守本许可协议的" +"内容和条件。如果您不同意本许可协议中的任何部分, 您将无权安装、复制或使用本软" +"件产品任何试图不遵守本许可协议的内容和条件, 而安装、复制或使用本软件产品的行" +"为都是非法的, 并将导致本许可协议赋予您的各种权利立即作废, 根据许可协议的条" "款, 您将必须立即销毁本软件产品的任何副本。\n" "\n" "\n" "2. 有限担保\n" "\n" "本软件产品和附带的文档是一经发表即“不再修改”, 在法律允许的范围内没有任何担" -"保。在法律允许的范围内 Mandriva S.A. 对因使用或不能使用本软件产品而引起的" -"特定、偶然、直接、间接的无论任何损失(包括但不限于生意的丧失、生意的中断、财务" -"损失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任, 即使 " +"保。在法律允许的范围内 Mandriva S.A. 对因使用或不能使用本软件产品而引起的特" +"定、偶然、直接、间接的无论任何损失(包括但不限于生意的丧失、生意的中断、财务损" +"失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任, 即使 " "Mandriva S.A. 已经被告知有发生这种损失的可能性。\n" "\n" "在某些国家中关于拥有和使用被禁止的软件的有限责任\n" "\n" -"在法律允许的范围内 Mandriva S.A. 或其分销者对因拥有或使用, 或从任何 " -"Mandrivalinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、" -"偶然、直接、间接的无论任何损失 (包括但不限于生意的丧失、生意的中断、财务损" -"失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任。这种有限" -"责任适用但不限于本软件产品所包括的强大数据加密组件。\n" +"在法律允许的范围内 Mandriva S.A. 或其分销者对因拥有或使用, 或从任何 Mandriva " +"Linux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、偶然、直" +"接、间接的无论任何损失 (包括但不限于生意的丧失、生意的中断、财务损失、因法院" +"裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任。这种有限责任适用但" +"不限于本软件产品所包括的强大数据加密组件。\n" "\n" "\n" "3. GPL 许可协议和其它有关协议\n" @@ -6179,17 +6185,17 @@ msgstr "" "共许可协议(GNU General Public Licence), 此后简称为“GPL”, 或其它类似的许可协议" "的条款和条件。这些许可协议大多允许您使用、复制、修改或重新发表协议所覆盖的部" "分。使用这些软件之前, 请仔细阅读有关许可协议的条款和条件。如果对任何部分的许" -"可协议有疑问, 应该与该部分的作者联系, Mandriva 无法解答这些问题。由 " -"Mandriva S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创" -"作的文档采用一个特别的许可协议。详情见有关的文档。\n" +"可协议有疑问, 应该与该部分的作者联系, Mandriva 无法解答这些问题。由 Mandriva " +"S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandriva S.A. 创作的文档采用一个特" +"别的许可协议。详情见有关的文档。\n" "\n" "\n" "4. 知识产权\n" "\n" "本软件产品的各个组件的所有权利属于它们各自的作者, 并受到所有可适用于软件程序" -"的知识产权和版权法律的保护。Mandriva S.A. 保留对本软件产品进行全面或部分" -"的更改或调整的权利, 不论采用任何方法, 不论出于任何目的。\n" -"“Mandrake”, “Mandrivalinux”和相关的标志是 Mandriva S.A. 的商标。\n" +"的知识产权和版权法律的保护。Mandriva S.A. 保留对本软件产品进行全面或部分的更" +"改或调整的权利, 不论采用任何方法, 不论出于任何目的。\n" +"“Mandrake”, “Mandriva Linux”和相关的标志是 Mandriva S.A. 的商标。\n" "\n" "\n" "5. 适用法律\n" @@ -6277,8 +6283,8 @@ msgid "" "Remove the boot media and press return to reboot.\n" "\n" "\n" -"For information on fixes which are available for this release of " -"Mandrivalinux,\n" +"For information on fixes which are available for this release of Mandriva " +"Linux,\n" "consult the Errata available from:\n" "\n" "\n" @@ -6286,25 +6292,25 @@ msgid "" "\n" "\n" "Information on configuring your system is available in the post\n" -"install chapter of the Official Mandrivalinux User's Guide." +"install chapter of the Official Mandriva Linux User's Guide." msgstr "" "恭喜。安装完成了。\n" "请取出启动介质, 然后按 ENTER 重新启动。\n" "\n" "\n" -"要了解此版本 Mandrivalinux 的修订, 请访问以下勘误表: \n" +"要了解此版本 Mandriva Linux 的修订, 请访问以下勘误表: \n" "\n" "\n" "%s\n" "\n" "\n" -"关于安装后如何配置您的系统, 请查看 Mandrivalinux 官方用户手册。" +"关于安装后如何配置您的系统, 请查看 Mandriva Linux 官方用户手册。" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX #: install_messages.pm:144 #, c-format -msgid "http://www.mandrakelinux.com/en/errata.php3" -msgstr "http://www.mandrakelinux.com/en/errata.php3" +msgid "http://www.mandrivalinux.com/en/errata.php3" +msgstr "http://www.mandrivalinux.com/en/errata.php3" #: install_steps.pm:246 #, c-format @@ -6332,11 +6338,11 @@ msgstr "进入步骤“%s”\n" #, c-format msgid "" "Your system is low on resources. You may have some problem installing\n" -"Mandrivalinux. If that occurs, you can try a text install instead. For " +"Mandriva Linux. If that occurs, you can try a text install instead. For " "this,\n" "press `F1' when booting on CDROM, then enter `text'." msgstr "" -"您的系统资源不足。您在安装 Mandrivalinux 时可能遇到问题。\n" +"您的系统资源不足。您在安装 Mandriva Linux 时可能遇到问题。\n" "如果这样, 您可以尝试文本模式的安装。\n" "在从光盘启动后按“F1”键, 然后输入“text”。" @@ -6865,8 +6871,8 @@ msgstr "" #: install_steps_interactive.pm:821 #, c-format msgid "" -"Contacting Mandrivalinux web site to get the list of available mirrors..." -msgstr "正在连接 Mandrivalinux 网站以获得镜像网站列表..." +"Contacting Mandriva Linux web site to get the list of available mirrors..." +msgstr "正在连接 Mandriva Linux 网站以获得镜像网站列表..." #: install_steps_interactive.pm:840 #, c-format @@ -7083,8 +7089,8 @@ msgstr "" #: install_steps_newt.pm:20 #, c-format -msgid "Mandrivalinux Installation %s" -msgstr "Mandrivalinux 安装 %s" +msgid "Mandriva Linux Installation %s" +msgstr "Mandriva Linux 安装 %s" #. -PO: This string must fit in a 80-char wide text screen #: install_steps_newt.pm:34 @@ -9669,13 +9675,13 @@ msgstr "BitTorrent" msgid "" "drakfirewall configurator\n" "\n" -"This configures a personal firewall for this Mandrivalinux machine.\n" +"This configures a personal firewall for this Mandriva Linux machine.\n" "For a powerful and dedicated firewall solution, please look to the\n" "specialized MandrakeSecurity Firewall distribution." msgstr "" "“Drak 防火墙”配置\n" "\n" -"此程序可为您的 Mandrivalinux 机器配置个人防火墙。\n" +"此程序可为您的 Mandriva Linux 机器配置个人防火墙。\n" "如果要配置强大的专用防火墙, 请考虑使用专门的\n" "MandrakeSecurity 防火墙发行版。" @@ -13588,11 +13594,11 @@ msgstr "" #: printer/printerdrake.pm:3929 #, c-format msgid "" -"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share " -"your scanner on the network.\n" +"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to " +"share your scanner on the network.\n" "\n" msgstr "" -"运行 SannerDrake (Mandrivalinux 控制中心中的硬件/扫描仪)可在网络上共向您的扫" +"运行 SannerDrake (Mandriva Linux 控制中心中的硬件/扫描仪)可在网络上共向您的扫" "描仪。\n" "\n" @@ -15423,33 +15429,33 @@ msgstr "停止" #: share/advertising/01.pl:13 #, c-format -msgid "<b>What is Mandrivalinux?</b>" -msgstr "<b>何为 Mandrivalinux?</b>" +msgid "<b>What is Mandriva Linux?</b>" +msgstr "<b>何为 Mandriva Linux?</b>" #: share/advertising/01.pl:15 #, c-format -msgid "Welcome to <b>Mandrivalinux</b>!" -msgstr "<b>Mandrivalinux</b> 欢迎您!" +msgid "Welcome to <b>Mandriva Linux</b>!" +msgstr "<b>Mandriva Linux</b> 欢迎您!" #: share/advertising/01.pl:17 #, c-format msgid "" -"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the " +"Mandriva Linux 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 "" -"Mandrivalinux 是一整套系统的有机组成, 其中不仅包括<b>操作系统</b>(基于 Linux " -"内核), 还包括您梦寐以求的<b>海量应用程序</b>。" +"Mandriva Linux 是一整套系统的有机组成, 其中不仅包括<b>操作系统</b>(基于 " +"Linux 内核), 还包括您梦寐以求的<b>海量应用程序</b>。" #: share/advertising/01.pl:19 #, c-format msgid "" -"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It " +"Mandriva Linux 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 "" -"Mandrivalinux 是现今最<b>友好</b>的 Linux 发行版之一。它还是世界上<b>使用最为" -"广泛</b>的 Linux 发行版之一!" +"Mandriva Linux 是现今最<b>友好</b>的 Linux 发行版之一。它还是世界上<b>使用最" +"为广泛</b>的 Linux 发行版之一!" #: share/advertising/02.pl:13 #, c-format @@ -15464,14 +15470,14 @@ msgstr "欢迎进入<b>开放源代码世界</b>!" #: share/advertising/02.pl:17 #, c-format msgid "" -"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 " +"Mandriva Linux 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 Mandriva Linux " "contributors." msgstr "" -"Mandrivalinux 专注于开放源代码模型。这意味着您现在看到的新版本就是 " -"<b>Mandriva 开发者团队</b>和来自<b>世界各地 Mandrivalinux 贡献者社区</b>" -"共同努力的结果。" +"Mandriva Linux 专注于开放源代码模型。这意味着您现在看到的新版本就是 " +"<b>Mandriva 开发者团队</b>和来自<b>世界各地 Mandriva Linux 贡献者社区</b>共同" +"努力的结果。" #: share/advertising/02.pl:19 #, c-format @@ -15488,11 +15494,11 @@ msgstr "<b>GPL</b>" #: share/advertising/03.pl:15 #, c-format msgid "" -"Most of the software included in the distribution and all of the " -"Mandrivalinux tools are licensed under the <b>General Public License</b>." +"Most of the software included in the distribution and all of the Mandriva " +"Linux tools are licensed under the <b>General Public License</b>." msgstr "" -"发行版中包含的绝大多数软件以及 Mandrivalinux 专有的全部工具都以 <b>GPL</b> 协" -"议放出。" +"发行版中包含的绝大多数软件以及 Mandriva Linux 专有的全部工具都以 <b>GPL</b> " +"协议放出。" #: share/advertising/03.pl:17 #, c-format @@ -15521,24 +15527,24 @@ msgstr "<b>加入社区</b>" #: share/advertising/04.pl:15 #, c-format msgid "" -"Mandrivalinux has one of the <b>biggest communities</b> of users and " +"Mandriva Linux 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 Mandrivalinux world." +"<b>key role</b> in the Mandriva Linux world." msgstr "" -"Mandrivalinux 拥有的用户和开发者<b>社区人数众多</b>。这样的社区所扮演的角色十" -"分广泛, 从错误报告到开发新程序。社区在 Mandrivalinux 世界中扮演着<b>至关重要" -"</b>的角色。" +"Mandriva Linux 拥有的用户和开发者<b>社区人数众多</b>。这样的社区所扮演的角色" +"十分广泛, 从错误报告到开发新程序。社区在 Mandriva Linux 世界中扮演着<b>至关重" +"要</b>的角色。" #: share/advertising/04.pl:17 #, c-format msgid "" "To <b>learn more</b> about our dynamic community, please visit <b>www." -"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel." +"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel." "php3</b> if you would like to get <b>involved</b> in the development." msgstr "" "要<b>更多地了解</b>我们的活力社区, 请浏览 <b>www.mandrakelinux.cn</b>；而如果" -"您想要直接<b>参与</b>开发的话, 请直接查看 <b>www.mandrakelinux.com/en/" +"您想要直接<b>参与</b>开发的话, 请直接查看 <b>www.mandrivalinux.com/en/" "cookerdevel.php3</b>。" #: share/advertising/05.pl:15 @@ -15549,11 +15555,11 @@ msgstr "<b>下载版本</b>" #: share/advertising/05.pl:17 #, c-format msgid "" -"You are now installing <b>Mandrivalinux Download</b>. This is the free " +"You are now installing <b>Mandriva Linux Download</b>. This is the free " "version that Mandriva wants to keep <b>available to everyone</b>." msgstr "" -"您正在安装 <b>Mandrivalinux 下载版本</b>。这是一种免费下载的版本, " -"Mandriva 想要将其贡献给<b>每个人</b>。" +"您正在安装 <b>Mandriva Linux 下载版本</b>。这是一种免费下载的版本, Mandriva " +"想要将其贡献给<b>每个人</b>。" #: share/advertising/05.pl:19 #, c-format @@ -15590,8 +15596,8 @@ msgstr "<b>探索, 您的第一个 Linux 桌面</b>" #: share/advertising/06.pl:15 #, c-format -msgid "You are now installing <b>Mandrivalinux Discovery</b>." -msgstr "您正在安装 <b>Mandrivalinux 探索版</b>。" +msgid "You are now installing <b>Mandriva Linux Discovery</b>." +msgstr "您正在安装 <b>Mandriva Linux 探索版</b>。" #: share/advertising/06.pl:17 #, c-format @@ -15612,8 +15618,8 @@ msgstr "<b>专业版, Linux 终极桌面</b>" #: share/advertising/07.pl:15 #, c-format -msgid "You are now installing <b>Mandrivalinux PowerPack</b>." -msgstr "您正在安装 <b>Mandrivalinux 专业版</b>。" +msgid "You are now installing <b>Mandriva Linux PowerPack</b>." +msgstr "您正在安装 <b>Mandriva Linux 专业版</b>。" #: share/advertising/07.pl:17 #, c-format @@ -15622,9 +15628,9 @@ msgid "" "includes <b>thousands of applications</b> - everything from the most popular " "to the most advanced." msgstr "" -"专业版是 Mandriva 的<b>金牌 Linux 桌面</b>产品。除了是最易用最友好的 " -"Linux 发行版, 专业版还包括了<b>数千应用程序</b> - 从最流行程序到最专业的程序" -"一应俱全。" +"专业版是 Mandriva 的<b>金牌 Linux 桌面</b>产品。除了是最易用最友好的 Linux 发" +"行版, 专业版还包括了<b>数千应用程序</b> - 从最流行程序到最专业的程序一应俱" +"全。" #: share/advertising/08.pl:13 #, c-format @@ -15633,8 +15639,8 @@ msgstr "<b>专业版+, 桌面和服务器的 Linux 解决方案</b>" #: share/advertising/08.pl:15 #, c-format -msgid "You are now installing <b>Mandrivalinux PowerPack+</b>." -msgstr "您正在安装 <b>Mandrivalinux 专业版+</b>。" +msgid "You are now installing <b>Mandriva Linux PowerPack+</b>." +msgstr "您正在安装 <b>Mandriva Linux 专业版+</b>。" #: share/advertising/08.pl:17 #, c-format @@ -15655,14 +15661,13 @@ msgstr "<b>Mandriva 产品</b>" #: share/advertising/09.pl:15 #, c-format msgid "" -"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> " -"products." -msgstr "<b>Mandriva</b> 开发了广泛的 <b>Mandrivalinux</b> 产品线。" +"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products." +msgstr "<b>Mandriva</b> 开发了广泛的 <b>Mandriva Linux</b> 产品线。" #: share/advertising/09.pl:17 #, c-format -msgid "The Mandrivalinux products are:" -msgstr "Mandrivalinux 产品包括:" +msgid "The Mandriva Linux products are:" +msgstr "Mandriva Linux 产品包括:" #: share/advertising/09.pl:18 #, c-format @@ -15682,11 +15687,11 @@ msgstr "\t* <b>专业版+</b>, 桌面和服务器的 Linux 解决方案。" #: share/advertising/09.pl:21 #, c-format msgid "" -"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making " +"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making " "the most of your 64-bit processor." msgstr "" -"\t* <b>Mandrivalinux for x86-64</b>, 充分发挥您 64 位处理器性能的 " -"Mandrivalinux 解决方案。" +"\t* <b>Mandriva Linux for x86-64</b>, 充分发挥您 64 位处理器性能的 Mandriva " +"Linux 解决方案。" #: share/advertising/10.pl:15 #, c-format @@ -15696,27 +15701,27 @@ msgstr "<b>Mandriva 产品(随身产品)</b>" #: share/advertising/10.pl:17 #, c-format msgid "" -"Mandriva has developed two products that allow you to use Mandrivalinux " +"Mandriva has developed two products that allow you to use Mandriva Linux " "<b>on any computer</b> and without any need to actually install it:" msgstr "" -"Mandriva 开发了两款随身产品, 使得您可以在不安装的情况下<b>在任何计算机上" -"</b>使用 Mandrivalinux:" +"Mandriva 开发了两款随身产品, 使得您可以在不安装的情况下<b>在任何计算机上</b>" +"使用 Mandriva Linux:" #: share/advertising/10.pl:18 #, c-format msgid "" -"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a " +"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a " "bootable CD-ROM." -msgstr "\t* <b>Move</b>, 直接从可启动光盘中运行的 Mandrivalinux 发行版。" +msgstr "\t* <b>Move</b>, 直接从可启动光盘中运行的 Mandriva Linux 发行版。" #: share/advertising/10.pl:19 #, c-format msgid "" -"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the " +"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the " "ultra-compact “LaCie Mobile Hard Drive”." msgstr "" -"\t* <b>GlobeTrotter</b>, 预装于超强压缩的 LaCie 移动硬盘中的 Mandrivalinux 发" -"行版。" +"\t* <b>GlobeTrotter</b>, 预装于超强压缩的 LaCie 移动硬盘中的 Mandriva Linux " +"发行版。" #: share/advertising/11.pl:13 #, c-format @@ -15726,24 +15731,26 @@ msgstr "<b>Mandriva 产品(专业解决方案)</b>" #: share/advertising/11.pl:15 #, c-format msgid "" -"Below are the Mandriva products designed to meet the <b>professional " -"needs</b>:" +"Below are the Mandriva products designed to meet the <b>professional needs</" +"b>:" msgstr "下面是 Mandriva 专为适合<b>专业需求</b>所设计的产品:" #: share/advertising/11.pl:16 #, c-format -msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses." -msgstr "\t* <b>企业桌面</b>, 商务适用的 Mandrivalinux 桌面。" +msgid "" +"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses." +msgstr "\t* <b>企业桌面</b>, 商务适用的 Mandriva Linux 桌面。" #: share/advertising/11.pl:17 #, c-format -msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution." -msgstr "\t* <b>企业服务器</b>, Mandrivalinux 服务器解决方案。" +msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution." +msgstr "\t* <b>企业服务器</b>, Mandriva Linux 服务器解决方案。" #: share/advertising/11.pl:18 #, c-format -msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution." -msgstr "\t* <b>多网络防火墙</b>, Mandrivalinux 安全解决方案。" +msgid "" +"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution." +msgstr "\t* <b>多网络防火墙</b>, Mandriva Linux 安全解决方案。" #: share/advertising/12.pl:13 #, c-format @@ -15788,8 +15795,8 @@ msgid "" "With PowerPack, you will have the choice of the <b>graphical desktop " "environment</b>. Mandriva has chosen <b>KDE</b> as the default one." msgstr "" -"在专业版中, 您可以选择各种<b>图形桌面环境</b>。而 Mandriva 为您预设的桌面" -"环境是 <b>KDE</b>。" +"在专业版中, 您可以选择各种<b>图形桌面环境</b>。而 Mandriva 为您预设的桌面环境" +"是 <b>KDE</b>。" #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17 #, c-format @@ -15815,8 +15822,8 @@ msgid "" "With PowerPack+, you will have the choice of the <b>graphical desktop " "environment</b>. Mandriva has chosen <b>KDE</b> as the default one." msgstr "" -"在专业版+中, 您可以选择各种<b>图形桌面环境</b>。而 Mandriva 为您预设的桌" -"面环境是 <b>KDE</b>。" +"在专业版+中, 您可以选择各种<b>图形桌面环境</b>。而 Mandriva 为您预设的桌面环" +"境是 <b>KDE</b>。" #: share/advertising/14.pl:15 #, c-format @@ -15938,11 +15945,11 @@ msgstr "<b>享受广泛的应用程序</b>" #: share/advertising/18.pl:15 #, c-format msgid "" -"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for " +"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for " "<b>all of your tasks</b>:" msgstr "" -"在 Mandrivalinux 菜单中, 您可<b>轻而易举</b>的找到完成<b>各种任务</b>的应用程" -"序:" +"在 Mandriva Linux 菜单中, 您可<b>轻而易举</b>的找到完成<b>各种任务</b>的应用" +"程序:" #: share/advertising/18.pl:16 #, c-format @@ -16186,18 +16193,18 @@ msgstr "\t* <b>Postfix</b> 和 <b>Sendmail</b>：流行而强大的邮件服务 #: share/advertising/25.pl:13 #, c-format -msgid "<b>Mandrivalinux Control Center</b>" -msgstr "<b>Mandrivalinux 控制中心</b>" +msgid "<b>Mandriva Linux Control Center</b>" +msgstr "<b>Mandriva Linux 控制中心</b>" #: share/advertising/25.pl:15 #, c-format msgid "" -"The <b>Mandrivalinux Control Center</b> is an essential collection of " -"Mandrivalinux-specific utilities designed to simplify the configuration of " +"The <b>Mandriva Linux Control Center</b> is an essential collection of " +"Mandriva Linux-specific utilities designed to simplify the configuration of " "your computer." msgstr "" -"<b>Mandrivalinux 控制中心</b>是 Mandrivalinux 特有工具的大集合, 它可显著简化" -"对计算机的配置。" +"<b>Mandriva Linux 控制中心</b>是 Mandriva Linux 特有工具的大集合, 它可显著简" +"化对计算机的配置。" #: share/advertising/25.pl:17 #, c-format @@ -16221,14 +16228,14 @@ msgid "" "Like all computer programming, open source software <b>requires time and " "people</b> for development. In order to respect the open source philosophy, " "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 " +"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> " +"and the development of Mandriva Linux, <b>please</b> consider buying one of " "our products or services!" msgstr "" "与其它软件编程方式相同, 开放源代码软件<b>需要时间和人力</b>进行开发。为了遵从" -"开放源代码理念, Mandriva 会销售增值产品和服务, 以便进一步<b>改进 " -"Mandrivalinux</b>。如果您想要<b>支持开放源代码理念</b>以及 Mandrivalinux 的开" -"发, <b>请</b>考虑购买我们的产品或服务！" +"开放源代码理念, Mandriva 会销售增值产品和服务, 以便进一步<b>改进 Mandriva " +"Linux</b>。如果您想要<b>支持开放源代码理念</b>以及 Mandriva Linux 的开发, <b>" +"请</b>考虑购买我们的产品或服务！" #: share/advertising/27.pl:13 #, c-format @@ -16238,11 +16245,11 @@ msgstr "<b>在线商店</b>" #: share/advertising/27.pl:15 #, c-format msgid "" -"To learn more about Mandriva products and services, you can visit our " -"<b>e-commerce platform</b>." +"To learn more about Mandriva products and services, you can visit our <b>e-" +"commerce platform</b>." msgstr "" -"要了解关于 Mandriva 产品和服务的更多信息, 您可以参观我们的<b>电子商务平台" -"</b>。" +"要了解关于 Mandriva 产品和服务的更多信息, 您可以参观我们的<b>电子商务平台</" +"b>。" #: share/advertising/27.pl:17 #, c-format @@ -16258,8 +16265,8 @@ msgstr "此平台刚刚经过<b>重新设计</b>, 效率和可用性都大为改 #: share/advertising/27.pl:21 #, c-format -msgid "Stop by today at <b>store.mandrakesoft.com</b>!" -msgstr "驻足 <b>store.mandrakesoft.com</b>" +msgid "Stop by today at <b>store.mandriva.com</b>!" +msgstr "驻足 <b>store.mandriva.com</b>" #: share/advertising/28.pl:15 #, c-format @@ -16269,9 +16276,9 @@ msgstr "<b>Mandriva Club</b>" #: share/advertising/28.pl:17 #, c-format msgid "" -"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux " +"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux " "product.." -msgstr "<b>Mandriva Club</b> 是您 Mandrivalinux 产品的<b>绝佳拍档</b>..." +msgstr "<b>Mandriva Club</b> 是您 Mandriva Linux 产品的<b>绝佳拍档</b>..." #: share/advertising/28.pl:19 #, c-format @@ -16283,10 +16290,9 @@ msgstr "加入 Mandriva Club, 您可充分享受各项<b>超值回馈</b>, 例 #, c-format msgid "" "\t* <b>Special discounts</b> on products and services of our online store " -"<b>store.mandrakesoft.com</b>." +"<b>store.mandriva.com</b>." msgstr "" -"\t* 从在线商店 <b>store.mandrakesoft.com</b> 购买产品和服务的<b>特殊折扣</" -"b>。" +"\t* 从在线商店 <b>store.mandriva.com</b> 购买产品和服务的<b>特殊折扣</b>。" #: share/advertising/28.pl:21 #, c-format @@ -16297,16 +16303,16 @@ msgstr "\t* 访问<b>商业应用程序</b>(例如 NVIDIA® 或 ATI™ 的驱动 #: share/advertising/28.pl:22 #, c-format -msgid "\t* Participation in Mandrivalinux <b>user forums</b>." -msgstr "\t* 参与 Mandrivalinux <b>用户论坛</b>。" +msgid "\t* Participation in Mandriva Linux <b>user forums</b>." +msgstr "\t* 参与 Mandriva Linux <b>用户论坛</b>。" #: share/advertising/28.pl:23 #, c-format msgid "" -"\t* <b>Early and privileged access</b>, before public release, to " -"Mandrivalinux <b>ISO images</b>." +"\t* <b>Early and privileged access</b>, before public release, to Mandriva " +"Linux <b>ISO images</b>." msgstr "" -"\t* <b>优先访问</b>, 在公众之前优先访问 Mandrivalinux <b>ISO 映像</b>。" +"\t* <b>优先访问</b>, 在公众之前优先访问 Mandriva Linux <b>ISO 映像</b>。" #: share/advertising/29.pl:13 #, c-format @@ -16324,10 +16330,10 @@ msgstr "<b>Mandriva Online</b> 是 Mandriva 为客户特别开发的全新金牌 #, c-format msgid "" "Mandriva Online provides a wide range of valuable services for <b>easily " -"updating</b> your Mandrivalinux systems:" +"updating</b> your Mandriva Linux systems:" msgstr "" -"Mandriva Online 为<b>轻松更新</b>您的 Mandrivalinux 系统提供了范围广泛的增值服" -"务：" +"Mandriva Online 为<b>轻松更新</b>您的 Mandriva Linux 系统提供了范围广泛的增值" +"服务：" #: share/advertising/29.pl:18 #, c-format @@ -16349,8 +16355,8 @@ msgstr "\t* 灵活的<b>按计划</b>更新。" #: share/advertising/29.pl:21 #, c-format msgid "" -"\t* Management of <b>all your Mandrivalinux systems</b> with one account." -msgstr "\t* 通过一个账户管理<b>您所有的 Mandrivalinux 系统</b>。" +"\t* Management of <b>all your Mandriva Linux systems</b> with one account." +msgstr "\t* 通过一个账户管理<b>您所有的 Mandriva Linux 系统</b>。" #: share/advertising/30.pl:13 #, c-format @@ -16361,27 +16367,27 @@ msgstr "<b>Mandriva Expert</b>" #, c-format msgid "" "Do you require <b>assistance?</b> Meet Mandriva's technical experts on " -"<b>our technical support platform</b> www.mandrakeexpert.com." +"<b>our technical support platform</b> www.mandrivaexpert.com." msgstr "" -"您需要<b>帮助</b>吗?您可在<b>我们的技术支持平台</b> www.mandrakeexpert.com " +"您需要<b>帮助</b>吗?您可在<b>我们的技术支持平台</b> www.mandrivaexpert.com " "与 Mandriva 的技术专家会面。" #: share/advertising/30.pl:17 #, c-format msgid "" -"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save " +"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save " "a lot of time." msgstr "" -"感谢<b>具有资质认证的 Mandrivalinux 专家</b>的帮助, 您将能够节省大量时间。" +"感谢<b>具有资质认证的 Mandriva Linux 专家</b>的帮助, 您将能够节省大量时间。" #: share/advertising/30.pl:19 #, c-format msgid "" -"For any question related to Mandrivalinux, you have the possibility to " -"purchase support incidents at <b>store.mandrakesoft.com</b>." +"For any question related to Mandriva Linux, you have the possibility to " +"purchase support incidents at <b>store.mandriva.com</b>." msgstr "" -"如果有关于 Mandrivalinux 的任何问题, 您都可以在 <b>store.mandrakesoft.com</" -"b> 购买支持事件。" +"如果有关于 Mandriva Linux 的任何问题, 您都可以在 <b>store.mandriva.com</b> 购" +"买支持事件。" #: share/compssUsers.pl:25 #, c-format @@ -16757,15 +16763,15 @@ msgid "" "\n" "OPTIONS:\n" " --help - print this help message.\n" -" --report - program should be one of mandrakelinux tools\n" -" --incident - program should be one of mandrakelinux tools" +" --report - program should be one of Mandriva Linux tools\n" +" --incident - program should be one of Mandriva Linux tools" msgstr "" "[选项] [程序名]\n" "\n" "选项:\n" " --help - 打印此帮助信息。\n" -" --report - 程序应该是 Mandrivalinux 工具之一\n" -" --incident - 程序应该是 Mandrivalinux 工具之一" +" --report - 程序应该是 Mandriva Linux 工具之一\n" +" --incident - 程序应该是 Mandriva Linux 工具之一" #: standalone.pm:63 #, c-format @@ -16819,7 +16825,7 @@ msgstr "" #, c-format msgid "" "[OPTIONS]...\n" -"Mandrivalinux Terminal Server Configurator\n" +"Mandriva Linux Terminal Server Configurator\n" "--enable : enable MTS\n" "--disable : disable MTS\n" "--start : start MTS\n" @@ -16833,7 +16839,7 @@ msgid "" "IP, nbi image name)" msgstr "" "[选项]...\n" -"Mandrivalinux 终端服务器配置\n" +"Mandriva Linux 终端服务器配置\n" "--enable :启用 MTS\n" "--disable :禁用 MTS\n" "--start :启动 MTS\n" @@ -16885,8 +16891,8 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]" #, c-format msgid "" "[OPTION]...\n" -" --no-confirmation do not ask first confirmation question in " -"Mandriva Update mode\n" +" --no-confirmation do not ask first confirmation question in Mandriva " +"Update mode\n" " --no-verify-rpm do not verify packages signatures\n" " --changelog-first display changelog before filelist in the " "description window\n" @@ -19670,13 +19676,13 @@ msgstr "" #: standalone/drakbug:41 #, c-format -msgid "Mandrivalinux Bug Report Tool" -msgstr "Mandrivalinux 故障报告工具" +msgid "Mandriva Linux Bug Report Tool" +msgstr "Mandriva Linux 故障报告工具" #: standalone/drakbug:46 #, c-format -msgid "Mandrivalinux Control Center" -msgstr "Mandrivalinux 控制中心" +msgid "Mandriva Linux Control Center" +msgstr "Mandriva Linux 控制中心" #: standalone/drakbug:48 #, c-format @@ -20163,19 +20169,19 @@ msgstr "开机时启动" #, c-format msgid "" "This interface has not been configured yet.\n" -"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center" +"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center" msgstr "" "这块网卡还没有配置过。\n" -"请从“Mandrivalinux 控制中心”运行“添加网卡”助手" +"请从“Mandriva Linux 控制中心”运行“添加网卡”助手" #: 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 Mandrivalinux Control Center" +"Run the \"%s\" assistant from the Mandriva Linux Control Center" msgstr "" "您从未配置过 Internet 连接。\n" -"请从 Mandrivalinux 控制中心运行“%s”助手" +"请从 Mandriva Linux 控制中心运行“%s”助手" #. -PO: here "Add Connection" should be translated the same was as in control-center #: standalone/drakconnect:1010 standalone/net_applet:62 @@ -20225,8 +20231,8 @@ msgstr "KDM (KDE 显示管理器)" #: standalone/drakedm:36 #, c-format -msgid "MdkKDM (Mandrivalinux Display Manager)" -msgstr "MdkKDM (Mandrivalinux 显示管理器)" +msgid "MdkKDM (Mandriva Linux Display Manager)" +msgstr "MdkKDM (Mandriva Linux 显示管理器)" #: standalone/drakedm:37 #, c-format @@ -20527,18 +20533,18 @@ msgid "" "\n" " DUPONT Sebastien (original version)\n" "\n" -" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n" +" CHAUMETTE Damien <dchaumette@mandriva.com>\n" "\n" -" VIGNAUD Thierry <tvignaud@mandrakesoft.com>" +" VIGNAUD Thierry <tvignaud@mandriva.com>" msgstr "" "版权 (C) 2001-2002 由 Mandriva 持有\n" "\n" "\n" " DUPONT Sebastien (原始版本)\n" "\n" -" CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n" +" CHAUMETTE Damien <dchaumette@mandriva.com>\n" "\n" -" VIGNAUD Thierry <tvignaud@mandrakesoft.com>" +" VIGNAUD Thierry <tvignaud@mandriva.com>" #: standalone/drakfont:520 #, c-format @@ -21092,8 +21098,8 @@ msgstr " --doc <link> - 链接到其他网页 ( 给 WM 欢迎的前端 #: standalone/drakhelp:36 #, c-format -msgid "Mandrivalinux Help Center" -msgstr "Mandrivalinux 帮助中心" +msgid "Mandriva Linux Help Center" +msgstr "Mandriva Linux 帮助中心" #: standalone/drakhelp:36 #, c-format @@ -21482,7 +21488,7 @@ msgstr "IP:" #: standalone/drakroam:160 #, c-format msgid "Mode:" -msgstr "模式：%s" +msgstr "模式：" #: standalone/drakroam:161 #, c-format @@ -21737,7 +21743,7 @@ msgid "" "You can visit our hardware database at:\n" "\n" "\n" -"http://www.linux-mandrake.com/en/hardware.php3" +"http://www.mandrivalinux.com/en/hardware.php3" msgstr "" "在您的机器上没有检测到声卡。请检查您是否正确的安装了您的声卡, 它是否被 Linux " "支持。\n" @@ -21746,7 +21752,7 @@ msgstr "" "您可以访问硬件数据库: \n" "\n" "\n" -"http://www.mandrakelinux.com/zh_CN/hardware.php3" +"http://www.mandrivalinux.com/zh_CN/hardware.php3" #: standalone/draksound:57 #, c-format @@ -23496,7 +23502,7 @@ msgid "" "You can visit our hardware database at:\n" "\n" "\n" -"http://www.linux-mandrake.com/en/hardware.php3" +"http://www.mandrivalinux.com/en/hardware.php3" msgstr "" "没有在您的计算机上检测到电视卡。请检查是否正确安装了 Linux 支持的视频/电视" "卡。\n" @@ -24203,13 +24209,13 @@ msgid "" "This is HardDrake, a %s hardware configuration tool.\n" "<span foreground=\"royalblue3\">Version:</span> %s\n" "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud <" -"tvignaud@mandrakesoft.com>\n" +"tvignaud@mandriva.com>\n" "\n" msgstr "" "这是“Drak 硬件设置”, %s 的硬件设置工具。\n" "<span foreground=\"royalblue3\">版本:</span> %s\n" "<span foreground=\"royalblue3\">作者:</span> Thierry Vignaud <" -"tvignaud@mandrakesoft.com>\n" +"tvignaud@mandriva.com>\n" "\n" #: standalone/harddrake2:243 @@ -24317,8 +24323,8 @@ msgstr "修改已经完成, 不过您必须退出登录修改才会生效" #: standalone/logdrake:50 #, c-format -msgid "Mandrivalinux Tools Logs" -msgstr "Mandrivalinux 工具日志" +msgid "Mandriva Linux Tools Logs" +msgstr "Mandriva Linux 工具日志" #: standalone/logdrake:51 #, c-format @@ -24830,10 +24836,10 @@ msgstr "连接完成。" #, c-format msgid "" "Connection failed.\n" -"Verify your configuration in the Mandrivalinux Control Center." +"Verify your configuration in the Mandriva Linux Control Center." msgstr "" "连接失败。\n" -"请在 Mandrivalinux 控制中心中检查您的配置。" +"请在 Mandriva Linux 控制中心中检查您的配置。" #: standalone/net_monitor:341 #, c-format |