updated pot file

1 files changed, 275 insertions, 216 deletions

diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 8d4c01d1..32635e94 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2001-11-27 19:52+0100\n"
+"POT-Creation-Date: 2001-12-03 17:32+0100\n"
 "PO-Revision-Date: 2001-09-18 10:33--800\n"
 "Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -29,27 +29,27 @@ msgstr ""
 "自動安裝套件...\n"
 "您要求安裝的套件 $rpm\n"
 
-#: _irpm:31 po/placeholder.h:163 urpmi:248
+#: _irpm:31 po/placeholder.h:169 urpmi:248
 msgid "Is it OK?"
 msgstr "正確嗎﹖"
 
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
+#: _irpm:33 po/placeholder.h:159 urpmi:251 urpmi:279
 msgid "Ok"
 msgstr "確定"
 
-#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
+#: _irpm:34 po/placeholder.h:125 urpmi:252 urpmi:280
 msgid "Cancel"
 msgstr "取消"
 
-#: _irpm:40 po/placeholder.h:130 urpmi:256 urpmi:318 urpmi:342
+#: _irpm:40 po/placeholder.h:136 urpmi:256 urpmi:318 urpmi:342
 msgid "Nn"
 msgstr "Nn(否)"
 
-#: _irpm:41 po/placeholder.h:133 urpmi:257 urpmi:319 urpmi:343
+#: _irpm:41 po/placeholder.h:139 urpmi:257 urpmi:319 urpmi:343
 msgid "Yy"
 msgstr "Yy(是)"
 
-#: _irpm:42 po/placeholder.h:157 urpmi:258
+#: _irpm:42 po/placeholder.h:163 urpmi:258
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
 
@@ -160,106 +160,115 @@ msgstr "urpmi 仍未安裝"
 msgid "reading synthesis file [%s]"
 msgstr "讀取相關清單 (depslist) [%s]"
 
-#: po/placeholder.h:30 urpm.pm:298
+#: po/placeholder.h:30
+msgid "retrieving source hdlist (or synthesis)..."
+msgstr ""
+
+#: po/placeholder.h:31
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
 
-#: po/placeholder.h:31 urpm.pm:277
+#: po/placeholder.h:32 urpm.pm:1719
+#, fuzzy
+msgid "retrieving rpms files..."
+msgstr "擷取 [%s]"
+
+#: po/placeholder.h:33 urpm.pm:283
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:34
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "沒有資料寫入 \"%s\" 的清單檔案"
 
-#: po/placeholder.h:33 urpm.pm:233
+#: po/placeholder.h:35 urpm.pm:239
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "無法找到 \"%s\" 的清單檔案，忽略這個媒介"
 
-#: po/placeholder.h:34
+#: po/placeholder.h:36
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "無法解析檔頭清單 (hdlist) \"%s\""
 
-#: po/placeholder.h:35
+#: po/placeholder.h:37
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "沒有資料寫入 \"%s\" 的清單檔案"
 
-#: po/placeholder.h:36 urpm.pm:845
+#: po/placeholder.h:38 urpm.pm:869
 #, c-format
 msgid "read provides file [%s]"
 msgstr "讀取套件與函式庫清單 (provides) [%s]"
 
-#: po/placeholder.h:37 urpm.pm:1549
+#: po/placeholder.h:39 urpm.pm:1595
 #, c-format
 msgid "package %s is not found."
 msgstr "找不到套件 %s。"
 
-#: po/placeholder.h:38 urpm.pm:876
+#: po/placeholder.h:40 urpm.pm:900
 #, c-format
 msgid "unable to write compss file [%s]"
 msgstr "無法寫入群組清單 (compss) [%s]"
 
-#: po/placeholder.h:39 urpm.pm:819
+#: po/placeholder.h:41 urpm.pm:843
 #, c-format
 msgid "unmounting %s"
 msgstr "卸下 %s"
 
-#: po/placeholder.h:40
+#: po/placeholder.h:42
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "移除 %d 個在快取區內無用的檔頭"
 
-#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
+#: po/placeholder.h:43 urpm.pm:949 urpm.pm:1537
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "無法找到媒介 \"%s\" 的檔頭清單 (hdlist)"
 
-#: po/placeholder.h:42 urpm.pm:160
+#: po/placeholder.h:44 urpm.pm:166
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr "媒介 \"%s\" 企圖使用一個已被使用的檔頭清單 (hdlist)，忽略這個媒介"
 
