sync with code

1 files changed, 533 insertions, 473 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4c30a639..20311b2b 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: 2008-02-14 13:05+0100\n"
+"POT-Creation-Date: 2008-02-25 11:14+0100\n"
 "PO-Revision-Date: 2006-09-01 21:32+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -154,7 +154,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:114 ../urpmi:625
+#: ../gurpmi2:114 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -195,13 +195,13 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:215 ../urpmi:591
+#: ../gurpmi2:215 ../urpmi:592
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將一併安裝下列套件"
 
-#: ../gurpmi2:216 ../urpmi:592
+#: ../gurpmi2:216 ../urpmi:593
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -233,7 +233,7 @@ msgstr "準備中..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:260 ../urpmi:619
+#: ../gurpmi2:260 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請將名為 \"%s\" 的媒體置入裝置 [%s] 內"
@@ -314,7 +314,7 @@ msgstr "                    預設為 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - 顯示群組名稱。\n"
 
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只有擁有管理者權限的使用者才能安裝套件"
@@ -324,68 +324,68 @@ msgstr "只有擁有管理者權限的使用者才能安裝套件"
 msgid "Running urpmi in restricted mode..."
 msgstr "以限制模式執行 urpmi..."
 
-#: ../urpm.pm:108
+#: ../urpm.pm:110
 #, fuzzy, c-format
 msgid "fail to create directory %s"
 msgstr "無法寫入重新打包目錄 [%s]\n"
 
-#: ../urpm.pm:109
+#: ../urpm.pm:111
 #, fuzzy, c-format
 msgid "invalid owner for directory %s"
 msgstr "錯誤的日期或期間 [%s]\n"
 
-#: ../urpm.pm:208
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
-#: ../urpm.pm:222
+#: ../urpm.pm:224
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:228
+#: ../urpm.pm:230
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在擷取 rpm 檔案 [%s] ..."
 
-#: ../urpm.pm:230 ../urpm/get_pkgs.pm:158
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:233 ../urpm/download.pm:686 ../urpm/get_pkgs.pm:160
-#: ../urpm/media.pm:742 ../urpm/media.pm:1144 ../urpm/media.pm:1320
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
 
-#: ../urpm.pm:238
+#: ../urpm.pm:240
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpm.pm:243
+#: ../urpm.pm:245
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "無法解析 spec 檔案 %s [%s]"
 
-#: ../urpm.pm:251
+#: ../urpm.pm:253
 #, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:255
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "與 RPM 檔案 [%s] 不相容的硬體架構"
 
-#: ../urpm.pm:257
+#: ../urpm.pm:259
 #, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
-#: ../urpm.pm:355
+#: ../urpm.pm:357
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "使用限制模式執行時禁止該操作程序"
@@ -400,32 +400,32 @@ msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm/args.pm:352
+#: ../urpm/args.pm:353
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:419
 #, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "環境目錄 %s 不存在"
 
-#: ../urpm/args.pm:437
+#: ../urpm/args.pm:438
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:440 ../urpm/args.pm:443
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:451
+#: ../urpm/args.pm:452
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
 
-#: ../urpm/bug_report.pm:48 ../urpmi:246
+#: ../urpm/bug_report.pm:48 ../urpmi:247
 #, c-format
 msgid "Copying failed"
 msgstr "複製失敗"
@@ -445,7 +445,7 @@ msgstr "無法寫入設定檔 [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../urpm/cfg.pm:248 ../urpm/media.pm:443 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
@@ -480,87 +480,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:229
+#: ../urpm/download.pm:234
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "複製失敗"
 
-#: ../urpm/download.pm:235
+#: ../urpm/download.pm:240
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "由於遺失了 %s"
 
-#: ../urpm/download.pm:300
+#: ../urpm/download.pm:305
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "由於遺失了 %s"
 
-#: ../urpm/download.pm:425
+#: ../urpm/download.pm:430
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:464
+#: ../urpm/download.pm:469
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:530
+#: ../urpm/download.pm:535
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:549
+#: ../urpm/download.pm:554
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:565
+#: ../urpm/download.pm:570
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:573
+#: ../urpm/download.pm:578
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "由於遺失了 %s"
 
