s/Mandrake/Mandriva/

1 files changed, 444 insertions, 360 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4e5c18b0..c27ef73c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,7 +1,7 @@
 # translation of zh_TW.po to Chinese Traditional
 # translation of rpmdrake-zh_TW.po to Chinese Traditional
 #
-# Latest versions of po files are at http://www.mandrakelinux.com/l10n/zh_TW.php3
+# Latest versions of po files are at http://www.mandrivalinux.com/l10n/zh_TW.php3
 #
 # %s messages for zh_TW.Big5 locale
 # Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2005-03-02 10:52+0100\n"
+"POT-Creation-Date: 2005-05-05 22:04+0200\n"
 "PO-Revision-Date: 2005-02-05 12:48+0800\n"
 "Last-Translator: Shiva Huang <blueshiva@giga.net.tw>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "選擇媒體類型"
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandrakelinux web or FTP "
+"This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
 "\n"
 "There are two kinds of official mirrors. You can choose to add sources that\n"
@@ -45,7 +45,7 @@ msgid ""
 "official updates for your distribution. (You can add both, but you'll have\n"
 "to do this in two steps.)"
 msgstr ""
-"這個步驟使您可以由 Mandrakelinux 網站或 FTP 映射站台新增套件來源。\n"
+"這個步驟使您可以由 Mandriva Linux 網站或 FTP 映射站台新增套件來源。\n"
 "\n"
 "有兩種官方的映射站台，您可以選擇加入包含您使用的散佈套件完整套件列表的套件\n"
 "來源 (通常是標準安裝光碟裡面的所有內容)，或者您可以選擇提供您使用的散佈套件\n"
@@ -67,14 +67,14 @@ msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
 "\n"
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 "這將會根據您的散佈套件 (%s) 嘗試安裝所有的官方套件來源\n"
 "\n"
-"我需要連線到 Mandrakesoft 站取回映射站台的列表。\n"
+"我需要連線到 Mandriva 站取回映射站台的列表。\n"
 "請確定您能夠正常的連結到網際網路上。\n"
 "\n"
 "您要繼續嗎？"
@@ -135,7 +135,7 @@ msgstr "瀏覽..."
 msgid "Login:"
 msgstr "登入："
 
-#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459 ../rpmdrake.pm:123
 #, c-format
 msgid "Password:"
 msgstr "密碼："
@@ -188,9 +188,9 @@ msgstr "媒體類別："
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
 #: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
 #: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
-#: ../edit-urpm-sources.pl:794 ../rpmdrake:164 ../rpmdrake:699
-#: ../rpmdrake:1502 ../rpmdrake:1510 ../rpmdrake.pm:504 ../rpmdrake.pm:594
-#: ../rpmdrake.pm:663
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:165 ../rpmdrake:701
+#: ../rpmdrake:1505 ../rpmdrake:1513 ../rpmdrake.pm:539 ../rpmdrake.pm:628
+#: ../rpmdrake.pm:697
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -200,9 +200,9 @@ msgstr "取消"
 #: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
 #: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
 #: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
-#: ../edit-urpm-sources.pl:990 ../rpmdrake:164 ../rpmdrake:699 ../rpmdrake:716
-#: ../rpmdrake:721 ../rpmdrake:1444 ../rpmdrake:1502 ../rpmdrake:1647
-#: ../rpmdrake.pm:192 ../rpmdrake.pm:249 ../rpmdrake.pm:504
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:165 ../rpmdrake:701 ../rpmdrake:718
+#: ../rpmdrake:723 ../rpmdrake:1446 ../rpmdrake:1505 ../rpmdrake:1648
+#: ../rpmdrake.pm:114 ../rpmdrake.pm:224 ../rpmdrake.pm:281 ../rpmdrake.pm:539
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -373,7 +373,7 @@ msgid "Add"
 msgstr "新增"
 
 #: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
-#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1179
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr "移除"
@@ -408,8 +408,8 @@ msgstr "媒體極限"
 msgid "Command"
 msgstr "指令"
 
-#: ../edit-urpm-sources.pl:684 ../rpmdrake:363 ../rpmdrake:380 ../rpmdrake:511
-#: ../rpmdrake:627
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:382 ../rpmdrake:516
+#: ../rpmdrake:629
 #, c-format
 msgid "(none)"
 msgstr "(無)"
@@ -436,8 +436,10 @@ msgstr "媒體"
 
 #: ../edit-urpm-sources.pl:737
 #, c-format
-msgid "Keys"
-msgstr "鑰匙"
+msgid ""
+"_:cryptographic keys\n"
+"Keys"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:756
 #, c-format
@@ -498,7 +500,7 @@ msgstr "更新媒體"
 msgid "Regenerate hdlist"
 msgstr "重新產生 hdlist"
 
-#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:587
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:621
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "請稍候，更新媒體中..."
@@ -538,7 +540,7 @@ msgstr "全域選項"
 msgid "Help"
 msgstr "輔助說明"
 
-#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:75 ../rpmdrake:1758
+#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1759
 #, c-format
 msgid ""
 "%s\n"
@@ -574,12 +576,12 @@ msgstr ""
 "套件資料庫被鎖定了。請關閉其它使用到套件資料庫的程式 (您是否\n"
 "在其他工作區有其它的媒體管理程式，或者您正在安裝套件呢？)"
 
-#: ../gurpmi.addmedia:70
+#: ../gurpmi.addmedia:69
 #, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "無法新增媒體，遺失或錯誤的參數"
 
-#: ../gurpmi.addmedia:78
+#: ../gurpmi.addmedia:77
 #, c-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
