update po files

1 files changed, 268 insertions, 177 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index fe8b5ca5..dda2b951 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-15 15:00+0200\n"
+"POT-Creation-Date: 2009-07-29 15:49+0200\n"
 "PO-Revision-Date: 2008-11-01 10:40+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -118,7 +118,7 @@ msgstr "取消 (_C)"
 msgid "Choose location to save file"
 msgstr "選擇存檔的位置"
 
-#: ../gurpmi.pm:39 ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:76
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -139,32 +139,32 @@ msgstr ""
 msgid "Options:"
 msgstr "選項："
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:81 ../urpmi.addmedia:54
 #: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此說明訊息。\n"
 
-#: ../gurpmi.pm:47 ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:88
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非互動式模式，對問題使用預設的回答。\n"
 
-#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:89 ../urpmq:52
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自動選擇要用來升級系統的套件。\n"
 
-#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:112 ../urpmq:66
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 即使某些套件不存在仍然強制執行。\n"
 
-#: ../gurpmi.pm:50 ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:142
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -173,34 +173,34 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 RPM 檔案的簽章。\n"
 "                   (--no-verify-rpm 會停用它，預設值為啟用)。\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:82 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../gurpmi.pm:53 ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:159
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允許於 provides 中搜尋套件。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:160
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 中搜尋套件。\n"
 
-#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:119 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一個根目錄進行 RPM 套件的安裝。\n"
 
-#: ../gurpmi.pm:56 ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:144
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 僅確認安裝是否能夠正確完成。\n"
 
-#: ../gurpmi.pm:57 ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:85
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
@@ -252,7 +252,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:146 ../urpmi:626
+#: ../gurpmi2:146 ../urpmi:648
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -293,13 +293,13 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:267 ../urpmi:593
+#: ../gurpmi2:267 ../urpmi:613
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:268 ../urpmi:594
+#: ../gurpmi2:268 ../urpmi:614
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -326,29 +326,29 @@ msgstr "準備中..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:333 ../urpmi:621
+#: ../gurpmi2:334 ../urpmi:643
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
 
-#: ../gurpmi2:347
+#: ../gurpmi2:348
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpmi2:359 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../gurpmi2:360 ../urpm.pm:327 ../urpm/download.pm:821
 #: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
 #: ../urpm/media.pm:1422
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
 
-#: ../gurpmi2:375
+#: ../gurpmi2:376
 #, c-format
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:391
+#: ../gurpmi2:393
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -359,27 +359,27 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:397 ../urpm/main_loop.pm:253 ../urpm/main_loop.pm:296
+#: ../gurpmi2:399 ../urpm/main_loop.pm:253 ../urpm/main_loop.pm:296
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../gurpmi2:402
+#: ../gurpmi2:404
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:404
+#: ../gurpmi2:406
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:405 ../urpme:169
+#: ../gurpmi2:407 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:413 ../urpmi:688
+#: ../gurpmi2:415 ../urpmi:710
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -418,7 +418,7 @@ msgstr "                    預設為 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - 輸出 RPM 的完整名稱 (NVRA)\n"
 
-#: ../rurpmi:11 ../urpmi:269
+#: ../rurpmi:11 ../urpmi:284
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只有擁有管理者權限的使用者才能安裝套件"
@@ -513,52 +513,52 @@ msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm/args.pm:371
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:372
+#: ../urpm/args.pm:377
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "遺失簽名 (%s)"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:383
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:387
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:396
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:460
+#: ../urpm/args.pm:465
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目錄不存在"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:488
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:491 ../urpm/args.pm:494 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:502
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
 
-#: ../urpm/bug_report.pm:55 ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:274
 #, c-format
 msgid "Copying failed"
 msgstr "複製失敗"
@@ -630,106 +630,210 @@ msgstr "用戶名稱："
 msgid "Password:"
 msgstr "密碼："
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:259
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpm/download.pm:266
+#: ../urpm/download.pm:267
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失敗：離開訊號 %d"
 
