1 files changed, 270 insertions, 132 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0faf713f..8c369893 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-08 16:17+0200\n"
+"POT-Creation-Date: 2005-09-16 17:25+0200\n"
 "PO-Revision-Date: 2004-11-20 22:06+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -15,244 +15,244 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:62
+#: ../mdkapplet:64
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
-#: ../mdkapplet:68
+#: ../mdkapplet:70
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrivaonline.com"
 
-#: ../mdkapplet:74
+#: ../mdkapplet:76
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "系统正忙。请稍候..."
 
-#: ../mdkapplet:80
+#: ../mdkapplet:82
 #, c-format
 msgid "New updates are available for your system"
 msgstr "您的系统没有可用的更新"
 
-#: ../mdkapplet:86
+#: ../mdkapplet:88
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "服务未配置。请点击“配置服务”"
 
-#: ../mdkapplet:92
+#: ../mdkapplet:94
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
-#: ../mdkapplet:98
+#: ../mdkapplet:100
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
-#: ../mdkapplet:104
+#: ../mdkapplet:106
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
-#: ../mdkapplet:109 ../mdkapplet:162
+#: ../mdkapplet:111 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Configure the service"
 msgstr "配置服务"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113
 #, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:112 ../mdkapplet:165 ../mdkonline:93 ../mdkonline:97
-#: ../mdkonline:135 ../mdkupdate:171
+#: ../mdkapplet:114 ../mdkapplet:167 ../mdkonline:87 ../mdkonline:91
+#: ../mdkonline:127 ../mdkupdate:176
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../mdkapplet:112 ../mdkapplet:164 ../mdkapplet:165
+#: ../mdkapplet:114 ../mdkapplet:166 ../mdkapplet:167
 #, c-format
 msgid "Check updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:114
+#: ../mdkapplet:116
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../mdkapplet:116
+#: ../mdkapplet:118
 #, c-format
 msgid "Configure Now!"
 msgstr "立即配置!"
 
-#: ../mdkapplet:150 ../mdkapplet:221
+#: ../mdkapplet:152 ../mdkapplet:223
 #, c-format
 msgid "Mandriva Linux Updates Applet"
 msgstr "Mandriva Linux 更新小程序"
 
-#: ../mdkapplet:160
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "动作"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: ../mdkapplet:167
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "查看日志"
 
-#: ../mdkapplet:170
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../mdkapplet:174 ../mdkapplet:381
+#: ../mdkapplet:176 ../mdkapplet:381
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:204
 #, c-format
 msgid "Network Connection: "
 msgstr "网络连接: "
 
-#: ../mdkapplet:202
+#: ../mdkapplet:204
 #, c-format
 msgid "Up"
 msgstr "通"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:204
 #, c-format
 msgid "Down"
 msgstr "断"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:205
 #, c-format
 msgid "Last check: "
 msgstr "上次检查: "
 
-#: ../mdkapplet:204 ../mdkonline:131
+#: ../mdkapplet:206 ../mdkonline:120
 #, c-format
 msgid "Machine name:"
 msgstr "机器名: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:207
 #, c-format
 msgid "Updates: "
 msgstr "更新: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:211
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Drak 连接\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:215
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "调用 mdkupdate --applet\n"
 
-#: ../mdkapplet:216
+#: ../mdkapplet:218
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online 似乎重新安装了，正在重新装入小程序..."
 
-#: ../mdkapplet:227
+#: ../mdkapplet:229
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:229
+#: ../mdkapplet:231
 #, c-format
 msgid "Connecting to"
 msgstr "正在连接到"
 
-#: ../mdkapplet:240
+#: ../mdkapplet:242
 #, c-format
 msgid "Response from Mandriva Online server\n"
 msgstr "Mandriva Online 服务器的响应\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:260
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "正在检查... 有可用的更新\n"
 
-#: ../mdkapplet:263
+#: ../mdkapplet:265
 #, c-format
 msgid "Development release not supported by service"
 msgstr "此服务不支持开发版本"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:266
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "此服务器不支持太旧的版本"
 
-#: ../mdkapplet:265
+#: ../mdkapplet:267
 #, c-format
 msgid "Unknown state"
 msgstr "未知状态"
 
-#: ../mdkapplet:266
+#: ../mdkapplet:268
 #, c-format
 msgid "Online services disabled. Contact Mandriva Online site\n"
 msgstr "在线服务已禁用。请浏览 Mandriva Online 网站\n"
 
-#: ../mdkapplet:267
+#: ../mdkapplet:269
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "密码错误。\n"
 
-#: ../mdkapplet:268
+#: ../mdkapplet:270
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "动作、主机或用户名错误。\n"
 
-#: ../mdkapplet:269
+#: ../mdkapplet:271
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
 