@@ -589,22 +591,88 @@ msgstr ""
 "您正要新增一個新的套件媒體 `%s'。\n"
 "那表示您將可以由這個新的媒體安裝新的軟體套件到您的系統上。"
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:86
 #, c-format
 msgid "Successfully added medium `%s'."
 msgstr "成功的新增了媒體 `%s'。"
 
-#: ../rpmdrake:28
+#: ../rpmdrake:31
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "用法: %s [選項]..."
 
-#: ../rpmdrake:161
+#: ../rpmdrake:32
+#, c-format
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
+msgstr ""
+
+#: ../rpmdrake:33
+#, c-format
+msgid "  --media=medium1,..     limit to given media"
+msgstr ""
+
+#: ../rpmdrake:34
+#, c-format
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+
+#: ../rpmdrake:35
+#, c-format
+msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgstr ""
+
+#: ../rpmdrake:36
+#, c-format
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+
+#: ../rpmdrake:37
+#, fuzzy, c-format
+msgid "  --no-media-update      don't update media at startup"
+msgstr "  --update       - 只更新更新的媒體。\n"
+
+#: ../rpmdrake:38
+#, fuzzy, c-format
+msgid "  --no-verify-rpm        don't verify packages signatures"
+msgstr "  --name          - 只顯示套件名稱。\n"
+
+#: ../rpmdrake:39
+#, c-format
+msgid ""
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
+msgstr ""
+
+#: ../rpmdrake:40
+#, c-format
+msgid "  --pkg-nosel=pkg1,..    show only these packages"
+msgstr ""
+
+#: ../rpmdrake:41
+#, c-format
+msgid "  --pkg-sel=pkg1,..      preselect these packages"
+msgstr ""
+
+#: ../rpmdrake:42
+#, fuzzy, c-format
+msgid "  --root                 force to run as root"
+msgstr "                           "
+
+#: ../rpmdrake:43
+#, c-format
+msgid "  --search=pkg           run search for \"pkg\""
+msgstr ""
+
+#: ../rpmdrake:162
 #, c-format
 msgid "Running in user mode"
 msgstr "以一般使用者模式執行"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:163
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -615,632 +683,628 @@ msgstr ""
 "您無法對系統進行修改，\n"
 "但是您仍然可以瀏覽現存的資料庫。"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:172
 #, c-format
 msgid "Accessibility"
 msgstr "輔助功能"
 
-#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #, c-format
 msgid "Archiving"
 msgstr "歸檔"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:173
 #, c-format
 msgid "Backup"
 msgstr "備份"
 
-#: ../rpmdrake:173
+#: ../rpmdrake:174
 #, c-format
 msgid "Cd burning"
 msgstr "光碟燒錄"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:175
 #, c-format
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../rpmdrake:175 ../rpmdrake:180 ../rpmdrake:192 ../rpmdrake:203
-#: ../rpmdrake:212 ../rpmdrake:224 ../rpmdrake:236 ../rpmdrake:244
-#: ../rpmdrake:332
+#: ../rpmdrake:176 ../rpmdrake:181 ../rpmdrake:193 ../rpmdrake:204
+#: ../rpmdrake:213 ../rpmdrake:225 ../rpmdrake:237 ../rpmdrake:245
+#: ../rpmdrake:333
 #, c-format
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake:176 ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179
-#: ../rpmdrake:180
+#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
+#: ../rpmdrake:181
 #, c-format
 msgid "Books"
 msgstr "書籍"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:177
 #, c-format
 msgid "Computer books"
 msgstr "電腦書籍"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:178
 #, c-format
 msgid "Faqs"
 msgstr "常見問題集"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:179
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:180
 #, c-format
 msgid "Literature"
 msgstr "文獻"
 
-#: ../rpmdrake:181 ../rpmdrake:182
+#: ../rpmdrake:182 ../rpmdrake:183
 #, c-format
 msgid "Cluster"
 msgstr "叢集"
 
-#: ../rpmdrake:181
+#: ../rpmdrake:182
 #, c-format
 msgid "Message Passing"
 msgstr "傳遞訊息中"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:183
 #, c-format
 msgid "Queueing Services"
 msgstr "查詢服務"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:184
 #, c-format
 msgid "Communications"
 msgstr "通訊"
 
-#: ../rpmdrake:184 ../rpmdrake:187
+#: ../rpmdrake:185 ../rpmdrake:188
 #, c-format
 msgid "Databases"
 msgstr "資料庫"
 
-#: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192 ../rpmdrake:193
+#: ../rpmdrake:194 ../rpmdrake:195
 #, c-format
 msgid "Development"
 msgstr "開發"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:186
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:187
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:189
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME 與 GTK+"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:190
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:191
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE 與 Qt"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:192
 #, c-format
 msgid "Kernel"
 msgstr "核心"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:194
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:195
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:196
 #, c-format
 msgid "Editors"
 msgstr "編輯器"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:197
 #, c-format
 msgid "Education"
 msgstr "教育"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:198
 #, c-format
 msgid "Emulators"
 msgstr "模擬器"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:199
 #, c-format
 msgid "File tools"
 msgstr "檔案工具"
 
-#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202 ../rpmdrake:203
+#: ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206 ../rpmdrake:207
 #, c-format
 msgid "Games"
 msgstr "遊戲"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:200
 #, c-format
 msgid "Adventure"
 msgstr "冒險遊戲"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:201
 #, c-format
 msgid "Arcade"
 msgstr "大型電玩"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:202
 #, c-format
 msgid "Boards"
 msgstr "棋盤遊戲"
 
