name change (Mandrake -> Mandriva)

1 files changed, 90 insertions, 88 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index cb8f65d..acb50a0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,14 +1,14 @@
-# Copyright (c) 2003 Mandrakesoft, Inc.
+# Copyright (c) 2003 Mandriva, Inc.
 # Funda Wang <fundawang@linux.net.cn>, 2004
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: indexhtml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-22 09:12+0100\n"
+"POT-Creation-Date: 2005-04-11 15:57+0200\n"
 "PO-Revision-Date: 2004-09-01 01:57+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
+"Language-Team: Mandriva Linux 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"
@@ -21,102 +21,104 @@ msgstr "欢迎"
 #. title (<title>) of the html
 #. title (<h1>) of the html page
 #: HTML/placeholder.h:10 HTML/placeholder.h:12
-msgid "Congratulations for choosing Mandrakelinux!"
-msgstr "感谢您选择 Mandrakelinux!"
+msgid "Congratulations for choosing Mandriva Linux!"
+msgstr "感谢您选择 Mandriva Linux!"
 
 #.
 #. i18n("We take pride in providing the most user-friendly and full-featured Linux distribution available. We hope it gives you complete satisfaction for many years."),
 #: HTML/placeholder.h:15
 msgid ""
-"Mandrakesoft offers a comprehensive range of products and services to help "
-"you make the most of your Mandrakelinux system. Just point and click and "
-"find out everything about Mandrakelinux!"
+"Mandriva offers a comprehensive range of products and services to help you "
+"make the most of your Mandriva Linux system. Just point and click and find "
+"out everything about Mandriva Linux!"
 msgstr ""
-"Mandrakesoft 提供了一整套产品和服务来帮助您更好地使用 Mandrakelinux 系统。指"
-"点之中即可了解关于 Mandrakelinux 的一切!"
+"Mandriva 提供了一整套产品和服务来帮助您更好地使用 Mandriva Linux 系统。指点之"
+"中即可了解关于 Mandriva Linux 的一切!"
 
-#. placeholer is mandrakesoft.com URL
+#. placeholer is mandriva.com URL
 #: HTML/placeholder.h:29
 msgid ""
-"The mandrakesoft.com website provides all the details for keeping in touch "
-"with the publisher of the Linux system with the most features and best "
-"usability."
+"The mandriva.com website provides all the details for keeping in touch with "
+"the publisher of the Linux system with the most features and best usability."
 msgstr ""
-"Mandrakesoft.com 网站提供了与您最喜爱的 Linux 发行版时刻保持亲密接触的全部细"
-"节。"
+"Mandriva.com 网站提供了与您最喜爱的 Linux 发行版时刻保持亲密接触的全部细节。"
 
 #. i18n("The %s website lets you keep in touch with the publisher of your favorite Linux distribution. It's also a great location for discovering new products and services."),
 #.
 #: HTML/placeholder.h:32 mail/placeholder.h:34
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: HTML/placeholder.h:35
 msgid ""
-"Mandrakeonline is the latest service provided by Mandrakesoft. It allows you "
-"to keep your computer up-to-date through a centralized and automated service."
+"Mandriva Online is the latest service provided by Mandriva. It allows you to "
+"keep your computer up-to-date through a centralized and automated service."
 msgstr ""
-"Mandrakeonline 是 Mandrakesoft 提供的最新服务。它允许您通过集中化的自动服务将"
-"您的计算机时刻保持最新。"
+"Mandriva Online 是 Mandriva 提供的最新服务。它允许您通过集中化的自动服务将您"
+"的计算机时刻保持最新。"
+
+#.
+#: HTML/placeholder.h:37
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Online"
 
 #: HTML/placeholder.h:40
 msgid ""
-"Mandrakelinux.com is the website dedicated to the Linux community and open "
+"Mandrivalinux.com is the website dedicated to the Linux community and open "
 "source Linux projects."
-msgstr "Mandrakelinux.com 是专注于 Linux 社区和开放源代码 Linux 项目的网站。"
+msgstr "Mandrivalinux.com 是专注于 Linux 社区和开放源代码 Linux 项目的网站。"
 
 #.
 #: HTML/placeholder.h:42 mail/placeholder.h:26
-msgid "Mandrakeclub"
-msgstr "Mandrakeclub"
+msgid "Mandriva Club"
+msgstr "Mandriva Club"
 
-#. placeholder is mandrakeclub URL
-#: HTML/placeholder.h:46
+#: HTML/placeholder.h:45
 msgid ""
-"Mandrakeclub is the website dedicated to Mandrakelinux users. Signing up for "
-"membership brings you exclusive benefits: exclusive access to forums, RPMs "
-"and products download, discounts on Mandrakelinux products and much more!"
+"Mandriva Club is the website dedicated to Mandriva Linux users. Signing up "
+"for membership brings you exclusive benefits: exclusive access to forums, "
+"RPMs and products download, discounts on Mandriva Linux products and much "
+"more!"
 msgstr ""
