sync with code

1 files changed, 87 insertions, 82 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 166499d8..7d3091fd 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: 2012-02-13 11:06+0100\n"
+"POT-Creation-Date: 2012-02-27 21:09+0100\n"
 "PO-Revision-Date: 2008-11-01 10:40+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -43,7 +43,7 @@ msgstr "RPM 套件安裝"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "錯誤：無法找到檔案 %s，作業將取消"
 
-#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
+#: ../gurpmi:47 ../gurpmi2:196 ../gurpmi2:221
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
@@ -109,7 +109,7 @@ msgstr "安裝 (_I)"
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:101 ../gurpmi2:187
+#: ../gurpmi:101 ../gurpmi2:196
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
@@ -237,7 +237,16 @@ msgstr "套件安裝"
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../gurpmi2:111
+#: ../gurpmi2:112 ../urpmi:509
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
+"某些要求的套件無法安裝：\n"
+"%s"
+
+#: ../gurpmi2:120
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -248,42 +257,42 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:155
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:146 ../urpmi:626
+#: ../gurpmi2:155 ../urpmi:632
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../gurpmi2:183
+#: ../gurpmi2:192
 #, c-format
 msgid " (to upgrade)"
 msgstr " (升級用)"
 
-#: ../gurpmi2:184
+#: ../gurpmi2:193
 #, c-format
 msgid " (to install)"
 msgstr " (安裝用)"
 
-#: ../gurpmi2:187
+#: ../gurpmi2:196
 #, c-format
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:188
+#: ../gurpmi2:197
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
-#: ../gurpmi2:213
+#: ../gurpmi2:222
 #, c-format
 msgid "_Abort"
 msgstr "放棄 (_A)"
 
-#: ../gurpmi2:248
+#: ../gurpmi2:257
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -294,62 +303,62 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:267 ../urpmi:593
+#: ../gurpmi2:276 ../urpmi:599
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:268 ../urpmi:594
+#: ../gurpmi2:277 ../urpmi:600
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "為了滿足相依性，將會一併安裝下列套件："
 
-#: ../gurpmi2:270
+#: ../gurpmi2:279
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 個套件，共 %d MB)"
 
-#: ../gurpmi2:278 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:310 ../urpm/install.pm:81
+#: ../gurpmi2:319 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:316
+#: ../gurpmi2:325
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:334 ../urpmi:621
+#: ../gurpmi2:343 ../urpmi:627
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
 
-#: ../gurpmi2:348
+#: ../gurpmi2:357
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpmi2:360 ../urpm.pm:334 ../urpm/download.pm:831
+#: ../gurpmi2:369 ../urpm.pm:338 ../urpm/download.pm:831
 #: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
 #: ../urpm/media.pm:1644
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
 
-#: ../gurpmi2:376
+#: ../gurpmi2:385
 #, c-format
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:393
+#: ../gurpmi2:402
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -360,27 +369,27 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:399 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../gurpmi2:404
+#: ../gurpmi2:413
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:406
+#: ../gurpmi2:415
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:407 ../urpme:169
+#: ../gurpmi2:416 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:415 ../urpmi:686
+#: ../gurpmi2:427 ../urpmi:695
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -429,77 +438,82 @@ msgstr "只有擁有管理者權限的使用者才能安裝套件"
 msgid "Running urpmi in restricted mode..."
 msgstr "以限制模式執行 urpmi..."
 
-#: ../urpm.pm:106
+#: ../urpm.pm:23
+#, c-format
+msgid "While some packages may have been installed, there were failures.\n"
+msgstr ""
+
+#: ../urpm.pm:110
 #, c-format
 msgid "fail to create directory %s"
 msgstr "無法建立目錄 %s"
 
-#: ../urpm.pm:107
+#: ../urpm.pm:111
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "%s 目錄的擁有者無效"
 
-#: ../urpm.pm:131
+#: ../urpm.pm:135
 #, c-format
 msgid "Can not download packages into %s"
 msgstr "無法下載套件至 %s"
 
-#: ../urpm.pm:146
+#: ../urpm.pm:150
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "環境目錄 %s 不存在"
 
-#: ../urpm.pm:147 ../urpmf:248 ../urpmq:167
+#: ../urpm.pm:151 ../urpmf:248 ../urpmq:167
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
-#: ../urpm.pm:309
+#: ../urpm.pm:313
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:327
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:329
+#: ../urpm.pm:333
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在擷取 rpm 檔案 [%s] ..."
 
-#: ../urpm.pm:331 ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:335 ../urpm/get_pkgs.pm:260
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:339
+#: ../urpm.pm:343
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpm.pm:344
+#: ../urpm.pm:348
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "無法解析 spec 檔案 %s [%s]"
 
