sync with code

1 files changed, 304 insertions, 307 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index de8f0583..ad8bf668 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:31+0200\n"
+"POT-Creation-Date: 2007-08-10 19:06+0200\n"
 "PO-Revision-Date: 2006-09-18 22:52+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -31,7 +31,7 @@ msgstr ""
 "X-Poedit-Country: TAIWAN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:687
+#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:689
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -41,7 +41,7 @@ msgstr ""
 "更新的清單項目是空的。也許是安裝於您系統上的套件沒有可用的更新，\n"
 "或者您的系統已經全部安裝完畢了。"
 
-#: ../MandrivaUpdate:105 ../rpmdrake:90 ../rpmdrake:525 ../rpmdrake.pm:189
+#: ../MandrivaUpdate:105 ../rpmdrake:90 ../rpmdrake:539 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Management"
 msgstr "軟體套件管理程式"
@@ -51,22 +51,22 @@ msgstr "軟體套件管理程式"
 msgid "Here is the list of software package updates"
 msgstr "軟體套件升級"
 
-#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1081 ../rpmdrake:454
+#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1081 ../rpmdrake:468
 #, c-format
 msgid "Help"
 msgstr "輔助說明"
 
-#: ../MandrivaUpdate:148 ../rpmdrake:459 ../rpmdrake.pm:778
+#: ../MandrivaUpdate:148 ../rpmdrake:473 ../rpmdrake.pm:775
 #, c-format
 msgid "Select all"
 msgstr "全部選取"
 
-#: ../MandrivaUpdate:156 ../rpmdrake.pm:782
+#: ../MandrivaUpdate:156 ../rpmdrake.pm:779
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../MandrivaUpdate:164 ../rpmdrake:469
+#: ../MandrivaUpdate:164 ../rpmdrake:483
 #, c-format
 msgid "Quit"
 msgstr "結束"
@@ -244,9 +244,9 @@ msgstr "媒體類別："
 #: ../Rpmdrake/edit_urpm_sources.pm:447 ../Rpmdrake/edit_urpm_sources.pm:474
 #: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
 #: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
-#: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
-#: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
+#: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:461
+#: ../Rpmdrake/init.pm:133 ../Rpmdrake/pkg.pm:627 ../Rpmdrake/pkg.pm:669
+#: ../rpmdrake.pm:298 ../rpmdrake.pm:613 ../rpmdrake.pm:698 ../rpmdrake.pm:771
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -256,10 +256,10 @@ msgstr "取消"
 #: ../Rpmdrake/edit_urpm_sources.pm:624 ../Rpmdrake/edit_urpm_sources.pm:667
 #: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
 #: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
-#: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
-#: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
-#: ../rpmdrake.pm:304 ../rpmdrake.pm:616
+#: ../Rpmdrake/gui.pm:461 ../Rpmdrake/gui.pm:477 ../Rpmdrake/gui.pm:482
+#: ../Rpmdrake/init.pm:133 ../Rpmdrake/pkg.pm:473 ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/rpmnew.pm:179 ../rpmdrake.pm:125 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:301 ../rpmdrake.pm:613
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -477,8 +477,8 @@ msgstr "媒體限定"
 msgid "Command"
 msgstr "指令"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:756 ../Rpmdrake/gui.pm:684
-#: ../Rpmdrake/pkg.pm:97 ../Rpmdrake/pkg.pm:127 ../Rpmdrake/pkg.pm:167
+#: ../Rpmdrake/edit_urpm_sources.pm:756 ../Rpmdrake/gui.pm:686
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:128 ../Rpmdrake/pkg.pm:168
 #: ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
@@ -550,7 +550,7 @@ msgstr ""
 msgid "Configure media"
 msgstr "設定媒體"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:977
+#: ../Rpmdrake/edit_urpm_sources.pm:977 ../Rpmdrake/pkg.pm:204
 #, c-format
 msgid "Enabled"
 msgstr "是否啟用？"
@@ -601,7 +601,7 @@ msgstr "同步管理..."
 msgid "Global options..."
 msgstr "全域選項"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:139
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -693,7 +693,7 @@ msgstr "大小："
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:827
+#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:824
 #, c-format
 msgid "Medium: "
 msgstr "媒體："
@@ -704,7 +704,7 @@ msgid "Files:"
 msgstr "檔案 (_F)："
 
 #: ../Rpmdrake/gui.pm:118 ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:137
-#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:133
+#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:134
 #, c-format
 msgid "(Not available)"
 msgstr "(無法使用)"
@@ -739,55 +739,55 @@ msgstr "摘要："
 msgid "Description: "
 msgstr "描述："
 