-#: ../urpm/download.pm:676
+#: ../urpm/download.pm:681
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:678
+#: ../urpm/download.pm:683
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:735
+#: ../urpm/download.pm:740
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "正在移除 %s"
 
-#: ../urpm/download.pm:739
+#: ../urpm/download.pm:744
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...擷取失敗：%s"
 
-#: ../urpm/download.pm:752
+#: ../urpm/download.pm:772
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定義了未知的通訊協定"
 
-#: ../urpm/download.pm:772
+#: ../urpm/download.pm:792
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 無法使用，回到 %s"
 
-#: ../urpm/download.pm:776
+#: ../urpm/download.pm:796
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "沒有找到 webfetch，支援的 webfetch 有：%s\n"
 
-#: ../urpm/download.pm:797
+#: ../urpm/download.pm:817
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "無法處理通訊協定：%s"
@@ -575,17 +575,17 @@ msgstr "正在 %2$s 上安装 %1$s..."
 msgid "package %s is not found."
 msgstr "沒有找到套件 %s。"
 
-#: ../urpm/get_pkgs.pm:134
+#: ../urpm/get_pkgs.pm:136
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "畸形的 URL：[%s]"
 
-#: ../urpm/get_pkgs.pm:147
+#: ../urpm/get_pkgs.pm:149
 #, c-format
 msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 msgstr ""
 
-#: ../urpm/get_pkgs.pm:154
+#: ../urpm/get_pkgs.pm:156
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
@@ -606,32 +606,42 @@ msgstr "已建立在 %s 上的安裝程序 (移除 = %d，安裝 = %d，升級 =
 msgid "unable to create transaction"
 msgstr "無法建立安裝程序"
 
-#: ../urpm/install.pm:179
+#: ../urpm/install.pm:180
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "無法由 delta-rpm 套件包中取出套件 %s"
 
-#: ../urpm/install.pm:190
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to install package %s"
 msgstr "無法安裝套件 %s"
 
-#: ../urpm/install.pm:227
+#: ../urpm/install.pm:196
+#, fuzzy, c-format
+msgid "removing bad rpm (%s) from %s"
+msgstr "正在由 %2$s 安裝 %1$s"
+
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
+#, fuzzy, c-format
+msgid "removing %s failed: %s"
+msgstr "...擷取失敗：%s"
+
+#: ../urpm/install.pm:235
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm/install.pm:228
+#: ../urpm/install.pm:236
 #, c-format
 msgid "removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm/install.pm:243
+#: ../urpm/install.pm:252
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:260
 #, c-format
 msgid "More information on package %s"
 msgstr "更多關於套件 %s 的資訊"
@@ -727,37 +737,44 @@ msgid "Try harder to install (--force)? (y/N) "
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
 
 #: ../urpm/main_loop.pm:264
+#, fuzzy, c-format
+msgid ""
+"Installation failed, bad rpms:\n"
+"%s"
+msgstr "節點 %s 安裝失敗"
+
+#: ../urpm/main_loop.pm:270
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] "%d 個安裝程序失敗"
 
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:281
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安裝"
 
-#: ../urpm/main_loop.pm:280
+#: ../urpm/main_loop.pm:286
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:294
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../urpm/main_loop.pm:289
+#: ../urpm/main_loop.pm:295
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../urpm/main_loop.pm:292
+#: ../urpm/main_loop.pm:298
 #, fuzzy, c-format
 msgid "Package %s can not be installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../urpm/main_loop.pm:293
+#: ../urpm/main_loop.pm:299
 #, fuzzy, c-format
 msgid "Packages %s can not be installed"
 msgstr "每個套件都已經安裝了"
@@ -772,67 +789,67 @@ msgstr "正在檢驗 MD5SUM 檔案"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：在 MD5SUM 檔案中找不到 %s 的 md5sum"
 
-#: ../urpm/media.pm:185
+#: ../urpm/media.pm:187
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虛擬媒體 \"%s\" 應該有一個清楚的 url，忽略這個媒體"
 