-#: ../rpmdrake:202
+#: ../rpmdrake:203
 #, c-format
 msgid "Cards"
 msgstr "卡片遊戲"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:205
 #, c-format
 msgid "Puzzles"
 msgstr "益智遊戲"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:206
 #, c-format
 msgid "Sports"
 msgstr "運動遊戲"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:207
 #, c-format
 msgid "Strategy"
 msgstr "戰略遊戲"
 
-#: ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209 ../rpmdrake:210
-#: ../rpmdrake:211 ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214
+#: ../rpmdrake:208 ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
 #, c-format
 msgid "Graphical desktop"
 msgstr "圖形化桌面"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:208
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:208
+#: ../rpmdrake:209
 #, c-format
 msgid "FVWM based"
 msgstr "以 FVWM 為基礎的"
 
-#: ../rpmdrake:209
+#: ../rpmdrake:210
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:211
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:212
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:213
+#: ../rpmdrake:214
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:214
+#: ../rpmdrake:215
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:216
 #, c-format
 msgid "Graphics"
 msgstr "圖形"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:217
 #, c-format
 msgid "Monitoring"
 msgstr "監視"
 
-#: ../rpmdrake:217
+#: ../rpmdrake:218
 #, c-format
 msgid "Multimedia"
 msgstr "多媒體"
 
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
-#: ../rpmdrake:226 ../rpmdrake:243
+#: ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+#: ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226
+#: ../rpmdrake:227 ../rpmdrake:244
 #, c-format
 msgid "Networking"
 msgstr "網路"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:219
 #, c-format
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:220
 #, c-format
 msgid "File transfer"
 msgstr "檔案傳輸"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:221
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:222
 #, c-format
 msgid "Instant messaging"
 msgstr "即時通訊"
 
-#: ../rpmdrake:222
+#: ../rpmdrake:223
 #, c-format
 msgid "Mail"
 msgstr "郵件"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:224
 #, c-format
 msgid "News"
 msgstr "新聞群組"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:226
 #, c-format
 msgid "Remote access"
 msgstr "遠端存取"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:227
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:228
 #, c-format
 msgid "Office"
 msgstr "辦公軟體"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:229
 #, c-format
 msgid "Public Keys"
 msgstr "公鑰"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:230
 #, c-format
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #, c-format
 msgid "Sciences"
 msgstr "科學"
 
-#: ../rpmdrake:230
+#: ../rpmdrake:231
 #, c-format
 msgid "Astronomy"
 msgstr "天文學"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:232
 #, c-format
 msgid "Biology"
 msgstr "生物學"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:233
 #, c-format
 msgid "Chemistry"
 msgstr "化學"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:234
 #, c-format
 msgid "Computer science"
 msgstr "計算機科學"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:235
 #, c-format
 msgid "Geosciences"
 msgstr "地球科學"
 
-#: ../rpmdrake:235
+#: ../rpmdrake:236
 #, c-format
 msgid "Mathematics"
 msgstr "數學"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:238
 #, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:239
 #, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:239
+#: ../rpmdrake:240
 #, c-format
 msgid "Sound"
 msgstr "音效"
 
-#: ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243
-#: ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247
-#: ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251
-#: ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255
-#: ../rpmdrake:256 ../rpmdrake:257
+#: ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244
+#: ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248
+#: ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255 ../rpmdrake:256
+#: ../rpmdrake:257 ../rpmdrake:258
 #, c-format
 msgid "System"
 msgstr "系統"
 
-#: ../rpmdrake:240
+#: ../rpmdrake:241
 #, c-format
 msgid "Base"
 msgstr "基本套件"
 
-#: ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:245 ../rpmdrake:246
+#: ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245
+#: ../rpmdrake:246 ../rpmdrake:247
 #, c-format
 msgid "Configuration"
 msgstr "設定"
 
-#: ../rpmdrake:241
+#: ../rpmdrake:242
 #, c-format
 msgid "Boot and Init"
 msgstr "開機與 Init 初始"
 
-#: ../rpmdrake:242
+#: ../rpmdrake:243
 #, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../rpmdrake:245
+#: ../rpmdrake:246
 #, c-format
 msgid "Packaging"
 msgstr "包裝"
 
-#: ../rpmdrake:246
+#: ../rpmdrake:247
 #, c-format
 msgid "Printing"
 msgstr "列印"
 
-#: ../rpmdrake:247
+#: ../rpmdrake:248
 #, c-format
 msgid "Deploiement"
 msgstr "部署"
 
-#: ../rpmdrake:248
+#: ../rpmdrake:249
 #, c-format
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
 #, c-format
 msgid "Fonts"
 msgstr "字型"
 
-#: ../rpmdrake:249
+#: ../rpmdrake:250
 #, c-format
 msgid "Console"
 msgstr "命令列"
 
-#: ../rpmdrake:250
+#: ../rpmdrake:251
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:251
+#: ../rpmdrake:252
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:252
+#: ../rpmdrake:253
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:253
+#: ../rpmdrake:254
 #, c-format
 msgid "Internationalization"
 msgstr "國際化"
 
-#: ../rpmdrake:254
+#: ../rpmdrake:255
 #, c-format
 msgid "Kernel and hardware"
 msgstr "核心與硬體"
 
-#: ../rpmdrake:255
+#: ../rpmdrake:256
 #, c-format
 msgid "Libraries"
 msgstr "函式庫"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:257
 #, c-format
 msgid "Servers"
 msgstr "伺服器"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:258
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:258
+#: ../rpmdrake:259
 #, c-format
 msgid "Terminals"
 msgstr "終端機"
 