-#: ../Rpmdrake/gui.pm:443 ../Rpmdrake/gui.pm:471 ../Rpmdrake/gui.pm:473
+#: ../Rpmdrake/gui.pm:444 ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:475
 #, c-format
 msgid "More information on package..."
 msgstr "更多該套件的資訊..."
 
-#: ../Rpmdrake/gui.pm:445
+#: ../Rpmdrake/gui.pm:446
 #, c-format
 msgid "Please choose"
 msgstr "請選擇"
 
-#: ../Rpmdrake/gui.pm:446
+#: ../Rpmdrake/gui.pm:447
 #, fuzzy, c-format
 msgid "The following package is needed:"
 msgstr "需要下列套件的其中之一："
 
-#: ../Rpmdrake/gui.pm:446
+#: ../Rpmdrake/gui.pm:447
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:464
+#: ../Rpmdrake/gui.pm:461 ../Rpmdrake/gui.pm:466
 #, c-format
 msgid "More info"
 msgstr "更多資訊"
 
-#: ../Rpmdrake/gui.pm:466
+#: ../Rpmdrake/gui.pm:468
 #, c-format
 msgid "Information on packages"
 msgstr "套件資訊"
 
-#: ../Rpmdrake/gui.pm:499
+#: ../Rpmdrake/gui.pm:501
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "一些額外的套件必須被移除"
 
-#: ../Rpmdrake/gui.pm:500
+#: ../Rpmdrake/gui.pm:502
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "因為它們的相依性問題，以下的套件也需要移除： "
 
-#: ../Rpmdrake/gui.pm:506 ../Rpmdrake/gui.pm:515
+#: ../Rpmdrake/gui.pm:508 ../Rpmdrake/gui.pm:517
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "某些套件無法被移除"
 
-#: ../Rpmdrake/gui.pm:507
+#: ../Rpmdrake/gui.pm:509
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -796,7 +796,7 @@ msgstr ""
 "移除下面這些套件將會破壞您的系統，抱歉：\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:516 ../Rpmdrake/gui.pm:583
+#: ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:585
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -806,12 +806,12 @@ msgstr ""
 "由於相依性的要求，下面的套件現在會取消選取以便於能夠繼續進行\n"
 "下去:\n"
 
-#: ../Rpmdrake/gui.pm:545
+#: ../Rpmdrake/gui.pm:547
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要額外的套件"
 
-#: ../Rpmdrake/gui.pm:546
+#: ../Rpmdrake/gui.pm:548
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -821,22 +821,22 @@ msgstr ""
 "為了能夠滿足相依性的要求，下面的套件也必須一併安裝：\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:560
+#: ../Rpmdrake/gui.pm:562
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (屬於略過的列表)"
 
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:566
 #, fuzzy, c-format
 msgid "One package cannot be installed"
 msgstr "某些套件無法被安裝"
 
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:566
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "某些套件無法被安裝"
 
-#: ../Rpmdrake/gui.pm:566
+#: ../Rpmdrake/gui.pm:568
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -847,7 +847,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:567
+#: ../Rpmdrake/gui.pm:569
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following packages can't be selected:\n"
@@ -858,27 +858,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
+#: ../Rpmdrake/gui.pm:584 ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
 
-#: ../Rpmdrake/gui.pm:613
+#: ../Rpmdrake/gui.pm:615
 #, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "錯誤：%s 似乎被掛載為唯讀模式。"
 
-#: ../Rpmdrake/gui.pm:617
+#: ../Rpmdrake/gui.pm:619
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您必須先選擇一些套件。"
 
-#: ../Rpmdrake/gui.pm:622
+#: ../Rpmdrake/gui.pm:624
 #, c-format
 msgid "Too many packages are selected"
 msgstr "選取了太多套件"
 
-#: ../Rpmdrake/gui.pm:623
+#: ../Rpmdrake/gui.pm:625
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -894,42 +894,42 @@ msgstr ""
 "\n"
 "您確定要安裝全部選取的套件嗎?"
 
-#: ../Rpmdrake/gui.pm:649 ../Rpmdrake/pkg.pm:230
+#: ../Rpmdrake/gui.pm:651 ../Rpmdrake/pkg.pm:238
 #, c-format
 msgid "Fatal error"
 msgstr "致命的錯誤"
 
-#: ../Rpmdrake/gui.pm:650 ../Rpmdrake/pkg.pm:231
+#: ../Rpmdrake/gui.pm:652 ../Rpmdrake/pkg.pm:239
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "發生了一個致命的錯誤：%s。"
 