-#: ../urpm/media.pm:187
+#: ../urpm/media.pm:189
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的列表，忽略這個媒體"
 
-#: ../urpm/media.pm:194
+#: ../urpm/media.pm:196
 #, fuzzy, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的 hdlist 檔案，忽略這個媒體"
 
-#: ../urpm/media.pm:221
+#: ../urpm/media.pm:223
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "正在嘗試跳過已存在媒體  \"%s\"，正在跳過"
 
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:409
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移除式媒體 \"%s\" 的掛載點過多"
 
-#: ../urpm/media.pm:403
+#: ../urpm/media.pm:410
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "將可移除式裝置當成 \"%s\""
 
-#: ../urpm/media.pm:406
+#: ../urpm/media.pm:413
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr "媒體 \"%s\" 是一個光碟映像檔，將立即掛載起來"
 
-#: ../urpm/media.pm:409
+#: ../urpm/media.pm:416
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "使用不同的可移除式裝置 [%s] 於 \"%s\" "
 
-#: ../urpm/media.pm:414 ../urpm/media.pm:417
+#: ../urpm/media.pm:421 ../urpm/media.pm:424
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "無法擷取可移除式媒體 \"%s\" 的路徑名稱"
 
-#: ../urpm/media.pm:445 ../urpm/media.pm:451
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "寫入設定檔 [%s]"
 
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:501
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "無法於 use-distrib 模式下使用同步管理模式"
 
-#: ../urpm/media.pm:502
+#: ../urpm/media.pm:509
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "於同步管理模式使用相關連的媒體：%s"
 
-#: ../urpm/media.pm:518
+#: ../urpm/media.pm:525
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -841,162 +858,162 @@ msgstr ""
 "--synthesis 不能夠與 --media、--excludemedia、--sortmedia、--update、--use-"
 "distrib 以及 --parallel 一起使用"
 
-#: ../urpm/media.pm:602
+#: ../urpm/media.pm:612
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜尋開始於：%s 結束於：%s"
 
-#: ../urpm/media.pm:617
+#: ../urpm/media.pm:627
 #, c-format
 msgid "skipping package %s"
 msgstr "正在略過套件 %s"
 
-#: ../urpm/media.pm:633
+#: ../urpm/media.pm:643
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "將會安裝而非升級套件 %s"
 
-#: ../urpm/media.pm:658
+#: ../urpm/media.pm:668
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm/media.pm:686
+#: ../urpm/media.pm:710
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:692
+#: ../urpm/media.pm:716
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "正在讀取媒體 \"%s\" 的標頭"
 
-#: ../urpm/media.pm:698
+#: ../urpm/media.pm:722
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm/media.pm:725
+#: ../urpm/media.pm:750
 #, fuzzy, c-format
 msgid "unable to mount the distribution medium"
 msgstr "無法存取第一個安裝媒體"
 
-#: ../urpm/media.pm:728
+#: ../urpm/media.pm:753
 #, fuzzy, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "這個 url 看起來並沒有包含任何散佈套件"
 
-#: ../urpm/media.pm:735
-#, c-format
-msgid "retrieving media.cfg file..."
-msgstr "正在擷取 media.cfg 檔案..."
-
-#: ../urpm/media.pm:740
+#: ../urpm/media.pm:769
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "無法解析 media.cfg"
 
-#: ../urpm/media.pm:743
+#: ../urpm/media.pm:772
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "無法存取第一個安裝媒體 (找不到 hdlists 檔案)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:790
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:839
+#, c-format
+msgid "retrieving media.cfg file..."
+msgstr "正在擷取 media.cfg 檔案..."
+
+#: ../urpm/media.pm:880
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm/media.pm:840
+#: ../urpm/media.pm:883
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體：\"%s\""
 
-#: ../urpm/media.pm:860
+#: ../urpm/media.pm:903
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm/media.pm:926
+#: ../urpm/media.pm:979
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:1017
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "重新設定失敗"
 
-#: ../urpm/media.pm:970
+#: ../urpm/media.pm:1023
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新設定完成"
 
-#: ../urpm/media.pm:991
+#: ../urpm/media.pm:1044
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "媒體 \"%s\" 沒有被選取"
 
