usync with code

1 files changed, 455 insertions, 443 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index f08a367f..f6db6f14 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-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+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:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, 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:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
@@ -108,7 +108,7 @@ msgstr "安裝 (_I)"
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
@@ -139,8 +139,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../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"
@@ -173,7 +174,7 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 RPM 檔案的簽章。\n"
 "                   (--no-verify-rpm 會停用它，預設值為啟用)。\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
@@ -221,7 +222,7 @@ msgstr "請稍候..."
 msgid "Must be root"
 msgstr "必須擁有管理者權限"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -232,42 +233,42 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (升級用)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (安裝用)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "放棄 (_A)"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -278,60 +279,60 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "為了滿足相依性，將會一併安裝下列套件："
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 個套件，共 %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -342,28 +343,28 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -443,8 +444,8 @@ msgid "...retrieving done"
 msgstr "...擷取完成"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
@@ -484,52 +485,52 @@ msgstr "使用限制模式執行時禁止該操作程序"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "遺失簽名 (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目錄不存在"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
@@ -956,217 +957,217 @@ msgstr ""
 "--synthesis 不能夠與 --media、--excludemedia、--sortmedia、--update、--use-"
 "distrib 以及 --parallel 一起使用"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜尋開始於：%s 結束於：%s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "正在略過套件 %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "將會安裝而非升級套件 %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(預設為忽略)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在遠端媒體 \"%2$s\" 前新增媒體 \"%1$s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "新增媒體 \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目錄 %s 不存在"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "這個位置似乎並沒有包含任何散佈套件"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "無法解析 media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "無法存取散佈媒體 (找不到 media.cfg 檔案)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在擷取 media.cfg 檔案..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體：\"%s\""
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "重新設定失敗"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新設定完成"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成名稱檔案時發生錯誤：相依性 %d 沒有找到"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "媒體 \"%s\" 已經處於最新狀態"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗 synthesis 檔案 [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在複製媒體 \"%2$s\" 的 [%1$s]..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案小得可疑)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在計算來源 synthesis 的 md5sum"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] 擷取失敗 (md5sum 不合)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "正在比對 %s 與 %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的 MD5SUM 檔案..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在擷取 \"%s\" 的來源 synthesis..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的公鑰..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的公鑰"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新媒體 \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1198,7 +1199,7 @@ msgstr "Nn否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy是"
@@ -1268,7 +1269,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1350,264 +1351,7 @@ msgstr "正在掛載 %s"
 msgid "unmounting %s"
 msgstr "正在卸載 %s"
 
-#: ../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:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "以下套件包含 %s：%s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s 套件無法安裝"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "%s 套件已經安裝了"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "%s 套件已經安裝了"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "由於遺失了 %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "由於已經安裝了 %s"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "由於未滿足 %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "正在試著促進 %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "為了要保留 %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "為了要安裝 %s"
-
-#: ../urpm/select.pm:613
-#, 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:276
-#, c-format
-msgid "Can't write file"
-msgstr "無法寫入檔案"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "無法開啟檔案"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "無法移動檔案 %s 至 %s"
-
-#: ../urpme:41
-#, 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:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自動選擇套件。\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - 在移除前重新打包檔案\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - 使用另一個根目錄存放 urpmi 資料庫與 RPM 的安裝。\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - 不執行套件中的命令稿。\n"
-
-#: ../urpme:56
-#, 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:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - 詳細訊息模式。\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 選擇所有符合描述的套件。\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "只有擁有管理者權限的使用者才能移除套件"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "未知的套件"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "未知的套件"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "移除套件 %s 將破壞您的系統"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "沒有東西可移除"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "沒有東西可移除"
-
-#: ../urpme:147
-#, 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:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "未知的套件"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "要移除這 %d 個套件嗎？"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) (是/否) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "將可移除式裝置當成 \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "移除失敗"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "移除失敗"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1623,278 +1367,546 @@ msgstr ""
 "\n"
 "用法：urpmf [選項] pattern-expression\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../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:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - 使用另一個根目錄存放 urpmi 資料庫與 RPM 的安裝。\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用指定的路徑來存取媒體\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../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:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../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
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - 授權\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"
 
