really sync with code

1 files changed, 595 insertions, 547 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index cae586e3..dc5f106c 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-03-17 17:46+0100\n"
+"POT-Creation-Date: 2008-04-22 20:19+0200\n"
 "PO-Revision-Date: 2008-03-22 15:16+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -32,7 +32,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:30 ../gurpmi2:65
+#: ../gurpmi:30 ../gurpmi2:72
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 套件安裝"
@@ -42,7 +42,7 @@ msgstr "RPM 套件安裝"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "錯誤：無法找到檔案 %s，作業將取消"
 
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:166 ../gurpmi2:190
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
@@ -108,7 +108,7 @@ msgstr "安裝 (_I)"
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:166
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
@@ -139,14 +139,13 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../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"
 
-#: ../gurpmi.pm:47
+#: ../gurpmi.pm:47 ../urpmi:81
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
@@ -165,7 +164,7 @@ msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 即使某些套件不存在仍然強制執行。\n"
 
-#: ../gurpmi.pm:50 ../urpmi:132
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -174,55 +173,55 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 RPM 檔案的簽章。\n"
 "                   (--no-verify-rpm 會停用它，預設值為啟用)。\n"
 
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:75 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../gurpmi.pm:53 ../urpmi:148
+#: ../gurpmi.pm:53 ../urpmi:149
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允許於 provides 中搜尋套件。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:149
+#: ../gurpmi.pm:54 ../urpmi:150
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 中搜尋套件。\n"
 
-#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:68
+#: ../gurpmi.pm:55 ../urpmi:111 ../urpmq:68
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一個根目錄進行 RPM 套件的安裝。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:134
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 僅確認安裝是否能夠正確完成。\n"
 
-#: ../gurpmi.pm:55 ../urpmi:78
+#: ../gurpmi.pm:57 ../urpmi:78
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - 只使用指定的媒體來搜尋需要的套件。\n"
 
-#: ../gurpmi.pm:98
+#: ../gurpmi.pm:100
 #, c-format
 msgid "No packages specified"
 msgstr "未指定套件"
 
-#: ../gurpmi2:45
+#: ../gurpmi2:52
 #, c-format
 msgid "Please wait..."
 msgstr "請稍候..."
 
-#: ../gurpmi2:54
+#: ../gurpmi2:61
 #, c-format
 msgid "Must be root"
 msgstr "必須擁有管理者權限"
 
-#: ../gurpmi2:89
+#: ../gurpmi2:102
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -233,42 +232,42 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:114
+#: ../gurpmi2:126
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:114 ../urpmi:626
+#: ../gurpmi2:126 ../urpmi:638
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../gurpmi2:148
+#: ../gurpmi2:162
 #, c-format
 msgid " (to upgrade)"
 msgstr " (升級用)"
 
-#: ../gurpmi2:149
+#: ../gurpmi2:163
 #, c-format
 msgid " (to install)"
 msgstr " (安裝用)"
 
-#: ../gurpmi2:152
+#: ../gurpmi2:166
 #, c-format
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:153
+#: ../gurpmi2:167
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
-#: ../gurpmi2:176
+#: ../gurpmi2:191
 #, c-format
 msgid "_Abort"
 msgstr "放棄 (_A)"
 
-#: ../gurpmi2:196
+#: ../gurpmi2:213
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -279,60 +278,60 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:215 ../urpmi:592
+#: ../gurpmi2:232 ../urpmi:604
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:216 ../urpmi:593
+#: ../gurpmi2:233 ../urpmi:605
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "為了滿足相依性，將會一併安裝下列套件："
 
-#: ../gurpmi2:218
+#: ../gurpmi2:235
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 個套件，共 %d MB)"
 
-#: ../gurpmi2:224
+#: ../gurpmi2:241
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../gurpmi2:226 ../urpm/main_loop.pm:48
+#: ../gurpmi2:243 ../urpm/main_loop.pm:48
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:240 ../urpm/install.pm:81
+#: ../gurpmi2:257 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:244
+#: ../gurpmi2:261
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:264 ../urpmi:622
+#: ../gurpmi2:278 ../urpmi:633
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
 
-#: ../gurpmi2:275
+#: ../gurpmi2:289
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpmi2:289
+#: ../gurpmi2:308
 #, c-format
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:296 ../urpm/main_loop.pm:258
+#: ../gurpmi2:316 ../urpm/main_loop.pm:261
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,28 +342,28 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:302 ../urpm/main_loop.pm:196 ../urpm/main_loop.pm:214
-#: ../urpm/main_loop.pm:232
+#: ../gurpmi2:322 ../urpm/main_loop.pm:199 ../urpm/main_loop.pm:217
+#: ../urpm/main_loop.pm:235
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../gurpmi2:307
+#: ../gurpmi2:327
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:309
+#: ../gurpmi2:329
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:310 ../urpme:132
+#: ../gurpmi2:330 ../urpme:132
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:334 ../urpmi:677
+#: ../gurpmi2:338 ../urpmi:692
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -403,7 +402,7 @@ msgstr "                    預設為 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - 輸出 RPM 的完整名稱 (NVRA)\n"
 
-#: ../rurpmi:11 ../urpmi:269
+#: ../rurpmi:11 ../urpmi:281
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只有擁有管理者權限的使用者才能安裝套件"
@@ -423,98 +422,118 @@ msgstr "無法建立目錄 %s"
 msgid "invalid owner for directory %s"
 msgstr "%s 目錄的擁有者無效"
 