-#: ../urpm/download.pm:267
+#: ../urpm/download.pm:268
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:301
+#: ../urpm/download.pm:302
 #, c-format
 msgid "copy failed"
 msgstr "複製失敗"
 
-#: ../urpm/download.pm:307
+#: ../urpm/download.pm:308
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget 遺失了\n"
 
-#: ../urpm/download.pm:374
+#: ../urpm/download.pm:375
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl 遺失了\n"
 
-#: ../urpm/download.pm:499
+#: ../urpm/download.pm:511
+#, fuzzy, c-format
+msgid "curl failed: upload canceled\n"
+msgstr "curl 失敗：已取消下載\n"
+
+#: ../urpm/download.pm:512
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失敗：已取消下載\n"
 
-#: ../urpm/download.pm:538
+#: ../urpm/download.pm:547
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync 遺失了\n"
 
-#: ../urpm/download.pm:606
+#: ../urpm/download.pm:615
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh 遺失了\n"
 
-#: ../urpm/download.pm:625
+#: ../urpm/download.pm:634
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla 遺失了\n"
 
-#: ../urpm/download.pm:641
+#: ../urpm/download.pm:650
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "無法執行 prozilla\n"
 
-#: ../urpm/download.pm:651
+#: ../urpm/download.pm:660
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 遺失了\n"
 
-#: ../urpm/download.pm:694
+#: ../urpm/download.pm:703
 #, c-format
 msgid "Failed to download %s"
 msgstr "下載 %s 失敗"
 
-#: ../urpm/download.pm:788
+#: ../urpm/download.pm:798
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已經完成 %s%% 共 %s，ETA = %s，速度 = %s"
 
-#: ../urpm/download.pm:789
+#: ../urpm/download.pm:799
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 完成，速度 = %s"
 
-#: ../urpm/download.pm:862
+#: ../urpm/download.pm:872
 #, c-format
 msgid "retrieving %s"
 msgstr "正在取得 %s"
 
-#: ../urpm/download.pm:869
+#: ../urpm/download.pm:879
 #, c-format
 msgid "retrieved %s"
 msgstr ".已取得 %s"
 
-#: ../urpm/download.pm:933
+#: ../urpm/download.pm:943
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定義了未知的通訊協定"
 
-#: ../urpm/download.pm:945
+#: ../urpm/download.pm:955
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "沒有找到 webfetch，支援的 webfetch 有：%s\n"
 
-#: ../urpm/download.pm:962
+#: ../urpm/download.pm:972
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "無法處理通訊協定：%s"
 
+#: ../urpm/dudf.pm:194
+#, c-format
+msgid ""
+"# Here are logs of your DUDF uploads.\n"
+"# Line format is : <date time of generation> <uid>\n"
+"# You can use uids to see the content of your uploads at this url :\n"
+"# http://dudf.forge.mandriva.com/\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:243
+#, c-format
+msgid "curl is missing, cannot upload DUDF file.\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:247
+#, c-format
+msgid "Compressing DUDF data... "
+msgstr ""
+
+#: ../urpm/dudf.pm:249 ../urpm/dudf.pm:250
+#, c-format
+msgid "NOT OK\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:258 ../urpm/dudf.pm:452
+#, c-format
+msgid "OK\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:260
+#, c-format
+msgid "Uploading DUDF data:\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:281
+#, c-format
+msgid ""
+"\n"
+"You can see your DUDF report at the following URL :\n"
+"\t"
+msgstr ""
+
+#: ../urpm/dudf.pm:287
+#, c-format
+msgid ""
+"You can access to a log of your uploads in\n"
+"\t"
+msgstr ""
+
+#: ../urpm/dudf.pm:331 ../urpm/msg.pm:76 ../urpmi:511 ../urpmi:526
+#: ../urpmi:633
+#, c-format
+msgid "Nn"
+msgstr "Nn否"
+
+#: ../urpm/dudf.pm:332
+#, c-format
+msgid ""
+"A problem has been encountered. You can help Mandriva to improve packages "
+"installation \n"
+msgstr ""
+
+#: ../urpm/dudf.pm:333
+#, c-format
+msgid ""
+"by uploading us a DUDF report file. This is a part of the Mancoosi european "
+"research project.\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:334
+#, c-format
+msgid "More at http://www.mancoosi.org\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:335
+#, c-format
+msgid "Do you want to upload to Mandriva a DUDF report?"
+msgstr ""
+
+#: ../urpm/dudf.pm:336 ../urpmi:513 ../urpmi:528 ../urpmi:634
+#: ../urpmi.addmedia:135
+#, c-format
+msgid " (Y/n) "
+msgstr " (Y/n) (是/否) "
+
+#: ../urpm/dudf.pm:337
+#, c-format
+msgid ""
+"\n"
+"Generating DUDF... "
+msgstr ""
+
+#: ../urpm/dudf.pm:456
+#, fuzzy, c-format
+msgid ""
+"Cannot write DUDF file\n"
+"."
+msgstr "無法寫入檔案"
+
 #: ../urpm/get_pkgs.pm:16
 #, c-format
 msgid "cleaning %s and %s"
