changed MandrakeSoft -> Mandrakesoft

1 files changed, 106 insertions, 151 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index b3332551..10f7da83 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-06-15 17:47+0200\n"
+"POT-Creation-Date: 2004-07-20 14:33+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"
@@ -18,135 +18,135 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkapplet:62
+#: ../mdkapplet:65
 msgid "No updates available for your system"
 msgstr ""
 
-#: ../mdkapplet:68
+#: ../mdkapplet:71
 msgid "Config problems. Launch \"configure\" again"
 msgstr ""
 
-#: ../mdkapplet:74
+#: ../mdkapplet:77
 msgid "System is busy. Wait ..."
 msgstr ""
 
-#: ../mdkapplet:80
+#: ../mdkapplet:83
 #, perl-format
 msgid "%s packages available for update"
 msgstr ""
 
-#: ../mdkapplet:86
+#: ../mdkapplet:89
 msgid "Service not available. Click on \"configuration\""
 msgstr ""
 
-#: ../mdkapplet:92
+#: ../mdkapplet:95
 msgid "Network is down. Click on \"configure Network\""
 msgstr ""
 
-#: ../mdkapplet:98
+#: ../mdkapplet:101
 msgid "Service deactivated. Waiting for payment..."
 msgstr ""
 
-#: ../mdkapplet:102
+#: ../mdkapplet:105
 msgid "Launch Mandrake Update"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:106
 #, fuzzy
 msgid "Configuration"
 msgstr "正在讀取組態設定\n"
 
-#: ../mdkapplet:104
+#: ../mdkapplet:107
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:105
+#: ../mdkapplet:108
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:106
+#: ../mdkapplet:109
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:107
+#: ../mdkapplet:110
 #, fuzzy
 msgid "Configure Now!"
 msgstr "正在讀取組態設定\n"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:142
 msgid "Mandrake Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:147
+#: ../mdkapplet:150
 msgid "Actions"
 msgstr ""
 
-#: ../mdkapplet:149
+#: ../mdkapplet:152
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:150
+#: ../mdkapplet:153
 msgid "Configure"
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:163 ../mdkapplet:364
+#: ../mdkapplet:154 ../mdkapplet:166 ../mdkapplet:359
 msgid "Available"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:154
 msgid "Check updates"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:154
 #, fuzzy
 msgid "Checking ..."
 msgstr "連線問題"
 
-#: ../mdkapplet:151 ../mdkapplet:163 ../mdkapplet:364
+#: ../mdkapplet:154 ../mdkapplet:166 ../mdkapplet:359
 msgid "Not Available"
 msgstr ""
 
-#: ../mdkapplet:152
+#: ../mdkapplet:155
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:155
+#: ../mdkapplet:158
 msgid "Status"
 msgstr ""
 
-#: ../mdkapplet:158
+#: ../mdkapplet:161
 msgid "Network Connection: "
 msgstr ""
 
-#: ../mdkapplet:159
+#: ../mdkapplet:162
 msgid "Down"
 msgstr ""
 
-#: ../mdkapplet:159
+#: ../mdkapplet:162
 msgid "Up"
 msgstr ""
 
-#: ../mdkapplet:162
+#: ../mdkapplet:165
 msgid "New Updates: "
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:169
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:172 ../mdkapplet:414
+#: ../mdkapplet:175 ../mdkapplet:409
 msgid "Close"
 msgstr "關閉"
 
-#: ../mdkapplet:194
+#: ../mdkapplet:197
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:198
+#: ../mdkapplet:201
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:206
 msgid "Mdkonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
@@ -155,83 +155,83 @@ msgstr ""
 msgid "Computing new updates...\n"
 msgstr "連線問題"
 
-#: ../mdkapplet:221
+#: ../mdkapplet:216
 #, fuzzy
 msgid "Connecting to"
 msgstr "連線問題"
 
-#: ../mdkapplet:243
+#: ../mdkapplet:238
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:247
+#: ../mdkapplet:242
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:248
+#: ../mdkapplet:243
 msgid "Online services disabled. Contact MandrakeOnline site\n"
 msgstr ""
 
-#: ../mdkapplet:249
+#: ../mdkapplet:244
 msgid "Wrong Password.\n"
 msgstr "密碼錯誤\n"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:245
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:251
+#: ../mdkapplet:246
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:250
 msgid "System is up to date\n"
 msgstr ""
 
-#: ../mdkapplet:343
+#: ../mdkapplet:338
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:356
+#: ../mdkapplet:351
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:359
+#: ../mdkapplet:354
 msgid "Checking config file: Not present\n"
 msgstr ""
 
-#: ../mdkapplet:404
+#: ../mdkapplet:399
 #, fuzzy
 msgid "Logs"
 msgstr "帳號："
 
-#: ../mdkapplet:420
+#: ../mdkapplet:415
 msgid "Clear"
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mdkapplet:441
 msgid "About.."
 msgstr ""
 