-#: ../mdkapplet:271
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Problem occured while connecting to the server, please contact the support "
 "team"
 msgstr "连接到服务器时发生问题，请联系支持团队"
 
-#: ../mdkapplet:273
+#: ../mdkapplet:275
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:305
+#: ../mdkapplet:307
 #, c-format
 msgid "No check"
 msgstr "不检查"
 
-#: ../mdkapplet:318
+#: ../mdkapplet:320
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "检查配置文件：不存在\n"
 
-#: ../mdkapplet:321
+#: ../mdkapplet:323
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
@@ -282,32 +282,47 @@ msgstr "在启动时自动调用"
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkonline:58 ../mdkonline:110
+#: ../mdkonline:59 ../mdkonline:99
 #, c-format
 msgid "Mandriva Online"
 msgstr "Mandriva Online"
 
-#: ../mdkonline:61
+#: ../mdkonline:62
 #, c-format
 msgid "I already have an account"
 msgstr "我已经有账户了"
 
-#: ../mdkonline:62
+#: ../mdkonline:63
 #, c-format
 msgid "I want to subscribe"
 msgstr "我想要订阅"
 
-#: ../mdkonline:93
+#: ../mdkonline:68
+#, c-format
+msgid "Mr."
+msgstr ""
+
+#: ../mdkonline:68
+#, fuzzy, c-format
+msgid "Mrs."
+msgstr "XMrIs"
+
+#: ../mdkonline:68
+#, c-format
+msgid "Ms."
+msgstr ""
+
+#: ../mdkonline:87
 #, c-format
 msgid "Reading configuration\n"
 msgstr "正在读取配置\n"
 
-#: ../mdkonline:97
+#: ../mdkonline:91
 #, c-format
 msgid "Sending configuration..."
 msgstr "正在发送配置..."
 
-#: ../mdkonline:113
+#: ../mdkonline:102
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -318,32 +333,37 @@ msgstr ""
 "(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到安全更新和有"
 "用的升级。\n"
 
-#: ../mdkonline:118
+#: ../mdkonline:107
 #, c-format
 msgid "Account creation or authentication"
 msgstr "账户创建或身份验证"
 
-#: ../mdkonline:123
+#: ../mdkonline:112
 #, c-format
 msgid "Enter your Mandriva Online login, password and machine name:"
 msgstr "请输入您的 Mandriva Online 登录名，密码和机器名:"
 
-#: ../mdkonline:129 ../mdkonline:160
-#, c-format
-msgid "Login:"
-msgstr "登录名:"
+#: ../mdkonline:118 ../mdkonline:158
+#, fuzzy, c-format
+msgid "Email address:"
+msgstr "IP 地址："
 
-#: ../mdkonline:130 ../mdkonline:161
+#: ../mdkonline:119 ../mdkonline:159
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../mdkonline:135
+#: ../mdkonline:125
+#, fuzzy, c-format
+msgid "Machine name must be 1 to 40 alphanumerical characters"
+msgstr "挂载点只能包含字母和数字"
+
+#: ../mdkonline:127
 #, c-format
 msgid "Connecting to Mandriva Online website..."
 msgstr "正在连接到 Mandriva Online 网站..."
 
-#: ../mdkonline:143
+#: ../mdkonline:137
 #, c-format
 msgid ""
 "In order to benefit from Mandriva Online services,\n"
@@ -371,53 +391,31 @@ msgstr ""
 "下“下一步”，就表明您允许我们通过个性化的电子邮件提醒您最新的安全更新和有用的"
 "升级。除此以外，您还能够从 www.mandrivaexpert.com 上得到支持服务的付费折扣。"
 
-#: ../mdkonline:145 ../mdkonline:184 ../mdkupdate:141
+#: ../mdkonline:152
 #, c-format
-msgid "Connection problem"
-msgstr "连接问题"
-
-#: ../mdkonline:145
-#, c-format
-msgid "or"
-msgstr "或"
+msgid "Create a Mandriva Online Account"
+msgstr "创建一个 Mandriva Online 账户"
 
-#: ../mdkonline:145
-#, c-format
-msgid "wrong password:"
-msgstr "密码错误:"
+#: ../mdkonline:155
+#, fuzzy, c-format
+msgid "Greeting:"
+msgstr "绿"
 
-#: ../mdkonline:145
+#: ../mdkonline:156
 #, c-format
