sync with code

1 files changed, 292 insertions, 282 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0c41fb3e..95b1ae3d 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-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -42,7 +42,7 @@ msgstr "RPM 套件安裝"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "錯誤：無法找到檔案 %s，作業將取消"
 
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
@@ -108,7 +108,7 @@ msgstr "安裝 (_I)"
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
@@ -139,9 +139,8 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../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
+#: ../gurpmi.pm:46 ../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"
@@ -174,17 +173,17 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 RPM 檔案的簽章。\n"
 "                   (--no-verify-rpm 會停用它，預設值為啟用)。\n"
 
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允許於 provides 中搜尋套件。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 中搜尋套件。\n"
@@ -222,7 +221,22 @@ msgstr "請稍候..."
 msgid "Must be root"
 msgstr "必須擁有管理者權限"
 
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "正在發佈 %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "套件安裝..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "套件安裝..."
+
+#: ../gurpmi2:111
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -238,37 +252,37 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:170
 #, c-format
 msgid " (to upgrade)"
 msgstr " (升級用)"
 
-#: ../gurpmi2:172
+#: ../gurpmi2:171
 #, c-format
 msgid " (to install)"
 msgstr " (安裝用)"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:174
 #, c-format
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:176
+#: ../gurpmi2:175
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
-#: ../gurpmi2:200
+#: ../gurpmi2:199
 #, c-format
 msgid "_Abort"
 msgstr "放棄 (_A)"
 
-#: ../gurpmi2:222
+#: ../gurpmi2:221
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -279,60 +293,55 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "為了滿足相依性，將會一併安裝下列套件："
 
-#: ../gurpmi2:244
+#: ../gurpmi2:243
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 個套件，共 %d MB)"
 
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "套件安裝..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:270
+#: ../gurpmi2:269
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
 
-#: ../gurpmi2:298
+#: ../gurpmi2:297
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpmi2:324
+#: ../gurpmi2:323
 #, c-format
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,28 +352,28 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../gurpmi2:343
+#: ../gurpmi2:342
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:345
+#: ../gurpmi2:344
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -403,7 +412,7 @@ msgstr "                    預設為 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - 輸出 RPM 的完整名稱 (NVRA)\n"
 
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只有擁有管理者權限的使用者才能安裝套件"
@@ -413,134 +422,143 @@ msgstr "只有擁有管理者權限的使用者才能安裝套件"
 msgid "Running urpmi in restricted mode..."
 msgstr "以限制模式執行 urpmi..."
 
-#: ../urpm.pm:111
+#: ../urpm.pm:112
 #, c-format
 msgid "fail to create directory %s"
 msgstr "無法建立目錄 %s"
 
-#: ../urpm.pm:112
+#: ../urpm.pm:113
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "%s 目錄的擁有者無效"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:125
 #, fuzzy, c-format
 msgid "Can not download packages into %s"
 msgstr "無法寫入重新打包目錄 [%s]\n"
 
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "環境目錄 %s 不存在"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "正在 %s 上使用特定的環境\n"
+
+#: ../urpm.pm:305
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
-#: ../urpm.pm:288
+#: ../urpm.pm:319
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:294
+#: ../urpm.pm:325
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在擷取 rpm 檔案 [%s] ..."
 
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
 
-#: ../urpm.pm:304
+#: ../urpm.pm:335
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpm.pm:309
+#: ../urpm.pm:340
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "無法解析 spec 檔案 %s [%s]"
 
-#: ../urpm.pm:317
+#: ../urpm.pm:348
 #, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:350
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "與 RPM 檔案 [%s] 不相容的硬體架構"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:354
 #, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
-#: ../urpm.pm:410
+#: ../urpm.pm:441
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "使用限制模式執行時禁止該操作程序"
 
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "遺失簽名 (%s)"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目錄不存在"
 
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
 
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "複製失敗"
@@ -587,122 +605,122 @@ msgstr "媒體 '%s' 被定義了兩次，正在取消"
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
 
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s 無法使用，回到 %s"
+
+#: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr ""
 
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "請輸入您的憑證以使用代理伺服器\n"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "User name:"
 msgstr "用戶名稱："
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "Password:"
 msgstr "密碼："
 
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失敗：離開訊號 %d"
 
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
 #, c-format
 msgid "copy failed"
 msgstr "複製失敗"
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget 遺失了\n"
 
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl 遺失了\n"
 
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失敗：已取消下載\n"
 
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync 遺失了\n"
 
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh 遺失了\n"
 
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla 遺失了\n"
 
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "無法執行 prozilla\n"
 
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 遺失了\n"
 
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
 #, c-format
 msgid "retrieving %s"
 msgstr "正在取得 %s"
 
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
 #, c-format
 msgid "retrieved %s"
 msgstr ".已取得 %s"
 
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定義了未知的通訊協定"
 
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s 無法使用，回到 %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "沒有找到 webfetch，支援的 webfetch 有：%s\n"
 
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "無法處理通訊協定：%s"
@@ -722,58 +740,58 @@ msgstr "沒有找到套件 %s。"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
 
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
 #, c-format
 msgid "[repackaging]"
 msgstr "[正在重新打包]"
 
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已建立在 %s 上的安裝程序 (移除 = %d，安裝 = %d，升級 = %d)"
 
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
 #, c-format
 msgid "unable to create transaction"
 msgstr "無法建立安裝程序"
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "無法由 delta-rpm 套件包中取出套件 %s"
 
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
 #, c-format
 msgid "unable to install package %s"
 msgstr "無法安裝套件 %s"
 
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在由 %2$s 移除不良的 RPM (%1$s)"
 
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "移除 %s 失敗：%s"
 
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
 #, c-format
 msgid "Removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
 #, c-format
 msgid "removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在由 %2$s 移除已安裝的 RPM (%1$s)"
 
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
 #, c-format
 msgid "More information on package %s"
 msgstr "更多關於套件 %s 的資訊"