-#: ../urpm.pm:210
+#: ../urpm.pm:233
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
-#: ../urpm.pm:224
+#: ../urpm.pm:247
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:230
+#: ../urpm.pm:253
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在擷取 rpm 檔案 [%s] ..."
 
-#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
+#: ../urpm.pm:255 ../urpm/get_pkgs.pm:171
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
-#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
+#: ../urpm.pm:258 ../urpm/download.pm:714 ../urpm/get_pkgs.pm:173
+#: ../urpm/media.pm:793 ../urpm/media.pm:1237 ../urpm/media.pm:1405
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
 
-#: ../urpm.pm:240
+#: ../urpm.pm:263
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpm.pm:245
+#: ../urpm.pm:268
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "無法解析 spec 檔案 %s [%s]"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:276
 #, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
-#: ../urpm.pm:255
+#: ../urpm.pm:278
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "與 RPM 檔案 [%s] 不相容的硬體架構"
 
-#: ../urpm.pm:259
+#: ../urpm.pm:282
 #, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
-#: ../urpm.pm:357
+#: ../urpm.pm:367
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "使用限制模式執行時禁止該操作程序"
 
-#: ../urpm/args.pm:130 ../urpm/args.pm:139
+#: ../urpm/args.pm:142 ../urpm/args.pm:151
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 
-#: ../urpm/args.pm:280
+#: ../urpm/args.pm:300
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm/args.pm:353
+#: ../urpm/args.pm:377
+#, fuzzy, c-format
+msgid "unexpected expression %s"
+msgstr "樣版表示式：\n"
+
+#: ../urpm/args.pm:378
+#, fuzzy, c-format
+msgid "missing expression before %s"
+msgstr "遺失簽名 (%s)"
+
+#: ../urpm/args.pm:384
+#, c-format
+msgid "unexpected expression %s (suggestion: use -a or -o ?)"
+msgstr ""
+
+#: ../urpm/args.pm:388
+#, fuzzy, c-format
+msgid "no expression to close"
+msgstr "樣版表示式：\n"
+
+#: ../urpm/args.pm:397
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:419
+#: ../urpm/args.pm:469
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目錄不存在"
 
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:488
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:441 ../urpm/args.pm:444
+#: ../urpm/args.pm:491 ../urpm/args.pm:494
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:452
+#: ../urpm/args.pm:502
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
 
-#: ../urpm/bug_report.pm:48 ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr "複製失敗"
@@ -526,12 +545,17 @@ msgid ""
 "automatically)"
 msgstr ""
 
+#: ../urpm/cdrom.pm:68
+#, c-format
+msgid "HAL daemon (hald) is not running or not ready"
+msgstr ""
+
 #: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "媒體 \"%s\" 無法使用"
 
-#: ../urpm/cdrom.pm:206
+#: ../urpm/cdrom.pm:207
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "無法由媒體 \"%2$s\" 讀取 [%1$s] rpm 檔"
@@ -551,122 +575,127 @@ msgstr "無法讀取設定檔 [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "媒體 '%s' 被定義了兩次，正在取消"
 
-#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:456 ../urpm/media.pm:462
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
 
-#: ../urpm/download.pm:111
+#: ../urpm/download.pm:100
+#, c-format
+msgid "can not read proxy settings (not enough rights to read %s)"
+msgstr ""
+
+#: ../urpm/download.pm:125
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "請輸入您的憑證以使用代理伺服器\n"
 
-#: ../urpm/download.pm:112
+#: ../urpm/download.pm:126
 #, c-format
 msgid "User name:"
 msgstr "用戶名稱："
 
-#: ../urpm/download.pm:112
+#: ../urpm/download.pm:126
 #, c-format
 msgid "Password:"
 msgstr "密碼："
 
-#: ../urpm/download.pm:195
+#: ../urpm/download.pm:210
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpm/download.pm:204
+#: ../urpm/download.pm:219
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失敗：離開訊號 %d"
 
-#: ../urpm/download.pm:205
+#: ../urpm/download.pm:220
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:234
+#: ../urpm/download.pm:249
 #, c-format
 msgid "copy failed"
 msgstr "複製失敗"
 
-#: ../urpm/download.pm:240
+#: ../urpm/download.pm:255
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget 遺失了\n"
 
-#: ../urpm/download.pm:305
+#: ../urpm/download.pm:322
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl 遺失了\n"
 
-#: ../urpm/download.pm:430
+#: ../urpm/download.pm:447
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失敗：已取消下載\n"
 
-#: ../urpm/download.pm:469
+#: ../urpm/download.pm:486
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync 遺失了\n"
 
-#: ../urpm/download.pm:535
+#: ../urpm/download.pm:552
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh 遺失了\n"
 
-#: ../urpm/download.pm:554
+#: ../urpm/download.pm:571
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla 遺失了\n"
 
-#: ../urpm/download.pm:570
+#: ../urpm/download.pm:587
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "無法執行 prozilla\n"
 
-#: ../urpm/download.pm:578
+#: ../urpm/download.pm:595
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 遺失了\n"
 
-#: ../urpm/download.pm:681
+#: ../urpm/download.pm:698
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:683
+#: ../urpm/download.pm:700
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:740
+#: ../urpm/download.pm:763
 #, c-format
 msgid "retrieving %s"
 msgstr "正在取得 %s"
 
-#: ../urpm/download.pm:744
+#: ../urpm/download.pm:767
 #, c-format
 msgid "retrieved %s"
 msgstr ".已取得 %s"
 
-#: ../urpm/download.pm:772
+#: ../urpm/download.pm:795
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定義了未知的通訊協定"
 