-"Mandrakeclub 是专为 Mandrakelinux 用户建立的网站。注册会员之后，您可得到如下"
-"专属权利：专属论坛、RPMs 和产品下载、购买 Mandrakelinux 产品的特殊折扣，等"
+"Mandriva Club 是专为 Mandriva Linux 用户建立的网站。注册会员之后，您可得到如"
+"下专属权利：专属论坛、RPMs 和产品下载、购买 Mandriva Linux 产品的特殊折扣，等"
 "等！"
 
 #.
-#: HTML/placeholder.h:48 mail/placeholder.h:22
-msgid "Mandrakestore"
-msgstr "Mandrakestore"
+#: HTML/placeholder.h:47 mail/placeholder.h:22
+msgid "Mandriva Store"
+msgstr "Mandriva Store"
 
-#. placeholder is mandrakestore URL
-#: HTML/placeholder.h:52
+#: HTML/placeholder.h:50
 msgid ""
-"Mandrakestore is the Mandrakesoft's online store. Thanks to its new look-and-"
+"Mandriva Store is the Mandriva's online store. Thanks to its new look-and-"
 "feel the purchase of products, services or third-party solutions has never "
 "been so easy!"
 msgstr ""
-"Mandrakestore 是 Mandrakesoft 的在线商店。得益于其全新观感，购买产品、服务或"
-"第三方解决方案从未如此容易！"
+"Mandriva Store 是 Mandriva 的在线商店。得益于其全新观感，购买产品、服务或第三"
+"方解决方案从未如此容易！"
 
-#. placeholder is mandrakeexpert URL
-#: HTML/placeholder.h:58
+#: HTML/placeholder.h:55
 msgid ""
-"Mandrakeexpert is the primary destination for receiving assistance from "
-"Mandrakesoft's support team."
-msgstr "Mandrakeexpert 是从 Mandrakesoft 的支持团队获取帮助的主要地点。"
+"Mandriva Expert is the primary destination for receiving assistance from "
+"Mandriva's support team."
+msgstr "Mandriva Expert 是从 Mandriva 的支持团队获取帮助的主要地点。"
 
 #. name appearing in To:
 #: mail/placeholder.h:8
-msgid "Mandrakesoft Users"
-msgstr "Mandrakesoft 用户"
+msgid "Mandriva Users"
+msgstr "Mandriva 用户"
 
 #. subject
 #: mail/placeholder.h:10
-msgid "Welcome to Mandrakelinux"
-msgstr "Mandrakelinux 欢迎您"
+msgid "Welcome to Mandriva Linux"
+msgstr "Mandriva Linux 欢迎您"
 
 #.
 #: mail/placeholder.h:12
-msgid "Welcome to Mandrakelinux!"
-msgstr "Mandrakelinux 欢迎您 !"
+msgid "Welcome to Mandriva Linux!"
+msgstr "Mandriva Linux 欢迎您 !"
 
 #. mail greeting heading
 #: mail/placeholder.h:14
@@ -126,11 +128,11 @@ msgstr "您好，"
 #.
 #: mail/placeholder.h:16
 msgid ""
-"We hope you are totally satisfied with Mandrakelinux. Below is a list of "
+"We hope you are totally satisfied with Mandriva Linux. Below is a list of "
 "useful websites:"
-msgstr "我们希望您对 Mandrakelinux 感到满意，下面是一些有用的网站："
+msgstr "我们希望您对 Mandriva Linux 感到满意，下面是一些有用的网站："
 
-#. placeholer is mandrakesoft.com URL
+#. placeholer is mandriva.com URL
 #: mail/placeholder.h:21
 #, c-format
 msgid ""
@@ -138,18 +140,18 @@ msgid ""
 "publisher of your favorite Linux distribution."
 msgstr "%s 网站提供了与您最喜爱的 Linux 发行版时刻保持亲密接触的全部细节。"
 
-#. placeholder is 'Mandrakestore'
+#. placeholder is 'Mandriva Store'
 #: mail/placeholder.h:25
 #, c-format
 msgid ""
-"%s is the Mandrakesoft's online store. Thanks to its new look-and-feel the "
+"%s is the Mandriva's online store. Thanks to its new look-and-feel the "
 "purchase of products, services or third-party solutions has never been so "
 "easy!"
 msgstr ""
-"%s 是 Mandrakesoft 的在线商店。得益于其全新的观感，购买产品、服务或第三方解决"
-"方案从未如此简单!"
+"%s 是 Mandriva 的在线商店。得益于其全新的观感，购买产品、服务或第三方解决方案"
+"从未如此简单!"
 
-#. placeholder is 'Mandrakeclub'
+#. placeholder is 'Mandriva Club'
 #: mail/placeholder.h:29
 #, c-format
 msgid ""
@@ -160,26 +162,26 @@ msgstr ""
 "序的地方。"
 
 #: mail/placeholder.h:30
-msgid "Mandrakeexpert"
-msgstr "Mandrakeexpert"
+msgid "Mandriva Expert"
+msgstr "Mandriva Expert"
 
-#. placeholder is 'Mandrakeexpert'
+#. placeholder is 'Mandriva Expert'
 #: mail/placeholder.h:33
 #, c-format
 msgid ""