@@ -1211,23 +1315,18 @@ msgstr "重新嘗試鏡像站 %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "無法從鏡像站列表 %s 找到鏡像站"
 
-#: ../urpm/mirrors.pm:218
+#: ../urpm/mirrors.pm:222
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:263
+#: ../urpm/mirrors.pm:267
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "正由 %s 取得鏡像站列表"
 
-#: ../urpm/msg.pm:76 ../urpmi:494 ../urpmi:509 ../urpmi:613
-#, c-format
-msgid "Nn"
-msgstr "Nn否"
-
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:545 ../urpmi:649 ../urpmi:655
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:563 ../urpmi:671 ../urpmi:677
 #: ../urpmi.addmedia:132
 #, c-format
 msgid "Yy"
@@ -1431,32 +1530,27 @@ msgstr "%s 套件已經安裝了"
 msgid "Packages %s are already installed"
 msgstr "%s 套件已經安裝了"
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:648
+#: ../urpm/select.pm:563 ../urpm/select.pm:650
 #, c-format
-msgid "due to missing %s"
-msgstr "由於遺失了 %s"
-
-#: ../urpm/select.pm:565
-#, c-format
-msgid "due to already installed %s"
-msgstr "由於已經安裝了 %s"
+msgid "due to conflicts with %s"
+msgstr "由於與 %s 發生衝突"
 
-#: ../urpm/select.pm:566 ../urpm/select.pm:646
+#: ../urpm/select.pm:564 ../urpm/select.pm:644
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於未滿足 %s"
 
-#: ../urpm/select.pm:572
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在試著促進 %s"
 
-#: ../urpm/select.pm:573
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %s"
 
-#: ../urpm/select.pm:614
+#: ../urpm/select.pm:612
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1465,7 +1559,7 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpm/select.pm:615
+#: ../urpm/select.pm:613
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1474,15 +1568,15 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpm/select.pm:642
+#: ../urpm/select.pm:640
 #, c-format
 msgid "in order to install %s"
 msgstr "為了要安裝 %s"
 
-#: ../urpm/select.pm:652
+#: ../urpm/select.pm:646
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "由於與 %s 發生衝突"
+msgid "due to missing %s"
+msgstr "由於遺失了 %s"
 
 #: ../urpm/signature.pm:33
 #, c-format
@@ -1555,12 +1649,12 @@ msgstr ""
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
 
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#: ../urpme:51 ../urpmi:118 ../urpmq:68
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
 
-#: ../urpme:52 ../urpmi:142
+#: ../urpme:52 ../urpmi:151
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在移除前重新打包檔案\n"
@@ -1570,13 +1664,13 @@ msgstr "  --repackage    - 在移除前重新打包檔案\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpme:54 ../urpmf:40 ../urpmi:120 ../urpmi.addmedia:72
 #: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --urpmi-root   - 使用另一個根目錄存放 urpmi 資料庫與 RPM 的安裝。\n"
 