-#: ../urpm/media.pm:1002
+#: ../urpm/media.pm:1055
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗 synthesis 檔案 [%s]"
 
-#: ../urpm/media.pm:1022
+#: ../urpm/media.pm:1075
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
 
-#: ../urpm/media.pm:1035 ../urpm/media.pm:1117
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在寫入媒體 \"%s\" 的列表檔"
 
-#: ../urpm/media.pm:1037 ../urpm/media.pm:1092 ../urpm/media.pm:1336
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm/media.pm:1088
+#: ../urpm/media.pm:1141
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm/media.pm:1090 ../urpm/media.pm:1121
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm/media.pm:1123
+#: ../urpm/media.pm:1177
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案小得可疑)"
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1210
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在計算來源 hdlist (或 synthesis) 的 md5sum"
 
-#: ../urpm/media.pm:1157 ../urpm/media.pm:1572
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "複製 [%s] 失敗 (md5sum 不合)"
 
-#: ../urpm/media.pm:1172
+#: ../urpm/media.pm:1227
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm/media.pm:1182
+#: ../urpm/media.pm:1237
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "正在 %2$s 上安装 %1$s..."
 
-#: ../urpm/media.pm:1202
+#: ../urpm/media.pm:1257
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1006,64 +1023,84 @@ msgstr ""
 "無法存取媒體 \"%s\"，\n"
 "這可能是因為您建立媒體時是手動將這個目錄掛載到系統裡的。"
 
-#: ../urpm/media.pm:1215
+#: ../urpm/media.pm:1270
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1241
+#: ../urpm/media.pm:1296
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm/media.pm:1295
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在擷取 \"%s\" 的來源 hdlist (或 synthesis)..."
 
-#: ../urpm/media.pm:1312
+#: ../urpm/media.pm:1367
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1425
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1425
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的公鑰..."
 
-#: ../urpm/media.pm:1382
+#: ../urpm/media.pm:1437
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
 
-#: ../urpm/media.pm:1386
+#: ../urpm/media.pm:1441
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的公鑰"
 
-#: ../urpm/media.pm:1455
+#: ../urpm/media.pm:1512
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "加入的媒體 %s"
 
-#: ../urpm/media.pm:1566
+#: ../urpm/media.pm:1623
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
 
-#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:521 ../urpmi:610
+#: ../urpm/mirrors.pm:19
+#, c-format
+msgid "trying again with mirror %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:60
+#, c-format
+msgid "Could not find a mirror from mirrorlist %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:133
+#, c-format
+msgid "found geolocalisation %s %.2f %.2f from timezone %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:178
+#, fuzzy, c-format
+msgid "getting mirror list from %s"
+msgstr "由 [%s] 讀取 rpm 檔案"
+
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
 #, c-format
 msgid "Nn"
 msgstr "Nn否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:522 ../urpmi:561
-#: ../urpmi:611 ../urpmi:641 ../urpmi:647 ../urpmi.addmedia:122
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
 #, c-format
 msgid "Yy"
 msgstr "Yy是"
@@ -1183,224 +1220,7 @@ msgstr "自相矛盾的媒體 \"%s\" 標示為可移除但是事實上卻不是�
 msgid "unable to access medium \"%s\""
 msgstr "無法存取媒體 \"%s\" "
 
