sync with code

1 files changed, 405 insertions, 547 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1fad1b9..6d54e6c7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-06 20:01+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -23,68 +23,61 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "將於 %s 檢查更新"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系統處於最新的狀態"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "服務設定發生問題，請檢查錯誤紀錄並寄封電子郵件至 support@mandrivaonline.com"
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrivaonline.com"
+msgstr ""
+"服務設定發生問題，請檢查錯誤紀錄並寄封電子郵件至 support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "有適用於您系統的更新"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "有適用於您系統的加值軟體"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "沒有設定服務，請點選「設定本服務」"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "網路沒有啟動，請設定您的網路連線"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服務沒有啟動。請點選「線上網站」"
 
-#: ../mdkapplet:151
-#: ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 資料庫被鎖住了"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支援 (您使用的版本過舊或是開發中版本)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr "找不到媒體。您必須經由「套件媒體管理員」新增一些媒體。"
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -99,591 +92,131 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "是否啟用？"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "更新媒體時發生錯誤"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "檢查中...有可用的更新\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "套件都已經更新了"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "無法開啟 urpmi 資料庫"
 
-#: ../mdkapplet:217
-#: ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "安裝更新"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "設定本服務"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "檢查更新"
 
-#: ../mdkapplet:220
-#: ../mdkapplet:327
-#: ../mdkonline:114
-#: ../mdkonline:155
-#: ../mdkupdate:123
-#: ../mdkupdate:174
-#: ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "請稍候"
-
-#: ../mdkapplet:220
-#: ../mdkapplet:326
-#: ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "檢查更新"
-
-#: ../mdkapplet:223
-#: ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "線上網站"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "設定網路連線"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "立即設定！"
-
-#: ../mdkapplet:313
-#: ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux 自動更新面板程式"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "動作"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "設定"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "檢視紀錄"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "狀態"
-
-#: ../mdkapplet:336
-#: ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "關閉"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "網路連線："
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "啟動"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "未啟動"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "最近一次檢查："
-
-#: ../mdkapplet:367
-#: ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "電腦名稱："
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "更新："
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "啟動 drakconnect 連線程式\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online 似乎重新安裝過，重新載入面板程式..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "啟動 MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux 自動更新面板程式"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "計算新的更新...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "連線到"
 
