re-sync after the big svn loss

1 files changed, 204 insertions, 199 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7690691a..b8884f14 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: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-27 16:38+0200\n"
 "PO-Revision-Date: 2006-09-01 21:32+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -118,12 +118,12 @@ msgstr "取消 (_C)"
 msgid "Choose location to save file"
 msgstr "選擇存檔的位置"
 
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知的選項 %s"
 
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
 #, c-format
 msgid "No packages specified"
 msgstr "未指定套件"
@@ -154,7 +154,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -257,7 +257,7 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
@@ -277,10 +277,10 @@ msgstr "正在安裝套件 `%s' (%s/%s)..."
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
 #, c-format
-msgid "Installation failed"
-msgstr "安裝失敗"
+msgid "Installation failed:"
+msgstr "安裝失敗；"
 
 #: ../gurpmi2:344
 #, c-format
@@ -336,63 +336,63 @@ msgstr "只有擁有管理者權限的使用者才能安裝套件"
 msgid "Running urpmi in restricted mode..."
 msgstr "以限制模式執行 urpmi..."
 
-#: ../urpm.pm:92
+#: ../urpm.pm:91
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
-#: ../urpm.pm:111
+#: ../urpm.pm:110
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:127
+#: ../urpm.pm:126
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:133
+#: ../urpm.pm:132
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在擷取 rpm 檔案 [%s] ..."
 
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
 
-#: ../urpm.pm:143
+#: ../urpm.pm:142
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpm.pm:148
+#: ../urpm.pm:147
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "無法解析 spec 檔案 %s [%s]"
 
-#: ../urpm.pm:158
+#: ../urpm.pm:157
 #, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
-#: ../urpm.pm:160
+#: ../urpm.pm:159
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "與 RPM 檔案 [%s] 不相容的硬體架構"
 
-#: ../urpm.pm:164
+#: ../urpm.pm:163
 #, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
-#: ../urpm.pm:260
+#: ../urpm.pm:259
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "使用限制模式執行時禁止該操作程序"
@@ -432,7 +432,7 @@ msgstr ""
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
 
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
@@ -457,7 +457,7 @@ msgstr "無法寫入設定檔 [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
@@ -587,7 +587,7 @@ msgstr "有多個套件具有相同的 rpm 檔名 \"%s\""
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "在值 \"%2$s\" 上無法正確解析 [%1$s]"
 
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的列表，忽略這個媒體"
@@ -722,331 +722,331 @@ msgstr "警告：在 MD5SUM 檔案中找不到 %s 的 md5sum"
 msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
 msgstr "計算來源 hdlist (或 synthesis) 的 md5sum"
 
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虛擬媒體 \"%s\" 不應該指定 hdlist 或列表檔案，忽略這個媒體"
 
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虛擬媒體 \"%s\" 應該有一個清楚的 url，忽略這個媒體"
 
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
 #, fuzzy, c-format
 msgid "invalid hdlist name"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "無法找到 \"%s\" 的列表檔案，忽略這個媒體"
 
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
 #, fuzzy, c-format
 msgid "\"synthesis\" should not be set (medium \"%s\")"
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
 #, fuzzy, c-format
 msgid "\"synthesis\" should be set (medium \"%s\")"
 msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
 
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的 hdlist 檔案，忽略這個媒體"
 
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
 #, fuzzy, c-format
 msgid "unable to access list file of \"%s\""
 msgstr "無法解析 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的 hdlist，忽略這個媒體"
 
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的列表，忽略這個媒體"
 
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "正在嘗試跳過已存在媒體  \"%s\"，正在跳過"
 
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移除式媒體 \"%s\" 的掛載點過多"
 
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "將可移除式裝置當成 \"%s\""
 
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr "媒體 \"%s\" 是一個光碟映像檔，將立即掛載起來"
 
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "使用不同的可移除式裝置 [%s] 於 \"%s\" "
 
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "無法擷取可移除式媒體 \"%s\" 的路徑名稱"
 
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
 #, c-format
 msgid "wrote %s"
 msgstr ""
 
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "寫入設定檔 [%s]"
 
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "無法於 use-distrib 模式下使用同步管理模式"
 
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "於同步管理模式使用相關連的媒體：%s"
 
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib or --parallel"
 msgstr ""