-#: ../Rpmdrake/gui.pm:668
+#: ../Rpmdrake/gui.pm:670
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "排序套件中，請稍候..."
 
-#: ../Rpmdrake/gui.pm:686
+#: ../Rpmdrake/gui.pm:688
 #, c-format
 msgid "No update"
 msgstr "無更新"
 
-#: ../Rpmdrake/gui.pm:710 ../rpmdrake:239
+#: ../Rpmdrake/gui.pm:712 ../rpmdrake:239
 #, c-format
 msgid "All"
 msgstr "全部"
 
-#: ../Rpmdrake/gui.pm:719 ../rpmdrake:144
+#: ../Rpmdrake/gui.pm:721 ../rpmdrake:144
 #, c-format
 msgid "Upgradable"
 msgstr "可供更新"
 
-#: ../Rpmdrake/gui.pm:719 ../rpmdrake:144
+#: ../Rpmdrake/gui.pm:721 ../rpmdrake:144
 #, c-format
 msgid "Addable"
 msgstr "可供加入"
 
-#: ../Rpmdrake/gui.pm:739
+#: ../Rpmdrake/gui.pm:741
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "這個套件沒有可用的說明\n"
@@ -962,7 +962,7 @@ msgstr "壓縮"
 
 #: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:57
 #: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:89 ../Rpmdrake/icon.pm:110
-#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:74
+#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:75
 #, c-format
 msgid "Other"
 msgstr "其他"
@@ -1543,44 +1543,49 @@ msgstr "用法：%s [選項]..."
 
 #: ../Rpmdrake/init.pm:40
 #, c-format
+msgid "  --auto                 assume default answers to questions"
+msgstr ""
+
+#: ../Rpmdrake/init.pm:41
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr "  --changelog-first      在描述視窗中先顯示更新資訊再顯示檔案列表"
 
-#: ../Rpmdrake/init.pm:41
+#: ../Rpmdrake/init.pm:42
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     限制於給定的媒體"
 
-#: ../Rpmdrake/init.pm:42
+#: ../Rpmdrake/init.pm:43
 #, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     計畫合併所有找到的 .rpmnew/.rpmsave 檔案"
 
-#: ../Rpmdrake/init.pm:43
+#: ../Rpmdrake/init.pm:44
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=MODE            設定模式 (install (預設值)、remove、update)"
 
-#: ../Rpmdrake/init.pm:44
+#: ../Rpmdrake/init.pm:45
 #, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      在升級模式時不詢問第一個確認問題"
 
-#: ../Rpmdrake/init.pm:45
+#: ../Rpmdrake/init.pm:46
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      啟動時不更新媒體"
 
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:47
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        不驗證套件簽章"
 
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
@@ -1589,37 +1594,37 @@ msgstr ""
 "  --parallel=alias,host  在同步管理模式下，使用 \"alias\" 別名群組或 \"host"
 "\" 主機名稱來顯示相依性"
 
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:49
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    僅顯示這些套件"
 
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:50
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      預先選取這些套件"
 
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:51
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 強制使用 root 來執行"
 
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:52
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           搜尋 \"pkg\" "
 
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:53
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../Rpmdrake/init.pm:129
+#: ../Rpmdrake/init.pm:130
 #, c-format
 msgid "Running in user mode"
 msgstr "以一般使用者模式執行"
 
-#: ../Rpmdrake/init.pm:130
+#: ../Rpmdrake/init.pm:131
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1630,12 +1635,12 @@ msgstr ""
 "您無法對系統進行修改，\n"
 "但是您仍然可以瀏覽現存的資料庫。"
 
-#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
+#: ../Rpmdrake/init.pm:138 ../Rpmdrake/init.pm:163
 #, c-format
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../Rpmdrake/init.pm:142
+#: ../Rpmdrake/init.pm:143
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1647,7 +1652,7 @@ msgstr ""
 "\n"
 "此工具將協助您選取要從系統移除的軟體。"
 
-#: ../Rpmdrake/init.pm:147
+#: ../Rpmdrake/init.pm:148
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1659,12 +1664,12 @@ msgstr ""
 "\n"
 "此工具將協助您選取要安裝於系統上的更新。"
 
-#: ../Rpmdrake/init.pm:152
+#: ../Rpmdrake/init.pm:153
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "歡迎使用軟體安裝工具！"
 
-#: ../Rpmdrake/init.pm:153
+#: ../Rpmdrake/init.pm:154
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1679,22 +1684,22 @@ msgstr ""
 "套件都位於 CD 或 DVD 光碟內。此工具將會協助您選取您想\n"
 "要安裝於系統的軟體。"
 