-#: ../mdkapplet:467
-#: ../mdkupdate:159
-#: ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "發生一個錯誤"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "本服務不支援開發中的版本"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "本服務不支援過舊的版本"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "未知的狀態"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "線上服務關閉。請聯繫 Mandriva Online 網站\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "密碼錯誤。\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "錯誤的動作或主機或帳號。\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-msgstr "您的網路設定發生錯誤 (請檢查您的路由器、防火牆或代理伺服器設定)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid "Problem occured while connecting to the server, please contact the support team"
-msgstr "連結到伺服器發生錯誤，請聯繫支援團隊"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "來自 Mandriva Online 伺服器的回應\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系統已經在最新狀態了\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "不檢查"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "檢查設定檔：不存在\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "檢查網路狀態中：似乎已停用\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "記錄檔"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "清除"
+msgid "Warning"
+msgstr "警告"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "關於..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online 將引導您連結到 Mandriva 網頁服務。"
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "總是在啟動時執行"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "結束"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline 版本號 %s\n"
-"Copyright (C) %s Mandriva.\n"
-"這是自由軟體且可於 GNU GPL 條款下被重新散佈。\n"
-"\n"
-"用法：\n"
-
-#: ../mdkonline:63
-#: ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- 顯示本輔助說明。\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- 主機名稱。\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- 使用者國家名稱。\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- 使用互動模式。\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- 使用非互動模式。\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - 使用者的登入名稱。\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- 使用者密碼。\n"
-
-#: ../mdkonline:87
-#: ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "我已經有一個帳號"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "我要訂購"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Mr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Ms."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "正在讀取組態設定\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"這個精靈將協助您上傳您的組態設定 (包含套件與硬體設定) 到一個集\n"
-"中管理的資料庫中，以提供您關於安全性更新及其餘有用的更新的訊息。\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "帳號建立或認證"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "請輸入您在 Mandriva Online 上的帳號、密碼與電腦名稱："
-
-#: ../mdkonline:142
-#: ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "郵件地址："
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "國家"
-
-#: ../mdkonline:144
-#: ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "密碼："
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "電腦描述："
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(例如：我家的電腦)"
-
-#: ../mdkonline:152
-#: ../mdkonline:159
-#: ../mdkonline:180
-#: ../mdkonline:204
-#: ../mdkonline:208
-#: ../mdkonline:212
-#: ../mdkonline:217
-#: ../mdkupdate:141
-#: ../mdkupdate:159
-#: ../mdkupdate:188
-#: ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "錯誤"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "主機名稱必須由 1 到 40 個英文字母或數字的字元所組成"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "正在連線到 Mandriva Online 網站..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"為了能夠使用 Mandriva Online 服務項目，首先需要將您目前的組態資訊\n"
-"送回 Mandriva Linux 總部，以便於能夠進行後續服務功能。\n"
-"\n"
-"設定精靈將會送出下面的資訊到 Mandriva 總部，這包含了：\n"
-"\n"
-"1) 您目前系統已經安裝的套件清單內容，\n"
-"\n"
-"2) 您系統的硬體環境組態。\n"
-"\n"
-"如果您不認同將相關資訊送回至 Mandriva 的行為，或者是您不打算\n"
-"使用後續 Mandriva Online 服務的話，請點選「取消」 按鈕放棄。\n"
-"若是您點選「下一步」的話，設定精靈將會把相關資訊送回 Mandriva \n"
-"總部，您以後就能夠獲得關於相關套件的安全問題通知，並包含相關套件\n"
-"更新資訊。\n"
-"此外，您可以在 http://www.mandrivaexpert.com 使用付費的機制獲得\n"
-"更多服務與支援。"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "連線問題"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "上傳檔案時發生問題，請再試一次"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "建立 Mandriva Online 帳號"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "歡迎："
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "名字："
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "姓氏："
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "確認密碼："
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"密碼不符\n"
-" 請再試一次\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "請填寫全部的欄位"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "不是一個有效的郵件地址！\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "帳號建立失敗！"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online 帳號註冊成功。\n"
-"請按「下一步」來認證並上傳您的組態設定\n"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid "Your upload was successful!"
-msgstr "上傳成功！"
+msgid "Online WebSite"
+msgstr "線上網站"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"由現在起，您將會不定期的收到來自於 Mandriva Online\n"
-"發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline:229
+#: ../mdkapplet:492
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-"Mandriva Online 提供讓您能夠自動進行更新動作。\n"
-"系統將會定期的執行更新程式檢查最新的更新資訊\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "恭喜"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "您的 Mandriva Online 帳號已經成功設定\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "組態設定上傳成功"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "上傳組態設定時發生問題"
+msgid "Always launch on startup"
+msgstr "總是在啟動時執行"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid "Cannot connect to Mandriva Online website: wrong login/password or router/firewall bad settings"
-msgstr "無法連線到 Mandriva Online 網站：錯誤的帳號/密碼或路由器/防火牆設定"
+msgid "Quit"
+msgstr "結束"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -719,8 +252,7 @@ msgstr "註冊錯誤"
 msgid "Some parameters are missing"
 msgstr "某些參數遺失"
 
-#: ../mdkonline.pm:210
-#: ../mdkonline.pm:216
+#: ../mdkonline.pm:210 ../mdkonline.pm:216
 #, c-format
 msgid "Password error"
 msgstr "密碼錯誤"
@@ -730,9 +262,7 @@ msgstr "密碼錯誤"
 msgid "Wrong password"
 msgstr "錯誤密碼"
 
-#: ../mdkonline.pm:211
-#: ../mdkonline.pm:212
-#: ../mdkonline.pm:213
+#: ../mdkonline.pm:211 ../mdkonline.pm:212 ../mdkonline.pm:213
 #, c-format
 msgid "Login error"
 msgstr "登入錯誤"
@@ -770,8 +300,7 @@ msgstr "限制錯誤"
 msgid "Database access forbidden"
 msgstr "連結資料庫遭拒"
 
-#: ../mdkonline.pm:215
-#: ../mdkonline.pm:217
+#: ../mdkonline.pm:215 ../mdkonline.pm:217
 #, c-format
 msgid "Service error"
 msgstr "服務錯誤"
