- switch to Mandriva

1 files changed, 44 insertions, 44 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4037df19..9872861e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -24,8 +24,8 @@ msgstr "您的系统已为最新"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrakeonline.net"
-msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrakeonline.net"
+"support@mandrivaonline.net"
+msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrivaonline.net"
 
 #: ../mdkapplet:75
 #, c-format
@@ -100,8 +100,8 @@ msgstr "立即配置!"
 
 #: ../mdkapplet:152 ../mdkapplet:232
 #, c-format
-msgid "Mandrakelinux Updates Applet"
-msgstr "Mandrakelinux 更新小程序"
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux 更新小程序"
 
 #: ../mdkapplet:162
 #, c-format
@@ -170,8 +170,8 @@ msgstr "调用 mdkupdate --applet\n"
 
 #: ../mdkapplet:227
 #, c-format
-msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
-msgstr "Mandrakeonline 似乎重新安装了，正在重新装入小程序..."
+msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+msgstr "Mandriva Online 似乎重新安装了，正在重新装入小程序..."
 
 #: ../mdkapplet:238
 #, c-format
@@ -185,8 +185,8 @@ msgstr "正在连接到"
 
 #: ../mdkapplet:247
 #, c-format
-msgid "Response from Mandrakeonline server\n"
-msgstr "Mandrakeonline 服务器的响应\n"
+msgid "Response from Mandriva Online server\n"
+msgstr "Mandriva Online 服务器的响应\n"
 
 #: ../mdkapplet:265
 #, c-format
@@ -210,8 +210,8 @@ msgstr "未知状态"
 
 #: ../mdkapplet:273
 #, c-format
-msgid "Online services disabled. Contact Mandrakeonline site\n"
-msgstr "在线服务已禁用。请浏览 Mandrakeonline 网站\n"
+msgid "Online services disabled. Contact Mandriva Online site\n"
+msgstr "在线服务已禁用。请浏览 Mandriva Online 网站\n"
 
 #: ../mdkapplet:274
 #, c-format
@@ -284,8 +284,8 @@ msgstr "退出"
 
 #: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: ../mdkonline:55
 #, c-format
@@ -314,7 +314,7 @@ msgid ""
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
-"您需要在本步骤中提供您在 Mandrakeonline 的账户。而本助手将会帮助您将您的配置"
+"您需要在本步骤中提供您在 Mandriva Online 的账户。而本助手将会帮助您将您的配置"
 "(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到安全更新和有"
 "用的升级。\n"
 
@@ -325,8 +325,8 @@ msgstr "账户创建或身份验证"
 
 #: ../mdkonline:119
 #, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "请输入您的 Mandrakeonline 登录名，密码和机器名:"
+msgid "Enter your Mandriva Online login, password and machine name:"
+msgstr "请输入您的 Mandriva Online 登录名，密码和机器名:"
 
 #: ../mdkonline:125 ../mdkonline:156
 #, c-format
@@ -340,16 +340,16 @@ msgstr "密码:"
 
 #: ../mdkonline:131
 #, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "正在连接到 Mandrakeonline 网站..."
+msgid "Connecting to Mandriva Online website..."
+msgstr "正在连接到 Mandriva Online 网站..."
 
 #: ../mdkonline:139
 #, c-format
 msgid ""
-"In order to benefit from Mandrakeonline services,\n"
+"In order to benefit from Mandriva Online services,\n"
 "we are about to upload your configuration.\n"
 "\n"
-"The Wizard will now send the following information to Mandrakesoft:\n"
+"The Wizard will now send the following information to Mandriva:\n"
 "1) the list of packages you have installed on your system,\n"
 "2) your hardware configuration.\n"
 "\n"
@@ -359,17 +359,17 @@ msgid ""
 "informed\n"
 "about security updates and useful upgrades via personalized email alerts.\n"
 "Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrakeexpert.com."
+"www.mandrivaexpert.com."
 msgstr ""
-"为了更好的享受 Mandrakeonline 的服务，我们即将上传您的配置。\n"
+"为了更好的享受 Mandriva Online 的服务，我们即将上传您的配置。\n"
 "\n"
-"向导现在将向 Mandrakesoft 发送下列信息:\n"
+"向导现在将向 Mandriva 发送下列信息:\n"
 "1) 您在系统中所安装的软件包列表；\n"
 "2) 您的硬件配置。\n"
 "\n"
 "如果您担心此操作会暴露您的个人隐私，或者不想享受此服务，请按“取消”。只要您按"
 "下“下一步”，就表明您允许我们通过个性化的电子邮件提醒您最新的安全更新和有用的"
