1 files changed, 294 insertions, 232 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0f36ee69..ebf7273e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-04-30 22:03+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -64,7 +64,7 @@ msgstr "可移除裝置"
 msgid "Path or mount point:"
 msgstr "路徑或是掛載點:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "安全更新"
@@ -131,9 +131,9 @@ msgstr "媒體類別:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -142,10 +142,10 @@ msgstr "取消"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -328,8 +328,8 @@ msgstr "媒體極限"
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(無)"
@@ -418,7 +418,7 @@ msgstr "更新媒體"
 msgid "Regenerate hdlist"
 msgstr "重新產生 hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "請稍後，更新媒體中..."
@@ -511,12 +511,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "執行於 user mode 使用者模式"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -527,568 +527,568 @@ msgstr ""
 "您將不能於系統上執行修改,\n"
 "但是您或許仍然可以瀏覽存在的資料庫."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "存取性"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "歸檔"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "備份"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD 燒錄"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "書"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "電腦書"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literature"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "通訊"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "資料庫"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "開發"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME 與 GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE and Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "核心"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "編輯者"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "通訊"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "模擬器"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "檔案工具"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "遊戲"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "冒險"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "遊樂場"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "板塊"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "卡片"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "謎"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "運動"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "策略"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "圖形化桌面"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM based"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Graphics"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "監視"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "多媒體"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "網路"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "檔案傳輸"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "即時訊息"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "郵件"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "新聞"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "遠端存取"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "辦公室"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "出版"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "科學"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "太空"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "生物學"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "化學"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "計算機科學"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geosciences"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "數學"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "貝殼"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "音效"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "系統"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "設定"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "開機與 Init 初始"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "包裝"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "列印"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "開發"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "開發"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "字型"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "命令列"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "國際化"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "核心與硬體"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "圖書館"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "伺服器"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "終端機"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "文字工具"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "視訊"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(無法使用)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "搜尋結果 (無)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "請稍候, 搜尋中..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "可更新的"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "可供加入"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "已選取"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "未選取"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "更多該套件資訊..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "請選擇"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列的其中之一套件:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "請稍候, 排序套件..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "無更新"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1098,28 +1098,28 @@ msgstr ""
 "更新的清單項目是空的. 也許是沒有可利用的套件更新安裝於你的系統上,\n"
 "或者是您的系統目前都已經安裝上全部的套件了."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "更多資訊"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "套件資訊"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "一些額外的套件必須被移除"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1129,12 +1129,12 @@ msgstr ""
 "因為他們的相依性, 以下套件也需要被移除:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "某些套件無法被移除"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 "移除下面這些套件可能會讓您的系統出錯, 抱歉\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1153,12 +1153,12 @@ msgstr ""
 "由於相依性的要求，下面的套件現在會取消選取以便於能夠繼續進行\n"
 "下去:\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要額外的套件"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1168,17 +1168,17 @@ msgstr ""
 "為了能夠滿足相依性的要求，下面的套件也必須一同安裝上:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "某些套件無法被安裝"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1189,132 +1189,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "某些套件需要被移除"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "已選擇：%d MB / 可用磁碟空間：%d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "已選擇大小: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "檔案 (_F):\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "變更紀錄:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "媒體:"
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "目前已安裝的版本:"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "名稱:"
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "版本:"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "大小:"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "重要性:"
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "摘要:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "更新的原因:"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Bugfixes 更新"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux 首選"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "所有套件, 依照字母順序分類"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "所有套件, 依群組"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "所有套件, 依大小排序"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部套件, 依選擇狀態分類"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全部套件, 依媒體倉儲分類"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部套件, 依可供更新分類"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "只有樹葉, 以安裝時間分類"
@@ -1344,7 +1349,7 @@ msgstr "重置選取"
 msgid "Reload the packages list"
 msgstr "重新載入套件清單"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "更新媒體"
@@ -1757,6 +1762,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1770,158 +1780,181 @@ msgstr ""
 "這些套件都位於 CDROM 或 DVD 光碟內. 此工具將會幫助您\n"
 "選取您所想要安裝於系統的軟體."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "軟體套件移除"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "資訊..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "澳洲"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "德國"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "希臘"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "法國"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "義大利"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "韓國"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "蘇俄"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "中國"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "美國"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"我需要連線到 Mandrakesoft 站取回映射站台的清單檔案.\n"
+"請確定您目前網路能夠正常連線出去.\n"
+"\n"
+"您要繼續嗎?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1934,18 +1967,38 @@ msgstr ""
 "\n"
 "您要繼續嗎?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "請稍後, 正在由 Mandrakesoft 站取回映射站台位址清單."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "請稍後, 正在由 Mandrakesoft 站取回映射站台位址清單."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "下載發生錯誤"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"下載映射站台清單時發生錯誤:\n"
+"\n"
+"%s\n"
+"也許是網路連線失敗, 或者是 Mandrakesoft 站台暫時無法聯繫上,\n"
+"請稍後再試."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1960,12 +2013,17 @@ msgstr ""
 "也許是網路連線失敗, 或者是 Mandrakesoft 站台暫時無法聯繫上,\n"
 "請稍後再試."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "無映射站台"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1980,63 +2038,63 @@ msgstr ""
 "Mandrakelinux Official Updates\n"
 "目前尚不支援您用的處理器架構."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "請選取想要的映射站台."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "複製檔案於媒體 `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "檢查媒體檔案 `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "檢查遠端媒體檔案 `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " 完成."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " 失敗!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s 從媒體 %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在開始下載 `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下載 `%s', 次數:%s, 速度:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下載 `%s', 速度:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2047,17 +2105,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "請選擇您要更新的媒體:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2070,7 +2128,7 @@ msgstr ""
 "錯誤:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2078,17 +2136,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "無法建立媒體."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "請稍後，正在加入媒介來源..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2099,7 +2157,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, c-format
+msgid ""
+"Your medium `%s', used for updates, does not match the version of %s you're "
+"running (%s).\n"
+"It will be disabled."
+msgstr ""
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2365,10 +2431,6 @@ msgstr "未識別的傳輸加密\n"
 msgid "Unknown error code %d\n"
 msgstr "未知的錯誤碼 %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "安裝軟體"