-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 "
-"Mandriva Online.\n"
-" In the latter case, go back to the first step to connect to Mandriva "
-"Online.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
-msgstr ""
-"您的登录名或密码有错。\n"
-"不管是哪种情况，您都需要重新输入一次。不然，您就需要在 Mandriva Online 上创建"
-"一个账户。\n"
-"如果您想要创建账户的话，请返回到第一步，以连接到 Mandriva Online。\n"
-"请注意，您还必须提供一个机器名(只能由字母组成)"
+msgid "First name:"
+msgstr "名:"
 
 #: ../mdkonline:157
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "创建一个 Mandriva Online 账户"
+#, fuzzy, c-format
+msgid "Last name:"
+msgstr "主机名："
 
-#: ../mdkonline:162
+#: ../mdkonline:160
 #, c-format
 msgid "Confirm Password:"
 msgstr "确认密码:"
 
-#: ../mdkonline:163
-#, c-format
-msgid "Mail contact:"
-msgstr "联系邮件:"
-
 #: ../mdkonline:167
 #, c-format
 msgid ""
@@ -428,9 +426,9 @@ msgstr ""
 " 请再试一次\n"
 
 #: ../mdkonline:167
-#, c-format
-msgid "Please provide a login"
-msgstr "请提供有效的登录名"
+#, fuzzy, c-format
+msgid "Please fill in each field"
+msgstr "所有内容都是必填的\n"
 
 #: ../mdkonline:167
 #, c-format
@@ -467,6 +465,11 @@ msgstr ""
 "Mandriva Online 还能让您自动保持更新。您的系统中会定期运行一个特定的程序，该"
 "程序会自动下载并安装更新\n"
 
+#: ../mdkonline:184 ../mdkupdate:146
+#, c-format
+msgid "Connection problem"
+msgstr "连接问题"
+
 #: ../mdkonline:184
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
@@ -505,37 +508,127 @@ msgid ""
 msgstr ""
 "无法连接到 Mandriva Online 网站: 登录名/密码不对，或路由器/防火墙设置错误"
 
-#: ../mdkonline.pm:54
+#: ../mdkonline.pm:95
+#, fuzzy, c-format
+msgid "Security error"
+msgstr "安全警告: "
+
+#: ../mdkonline.pm:95
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
-msgstr "登录名和密码都必须少于 12 个字符\n"
+msgid "Unsecure invocation: Method available through httpS only"
+msgstr ""
+
+#: ../mdkonline.pm:96
+#, fuzzy, c-format
+msgid "Database error"
+msgstr "数据库错误"
 
-#: ../mdkonline.pm:55
+#: ../mdkonline.pm:96
 #, c-format
-msgid "Special characters are not allowed\n"
-msgstr "不允许出现特殊字符\n"
+msgid ""
+"Server Database failed\n"
+"Please Try again Later"
+msgstr ""
+
+#: ../mdkonline.pm:97
+#, fuzzy, c-format
+msgid "Registration error"
+msgstr "注册类型"
+
+#: ../mdkonline.pm:97
+#, fuzzy, c-format
+msgid "Some parameters are missing"
+msgstr "没有找到远程打印机！"
+
+#: ../mdkonline.pm:98 ../mdkonline.pm:104
+#, fuzzy, c-format
+msgid "Password error"
+msgstr "密码服务器"
 
-#: ../mdkonline.pm:56
+#: ../mdkonline.pm:98
 #, c-format
-msgid "Please fill in all fields\n"
-msgstr "所有内容都是必填的\n"
+msgid "Wrong password"
+msgstr "密码错误"
+
+#: ../mdkonline.pm:99 ../mdkonline.pm:100 ../mdkonline.pm:101
+#, fuzzy, c-format
+msgid "Login error"
+msgstr "未知错误"
+
+#: ../mdkonline.pm:99
+#, fuzzy, c-format
+msgid ""
+"The email you provided is already in use\n"
+"Please enter another one\n"
+msgstr "目的目录已经被使用，请选择其他的目录。"
 
-#: ../mdkonline.pm:57
+#: ../mdkonline.pm:100
 #, c-format
-msgid "Email not valid\n"
-msgstr "电子邮件无效\n"
+msgid "The email you provided is invalid or forbidden"
+msgstr ""
+
+#: ../mdkonline.pm:101
+#, fuzzy, c-format
+msgid ""
+"Email address box is empty\n"
+"Please provide one"
+msgstr "名字栏是空的，请提供一个名字"
+
+#: ../mdkonline.pm:102
+#, fuzzy, c-format
+msgid "Restriction Error"
+msgstr "限制 WEP"
+
+#: ../mdkonline.pm:102
+#, fuzzy, c-format
+msgid "Database access forbidden"
+msgstr "数据库服务器"
+
+#: ../mdkonline.pm:103 ../mdkonline.pm:105
+#, fuzzy, c-format
+msgid "Service error"
+msgstr "写入错误\n"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:103
 #, c-format