-#: po/placeholder.h:43 urpm.pm:184
+#: po/placeholder.h:45 urpm.pm:190
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "無法使用這個名稱 \"%s\"，因同一名稱的媒介已存在"
 
-#: po/placeholder.h:44 urpm.pm:191
+#: po/placeholder.h:46 urpm.pm:197
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "不會考慮使用媒介 \"%s\" 因清單檔案 [%s] 不存在"
 
-#: po/placeholder.h:45
+#: po/placeholder.h:47
 msgid "keeping only files referenced in provides"
 msgstr "只保存在\"套件與函式庫清單\" (provides) 內有關的檔案"
 
-#: po/placeholder.h:46
+#: po/placeholder.h:48
 #, c-format
 msgid "unable to build synthesis file for medium \"%s\""
 msgstr "無法為媒介 \"%s\" 建立綜合檔頭清單 (synthesis)"
 
-#: po/placeholder.h:47
+#: po/placeholder.h:49
 #, c-format
 msgid "found %d headers in cache"
 msgstr "在快取空間內找到 %d 個檔頭"
 
-#: po/placeholder.h:48 urpm.pm:842
+#: po/placeholder.h:50 urpm.pm:866
 #, c-format
 msgid "unable to read provides file [%s]"
 msgstr "無法讀取套件與函式庫清單 (provides) [%s]"
 
-#: po/placeholder.h:49 urpm.pm:1891
+#: po/placeholder.h:51 urpm.pm:1945
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr "沒有選取 %s 因它的本地語言套件仍未選定"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:52
 #, fuzzy, c-format
 msgid ""
 "removing %s to upgrade to %s ...\n"
@@ -268,251 +277,265 @@ msgstr ""
 "移除套件 %s 以便進行升級到 ...\n"
 "  版本 %s， 否則它將不會被更新！"
 
-#: po/placeholder.h:54 urpm.pm:326
+#: po/placeholder.h:56
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "媒介 \"%s\" 已存在"
 
-#: po/placeholder.h:55
+#: po/placeholder.h:57
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "無法寫入清單檔案 \"%s\""
 
-#: po/placeholder.h:56 urpm.pm:310
+#: po/placeholder.h:58
 #, c-format
 msgid "write config file [%s]"
 msgstr "寫入設定檔 [%s]"
 
-#: po/placeholder.h:57 urpm.pm:1107
+#: po/placeholder.h:59 urpm.pm:1133
 #, c-format
 msgid "no package named %s"
 msgstr "沒有套件具有這個名稱 %s"
 
-#: po/placeholder.h:58 urpm.pm:854
+#: po/placeholder.h:60 urpm.pm:878
 #, c-format
 msgid "unable to read compss file [%s]"
 msgstr "無法讀取群組清單(compss) [%s]"
 
-#: po/placeholder.h:59 urpm.pm:228
+#: po/placeholder.h:61 urpm.pm:234
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "無法找到 \"%s\" 的檔頭清單 (hdlist)，忽略這個媒介"
 
-#: po/placeholder.h:60
+#: po/placeholder.h:62
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "為媒介 \"%s\" 建立綜合檔頭清單 (synthesis)"
 
-#: po/placeholder.h:61
+#: po/placeholder.h:63
 msgid "computing dependencies"
 msgstr "偵測選定套件的相關套件"
 
-#: po/placeholder.h:62
+#: po/placeholder.h:64
 #, fuzzy, c-format
 msgid "retrieve of [%s] failed"
 msgstr "使用 wget 下載 [%s] 失敗"
 
-#: po/placeholder.h:63 urpm.pm:874
+#: po/placeholder.h:65 urpm.pm:898
 #, c-format
 msgid "write provides file [%s]"
 msgstr "寫入套件與函式庫清單 (provides) [%s]"
 
-#: po/placeholder.h:64 urpm.pm:809
+#: po/placeholder.h:66 urpm.pm:833
 #, c-format
 msgid "mounting %s"
 msgstr "掛載 %s"
 
-#: po/placeholder.h:65 urpm.pm:178
+#: po/placeholder.h:67 urpm.pm:184
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "無法處理媒介 \"%s\"，因為其它媒介正在使用清單檔"
 
-#: po/placeholder.h:66
+#: po/placeholder.h:68
 #, c-format
 msgid "reading hdlist file [%s]"
 msgstr "讀取 hdlist 檔案 [%s]"
 
