From 98d145626395a363f79c9f882fa93e1c3b552e38 Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Tue, 20 Jul 2004 05:18:57 +0000
Subject: changed MandrakeSoft -> Mandrakesoft

---
 po/zh_CN.po | 288 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 139 insertions(+), 149 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5bb34a91..2da2a5fa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-15 17:47+0200\n"
+"POT-Creation-Date: 2004-07-20 14:33+0200\n"
 "PO-Revision-Date: 2004-07-14 16:16+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -14,132 +14,132 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:62
+#: ../mdkapplet:65
 msgid "No updates available for your system"
 msgstr "您的系统没有可用的更新"
 
-#: ../mdkapplet:68
+#: ../mdkapplet:71
 msgid "Config problems. Launch \"configure\" again"
 msgstr "配置问题。请再次调用“配置”"
 
-#: ../mdkapplet:74
+#: ../mdkapplet:77
 msgid "System is busy. Wait ..."
 msgstr "系统正忙。请稍候..."
 
-#: ../mdkapplet:80
+#: ../mdkapplet:83
 #, perl-format
 msgid "%s packages available for update"
 msgstr "%s 软件包可进行更新"
 
-#: ../mdkapplet:86
+#: ../mdkapplet:89
 msgid "Service not available. Click on \"configuration\""
 msgstr "服务不可用。请点击“配置”"
 
-#: ../mdkapplet:92
+#: ../mdkapplet:95
 msgid "Network is down. Click on \"configure Network\""
 msgstr "网络已掉线。请点击“配置网络”"
 
-#: ../mdkapplet:98
+#: ../mdkapplet:101
 msgid "Service deactivated. Waiting for payment..."
 msgstr "服务已禁用。等候付款..."
 
-#: ../mdkapplet:102
+#: ../mdkapplet:105
 msgid "Launch Mandrake Update"
 msgstr "调用 Mandrakeupdate"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:106
 msgid "Configuration"
 msgstr "配置"
 
-#: ../mdkapplet:104
+#: ../mdkapplet:107
 msgid "Check Updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:105
+#: ../mdkapplet:108
 msgid "Online WebSite"
 msgstr "在线网站"
 
-#: ../mdkapplet:106
+#: ../mdkapplet:109
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../mdkapplet:107
+#: ../mdkapplet:110
 msgid "Configure Now!"
 msgstr "立即配置!"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:142
 msgid "Mandrake Updates Applet"
 msgstr "Mandrakelinux 更新小程序"
 
-#: ../mdkapplet:147
+#: ../mdkapplet:150
 msgid "Actions"
 msgstr "动作"
 
-#: ../mdkapplet:149
+#: ../mdkapplet:152
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mdkapplet:150
+#: ../mdkapplet:153
 msgid "Configure"
 msgstr "配置"
 
-#: ../mdkapplet:151 ../mdkapplet:163 ../mdkapplet:364
+#: ../mdkapplet:154 ../mdkapplet:166 ../mdkapplet:359
 msgid "Available"
 msgstr "可用"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:154
 msgid "Check updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:154
 msgid "Checking ..."
 msgstr "正在检查..."
 
-#: ../mdkapplet:151 ../mdkapplet:163 ../mdkapplet:364
+#: ../mdkapplet:154 ../mdkapplet:166 ../mdkapplet:359
 msgid "Not Available"
 msgstr "不可用"
 
-#: ../mdkapplet:152
+#: ../mdkapplet:155
 msgid "See logs"
 msgstr "查看日志"
 
-#: ../mdkapplet:155
+#: ../mdkapplet:158
 msgid "Status"
 msgstr "状态"
 
-#: ../mdkapplet:158
+#: ../mdkapplet:161
 msgid "Network Connection: "
 msgstr "网络连接: "
 
-#: ../mdkapplet:159
+#: ../mdkapplet:162
 msgid "Down"
 msgstr "向下"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:162
 msgid "Up"
 msgstr "向上"
 
-#: ../mdkapplet:162
+#: ../mdkapplet:165
 msgid "New Updates: "
 msgstr "新更新: "
 
-#: ../mdkapplet:166
+#: ../mdkapplet:169
 msgid "Last check: "
 msgstr "上次检查: "
 
-#: ../mdkapplet:172 ../mdkapplet:414
+#: ../mdkapplet:175 ../mdkapplet:409
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet:194
+#: ../mdkapplet:197
 msgid "Launching drakconnect\n"
 msgstr "调用 Drak 连接\n"
 