-"--synthesis 不能夠與 --media、--excludemedia、--sortmedia、--update 以及 --"
-"parallel 一起使用"
+"--synthesis 不能夠與 --media、--excludemedia、--sortmedia、--update、--use-"
+"distrib 以及 --parallel 一起使用"
 
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
 #, fuzzy, c-format
 msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜尋開始於：%s 結束於：%s"
 
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在進行第二個步驟，相依性的計算\n"
 
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
 #, c-format
 msgid "skipping package %s"
 msgstr "正在略過套件 %s"
 
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "將會安裝而非升級套件 %s"
 
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr "虛擬媒體必須在本地端"
 
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "正在讀取媒體 \"%s\" 的標頭"
 
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
 #, fuzzy, c-format
 msgid "unable to mount the distribution medium"
 msgstr "無法存取第一個安裝媒體"
 
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
 #, fuzzy, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "這個 url 看起來並沒有包含任何散佈套件"
 
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在擷取 media.cfg 檔案..."
 
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "無法解析 media.cfg"
 
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "無法存取第一個安裝媒體 (找不到 hdlists 檔案)"
 
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體：\"%s\""
 
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
 
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "重新設定失敗"
 
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新設定完成"
 
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成名稱檔案時發生錯誤：相依性 %d 沒有找到"
 
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr "生成名稱檔案時發生錯誤：無法寫入檔案 (%s)"
 
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "媒體 \"%s\" 沒有被選取"
 
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗 synthesis 檔案 [%s]"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在建立 hdlist [%s]"
 
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "無法為媒介 \"%s\" 建立 synthesis 檔。您的 hdlist 檔可能並不標準。"
 
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 hdlist 或 synthesis 檔案時發生問題"
 
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在寫入媒體 \"%s\" 的列表檔"
 
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案小得可疑)"
 
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在計算複製的來源 hdlist (或 synthesis) 的 md5sum"
 
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "複製 [%s] 失敗 (md5sum 不合)"
 
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在計算來源 hdlist (或 synthesis) 的 md5sum"
 
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
 #, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "...擷取失敗：md5sum 不合"
 
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "在 [%s] 內找不到 rpm 檔案"
 
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "由 [%s] 讀取 rpm 檔案"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "無法由 [%s] 讀取 rpm 套件：%s"
 
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
 #, c-format
 msgid "no rpms read"
 msgstr "沒有讀取到任何的 rpm"
 
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1056,78 +1056,79 @@ msgstr ""
 "無法存取媒體 \"%s\"，\n"
 "這可能是因為您建立媒體時是手動將這個目錄掛載到系統裡的。"
 
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在擷取 \"%s\" 的來源 hdlist (或 synthesis)..."
 
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
 
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的公鑰..."
 
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
 
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的公鑰"
 
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在寫入媒體 \"%s\" 的列表檔"
 
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "加入的媒體 %s"
 
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "無法解析 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
 
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在讀取媒體 \"%s\" 的標頭"
 
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
 #, c-format
 msgid "Nn"
 msgstr "Nn否"
 
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#. -PO: Add here the keys which might be pressed in the "Yes"-case.
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:549 ../urpmi:600 ../urpmi:677
+#: ../urpmi:755 ../urpmi.addmedia:130
 #, c-format
 msgid "Yy"
 msgstr "Yy是"
 
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "抱歉，選擇錯誤，請再試一次\n"
@@ -1182,47 +1183,47 @@ msgstr "自相矛盾的媒體 \"%s\" 標示為可移除但是事實上卻不是�
 msgid "unable to access medium \"%s\""
 msgstr "無法存取媒體 \"%s\" "
 
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
 #, c-format
 msgid "No package named %s"
 msgstr "沒有套件命名為 %s"
 
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s：%s"
 
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
 #, c-format
 msgid "due to missing %s"
 msgstr "由於遺失了 %s"
 
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於未滿足 %s"
 
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在試著促進 %s"
 
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %s"
 
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
 #, c-format
 msgid "in order to install %s"
 msgstr "為了要安裝 %s"
 
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "由於與 %s 發生衝突"
 
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
 #, c-format
 msgid "unrequested"
 msgstr "未被要求"
@@ -1365,24 +1366,30 @@ msgstr "沒有東西可移除"
 msgid "Checking to remove the following packages"
 msgstr "正在檢查以移除下列套件"
 
-#: ../urpme:132
+#: ../urpme:133
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "為了滿足相依性，下列 %d 個套件將被移除 (%d MB)"
+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:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "要移除這 %d 個套件嗎？"
 
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
 
-#: ../urpme:156
+#: ../urpme:159
 #, c-format
 msgid "Removal failed"
 msgstr "移除失敗"
@@ -1632,7 +1639,7 @@ msgstr "  --vendor       - 提供者\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 這個套件被找到的媒介\n"
 
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
@@ -1642,12 +1649,12 @@ msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式錯誤：您只能使用一個多值標籤"
 
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
-#: ../urpmf:226
+#: ../urpmf:223
 #, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1655,7 +1662,7 @@ msgid ""
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmf:227
+#: ../urpmf:224
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您或許想要使用 --name 參數來搜尋套件名稱。\n"
@@ -1940,7 +1947,7 @@ msgstr "  --nolock       - 不鎖定 RPM 資料庫。\n"
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 只升級相同平台的套件。\n"
 
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合的項目。\n"
@@ -2149,113 +2156,111 @@ msgstr ""
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:598
-#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "繼續安裝這 %d 個套件？(共 %d MB)"
-
-#: ../urpmi:599
-#, fuzzy, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "繼續安裝這 %d 個套件？(共 %d MB)"
+#: ../urpmi:597
+#, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "繼續安裝這 %d 個套件？"
 
 #: ../urpmi:623
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "準備好時請按 Enter..."
 