-#: ../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
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - 建議標籤\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:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "樣版表示式：\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式錯誤：您只能使用一個多值標籤"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 hdlist"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 synthesis"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 xml-info"
 
+#: ../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:168
+#, c-format
+msgid "No package named %s"
+msgstr "沒有套件命名為 %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "以下套件包含 %s：%s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "%s 套件無法安裝"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "%s 套件已經安裝了"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s 套件已經安裝了"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "由於遺失了 %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "由於已經安裝了 %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "由於未滿足 %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "正在試著促進 %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "為了要保留 %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "為了要安裝 %s"
+
+#: ../urpm/select.pm:617
+#, 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:276
+#, c-format
+msgid "Can't write file"
+msgstr "無法寫入檔案"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "無法開啟檔案"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "無法移動檔案 %s 至 %s"
+
+#: ../urpme:41
+#, 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:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自動選擇套件。\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - 在移除前重新打包檔案\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - 只更新 RPM 資料庫，而非檔案系統。\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - 不執行套件中的命令稿。\n"
+
+#: ../urpme:57
+#, 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:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - 詳細訊息模式。\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 選擇所有符合描述的套件。\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "只有擁有管理者權限的使用者才能移除套件"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "未知的套件"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "未知的套件"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "移除套件 %s 將破壞您的系統"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "沒有東西可移除"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "沒有東西可移除"
+
+#: ../urpme:149
+#, 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:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "未知的套件"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "要移除這 %d 個套件嗎？"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) (是/否) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "將可移除式裝置當成 \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "移除失敗"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "移除失敗"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "樣版表示式：\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1984,11 +1996,6 @@ msgstr "  --clean        - 在執行任何事前先由快取中移除 RPM 檔案
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不清除快取中的 RPM 檔案。\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - 只更新 RPM 資料庫，而非檔案系統。\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2305,7 +2312,7 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
@@ -2493,10 +2500,12 @@ msgstr "  --curl         - 使用 curl 擷取遠端檔案。\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 建立更新的媒體。\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2504,39 +2513,39 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 使用 synthesis 檔案。\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - 使用 RPM 檔案 (而非 synthesis)。\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - 不嘗試尋找任何 synthesis 檔案。\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自動根據安裝媒體建立所有的媒體。\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 搭配 --distrib，每個媒體都要徵詢同意\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 搭配 --distrib，加入所有列出的媒體\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2545,72 +2554,72 @@ msgstr ""
 "  --from         - 使用指定的 URL 取得映射站台清單，預設為\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - 建立永遠保持於最新狀態的虛擬媒體。\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 不使用 MD5SUM 檔案檢查功能。\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不匯入新增的媒體的公鑰\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 加入這個媒介到設定檔中，但不更新它。\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安靜模式。\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整訊息模式。\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "已知的 xml-info 政策為 %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "--distrib --mirrorlist <url> 不需要參數"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "錯誤的 <url> (對於本地目錄，必須使用絕對路徑)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只有管理者才能新增媒體"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "正在建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "無法建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "--distrib 不需給予 <synthesis 檔案的相對路徑>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2619,17 +2628,17 @@ msgstr ""
 "\n"
 "您要加入媒體 '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<synthesis 檔案的相對路徑> 遺失\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "遠端媒體無法使用 %s"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "無法增加媒體"
@@ -2861,12 +2870,12 @@ msgstr "  -f             - 強制產生 hdlist 檔案。\n"
 msgid "Only superuser is allowed to update media"
 msgstr "只有管理者才能跟新媒體"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可供更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2875,17 +2884,17 @@ msgstr ""
 "要更新的項目遺失\n"
 "(%s 的其中之一)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "略過媒體 %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "啟用媒體 %s"
@@ -3150,6 +3159,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - 建立更新的媒體。\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "畸形的 URL：[%s]"