-#: ../rpmdrake:259
+#: ../rpmdrake:260
 #, c-format
 msgid "Text tools"
 msgstr "文字工具"
 
-#: ../rpmdrake:260
+#: ../rpmdrake:261
 #, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#: ../rpmdrake:261
+#: ../rpmdrake:262
 #, c-format
 msgid "Video"
 msgstr "視訊"
 
-#: ../rpmdrake:386 ../rpmdrake:528 ../rpmdrake:530
+#: ../rpmdrake:388 ../rpmdrake:533 ../rpmdrake:535
 #, c-format
 msgid "(Not available)"
 msgstr "(無法使用)"
 
-#: ../rpmdrake:415 ../rpmdrake:492
+#: ../rpmdrake:417 ../rpmdrake:497
 #, c-format
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../rpmdrake:415
+#: ../rpmdrake:417
 #, c-format
 msgid "Search results (none)"
 msgstr "搜尋結果 (無)"
 
-#: ../rpmdrake:426 ../rpmdrake:450
+#: ../rpmdrake:428 ../rpmdrake:455
 #, c-format
 msgid "Please wait, searching..."
 msgstr "搜尋中，請稍候..."
 
-#: ../rpmdrake:445 ../rpmdrake:1233 ../rpmdrake:1543 ../rpmdrake:1757
+#: ../rpmdrake:450 ../rpmdrake:576 ../rpmdrake:1235 ../rpmdrake:1546
+#: ../rpmdrake:1758
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:455
+#: ../rpmdrake:460
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:493 ../rpmdrake:662
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Upgradable"
 msgstr "可供更新"
 
-#: ../rpmdrake:493 ../rpmdrake:662
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Addable"
 msgstr "可供加入"
 
-#: ../rpmdrake:495
+#: ../rpmdrake:500
 #, c-format
 msgid "Selected"
 msgstr "已選取"
 
-#: ../rpmdrake:495
+#: ../rpmdrake:500
 #, c-format
 msgid "Not selected"
 msgstr "未選取"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:530
 #, c-format
 msgid "Files:\n"
 msgstr "檔案 (_F)：\n"
 
-#: ../rpmdrake:530
+#: ../rpmdrake:535
 #, c-format
 msgid "Changelog:\n"
 msgstr "更新紀錄：\n"
 
-#: ../rpmdrake:535
+#: ../rpmdrake:540
 #, c-format
 msgid "Medium: "
 msgstr "媒體："
 
-#: ../rpmdrake:537
+#: ../rpmdrake:542
 #, c-format
 msgid "Currently installed version: "
 msgstr "目前已安裝的版本："
 
-#: ../rpmdrake:545
+#: ../rpmdrake:550
 #, c-format
 msgid "Name: "
 msgstr "名稱："
 
-#: ../rpmdrake:546
+#: ../rpmdrake:551
 #, c-format
 msgid "Version: "
 msgstr "版本："
 
-#: ../rpmdrake:547
+#: ../rpmdrake:552
 #, c-format
 msgid "Size: "
 msgstr "大小："
 
-#: ../rpmdrake:547
+#: ../rpmdrake:552
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:550
+#: ../rpmdrake:555
 #, c-format
 msgid "Importance: "
 msgstr "重要性："
 
-#: ../rpmdrake:553
+#: ../rpmdrake:558
 #, c-format
 msgid "Summary: "
 msgstr "摘要："
 
-#: ../rpmdrake:556
+#: ../rpmdrake:561
 #, c-format
 msgid "Reason for update: "
 msgstr "更新的原因："
 
-#: ../rpmdrake:558
+#: ../rpmdrake:563
 #, c-format
 msgid "Description: "
 msgstr "描述："
 
-#: ../rpmdrake:558
+#: ../rpmdrake:563
 #, c-format
 msgid "No description"
 msgstr "沒有描述"
 
-#: ../rpmdrake:573
-#, c-format
-msgid "Rpmdrake %s"
-msgstr "Rpmdrake %s"
-
-#: ../rpmdrake:590 ../rpmdrake:712 ../rpmdrake:714 ../rpmdrake:1637
+#: ../rpmdrake:592 ../rpmdrake:714 ../rpmdrake:716 ../rpmdrake:1638
 #, c-format
 msgid "More information on package..."
 msgstr "更多該套件的資訊..."
 
-#: ../rpmdrake:591
+#: ../rpmdrake:593
 #, c-format
 msgid "Please choose"
 msgstr "請選擇"
 
-#: ../rpmdrake:591
+#: ../rpmdrake:593
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件的其中之一："
 
-#: ../rpmdrake:612
+#: ../rpmdrake:614
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "排序套件中，請稍候..."
 
-#: ../rpmdrake:629
+#: ../rpmdrake:631
 #, c-format
 msgid "No update"
 msgstr "無更新"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:632
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1250,28 +1314,28 @@ msgstr ""
 "更新的清單項目是空的。也許是安裝於您系統上的套件沒有可用的更新，\n"
 "或者您的系統已經全部安裝完畢了。"
 
-#: ../rpmdrake:653
+#: ../rpmdrake:655
 #, c-format
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:699 ../rpmdrake:704
+#: ../rpmdrake:701 ../rpmdrake:706
 #, c-format
 msgid "More info"
 msgstr "更多資訊"
 
-#: ../rpmdrake:707 ../rpmdrake:1626
+#: ../rpmdrake:709 ../rpmdrake:1627
 #, c-format
 msgid "Information on packages"
 msgstr "套件資訊"
 