-#: ../urpm/select.pm:21
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:23
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:184
-#, c-format
-msgid "No package named %s"
-msgstr "沒有套件命名為 %s"
-
-#: ../urpm/select.pm:186 ../urpme:107
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "以下套件包含 %s：%s"
-
-#: ../urpm/select.pm:495 ../urpm/select.pm:538
-#, c-format
-msgid "due to missing %s"
-msgstr "由於遺失了 %s"
-
-#: ../urpm/select.pm:496
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "每個套件都已經安裝了"
-
-#: ../urpm/select.pm:497 ../urpm/select.pm:536
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "由於未滿足 %s"
-
-#: ../urpm/select.pm:503
-#, c-format
-msgid "trying to promote %s"
-msgstr "正在試著促進 %s"
-
-#: ../urpm/select.pm:504
-#, c-format
-msgid "in order to keep %s"
-msgstr "為了要保留 %s"
-
-#: ../urpm/select.pm:532
-#, c-format
-msgid "in order to install %s"
-msgstr "為了要安裝 %s"
-
-#: ../urpm/select.pm:542
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "由於與 %s 發生衝突"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "無效的簽名 (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "無效的公鑰 ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "遺失簽名 (%s)"
-
-#: ../urpm/sys.pm:221
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "無法建立設定檔 [%s]"
-
-#: ../urpm/sys.pm:221
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "複製失敗"
-
-#: ../urpme:40
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme 版本號 %s\n"
-"Copyright (C) 1999-2006 Mandriva。\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法：\n"
-
-#: ../urpme:45 ../urpmf:35 ../urpmi:74 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 顯示此說明訊息。\n"
-
-#: ../urpme:46
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自動選擇套件。\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
-
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - 即使某些套件不存在仍然強制執行。\n"
-
-#: ../urpme:49 ../urpmi:109 ../urpmq:67
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
-
-#: ../urpme:50 ../urpmi:140
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - 在移除前重新打包檔案\n"
-
-#: ../urpme:51
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
-
-#: ../urpme:52 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:60
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:69
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - 使用另一個根目錄進行 RPM 套件的安裝。\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - 不執行套件中的命令稿。\n"
-
-#: ../urpme:54
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 立即由一個散佈套件樹設定 urpme，在搭配 --root 選項來安\n"
-"                   裝/移除一個 chroot 時很方便。\n"
-
-#: ../urpme:56 ../urpmi:151 ../urpmq:84
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - 完整訊息模式。\n"
-
-#: ../urpme:57
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 選擇所有符合描述的套件。\n"
-
-#: ../urpme:70
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "只有擁有管理者權限的使用者才能移除套件"
-
-#: ../urpme:100
-#, c-format
-msgid "unknown packages"
-msgstr "未知的套件"
-
-#: ../urpme:100
-#, c-format
-msgid "unknown package"
-msgstr "未知的套件"
-
-#: ../urpme:113 ../urpmi:535
-#, c-format
-msgid "removing package %s will break your system"
-msgstr "移除套件 %s 將破壞您的系統"
-
-#: ../urpme:115
-#, c-format
-msgid "Nothing to remove"
-msgstr "沒有東西可移除"
-
-#: ../urpme:120
-#, c-format
-msgid "Checking to remove the following packages"
-msgstr "正在檢查以移除下列套件"
-
-#: ../urpme:124
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
-
-#: ../urpme:128
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "要移除這 %d 個套件嗎？"
-
-#: ../urpme:128 ../urpmi:562 ../urpmi:642 ../urpmi.addmedia:125
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) (是/否) "
-
-#: ../urpme:150
-#, c-format
-msgid "Removal failed"
-msgstr "移除失敗"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1416,282 +1236,506 @@ msgstr ""
 "\n"
 "用法：urpmf [選項] pattern-expression\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - 顯示此說明訊息。\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../urpmf:37 ../urpmi:131 ../urpmq:79
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
 
-#: ../urpmf:38 ../urpmi:76 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不比對樣版，把參數當作一般字串。\n"
 
-#: ../urpmf:41 ../urpmi:75 ../urpmq:47
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - 使用另一個根目錄進行 RPM 套件的安裝。\n"
+
+#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../urpmf:42 ../urpmi:79 ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 依據子字串排序媒體，以逗號分開。\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
 
-#: ../urpmf:44 ../urpmi:80 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不顯示相同的訊息。\n"
 