-#: ../mdkapplet:447
+#: ../mdkapplet:442
 msgid "Quit"
 msgstr "結束"
 
-#: ../mdkapplet:459
+#: ../mdkapplet:454
 msgid "Attempting to connect to mandrakeonline.net\n"
 msgstr ""
 
-#: ../mdkonline:98
+#: ../mdkonline:86
 msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:117
+#: ../mdkonline:100
 msgid "Welcome to MandrakeOnline"
 msgstr "歡迎來到 MandrakeOnline"
 
-#: ../mdkonline:118
+#: ../mdkonline:101
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -240,67 +240,67 @@ msgid ""
 msgstr ""
 "在這個步驟，前提已經假設您已經在 Mandrake Online 上\n"
 "已經登記註冊使用者帳號了。接下來要進行的就是將您系統\n"
-"相關資訊傳回至MandrakeSoft 總部進行註冊。(傳回的資訊，\n"
+"相關資訊傳回至Mandrakesoft 總部進行註冊。(傳回的資訊，\n"
 "包含您系統目前已經安裝的套件清單，與系統硬體裝置組態)。\n"
 "這個步驟完成後，就能夠提供您相關的安全公告以及套件更新\n"
 "等資訊。\n"
 
-#: ../mdkonline:119
+#: ../mdkonline:102
 #, fuzzy
 msgid "Create a MandrakeOnline Account"
 msgstr "歡迎來到 MandrakeOnline"
 
-#: ../mdkonline:121
+#: ../mdkonline:104
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "我還沒有 Mandrake Online 的帳號，我希望要 "
 
-#: ../mdkonline:121
+#: ../mdkonline:104
 msgid "Subscribe"
 msgstr "註冊"
 
-#: ../mdkonline:125 ../mdkonline:145
+#: ../mdkonline:108 ../mdkonline:128
 msgid "Login:"
 msgstr "帳號："
 
-#: ../mdkonline:126 ../mdkonline:146
+#: ../mdkonline:109 ../mdkonline:129
 msgid "Password:"
 msgstr "    密碼："
 
-#: ../mdkonline:127
+#: ../mdkonline:110
 msgid "Confirm Password:"
 msgstr "確認密碼:"
 
-#: ../mdkonline:128
+#: ../mdkonline:111
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:135
+#: ../mdkonline:118
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux 隱私政策"
 
-#: ../mdkonline:141
+#: ../mdkonline:124
 msgid "Authentification"
 msgstr "認證確認"
 
-#: ../mdkonline:142
+#: ../mdkonline:125
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "請輸入您在 MandrakeOnline 上的帳號 ID 與密碼"
 
-#: ../mdkonline:147
+#: ../mdkonline:130
 msgid "Machine name:"
 msgstr "機器名稱："
 
-#: ../mdkonline:152
+#: ../mdkonline:135
 #, fuzzy
 msgid "Send Configuration"
 msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline:153
+#: ../mdkonline:136
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
 "\n"
-"The Wizard will now send the following information to MandrakeSoft:\n"
+"The Wizard will now send the following information to Mandrakesoft:\n"
 "1) the list of packages you have installed on your system,\n"
 "2) your hardware configuration.\n"
 "\n"
@@ -317,13 +317,13 @@ msgstr ""
 "為了能夠使用 MandrakeOnline 服務項目，首先需要將您目前組態資訊\n"
 "送回 Mandrake 總部，以便於能夠進行後續服務功能。\n"
 "\n"
-"設定精靈將會送出下面的資訊到 MandrakeSoft 總部，這包含了:\n"
+"設定精靈將會送出下面的資訊到 Mandrakesoft 總部，這包含了:\n"
 "1) 您目前系統已經安裝的套件清單內容，\n"
 "2) 您系統的硬體環境組態。\n"
 "\n"
-"如果您不認同將相關資訊送回至 MandrakeSoft 的行為，或者是您不打算\n"
+"如果您不認同將相關資訊送回至 Mandrakesoft 的行為，或者是您不打算\n"
 "使用後續 MandrakeOnline 服務的話，請點選 \"取消\" 按鈕放棄。\n"
-"若是您點選 \"下一步\" 的話，設定精靈將會把相關資訊送回 MandrakeSoft \n"
+"若是您點選 \"下一步\" 的話，設定精靈將會把相關資訊送回 Mandrakesoft \n"
 "總部，您後續就能夠獲得關於相關套件的安全問題通知，並包含相關套件\n"
 "更新資訊。\n"
 "此外，您可以在 http://www.mandrakeexpert.com 使用付費的機制獲得\n"
@@ -331,11 +331,11 @@ msgstr ""
 "當整個步驟都完成後，Mandrake 將回提供一個 username@mandrakeonline.net\n"
 "的使用者帳好提供給您使用。"
 