@@ -824,7 +353,8 @@ msgstr "無法連線到 Mandriva 網頁服務"
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -834,6 +364,11 @@ msgstr ""
 "\n"
 "用法：\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- 顯示本輔助說明。\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -856,27 +391,34 @@ msgstr "  --debug\t\t\t- 紀錄做了那些事情\n"
 
 #: ../mdkupdate:78
 #, c-format
-msgid "  --bundle file.bundle\t- parse and install package from .bundle metainfo file.\n"
+msgid ""
+"  --bundle file.bundle\t- parse and install package from .bundle metainfo "
+"file.\n"
 msgstr "  --bundle file.bundle\t- 分析並安裝 .bundle 資訊檔中的套件。\n"
 
-#: ../mdkupdate:118
-#: ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "警告"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
-msgid "You first need to install the system on your harddrive with the 'Live Install' wizard."
+msgid ""
+"You first need to install the system on your harddrive with the 'Live "
+"Install' wizard."
 msgstr "首先您必須用「Live Install」精靈將系統安裝到您的硬碟。"
 
-#: ../mdkupdate:123
-#: ../mdkupdate:174
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "請稍候"
+
+#: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "錯誤"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -888,12 +430,18 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "發生一個錯誤"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
 "The version of the Mandriva Online client is too old.\n"
 "\n"
-"You need to update to a newer version. You can get a new one from http://start.mandriva.com"
+"You need to update to a newer version. You can get a new one from http://"
+"start.mandriva.com"
 msgstr ""
 "這個 Mandriva Online 客戶端的版本太舊了。\n"
 "\n"
@@ -909,34 +457,337 @@ msgstr "這個加值軟體沒有經過良好的格式化，略過。"
 msgid "Installing packages ...\n"
 msgstr "正在安裝套件...\n"
 