-#: po/placeholder.h:67 urpm.pm:879
+#: po/placeholder.h:69 urpm.pm:103
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:903
 #, c-format
 msgid "write compss file [%s]"
 msgstr "寫入群組清單 (compss) [%s]"
 
-#: po/placeholder.h:68 urpm.pm:833
+#: po/placeholder.h:71 urpm.pm:857
 #, c-format
 msgid "read depslist file [%s]"
 msgstr "讀取相關清單 (depslist) [%s]"
 
-#: po/placeholder.h:69 urpm.pm:103
-msgid "curl failed\n"
-msgstr ""
-
-#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#: po/placeholder.h:72 urpm.pm:287 urpm.pm:290
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "無法建立媒介 \"%s\"\n"
 
-#: po/placeholder.h:71 urpm.pm:1668
+#: po/placeholder.h:73 urpm.pm:1714
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "不合格式的輸入：[%s]"
 
-#: po/placeholder.h:72 urpm.pm:1502 urpm.pm:1528
+#: po/placeholder.h:74 urpm.pm:1548 urpm.pm:1574
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "在那裡有多個相同名稱的套件 \"%s\""
 
-#: po/placeholder.h:73 urpm.pm:163
+#: po/placeholder.h:75 urpm.pm:169
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr "媒介 \"%s\" 嘗試使用正在使用中的清單，忽略這個媒介"
 
-#: po/placeholder.h:74 urpm.pm:871
+#: po/placeholder.h:76 urpm.pm:895
 #, c-format
 msgid "unable to write provides file [%s]"
 msgstr "無法寫入\"套件與函式庫清單\" (provides) 檔 [%s]"
 
-#: po/placeholder.h:75 urpm.pm:206
+#: po/placeholder.h:77 urpm.pm:212
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的檔頭清單 (hdlist)，忽略這個媒介"
 
-#: po/placeholder.h:76 urpm.pm:1215
+#: po/placeholder.h:78 urpm.pm:1245
 #, fuzzy
 msgid "unable to find all synthesis file, using parsehdlist server"
 msgstr ""
 "無法尋找全部綜合檔頭清單 (synthesis)，使用檔頭清單解析 (parsehdlist) 伺服器"
 
-#: po/placeholder.h:77 urpm.pm:1011
+#: po/placeholder.h:79 urpm.pm:1035
 msgid "unable to register rpm file"
 msgstr "無法登記套件檔"
 
-#: po/placeholder.h:78 urpm.pm:256
+#: po/placeholder.h:80 urpm.pm:262
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "無法檢查 \"%s\" 的清單檔，忽略這個媒介"
 
-#: po/placeholder.h:79 urpm.pm:272
+#: po/placeholder.h:81 urpm.pm:278
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:248
+#: po/placeholder.h:82 urpm.pm:254
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "不連貫的 \"%s\" 的清單檔，忽略這個媒介"
 
-#: po/placeholder.h:81
+#: po/placeholder.h:83
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "複製 [%s] 失敗"
 
-#: po/placeholder.h:82
+#: po/placeholder.h:84
 #, c-format
 msgid "trying to remove inexistent medium \"%s\""
 msgstr "企圖移除不存在的媒介 \"%s\""
 
-#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
+#: po/placeholder.h:85
+msgid "retrieving description file..."
+msgstr ""
+
+#: po/placeholder.h:86 urpm.pm:937 urpm.pm:1221 urpm.pm:1519 urpm.pm:1526
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "無法正確解析 [%s]"
 
-#: po/placeholder.h:84 urpm.pm:1192
+#: po/placeholder.h:87 urpm.pm:1222
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "讀取相關清單 (depslist) [%s]"
 
-#: po/placeholder.h:85 urpm.pm:830
+#: po/placeholder.h:88 urpm.pm:854
 #, c-format
 msgid "unable to read depslist file [%s]"
 msgstr "無法讀取相關清單 (depslist) [%s]"
 
-#: po/placeholder.h:86 urpm.pm:857
+#: po/placeholder.h:89 urpm.pm:881
 #, c-format
 msgid "read compss file [%s]"
 msgstr "讀取群組清單 (compss) [%s]"
 