-#: ../rpmdrake:729
+#: ../rpmdrake:731
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "一些額外的套件必須被移除"
 
-#: ../rpmdrake:730
+#: ../rpmdrake:732
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1281,12 +1345,12 @@ msgstr ""
 "因為它們的相依性問題，以下的套件也需要移除：\n"
 "\n"
 
-#: ../rpmdrake:736 ../rpmdrake:745
+#: ../rpmdrake:738 ../rpmdrake:747
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "某些套件無法被移除"
 
-#: ../rpmdrake:737
+#: ../rpmdrake:739
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1295,7 +1359,7 @@ msgstr ""
 "移除下面這些套件將會破壞您的系統，抱歉：\n"
 "\n"
 
-#: ../rpmdrake:746 ../rpmdrake:808
+#: ../rpmdrake:748 ../rpmdrake:810
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1305,12 +1369,12 @@ msgstr ""
 "由於相依性的要求，下面的套件現在會取消選取以便於能夠繼續進行\n"
 "下去:\n"
 
-#: ../rpmdrake:775
+#: ../rpmdrake:777
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要額外的套件"
 
-#: ../rpmdrake:776
+#: ../rpmdrake:778
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1320,17 +1384,17 @@ msgstr ""
 "為了能夠滿足相依性的要求，下面的套件也必須一併安裝：\n"
 "\n"
 
-#: ../rpmdrake:791
+#: ../rpmdrake:793
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (屬於略過的列表)"
 
-#: ../rpmdrake:793
+#: ../rpmdrake:795
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "某些套件無法被安裝"
 
-#: ../rpmdrake:794
+#: ../rpmdrake:796
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1341,122 +1405,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:807 ../rpmdrake:1073
+#: ../rpmdrake:809 ../rpmdrake:1075
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
 
-#: ../rpmdrake:832
+#: ../rpmdrake:834
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "已選擇：%d MB / 可用磁碟空間：%d MB"
 
-#: ../rpmdrake:833
+#: ../rpmdrake:835
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "已選擇的大小：%d MB"
 
-#: ../rpmdrake:839
+#: ../rpmdrake:841
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "這個套件沒有可用的說明\n"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Security updates"
 msgstr "安全性更新"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Bugfixes updates"
 msgstr "臭蟲修正更新"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Normal updates"
 msgstr "一般更新"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:928
 #, c-format
 msgid "%s choices"
 msgstr "%s 個選項"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:928
 #, c-format
-msgid "Mandrakelinux choices"
-msgstr "Mandrakelinux 分類"
+msgid "Mandriva Linux choices"
+msgstr "Mandriva Linux 分類"
 
-#: ../rpmdrake:929
+#: ../rpmdrake:931
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "所有套件，依照字母順序排列"
 
-#: ../rpmdrake:937
+#: ../rpmdrake:939
 #, c-format
 msgid "All packages, by group"
 msgstr "所有套件，依照群組分類"
 
-#: ../rpmdrake:938
+#: ../rpmdrake:940
 #, c-format
 msgid "All packages, by size"
 msgstr "所有套件，依大小排序"
 
-#: ../rpmdrake:939
+#: ../rpmdrake:941
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部套件，依選取狀態分類"
 
-#: ../rpmdrake:943
+#: ../rpmdrake:945
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全部套件，依媒體分類"
 
-#: ../rpmdrake:944
+#: ../rpmdrake:946
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部套件，依可供更新分類"
 
-#: ../rpmdrake:948
+#: ../rpmdrake:950
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "不分類，僅依安裝時間排序"
 
-#: ../rpmdrake:1022
+#: ../rpmdrake:1024
 #, c-format
 msgid "in names"
 msgstr "依名稱"
 
-#: ../rpmdrake:1024
+#: ../rpmdrake:1026
 #, c-format
 msgid "in descriptions"
 msgstr "依描述"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1028
 #, c-format
 msgid "in file names"
 msgstr "依檔案名稱"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1037
 #, c-format
 msgid "Normal information"
 msgstr "一般資訊"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1037
 #, c-format
 msgid "Maximum information"
 msgstr "詳細資訊"
 
-#: ../rpmdrake:1055
+#: ../rpmdrake:1057
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您必須先選擇一些套件。"
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1062
 #, c-format
 msgid "Too many packages are selected"
 msgstr "選取了太多套件"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1063
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1472,7 +1536,7 @@ msgstr ""
 "\n"
 "您確定要安裝全部選取的套件嗎?"
 
-#: ../rpmdrake:1074
+#: ../rpmdrake:1076
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1487,93 +1551,98 @@ msgstr ""
 "\n"
 "您確定要繼續嗎？"
 
-#: ../rpmdrake:1107
+#: ../rpmdrake:1109
 #, c-format
 msgid "Software Packages Removal"
 msgstr "軟體套件移除"
 
-#: ../rpmdrake:1108
+#: ../rpmdrake:1110
 #, c-format
 msgid "Software Packages Update"
 msgstr "軟體套件升級"
 
-#: ../rpmdrake:1109
+#: ../rpmdrake:1111
 #, c-format
 msgid "Software Packages Installation"
 msgstr "軟體套件安裝"
 
-#: ../rpmdrake:1115 ../rpmdrake:1118 ../rpmdrake:1127 ../rpmdrake:1138
-#: ../rpmdrake:1143
+#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: ../rpmdrake:1118
+#: ../rpmdrake:1120
 #, c-format
 msgid "/_Update media"
 msgstr "/更新媒體 (_U)"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1129
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/重新選取 (_R)"
 