-#: ../urpmf:46 ../urpmi:77 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新媒體。\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 完整訊息模式。\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略樣版中的大小寫差異。\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 分辨樣版中的大小寫差異 (預設值)。\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字串>       - 更改字串分隔符號 (預設為“:”)。\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "樣版表示式：\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文字           - 任何文字都將被分析為正規表示式，除非使用了 -l。\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接包含 perl 原始碼，類似 perl -e。\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 運算子。\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 運算子。\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT 運算子。\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括弧。\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "標籤清單：\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 使用類似 printf 的輸出格式\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   範例：'%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 硬體架構\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 建立主機\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 建立時間\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 組態檔\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - 衝突標籤\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - 套件描述\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 發行版\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 時期\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - 套件檔案名稱\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出套件內包含的檔案\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 群組\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - 套件名稱\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 套件名稱\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes    - 淘汰標籤\n"
 "\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - 提供標籤\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - 需要標籤\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安裝大小\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 原始碼套件名稱\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 "  --obsoletes    - 淘汰標籤\n"
 "\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 這個套件被找到的媒介\n"
 
-#: ../urpmf:85 ../urpmq:94
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 
-#: ../urpmf:197
+#: ../urpm/search.pm:197 ../urpmf:197
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式錯誤：您只能使用一個多值標籤"
 
-#: ../urpmf:247 ../urpmi:253 ../urpmq:136
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
 
-#: ../urpmf:304
+#: ../urpm/search.pm:304 ../urpmf:306
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "正在寫入媒體 \"%s\" 的列表檔"
 
+#: ../urpm/select.pm:21
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:23
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:184
+#, c-format
+msgid "No package named %s"
+msgstr "沒有套件命名為 %s"
+
+#: ../urpm/select.pm:186 ../urpme:107
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "以下套件包含 %s：%s"
+
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
+#, c-format
+msgid "due to missing %s"
+msgstr "由於遺失了 %s"
+
+#: ../urpm/select.pm:496
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "每個套件都已經安裝了"
+
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "由於未滿足 %s"
+
+#: ../urpm/select.pm:503
+#, c-format
+msgid "trying to promote %s"
+msgstr "正在試著促進 %s"
+
+#: ../urpm/select.pm:504
+#, c-format
+msgid "in order to keep %s"
+msgstr "為了要保留 %s"
+
+#: ../urpm/select.pm:532
+#, c-format
+msgid "in order to install %s"
+msgstr "為了要安裝 %s"
+
+#: ../urpm/select.pm:542
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "由於與 %s 發生衝突"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "無效的簽名 (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "無效的公鑰 ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "遺失簽名 (%s)"
+
+#: ../urpm/sys.pm:221
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "無法建立設定檔 [%s]"
+
+#: ../urpm/sys.pm:221
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "複製失敗"
+
+#: ../urpm/sys.pm:234
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "複製失敗"
+
+#: ../urpme:40
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme 版本號 %s\n"
+"Copyright (C) 1999-2006 Mandriva。\n"
+"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+"\n"
+"用法：\n"
+
+#: ../urpme:46
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自動選擇套件。\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
+
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - 即使某些套件不存在仍然強制執行。\n"
+
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
+
+#: ../urpme:50 ../urpmi:140
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - 在移除前重新打包檔案\n"
+
+#: ../urpme:51
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - 不執行套件中的命令稿。\n"
+
+#: ../urpme:54
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - 立即由一個散佈套件樹設定 urpme，在搭配 --root 選項來安\n"
+"                   裝/移除一個 chroot 時很方便。\n"
+
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - 完整訊息模式。\n"
+
+#: ../urpme:57
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 選擇所有符合描述的套件。\n"
+
+#: ../urpme:70
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "只有擁有管理者權限的使用者才能移除套件"
+
+#: ../urpme:100
+#, c-format
+msgid "unknown packages"
+msgstr "未知的套件"
+
+#: ../urpme:100
+#, c-format
+msgid "unknown package"
+msgstr "未知的套件"
+
+#: ../urpme:113 ../urpmi:536
+#, c-format
+msgid "removing package %s will break your system"
+msgstr "移除套件 %s 將破壞您的系統"
+
+#: ../urpme:115
+#, c-format
+msgid "Nothing to remove"
+msgstr "沒有東西可移除"
+
+#: ../urpme:120
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "正在檢查以移除下列套件"
+
+#: ../urpme:124
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
+
+#: ../urpme:128
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "要移除這 %d 個套件嗎？"
+
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) (是/否) "
+
+#: ../urpme:150
+#, c-format
+msgid "Removal failed"
+msgstr "移除失敗"
+
 #: ../urpmi:69
 #, c-format
 msgid ""