@@ -818,18 +836,18 @@ msgstr "放棄"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s 資料庫已被鎖定 (另一個程式已經在使用它了)"
 
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr ""
 
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -838,73 +856,63 @@ msgstr ""
 "安裝失敗，損毀的套件：\n"
 "%s"
 
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列套件有不正確的簽章"
 
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列套件有不正確的簽章"
 
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續安裝嗎？"
 
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "正在移除已安裝的套件 (%s)"
 
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
 #, c-format
 msgid "distributing %s"
 msgstr "正在發佈 %s"
 
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
 
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
 #, c-format
 msgid "Packages are up to date"
 msgstr "套件都已經更新了"
 
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安裝"
 
 #: ../urpm/md5sum.pm:26
 #, c-format
-msgid "examining %s file"
-msgstr "正在檢驗 %s 檔案"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：在 MD5SUM 檔案中找不到 %s 的 md5sum"
 
@@ -977,228 +985,228 @@ msgstr "將會安裝而非升級套件 %s"
 msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
 #, c-format
 msgid "(ignored by default)"
 msgstr "(預設為忽略)"
 
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在遠端媒體 \"%2$s\" 前新增媒體 \"%1$s\""
 
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "新增媒體 \"%s\""
 
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目錄 %s 不存在"
 
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "這個位置似乎並沒有包含任何散佈套件"
 
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "無法解析 media.cfg"
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "無法存取散佈媒體 (找不到 media.cfg 檔案)"
 
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在擷取 media.cfg 檔案..."
 
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體：\"%s\""
 
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
 
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "重新設定失敗"
 
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新設定完成"
 
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成名稱檔案時發生錯誤：相依性 %d 沒有找到"
 
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "媒體 \"%s\" 已經處於最新狀態"
 
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗 synthesis 檔案 [%s]"
 
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
 
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在複製媒體 \"%2$s\" 的 [%1$s]..."
 
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案小得可疑)"
 
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在計算來源 synthesis 的 md5sum"
 
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] 擷取失敗 (md5sum 不合)"
 
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
 #, c-format
 msgid "comparing %s and %s"
 msgstr "正在比對 %s 與 %s"
 
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的 MD5SUM 檔案..."
 
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm/media.pm:1461
-#, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "正在擷取 \"%s\" 的來源 synthesis..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
 #, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
 
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
 #, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "正在擷取 \"%s\" 的來源 synthesis..."
 
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的公鑰..."
 
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
 
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的公鑰"
 
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
+
+#: ../urpm/media.pm:1612
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新媒體 \"%s\""
 
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
 
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "無法從鏡像站列表 %s 找到鏡像站"
 
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "正由 %s 取得鏡像站列表"
 
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
 #, c-format
 msgid "Nn"
 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
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
@@ -1269,7 +1277,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1621,11 +1629,6 @@ msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式錯誤：您只能使用一個多值標籤"
 
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "正在 %s 上使用特定的環境\n"
-
 #: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
@@ -1641,118 +1644,136 @@ msgstr "媒體 \"%s\" 沒有可用的 synthesis"
 msgid "no xml-info available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 xml-info"
 
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
 #, c-format
 msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
 #, c-format
 msgid "No package named %s"
 msgstr "沒有套件命名為 %s"
 
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s：%s"
 
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "%s 套件無法安裝"
 
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Package %s is already installed"
 msgstr "%s 套件已經安裝了"
 
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "%s 套件已經安裝了"
 
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
 #, c-format
 msgid "due to missing %s"
 msgstr "由於遺失了 %s"
 
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
 #, c-format
 msgid "due to already installed %s"
 msgstr "由於已經安裝了 %s"
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於未滿足 %s"
 
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在試著促進 %s"
 
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %s"
 
 #: ../urpm/select.pm:607
 #, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"下列套件必須移除給其他套件來升級：\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"下列套件必須移除給其他套件來升級：\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
 msgid "in order to install %s"
 msgstr "為了要安裝 %s"
 
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "由於與 %s 發生衝突"
 
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "無效的簽名 (%s)"
 
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "無效的公鑰 ID (%s)"
 
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "遺失簽名 (%s)"
 
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
 #, c-format
 msgid "system"
 msgstr ""
 
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
 #, c-format
 msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, c-format
 msgid "Can't write file"
 msgstr "無法寫入檔案"
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, c-format
 msgid "Can't open file"
 msgstr "無法開啟檔案"
 
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "無法移動檔案 %s 至 %s"
@@ -1793,7 +1814,7 @@ msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在移除前重新打包檔案\n"
@@ -1822,7 +1843,7 @@ msgstr ""
 "  --use-distrib  - 立即由一個散佈套件樹設定 urpme，在搭配 --root 選項來安\n"
 "                   裝/移除一個 chroot 時很方便。\n"
 
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 詳細訊息模式。\n"
@@ -1882,7 +1903,7 @@ msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "要移除這 %d 個套件嗎？"
 
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
@@ -2135,17 +2156,22 @@ msgstr "  --ignorearch   - 允許安裝硬體架構不相符的 RPM 檔。\n"
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不執行套件中的命令稿\n"
 
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid "  --replacefiles - ignore file conflicts\n"
+msgstr "  --conflicts    - 衝突標籤\n"
+
+#: ../urpmi:143
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安裝時應該略過的套件\n"
 