-#: ../Rpmdrake/init.pm:164
+#: ../Rpmdrake/init.pm:165
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr ""
 
-#: ../Rpmdrake/init.pm:165
+#: ../Rpmdrake/init.pm:166
 #, fuzzy, c-format
 msgid "Do you want to add media sources now?"
 msgstr "您確定要移除套件來源 \"%s\" 嗎？"
 
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
+#: ../Rpmdrake/pkg.pm:188 ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Confirmation"
 msgstr "確認"
 
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/pkg.pm:189
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1707,12 +1712,12 @@ msgstr ""
 "\n"
 "您要繼續嗎?"
 
-#: ../Rpmdrake/pkg.pm:197
+#: ../Rpmdrake/pkg.pm:198
 #, c-format
 msgid "Already existing update media"
 msgstr "更新媒體已存在"
 
-#: ../Rpmdrake/pkg.pm:198
+#: ../Rpmdrake/pkg.pm:199
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1727,12 +1732,12 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../Rpmdrake/pkg.pm:209
+#: ../Rpmdrake/pkg.pm:210
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手動選擇您需要的映射站台"
 
-#: ../Rpmdrake/pkg.pm:210
+#: ../Rpmdrake/pkg.pm:211
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1746,58 +1751,78 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
-#: ../rpmdrake.pm:329
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576 ../Rpmdrake/pkg.pm:742
+#: ../rpmdrake.pm:326
 #, c-format
 msgid "Please wait"
 msgstr "請稍候"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576 ../Rpmdrake/pkg.pm:742
 #, c-format
 msgid "Initializing..."
 msgstr "初始化中..."
 
-#: ../Rpmdrake/pkg.pm:261
+#: ../Rpmdrake/pkg.pm:268
 #, fuzzy, c-format
 msgid "Reading updates description"
 msgstr "依描述"
 
-#: ../Rpmdrake/pkg.pm:287 ../Rpmdrake/pkg.pm:364
+#: ../Rpmdrake/pkg.pm:294 ../Rpmdrake/pkg.pm:371
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../Rpmdrake/pkg.pm:293
+#: ../Rpmdrake/pkg.pm:300
 #, fuzzy, c-format
 msgid "Please wait, listing base packages..."
 msgstr "排序套件中，請稍候..."
 
-#: ../Rpmdrake/pkg.pm:330
+#: ../Rpmdrake/pkg.pm:337
 #, fuzzy, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../Rpmdrake/pkg.pm:447
+#: ../Rpmdrake/pkg.pm:453
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "一般資訊"
+
+#: ../Rpmdrake/pkg.pm:455
+#, c-format
+msgid "These packages come with upgrade information"
+msgstr "這些套件包含了升級資訊"
+
+#: ../Rpmdrake/pkg.pm:463
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "更多該套件的資訊..."
+
+#: ../Rpmdrake/pkg.pm:466
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
+msgstr "更多 %s 套件的資訊..."
+
+#: ../Rpmdrake/pkg.pm:482
 #, c-format
 msgid "Could not create temporary directory '%s'"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
+#: ../Rpmdrake/pkg.pm:490 ../Rpmdrake/pkg.pm:723
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:494 ../Rpmdrake/pkg.pm:699
 #, c-format
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:495 ../Rpmdrake/pkg.pm:514 ../Rpmdrake/pkg.pm:701
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1808,22 +1833,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
+#: ../Rpmdrake/pkg.pm:513 ../Rpmdrake/pkg.pm:689
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../Rpmdrake/pkg.pm:507
+#: ../Rpmdrake/pkg.pm:542
 #, c-format
 msgid "Unable to get source packages."
 msgstr "無法取得來源套件。"
 
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/pkg.pm:544 ../Rpmdrake/pkg.pm:692
 #, c-format
 msgid ""
 "\n"
@@ -1836,19 +1861,19 @@ msgstr ""
 "錯誤報告：\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:558
 #, fuzzy, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "為了滿足相依性，將一併安裝下列套件"
 
-#: ../Rpmdrake/pkg.pm:528
+#: ../Rpmdrake/pkg.pm:563
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "移除一把鑰匙"
 
-#: ../Rpmdrake/pkg.pm:530
+#: ../Rpmdrake/pkg.pm:565
 #, fuzzy, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr ""
@@ -1858,14 +1883,14 @@ msgstr ""
 "\n"
 "您確定要繼續嗎？"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:566
 #, fuzzy, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:566
 #, fuzzy, c-format
 msgid "Is it ok to continue?"
 msgstr ""