-#: ../urpm/download.pm:792
+#: ../urpm/download.pm:815
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 無法使用，回到 %s"
 
-#: ../urpm/download.pm:796
+#: ../urpm/download.pm:819
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "沒有找到 webfetch，支援的 webfetch 有：%s\n"
 
-#: ../urpm/download.pm:817
+#: ../urpm/download.pm:840
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "無法處理通訊協定：%s"
@@ -681,17 +710,17 @@ msgstr "正在清除 %s 與 %s"
 msgid "package %s is not found."
 msgstr "沒有找到套件 %s。"
 
-#: ../urpm/get_pkgs.pm:136
+#: ../urpm/get_pkgs.pm:149
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "畸形的 URL：[%s]"
 
-#: ../urpm/get_pkgs.pm:149
+#: ../urpm/get_pkgs.pm:160
 #, c-format
 msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 msgstr ""
 
-#: ../urpm/get_pkgs.pm:156
+#: ../urpm/get_pkgs.pm:167
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
@@ -797,47 +826,47 @@ msgstr "%s 資料庫已被鎖定 (另一個程式已經在使用它了)"
 msgid "The following package has bad signature"
 msgstr "下列套件有不正確的簽章"
 
-#: ../urpm/main_loop.pm:111
+#: ../urpm/main_loop.pm:114
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列套件有不正確的簽章"
 
-#: ../urpm/main_loop.pm:112
+#: ../urpm/main_loop.pm:115
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續安裝嗎？"
 
-#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:203 ../urpm/main_loop.pm:221
+#: ../urpm/main_loop.pm:128 ../urpm/main_loop.pm:206 ../urpm/main_loop.pm:224
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../urpm/main_loop.pm:129
+#: ../urpm/main_loop.pm:132
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "正在移除已安裝的套件 (%s)"
 
-#: ../urpm/main_loop.pm:149
+#: ../urpm/main_loop.pm:152
 #, c-format
 msgid "distributing %s"
 msgstr "正在發佈 %s"
 
-#: ../urpm/main_loop.pm:164
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../urpm/main_loop.pm:166
+#: ../urpm/main_loop.pm:169
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:207
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
 
-#: ../urpm/main_loop.pm:222
+#: ../urpm/main_loop.pm:225
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
@@ -856,7 +885,7 @@ msgstr ""
 "安裝失敗，損毀的套件：\n"
 "%s"
 
-#: ../urpm/main_loop.pm:270
+#: ../urpm/main_loop.pm:273
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
@@ -902,47 +931,47 @@ msgstr "正在檢驗 %s 檔案"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：在 MD5SUM 檔案中找不到 %s 的 md5sum"
 
-#: ../urpm/media.pm:187
+#: ../urpm/media.pm:194
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虛擬媒體 \"%s\" 應該有一個清楚的 url，忽略這個媒體"
 
-#: ../urpm/media.pm:189
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的列表，忽略這個媒體"
 
-#: ../urpm/media.pm:196
+#: ../urpm/media.pm:203
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的 synthesis 檔案，忽略這個媒體"
 
-#: ../urpm/media.pm:223
+#: ../urpm/media.pm:230
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "正在嘗試跳過已存在媒體  \"%s\"，正在跳過"
 
-#: ../urpm/media.pm:409
+#: ../urpm/media.pm:415
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr ""
 
-#: ../urpm/media.pm:452 ../urpm/media.pm:458
+#: ../urpm/media.pm:458 ../urpm/media.pm:464
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "寫入設定檔 [%s]"
 
-#: ../urpm/media.pm:501
+#: ../urpm/media.pm:507
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "無法於 use-distrib 模式下使用同步管理模式"
 
-#: ../urpm/media.pm:509
+#: ../urpm/media.pm:515
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "於同步管理模式使用相關連的媒體：%s"
 
-#: ../urpm/media.pm:525
+#: ../urpm/media.pm:531
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -951,212 +980,212 @@ msgstr ""
 "--synthesis 不能夠與 --media、--excludemedia、--sortmedia、--update、--use-"
 "distrib 以及 --parallel 一起使用"
 
-#: ../urpm/media.pm:612
+#: ../urpm/media.pm:624
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜尋開始於：%s 結束於：%s"
 
-#: ../urpm/media.pm:627
+#: ../urpm/media.pm:641
 #, c-format
 msgid "skipping package %s"
 msgstr "正在略過套件 %s"
 
-#: ../urpm/media.pm:643
+#: ../urpm/media.pm:657
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "將會安裝而非升級套件 %s"
 
-#: ../urpm/media.pm:668
+#: ../urpm/media.pm:682
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm/media.pm:710
+#: ../urpm/media.pm:724
 #, c-format
 msgid "(ignored by default)"
 msgstr "(預設為忽略)"
 
-#: ../urpm/media.pm:716
+#: ../urpm/media.pm:730
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在遠端媒體 \"%2$s\" 前新增媒體 \"%1$s\""
 
-#: ../urpm/media.pm:722
+#: ../urpm/media.pm:736
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "新增媒體 \"%s\""
 
-#: ../urpm/media.pm:759
+#: ../urpm/media.pm:765
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目錄 %s 不存在"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:773
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "這個位置似乎並沒有包含任何散佈套件"
 
-#: ../urpm/media.pm:769
+#: ../urpm/media.pm:791
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "無法解析 media.cfg"
 
-#: ../urpm/media.pm:772
+#: ../urpm/media.pm:794
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "無法存取散佈媒體 (找不到 media.cfg 檔案)"
 