-#: ../mdkupdate:231
-#: ../mdkupdate:271
+#: ../mdkupdate:231 ../mdkupdate:271
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "無法由 update_source 媒體更新套件。\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "有適用於您系統的加值軟體"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "沒有設定服務，請點選「設定本服務」"
+
+#~ msgid "Configure the service"
+#~ msgstr "設定本服務"
+
+#~ msgid "Check updates"
+#~ msgstr "檢查更新"
+
+#~ msgid "Configure Now!"
+#~ msgstr "立即設定！"
+
+#~ msgid "Actions"
+#~ msgstr "動作"
+
+#~ msgid "Configure"
+#~ msgstr "設定"
+
+#~ msgid "See logs"
+#~ msgstr "檢視紀錄"
+
+#~ msgid "Status"
+#~ msgstr "狀態"
+
+#~ msgid "Close"
+#~ msgstr "關閉"
+
+#~ msgid "Network Connection: "
+#~ msgstr "網路連線："
+
+#~ msgid "Up"
+#~ msgstr "啟動"
+
+#~ msgid "Down"
+#~ msgstr "未啟動"
+
+#~ msgid "Last check: "
+#~ msgstr "最近一次檢查："
+
+#~ msgid "Machine name:"
+#~ msgstr "電腦名稱："
+
+#~ msgid "Updates: "
+#~ msgstr "更新："
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "本服務不支援開發中的版本"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "本服務不支援過舊的版本"
+
+#~ msgid "Unknown state"
+#~ msgstr "未知的狀態"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "線上服務關閉。請聯繫 Mandriva Online 網站\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "密碼錯誤。\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "錯誤的動作或主機或帳號。\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr "您的網路設定發生錯誤 (請檢查您的路由器、防火牆或代理伺服器設定)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "連結到伺服器發生錯誤，請聯繫支援團隊"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "來自 Mandriva Online 伺服器的回應\n"
+
+#~ msgid "No check"
+#~ msgstr "不檢查"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "檢查設定檔：不存在\n"
+
+#~ msgid "Logs"
+#~ msgstr "記錄檔"
+
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline 版本號 %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "這是自由軟體且可於 GNU GPL 條款下被重新散佈。\n"
+#~ "\n"
+#~ "用法：\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- 主機名稱。\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- 使用者國家名稱。\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- 使用互動模式。\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- 使用非互動模式。\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - 使用者的登入名稱。\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- 使用者密碼。\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "我已經有一個帳號"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "我要訂購"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "正在讀取組態設定\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "這個精靈將協助您上傳您的組態設定 (包含套件與硬體設定) 到一個集\n"
+#~ "中管理的資料庫中，以提供您關於安全性更新及其餘有用的更新的訊息。\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "帳號建立或認證"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "請輸入您在 Mandriva Online 上的帳號、密碼與電腦名稱："
+
+#~ msgid "Email address:"
+#~ msgstr "郵件地址："
+
+#~ msgid "Country"
+#~ msgstr "國家"
+
+#~ msgid "Password:"
+#~ msgstr "密碼："
+
+#~ msgid "Machine description:"
+#~ msgstr "電腦描述："
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(例如：我家的電腦)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "主機名稱必須由 1 到 40 個英文字母或數字的字元所組成"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "正在連線到 Mandriva Online 網站..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "為了能夠使用 Mandriva Online 服務項目，首先需要將您目前的組態資訊\n"
+#~ "送回 Mandriva Linux 總部，以便於能夠進行後續服務功能。\n"
+#~ "\n"
+#~ "設定精靈將會送出下面的資訊到 Mandriva 總部，這包含了：\n"
+#~ "\n"
+#~ "1) 您目前系統已經安裝的套件清單內容，\n"
+#~ "\n"
+#~ "2) 您系統的硬體環境組態。\n"
+#~ "\n"
+#~ "如果您不認同將相關資訊送回至 Mandriva 的行為，或者是您不打算\n"
+#~ "使用後續 Mandriva Online 服務的話，請點選「取消」 按鈕放棄。\n"
+#~ "若是您點選「下一步」的話，設定精靈將會把相關資訊送回 Mandriva \n"
+#~ "總部，您以後就能夠獲得關於相關套件的安全問題通知，並包含相關套件\n"
+#~ "更新資訊。\n"
+#~ "此外，您可以在 http://www.mandrivaexpert.com 使用付費的機制獲得\n"
+#~ "更多服務與支援。"
+
+#~ msgid "Connection problem"
+#~ msgstr "連線問題"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "上傳檔案時發生問題，請再試一次"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "建立 Mandriva Online 帳號"
+
+#~ msgid "Greeting:"
+#~ msgstr "歡迎："
+
+#~ msgid "First name:"
+#~ msgstr "名字："
+
+#~ msgid "Last name:"
+#~ msgstr "姓氏："
+
+#~ msgid "Confirm Password:"
+#~ msgstr "確認密碼："
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "密碼不符\n"
+#~ " 請再試一次\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "請填寫全部的欄位"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "不是一個有效的郵件地址！\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "帳號建立失敗！"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online 帳號註冊成功。\n"
+#~ "請按「下一步」來認證並上傳您的組態設定\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "上傳成功！"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "由現在起，您將會不定期的收到來自於 Mandriva Online\n"
+#~ "發送的安全與更新修正套件公告資訊。"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online 提供讓您能夠自動進行更新動作。\n"
+#~ "系統將會定期的執行更新程式檢查最新的更新資訊\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "恭喜"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "您的 Mandriva Online 帳號已經成功設定\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "組態設定上傳成功"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "上傳組態設定時發生問題"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr "無法連線到 Mandriva Online 網站：錯誤的帳號/密碼或路由器/防火牆設定"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- 啟動 Mandriva Update 面板程式。\n"
+
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "無法取得更新列表：%s"
+
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "請選取要安裝的套件並按下確定"
+
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "系統忙碌中，請稍候..."
+
 #~ msgid "Sending configuration..."
 #~ msgstr "正在送出組態設定..."
+
 #~ msgid "Unsecure invocation: Method available through httpS only"
 #~ msgstr "不安全的請求：僅能使用 httpS"
+
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "沒有找到檔案 %s，請先執行 mdkonline 設定精靈"
+
 #~ msgid "Mandriva Update could not contact the site, we will try again."
 #~ msgstr "Mandriva Update 無法連線到網站，我們將再試一次。"
+
 #~ 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 "
@@ -950,22 +801,29 @@ msgstr "無法由 update_source 媒體更新套件。\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"
 #~ msgstr "連結到伺服器發生錯誤，請聯繫支援團隊"
-