-#: ../urpme:55 ../urpmi:101
+#: ../urpme:55 ../urpmi:110
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只更新 RPM 資料庫，而非檔案系統。\n"
@@ -1595,7 +1689,7 @@ msgstr ""
 "  --use-distrib  - 立即由一個散佈套件樹設定 urpme，在搭配 --root 選項來安\n"
 "                   裝/移除一個 chroot 時很方便。\n"
 
-#: ../urpme:59 ../urpmi:153 ../urpmq:89
+#: ../urpme:59 ../urpmi:162 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 詳細訊息模式。\n"
@@ -1691,12 +1785,12 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpmf:37 ../urpmi:141 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpmf:38 ../urpmi:83 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
@@ -1707,7 +1801,7 @@ msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不比對樣版，把參數當作一般字串。\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpmf:42 ../urpmi:86 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1718,7 +1812,7 @@ msgstr "  --sortmedia    - 依據子字串排序媒體，以逗號分開。\n"
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用指定的路徑來存取媒體\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpmf:44 ../urpmi:87 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
@@ -1728,7 +1822,7 @@ msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫�
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不顯示相同的訊息。\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpmf:46 ../urpmi:84 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新媒體。\n"
@@ -1953,44 +2047,44 @@ msgstr "媒體 \"%s\" 沒有可用的 synthesis"
 msgid "no xml-info available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 xml-info"
 
-#: ../urpmi:81
+#: ../urpmi:90
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 當升級系統時更新媒體。\n"
 
-#: ../urpmi:82
+#: ../urpmi:91
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 不使用 MD5SUM 檔案檢查功能。\n"
 
-#: ../urpmi:83
+#: ../urpmi:92
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 強制更新 gpg 金鑰。\n"
 
-#: ../urpmi:84
+#: ../urpmi:93
 #, c-format
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:54
+#: ../urpmi:94 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - 不要自動選取 \"建議的\" 套件。\n"
 
-#: ../urpmi:86
+#: ../urpmi:95
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 絕不要求移除套件，直接中斷安裝。\n"
 
-#: ../urpmi:87
+#: ../urpmi:96
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安裝套件 (只下載)。\n"
 
-#: ../urpmi:88 ../urpmq:56
+#: ../urpmi:97 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1999,7 +2093,7 @@ msgstr ""
 "  --keep         - 盡可能的保留現存的套件，拒絕安裝會導致移除其他套件的\n"
 "                   套件。\n"
 
-#: ../urpmi:90
+#: ../urpmi:99
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -2010,52 +2104,52 @@ msgstr ""
 "                   分割為幾個小的安裝程序。\n"
 "                   預設值為 %d。\n"
 
-#: ../urpmi:94
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小型安裝程序大小，預設值為 %d。\n"
 
-#: ../urpmi:96
+#: ../urpmi:105
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 加上模糊搜尋。\n"
 
-#: ../urpmi:97
+#: ../urpmi:106
 #, c-format
 msgid "  --buildrequires - install the buildrequires of the packages\n"
 msgstr ""
 "  --buildrequires - 安裝建構此套件所需的套件\n"
 "\n"
 
-#: ../urpmi:98
+#: ../urpmi:107
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安裝原始碼套件 (不安裝二進位檔)。\n"
 
-#: ../urpmi:99
+#: ../urpmi:108
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - 在執行任何事前先由快取中移除 RPM 檔案。\n"
 
-#: ../urpmi:100
+#: ../urpmi:109
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不清除快取中的 RPM 檔案。\n"
 
-#: ../urpmi:102
+#: ../urpmi:111
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - 強制安裝已經安裝過的套件。\n"
 
-#: ../urpmi:104
+#: ../urpmi:113
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允許要求使用者不檢查相依性就安裝套件。\n"
 
-#: ../urpmi:106
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -2064,12 +2158,12 @@ msgstr ""
 "  --allow-force  - 允許要求使用者安裝套件而不檢查相依性與完整\n"
 "                   性。\n"
 