-#: ../urpm/media.pm:790
+#: ../urpm/media.pm:812
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:839
+#: ../urpm/media.pm:861
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在擷取 media.cfg 檔案..."
 
-#: ../urpm/media.pm:880
+#: ../urpm/media.pm:902
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm/media.pm:883
+#: ../urpm/media.pm:905
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體：\"%s\""
 
-#: ../urpm/media.pm:903
+#: ../urpm/media.pm:925
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:1001
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
 
-#: ../urpm/media.pm:1017
+#: ../urpm/media.pm:1039
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "重新設定失敗"
 
-#: ../urpm/media.pm:1023
+#: ../urpm/media.pm:1045
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新設定完成"
 
-#: ../urpm/media.pm:1053
+#: ../urpm/media.pm:1061
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成名稱檔案時發生錯誤：相依性 %d 沒有找到"
 
-#: ../urpm/media.pm:1074
+#: ../urpm/media.pm:1082
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "媒體 \"%s\" 已經處於最新狀態"
 
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1093
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗 synthesis 檔案 [%s]"
 
-#: ../urpm/media.pm:1075
+#: ../urpm/media.pm:1113
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
 
-#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
+#: ../urpm/media.pm:1126 ../urpm/media.pm:1209
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在複製媒體 \"%2$s\" 的 [%1$s]..."
 
-#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
+#: ../urpm/media.pm:1128 ../urpm/media.pm:1183 ../urpm/media.pm:1421
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm/media.pm:1141
+#: ../urpm/media.pm:1179
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
+#: ../urpm/media.pm:1181 ../urpm/media.pm:1213
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm/media.pm:1177
+#: ../urpm/media.pm:1215
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案小得可疑)"
 
-#: ../urpm/media.pm:1210
+#: ../urpm/media.pm:1248
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在計算來源 synthesis 的 md5sum"
 
-#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
+#: ../urpm/media.pm:1250 ../urpm/media.pm:1671
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] 擷取失敗 (md5sum 不合)"
 
-#: ../urpm/media.pm:1227
+#: ../urpm/media.pm:1265
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm/media.pm:1237
+#: ../urpm/media.pm:1275
 #, c-format
 msgid "comparing %s and %s"
 msgstr "正在比對 %s 與 %s"
 
-#: ../urpm/media.pm:1268
+#: ../urpm/media.pm:1300
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1296
+#: ../urpm/media.pm:1326
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的 MD5SUM 檔案..."
 
-#: ../urpm/media.pm:1350
+#: ../urpm/media.pm:1380
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在擷取 \"%s\" 的來源 synthesis..."
 
-#: ../urpm/media.pm:1367
+#: ../urpm/media.pm:1397
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
 
-#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
+#: ../urpm/media.pm:1404 ../urpm/media.pm:1512
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
 
-#: ../urpm/media.pm:1425
+#: ../urpm/media.pm:1455
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的公鑰..."
 
-#: ../urpm/media.pm:1437
+#: ../urpm/media.pm:1467
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
 
-#: ../urpm/media.pm:1441
+#: ../urpm/media.pm:1471
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的公鑰"
 
-#: ../urpm/media.pm:1512
+#: ../urpm/media.pm:1545
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新媒體 \"%s\""
 
-#: ../urpm/media.pm:1623
+#: ../urpm/media.pm:1665
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1166,94 +1195,94 @@ msgstr ""
 msgid "trying again with mirror %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:60
+#: ../urpm/mirrors.pm:55
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "無法從鏡像站列表 %s 找到鏡像站"
 
-#: ../urpm/mirrors.pm:133
+#: ../urpm/mirrors.pm:181
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:178
+#: ../urpm/mirrors.pm:226
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "正由 %s 取得鏡像站列表"
 
-#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
+#: ../urpm/msg.pm:63 ../urpmi:518 ../urpmi:534 ../urpmi:624
 #, 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:507 ../urpmi:523 ../urpmi:562
-#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
+#: ../urpm/msg.pm:64 ../urpme:37 ../urpmi:519 ../urpmi:535 ../urpmi:574
+#: ../urpmi:625 ../urpmi:661 ../urpmi:667 ../urpmi.addmedia:138
 #, c-format
 msgid "Yy"
 msgstr "Yy是"
 
-#: ../urpm/msg.pm:120
+#: ../urpm/msg.pm:121
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "抱歉，選擇錯誤，請再試一次\n"
 
-#: ../urpm/msg.pm:151
+#: ../urpm/msg.pm:152
 #, c-format
 msgid "Package"
 msgstr "套件"
 
-#: ../urpm/msg.pm:151
+#: ../urpm/msg.pm:152
 #, c-format
 msgid "Version"
 msgstr "版本"
 
-#: ../urpm/msg.pm:151
+#: ../urpm/msg.pm:152
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../urpm/msg.pm:151
+#: ../urpm/msg.pm:152
 #, c-format
 msgid "Arch"
 msgstr "硬體架構"
 
-#: ../urpm/msg.pm:160
+#: ../urpm/msg.pm:161
 #, c-format
 msgid "(suggested)"
 msgstr "(建議)"
 
-#: ../urpm/msg.pm:175
+#: ../urpm/msg.pm:176
 #, c-format
 msgid "medium \"%s\""
 msgstr "媒體 \"%s\""
 
-#: ../urpm/msg.pm:175
+#: ../urpm/msg.pm:176
 #, c-format
 msgid "command line"
 msgstr "命令列"
 
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:190
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:190
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:190
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:190
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
 #, c-format
 msgid "TB"
 msgstr "TB"