-#: po/placeholder.h:87 urpm.pm:139 urpm.pm:151
+#: po/placeholder.h:90 urpm.pm:98
+msgid "no webfetch (curl or wget for example) found\n"
+msgstr ""
+
+#: po/placeholder.h:91 urpm.pm:145 urpm.pm:157
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "設定檔內的第 %s 行語法錯誤"
 
-#: po/placeholder.h:88
+#: po/placeholder.h:92
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "建立檔頭清單 (hdlist) [%s]"
 
-#: po/placeholder.h:89 urpm.pm:1603
+#: po/placeholder.h:93 urpm.pm:1649
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "無法從媒介 \"%2$s\" 讀取套件檔 [%1$s]"
 
-#: po/placeholder.h:90 urpm.pm:1015
+#: po/placeholder.h:94 urpm.pm:1039
 msgid "error registering local packages"
 msgstr "登記本機套件時發生錯誤"
 
-#: po/placeholder.h:91 urpm.pm:273
+#: po/placeholder.h:95 urpm.pm:279
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:92 urpm.pm:1619
+#: po/placeholder.h:96 urpm.pm:1726
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "擷取 [%s]"
+
+#: po/placeholder.h:97 urpm.pm:1665
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "有問題的媒介 \"%s\"，因為不正確地標示成可移除的媒介"
 
-#: po/placeholder.h:93
+#: po/placeholder.h:98
 #, c-format
 msgid "unable to build hdlist: %s"
 msgstr "無法建立檔頭清單 (hdlist)：%s"
 
-#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
+#: po/placeholder.h:99 urpm.pm:1639 urpm.pm:1642 urpm.pm:1661
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "仍未選定媒介 \"%s\""
 
-#: po/placeholder.h:95 urpm.pm:1006
+#: po/placeholder.h:100 urpm.pm:1030
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "不合法的套件名稱 [%s]"
 
-#: po/placeholder.h:96 urpm.pm:1175
+#: po/placeholder.h:101 urpm.pm:1205
 #, c-format
 msgid "unknown data associated with %s"
 msgstr "不詳的資料與 %s 有所關連"
 
-#: po/placeholder.h:97 urpm.pm:222
+#: po/placeholder.h:102 urpm.pm:228
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "嘗試忽略現存的媒介 \"%s\"，忽略這個媒介"
 
-#: po/placeholder.h:98 urpm.pm:869
+#: po/placeholder.h:103 urpm.pm:893
 #, c-format
 msgid "write depslist file [%s]"
 msgstr "寫入相關清單 (depslist) [%s]"
 
-#: po/placeholder.h:99 urpm.pm:208
+#: po/placeholder.h:104 urpm.pm:214
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的清單檔，忽略這個媒介 "
 
-#: po/placeholder.h:100 urpm.pm:1879
+#: po/placeholder.h:105 urpm.pm:1933
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr "沒有選取 %s 因沒有足夠檔案去進行更新"
 
-#: po/placeholder.h:101 urpm.pm:1007
+#: po/placeholder.h:106 urpm.pm:1031
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取套件檔 [%s]"
 
-#: po/placeholder.h:102 urpm.pm:866
+#: po/placeholder.h:107 urpm.pm:890
 #, c-format
 msgid "unable to write depslist file [%s]"
 msgstr "無法寫入相關清單 (depslist) [%s]"
 
-#: po/placeholder.h:103
+#: po/placeholder.h:108
 #, fuzzy, c-format
 msgid ""
 "removing %s to upgrade to %s ...\n"
@@ -521,150 +544,155 @@ msgstr ""
 "移除套件 %s 以便進行升級到 ...\n"
 "  版本 %s，否則它將不能正確升級！"
 
-#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "無法存取媒介 \"%s\""
-
-#: po/placeholder.h:108 urpm.pm:994
+#: po/placeholder.h:112 urpm.pm:1018
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "重新排列 %s 的相關清單內的項目"
 
-#: po/placeholder.h:109
+#: po/placeholder.h:113 urpm.pm:1676
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "企圖選擇不存在的媒介 \"%s\""
-
-#: po/placeholder.h:110 urpm.pm:97
-#, fuzzy
-msgid "wget failed\n"
-msgstr "使用 wget 下載 [%s] 失敗"
+msgid "unable to access medium \"%s\""
+msgstr "無法存取媒介 \"%s\""
 
-#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
+#: po/placeholder.h:114 urpm.pm:944 urpm.pm:1532 urpm.pm:1583
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr "無法正確解析在數值 \"%2$s\" 內的 [%1$s]"
 