-"%s is the primary destination for receiving assistance from Mandrakesoft's "
+"%s is the primary destination for receiving assistance from Mandriva's "
 "support team."
-msgstr "%s 是从 Mandrakesoft 的支持团队获取帮助的主要地点。"
+msgstr "%s 是从 Mandriva 的支持团队获取帮助的主要地点。"
 
-#. placeholder is 'Mandrakeonline'
+#. placeholder is 'Mandriva Online'
 #: mail/placeholder.h:37
 #, c-format
 msgid ""
-"%s is the latest service provided by Mandrakesoft. It allows you to keep "
-"your computer up-to-date through a centralized and automated service."
+"%s is the latest service provided by Mandriva. It allows you to keep your "
+"computer up-to-date through a centralized and automated service."
 msgstr ""
-"%s 是 Mandrakesoft 提供的最新服务。它允许您通过集中化的自动服务将您的计算机时"
-"刻保持最新。"
+"%s 是 Mandriva 提供的最新服务。它允许您通过集中化的自动服务将您的计算机时刻保"
+"持最新。"
 
 #. goodbye signature (1st line)
 #: mail/placeholder.h:39
@@ -188,8 +190,8 @@ msgstr "此致敬礼"
 
 #. goodbye signature (2nd line)
 #: mail/placeholder.h:41
-msgid "The Mandrakesoft team"
-msgstr "Mandrakesoft 团队"
+msgid "The Mandriva team"
+msgstr "Mandriva 团队"
 
 #~ msgid ""
 #~ "We take pride in providing the most user-friendly and full-featured Linux "
@@ -207,8 +209,8 @@ msgstr "Mandrakesoft 团队"
 #~ "%s 网站可让您与最喜爱的 Linux 发行版时刻保持亲密接触。您还可以从中发现新产"
 #~ "品和新服务。"
 
-#~ msgid "Mandrakeclub.com"
-#~ msgstr "Mandrakeclub.com"
+#~ msgid "Mandriva Club.com"
+#~ msgstr "Mandriva Club.com"
 
 #~ msgid ""
 #~ "We highly recommend that you join %s to take full advantage of special "
@@ -218,24 +220,24 @@ msgstr "Mandrakesoft 团队"
 #~ "我们强烈建议您加入 %s，以便感受我们为您精心准备的各种优惠，尽享特权，并能"
 #~ "访问数百个实用程序。"
 
-#~ msgid "Mandrakestore.com"
-#~ msgstr "Mandrakestore.com"
+#~ msgid "Mandriva Store.com"
+#~ msgstr "Mandriva Store.com"
 
 #~ msgid ""
-#~ "Get all the latest Mandrakesoft products, services and third-party "
-#~ "solutions at %s --  our official online store."
+#~ "Get all the latest Mandriva products, services and third-party solutions "
+#~ "at %s --  our official online store."
 #~ msgstr ""
-#~ "在官方的在线商场 %s 购得最新的 Mandrakesoft 产品、服务以及第三方解决方案。"
+#~ "在官方的在线商场 %s 购得最新的 Mandriva 产品、服务以及第三方解决方案。"
 
 #~ msgid ""
 #~ "Should you require technical assistance, support incidents may be "
-#~ "purchased at Mandrakestore.com where you can also register your official "
-#~ "Mandrakelinux pack. Then, just log into %s to receive assistance directly "
-#~ "from Mandrakesoft's support team and from the community of users."
+#~ "purchased at Mandriva Store.com where you can also register your official "
+#~ "Mandriva Linux pack. Then, just log into %s to receive assistance "
+#~ "directly from Mandriva's support team and from the community of users."
 #~ msgstr ""
-#~ "当您需要技术协助时，可在 Mandrakestore.com 购买支持事件。您也可同时注册您"
-#~ "的 Mandrakelinux 盒装产品。然后，只需登录到 %s 即可直接从 Mandrakesoft 的"
-#~ "支持团队和用户社区获得帮助。"
+#~ "当您需要技术协助时，可在 Mandriva Store.com 购买支持事件。您也可同时注册您"
+#~ "的 Mandriva Linux 盒装产品。然后，只需登录到 %s 即可直接从 Mandriva 的支持"
+#~ "团队和用户社区获得帮助。"
 
 #~ msgid ""
 #~ "If you are interested in contributing as a volunteer to the worldwide "
@@ -246,8 +248,8 @@ msgstr "Mandrakesoft 团队"
 #~ "阅以下链接中的详细信息：%s。"
 
 #~ msgid ""
-#~ "Purchase the latest Mandrakesoft products, services and third-party "
+#~ "Purchase the latest Mandriva products, services and third-party "
 #~ "solutions. %s is a 'must stop location' for adding value to your computer."
 #~ msgstr ""
-#~ "购买最新的 Mandrakesoft 产品、服务以及第三方解决方案。%s 必将为您计算机成"
-#~ "倍增添活力。"
+#~ "购买最新的 Mandriva 产品、服务以及第三方解决方案。%s 必将为您计算机成倍增"
+#~ "添活力。"