From 2d5c3a1e47af9cb411573a74fdcc163c238886cb Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Fri, 23 Apr 2004 22:42:28 +0000
Subject: updated pot file

---
 po/zh_TW.po | 909 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 453 insertions(+), 456 deletions(-)

(limited to 'po/zh_TW.po')

diff --git a/po/zh_TW.po b/po/zh_TW.po
index adf6c970..afdddc03 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-04-17 21:32+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -59,22 +59,22 @@ msgstr ""
 "自動套件安裝...\n"
 "您要求安裝的套件 %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "這樣可以嗎?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
@@ -84,7 +84,7 @@ msgstr " (Y/n) (是/否) "
 msgid "%s: command not found\n"
 msgstr "%s:找不到指令\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -93,242 +93,181 @@ msgstr ""
 "使用法: %s [選項]\n"
 "其中 [選項] 是從\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - 顯示此說明訊息.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - 限制結果到給定的群組.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    預設為 %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "未知的 webfetch `%s'!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "未知的通訊協定項目定義於 %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "沒有找到 webfetch, 支援的 webfetch 有: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "無法處理通訊協定: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "複製失敗: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget 遺失\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget 失敗: 離開於 %d 或信號 %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl 遺失\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl 失敗: 離開於 %d 或信號 %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync 遺失\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync 失敗: 離開於 %d 或信號 %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh 遺失\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s 完成, ETA = %s, 速度 = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% 完成, 速度 = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...擷取失敗: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "語法錯誤於設定檔內的第 %s 行"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的 hdlist, 忽略媒體"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的清單, 忽略媒體"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "無法處理媒體 \"%s\" 因為另一個媒體正在使用清單檔"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "無法使用名稱 \"%s\" 給未命名的媒體因為它已經被使用了"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "不會考慮使用媒體 \"%s\" 因為無清單檔案 [%s] 存在"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "無法決定這個 hdlist 檔案 [%s] 的媒體"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" hdlist 檔案, 忽略這個媒體"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的清單檔, 忽略這個媒體"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "正在嘗試避開現存的媒體  \"%s\" , 正在避免"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虛擬媒體 \"%s\" 不應該有定義 hdlist 或清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虛擬媒體 \"%s\" 應該有一個清楚的 url, 忽略這個媒體"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "無法找到 \"%s\" hdlist 檔案, 忽略這個媒體"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "無法找到 \"%s\" 清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "前後不一致的 \"%s\" 的清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "無法檢查 \"%s\" 的清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移動式媒體 \"%s\" 的掛載點過多"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "將可移動式裝置當成 \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "使用不同的可移動式裝置 [%s] 於 \"%s\" "
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "無法擷取移動式媒體 \"%s\" 的路徑名稱"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "寫入設定檔 [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "無法於 use-distrib 模式下使用平行模式"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "無法解析 %s 檔案內的 %s"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "檢驗 [%s] 檔案內的平行處理器"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "在 %s 發現節點的處理器"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "使用相關媒體於平行模式: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "無法使用平行選項 \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -337,133 +276,139 @@ msgstr ""
 "--synthesis 不能夠與 --media, --excludemedia, --sortmedia, --update 與 --"
 "parallel 使用"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗綜合檔案 [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虛擬媒體 \"%s\" 並非本地端, 忽略這個媒體"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 hdlist 或綜合檔案發生問題"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在執行第二部相依性的計算\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "正在略過套件 %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "會要安裝而非升級套件 %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "虛擬媒體需要是本地的"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "加入的媒體 %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "無法存取第一個安裝媒體"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "複製 hdlist 檔案..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "無法存取第一個安裝媒體 (找不到 Mandrake/base/hdlists 檔案)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "擷取 hdlists 檔案..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...擷取失敗: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 檔案中有無效的 hdlist 敘述 \"%s\""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體: \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -473,229 +418,229 @@ msgstr ""
 "無法存取媒體 \"%s\",\n"
 "這在你建立媒體時手動掛載目錄時有可能發生."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虛擬媒體 \"%s\" 應該有有效的來源 hdlist 或綜合, 忽略這個媒體"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "計算來源 hdlist 的 md5sum (或綜合)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在檢驗 MD5SUM 檔案"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在複製 \"%s\" 的來源 hdlist (或綜合)..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案可疑的小)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在計算被複製的來源 hdlist (或綜合) 的 md5sum"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "複製 [%s] 失敗 (md5sum 不合)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的綜合檔案發生問題"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "由 [%s] 讀取 rpm 檔案"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "無法由 [%s] 讀取 rpm 套件: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "在 [%s] 內找不到 rpm 檔案"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在擷取 \"%s\" 的來源 hdlist (或綜合)..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "發現探查到的 hdlist (或綜合) 為 %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在計算來源 hdlist (或綜合) 的 md5sum"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不合"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "擷取來源 hdlist (或綜合) 失敗"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "無媒體 \"%s\" 的 hdlist 檔案被找到"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "檔案 [%s] 已經被相同的 \"%s\" 媒體所使用了"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "無法從語法上分析 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "無法寫入 \"%s\" 的清單檔案"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在寫入 \"%s\" 的清單檔案"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "沒有資料寫入 \"%s\" 的清單檔案"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的 pubkey 檔案..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%s\" 的 pubkey 檔案匯入 key %s"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的 pubkey 檔案"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在讀取媒體 \"%s\" 的標頭"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在建立 hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "為媒體 \"%s\" 建立綜合檔案"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "在 cache 找到 %d 個標頭"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "正在移除 %d 個在 cache 內廢棄的標頭"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "正在掛載 %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "正在卸載 %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "重新安置 %s 項目於 depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "無項目被重新安置於 depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在擷取 rpms 檔案 [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "沒有套件命名為 %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多個套件有相同 rpm 檔案名稱 \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "無法正確從語法上分析 [%s] 於數值 \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -704,142 +649,158 @@ msgstr ""
 "媒體 \"%s\" 使用一個無效的清單檔案:\n"
 "  鏡設站可能不是最新狀態, 正在嘗試使用替代方法"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "媒體 \"%s\" 沒有定義任何 rpm 檔案位置"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "找不到套件 %s."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 資料庫鎖住了"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "未選擇媒體 \"%s\" "
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "無法由媒體 \"%s\" 讀取 [%s] rpm 檔案"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "前後不一致的媒體 \"%s\" 標示為可移除但是事實上卻不是這麼一回事"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "無法存取媒體 \"%s\" "
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "不合格式的輸入:[%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "正在使用 %d 程序以執行交易"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "建立交易給 %s 上的安裝 (移除=%d, 安裝=%d, 升級=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "無法建立處理"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "無法移除套件 %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "正在新增套件 %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "無法安裝套件 %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "由於 %s 遺失"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於 %s 未被滿足"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在嘗試促進 %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "為了要安裝 %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "由於與 %s 的衝突"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "未被要求"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "無效的簽名 (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "無效的 Key ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "遺失簽名 (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "於命令列上有壞的 proxy 宣告\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 無法讀取 rpm 檔案 \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "對不起, 錯誤選擇, 再試一次\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -855,38 +816,40 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此說明訊息.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自動選擇一個上等套件.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "  --test         - verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 確認安裝是否能夠正確達成.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 強制實施即使某些套件不存在.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 穿過別名機器分散式的 urpmi\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一個 rpm 安裝的根.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -895,72 +858,62 @@ msgstr ""
 "  --use-distrib  - 由一個發行版樹即時設定 urpmi ,有用於\n"
 "                   安裝/反安裝一個 chroot 藉由 --root 選項.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整資訊模式.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 選擇所有符合描述的套件.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "未知的套件"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "未知的套件"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "沒有東西可移除"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "正在檢查以移除以下套件:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "為了滿足相依性, 下列套件將會被移除 (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "正在移除失敗"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "對不起, 錯誤選擇, 再試一次\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -976,37 +929,38 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新的媒體.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體, 以逗號分開.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用給定的媒體, 以逗號分開.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 依據子字串排序媒體, 以逗號分開.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用給定的綜合檔案, 而不是 urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 完整資訊模式.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1016,134 +970,136 @@ msgstr ""
 "  --quiet        - 不顯示標籤名稱 (預設若無標籤給定於 命\n"
 "                   令列, 不相容於互動式模式).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq          - 不顯示同一的行.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - 列印全部標籤.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - 顯示標籤群組: 群組.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - 顯示標籤大小: 大小.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch          - 顯示標籤時代: 時代.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - 列印標籤摘要: 摘要.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - 顯示標籤描述: 描述.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - 顯示標籤 sourcerpm: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - 顯示標籤包裝者: 裝者.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - 顯示標籤 buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - 顯示標籤 url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - 顯示標籤提供: 全部提供.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - 顯示標籤需要: 全部需要.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - 顯示標籤檔案: 全部檔案.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - 顯示標籤衝突: 衝突.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - 顯示標籤過時: 全部過時.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - 於每一個樣式中忽略大小寫分別.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本, 發行與 arch 名稱.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接包含 perl 碼類似 perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
-msgid "  -a             - binary AND operator, true if both expression are true.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -a             - 二元 AND 運算子, 真值若兩者皆真.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
-msgid "  -o             - binary OR operator, true if one expression is true.\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr "  -o             - 二元 OR 運算子, 真值若一者為真.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !             - 一元 NOT, 真值若描述句為假.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - 左括弧以開啟群組描述句.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - 右括弧以關閉群組描述句.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1152,12 +1108,12 @@ msgstr ""
 "收回回饋是 :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在使用特定的環境於 %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1173,33 +1129,34 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用給定的綜合而不是 urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自動選擇升級系統的套件.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 永不要求反安裝一個套件, 中斷安裝.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
-"  --keep         - 盡可能保留存在的套件, 拒絕"
-"                  會導致移除的被要求的套件.\n"
+"  --keep         - 盡可能保留存在的套件, 拒絕                  會導致移除的被"
+"要求的套件.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1207,37 +1164,37 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 加上模糊搜尋(如同 -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下個套件是原始碼套件 (如同 -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - 在任何其他事前先由 cache 中移除 rpm.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 保留 cache 中未使用的 rpm.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1246,7 +1203,7 @@ msgstr ""
 "  --allow-nodeps - 允許要求使用者不檢查相依性\n"
 "                   安裝套件.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1255,29 +1212,29 @@ msgstr ""
 "  --allow-force  - 允許要求使用者安裝套件\n"
 "                   而不檢查相依性與完整性.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 使用 wget 擷取遠端檔案.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 使用 curl 擷取遠端檔案.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1286,7 +1243,7 @@ msgstr ""
 "  --resume       - 重新開始部份下載檔案的傳送\n"
 "                   (--no-resume 禁用它, 預設為禁用).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1295,7 +1252,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP proxy, port number 被假設\n"
 "                   為1080 為預設值 (格式為 <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1304,19 +1261,19 @@ msgstr ""
 "  --proxy-user   - 指定 proxy 認證的使用者與密碼\n"
 "                   (格式為 <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - 使用 X 界面.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1325,7 +1282,7 @@ msgstr ""
 "  --best-output  - 按照環境選擇最佳的界面:\n"
 "                   X 或文字模式.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1334,73 +1291,62 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 rpm 簽名.\n"
 "                   (--no-verify-rpm 禁用它, 預設為啟用).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除以逗號分開的路徑.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合項目.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允許於 provides 中搜尋以找到套件.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不於 provides 中搜尋以找到套件.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 加上模糊搜尋( 如同 --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下個套件是原始檔套件 (如同 --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安靜模式.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  於命令列指定的名稱或 rpm 檔案將會被安裝.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "選擇存檔的位置"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "於命令列上有壞的 proxy 宣告\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "當使用 --install-src 時隨著二元 rpm 檔案可做的事"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1421,22 +1367,22 @@ msgstr ""
 "\n"
 "您想怎麼做?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "不進行任何動作"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "是的, 實在安裝它"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "儲存檔案"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1451,54 +1397,54 @@ msgstr ""
 "\n"
 "您或許寧願只是儲存它. 您的選擇是什麼?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "安裝它"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目錄 [%s] 已經存在, 請使用另一個目錄給臭蟲報告或刪除它"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只有 superuser 才允許安裝套件"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "須要安裝下列其中之一套件 %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列其中一個套件:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "何者是您的選擇? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "初始化中..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1507,12 +1453,12 @@ msgstr ""
 "某些要求的套件不能被安裝:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "你同意嗎?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1522,7 +1468,7 @@ msgstr ""
 "安裝無法繼續因為下列套件必須移除給其他套件來升級:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1531,14 +1477,14 @@ msgstr ""
 "下列套件必須移除給其他套件來升級:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "為了滿足相依性, 下列套件將要被安裝. (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1547,37 +1493,47 @@ msgstr ""
 "您需要為 root 以安裝下列相依性項目:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件, 放棄"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請將具有名稱 \"%s\" 的媒體放入到裝置 [%s] 內"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "準備好時請按 Enter..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s 完成, ETA = %s, 速度 = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% 完成, 速度 = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列套件有壞的簽名"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續進行安裝嗎?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1588,57 +1544,57 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "正在發佈 %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性安裝? (y/N)(是/否)"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "嘗試甚至更強制的安裝方式 (--force)? (y/N)(是/否)"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安裝處理失敗"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "安裝為可能的"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "每一個東西都已經安裝了"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新開始 urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1663,36 +1619,36 @@ msgstr ""
 "\n"
 "而 [選項] 來自\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 建立更新的媒體.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - 嘗試尋找並使用綜合檔案.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - 嘗試尋找並使用 hdlist 檔案.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - 不嘗試尋找綜合檔案或 hdlist 檔案.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自動從安裝媒體建立全部媒體.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1700,7 +1656,7 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1709,7 +1665,7 @@ msgstr ""
 "  --from         - 使用指定的 url 給鏡射站台清單, 預設為\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1717,87 +1673,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 清除標頭 cache 目錄.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 強制 hdlist 檔案產生.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知選項 '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "無法新增 cooker 發行版的更新\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "正在擷取鏡射站台於 %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"用 --distrib 時不需要給予 <hdlist 的相對路徑>"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "用 --distrib 時不需要給予 <hdlist 的相對路徑>"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "無法更新媒體 \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<hdlist 的相對路徑> 遺失\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist 的相對路徑> 遺失\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"用網路媒體時遺漏了 `with'\n"