-#: po/placeholder.h:112 urpm.pm:1110
+#: po/placeholder.h:115
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "企圖選擇不存在的媒介 \"%s\""
+
+#: po/placeholder.h:116 urpm.pm:1136
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s：%s"
 
-#: po/placeholder.h:113
+#: po/placeholder.h:117
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "在 [%s] 內找不到套件檔"
 
-#: po/placeholder.h:114 urpm.pm:1772
+#: po/placeholder.h:118 urpm.pm:1724
+#, fuzzy
+msgid "...retrieving done"
+msgstr "擷取 [%s]"
+
+#: po/placeholder.h:119 urpm.pm:1826
 #, c-format
 msgid "selecting %s using obsoletes"
 msgstr "選定的套件發行版本 %s 會使用到其它過時的套件"
 
-#: po/placeholder.h:115 urpm.pm:1888
+#: po/placeholder.h:120 urpm.pm:109
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpm.pm:1942
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr "選取有關檔案時自動選定 %s 套件"
 
-#: po/placeholder.h:116 urpm.pm:100
+#: po/placeholder.h:122 urpm.pm:106
 msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:117 urpm.pm:95
+#: po/placeholder.h:123 urpm.pm:101
 msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:118 urpm.pm:195
+#: po/placeholder.h:124 urpm.pm:201
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "無法確定這個檔頭清單 (hdlist) [%s] 的有關媒介"
 
-#: po/placeholder.h:120
+#: po/placeholder.h:126
 #, fuzzy
 msgid "  --help         - print this help message.\n"
 msgstr "  --all          - 顯示全部選項所提供的資訊。"
 
-#: po/placeholder.h:121 urpmi:361
+#: po/placeholder.h:127 urpmi:361
 msgid "everything already installed"
 msgstr "全部都已安裝"
 
-#: po/placeholder.h:122 urpmi:98
+#: po/placeholder.h:128 urpmi:98
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi：不詳的選項 \"-%s\"，請輸入 --help 選項閱讀使用方法\n"
 
-#: po/placeholder.h:123 urpmi:194
+#: po/placeholder.h:129 urpmi:194
 msgid "One of the following packages is needed:"
 msgstr "須要以下其中一個套件："
 
-#: po/placeholder.h:124 po/placeholder.h:222
+#: po/placeholder.h:130 po/placeholder.h:237
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:125 urpmi:299
+#: po/placeholder.h:131 urpmi:299
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:129
+#: po/placeholder.h:135
 msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:131 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
+#: po/placeholder.h:137 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: po/placeholder.h:132 po/placeholder.h:234
+#: po/placeholder.h:138 po/placeholder.h:249
 msgid ""
 "  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:134
+#: po/placeholder.h:140
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "  --all          - 顯示全部選項所提供的資訊。"
 
-#: po/placeholder.h:135 urpmi:247
+#: po/placeholder.h:141 urpmi:247
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "為了令選取了的套件能正常執行，以下的套件亦需要一同安裝。 (%d MB)"
 
-#: po/placeholder.h:136 urpmi:320 urpmi:344
+#: po/placeholder.h:142 urpmi:320 urpmi:344
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "無須檢查套件的可執行能力就進行安裝？(y/N)(是/否)"
 
-#: po/placeholder.h:137
+#: po/placeholder.h:143
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:141 po/placeholder.h:240
+#: po/placeholder.h:147 po/placeholder.h:256
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:142 po/placeholder.h:241
+#: po/placeholder.h:148 po/placeholder.h:257
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:143
+#: po/placeholder.h:149
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all          - 顯示全部選項所提供的資訊。"
 
-#: po/placeholder.h:144 urpmi:202
+#: po/placeholder.h:150 urpmi:202
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "那一個是你的選擇﹖ (1-%d) "
 
-#: po/placeholder.h:145
+#: po/placeholder.h:151 po/placeholder.h:197 po/placeholder.h:217
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:146
+#: po/placeholder.h:152
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -674,83 +702,76 @@ msgid ""
 "usage:\n"
 msgstr "這是一個自由程式並遵照 GNU GPL 的條款發佈。"
 
-#: po/placeholder.h:152 urpmi:328 urpmi:352
+#: po/placeholder.h:158 urpmi:328 urpmi:352
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "使用強制性的安裝方式 (--force)？(y/N)(是/否)"
 