@@ -1293,7 +1322,227 @@ msgstr "正在掛載 %s"
 msgid "unmounting %s"
 msgstr "正在卸載 %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:191
+#, c-format
+msgid "No package named %s"
+msgstr "沒有套件命名為 %s"
+
+#: ../urpm/select.pm:193 ../urpme:107
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "以下套件包含 %s：%s"
+
+#: ../urpm/select.pm:516 ../urpm/select.pm:559
+#, c-format
+msgid "due to missing %s"
+msgstr "由於遺失了 %s"
+
+#: ../urpm/select.pm:517
+#, c-format
+msgid "due to already installed %s"
+msgstr "由於已經安裝了 %s"
+
+#: ../urpm/select.pm:518 ../urpm/select.pm:557
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "由於未滿足 %s"
+
+#: ../urpm/select.pm:524
+#, c-format
+msgid "trying to promote %s"
+msgstr "正在試著促進 %s"
+
+#: ../urpm/select.pm:525
+#, c-format
+msgid "in order to keep %s"
+msgstr "為了要保留 %s"
+
+#: ../urpm/select.pm:553
+#, c-format
+msgid "in order to install %s"
+msgstr "為了要安裝 %s"
+
+#: ../urpm/select.pm:563
+#, 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:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:271
+#, c-format
+msgid "Can't write file"
+msgstr "無法寫入檔案"
+
+#: ../urpm/sys.pm:271
+#, c-format
+msgid "Can't open file"
+msgstr "無法開啟檔案"
+
+#: ../urpm/sys.pm:284
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "無法移動檔案 %s 至 %s"
+
+#: ../urpme:40
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 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-2008 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:49 ../urpmi:110 ../urpmq:67
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
+
+#: ../urpme:50 ../urpmi:141
+#, 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:112 ../urpmi.addmedia:69
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:46 ../urpmq:69
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - 使用另一個根目錄存放 urpmi 資料庫與 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:152 ../urpmq:86
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - 詳細訊息模式。\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:548
+#, 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
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "要移除這 %d 個套件嗎？"
+
+#: ../urpme:128 ../urpmi:575 ../urpmi:662 ../urpmi.addmedia:141
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) (是/否) "
+
+#: ../urpme:150
+#, c-format
+msgid "Removal failed"
+msgstr "移除失敗"
+
+#: ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1309,484 +1558,278 @@ msgstr ""
 "\n"
 "用法：urpmf [選項] pattern-expression\n"
 
-#: ../urpm/search.pm:36 ../urpmf:36
+#: ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
+#: ../urpmf:37 ../urpmi:132 ../urpmq:79
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
 
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
+#: ../urpmf:38 ../urpmi:76 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../urpm/search.pm:39 ../urpmf:39
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不比對樣版，把參數當作一般字串。\n"
 
-#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
-#: ../urpmi.update:46 ../urpmq:69
-#, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - 使用另一個根目錄存放 urpmi 資料庫與 RPM 的安裝。\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
+#: ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 依據子字串排序媒體，以逗號分開。\n"
 
-#: ../urpm/search.pm:43 ../urpmf:43
+#: ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用指定的路徑來存取媒體\n"
 
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
+#: ../urpmf:44 ../urpmi:80 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
 
-#: ../urpm/search.pm:45 ../urpmf:45
+#: ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不顯示相同的訊息。\n"
 
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
+#: ../urpmf:46 ../urpmi:77 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新媒體。\n"
 
-#: ../urpm/search.pm:47 ../urpmf:47
+#: ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 完整訊息模式。\n"
 
-#: ../urpm/search.pm:48 ../urpmf:48
+#: ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略樣版中的大小寫差異。\n"
 
-#: ../urpm/search.pm:49 ../urpmf:49
+#: ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 分辨樣版中的大小寫差異 (預設值)。\n"
 
-#: ../urpm/search.pm:50 ../urpmf:50
+#: ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字串>       - 更改字串分隔符號 (預設為“:”)。\n"
 
-#: ../urpm/search.pm:51 ../urpmf:51
+#: ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/search.pm:52 ../urpmf:52
+#: ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文字           - 任何文字都將被分析為正規表示式，除非使用了 -l。\n"
 
-#: ../urpm/search.pm:53 ../urpmf:53
+#: ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接包含 perl 原始碼，類似 perl -e。\n"
 
-#: ../urpm/search.pm:54 ../urpmf:54
+#: ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 運算子。\n"
 
-#: ../urpm/search.pm:55 ../urpmf:55
+#: ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 運算子。\n"
 
-#: ../urpm/search.pm:56 ../urpmf:56
+#: ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT 運算子。\n"
 
-#: ../urpm/search.pm:57 ../urpmf:57
+#: ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括弧。\n"
 
-#: ../urpm/search.pm:58 ../urpmf:58
+#: ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "標籤清單：\n"
 
-#: ../urpm/search.pm:59 ../urpmf:59
+#: ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 使用類似 printf 的輸出格式\n"
 
-#: ../urpm/search.pm:60 ../urpmf:60
+#: ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   範例：'%%name:%%files'\n"
 
-#: ../urpm/search.pm:61 ../urpmf:61
+#: ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 硬體架構\n"
 
-#: ../urpm/search.pm:62 ../urpmf:62
+#: ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 建立主機\n"
 
-#: ../urpm/search.pm:63 ../urpmf:63
+#: ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 建立時間\n"
 
-#: ../urpm/search.pm:64 ../urpmf:64
+#: ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 組態檔\n"
 
-#: ../urpm/search.pm:65 ../urpmf:65
+#: ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - 衝突標籤\n"
 