-#: ../urpmi:143
+#: ../urpmi:144
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 應該要優先考慮的套件\n"
 
-#: ../urpmi:144
+#: ../urpmi:145
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2153,87 +2179,82 @@ msgid ""
 msgstr ""
 "  --more-choices - 當找到不只一個套件時，提供除了預設值之外的多個選擇。\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不鎖定 RPM 資料庫。\n"
 
-#: ../urpmi:147
+#: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 只升級相同平台的套件。\n"
 
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合的項目。\n"
 
-#: ../urpmi:151
+#: ../urpmi:152
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安靜模式。\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常詳細模式。\n"
 
-#: ../urpmi:154
+#: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  將會安裝於命令列指定的名稱或 RPM 檔案。\n"
 
-#: ../urpmi:182
+#: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "錯誤：無法與套件列表一起使用 --auto-select。\n"
 
-#: ../urpmi:189
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "錯誤：要生成一個臭蟲回報，請指定平常的命令列參數另外再加上 --bug。\n"
 
-#: ../urpmi:219
+#: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "當使用 --install-src 時您無法安裝二進制 RPM 檔案"
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid "You can't install spec files"
 msgstr "您無法安裝 spec 檔案"
 
-#: ../urpmi:227
+#: ../urpmi:228
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "--buildrequires 的預設值"
 
-#: ../urpmi:232
+#: ../urpmi:233
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "請使用 --buildrequires 或者 --install-src，預設為 --buildrequires"
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目錄 [%s] 已經存在，請指定另一個目錄給臭蟲回報或刪除它"
 
-#: ../urpmi:253
+#: ../urpmi:254
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
 
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "環境目錄 %s 不存在"
-
-#: ../urpmi:287
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2242,48 +2263,48 @@ msgstr ""
 "錯誤：%s 似乎被掛載為唯讀模式。\n"
 "使用 --allow-force 標籤來強制執行。"
 
-#: ../urpmi:361
+#: ../urpmi:349
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新媒體...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s：%s (升級用)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (升級用)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s：%s (安裝用)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (安裝用)"
 
-#: ../urpmi:462
+#: ../urpmi:450
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "為了滿足 '%s' 的相依性，需要下列套件之一："
 
-#: ../urpmi:465
+#: ../urpmi:453
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "您要選擇何者？ (1-%d) "
 
-#: ../urpmi:507
+#: ../urpmi:495
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2293,7 +2314,7 @@ msgstr ""
 "下列套件無法安裝，因為它需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:509
+#: ../urpmi:497
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2303,7 +2324,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
 #, c-format
 msgid ""
 "\n"
@@ -2312,12 +2333,12 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
 
-#: ../urpmi:524
+#: ../urpmi:512
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2326,7 +2347,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:525
+#: ../urpmi:513
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2335,12 +2356,12 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:542
+#: ../urpmi:530
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpmi:551
+#: ../urpmi:538
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2350,7 +2371,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:540
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2360,30 +2381,12 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"下列套件必須移除給其他套件來升級：\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"下列套件必須移除給其他套件來升級：\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(僅測試，移除動作並不會真的執行)"
 
-#: ../urpmi:583
+#: ../urpmi:568
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2393,44 +2396,44 @@ msgstr ""
 "您必須先呼叫 urpmi --buildrequires 來安裝下列相依性套件：\n"
 "%s\n"
 
-#: ../urpmi:594
+#: ../urpmi:579
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpmi:610
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:616
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "將使用 %s 額外磁碟空間。"
 
-#: ../urpmi:617
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "將釋放 %s 磁碟空間。"
 
-#: ../urpmi:618
+#: ../urpmi:603
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "將取得 %s 軟體套件。"
 
-#: ../urpmi:619
+#: ../urpmi:604
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../urpmi:640
+#: ../urpmi:625
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:648
+#: ../urpmi:633
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "掛載好後請按 Enter..."
@@ -3159,6 +3162,13 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
+#~ msgid "examining %s file"
+#~ msgstr "正在檢驗 %s 檔案"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
+
 #~ msgid "  --update       - create an update medium.\n"
 #~ msgstr "  --update       - 建立更新的媒體。\n"