-#: po/placeholder.h:154
+#: po/placeholder.h:160 po/placeholder.h:250
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:155 urpmi:205
+#: po/placeholder.h:161 urpmi:205
 msgid "Sorry, bad choice, try again\n"
 msgstr "對不起，選擇錯誤，請再試一次\n"
 
-#: po/placeholder.h:156
+#: po/placeholder.h:162
 msgid ""
 "  names or rpm files (only for root) given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:158
+#: po/placeholder.h:164
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:159
+#: po/placeholder.h:165 po/placeholder.h:190 po/placeholder.h:210
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:160 urpmi:294
+#: po/placeholder.h:166 urpmi:294
 #, c-format
 msgid "installing %s\n"
 msgstr "正在安裝 %s\n"
 
-#: po/placeholder.h:161 urpmi:152
+#: po/placeholder.h:167 urpmi:152
 msgid "Only superuser is allowed to install local packages"
 msgstr "只有超級使用者才允許安裝本機套件"
 
-#: po/placeholder.h:162 urpmi:276
+#: po/placeholder.h:168 urpmi:276
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請將具有名稱 \"%s\" 的媒介放入到裝置 [%s] 內"
 
-#: po/placeholder.h:164 po/placeholder.h:242 urpmi:266 urpmq:148
+#: po/placeholder.h:170 po/placeholder.h:258 urpmi:266 urpmq:149
 msgid "unable to get source packages, aborting"
 msgstr "法取得原始碼套件，放棄"
 
-#: po/placeholder.h:165 urpmi:102
+#: po/placeholder.h:171 urpmi:102
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "只有超級使用者才允許安裝本機套件"
 
-#: po/placeholder.h:166 urpmi:193
+#: po/placeholder.h:172 urpmi:193
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "須要安裝以下其中的一個套件 %s："
 
-#: po/placeholder.h:167 urpmi:277
+#: po/placeholder.h:173 urpmi:277
 msgid "Press Enter when it's done..."
 msgstr "完成後請按 <輸入鍵>．．"
 
-#: po/placeholder.h:168 urpmi.addmedia:46
-#, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
-"%s\n"
-"ftp 媒介的 url 缺少了 `with' 這個關鍵字\n"
-
-#: po/placeholder.h:172
+#: po/placeholder.h:174
+#, fuzzy
 msgid ""
-"usage: urpmi.addmedia [--update] <name> <url>\n"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
 "       file://<path>\n"
 "       ftp://<login>:<password>@<host>/<path> with <relative filename of "
 "hdlist>\n"
 "       ftp://<host>/<path> with <relative filename of hdlist>\n"
 "       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable_<device>://<path>\n"
+"       removable://<path>\n"
+"and [options] are from\n"
 msgstr ""
 "用法：urpmi.addmedia [--update] <媒介別名> <url>\n"
 "<url> 是以下其中一項\n"
@@ -761,26 +782,29 @@ msgstr ""
 "         http://<主機名稱>/<路徑> with <hdlist 的相關檔案名稱>\n"
 "         removable_<裝置>://<路徑>\n"
 
-#: po/placeholder.h:181 urpmi.addmedia:57
+#: po/placeholder.h:184 urpmi.addmedia:76
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "無法建立媒介 \"%s\"\n"
 
-#: po/placeholder.h:182 urpmi.addmedia:58
+#: po/placeholder.h:185 urpmi.addmedia:77
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "無法更新媒介 \"%s\"\n"
 
-#: po/placeholder.h:183 urpmi.addmedia:42
+#: po/placeholder.h:186 po/placeholder.h:206 urpmi.addmedia:54
 #, c-format
 msgid ""
-"%s\n"
-"device `%s' do not exist\n"
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"%s\n"
-"裝置 `%s' 不存在\n"
 
-#: po/placeholder.h:187 urpmi.addmedia:44
+#: po/placeholder.h:191 po/placeholder.h:215
+#, fuzzy
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all          - 顯示全部選項所提供的資訊。"
+
+#: po/placeholder.h:192 urpmi.addmedia:62
 #, c-format
 msgid ""
 "%s\n"
@@ -789,30 +813,33 @@ msgstr ""
 "%s\n"
 "缺少了 <檔頭清單 (hdlist) 的相關路徑>\n"
 