-#: ../urpm.pm:352
+#: ../urpm.pm:356
 #, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:358
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "與 RPM 檔案 [%s] 不相容的硬體架構"
 
-#: ../urpm.pm:358
+#: ../urpm.pm:362
 #, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
-#: ../urpm.pm:446
+#: ../urpm.pm:450
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "使用限制模式執行時禁止該操作程序"
@@ -509,52 +523,52 @@ msgstr "使用限制模式執行時禁止該操作程序"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 
-#: ../urpm/args.pm:306
+#: ../urpm/args.pm:307
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm/args.pm:381
+#: ../urpm/args.pm:384
 #, c-format
 msgid "unexpected expression %s"
 msgstr "未預期的表示式 %s"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:385
 #, c-format
 msgid "missing expression before %s"
 msgstr "在 %s 前找不到表示式"
 
-#: ../urpm/args.pm:388
+#: ../urpm/args.pm:391
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "非預期的表示式 %s（建議：使用 -a 或 -o？）"
 
-#: ../urpm/args.pm:392
+#: ../urpm/args.pm:395
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:401
+#: ../urpm/args.pm:404
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "預設 urpmf 需要正規表示式。您應該使用 \"--literal\" 選項"
 
-#: ../urpm/args.pm:475
+#: ../urpm/args.pm:478
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目錄不存在"
 
-#: ../urpm/args.pm:498
+#: ../urpm/args.pm:501
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "使用 %s 時不能沒有 %s"
 
-#: ../urpm/args.pm:501 ../urpm/args.pm:504 ../urpmq:159
+#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:159
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s 不能跟 %s 一起用"
 
-#: ../urpm/args.pm:512
+#: ../urpm/args.pm:515
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
@@ -1250,7 +1264,7 @@ msgstr "找到 geolocalisation %s %.2f %.2f，於時區 %s"
 msgid "getting mirror list from %s"
 msgstr "正由 %s 取得鏡像站列表"
 
-#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:510 ../urpmi:613
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:619
 #, c-format
 msgid "Nn"
 msgstr "Nn否"
@@ -1564,17 +1578,17 @@ msgstr "您需要重新啟動工作階段，因為 %s"
 msgid "You should restart %s for %s"
 msgstr "您需要重新啟動 %s，因為 %s"
 
-#: ../urpm/sys.pm:331
+#: ../urpm/sys.pm:352
 #, c-format
 msgid "Can't write file"
 msgstr "無法寫入檔案"
 
-#: ../urpm/sys.pm:331
+#: ../urpm/sys.pm:352
 #, c-format
 msgid "Can't open file"
 msgstr "無法開啟檔案"
 
-#: ../urpm/sys.pm:344
+#: ../urpm/sys.pm:365
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "無法移動檔案 %s 至 %s"
@@ -2406,7 +2420,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:496 ../urpmi:511
+#: ../urpmi:496 ../urpmi:514
 #, c-format
 msgid ""
 "\n"
@@ -2415,12 +2429,12 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:497 ../urpmi:512 ../urpmi:614 ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:620 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
 
-#: ../urpmi:505
+#: ../urpmi:508
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2429,21 +2443,12 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:506
-#, c-format
-msgid ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr ""
-"某些要求的套件無法安裝：\n"
-"%s"
-
-#: ../urpmi:523
+#: ../urpmi:529
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpmi:531
+#: ../urpmi:537
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2453,7 +2458,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:533
+#: ../urpmi:539
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2463,12 +2468,12 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:541
+#: ../urpmi:547
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(僅測試，移除動作並不會真的執行)"
 
-#: ../urpmi:560
+#: ../urpmi:566
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2478,44 +2483,44 @@ msgstr ""
 "您必須先呼叫 urpmi --buildrequires 來安裝下列相依性套件：\n"
 "%s\n"
 
-#: ../urpmi:570
+#: ../urpmi:576
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
 
-#: ../urpmi:596
+#: ../urpmi:602
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(僅測試，安裝動作並不會真的執行)"
 
-#: ../urpmi:602
+#: ../urpmi:608
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "將使用 %s 額外磁碟空間。"
 
-#: ../urpmi:603
+#: ../urpmi:609
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "將釋放 %s 磁碟空間。"
 
-#: ../urpmi:604
+#: ../urpmi:610
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "將取得 %s 軟體套件。"
 
-#: ../urpmi:605
+#: ../urpmi:611
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "繼續安裝這 %d 個套件？"
 
-#: ../urpmi:626
+#: ../urpmi:632
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:634
+#: ../urpmi:640
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "掛載好後請按 Enter..."