-#: ../urpmi:108
+#: ../urpmi:117
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
 msgstr "  --allow-suggests - 自動選取 \"建議的\" 套件。\n"
 
-#: ../urpmi:112
+#: ../urpmi:121
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -2078,12 +2172,12 @@ msgstr ""
 "  --use-distrib  - 立即由一個散佈套件樹設定 urpmi，在搭配 --root 選項來安\n"
 "                   裝/移除一個 chroot 時很方便。\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
+#: ../urpmi:123 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr ""
 
-#: ../urpmi:115
+#: ../urpmi:124
 #, c-format
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
@@ -2092,37 +2186,37 @@ msgstr ""
 "  --downloader   - 用來取得遠端檔案的程式。\n"
 "                   已知的程式有：%s\n"
 
-#: ../urpmi:118
+#: ../urpmi:127
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr " --curl-options - 要額外傳給 curl 的參數\n"
 
-#: ../urpmi:119
+#: ../urpmi:128
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 要額外傳給 rsync 的參數\n"
 
-#: ../urpmi:120
+#: ../urpmi:129
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 要額外傳給 wget 的參數\n"
 
-#: ../urpmi:121
+#: ../urpmi:130
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 要額外傳給 prozilla 的參數\n"
 
-#: ../urpmi:122
+#: ../urpmi:131
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 要額外傳給 aria2 的參數\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
+#: ../urpmi:132 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 限制下載的速度。\n"
 
-#: ../urpmi:124
+#: ../urpmi:133
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -2131,7 +2225,7 @@ msgstr ""
 "  --resume       - 接著傳送下載到一半的檔案\n"
 "                   (--no-resume 選項停用它，預設值為停用)。\n"
 
-#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
+#: ../urpmi:135 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2140,7 +2234,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理伺服器，通訊埠假設為預設值 1080 \n"
 "                   (格式為 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
+#: ../urpmi:137 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2149,54 +2243,54 @@ msgstr ""
 "  --proxy-user   - 指定代理伺服器認證的使用者帳號與密碼\n"
 "                   (格式為 <user:password>)。\n"
 
-#: ../urpmi:130
+#: ../urpmi:139
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "  --bug          - 輸出臭蟲回報到下一個參數所指定的目錄。\n"
 
-#: ../urpmi:136
+#: ../urpmi:145
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除以逗號分隔的路徑。\n"
 
-#: ../urpmi:137
+#: ../urpmi:146
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除說明文件檔案。\n"
 
-#: ../urpmi:138
+#: ../urpmi:147
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安裝前不檢查剩餘的磁碟空間。\n"
 
-#: ../urpmi:139
+#: ../urpmi:148
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允許安裝硬體架構不相符的 RPM 檔。\n"
 
-#: ../urpmi:140
+#: ../urpmi:149
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不執行套件中的命令稿\n"
 
-#: ../urpmi:141
+#: ../urpmi:150
 #, c-format
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --replacefiles - 忽略檔案衝突\n"
 
-#: ../urpmi:143
+#: ../urpmi:152
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安裝時應該略過的套件\n"
 
-#: ../urpmi:144
+#: ../urpmi:153
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 應該要優先考慮的套件\n"
 
-#: ../urpmi:145
+#: ../urpmi:154
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2204,82 +2298,82 @@ msgid ""
 msgstr ""
 "  --more-choices - 當找到不只一個套件時，提供除了預設值之外的多個選擇。\n"
 
-#: ../urpmi:147
+#: ../urpmi:156
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不鎖定 RPM 資料庫。\n"
 
-#: ../urpmi:148
+#: ../urpmi:157
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 只升級相同平台的套件。\n"
 
-#: ../urpmi:149 ../urpmq:97
+#: ../urpmi:158 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合的項目。\n"
 
-#: ../urpmi:152
+#: ../urpmi:161
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安靜模式。\n"
 
-#: ../urpmi:154
+#: ../urpmi:163
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常詳細模式。\n"
 