+msgid "`with' missing for network media\n"
+msgstr "用網路媒體時遺漏了 `with'\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "無法建立媒體 \"%s\"\n"
@@ -1816,6 +1751,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 選擇全部的媒體.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"未知選項 '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1830,7 +1774,7 @@ msgstr ""
 "要移除的項目遺失\n"
 "(%s 的其中一個)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1839,27 +1783,27 @@ msgstr ""
 "用法:urpmi.update [選項] <名稱> ...\n"
 "其中 <名稱> 為要更新的媒體名稱.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - 只更新更新的媒體.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 選擇所有非移動式媒體.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可以更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1868,7 +1812,7 @@ msgstr ""
 "要更新的項目遺失\n"
 "(%s 的其中一個)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1884,37 +1828,38 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的的套件.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   -- 列出可用的媒體.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   -- 列出可用的媒體與其 url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 當使用 --parallel 時列出可用的節點.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的平行別名.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1923,85 +1868,138 @@ msgstr ""
 "  --headers      - 從 urpmi db 中萃取套件標頭到\n"
 "                 stdout (只有 root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下載前先給予所有原始碼套件(只有 root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 顯示 changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 延伸套件相依性的查詢.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 若已經安裝較現今的版本則移除套件.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 完整輸出要移除的套件.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆向搜尋何者需要套件.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人類可讀形式顯示有用資訊.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 顯示群組及名稱.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 顯示版本與發行名稱.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 顯示套件檔案.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  在命令列給予的名稱或 rpm 檔案會被查詢.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq:未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 無法讀取 rpm 檔案 \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 只能夠與 --parallel 一同使用"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "未知的 webfetch `%s'!!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "複製失敗: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget 遺失\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget 失敗: 離開於 %d 或信號 %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl 遺失\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl 失敗: 離開於 %d 或信號 %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync 遺失\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync 失敗: 離開於 %d 或信號 %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh 遺失\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: 未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: 未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "為了滿足相依性, 下列套件將要被安裝. (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "用 --distrib 時不需要給予 <hdlist 的相對路徑>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlist 的相對路徑> 遺失\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "用網路媒體時遺漏了 `with'\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq:未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "找不到 webfetch (目前 curl 或 wget)\n"
 
@@ -2311,4 +2309,3 @@ msgstr "--list-nodes 只能夠與 --parallel 一同使用"
 #~ "相關套件。\n"
 #~ "   --force      - 強制執行安裝即使某些相關套件不存在。\n"
 #~ "查詢在指令行內提供的套件簡稱或套件全名。\n"
-
-- 
cgit v1.2.1