-#: ../mdkapplet:198
+#: ../mdkapplet:201
 msgid "Launching mdkupdate --applet\n"
 msgstr "调用 mdkupdate --applet\n"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:206
 msgid "Mdkonline seems to be reinstalled, reloading applet ...."
 msgstr "Mdkonline 似乎重新安装了，正在重新装入小程序..."
 
@@ -147,82 +147,81 @@ msgstr "Mdkonline 似乎重新安装了，正在重新装入小程序..."
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:221
+#: ../mdkapplet:216
 msgid "Connecting to"
 msgstr "正在连接到"
 
-#: ../mdkapplet:243
+#: ../mdkapplet:238
 msgid "Checking... Updates are available\n"
 msgstr "正在检查... 有可用的更新\n"
 
-#: ../mdkapplet:247
+#: ../mdkapplet:242
 msgid "Unknown state"
 msgstr "未知状态"
 
-#: ../mdkapplet:248
+#: ../mdkapplet:243
 msgid "Online services disabled. Contact MandrakeOnline site\n"
 msgstr "在线服务已禁用。请浏览 Mandrakeonline 网站\n"
 
-#: ../mdkapplet:249
+#: ../mdkapplet:244
 msgid "Wrong Password.\n"
 msgstr "密码错误。\n"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:245
 msgid "Wrong Action or host or login.\n"
 msgstr "动作、主机或用户名错误。\n"
 
-#: ../mdkapplet:251
+#: ../mdkapplet:246
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
-msgstr ""
-"您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
+msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:250
 msgid "System is up to date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:343
+#: ../mdkapplet:338
 msgid "No check"
 msgstr "不检查"
 
-#: ../mdkapplet:356
+#: ../mdkapplet:351
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:359
+#: ../mdkapplet:354
 msgid "Checking config file: Not present\n"
 msgstr "检查配置文件：不存在\n"
 
-#: ../mdkapplet:404
+#: ../mdkapplet:399
 msgid "Logs"
 msgstr "日志"
 
-#: ../mdkapplet:420
+#: ../mdkapplet:415
 msgid "Clear"
 msgstr "清除"
 
-#: ../mdkapplet:446
+#: ../mdkapplet:441
 msgid "About.."
 msgstr "关于..."
 
-#: ../mdkapplet:447
+#: ../mdkapplet:442
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkapplet:459
+#: ../mdkapplet:454
 msgid "Attempting to connect to mandrakeonline.net\n"
 msgstr "正在尝试连接到 mandrakeonline.net\n"
 
-#: ../mdkonline:98
+#: ../mdkonline:86
 msgid "Skip Wizard"
 msgstr "跳过向导"
 
-#: ../mdkonline:117
+#: ../mdkonline:100
 msgid "Welcome to MandrakeOnline"
 msgstr "MandrakeOnline 欢迎您"
 
-#: ../mdkonline:118
+#: ../mdkonline:101
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -233,60 +232,60 @@ msgstr ""
 "的配置(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到\n"
 "安全更新和有用的升级。\n"
 
-#: ../mdkonline:119
+#: ../mdkonline:102
 msgid "Create a MandrakeOnline Account"
 msgstr "创建一个 Mandrakeonline 账户"
 
-#: ../mdkonline:121
+#: ../mdkonline:104
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "我没有 Mandrakeonline 账户, 我要"
 
-#: ../mdkonline:121
+#: ../mdkonline:104
 msgid "Subscribe"
 msgstr "订阅"
 
-#: ../mdkonline:125 ../mdkonline:145
+#: ../mdkonline:108 ../mdkonline:128
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../mdkonline:126 ../mdkonline:146
+#: ../mdkonline:109 ../mdkonline:129
 msgid "Password:"
 msgstr "密码:"
 
-#: ../mdkonline:127
+#: ../mdkonline:110
 msgid "Confirm Password:"
 msgstr "确认密码:"
 
-#: ../mdkonline:128
+#: ../mdkonline:111
 msgid "Mail contact:"
 msgstr "联系邮件："
 
-#: ../mdkonline:135
+#: ../mdkonline:118
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux 隐私保护政策"
 
-#: ../mdkonline:141
+#: ../mdkonline:124
 msgid "Authentification"
 msgstr "身份验证"
 