-#: ../rpmdrake:1138
+#: ../rpmdrake:1140
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新載入套件清單 (_P)"
 
-#: ../rpmdrake:1143
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_Quit"
 msgstr "/離開 (_Q)"
 
-#: ../rpmdrake:1146 ../rpmdrake:1147 ../rpmdrake:1154
+#: ../rpmdrake:1145
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: ../rpmdrake:1147 ../rpmdrake:1154
+#: ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/顯示自動選取的套件 (_S)"
 
-#: ../rpmdrake:1151 ../rpmdrake:1152
+#: ../rpmdrake:1153 ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr "/輔助說明 (_H)"
 
-#: ../rpmdrake:1168
+#: ../rpmdrake:1170
 #, c-format
 msgid "Find:"
 msgstr "尋找："
 
-#: ../rpmdrake:1173
+#: ../rpmdrake:1175
 #, c-format
 msgid "Search"
 msgstr "搜尋"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1181
 #, c-format
 msgid "Install"
 msgstr "安裝"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1186
 #, c-format
 msgid "Quit"
 msgstr "結束"
 
-#: ../rpmdrake:1225
+#: ../rpmdrake:1227
 #, c-format
 msgid "Fatal error"
 msgstr "致命的錯誤"
 
-#: ../rpmdrake:1226
+#: ../rpmdrake:1228
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "發生了一個致命的錯誤： %s."
 
-#: ../rpmdrake:1234
+#: ../rpmdrake:1236
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1586,12 +1655,12 @@ msgstr ""
 "\n"
 "您要繼續嗎?"
 
-#: ../rpmdrake:1243
+#: ../rpmdrake:1245
 #, c-format
 msgid "Already existing update media"
 msgstr "更新媒體已存在"
 
-#: ../rpmdrake:1244
+#: ../rpmdrake:1246
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1606,12 +1675,12 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s."
 
-#: ../rpmdrake:1254
+#: ../rpmdrake:1256
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手動選擇您需要的映射站台"
 
-#: ../rpmdrake:1255
+#: ../rpmdrake:1257
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1625,62 +1694,62 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s."
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1290
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../rpmdrake:1366
+#: ../rpmdrake:1368
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在檢查 %s"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1391
 #, c-format
 msgid "changes:"
 msgstr "變更："
 
-#: ../rpmdrake:1397
+#: ../rpmdrake:1399
 #, c-format
 msgid "Remove .%s"
 msgstr "移除 .%s"
 
-#: ../rpmdrake:1401
+#: ../rpmdrake:1403
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 為主要檔案"
 
-#: ../rpmdrake:1405
+#: ../rpmdrake:1407
 #, c-format
 msgid "Do nothing"
 msgstr "不進行任何動作"
 
-#: ../rpmdrake:1421
+#: ../rpmdrake:1423
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完成"
 
-#: ../rpmdrake:1436
+#: ../rpmdrake:1438
 #, c-format
 msgid "Inspect..."
 msgstr "檢查..."
 
-#: ../rpmdrake:1465 ../rpmdrake:1622
+#: ../rpmdrake:1468 ../rpmdrake:1623
 #, c-format
 msgid "Everything installed successfully"
 msgstr "所有項目安裝成功"
 
-#: ../rpmdrake:1466 ../rpmdrake:1623
+#: ../rpmdrake:1469 ../rpmdrake:1624
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../rpmdrake:1468 ../rpmdrake:1607
+#: ../rpmdrake:1471 ../rpmdrake:1608
 #, c-format
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../rpmdrake:1469 ../rpmdrake:1608 ../rpmdrake:1663
+#: ../rpmdrake:1472 ../rpmdrake:1609 ../rpmdrake:1664
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1691,17 +1760,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1482
+#: ../rpmdrake:1485
 #, c-format
 msgid "Unable to get source packages."
 msgstr "無法取得來源套件。"
 
-#: ../rpmdrake:1483
+#: ../rpmdrake:1486
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../rpmdrake:1484 ../rpmdrake:1555
+#: ../rpmdrake:1487 ../rpmdrake:1558
 #, c-format
 msgid ""
 "\n"
@@ -1714,37 +1783,37 @@ msgstr ""
 "錯誤報告：\n"
 "%s"
 
-#: ../rpmdrake:1491
+#: ../rpmdrake:1494
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../rpmdrake:1491
+#: ../rpmdrake:1494
 #, c-format
 msgid "Initializing..."
 msgstr "初始化中..."
 
-#: ../rpmdrake:1500
+#: ../rpmdrake:1503
 #, c-format
 msgid "Change medium"
 msgstr "變更媒體"
 
-#: ../rpmdrake:1501
+#: ../rpmdrake:1504
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請置入名為 \"%s\" 的媒體於裝置 [%s] 中"
 
