merge changes from MNF, MDK-10-update

1 files changed, 256 insertions, 260 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index add8f95e..4b5d4b0b 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-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\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"
@@ -18,271 +18,291 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "任何問題, 請寄出一封電子郵件至 support@mandrakeonline.net\n"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "您系統並沒有網路卡存在"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "安裝升級"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "設定系統服務"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "更新"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "請稍候"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Check updates"
+msgstr "安全更新"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "設定網路連線"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "正在讀取組態設定\n"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 隱私政策"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "動作"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "設定"
 
-#: ../mdkapplet:160
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "安全更新"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "向前 5 秒"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "狀態"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "關閉"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "虛擬網絡連線"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "向上"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "向下"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "更新"
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "啟動 userdrake"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "連線問題"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "連線問題"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "歡迎來到 Mandrakeonline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "不詳的主機名稱"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "密碼錯誤\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "系統模式"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, fuzzy, c-format
 msgid "No check"
 msgstr "Gnome Go 象棋"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "遺失設定檔 %s.\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "日誌記錄"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "關於..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "結束"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "歡迎來到 Mandrakeonline"
+
+#: ../mdkonline:55
 #, c-format
-msgid "Next"
-msgstr "下一步"
+msgid "I already have an account"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid "I want to subscribe"
+msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Previous"
-msgstr "上一步"
+msgid "Please wait"
+msgstr "請稍候"
 
-#: ../mdkonline:103
+#: ../mdkonline:89
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "歡迎來到 Mandrakeonline"
+msgid "Reading configuration\n"
+msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:93
+#, fuzzy, c-format
+msgid "Sending configuration..."
+msgstr "正在讀取組態設定\n"
+
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -295,62 +315,37 @@ msgstr ""
 "這個步驟完成後，就能夠提供您相關的安全公告以及套件更新\n"
 "等資訊。\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, fuzzy, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "歡迎來到 Mandrakeonline"
+#: ../mdkonline:114
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
 
-#: ../mdkonline:107
-#, fuzzy, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "我還沒有 Mandrakelinux Online 的帳號，我希望要 "
+#: ../mdkonline:119
+#, c-format
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "請輸入您在 Mandrakeonline 上的帳號 ID 與密碼"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "帳號："
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "    密碼："
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "確認密碼:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, fuzzy, c-format
-msgid "Mail contact:"
-msgstr "郵件聯絡:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux 隱私政策"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "認證確認"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "請輸入您在 Mandrakeonline 上的帳號 ID 與密碼"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "機器名稱："
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, fuzzy, c-format
-msgid "Send Configuration"
-msgstr "正在讀取組態設定\n"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "歡迎來到 Mandrakeonline"
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -383,55 +378,54 @@ msgstr ""
 "此外，您可以在 http://www.mandrakeexpert.com 使用付費的機制獲得\n"
 "更多服務與支援。"
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
-#, c-format
-msgid "Finish"
-msgstr "完成"
-
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Your upload was successful!"
-msgstr "已經成功上傳資訊!"
+msgid "Connection problem"
+msgstr "連線問題"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "or"
 msgstr ""
-"現在開始，您將會不定期的收到來自於Mandrakeonline\n"
-"發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "密碼錯誤"
+
+#: ../mdkonline:141
 #, 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"
+"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"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline 提供讓您能夠自動進行更新動作。\n"
-"系統將會定期的執行更新程式檢查最新的更新資訊\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "自動升級"
+"您所輸入的登入 ID 或者是密碼有誤導致無法登入。\n"
+"請重新確定您所輸入的登入資訊，或者是您尚未\n"
+"註冊，請先註冊一個新帳號再使用。\n"
+"請回到主畫面程式重新進行操作，以便於能夠連上\n"
+"Mandrakelinux Online 服務。"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, fuzzy, c-format
-msgid "Country:"
-msgstr "鄉村"
+msgid "Create a Mandrakeonline Account"
+msgstr "歡迎來到 Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "錯誤"
+msgid "Confirm Password:"
+msgstr "確認密碼:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, fuzzy, c-format
-msgid "Please provide a login"
-msgstr "請再試一次"
+msgid "Mail contact:"
+msgstr "郵件聯絡:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -440,157 +434,114 @@ msgstr ""
 "密碼不合\n"
 " 請再試一次\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "不是一個有效郵件地址!\n"
-
-#: ../mdkonline:199 ../mdkonline_tui:78
-#, c-format
-msgid "Reading configuration\n"
-msgstr "正在讀取組態設定\n"
-
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:163
 #, fuzzy, c-format
-msgid "Sending configuration..."
-msgstr "正在讀取組態設定\n"
+msgid "Please provide a login"
+msgstr "請再試一次"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:163
 #, c-format
