Updated POT file.

1 files changed, 595 insertions, 881 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index af118ae6..e5a395c0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17,7 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2006-03-06 13:24+0800\n"
 "Last-Translator: Shvia Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -28,13 +29,11 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "選擇媒體類型"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -53,18 +52,16 @@ msgstr ""
 "來源 (通常是標準安裝光碟裡面的所有內容)，或者您可以選擇提供您使用的散佈套件\n"
 "官方更新的套件來源。(您可以兩項都加入，但是您必須重複這個步驟兩次。)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "散佈來源"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "官方更新"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -81,104 +78,84 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "請稍後，新增媒體中..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "新增一個媒體"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "本地端檔案"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "路徑："
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP 伺服器"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "RSYNC 伺服器"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP 伺服器"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "可移除裝置"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "路徑或是掛載點："
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "可移除裝置"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "瀏覽..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "登入："
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "密碼："
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist 檔案的相對路徑："
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "若留下空白，程式將自動尋找 synthesis/hdlist "
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "名稱："
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "建立一個適用於所有散佈套件的媒體"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "在這個媒體中搜尋更新"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少需要輸入前面兩個項目。"
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -186,13 +163,11 @@ msgstr ""
 "這個媒體的名稱已經存在了，\n"
 "您確定要置換原本項目嗎？"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "正在新增一個媒體："
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "媒體類別："
 
@@ -200,10 +175,9 @@ msgstr "媒體類別："
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "取消"
 