-#: ../mdkonline:158 ../mdkonline:269 ../mdkonline:298
+#: ../mdkonline:141 ../mdkonline:208 ../mdkonline:234
 msgid "Finish"
 msgstr "完成"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -343,7 +343,7 @@ msgstr ""
 "現在開始，您將會不定期的收到來自於MandrakeOnline\n"
 "發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -351,106 +351,66 @@ msgstr ""
 "MandrakeOnline 提供讓您能夠自動進行更新動作。\n"
 "系統將會定期的執行更新程式檢查最新的更新資訊\n"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid "Your upload was successful!"
 msgstr "已經成功上傳資訊!"
 
-#: ../mdkonline:160
+#: ../mdkonline:143
 msgid "automated Upgrades"
 msgstr "自動升級"
 
-#: ../mdkonline:165
+#: ../mdkonline:148
 msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:198
-msgid "Creation"
-msgstr ""
-
-#: ../mdkonline:198
-msgid "Login and password should be less than 12 characters\n"
-msgstr ""
-
-#: ../mdkonline:199
-msgid "Special characters"
-msgstr ""
-
-#: ../mdkonline:199
-msgid "Special characters are not allowed\n"
-msgstr ""
-
-#: ../mdkonline:200
-msgid "Empty fields"
-msgstr ""
-
-#: ../mdkonline:200
-msgid "Please fill in all fields\n"
-msgstr ""
-
-#: ../mdkonline:201
-msgid "Email"
-msgstr ""
-
-#: ../mdkonline:201
-msgid "Email not valid\n"
-msgstr ""
-
-#: ../mdkonline:202
-msgid "Account already exist\n"
-msgstr ""
-
-#: ../mdkonline:202
-msgid "Change account"
-msgstr ""
-
-#: ../mdkonline:208
-msgid "Problem connecting to server \n"
-msgstr ""
-
-#: ../mdkonline:208
-msgid "Server Problem"
-msgstr ""
-
-#: ../mdkonline:213 ../mdkonline:215 ../mdkonline:217
+#: ../mdkonline:182 ../mdkonline:184 ../mdkonline:186
 msgid "Error"
 msgstr ""
 
-#: ../mdkonline:213
+#: ../mdkonline:182
 msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:215
+#: ../mdkonline:184
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr ""
 
-#: ../mdkonline:217
+#: ../mdkonline:186
 msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:247
+#: ../mdkonline:198
+msgid "Reading configuration\n"
+msgstr "正在讀取組態設定\n"
+
+#: ../mdkonline:203
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:273 ../mdkonline:349
+#: ../mdkonline:210 ../mdkonline:274
 msgid "Connection problem"
 msgstr "連線問題"
 
-#: ../mdkonline:273 ../mdkonline:349
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate 無法聯絡到網站, 我們將再試."
+#: ../mdkonline:210
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
 
-#: ../mdkonline:315
+#: ../mdkonline:251
 msgid "Quitting Wizard\n"
 msgstr "正在結束設定精靈\n"
 
-#: ../mdkonline:361
+#: ../mdkonline:274
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate 無法聯絡到網站, 我們將再試."
+
+#: ../mdkonline:286
 msgid "Wrong password"
 msgstr "密碼錯誤"
 
-#: ../mdkonline:361
+#: ../mdkonline:286
 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 "
@@ -466,47 +426,42 @@ msgstr ""
 "請回到主畫面程式重新進行操作，以便於能夠連上\n"
 "Mandrake Online 服務。"
 
-#: ../mdkonline:368
-msgid "Reading configuration\n"
-msgstr "正在讀取組態設定\n"
-
-#: ../mdkupdate:58
+#: ../mdkupdate:53
 #, perl-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s MandrakeSoft.\n"
+"Copyright (C) %s Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate 版本 %s\n"
-"Copyright (C) %s MandrakeSoft.\n"
+"Copyright (C) %s Mandrakesoft.\n"
 "這是自由軟體且可於 GNU 條款下被重新發散 GPL.\n"
 "\n"
 "使用方式:\n"
 
-#: ../mdkupdate:63
+#: ../mdkupdate:58
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此求助訊息說明.\n"
 
-#: ../mdkupdate:64
+#: ../mdkupdate:59
 msgid "  --auto         - Mdkupdate launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:65
+#: ../mdkupdate:60
 #, fuzzy
 msgid "  --applet       - launch MandrakeUpdate.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:66
+#: ../mdkupdate:61
 #, fuzzy
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:276
-msgid "Unable to update packages from mdkupdate medium.\n"
-msgstr "無法由 mdkupdate 媒體更新套件.\n"
+#~ msgid "Unable to update packages from mdkupdate medium.\n"
+#~ msgstr "無法由 mdkupdate 媒體更新套件.\n"
 
 #, fuzzy
 #~ msgid "Response from MandrakeOnline server\n"