-msgid "Account already exists\n"
-msgstr "账户已存在\n"
+msgid ""
+"Mandriva web services are currently unavailable\n"
+"Please Try again Later"
+msgstr ""
+
+#: ../mdkonline.pm:104
+#, fuzzy, c-format
+msgid "Password mismatch"
+msgstr "密码不匹配。"
 
-#: ../mdkonline.pm:64
+#: ../mdkonline.pm:105
 #, c-format
-msgid "Problem connecting to server \n"
-msgstr "连接服务器出错\n"
+msgid ""
+"Mandriva web services are under maintenance\n"
+"Please Try again Later"
+msgstr ""
+
+#: ../mdkonline.pm:106
+#, fuzzy, c-format
+msgid "User Forbidden"
+msgstr "用户登录:"
 
-#: ../mdkupdate:60
+#: ../mdkonline.pm:106
+#, c-format
+msgid "User account forbidden by Mandriva web services"
+msgstr ""
+
+#: ../mdkonline.pm:107
+#, fuzzy, c-format
+msgid "Connection error"
+msgstr "连接名称"
+
+#: ../mdkonline.pm:107
+#, c-format
+msgid "Mandriva web services not reachable"
+msgstr ""
+
+#: ../mdkupdate:61
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -551,56 +644,101 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkupdate:65
+#: ../mdkupdate:66
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help        - 打印本帮助信息。\n"
 
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "  --auto         - Mandriva Update launched automatically.\n"
 msgstr "  --auto        - 自动调用 Mandriva Update。\n"
 
-#: ../mdkupdate:67
+#: ../mdkupdate:68
 #, c-format
 msgid "  --applet       - launch Mandriva Update.\n"
 msgstr "  --applet      - 调用 Mandriva Update。\n"
 
-#: ../mdkupdate:68
+#: ../mdkupdate:69
 #, c-format
 msgid "  --mnf          - launch mnf specific scripts.\n"
 msgstr "  --mnf          - 调用 mnf 指定的脚本。\n"
 
-#: ../mdkupdate:69
+#: ../mdkupdate:70
 #, c-format
 msgid "  --noX          - text mode version of Mandriva Update.\n"
 msgstr "  --noX          - Mandriva 更新的文本模式版本。\n"
 
-#: ../mdkupdate:77
+#: ../mdkupdate:78
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "未找到 %s 文件。请先运行 mdkonline 向导"
 
-#: ../mdkupdate:141
+#: ../mdkupdate:146
 #, c-format
 msgid "Mandriva Update could not contact the site, we will try again."
 msgstr "Mandriva Online 无法连接网站，请稍后再试一次。"
 
-#: ../mdkupdate:149
+#: ../mdkupdate:154
 #, c-format
 msgid "Choose which packages should be installed and Press Ok"
 msgstr "选择要安装的软件包，然后单击确定"
 
-#: ../mdkupdate:171
+#: ../mdkupdate:176
 #, c-format
 msgid "Installing packages ...\n"
 msgstr "正在安装软件包...\n"
 
-#: ../mdkupdate:174 ../mdkupdate:259
+#: ../mdkupdate:179 ../mdkupdate:264
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "无法从 update_source 介质更新软件包。\n"
 
+#~ msgid "Login:"
+#~ msgstr "登录名:"
+
+#~ msgid "or"
+#~ msgstr "或"
+
+#~ msgid "wrong password:"
+#~ 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 Mandriva Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "Online.\n"
+#~ " Be aware that you must also provide a Machine name \n"
+#~ " (only alphabetical characters are admitted)"
+#~ msgstr ""
+#~ "您的登录名或密码有错。\n"
+#~ "不管是哪种情况，您都需要重新输入一次。不然，您就需要在 Mandriva Online 上"
+#~ "创建一个账户。\n"
+#~ "如果您想要创建账户的话，请返回到第一步，以连接到 Mandriva Online。\n"
+#~ "请注意，您还必须提供一个机器名(只能由字母组成)"
+
+#~ msgid "Mail contact:"
+#~ msgstr "联系邮件:"
+
+#~ msgid "Please provide a login"
+#~ msgstr "请提供有效的登录名"
+
+#~ msgid "Login and password should be less than 12 characters\n"
+#~ msgstr "登录名和密码都必须少于 12 个字符\n"
+
+#~ msgid "Special characters are not allowed\n"
+#~ msgstr "不允许出现特殊字符\n"
+
+#~ msgid "Email not valid\n"
+#~ msgstr "电子邮件无效\n"
+
+#~ msgid "Account already exists\n"
+#~ msgstr "账户已存在\n"
+
+#~ msgid "Problem connecting to server \n"
+#~ msgstr "连接服务器出错\n"
+
 #~ msgid ""
 #~ "Problem occurred while connecting to the server, please contact the "
 #~ "support team"