@@ -212,101 +186,86 @@ msgstr "取消"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "確定"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "關於套件安裝的全域選項"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "總是"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "絕不"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "驗證要安裝的 RPM 套件檔案："
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "要使用的下載程式："
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "移除套件來源"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "您確定要移除套件來源 \"%s\" 嗎？"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "請稍候，正在移除媒體..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "編輯媒體"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "編輯媒體 \"%s\"："
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "儲存變更"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "代理伺服器..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "您需要置入媒體以便繼續"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "為了儲存變更，您需要在磁碟機置入該媒體。"
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "設定代理伺服器"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "媒體 \"%s\" 的代理伺服器設定"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "全域代理伺服器設定"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -315,166 +274,137 @@ msgstr ""
 "[:port]> 例如 proxy.hinet.net:80)："
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "代理伺服器主機名稱："
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "您需要指定用於代理伺服器認證的使用者帳號及密碼："
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "使用者："
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "新增同步管理群組"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "編輯同步管理群組"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "新增一媒體限定"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "選取要加入媒體限定中的媒體："
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "新增主機"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "請輸入要新增的主機名稱或 IP 位址："
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "編輯同步管理群組 \"%s\"："
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "群組名稱："
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "通訊協定："
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "媒體限定："
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "新增"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "移除"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "主機："
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "設定同步管理 urpmi (分散式執行的 urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "群組"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "通訊協定"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "媒體限定"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "通訊協定"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "指令"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(無)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "編輯"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "新增..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理數位套件簽章鑰匙"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "媒體"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "鑰匙"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "沒有找到名稱，鑰匙不存在於 rpm 鑰匙圈中！"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "新增一把鑰匙"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "選擇一把要新增到媒體 %s 的鑰匙"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "移除一把鑰匙"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -483,37 +413,31 @@ msgstr ""
 "(鑰匙名稱： %3$s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "新增一把鑰匙..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "移除鑰匙"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "設定媒體"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "是否啟用？"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "自動更新來源？"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "此媒體需要更新才能使用。現在要更新嗎？"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -523,38 +447,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "新增自訂..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "更新..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "管理鑰匙..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "同步管理..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "全域選項"
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "輔助說明"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -564,8 +482,7 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -578,8 +495,7 @@ msgstr ""
 "此工具將會協助您設定想要用於系統上的套件媒體來源。\n"
 "他們將會被用來安裝新的軟體套件或執行更新。"
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -589,13 +505,22 @@ msgstr ""
 "套件資料庫被鎖定了。請關閉其它使用到套件資料庫的程式 (您是否\n"
 "在其他工作區有其它的媒體管理程式，或者您正在安裝套件呢？)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "無法新增媒體，遺失或錯誤的參數"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"您正要新增一個新的套件媒體 `%s'。\n"
+"那表示您將可以由這個新的媒體安裝新的軟體套件到您的系統上。"
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -604,57 +529,54 @@ msgstr ""
 "您正要新增一個新的套件媒體 `%s'。\n"
 "那表示您將可以由這個新的媒體安裝新的軟體套件到您的系統上。"
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "成功的新增了媒體 `%s'。"
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "成功的新增了媒體 `%s'。"
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "用法：%s [選項]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr "  --changelog-first      在描述視窗中先顯示更新資訊再顯示檔案列表"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     限制於給定的媒體"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     計畫合併所有找到的 .rpmnew/.rpmsave 檔案"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=MODE            設定模式 (install (預設值)、remove、update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      在升級模式時不詢問第一個確認問題"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      啟動時不更新媒體"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        不驗證套件簽章"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -662,33 +584,27 @@ msgstr ""
 "  --parallel=alias,host  在同步管理模式下，使用 \"alias\" 別名群組或 \"host"
 "\" 主機名稱來顯示相依性"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    僅顯示這些套件"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      預先選取這些套件"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 強制使用 root 來執行"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           搜尋 \"pkg\" "
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "以一般使用者模式執行"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -698,634 +614,517 @@ msgstr ""
 "您無法對系統進行修改，\n"
 "但是您仍然可以瀏覽現存的資料庫。"
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "輔助功能"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "歸檔"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "備份"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "光碟燒錄"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "書籍"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "電腦書籍"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "常見問題集"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "文獻"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "叢集"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "傳遞訊息中"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "查詢服務"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "通訊"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "資料庫"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "開發"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "開發"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME 與 GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE 與 Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "核心"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "編輯器"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "教育"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "模擬器"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "檔案工具"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "遊戲"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "冒險遊戲"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "遊戲"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "大型電玩"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "棋盤遊戲"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "卡片遊戲"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "益智遊戲"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "運動遊戲"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "戰略遊戲"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "圖形化桌面"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "圖形化桌面"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "以 FVWM 為基礎的"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "圖形"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "監視"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "多媒體"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "網路"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "網路"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "檔案傳輸"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "即時通訊"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "郵件"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "新聞群組"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "遠端存取"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "辦公軟體"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "公鑰"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "科學"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "天文學"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "科學"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "生物學"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "化學"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "計算機科學"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "地球科學"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "數學"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "音效"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "系統"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "基本套件"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "設定"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "系統"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "開機與 Init 初始"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "設定"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "包裝"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "列印"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "部署"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "字型"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "命令列"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "字型"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "國際化"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "核心與硬體"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "函式庫"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "伺服器"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "終端機"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "文字工具"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "玩具"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "視訊"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(無法使用)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "搜尋結果 (無)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "搜尋中，請稍候..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "停止"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "可供加入"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "可供更新"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "可供加入"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "未選取"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "已選取"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "未選取"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "重要性："
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "更新的原因："
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "沒有描述"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "檔案 (_F)：\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "更新紀錄：\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "媒體："
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "目前已安裝的版本："
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "名稱："
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "版本："
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "硬體平台："
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "大小："
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "重要性："
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "大小："
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "摘要："
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "更新的原因："
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "描述："
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "沒有描述"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "更多該套件的資訊..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "請選擇"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件的其中之一："
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "請選擇"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "排序套件中，請稍候..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "無更新"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1334,29 +1133,24 @@ msgstr ""
 "更新的清單項目是空的。也許是安裝於您系統上的套件沒有可用的更新，\n"
 "或者您的系統已經全部安裝完畢了。"
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "更多資訊"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "套件資訊"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "一些額外的套件必須被移除"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1365,13 +1159,11 @@ msgstr ""
 "因為它們的相依性問題，以下的套件也需要移除：\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "某些套件無法被移除"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1379,8 +1171,7 @@ msgstr ""
 "移除下面這些套件將會破壞您的系統，抱歉：\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1389,13 +1180,11 @@ msgstr ""
 "由於相依性的要求，下面的套件現在會取消選取以便於能夠繼續進行\n"
 "下去:\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "需要額外的套件"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1404,18 +1193,17 @@ msgstr ""
 "為了能夠滿足相依性的要求，下面的套件也必須一併安裝：\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (屬於略過的列表)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "某些套件無法被安裝"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1425,123 +1213,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "已選擇：%d MB / 可用磁碟空間：%d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "已選擇的大小：%d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "這個套件沒有可用的說明\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "安全性更新"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "臭蟲修正更新"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "安裝"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "一般更新"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "安裝"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s 個選項"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux 分類"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "所有套件，依照字母順序排列"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "所有套件，依照群組分類"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "全部套件，依可供更新分類"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "所有套件，依大小排序"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "全部套件，依選取狀態分類"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "全部套件，依媒體分類"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "全部套件，依可供更新分類"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "不分類，僅依安裝時間排序"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "所有套件，依照群組分類"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "一般更新"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "臭蟲修正更新"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "一般更新"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "安全性更新"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "依名稱"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "依描述"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "依檔案名稱"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "一般資訊"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "詳細資訊"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "您必須先選擇一些套件。"
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "選取了太多套件"
 
 #: ../rpmdrake:1104
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -1557,7 +1330,7 @@ msgstr ""
 "您確定要安裝全部選取的套件嗎?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1571,89 +1344,100 @@ msgstr ""
 "\n"
 "您確定要繼續嗎？"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/檔案 (_F)"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/更新媒體 (_U)"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/重新選取 (_R)"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/重新載入套件清單 (_P)"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/離開 (_Q)"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/顯示自動選取的套件 (_S)"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/輔助說明 (_H)"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux 更新"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "尋找："
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "搜尋"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "清除"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "安裝"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "結束"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "致命的錯誤"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "發生了一個致命的錯誤：%s。"
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1665,13 +1449,12 @@ msgstr ""
 "\n"
 "您要繼續嗎?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "更新媒體已存在"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1685,13 +1468,12 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "如何手動選擇您需要的映射站台"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1704,58 +1486,56 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "正在讀取套件資料庫，請稍候..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "正在檢查 %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "變更："
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "移除 .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 為主要檔案"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "不進行任何動作"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "安裝完成"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "檢查..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1765,18 +1545,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "無法取得來源套件。"
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1788,38 +1567,34 @@ msgstr ""
 "錯誤報告：\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "套件安裝..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "初始化中..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "套件安裝..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "變更媒體"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請置入名為 \"%s\" 的媒體於裝置 [%s] 中"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下載套件 `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "核對套件簽章..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1833,13 +1608,12 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1851,23 +1625,21 @@ msgstr ""
 "\n"
 "您或許需要更新您的媒體資料庫。"
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1879,43 +1651,33 @@ msgstr ""
 "有些設定檔被建立時以 `.rpmnew' 或 `.rpmsave' 命名，您\n"
 "現在可以檢查一下以確保它正常運作："
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "這些套件包含了升級資訊"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "更多 %s 套件的資訊..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "沒有找到可供安裝的套件。"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的套件。"
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "正在讀取套件資料庫，請稍候..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "正在移除套件，請稍候..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "移除時發生問題"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1925,8 +1687,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1937,8 +1698,8 @@ msgstr ""
 "\n"
 "此工具將協助您選取要從系統移除的軟體。"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1949,13 +1710,11 @@ msgstr ""
 "\n"
 "此工具將協助您選取要安裝於系統上的更新。"
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "歡迎使用軟體安裝工具！"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1969,214 +1728,172 @@ msgstr ""
 "套件都位於 CD 或 DVD 光碟內。此工具將會協助您選取您想\n"
 "要安裝於系統的軟體。"
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "軟體升級"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux 更新"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "軟體升級"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "請輸入您的憑證以使用代理伺服器\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "用戶名稱："
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "軟體套件移除"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "軟體套件升級"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "軟體套件安裝"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "資訊..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "澳洲"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "德國"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "希臘"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "法國"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "義大利"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "韓國"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "俄羅斯"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "中國"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "美國"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2188,8 +1905,7 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2201,23 +1917,26 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s 個選項"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "請稍候，正在取回映射站台位址。"
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "請稍候，正在由 Mandriva 網站取回映射站台位址。"
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "下載過程發生錯誤"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2231,8 +1950,8 @@ msgstr ""
 "也許是網路連線失敗，或者是 Mandriva 站台暫時無法聯繫上，\n"
 "請稍候再試。"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2246,18 +1965,15 @@ msgstr ""
 "也許是網路連線失敗，或者是 Mandriva 站台暫時無法聯繫上，\n"
 "請稍候再試。"
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "無映射站台"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "我找不到任何適合的映射站台。"
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2270,69 +1986,64 @@ msgstr ""
 "會發生這個問題的情況相當多，最常發生的是Mandriva Linux 官方更新目前\n"
 "尚不支援您使用的處理器架構。"
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "請選取想要的映射站台。"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在複製媒體 `%s' 的檔案..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在驗證媒體中的檔案 `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在驗證遠端媒體中的檔案 `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " 失敗！"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "媒體 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "正在開始下載 `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下載 `%s'，剩餘時間：%s，速率：%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "下載 `%s'，速率：%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "請稍候，更新媒體中..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "接收套件時發生錯誤"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2345,34 +2056,29 @@ msgstr ""
 "您必須使用軟體套件媒體管理員來移除並重新加入這個媒體來重新設定；或者\n"
 "是因為這個媒體現在無法聯繫上，請您稍待一會再試試看。"
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "更新媒體"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "找不到有作用的媒體。您必須啟動這些媒體後才能進行更新。"
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "請選擇您要更新的媒體："
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "全部選取"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2384,8 +2090,8 @@ msgstr ""
 "錯誤：\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2395,18 +2101,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "無法建立媒體。"
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "新增媒體時發生錯誤"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2416,8 +2120,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2426,8 +2130,8 @@ msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 %s 版本 (%s) 不符。\n"
 "它將會被停用。"
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2436,13 +2140,11 @@ msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 Mandriva Linux 版本 (%s) 不符。\n"
 "它將會被停用。"
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "於背景啟動說明"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "說明視窗已經啟動，它將馬上出現於您的桌面。"
@@ -2717,6 +2419,18 @@ msgstr "移除軟體"
 msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
 
+#~ msgid "Stop"
+#~ msgstr "停止"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "全部套件，依媒體分類"
+
+#~ msgid "Normal information"
+#~ msgstr "一般資訊"
+
+#~ msgid "Maximum information"
+#~ msgstr "詳細資訊"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "所有項目都已經正確的安裝了"