-#: ../urpm/search.pm:66 ../urpmf:66
+#: ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - 套件描述\n"
 
-#: ../urpm/search.pm:67 ../urpmf:67
+#: ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 發行版\n"
 
-#: ../urpm/search.pm:68 ../urpmf:68
+#: ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 時期\n"
 
-#: ../urpm/search.pm:69 ../urpmf:69
+#: ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - 套件檔案名稱\n"
 
-#: ../urpm/search.pm:70 ../urpmf:70
+#: ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出套件內包含的檔案\n"
 
-#: ../urpm/search.pm:71 ../urpmf:71
+#: ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 群組\n"
 
-#: ../urpm/search.pm:72 ../urpmf:72
+#: ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - 授權\n"
 
-#: ../urpm/search.pm:73 ../urpmf:73
+#: ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 套件名稱\n"
 
-#: ../urpm/search.pm:74 ../urpmf:74
+#: ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - 淘汰標籤\n"
 
-#: ../urpm/search.pm:75 ../urpmf:75
+#: ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpm/search.pm:76 ../urpmf:76
+#: ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - 提供標籤\n"
 
-#: ../urpm/search.pm:77 ../urpmf:77
+#: ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - 需要標籤\n"
 
-#: ../urpm/search.pm:78 ../urpmf:78
+#: ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安裝大小\n"
 
-#: ../urpm/search.pm:79 ../urpmf:79
+#: ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 原始碼套件名稱\n"
 
-#: ../urpm/search.pm:80 ../urpmf:80
+#: ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - 建議標籤\n"
 
-#: ../urpm/search.pm:81 ../urpmf:81
+#: ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpm/search.pm:82 ../urpmf:82
+#: ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpm/search.pm:83 ../urpmf:83
+#: ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpm/search.pm:84 ../urpmf:84
+#: ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 這個套件被找到的媒介\n"
 
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
+#: ../urpmf:85 ../urpmq:96
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 
-#: ../urpm/search.pm:197 ../urpmf:197
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "樣版表示式：\n"
+
+#: ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式錯誤：您只能使用一個多值標籤"
 
-#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
+#: ../urpmf:248 ../urpmi:265 ../urpmq:141
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
-#: ../urpm/search.pm:290 ../urpmf:290
+#: ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 hdlist"
 
-#: ../urpm/search.pm:297 ../urpmf:297
+#: ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 synthesis"
 
-#: ../urpm/search.pm:304 ../urpmf:306
+#: ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 xml-info"
 
-#: ../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
-#, c-format
-msgid "due to already installed %s"
-msgstr "由於已經安裝了 %s"
-
-#: ../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
-#, c-format
-msgid "Can't write file"
-msgstr "無法寫入檔案"
-
-#: ../urpm/sys.pm:221
-#, c-format
-msgid "Can't open file"
-msgstr "無法開啟檔案"
-
-#: ../urpm/sys.pm:234
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "無法移動檔案 %s 至 %s"
-
-#: ../urpme:40
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 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-2008 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: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
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - 詳細訊息模式。\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
-#, 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:83
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1898,7 +1941,12 @@ msgstr ""
 "  --allow-force  - 允許要求使用者安裝套件而不檢查相依性與完整\n"
 "                   性。\n"
 
-#: ../urpmi:112
+#: ../urpmi:109
+#, fuzzy, c-format
+msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
+msgstr "  --no-suggests  - 不要自動選取 \"建議的\" 套件。\n"
+
+#: ../urpmi:113
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1907,7 +1955,7 @@ msgstr ""
 "  --use-distrib  - 立即由一個散佈套件樹設定 urpmi，在搭配 --root 選項來安\n"
 "                   裝/移除一個 chroot 時很方便。\n"
 
-#: ../urpmi:114
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
@@ -1916,37 +1964,37 @@ msgstr ""
 "  --downloader   - 用來取得遠端檔案的程式。\n"
 "                   已知的程式有：%s\n"
 
-#: ../urpmi:117
+#: ../urpmi:118
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr " --curl-options - 要額外傳給 curl 的參數\n"
 
-#: ../urpmi:118
+#: ../urpmi:119
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 要額外傳給 rsync 的參數\n"
 
-#: ../urpmi:119
+#: ../urpmi:120
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 要額外傳給 wget 的參數\n"
 
-#: ../urpmi:120
+#: ../urpmi:121
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 要額外傳給 prozilla 的參數\n"
 
-#: ../urpmi:121
+#: ../urpmi:122
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 要額外傳給 aria2 的參數\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
+#: ../urpmi:123 ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 限制下載的速度。\n"
 
-#: ../urpmi:123
+#: ../urpmi:124
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1955,7 +2003,7 @@ msgstr ""
 "  --resume       - 接著傳送下載到一半的檔案\n"
 "                   (--no-resume 選項停用它，預設值為停用)。\n"
 
-#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
+#: ../urpmi:126 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1964,7 +2012,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理伺服器，通訊埠假設為預設值 1080 \n"
 "                   (格式為 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
+#: ../urpmi:128 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1973,49 +2021,49 @@ msgstr ""
 "  --proxy-user   - 指定代理伺服器認證的使用者帳號與密碼\n"
 "                   (格式為 <user:password>)。\n"
 
-#: ../urpmi:129
+#: ../urpmi:130
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "  --bug          - 輸出臭蟲回報到下一個參數所指定的目錄。\n"
 
-#: ../urpmi:135
+#: ../urpmi:136
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除以逗號分隔的路徑。\n"
 
-#: ../urpmi:136
+#: ../urpmi:137
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除說明文件檔案。\n"
 