@@ -1884,7 +1928,7 @@ msgstr " --curl-options - 要額外傳給 curl 的參數\n"
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr " --curl-options - 要額外傳給 curl 的參數\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:49 ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 限制下載的速度。\n"
@@ -1898,7 +1942,7 @@ msgstr ""
 "  --resume       - 接著傳送下載到一半的檔案\n"
 "                   (--no-resume 選項停用它，預設值為停用)。\n"
 
-#: ../urpmi:125 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1907,7 +1951,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理伺服器，通訊埠假設為預設值 1080 \n"
 "                   (格式為 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:127 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2013,51 +2057,56 @@ msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - 安靜模式。\n"
 
 #: ../urpmi:152
+#, fuzzy, c-format
+msgid "  --debug        - very verbose mode.\n"
+msgstr "  --verbose      - 完整訊息模式。\n"
+
+#: ../urpmi:153
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  將會安裝於命令列指定的名稱或 RPM 檔案。\n"
 
-#: ../urpmi:180
+#: ../urpmi:181
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:187
+#: ../urpmi:188
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "錯誤：要生成一個臭蟲回報，請指定平常的命令列參數另外再加上 --bug。\n"
 
-#: ../urpmi:214
+#: ../urpmi:215
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "當使用 --install-src 時您無法安裝二進制 RPM 檔案"
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:240
+#: ../urpmi:241
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目錄 [%s] 已經存在，請指定另一個目錄給臭蟲回報或刪除它"
 
-#: ../urpmi:241
+#: ../urpmi:242
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "環境目錄 %s 不存在"
 
-#: ../urpmi:274
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2066,48 +2115,48 @@ msgstr ""
 "錯誤：%s 似乎被掛載為唯讀模式。\n"
 "使用 --allow-force 標籤來強制執行。"
 
-#: ../urpmi:361
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新媒體...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (升級用)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (升級用)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:446
+#: ../urpmi:447
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (安裝用)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:448
+#: ../urpmi:449
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (安裝用)"
 
-#: ../urpmi:454
+#: ../urpmi:455
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpmi:457
+#: ../urpmi:458
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "您要選擇何者？ (1-%d) "
 
-#: ../urpmi:498
+#: ../urpmi:499
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2117,7 +2166,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:501
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2127,7 +2176,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:507 ../urpmi:523
+#: ../urpmi:508 ../urpmi:524
 #, c-format
 msgid ""
 "\n"
@@ -2136,12 +2185,12 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:508 ../urpmi:524 ../urpmi:612 ../urpmi.addmedia:125
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
 
-#: ../urpmi:516
+#: ../urpmi:517
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2150,7 +2199,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:518
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2159,7 +2208,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:544
+#: ../urpmi:545
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2169,7 +2218,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:546
+#: ../urpmi:547
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2179,7 +2228,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:554
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2188,7 +2237,7 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpmi:554
+#: ../urpmi:555
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2197,12 +2246,12 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpmi:556
+#: ../urpmi:557
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(僅測試，移除動作並不會真的執行)"
 
-#: ../urpmi:577
+#: ../urpmi:578
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2212,38 +2261,38 @@ msgstr ""
 "您必須具有管理者權限以安裝下列的相依性項目：\n"
 "%s\n"
 
-#: ../urpmi:594
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:600
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:603
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../urpmi:620
+#: ../urpmi:621
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "準備好時請按 Enter..."
 
-#: ../urpmi:625
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:664
+#: ../urpmi:665
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -2261,6 +2310,15 @@ msgid ""
 "       http://<host>/<path>\n"
 "       removable://<path>\n"
 "\n"
+"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
+"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
+"\n"
+"examples:\n"
+"\n"
+"  urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+"  urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+"\n"
+"\n"
 "and [options] are from\n"
 msgstr ""
 "用法: urpmi.addmedia [選項] <名稱> <url> [with <相對路徑>]\n"
@@ -2274,27 +2332,27 @@ msgstr ""
 "\n"
 "而 [選項] 來自\n"
 