-#: ../urpmi:155
+#: ../urpmi:164
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  將會安裝於命令列指定的名稱或 RPM 檔案。\n"
 
-#: ../urpmi:183
+#: ../urpmi:198
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "錯誤：無法與套件列表一起使用 --auto-select。\n"
 
-#: ../urpmi:190
+#: ../urpmi:205
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "錯誤：要生成一個臭蟲回報，請指定平常的命令列參數另外再加上 --bug。\n"
 
-#: ../urpmi:220
+#: ../urpmi:235
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "當使用 --install-src 時您無法安裝二進制 RPM 檔案"
 
-#: ../urpmi:221
+#: ../urpmi:236
 #, c-format
 msgid "You can't install spec files"
 msgstr "您無法安裝 spec 檔案"
 
-#: ../urpmi:228
+#: ../urpmi:243
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "--buildrequires 的預設值"
 
-#: ../urpmi:233
+#: ../urpmi:248
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "請使用 --buildrequires 或者 --install-src，預設為 --buildrequires"
 
-#: ../urpmi:253
+#: ../urpmi:268
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目錄 [%s] 已經存在，請指定另一個目錄給臭蟲回報或刪除它"
 
-#: ../urpmi:254
+#: ../urpmi:269
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
 
-#: ../urpmi:275
+#: ../urpmi:290
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2289,42 +2383,42 @@ msgstr ""
 "使用 --allow-force 標籤來強制執行。"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:428
+#: ../urpmi:445
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s：%s (升級用)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:430
+#: ../urpmi:447
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (升級用)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:434
+#: ../urpmi:451
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s：%s (安裝用)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:436
+#: ../urpmi:453
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (安裝用)"
 
-#: ../urpmi:442
+#: ../urpmi:459
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "為了滿足 '%s' 的相依性，需要下列套件之一："
 
-#: ../urpmi:445
+#: ../urpmi:462
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "您要選擇何者？ (1-%d) "
 
-#: ../urpmi:487
+#: ../urpmi:504
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2334,7 +2428,7 @@ msgstr ""
 "下列套件無法安裝，因為它需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:489
+#: ../urpmi:506
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2344,7 +2438,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:495 ../urpmi:510
+#: ../urpmi:512 ../urpmi:527
 #, c-format
 msgid ""
 "\n"
@@ -2353,12 +2447,7 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:496 ../urpmi:511 ../urpmi:614 ../urpmi.addmedia:135
-#, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) (是/否) "
-
-#: ../urpmi:504
+#: ../urpmi:521
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2367,7 +2456,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:505
+#: ../urpmi:522
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2376,12 +2465,12 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:522
+#: ../urpmi:539
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpmi:530
+#: ../urpmi:547
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2391,7 +2480,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:532
+#: ../urpmi:549
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2401,12 +2490,12 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:558
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(僅測試，移除動作並不會真的執行)"
 
-#: ../urpmi:560
+#: ../urpmi:578
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2416,44 +2505,44 @@ msgstr ""
 "您必須先呼叫 urpmi --buildrequires 來安裝下列相依性套件：\n"
 "%s\n"
 
-#: ../urpmi:571
+#: ../urpmi:588
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpmi:596
+#: ../urpmi:616
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:602
+#: ../urpmi:622
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "將使用 %s 額外磁碟空間。"
 
-#: ../urpmi:603
+#: ../urpmi:623
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "將釋放 %s 磁碟空間。"
 
-#: ../urpmi:604
+#: ../urpmi:624
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "將取得 %s 軟體套件。"
 
-#: ../urpmi:605
+#: ../urpmi:625
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../urpmi:626
+#: ../urpmi:648
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:634
+#: ../urpmi:656
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "掛載好後請按 Enter..."
@@ -3051,3 +3140,5 @@ msgstr "RPM 檔案安裝的圖形化前端"
 msgid "Software Installer"
 msgstr "軟體安裝程式"
 
+#~ msgid "due to already installed %s"
+#~ msgstr "由於已經安裝了 %s"