-#: po/placeholder.h:191
+#: po/placeholder.h:196 po/placeholder.h:216
+#, fuzzy
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --group        - 顯示套件所屬群組。"
+
+#: po/placeholder.h:198 urpmi.addmedia:64
 #, c-format
 msgid ""
-"usage: urpmi.update [-a] <name> ...\n"
+"%s\n"
+"`with' missing for ftp media\n"
+msgstr ""
+"%s\n"
+"ftp 媒介的 url 缺少了 `with' 這個關鍵字\n"
+
+#: po/placeholder.h:202
+#, fuzzy
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
-"   -a    select all non-removable media.\n"
-"   -c    clean headers cache directory.\n"
-"   -f    force generation of base files, use another -f for hdlist files.\n"
-"\n"
-"unknown options '%s'\n"
 msgstr ""
-"用法：urpmi.update [-a] <媒介名稱> ...\n"
-"<媒介名稱> 即須要更新套件清單的媒介名稱。\n"
-"   -a     選擇所有固定的媒介。\n"
-"   -c     清除檔頭快取目錄。\n"
-"   -f    強制產生基本檔案，使用另一個 -f 指定檔頭清單檔案 (hdlist)。\n"
+"用法：urpmi.removemedia [-a] <媒介名稱> ...\n"
+"<媒介名稱> 即須要移除的媒介名稱。\n"
+"   -a    選擇所有媒介。\n"
 "\n"
 "不詳的選項 '%s'\n"
 
-#: po/placeholder.h:200 urpmi.update:51
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "無可更新 (使用 urpmi.addmedia 指令新增媒介)\n"
-
-#: po/placeholder.h:201 urpmi.update:53
+#: po/placeholder.h:211 urpmi.update:58
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -821,11 +848,20 @@ msgstr ""
 "缺少了須要更新的項目\n"
 "(%s 的其中一個)\n"
 
-#: po/placeholder.h:205 urpmi.removemedia:44
+#: po/placeholder.h:218 urpmi.update:56
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "無可更新 (使用 urpmi.addmedia 指令新增媒介)\n"
+
+#: po/placeholder.h:219
+#, fuzzy
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --all          - 顯示全部選項所提供的資訊。"
+
+#: po/placeholder.h:220 urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "無可移除 (使用 urpmi.addmedia 指令新增媒介)\n"
 
-#: po/placeholder.h:206 urpmi.removemedia:46
+#: po/placeholder.h:221 urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -834,7 +870,7 @@ msgstr ""
 "缺少了須要刪除的項目\n"
 "(%s 的其中一個)\n"
 
-#: po/placeholder.h:210
+#: po/placeholder.h:225
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -849,41 +885,41 @@ msgstr ""
 "\n"
 "不詳的選項 '%s'\n"
 
-#: po/placeholder.h:217
+#: po/placeholder.h:232
 #, fuzzy
 msgid "  -h             - print this help message.\n"
 msgstr "  --all          - 顯示全部選項所提供的資訊。"
 
-#: po/placeholder.h:218 urpmq:130
+#: po/placeholder.h:233 urpmq:131
 msgid ""
 "some package have to be removed for being upgraded, this is not supported "
 "yet\n"
 msgstr "為了可以順利升級，某些套件必須先行移除，這個功能仍未支援\n"
 
-#: po/placeholder.h:219
+#: po/placeholder.h:234
 #, fuzzy
 msgid "  -g             - print groups too with name.\n"
 msgstr "  --group        - 顯示套件所屬群組。"
 
-#: po/placeholder.h:220 urpmq:84
+#: po/placeholder.h:235 urpmq:83
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取套件檔 \"%s\"\n"
 
-#: po/placeholder.h:221
+#: po/placeholder.h:236
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:223
+#: po/placeholder.h:238
 #, fuzzy
 msgid "  -r             - print version and release too with name.\n"
 msgstr "                   預設會顯示套件全名，但不會顯示套件簡稱)。"
 
-#: po/placeholder.h:224
+#: po/placeholder.h:239
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:225
+#: po/placeholder.h:240
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -893,61 +929,55 @@ msgid ""
 "usage:\n"
 msgstr "這是一個自由程式並遵照 GNU GPL 的條款發佈。"
 
-#: po/placeholder.h:231
+#: po/placeholder.h:246
 #, fuzzy
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "                   預設會顯示套件全名，但不會顯示套件簡稱)。"
 