-msgid "Connection problem"
-msgstr "連線問題"
+msgid "Not a valid mail address!\n"
+msgstr "不是一個有效郵件地址!\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:169
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:251
-#, c-format
-msgid "Quitting Wizard\n"
-msgstr "正在結束設定精靈\n"
-
-#: ../mdkonline:273
-#, fuzzy, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
-
-#: ../mdkonline:285
+#: ../mdkonline:178
 #, c-format
-msgid "Wrong password"
-msgstr "密碼錯誤"
+msgid "Your upload was successful!"
+msgstr "已經成功上傳資訊!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:178
 #, 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 "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
-"您所輸入的登入 ID 或者是密碼有誤導致無法登入。\n"
-"請重新確定您所輸入的登入資訊，或者是您尚未\n"
-"註冊，請先註冊一個新帳號再使用。\n"
-"請回到主畫面程式重新進行操作，以便於能夠連上\n"
-"Mandrakelinux Online 服務。"
+"現在開始，您將會不定期的收到來自於Mandrakeonline\n"
+"發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:178
 #, c-format
-msgid "Login and password should be less than 12 characters\n"
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 msgstr ""
+"Mandrakeonline 提供讓您能夠自動進行更新動作。\n"
+"系統將會定期的執行更新程式檢查最新的更新資訊\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:180
 #, c-format
-msgid "Special characters are not allowed\n"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline.pm:60
-#, c-format
-msgid "Please fill in all fields\n"
-msgstr ""
+#: ../mdkonline:186
+#, fuzzy, c-format
+msgid "Country"
+msgstr "鄉村"
 
-#: ../mdkonline.pm:61
-#, c-format
-msgid "Email not valid\n"
-msgstr ""
+#: ../mdkonline:198
+#, fuzzy, c-format
+msgid "Congratulations"
+msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline:198
 #, c-format
-msgid "Account already exist\n"
+msgid "Your Mandrakeonline account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline.pm:68
-#, c-format
-msgid "Problem connecting to server \n"
-msgstr "連線到伺服器出問題\n"
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "已經成功上傳資訊!"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
+#: ../mdkonline:215
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "歡迎來到 Mandrakeonline"
+msgid "Problem uploading configuration"
+msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline_tui:48
+#: ../mdkonline:216
 #, c-format
-msgid "I already have an account"
+msgid ""
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
 
-#: ../mdkonline_tui:49
+#: ../mdkonline.pm:66
 #, c-format
-msgid "I want to subscribe"
+msgid "Login and password should be less than 12 characters\n"
 msgstr ""
 
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
+#: ../mdkonline.pm:67
 #, c-format
-msgid "Please wait"
-msgstr "請稍候"
+msgid "Special characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline_tui:103
+#: ../mdkonline.pm:68
 #, c-format
-msgid "Account creation or authentication"
+msgid "Please fill in all fields\n"
 msgstr ""
 
-#: ../mdkonline_tui:120
-#, fuzzy, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "歡迎來到 Mandrakeonline"
-
-#: ../mdkonline_tui:130
+#: ../mdkonline.pm:69
 #, c-format
-msgid "or"
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline_tui:130
-#, fuzzy, c-format
-msgid "wrong password:"
-msgstr "密碼錯誤"
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:70
 #, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline_tui:175
-#, fuzzy, c-format
-msgid "Country"
-msgstr "鄉村"
-
-#: ../mdkonline_tui:187
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "正在讀取組態設定\n"
-
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr ""
+msgid "Problem connecting to server \n"
+msgstr "連線到伺服器出問題\n"
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -606,48 +557,97 @@ msgstr ""
 "\n"
 "使用方式:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此求助訊息說明.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:58
-#, fuzzy, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --applet       - 更新全部資訊.\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "無法由 mdkupdate 媒體更新套件.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
 
+#~ msgid "Next"
+#~ msgstr "下一步"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Previous"
+#~ msgstr "上一步"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "歡迎來到 Mandrakeonline"
+
+#, fuzzy
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "我還沒有 Mandrakelinux Online 的帳號，我希望要 "
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux 隱私政策"
+
+#~ msgid "Authentification"
+#~ msgstr "認證確認"
+
+#, fuzzy
+#~ msgid "Send Configuration"
+#~ msgstr "正在讀取組態設定\n"
+
+#~ msgid "Finish"
+#~ msgstr "完成"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "自動升級"
+
+#, fuzzy
+#~ msgid "Country:"
+#~ msgstr "鄉村"
+
+#~ msgid "Error"
+#~ msgstr "錯誤"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "正在結束設定精靈\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
+
+#~ msgid "Wrong password"
+#~ msgstr "密碼錯誤"
+
+#, fuzzy
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --applet       - 更新全部資訊.\n"
+
 #, fuzzy
 #~ msgid "Skip Wizard"
 #~ msgstr " 跳過精靈 "
@@ -660,10 +660,6 @@ msgstr ""
 #~ msgstr "連線問題"
 
 #, fuzzy
-#~ msgid "Response from Mandrakeonline server\n"
-#~ msgstr "歡迎來到 Mandrakeonline"
-
-#, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - 更新全部資訊.\n"