-#: ../mdkonline:142
+#: ../mdkonline:125
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "请输入您的 Mandrakeonline 登录名, 密码和机器名:"
 
-#: ../mdkonline:147
+#: ../mdkonline:130
 msgid "Machine name:"
 msgstr "机器名:"
 
-#: ../mdkonline:152
+#: ../mdkonline:135
 msgid "Send Configuration"
 msgstr "发送配置"
 
-#: ../mdkonline:153
+#: ../mdkonline:136
 msgid ""
 "In order to benefit from MandrakeOnline 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 Mandrakesoft:\n"
 "1) the list of packages you have installed on your system,\n"
 "2) your hardware configuration.\n"
 "\n"
@@ -312,11 +311,11 @@ msgstr ""
 "到支持服务的付费折扣。\n"
 "最后，您还能得到一个 username@mandrakeonline.net 的电子邮件别名。"
 
-#: ../mdkonline:158 ../mdkonline:269 ../mdkonline:298
+#: ../mdkonline:141 ../mdkonline:208 ../mdkonline:234
 msgid "Finish"
 msgstr "完成"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -324,7 +323,7 @@ msgstr ""
 "从现在开始，您将能够收到 Mandrakeonline 发出的安全\n"
 "和更新通知了。"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -332,75 +331,27 @@ msgstr ""
 "Mandrakeonline 还能让您自动保持更新。您的系统中会定期运行一个特\n"
 "定的程序，该程序会自动下载并安装更新\n"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid "Your upload was successful!"
 msgstr "您的上传已经成功!"
 
-#: ../mdkonline:160
+#: ../mdkonline:143
 msgid "automated Upgrades"
 msgstr "自动升级"
 
-#: ../mdkonline:165
+#: ../mdkonline:148
 msgid "Country:"
 msgstr "国家:"
 
-#: ../mdkonline:198
-msgid "Creation"
-msgstr "创建"
-
-#: ../mdkonline:198
-msgid "Login and password should be less than 12 characters\n"
-msgstr "登录名和密码都应该小于 12 个字符\n"
-
-#: ../mdkonline:199
-msgid "Special characters"
-msgstr "特殊字符"
-
-#: ../mdkonline:199
-msgid "Special characters are not allowed\n"
-msgstr "不允许特殊字符\n"
-
-#: ../mdkonline:200
-msgid "Empty fields"
-msgstr "空内容"
-
-#: ../mdkonline:200
-msgid "Please fill in all fields\n"
-msgstr "请填入全部内容\n"
-
-#: ../mdkonline:201
-msgid "Email"
-msgstr "电子邮件"
-
-#: ../mdkonline:201
-msgid "Email not valid\n"
-msgstr "电子邮件无效\n"
-
-#: ../mdkonline:202
-msgid "Account already exist\n"
-msgstr "账户已经存在\n"
-
-#: ../mdkonline:202
-msgid "Change account"
-msgstr "更改账户"
-
-#: ../mdkonline:208
-msgid "Problem connecting to server \n"
-msgstr "连接到服务器有问题\n"
-
-#: ../mdkonline:208
-msgid "Server Problem"
-msgstr "服务器问题"
-
-#: ../mdkonline:213 ../mdkonline:215 ../mdkonline:217
+#: ../mdkonline:182 ../mdkonline:184 ../mdkonline:186
 msgid "Error"
 msgstr "出错"
 
-#: ../mdkonline:213
+#: ../mdkonline:182
 msgid "Please provide a login"
 msgstr "请提供有效的登录名"
 
-#: ../mdkonline:215
+#: ../mdkonline:184
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -408,31 +359,39 @@ msgstr ""
 "密码不匹配\n"
 " 请再试一次\n"
 
-#: ../mdkonline:217
+#: ../mdkonline:186
 msgid "Not a valid mail address!\n"
 msgstr "不是有效的电子邮件地址!\n"
 
-#: ../mdkonline:247
+#: ../mdkonline:198
+msgid "Reading configuration\n"
+msgstr "正在读取配置\n"
+
+#: ../mdkonline:203
 msgid "Sending configuration..."
 msgstr "正在发送配置..."
 
-#: ../mdkonline:273 ../mdkonline:349
+#: ../mdkonline:210 ../mdkonline:274
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: ../mdkonline:273 ../mdkonline:349
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline 无法连接到站点, 请稍后再试一次"
+#: ../mdkonline:210
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
 