-"升级。除此以外，您还能够从 www.mandrakeexpert.com 上得到支持服务的付费折扣。"
+"升级。除此以外，您还能够从 www.mandrivaexpert.com 上得到支持服务的付费折扣。"
 
 #: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:131
 #, c-format
@@ -391,22 +391,22 @@ msgstr "密码错误:"
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
+"Mandriva Online.\n"
 " In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
+"Mandriva Online.\n"
 " Be aware that you must also provide a Machine name \n"
 " (only alphabetical characters are admitted)"
 msgstr ""
 "您的登录名或密码有错。\n"
-"不管是哪种情况，您都需要重新输入一次。不然，您就需要在 Mandrakeonline 上创建"
+"不管是哪种情况，您都需要重新输入一次。不然，您就需要在 Mandriva Online 上创建"
 "一个账户。\n"
-"如果您想要创建账户的话，请返回到第一步，以连接到 Mandrakeonline。\n"
+"如果您想要创建账户的话，请返回到第一步，以连接到 Mandriva Online。\n"
 "请注意，您还必须提供一个机器名(只能由字母组成)"
 
 #: ../mdkonline:153
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "创建一个 Mandrakeonline 账户"
+msgid "Create a Mandriva Online Account"
+msgstr "创建一个 Mandriva Online 账户"
 
 #: ../mdkonline:158
 #, c-format
@@ -440,10 +440,10 @@ msgstr "不是有效的电子邮件地址!\n"
 #: ../mdkonline:169
 #, c-format
 msgid ""
-"Mandrakeonline Account successfully created.\n"
+"Mandriva Online Account successfully created.\n"
 "Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
-"Mandrakeonline 账户创建成功。\n"
+"Mandriva Online 账户创建成功。\n"
 "请单击“下一步”进行身份验证并上传您的配置\n"
 
 #: ../mdkonline:178
@@ -455,16 +455,16 @@ msgstr "您的上传已经成功!"
 #, c-format
 msgid ""
 "From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr "从现在开始，您将能够收到 Mandrakeonline 发出的安全和更新通知了。"
+"announcements thanks to Mandriva Online."
+msgstr "从现在开始，您将能够收到 Mandriva Online 发出的安全和更新通知了。"
 
 #: ../mdkonline:178
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
+"Mandriva Online offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
-"Mandrakeonline 还能让您自动保持更新。您的系统中会定期运行一个特定的程序，该程"
+"Mandriva Online 还能让您自动保持更新。您的系统中会定期运行一个特定的程序，该程"
 "序会自动下载并安装更新\n"
 
 #: ../mdkonline:180
@@ -484,8 +484,8 @@ msgstr "配置"
 
 #: ../mdkonline:203
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "您的 Mandrakeonline 账户已经配置成功\n"
+msgid "Your Mandriva Online account has been successfully configured\n"
+msgstr "您的 Mandriva Online 账户已经配置成功\n"
 
 #: ../mdkonline:219
 #, c-format
@@ -500,10 +500,10 @@ msgstr "读取配置出错"
 #: ../mdkonline:221
 #, c-format
 msgid ""
-"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"Cannot connect to Mandriva Online website: wrong login/password or router/"
 "firewall bad settings"
 msgstr ""
-"无法连接到 mandrakeonline 网站: 登录名/密码不对，或路由器/防火墙设置错误"
+"无法连接到 Mandriva Online 网站: 登录名/密码不对，或路由器/防火墙设置错误"
 
 #: ../mdkonline.pm:66
 #, c-format
@@ -539,14 +539,14 @@ msgstr "连接服务器出错\n"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandrakesoft.\n"
+"Copyright (C) %s Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate 版本 %s\n"
-"版权所有 (C) %s Mandrakesoft。\n"
+"版权所有 (C) %s Mandriva。\n"
 "这是自由软件, 它能在 GNU GPL 条款下再次发行。\n"
 "\n"
 "用法:\n"
@@ -574,7 +574,7 @@ msgstr "未找到 %s 文件。请先运行 mdkonline 向导"
 #: ../mdkupdate:131
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
-msgstr "Mandrakeonline 无法连接网站，请稍后再试一次。"
+msgstr "Mandriva Online 无法连接网站，请稍后再试一次。"
 
 #: ../mdkupdate:186
 #, c-format
@@ -586,6 +586,6 @@ msgstr "无法从 update_source 介质更新软件包。\n"
 
 #~ msgid ""
 #~ "Mandrakeupdate could not upload the diff files. Send a mail to support "
-#~ "[at] mandrakeonline [dot] net"
+#~ "[at] mandrivaonline [dot] net"
 #~ msgstr ""
-#~ "Mandrakeupdate 无法上传差异文件。请给 support@mandrakeonline.net 发送邮件"
+#~ "Mandrakeupdate 无法上传差异文件。请给 support@mandrivaonline.net 发送邮件"