-#: po/placeholder.h:232
+#: po/placeholder.h:247
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:233
+#: po/placeholder.h:248
 msgid ""
 "  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmq:81
+#: po/placeholder.h:251 urpmq:80
 #, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq：不詳的選項 \"-%s\"，請輸入 --help 選項閱讀使用方法\n"
 
-#: po/placeholder.h:236
+#: po/placeholder.h:252
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:243
+#: po/placeholder.h:259
 msgid ""
 "  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:244
-msgid ""
-"  --force        - force invocation even if some packages do not\n"
-"exist.\n"
-msgstr ""
-
-#: urpm.pm:1796 urpm.pm:1805
+#: urpm.pm:1850 urpm.pm:1859
 #, c-format
 msgid "removing %s to upgrade to %s ..."
 msgstr ""
 
-#: urpm.pm:1797 urpm.pm:1806
+#: urpm.pm:1851 urpm.pm:1860
 msgid ", $otherPackage, "
 msgstr ", $otherPackage, "
 
-#: urpm.pm:1797 urpm.pm:1806
+#: urpm.pm:1851 urpm.pm:1860
 msgid "));"
 msgstr "));"
 
-#: urpm.pm:1802
+#: urpm.pm:1856
 msgid "$p->{name}-$p->{version}-$p->{release}"
 msgstr "$p->{name}-$p->{version}-$p->{release}"
 
-#: urpm.pm:1812
+#: urpm.pm:1866
 msgid "$prefix/$_"
 msgstr "$prefix/$_"
 
@@ -956,38 +986,67 @@ msgstr "$prefix/$_"
 msgid "urpmi version %s"
 msgstr "urpmi 版本 %s"
 
-#: urpmi.addmedia:30
-msgid "usage: urpmi.addmedia [--update] <name> <url>"
+#: urpmi.addmedia:29
+#, fuzzy
+msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 msgstr "用法：urpmi.addmedia [--update] <媒介名稱><url>"
 
-#. <path>
-#. <login>:<password>@<host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <host>/<path> with <relative filename of hdlist>
-#. <path>
-#: urpmi.addmedia:37
+#: urpmi.addmedia:38 urpmi.addmedia:39 urpmi.addmedia:40 urpmi.addmedia:41
+#: urpmi.update:43 urpmi.update:44 urpmi.update:45 urpmi.update:46
+#: urpmi.update:47 urpmi.update:48
+msgid ") . _("
+msgstr ""
+
+#: urpmi.addmedia:42
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:38
-msgid "usage: urpmi.update [-a] <name> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
 msgstr "用法：urpmi.update [-a] <媒介名稱> ..."
 
+#: urpmi.removemedia:35 urpmi.update:48
+msgid ", $_);"
+msgstr ", $_);"
+
 #: urpmi.removemedia:32
 msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr "用法：urpmi.removemedia [-a] <媒介名稱> ..."
 
-#: urpmi.removemedia:35
-msgid ", $_);"
-msgstr ", $_);"
-
 #: urpmq:34
 #, c-format
 msgid "urpmq version %s"
 msgstr "urpmq 版本 %s"
 
-#~ msgid "retrieving [%s]"
-#~ msgstr "擷取 [%s]"
+#, fuzzy
+#~ msgid "wget failed\n"
+#~ msgstr "使用 wget 下載 [%s] 失敗"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "device `%s' do not exist\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "裝置 `%s' 不存在\n"
+
+#~ msgid ""
+#~ "usage: urpmi.update [-a] <name> ...\n"
+#~ "where <name> is a medium name to update.\n"
+#~ "   -a    select all non-removable media.\n"
+#~ "   -c    clean headers cache directory.\n"
+#~ "   -f    force generation of base files, use another -f for hdlist "
+#~ "files.\n"
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "用法：urpmi.update [-a] <媒介名稱> ...\n"
+#~ "<媒介名稱> 即須要更新套件清單的媒介名稱。\n"
+#~ "   -a     選擇所有固定的媒介。\n"
+#~ "   -c     清除檔頭快取目錄。\n"
+#~ "   -f    強制產生基本檔案，使用另一個 -f 指定檔頭清單檔案 (hdlist)。\n"
+#~ "\n"
+#~ "不詳的選項 '%s'\n"
 
 #~ msgid "wget of [%s] failed (maybe wget is missing?)"
 #~ msgstr "下載 [%s] 失敗 (是否沒有安裝 wget 程式？)"