-#: ../rpmdrake:1508
+#: ../rpmdrake:1511
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下載套件 `%s' (%s/%s)..."
 
-#: ../rpmdrake:1531
+#: ../rpmdrake:1534
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "核對套件簽章..."
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1547
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1759,12 +1828,12 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../rpmdrake:1552 ../rpmdrake:1662
+#: ../rpmdrake:1555 ../rpmdrake:1663
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1556
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1777,22 +1846,22 @@ msgstr ""
 "\n"
 "您或許需要更新您的媒體資料庫。"
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1569
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../rpmdrake:1569
+#: ../rpmdrake:1572
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../rpmdrake:1585
+#: ../rpmdrake:1588
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../rpmdrake:1620
+#: ../rpmdrake:1621
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1806,47 +1875,47 @@ msgstr ""
 "將原本的設定檔重新命名為 '.rpmsave'，為了確保程式能夠\n"
 "正常運作，您需要檢查一下："
 
-#: ../rpmdrake:1620
+#: ../rpmdrake:1621
 #, c-format
 msgid "everything was installed correctly"
 msgstr "所有項目都已經正確的安裝了"
 
-#: ../rpmdrake:1628
+#: ../rpmdrake:1629
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "這些套件包含了升級資訊"
 
-#: ../rpmdrake:1640
+#: ../rpmdrake:1641
 #, c-format
 msgid "More information on package... [%s]"
 msgstr "更多 %s 套件的資訊..."
 
-#: ../rpmdrake:1653
+#: ../rpmdrake:1654
 #, c-format
 msgid "No package found for installation."
 msgstr "沒有找到可供安裝的套件。"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1655
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的套件。"
 
-#: ../rpmdrake:1676
+#: ../rpmdrake:1677
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "正在讀取套件資料庫，請稍候..."
 
-#: ../rpmdrake:1723
+#: ../rpmdrake:1724
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在移除套件，請稍候..."
 
-#: ../rpmdrake:1728
+#: ../rpmdrake:1729
 #, c-format
 msgid "Problem during removal"
 msgstr "移除時發生問題"
 
-#: ../rpmdrake:1729
+#: ../rpmdrake:1730
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1857,7 +1926,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1762
+#: ../rpmdrake:1763
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1869,7 +1938,7 @@ msgstr ""
 "\n"
 "此工具將協助您選取要從系統移除的軟體。"
 
-#: ../rpmdrake:1767
+#: ../rpmdrake:1768
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1881,203 +1950,213 @@ msgstr ""
 "\n"
 "此工具將協助您選取要安裝於系統上的更新。"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1773
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "歡迎使用軟體安裝工具！"
 
-#: ../rpmdrake:1773
+#: ../rpmdrake:1774
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
-"Your Mandrakelinux system comes with several thousands of software\n"
+"Your Mandriva Linux system comes with several thousands of software\n"
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
 "歡迎使用軟體安裝工具！\n"
 "\n"
-"您的 Mandrakelinux 系統提供了包羅萬象的軟體套件，這些\n"
+"您的 Mandriva Linux 系統提供了包羅萬象的軟體套件，這些\n"
 "套件都位於 CD 或 DVD 光碟內。此工具將會協助您選取您想\n"
 "要安裝於系統的軟體。"
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
 #, c-format
 msgid "Software Update"
 msgstr "軟體升級"
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux 更新"
+
+#: ../rpmdrake.pm:122
+#, fuzzy, c-format
+msgid "Please enter your credentials for accessing proxy\n"
+msgstr "請於下方輸入你的 e-mail"
+
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux 更新"
+msgid "User name:"
+msgstr "用戶名稱："
 
-#: ../rpmdrake.pm:183
+#: ../rpmdrake.pm:215
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:219
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:235
+#: ../rpmdrake.pm:267
 #, c-format
 msgid "Info..."
 msgstr "資訊..."
 
-#: ../rpmdrake.pm:311
+#: ../rpmdrake.pm:343
 #, c-format
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../rpmdrake.pm:312
+#: ../rpmdrake.pm:344
 #, c-format
 msgid "Australia"
 msgstr "澳洲"
 
-#: ../rpmdrake.pm:313
+#: ../rpmdrake.pm:345
 #, c-format
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../rpmdrake.pm:314
+#: ../rpmdrake.pm:346
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:347
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:348
 #, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:349
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:350
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:351
 #, c-format
 msgid "Germany"
 msgstr "德國"
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:352
 #, c-format
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:321 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:353 ../rpmdrake.pm:357
 #, c-format
 msgid "Greece"
 msgstr "希臘"
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:354
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:355
 #, c-format
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:356
 #, c-format
 msgid "France"
 msgstr "法國"
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:358
 #, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:359
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:360
 #, c-format
 msgid "Italy"
 msgstr "義大利"
 
-#: ../rpmdrake.pm:329
+#: ../rpmdrake.pm:361
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:362
 #, c-format
 msgid "Korea"
 msgstr "韓國"
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:363
 #, c-format
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:364
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:365
 #, c-format
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:366
 #, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:367
 #, c-format
 msgid "Russia"
 msgstr "俄羅斯"
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:368
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:369
 #, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:370
 #, c-format
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:371
 #, c-format
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:372
 #, c-format
 msgid "China"
 msgstr "中國"
 
-#: ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343 ../rpmdrake.pm:344
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:373 ../rpmdrake.pm:374 ../rpmdrake.pm:375 ../rpmdrake.pm:376
+#: ../rpmdrake.pm:453
 #, c-format
 msgid "United States"
 msgstr "美國"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:468
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2090,36 +2169,35 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:472
 #, c-format
 msgid ""
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"我需要連線到 Mandrakesoft 網站取回映射站台的列表。\n"
+"我需要連線到 Mandriva 網站取回映射站台的列表。\n"
 "請確定您能夠正常的連結到網際網路上。\n"
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:478
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "請稍候，正在取回映射站台位址。"
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:479
 #, c-format
-msgid ""
-"Please wait, downloading mirror addresses from the Mandrakesoft website."
-msgstr "請稍候，正在由 Mandrakesoft 網站取回映射站台位址。"
+msgid "Please wait, downloading mirror addresses from the Mandriva website."
+msgstr "請稍候，正在由 Mandriva 網站取回映射站台位址。"
 
-#: ../rpmdrake.pm:450
+#: ../rpmdrake.pm:485
 #, c-format
 msgid "Error during download"
 msgstr "下載過程發生錯誤"
 
-#: ../rpmdrake.pm:452
+#: ../rpmdrake.pm:487
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2131,105 +2209,105 @@ msgstr ""
 "下載映射站台列表時發生錯誤：\n"
 "\n"
 "%s\n"
-"也許是網路連線失敗，或者是 Mandrakesoft 站台暫時無法聯繫上，\n"
+"也許是網路連線失敗，或者是 Mandriva 站台暫時無法聯繫上，\n"
 "請稍候再試。"
 
-#: ../rpmdrake.pm:457
+#: ../rpmdrake.pm:492
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
 "%s\n"
-"The network, or the Mandrakesoft website, may be unavailable.\n"
+"The network, or the Mandriva website, may be unavailable.\n"
 "Please try again later."
 msgstr ""
 "下載映射站台列表時發生錯誤：\n"
 "\n"
 "%s\n"
-"也許是網路連線失敗，或者是 Mandrakesoft 站台暫時無法聯繫上，\n"
+"也許是網路連線失敗，或者是 Mandriva 站台暫時無法聯繫上，\n"
 "請稍候再試。"
 
-#: ../rpmdrake.pm:466
+#: ../rpmdrake.pm:501
 #, c-format
 msgid "No mirror"
 msgstr "無映射站台"
 
-#: ../rpmdrake.pm:468
+#: ../rpmdrake.pm:503
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "我找不到任何適合的映射站台。"
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:504
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
 "There can be many reasons for this problem; the most frequent is\n"
 "the case when the architecture of your processor is not supported\n"
-"by Mandrakelinux Official Updates."
+"by Mandriva Linux Official Updates."
 msgstr ""
 "我找不到適合的映射站台。\n"
 "\n"
-"會發生這個問題的情況相當多，最常發生的是Mandrakelinux 官方更新目前\n"
+"會發生這個問題的情況相當多，最常發生的是Mandriva Linux 官方更新目前\n"
 "尚不支援您使用的處理器架構。"
 
-#: ../rpmdrake.pm:488
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "請選取想要的映射站台。"
 
-#: ../rpmdrake.pm:547
+#: ../rpmdrake.pm:581
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在複製媒體 `%s' 的檔案..."
 