-#: ../urpmi:137
+#: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安裝前不檢查剩餘的磁碟空間。\n"
 
-#: ../urpmi:138
+#: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允許安裝硬體架構不相符的 RPM 檔。\n"
 
-#: ../urpmi:139
+#: ../urpmi:140
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不執行套件中的命令稿\n"
 
-#: ../urpmi:141
+#: ../urpmi:142
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安裝時應該略過的套件\n"
 
-#: ../urpmi:142
+#: ../urpmi:143
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 應該要優先考慮的套件\n"
 
-#: ../urpmi:143
+#: ../urpmi:144
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2023,87 +2071,87 @@ msgid ""
 msgstr ""
 "  --more-choices - 當找到不只一個套件時，提供除了預設值之外的多個選擇。\n"
 
-#: ../urpmi:145
+#: ../urpmi:146
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不鎖定 RPM 資料庫。\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 只升級相同平台的套件。\n"
 
-#: ../urpmi:147 ../urpmq:92
+#: ../urpmi:148 ../urpmq:94
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合的項目。\n"
 
-#: ../urpmi:150
+#: ../urpmi:151
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安靜模式。\n"
 
-#: ../urpmi:152
+#: ../urpmi:153
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常詳細模式。\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  將會安裝於命令列指定的名稱或 RPM 檔案。\n"
 
-#: ../urpmi:181
+#: ../urpmi:182
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "錯誤：無法與套件列表一起使用 --auto-select。\n"
 
-#: ../urpmi:188
+#: ../urpmi:189
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "錯誤：要生成一個臭蟲回報，請指定平常的命令列參數另外再加上 --bug。\n"
 
-#: ../urpmi:215
+#: ../urpmi:219
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "當使用 --install-src 時您無法安裝二進制 RPM 檔案"
 
-#: ../urpmi:219
+#: ../urpmi:220
 #, c-format
 msgid "You can't install spec files"
 msgstr "您無法安裝 spec 檔案"
 
-#: ../urpmi:226
+#: ../urpmi:227
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "--buildrequires 的預設值"
 
-#: ../urpmi:231
+#: ../urpmi:232
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "請使用 --buildrequires 或者 --install-src，預設為 --buildrequires"
 
-#: ../urpmi:241
+#: ../urpmi:252
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目錄 [%s] 已經存在，請指定另一個目錄給臭蟲回報或刪除它"
 
-#: ../urpmi:242
+#: ../urpmi:253
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
 
-#: ../urpmi:253
+#: ../urpmi:264
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "環境目錄 %s 不存在"
 
-#: ../urpmi:275
+#: ../urpmi:287
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2112,48 +2160,48 @@ msgstr ""
 "錯誤：%s 似乎被掛載為唯讀模式。\n"
 "使用 --allow-force 標籤來強制執行。"
 
-#: ../urpmi:362
+#: ../urpmi:374
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新媒體...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:453
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s：%s (升級用)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:443
+#: ../urpmi:455
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (升級用)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:447
+#: ../urpmi:459
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s：%s (安裝用)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:449
+#: ../urpmi:461
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (安裝用)"
 
-#: ../urpmi:455
+#: ../urpmi:467
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "為了滿足 '%s' 的相依性，需要下列套件之一："
 
-#: ../urpmi:458
+#: ../urpmi:470
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "您要選擇何者？ (1-%d) "
 
-#: ../urpmi:499
+#: ../urpmi:511
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2163,7 +2211,7 @@ msgstr ""
 "下列套件無法安裝，因為它需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:501
+#: ../urpmi:513
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2173,7 +2221,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:508 ../urpmi:524
+#: ../urpmi:520 ../urpmi:536
 #, c-format
 msgid ""
 "\n"
@@ -2182,12 +2230,12 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
+#: ../urpmi:521 ../urpmi:537 ../urpmi:626 ../urpmi.addmedia:141
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
 
-#: ../urpmi:517
+#: ../urpmi:529
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2196,7 +2244,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:518
+#: ../urpmi:530
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2205,7 +2253,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:545
+#: ../urpmi:557
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2215,7 +2263,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:547
+#: ../urpmi:559
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2225,7 +2273,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:554
+#: ../urpmi:566
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2234,7 +2282,7 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpmi:555
+#: ../urpmi:567
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2243,12 +2291,12 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpmi:557
+#: ../urpmi:569
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(僅測試，移除動作並不會真的執行)"
 
-#: ../urpmi:578
+#: ../urpmi:590
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2258,38 +2306,38 @@ msgstr ""
 "您必須先呼叫 urpmi --buildrequires 來安裝下列相依性套件：\n"
 "%s\n"
 
-#: ../urpmi:595
+#: ../urpmi:607
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:601
+#: ../urpmi:613
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "將使用 %s 額外磁碟空間。"
 
-#: ../urpmi:602
+#: ../urpmi:614
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "將釋放 %s 磁碟空間。"
 
-#: ../urpmi:604
+#: ../urpmi:615
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "將取得 %s 軟體套件。"
 
-#: ../urpmi:605
+#: ../urpmi:616
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../urpmi:627
+#: ../urpmi:638
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:635
+#: ../urpmi:646
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "掛載好後請按 Enter..."
@@ -2431,66 +2479,66 @@ msgstr "  --raw          - 加入這個媒介到設定檔中，但不更新它�
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安靜模式。\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整訊息模式。\n"
 
-#: ../urpmi.addmedia:102
+#: ../urpmi.addmedia:101
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "已知的 xml-info 政策為 %s"
 
