merge new tool mdkonline_tui

1 files changed, 239 insertions, 48 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d74ca155..d55f6d24 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: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-21 21:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -16,218 +16,271 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "系统正忙。请稍候..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "您的系统没有可用的更新"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "服务未配置。请点击“配置服务”"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "配置服务"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "立即配置!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 更新小程序"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "动作"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "配置"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "检查更新"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "查看日志"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "状态"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "关闭"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "断"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "网络连接: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "通"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "断"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "上次检查: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "更新: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Drak 连接\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "调用 mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline 似乎重新安装了，正在重新装入小程序..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "正在连接到"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "正在检查... 有可用的更新\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "此服务不支持开发版本"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "此服务器不支持太旧的版本"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "未知状态"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "在线服务已禁用。请浏览 Mandrakeonline 网站\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "密码错误。\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "动作、主机或用户名错误。\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "不检查"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "检查配置文件：不存在\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "日志"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "清除"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "关于..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "上一步"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "跳过向导"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "上一步"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline 欢迎您"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -237,55 +290,68 @@ msgstr ""
 "的配置(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到\n"
 "安全更新和有用的升级。\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "创建一个 Mandrakeonline 账户"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "我没有 Mandrakeonline 账户, 我要"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "订阅"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "确认密码:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "联系邮件："
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux 隐私保护政策"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "身份验证"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "请输入您的 Mandrakeonline 登录名, 密码和机器名:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "机器名:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "发送配置"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -316,11 +382,18 @@ msgstr ""
 "到支持服务的付费折扣。\n"
 "最后，您还能得到一个 username@mandrakeonline.net 的电子邮件别名。"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "完成"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "您的上传已经成功!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -328,7 +401,8 @@ msgstr ""
 "从现在开始，您将能够收到 Mandrakeonline 发出的安全\n"
 "和更新通知了。"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -336,27 +410,28 @@ msgstr ""
 "Mandrakeonline 还能让您自动保持更新。您的系统中会定期运行一个特\n"
 "定的程序，该程序会自动下载并安装更新\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "您的上传已经成功!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "自动升级"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "国家:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "出错"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "请提供有效的登录名"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -365,38 +440,48 @@ msgstr ""
 " 请再试一次\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "不是有效的电子邮件地址!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "正在读取配置\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "正在发送配置..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "上传文件时发生了错误，请重试"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "正在退出向导\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline 无法连接，请稍后再试一次"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "密码错误"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, 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 "
@@ -412,8 +497,83 @@ msgstr ""
 "如果您想要创建账户的话，请返回到第一步，以连接到 Mandrakeonline。\n"
 "请注意，您还必须提供一个机器名(只能由字母组成)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline 欢迎您"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline 欢迎您"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "密码错误"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "国家:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -428,18 +588,49 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help        - 打印本帮助信息。\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto        - 自动调用 Mandrakeupdate。\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet      - 调用 Mandrakeupdate。\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update      - 更新密钥\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline 无法连接，请稍后再试一次"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""