@@ -1873,113 +1898,68 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../Rpmdrake/pkg.pm:561
-#, c-format
-msgid "Change medium"
-msgstr "變更媒體"
-
-#: ../Rpmdrake/pkg.pm:562
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "請置入名為 \"%s\" 的媒體於裝置 [%s] 中"
-
-#: ../Rpmdrake/pkg.pm:585
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:585
+#: ../Rpmdrake/pkg.pm:589
 #, fuzzy, c-format
 msgid "Preparing package installation transaction..."
 msgstr "正在準備套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:588
+#: ../Rpmdrake/pkg.pm:592
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:593
 #, c-format
 msgid "Total: %s/%s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
+#: ../Rpmdrake/pkg.pm:621 ../Rpmdrake/pkg.pm:708 ../rpmdrake.pm:741
+#: ../rpmdrake.pm:822 ../rpmdrake.pm:846
+#, c-format
+msgid "Error"
+msgstr "錯誤"
+
+#: ../Rpmdrake/pkg.pm:626 ../Rpmdrake/pkg.pm:631
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../Rpmdrake/pkg.pm:617
+#: ../Rpmdrake/pkg.pm:633
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:634
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:639
-#, c-format
-msgid "Verifying package signatures..."
-msgstr "核對套件簽章..."
-
-#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
-#, c-format
-msgid "Warning"
-msgstr "警告"
-
-#: ../Rpmdrake/pkg.pm:653
-#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you want to continue installation?"
-msgstr ""
-"下列套件的簽章不正確：\n"
-"\n"
-"%s\n"
-"\n"
-"您要繼續安裝嗎？"
-
-#: ../Rpmdrake/pkg.pm:666
+#: ../Rpmdrake/pkg.pm:667
 #, c-format
-msgid "installing %s from %s"
-msgstr "正在由 %2$s 安裝 %1$s"
+msgid "Change medium"
+msgstr "變更媒體"
 
 #: ../Rpmdrake/pkg.pm:668
 #, c-format
-msgid "installing %s"
-msgstr "正在安裝 %s"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "請置入名為 \"%s\" 的媒體於裝置 [%s] 中"
 
 #: ../Rpmdrake/pkg.pm:672
 #, c-format
-msgid "removing %s"
-msgstr "正在移除 %s"
-
-#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
-#: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
-#, c-format
-msgid "Error"
-msgstr "錯誤"
-
-#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
-#, c-format
-msgid "Installation failed:"
-msgstr "安裝失敗；"
-
-#: ../Rpmdrake/pkg.pm:700
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
+msgid "Verifying package signatures..."
+msgstr "核對套件簽章..."
 
-#: ../Rpmdrake/pkg.pm:718
+#: ../Rpmdrake/pkg.pm:678 ../rpmdrake.pm:754 ../rpmdrake.pm:863
 #, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
+msgid "Warning"
+msgstr "警告"
 
-#: ../Rpmdrake/pkg.pm:752
+#: ../Rpmdrake/pkg.pm:690
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1992,12 +1972,17 @@ msgstr ""
 "\n"
 "您或許需要更新您的媒體資料庫。"
 
-#: ../Rpmdrake/pkg.pm:763
+#: ../Rpmdrake/pkg.pm:700
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "安裝失敗"
 
-#: ../Rpmdrake/pkg.pm:777
+#: ../Rpmdrake/pkg.pm:709
+#, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的套件。"
+
+#: ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2010,42 +1995,17 @@ msgstr ""
 "有些設定檔被建立時以 `.rpmnew' 或 `.rpmsave' 命名，您\n"
 "現在可以檢查一下以確保它正常運作："
 
-#: ../Rpmdrake/pkg.pm:787
-#, fuzzy, c-format
-msgid "Upgrade information"
-msgstr "一般資訊"
-
-#: ../Rpmdrake/pkg.pm:789
-#, c-format
-msgid "These packages come with upgrade information"
-msgstr "這些套件包含了升級資訊"
-
-#: ../Rpmdrake/pkg.pm:797
-#, fuzzy, c-format
-msgid "Upgrade information about this package"
-msgstr "更多該套件的資訊..."
-
-#: ../Rpmdrake/pkg.pm:800
-#, fuzzy, c-format
-msgid "Upgrade information about package %s"
-msgstr "更多 %s 套件的資訊..."
-
-#: ../Rpmdrake/pkg.pm:812
-#, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的套件。"
-
-#: ../Rpmdrake/pkg.pm:828 ../Rpmdrake/pkg.pm:845
+#: ../Rpmdrake/pkg.pm:742 ../Rpmdrake/pkg.pm:758
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在移除套件，請稍候..."
 