-#: ../urpmi.addmedia:113
+#: ../urpmi.addmedia:112
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "--distrib --mirrorlist <url> 不需要參數"
 
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:117
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "錯誤的 <url> (對於本地目錄，必須使用絕對路徑)"
 
-#: ../urpmi.addmedia:122
+#: ../urpmi.addmedia:121
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只有管理者才能新增媒體"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "creating config file [%s]"
 msgstr "正在建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:125
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "無法建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:134
+#: ../urpmi.addmedia:133
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "--distrib 不需給予 <synthesis 檔案的相對路徑>"
 
-#: ../urpmi.addmedia:142
-#, c-format
+#: ../urpmi.addmedia:141
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Do you want to add media '%s'"
+"Do you want to add media '%s'?"
 msgstr ""
 "\n"
 "您要加入媒體 '%s'"
 
-#: ../urpmi.addmedia:168
+#: ../urpmi.addmedia:167
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<synthesis 檔案的相對路徑> 遺失\n"
 
-#: ../urpmi.addmedia:171
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "遠端媒體無法使用 %s"
 
-#: ../urpmi.addmedia:183
+#: ../urpmi.addmedia:182
 #, c-format
 msgid "unable to add medium"
 msgstr "無法增加媒體"
@@ -2644,22 +2692,22 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 選擇全部的媒體。\n"
 
-#: ../urpmi.removemedia:43
+#: ../urpmi.removemedia:42
 #, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - 對媒體名稱進行模糊比對。\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:59
 #, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "只有管理者才可以移除媒體"
 
-#: ../urpmi.removemedia:73
+#: ../urpmi.removemedia:72
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可以移除 (使用 urpmi.addmedia 來新增一個媒體)\n"
 
-#: ../urpmi.removemedia:79
+#: ../urpmi.removemedia:78
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2707,27 +2755,27 @@ msgstr "  --no-probe     - 不尋找任何 synthesis 或 hdlist 檔案。\n"
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 選擇所有不可移除式媒體。\n"
 
-#: ../urpmi.update:50
+#: ../urpmi.update:49
 #, fuzzy, c-format
 msgid "  -f             - force updating synthesis\n"
 msgstr "  -f             - 強制產生 hdlist 檔案。\n"
 
-#: ../urpmi.update:51
+#: ../urpmi.update:50
 #, fuzzy, c-format
 msgid "  -ff            - really force updating synthesis\n"
 msgstr "  -f             - 強制產生 hdlist 檔案。\n"
 
-#: ../urpmi.update:68
+#: ../urpmi.update:67
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只有管理者才能跟新媒體"
 
-#: ../urpmi.update:76
+#: ../urpmi.update:75
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可供更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi.update:94
+#: ../urpmi.update:93
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2736,17 +2784,17 @@ msgstr ""
 "要更新的項目遺失\n"
 "(%s 的其中之一)\n"
 
-#: ../urpmi.update:98
+#: ../urpmi.update:97
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:99
+#: ../urpmi.update:98
 #, c-format
 msgid "ignoring media %s"
 msgstr "略過媒體 %s"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:98
 #, c-format
 msgid "enabling media %s"
 msgstr "啟用媒體 %s"
@@ -2872,12 +2920,12 @@ msgid ""
 "                   - query package dependencies.\n"
 msgstr "  -d             - 延伸套件相依性的查詢。\n"
 
-#: ../urpmq:87
+#: ../urpmq:89
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr "  --whatrequires - 逆向搜尋何者需要此套件。\n"
 
-#: ../urpmq:88
+#: ../urpmq:90
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
@@ -2886,107 +2934,107 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                   - 進階逆向搜尋 (包含虛擬套件)。\n"
 
-#: ../urpmq:90
+#: ../urpmq:92
 #, fuzzy, c-format
 msgid ""
 "  --whatprovides, -p\n"
 "                   - search in provides to find package.\n"
 msgstr "  -p             - 於 provides 中搜尋套件。\n"
 
-#: ../urpmq:93
+#: ../urpmq:95
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 完整輸出要移除的套件。\n"
 
-#: ../urpmq:95
+#: ../urpmq:97
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 顯示群組名稱。\n"
 
-#: ../urpmq:96
+#: ../urpmq:98
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人類可讀的形式顯示有用資訊。\n"
 
-#: ../urpmq:97
+#: ../urpmq:99
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出套件內包含的檔案。\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
 #, fuzzy, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -q             - 安靜模式。\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 顯示名稱時一併顯示版本號與發行編號。\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下個套件是原始碼套件 (與 --src 相同)。\n"
 
-#: ../urpmq:101
+#: ../urpmq:103
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 若已經安裝較新的版本則移除套件。\n"
 
-#: ../urpmq:102
+#: ../urpmq:104
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 加上模糊搜尋 (與 --fuzzy 相同)。\n"
 
-#: ../urpmq:103
+#: ../urpmq:105
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 類似 -y 參數，但強制比對大小寫。\n"
 
-#: ../urpmq:104
+#: ../urpmq:106
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  查詢命令列給予的套件名稱或 RPM 檔案。\n"
 
-#: ../urpmq:180
+#: ../urpmq:185
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
 
-#: ../urpmq:206
+#: ../urpmq:209
 #, c-format
 msgid "use -l to list files"
 msgstr "使用 -l 列出檔案"
 
-#: ../urpmq:363
+#: ../urpmq:382
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:361
+#: ../urpmq:383
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:364
+#: ../urpmq:386
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:365
+#: ../urpmq:387
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:429
+#: ../urpmq:451
 #, c-format
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"