-#: ../urpmi:629
+#: ../urpmi:628
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:672
+#: ../urpmi:671
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "下列套件有不正確的簽章"
 
-#: ../urpmi:673
+#: ../urpmi:672
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列套件有不正確的簽章"
 
-#: ../urpmi:674
+#: ../urpmi:673
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續安裝嗎？"
 
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "安裝失敗"
+
+#: ../urpmi:711
 #, c-format
 msgid "distributing %s"
 msgstr "正在發佈 %s"
 
-#: ../urpmi:735
+#: ../urpmi:725
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../urpmi:737
+#: ../urpmi:727
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "安裝失敗；"
-
-#: ../urpmi:769
+#: ../urpmi:759
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
 
-#: ../urpmi:786
+#: ../urpmi:776
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
 
-#: ../urpmi:825
+#: ../urpmi:815
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d 個安裝程序失敗"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d 個安裝程序失敗"
 
-#: ../urpmi:834
+#: ../urpmi:825
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安裝"
 
-#: ../urpmi:839
+#: ../urpmi:830
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:847
+#: ../urpmi:838
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../urpmi:848
+#: ../urpmi:839
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../urpmi:851
+#: ../urpmi:842
 #, fuzzy, c-format
 msgid "Package %s can not be installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../urpmi:852
+#: ../urpmi:843
 #, fuzzy, c-format
 msgid "Packages %s can not be installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../urpmi:871
+#: ../urpmi:862
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
 
-#: ../urpmi.addmedia:36
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
+#: ../urpmi.addmedia:35
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
@@ -2499,8 +2504,9 @@ msgstr "正在清除重新打包目錄 [%s]...\n"
 
 #: ../urpmi.recover:72
 #, c-format
-msgid "%d files removed\n"
-msgstr "移除了 %d 個檔案\n"
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "移除了 %d 個檔案\n"
 
 #: ../urpmi.recover:82
 #, c-format
@@ -2782,119 +2788,118 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                   - 進階逆向搜尋 (包含虛擬套件)。\n"
 
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+"  --whatprovides, -p\n"
+"                   - search in provides to find package.\n"
+msgstr "  -p             - 於 provides 中搜尋套件。\n"
+
+#: ../urpmq:93
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 完整輸出要移除的套件。\n"
 
-#: ../urpmq:92
+#: ../urpmq:94
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 延伸套件相依性的查詢。\n"
 
-#: ../urpmq:94
+#: ../urpmq:96
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 顯示群組名稱。\n"
 
-#: ../urpmq:95
+#: ../urpmq:97
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人類可讀的形式顯示有用資訊。\n"
 
-#: ../urpmq:96
+#: ../urpmq:98
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出套件內包含的檔案。\n"
 
-#: ../urpmq:97
+#: ../urpmq:99
 #, fuzzy, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -q             - 安靜模式。\n"
 
-#: ../urpmq:98
-#, c-format
-msgid "  -p             - search in provides to find package.\n"
-msgstr "  -p             - 於 provides 中搜尋套件。\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 顯示名稱時一併顯示版本號與發行編號。\n"
 
-#: ../urpmq:100
+#: ../urpmq:101
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下個套件是原始碼套件 (與 --src 相同)。\n"
 
-#: ../urpmq:101
+#: ../urpmq:102
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 若已經安裝較新的版本則移除套件。\n"
 
-#: ../urpmq:102
+#: ../urpmq:103
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 加上模糊搜尋 (與 --fuzzy 相同)。\n"
 
-#: ../urpmq:103
+#: ../urpmq:104
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 類似 -y 參數，但強制比對大小寫。\n"
 
-#: ../urpmq:104
+#: ../urpmq:105
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  查詢命令列給予的套件名稱或 RPM 檔案。\n"
 
-#: ../urpmq:179
+#: ../urpmq:180
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
 
-#: ../urpmq:360
+#: ../urpmq:361
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
 msgstr ""
 
-#: ../urpmq:361
+#: ../urpmq:362
 #, fuzzy, c-format
 msgid "no hdlist for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:364
+#: ../urpmq:365
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 
-#: ../urpmq:365
+#: ../urpmq:366
 #, fuzzy, c-format
 msgid ""
 "no hdlist for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "沒有找到檔案列表\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
 #, c-format
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
+#~ msgid "No filelist found\n"
+#~ msgstr "沒有找到檔案列表\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr "為了滿足相依性，下列 %d 個套件將被移除 (%d MB)"
+
 #~ msgid "(%d packages, %d MB)"
 #~ msgstr "(%d 個套件，共 %d MB)"
 
-#, fuzzy
-#~ msgid "Proceed with the installation of 1 package? (%2$d MB)"
-#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-#~ msgstr[0] "繼續安裝這 %d 個套件？(共 %d MB)"
-
 #~ msgid ""
 #~ "  -P             - do not search in provides to find package (default).\n"
 #~ msgstr "  -P             - 不於 provides 中搜尋套件 (預設值)。\n"