-#: ../mdkonline:315
+#: ../mdkonline:251
 msgid "Quitting Wizard\n"
 msgstr "正在退出向导\n"
 
-#: ../mdkonline:361
+#: ../mdkonline:274
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "Mandrakeonline 无法连接到站点, 请稍后再试一次"
+
+#: ../mdkonline:286
 msgid "Wrong password"
 msgstr "密码错误"
 
-#: ../mdkonline:361
+#: ../mdkonline:286
 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 "
@@ -448,15 +407,11 @@ msgstr ""
 "如果您想要创建账户的话，请返回到第一步，以连接到 Mandrakeonline。\n"
 "请注意，您还必须提供一个机器名(只能由字母组成)"
 
-#: ../mdkonline:368
-msgid "Reading configuration\n"
-msgstr "正在读取配置\n"
-
-#: ../mdkupdate:58
+#: ../mdkupdate:53
 #, perl-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s MandrakeSoft.\n"
+"Copyright (C) %s Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -468,25 +423,60 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkupdate:63
+#: ../mdkupdate:58
 msgid "  --help         - print this help message.\n"
 msgstr "  --help        - 打印本帮助信息。\n"
 
-#: ../mdkupdate:64
+#: ../mdkupdate:59
 msgid "  --auto         - Mdkupdate launched automatically.\n"
 msgstr "  --auto        - 自动调用 Mandrakelinux Update。\n"
 
-#: ../mdkupdate:65
+#: ../mdkupdate:60
 msgid "  --applet       - launch MandrakeUpdate.\n"
 msgstr "  --applet      - 调用 Mandrakelinux Update。\n"
 
-#: ../mdkupdate:66
+#: ../mdkupdate:61
 msgid "  --update       - Update keys\n"
 msgstr "  --update      - 更新密钥\n"
 
-#: ../mdkupdate:276
-msgid "Unable to update packages from mdkupdate medium.\n"
-msgstr "无法从 mdkupdate 介质中更新包。\n"
+#~ msgid "Creation"
+#~ msgstr "创建"
+
+#~ msgid "Login and password should be less than 12 characters\n"
+#~ msgstr "登录名和密码都应该小于 12 个字符\n"
+
+#~ msgid "Special characters"
+#~ msgstr "特殊字符"
+
+#~ msgid "Special characters are not allowed\n"
+#~ msgstr "不允许特殊字符\n"
+
+#~ msgid "Empty fields"
+#~ msgstr "空内容"
+
+#~ msgid "Please fill in all fields\n"
+#~ msgstr "请填入全部内容\n"
+
+#~ msgid "Email"
+#~ msgstr "电子邮件"
+
+#~ msgid "Email not valid\n"
+#~ msgstr "电子邮件无效\n"
+
+#~ msgid "Account already exist\n"
+#~ msgstr "账户已经存在\n"
+
+#~ msgid "Change account"
+#~ msgstr "更改账户"
+
+#~ msgid "Problem connecting to server \n"
+#~ msgstr "连接到服务器有问题\n"
+
+#~ msgid "Server Problem"
+#~ msgstr "服务器问题"
+
+#~ msgid "Unable to update packages from mdkupdate medium.\n"
+#~ msgstr "无法从 mdkupdate 介质中更新包。\n"
 
 #~ msgid "Response from MandrakeOnline server\n"
 #~ msgstr "MandrakeOnline 服务器的响应\n"
@@ -632,7 +622,7 @@ msgstr "无法从 mdkupdate 介质中更新包。\n"
 #~ "Please take a few seconds to fill a short questionnaire. The data from "
 #~ "this \n"
 #~ "questionnaire will be used only for aggregate market studies.\n"
-#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "The text below is the privacy policy of Mandrakesoft about your personal "
 #~ "data."
 #~ msgstr ""
 #~ "您即将首次启动我们的 Mandrake Linux 免费下载版本。\n"
@@ -641,7 +631,7 @@ msgstr "无法从 mdkupdate 介质中更新包。\n"
 #~ "\n"
 #~ "请花一点时间完成小小的问卷调查。此问卷调查所收集的数据将只会用于市场研"
 #~ "究。\n"
-#~ "下面说明了 MandrakeSoft 关于您个人数据的隐私保护政策。"
+#~ "下面说明了 Mandrakesoft 关于您个人数据的隐私保护政策。"
 
 #~ msgid ""
 #~ "What personal data do we collect ?         \n"
-- 
cgit v1.2.1