-#: ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 使用 wget 擷取遠端檔案。\n"
 
-#: ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 使用 curl 擷取遠端檔案。\n"
 
-#: ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
 #, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - 使用 curl 擷取遠端檔案。\n"
 
-#: ../urpmi.addmedia:54
+#: ../urpmi.addmedia:63
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 建立更新的媒體。\n"
 
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:64
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2302,39 +2360,39 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:66
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 嘗試尋找並使用 synthesis 檔案。\n"
 
-#: ../urpmi.addmedia:58
+#: ../urpmi.addmedia:67
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:68
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - 不尋找任何 synthesis 或 hdlist 檔案。\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自動根據安裝媒體建立所有的媒體。\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:72
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 搭配 --distrib，每個媒體都要徵詢同意\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:73
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 搭配 --distrib，加入所有列出的媒體\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:74
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2343,76 +2401,79 @@ msgstr ""
 "  --from         - 使用指定的 URL 取得映射站台清單，預設為\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:67
-#, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+#: ../urpmi.addmedia:76
+#, fuzzy, c-format
+msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - 建立長保持於最新狀態的虛擬媒體，僅接受 file:// \n"
 "                   通訊協定。\n"
 
-#: ../urpmi.addmedia:69 ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 不使用 MD5SUM 檔案檢查功能。\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:78
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不匯入新增的媒體的公鑰\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 加入這個媒介到設定檔中，但不更新它。\n"
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 清除標頭快取目錄。\n"
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安靜模式。\n"
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整訊息模式。\n"
 
-#: ../urpmi.addmedia:94
+#: ../urpmi.addmedia:102
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:102
+#: ../urpmi.addmedia:113
+#, c-format
+msgid "no argument needed for --distrib --mirrorlist <url>"
+msgstr ""
+
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:105
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只有管理者才能新增媒體"
 
-#: ../urpmi.addmedia:108
+#: ../urpmi.addmedia:125
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "將建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:109
+#: ../urpmi.addmedia:126
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "無法建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:134
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "使用 --distrib 參數時不需給予 <hdlist 檔案的相對路徑>"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:142
 #, c-format
 msgid ""
 "\n"
@@ -2421,16 +2482,21 @@ msgstr ""
 "\n"
 "您要加入媒體 '%s'"
 
-#: ../urpmi.addmedia:150
+#: ../urpmi.addmedia:168
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<hdlist 檔案的相對路徑> 遺失\n"
 
-#: ../urpmi.addmedia:153
+#: ../urpmi.addmedia:171
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
+#: ../urpmi.addmedia:183
+#, fuzzy, c-format
+msgid "unable to add medium"
+msgstr "無法存取媒體 \"%s\" "
+
 #: ../urpmi.recover:28
 #, c-format
 msgid ""
@@ -2881,33 +2947,33 @@ msgstr "  查詢命令列給予的套件名稱或 RPM 檔案。\n"
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
 
-#: ../urpmq:358
+#: ../urpmq:360
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:359
+#: ../urpmq:361
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:362
+#: ../urpmq:364
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:363
+#: ../urpmq:365
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:427
+#: ../urpmq:429
 #, c-format
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
@@ -2989,9 +3055,6 @@ msgstr "沒有找到更新紀錄\n"
 #~ msgid "no rpm files found from [%s]"
 #~ msgstr "在 [%s] 內找不到 rpm 檔案"
 
-#~ msgid "reading rpm files from [%s]"
-#~ msgstr "由 [%s] 讀取 rpm 檔案"
-
 #~ msgid "unable to read rpm files from [%s]: %s"
 #~ msgstr "無法由 [%s] 讀取 rpm 套件：%s"
 
@@ -3133,9 +3196,6 @@ msgstr "沒有找到更新紀錄\n"
 #~ msgid "Verifying if install is possible on nodes..."
 #~ msgstr "正在驗證是否可在節點上進行安裝..."
 
-#~ msgid "Installation failed on node %s"
-#~ msgstr "節點 %s 安裝失敗"
-
 #~ msgid "Installing packages on nodes..."
 #~ msgstr "正在由節點安裝套件..."