-#: ../Rpmdrake/pkg.pm:856
+#: ../Rpmdrake/pkg.pm:769
 #, c-format
 msgid "Problem during removal"
 msgstr "移除時發生問題"
 
-#: ../Rpmdrake/pkg.pm:857
+#: ../Rpmdrake/pkg.pm:770
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2078,27 +2038,27 @@ msgstr ""
 msgid "Remove .%s"
 msgstr "移除 .%s"
 
-#: ../Rpmdrake/rpmnew.pm:114
+#: ../Rpmdrake/rpmnew.pm:121
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 為主要檔案"
 
-#: ../Rpmdrake/rpmnew.pm:118
+#: ../Rpmdrake/rpmnew.pm:125
 #, c-format
 msgid "Do nothing"
 msgstr "不進行任何動作"
 
-#: ../Rpmdrake/rpmnew.pm:149
+#: ../Rpmdrake/rpmnew.pm:156
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完成"
 
-#: ../Rpmdrake/rpmnew.pm:164
+#: ../Rpmdrake/rpmnew.pm:171
 #, c-format
 msgid "Inspect..."
 msgstr "檢查..."
 
-#: ../Rpmdrake/rpmnew.pm:182 ../rpmdrake:68 ../rpmdrake:95
+#: ../Rpmdrake/rpmnew.pm:189 ../rpmdrake:68 ../rpmdrake:95
 #, c-format
 msgid "Please wait, searching..."
 msgstr "搜尋中，請稍候..."
@@ -2263,132 +2223,138 @@ msgstr "依描述"
 msgid "in file names"
 msgstr "依檔案名稱"
 
-#: ../rpmdrake:345 ../rpmdrake:348 ../rpmdrake:359 ../rpmdrake:372
-#: ../rpmdrake:381
+#: ../rpmdrake:344 ../rpmdrake:386 ../rpmdrake:390 ../rpmdrake:394
+#: ../rpmdrake:433
+#, c-format
+msgid "/_Options"
+msgstr "/選項 (_O)"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "/_Auto solve dependancies"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:350 ../rpmdrake:361 ../rpmdrake:374
+#: ../rpmdrake:383
 #, c-format
 msgid "/_File"
 msgstr "/檔案 (_F)"
 
-#: ../rpmdrake:348
+#: ../rpmdrake:350
 #, c-format
 msgid "/_Update media"
 msgstr "/更新媒體 (_U)"
 
-#: ../rpmdrake:359
+#: ../rpmdrake:361
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/重新選取 (_R)"
 
-#: ../rpmdrake:372
+#: ../rpmdrake:374
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新載入套件清單 (_P)"
 
-#: ../rpmdrake:381
+#: ../rpmdrake:383
 #, c-format
 msgid "/_Quit"
 msgstr "/離開 (_Q)"
 
-#: ../rpmdrake:381
+#: ../rpmdrake:383
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:384 ../rpmdrake:385 ../rpmdrake:389 ../rpmdrake:419
-#, c-format
-msgid "/_Options"
-msgstr "/選項 (_O)"
-
-#: ../rpmdrake:385
+#: ../rpmdrake:390
 #, c-format
 msgid "/_Media Manager"
 msgstr "/軟體套件媒體管理程式 (_M)"
 
-#: ../rpmdrake:389 ../rpmdrake:419
+#: ../rpmdrake:394 ../rpmdrake:433
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/顯示自動選取的套件 (_S)"
 
-#: ../rpmdrake:393 ../rpmdrake:394 ../rpmdrake:395 ../rpmdrake:396
+#: ../rpmdrake:398 ../rpmdrake:399 ../rpmdrake:400 ../rpmdrake:401
 #, c-format
 msgid "/_Help"
 msgstr "/輔助說明 (_H)"
 
-#: ../rpmdrake:394
+#: ../rpmdrake:399
 #, c-format
 msgid "/_Report Bug"
 msgstr "/回報臭蟲 (_R)"
 
-#: ../rpmdrake:396
+#: ../rpmdrake:401
 #, c-format
 msgid "/_About..."
 msgstr "/關於... (_A)"
 
-#: ../rpmdrake:399
+#: ../rpmdrake:404
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "關於 Rpmdrake"
 
-#: ../rpmdrake:401
+#: ../rpmdrake:406
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../rpmdrake:403
+#: ../rpmdrake:408
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake 是 Mandriva Linux 的套件管理工具。"
 
-#: ../rpmdrake:405
+#: ../rpmdrake:410
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:410
+#: ../rpmdrake:415
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Shiva Huang <shivahuang@gmail.com>\n"
 "You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
 