-#: ../rpmdrake.pm:550
+#: ../rpmdrake.pm:584
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在驗證媒體中的檔案 `%s'..."
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:587
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在驗證遠端媒體中的檔案 `%s'..."
 
-#: ../rpmdrake.pm:557
+#: ../rpmdrake.pm:591
 #, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:595
 #, c-format
 msgid " failed!"
 msgstr " 失敗！"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:565
+#: ../rpmdrake.pm:599
 #, c-format
 msgid "%s from medium %s"
 msgstr "媒體 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:569
+#: ../rpmdrake.pm:603
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在開始下載 `%s'..."
 
-#: ../rpmdrake.pm:573
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下載 `%s'，剩餘時間：%s，速率：%s"
 
-#: ../rpmdrake.pm:576
+#: ../rpmdrake.pm:610
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下載 `%s'，速率：%s"
 
-#: ../rpmdrake.pm:613
+#: ../rpmdrake.pm:647
 #, c-format
 msgid "Error retrieving packages"
 msgstr "接收套件時發生錯誤"
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:648
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2243,27 +2321,27 @@ msgstr ""
 "您必須使用軟體套件媒體管理員來移除並重新加入這個媒體來重新設定；或者\n"
 "是因為這個媒體現在無法聯繫上，請您稍待一會再試試看。"
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Update media"
 msgstr "更新媒體"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "請選擇您要更新的媒體："
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:701
 #, c-format
 msgid "Select all"
 msgstr "全部選取"
 
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:705
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:727
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2276,7 +2354,7 @@ msgstr ""
 "錯誤：\n"
 "%s"
 
-#: ../rpmdrake.pm:717 ../rpmdrake.pm:726
+#: ../rpmdrake.pm:751 ../rpmdrake.pm:760
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2287,17 +2365,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:772
 #, c-format
 msgid "Unable to create medium."
 msgstr "無法建立媒體。"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:777
 #, c-format
 msgid "Failure when adding medium"
 msgstr "新增媒體時發生錯誤"
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:778
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2308,7 +2386,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:791
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2318,22 +2396,22 @@ msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 %s 版本 (%s) 不符。\n"
 "它將會被停用。"
 
-#: ../rpmdrake.pm:760
+#: ../rpmdrake.pm:794
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of "
-"Mandrakelinux you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of Mandriva "
+"Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
-"您用來更新系統的媒體 `%s' 與您正在使用的 Mandrakelinux 版本 (%s) 不符。\n"
+"您用來更新系統的媒體 `%s' 與您正在使用的 Mandriva Linux 版本 (%s) 不符。\n"
 "它將會被停用。"
 
-#: ../rpmdrake.pm:776
+#: ../rpmdrake.pm:810
 #, c-format
 msgid "Help launched in background"
 msgstr "於背景啟動說明"
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:811
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -2609,6 +2687,12 @@ msgstr "移除軟體"
 msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
 
+#~ msgid "Keys"
+#~ msgstr "鑰匙"
+
+#~ msgid "Rpmdrake %s"
+#~ msgstr "Rpmdrake %s"
+
 #~ msgid "/_View"
 #~ msgstr "/檢視 (_V)"