merge new tool mdkonline_tui

1 files changed, 239 insertions, 83 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index cc9943a0..1a864a86 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-zh_TW\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: 2003-11-30 19:38+0800\n"
 "Last-Translator: hilbert <freehil@yahoo.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -19,237 +19,271 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "任何問題, 請寄出一封電子郵件至 support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, 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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "設定系統服務"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "更新"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "設定網路連線"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "正在讀取組態設定\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 隱私政策"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "動作"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "設定"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "安全更新"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "向前 5 秒"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "狀態"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "關閉"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "向下"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, 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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "更新"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "啟動 userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "連線問題"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "連線問題"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "不詳的主機名稱"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "密碼錯誤\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "系統模式"
 
 #: ../mdkapplet:348
-#, fuzzy
+#, fuzzy, c-format
 msgid "No check"
 msgstr "Gnome Go 象棋"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
-#, fuzzy
+#, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "遺失設定檔 %s.\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
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, 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"
@@ -261,58 +295,68 @@ msgstr ""
 "這個步驟完成後，就能夠提供您相關的安全公告以及套件更新\n"
 "等資訊。\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, 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 "我還沒有 Mandrakelinux Online 的帳號，我希望要 "
 
-#: ../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
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, 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 上的帳號 ID 與密碼"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "機器名稱："
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "正在讀取組態設定\n"
 
-#: ../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"
@@ -348,11 +392,18 @@ msgstr ""
 "當整個步驟都完成後，Mandrakelinux 將回提供一個 username@mandrakeonline.net\n"
 "的使用者帳好提供給您使用。"
 
-#: ../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."
@@ -360,7 +411,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"
@@ -368,29 +420,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
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "鄉村"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "錯誤"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "請再試一次"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -399,40 +450,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
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "正在讀取組態設定\n"
 
-#: ../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
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
 
-#: ../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 "
@@ -448,8 +507,83 @@ msgstr ""
 "請回到主畫面程式重新進行操作，以便於能夠連上\n"
 "Mandrakelinux Online 服務。"
 
-#: ../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"
@@ -464,25 +598,53 @@ msgstr ""
 "\n"
 "使用方式:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此求助訊息說明.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "無法由 mdkupdate 媒體更新套件.\n"
+
+#: ../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 ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "正在讀取組態設定\n"
@@ -491,9 +653,6 @@ msgstr "  --applet       - 更新全部資訊.\n"
 #~ msgid "Checking ..."
 #~ msgstr "連線問題"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "無法由 mdkupdate 媒體更新套件.\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "歡迎來到 Mandrakeonline"
@@ -505,9 +664,6 @@ msgstr "  --applet       - 更新全部資訊.\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "我希望使用自動化更新"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
-
 #, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "歡迎來到 Mandrakeonline"