-#: ../rpmdrake:434
+#: ../rpmdrake:448
 #, c-format
 msgid "Find:"
 msgstr "尋找："
 
-#: ../rpmdrake:443
+#: ../rpmdrake:457
 #, c-format
 msgid "Search"
 msgstr "搜尋"
 
-#: ../rpmdrake:445
+#: ../rpmdrake:459
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../rpmdrake:465
+#: ../rpmdrake:479
 #, c-format
 msgid "Apply"
 msgstr "套用"
 
-#: ../rpmdrake:485
+#: ../rpmdrake:499
 #, c-format
 msgid "Quick Introduction"
 msgstr "快速導覽"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:500
 #, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "您可以藉由左側的分類樹來瀏覽軟體套件。"
 
-#: ../rpmdrake:487
+#: ../rpmdrake:501
 #, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr "您可以藉由點擊右側清單中的軟體套件來看到它的資訊。"
 
-#: ../rpmdrake:488
+#: ../rpmdrake:502
 #, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr "要安裝、升級或者移除一個軟體套件，請點擊它的 \"核取按鈕\"。"
@@ -2413,192 +2379,192 @@ msgstr "請輸入您的憑證以使用代理伺服器\n"
 msgid "User name:"
 msgstr "用戶名稱："
 
-#: ../rpmdrake.pm:184
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "Software Packages Removal"
 msgstr "軟體套件移除"
 
-#: ../rpmdrake.pm:185 ../rpmdrake.pm:189
+#: ../rpmdrake.pm:183 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Packages Update"
 msgstr "軟體套件升級"
 
-#: ../rpmdrake.pm:186
+#: ../rpmdrake.pm:184
 #, c-format
 msgid "Software Packages Installation"
 msgstr "軟體套件安裝"
 
-#: ../rpmdrake.pm:230
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:234
+#: ../rpmdrake.pm:232
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:282
 #, c-format
 msgid "Info..."
 msgstr "資訊..."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:405
 #, c-format
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Australia"
 msgstr "澳洲"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:409
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:412
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Germany"
 msgstr "德國"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:418 ../rpmdrake.pm:422
+#: ../rpmdrake.pm:415 ../rpmdrake.pm:419
 #, c-format
 msgid "Greece"
 msgstr "希臘"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:416
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "France"
 msgstr "法國"
 
-#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:424
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:425
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Italy"
 msgstr "義大利"
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:427
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "Korea"
 msgstr "韓國"
 
-#: ../rpmdrake.pm:428
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../rpmdrake.pm:429
+#: ../rpmdrake.pm:426
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:430
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../rpmdrake.pm:431
+#: ../rpmdrake.pm:428
 #, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:432
+#: ../rpmdrake.pm:429
 #, c-format
 msgid "Russia"
 msgstr "俄羅斯"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:430
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:434
+#: ../rpmdrake.pm:431
 #, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../rpmdrake.pm:435
+#: ../rpmdrake.pm:432
 #, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:436
+#: ../rpmdrake.pm:433
 #, c-format
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:434
 #, c-format
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../rpmdrake.pm:438
+#: ../rpmdrake.pm:435
 #, c-format
 msgid "China"
 msgstr "中國"
 
-#: ../rpmdrake.pm:439 ../rpmdrake.pm:440 ../rpmdrake.pm:441 ../rpmdrake.pm:442
+#: ../rpmdrake.pm:436 ../rpmdrake.pm:437 ../rpmdrake.pm:438 ../rpmdrake.pm:439
 #, c-format
 msgid "United States"
 msgstr "美國"
 
-#: ../rpmdrake.pm:540
+#: ../rpmdrake.pm:537
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2611,7 +2577,7 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:541
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2624,27 +2590,27 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:550 ../rpmdrake.pm:588
+#: ../rpmdrake.pm:547 ../rpmdrake.pm:585
 #, c-format
 msgid "Mirror choice"
 msgstr "映射站台選擇"
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:550
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "請稍候，正在取回映射站台位址。"
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:551
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "請稍候，正在由 Mandriva 網站取回映射站台位址。"
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:558
 #, c-format
 msgid "Error during download"
 msgstr "下載過程發生錯誤"
 
-#: ../rpmdrake.pm:563
+#: ../rpmdrake.pm:560
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2659,7 +2625,7 @@ msgstr ""
 "也許是網路連線失敗，或者是 Mandriva 站台暫時無法聯繫上，\n"
 "請稍候再試。"
 
-#: ../rpmdrake.pm:568
+#: ../rpmdrake.pm:565
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2674,17 +2640,17 @@ msgstr ""
 "也許是網路連線失敗，或者是 Mandriva 站台暫時無法聯繫上，\n"
 "請稍候再試。"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:575
 #, c-format
 msgid "No mirror"
 msgstr "無映射站台"
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:577
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "我找不到任何適合的映射站台。"
 
-#: ../rpmdrake.pm:581
+#: ../rpmdrake.pm:578
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2698,68 +2664,68 @@ msgstr ""
 "會發生這個問題的情況相當多，最常發生的是Mandriva Linux 官方更新目前\n"
 "尚不支援您使用的處理器架構。"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:597
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "請選取想要的映射站台。"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:650
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在複製媒體 `%s' 的檔案..."
 
-#: ../rpmdrake.pm:656
+#: ../rpmdrake.pm:653
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在驗證媒體中的檔案 `%s'..."
 
-#: ../rpmdrake.pm:659
+#: ../rpmdrake.pm:656
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在驗證遠端媒體中的檔案 `%s'..."
 
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:660
 #, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:664
 #, c-format
 msgid " failed!"
 msgstr " 失敗！"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "%s from medium %s"
 msgstr "媒體 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:675
+#: ../rpmdrake.pm:672
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在開始下載 `%s'..."
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:676
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下載 `%s'，剩餘時間：%s，速率：%s"
 
-#: ../rpmdrake.pm:682
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下載 `%s'，速率：%s"
 
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:690
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "請稍候，更新媒體中..."
 
-#: ../rpmdrake.pm:720
+#: ../rpmdrake.pm:717
 #, c-format
 msgid "Error retrieving packages"
 msgstr "接收套件時發生錯誤"
 
-#: ../rpmdrake.pm:721
+#: ../rpmdrake.pm:718
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2773,23 +2739,23 @@ msgstr ""
 "您必須使用軟體套件媒體管理員來移除並重新加入這個媒體來重新設定；或者\n"
 "是因為這個媒體現在無法聯繫上，請您稍待一會再試試看。"
 
-#: ../rpmdrake.pm:752
+#: ../rpmdrake.pm:749
 #, c-format
 msgid "Update media"
 msgstr "更新媒體"
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:754
 #, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "找不到有作用的媒體。您必須啟動這些媒體後才能進行更新。"
 
-#: ../rpmdrake.pm:764
+#: ../rpmdrake.pm:761
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "請選擇您要更新的媒體："
 
-#: ../rpmdrake.pm:803
+#: ../rpmdrake.pm:800
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2802,7 +2768,7 @@ msgstr ""
 "錯誤：\n"
 "%s"
 
-#: ../rpmdrake.pm:826 ../rpmdrake.pm:837
+#: ../rpmdrake.pm:823 ../rpmdrake.pm:834
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2813,17 +2779,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:849
+#: ../rpmdrake.pm:846
 #, c-format
 msgid "Unable to create medium."
 msgstr "無法建立媒體。"
 
-#: ../rpmdrake.pm:854
+#: ../rpmdrake.pm:851
 #, c-format
 msgid "Failure when adding medium"
 msgstr "新增媒體時發生錯誤"
 
-#: ../rpmdrake.pm:855
+#: ../rpmdrake.pm:852
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2834,7 +2800,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:865
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2844,7 +2810,7 @@ msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 %s 版本 (%s) 不符。\n"
 "它將會被停用。"
 
-#: ../rpmdrake.pm:871
+#: ../rpmdrake.pm:868
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2854,12 +2820,12 @@ msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 Mandriva Linux 版本 (%s) 不符。\n"
 "它將會被停用。"
 
-#: ../rpmdrake.pm:888
+#: ../rpmdrake.pm:885
 #, c-format
 msgid "Help launched in background"
 msgstr "於背景啟動說明"
 
-#: ../rpmdrake.pm:889
+#: ../rpmdrake.pm:886
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3135,6 +3101,37 @@ msgstr "移除軟體"
 msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
 
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation?"
+#~ msgstr ""
+#~ "下列套件的簽章不正確：\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "您要繼續安裝嗎？"
+
+#~ msgid "installing %s from %s"
+#~ msgstr "正在由 %2$s 安裝 %1$s"
+
+#~ msgid "installing %s"
+#~ msgstr "正在安裝 %s"
+
+#~ msgid "removing %s"
+#~ msgstr "正在移除 %s"
+
+#~ msgid "Installation failed:"
+#~ msgstr "安裝失敗；"
+
+#~ msgid "Try installation without checking dependencies? (y/N) "
+#~ msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
+
+#~ msgid "Try harder to install (--force)? (y/N) "
+#~ msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
+
 #~ msgid "Preparing..."
 #~ msgstr "準備中..."