* huge merge to bring the apt debian-sid and ubuntu branches as close

  as possible to apt--mvo again

1 files changed, 342 insertions, 257 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3b1329fab..2b1918791 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-08 11:03+0200\n"
+"POT-Creation-Date: 2007-06-07 00:57+0200\n"
 "PO-Revision-Date: 2006-10-21 16:58+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -16,145 +16,155 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:135
+#: cmdline/apt-cache.cc:143
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "套件 %s 版本 %s 有未解決的相依問題:\n"
 
-#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
-#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
-#: cmdline/apt-cache.cc:1508
+#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
+#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "無法找出套件 %s 的位置"
 
-#: cmdline/apt-cache.cc:232
+#: cmdline/apt-cache.cc:247
 msgid "Total package names : "
 msgstr "所有套件的名稱"
 
-#: cmdline/apt-cache.cc:272
+#: cmdline/apt-cache.cc:287
 msgid "  Normal packages: "
 msgstr "  普通套件："
 
-#: cmdline/apt-cache.cc:273
+#: cmdline/apt-cache.cc:288
 msgid "  Pure virtual packages: "
 msgstr "  虛擬套件："
 
-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:289
 msgid "  Single virtual packages: "
 msgstr "  單虛擬套件："
 
-#: cmdline/apt-cache.cc:275
+#: cmdline/apt-cache.cc:290
 msgid "  Mixed virtual packages: "
 msgstr "  混合虛擬套件："
 
-#: cmdline/apt-cache.cc:276
+#: cmdline/apt-cache.cc:291
 msgid "  Missing: "
 msgstr "  失蹤："
 
-#: cmdline/apt-cache.cc:278
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct versions: "
 msgstr "所有不同版本"
 
-#: cmdline/apt-cache.cc:280
+#: cmdline/apt-cache.cc:295
+#, fuzzy
+msgid "Total Distinct Descriptions: "
+msgstr "所有不同版本"
+
+#: cmdline/apt-cache.cc:297
 msgid "Total dependencies: "
 msgstr "所有依存關係："
 
-#: cmdline/apt-cache.cc:283
+#: cmdline/apt-cache.cc:300
 msgid "Total ver/file relations: "
 msgstr "所有版本/檔案關聯："
 
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:302
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "所有版本/檔案關聯："
+
+#: cmdline/apt-cache.cc:304
 msgid "Total Provides mappings: "
 msgstr "所有提供套件對應："
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:316
 msgid "Total globbed strings: "
 msgstr "Glob 字串共計:"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:330
 msgid "Total dependency version space: "
 msgstr "所有相依版本空間:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:335
 msgid "Total slack space: "
 msgstr "Slack 空間共計:"
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:343
 msgid "Total space accounted for: "
 msgstr "所有統計後的空間:"
 
-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "套件檔案 %s 已失去同步。"
 
-#: cmdline/apt-cache.cc:1231
+#: cmdline/apt-cache.cc:1293
 msgid "You must give exactly one pattern"
 msgstr "您必須給定一完整的樣式"
 
-#: cmdline/apt-cache.cc:1385
+#: cmdline/apt-cache.cc:1447
 msgid "No packages found"
 msgstr "未找到套件"
 
-#: cmdline/apt-cache.cc:1462
+#: cmdline/apt-cache.cc:1524
 msgid "Package files:"
 msgstr "套件檔案:"
 
-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "快取資料同步過時,無法 x-ref 套件檔案"
 
-#: cmdline/apt-cache.cc:1470
+#: cmdline/apt-cache.cc:1532
 #, c-format
 msgid "%4i %s\n"
 msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1482
+#: cmdline/apt-cache.cc:1544
 msgid "Pinned packages:"
 msgstr "鎖定的套件:"
 
-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
 msgid "(not found)"
 msgstr "(未找到)"
 
 #. Installed version
-#: cmdline/apt-cache.cc:1515
+#: cmdline/apt-cache.cc:1577
 msgid "  Installed: "
 msgstr "已安裝:"
 
-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
 msgid "(none)"
 msgstr "(沒有)"
 
 #. Candidate Version
-#: cmdline/apt-cache.cc:1522
+#: cmdline/apt-cache.cc:1584
 msgid "  Candidate: "
 msgstr "  候選:"
 
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1594
 msgid "  Package pin: "
 msgstr "  套件鎖定: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1541
+#: cmdline/apt-cache.cc:1603
 msgid "  Version table:"
 msgstr "  版本表格:"
 
-#: cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1618
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2564 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
 
-#: cmdline/apt-cache.cc:1659
+#: cmdline/apt-cache.cc:1721
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -301,7 +311,7 @@ msgstr ""
 "  -c=? 讀取指定的設定檔案\n"
 "  -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819
 #, c-format
 msgid "Unable to write to %s"
 msgstr "無法寫入『%s』。"
@@ -638,79 +648,79 @@ msgstr "在 unlink %s 時出錯"
 msgid "Failed to rename %s to %s"
 msgstr "無法將 %s 更名為 %s"
 
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示法出錯 - %s"
 
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
 msgid "The following packages have unmet dependencies:"
 msgstr "下列的套件有無法滿足的依存關係："
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
 #, c-format
 msgid "but %s is installed"
 msgstr "但是『%s』卻已經安裝好了。"
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是『%s』卻將被安裝。"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
 msgid "but it is not installable"
 msgstr "但是它卻無法安裝。"
 
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
 msgid "but it is a virtual package"
 msgstr "但是它只是虛擬的套件"
 
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
 msgid "but it is not installed"
 msgstr "但是『』卻還沒有安裝。"
 
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
 msgid "but it is not going to be installed"
 msgstr "但是它卻不會被安裝。"
 
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
 msgid " or"
 msgstr "或"
 
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
 msgid "The following NEW packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
 msgid "The following packages will be REMOVED:"
 msgstr "下列的套件都將被【刪除】："
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
 msgid "The following packages have been kept back:"
 msgstr "下列的套件都將維持舊版本:"
 
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
 msgid "The following packages will be upgraded:"
 msgstr "下列的套件都將更新:"
 
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列的套件都將被「降級」:"
 
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
 msgid "The following held packages will be changed:"
 msgstr "下列押後的套件都將被更改："
 
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s（因為 %s）"
 
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -718,143 +728,143 @@ msgstr ""
 "警告：下列的基本套件都將被移除。\n"
 "除非您很清楚在做什麼，請勿輕易嘗試。"
 
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "更新 %lu 個套件，新安裝 %lu 個套件，"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安裝 %lu 個套件，"
 
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降 %lu 個套件的版，"
 
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n"
 
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n"
 
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:664
 msgid "Correcting dependencies..."
 msgstr "更正依存關係中..."
 
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:667
 msgid " failed."
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:670
 msgid "Unable to correct dependencies"
 msgstr "無法更正依存關係。"
 
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:673
 msgid "Unable to minimize the upgrade set"
 msgstr "無法最小化升級的套件集合"
 
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:675
 msgid " Done"
 msgstr " 完成"
 
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:679
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:682
 msgid "Unmet dependencies. Try using -f."
 msgstr "無法滿足相依關係。試試看 -f 選項。"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:704
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告：下列的套件驗證失敗！"
 
-#: cmdline/apt-get.cc:693
+#: cmdline/apt-get.cc:708
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了認證警告。\n"
 
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:715
 msgid "Install these packages without verification [y/N]? "
 msgstr "不驗證這些套件就直接安裝？[y/N]"
 
-#: cmdline/apt-get.cc:702
+#: cmdline/apt-get.cc:717
 msgid "Some packages could not be authenticated"
 msgstr "部份套件無法驗證"
 
-#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
 msgid "There are problems and -y was used without --force-yes"
 msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
 
-#: cmdline/apt-get.cc:755
+#: cmdline/apt-get.cc:770
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！"
 
-#: cmdline/apt-get.cc:764
+#: cmdline/apt-get.cc:779
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有套件需要被移除,但移除動作被禁止。"
 
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:790
 msgid "Internal error, Ordering didn't finish"
 msgstr "內部錯誤，Ordering didn't finish"
 
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載的目錄"
 
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源單。"
 
-#: cmdline/apt-get.cc:816
+#: cmdline/apt-get.cc:831
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧"
 
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:836
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n"
 
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下載 %sB 的檔案。\n"
 
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:844
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "解壓縮後將消耗 %sB 的空間。\n"
 
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:847
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解壓縮後將空出 %sB 的空間。\n"
 
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s 無法足夠的空間。"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:864
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "『%s』內沒有足夠的空間。"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。"
 
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:881
 msgid "Yes, do as I say!"
 msgstr "是的,請執行我所指定的"
 
-#: cmdline/apt-get.cc:868
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -865,28 +875,28 @@ msgstr ""
 "若要繼續的話,就輸入下面的句子“%s”\n"
 " ?] "
 
-#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
 msgid "Abort."
 msgstr "放棄執行。"
 
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:904
 msgid "Do you want to continue [Y/n]? "
 msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
 
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法下載『%s』檔案。%s\n"
 
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:994
 msgid "Some files failed to download"
 msgstr "部份檔案無法下載"
 
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218
 msgid "Download complete and in download only mode"
 msgstr "下載完畢,目前是“僅下載”模式"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1001
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -894,47 +904,47 @@ msgstr ""
 "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n"
 "選項?"
 
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:1005
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)"
 
-#: cmdline/apt-get.cc:995
+#: cmdline/apt-get.cc:1010
 msgid "Unable to correct missing packages."
 msgstr "無法更正遺失的套件。"
 
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:1011
 msgid "Aborting install."
 msgstr "放棄安裝。"
 
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1045
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意,選擇了 %s 而非 %s\n"
 
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n"
 
-#: cmdline/apt-get.cc:1058
+#: cmdline/apt-get.cc:1073
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "套件『%s』沒有安裝，所以無法刪除。\n"
 
-#: cmdline/apt-get.cc:1069
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "虛擬套件『%s』的提供者是：\n"
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1096
 msgid " [Installed]"
 msgstr "【已安裝】"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1101
 msgid "You should explicitly select one to install."
 msgstr "請您明確地選擇一個來進行安裝。"
 
-#: cmdline/apt-get.cc:1091
+#: cmdline/apt-get.cc:1106
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -945,73 +955,113 @@ msgstr ""
 "這可能意味著這個套件已經消失或捨棄,\n"
 "或者只能在其他原碼中找到\n"
 
-#: cmdline/apt-get.cc:1110
+#: cmdline/apt-get.cc:1125
 msgid "However the following packages replace it:"
 msgstr "但是下列的套件將取代它："
 
-#: cmdline/apt-get.cc:1113
+#: cmdline/apt-get.cc:1128
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "套件 %s 還沒有可供安裝的候選版本"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安裝 %s,因為無法下載它。\n"
 
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "『%s』已經是最新版本了。\n"
 
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1185
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”發布版本"
 
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1187
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
-#: cmdline/apt-get.cc:1176
+#: cmdline/apt-get.cc:1193
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "選定的版本為 %s (%s) 的 %s\n"
 
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1330
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1343
 msgid "Unable to lock the list directory"
 msgstr "無法鎖定列表目錄"
 
-#: cmdline/apt-get.cc:1384
+#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1433
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1465
+#, fuzzy
+msgid ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr "下列的【新】套件都將被安裝："
+
+#: cmdline/apt-get.cc:1467
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1472
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1736
+msgid "The following information may help to resolve the situation:"
+msgstr "底下的資訊有助於解決現在的情況:"
+
+#: cmdline/apt-get.cc:1479
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "內部錯誤，problem resolver 處理失敗"
+
+#: cmdline/apt-get.cc:1498
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤,AllUpgrade 造成錯誤"
 
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1543
+#, fuzzy, c-format
+msgid "Couldn't find task %s"
+msgstr "無法找到 %s 套件。"
+
+#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到 %s 套件。"
 
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1665
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
 
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1695
+#, fuzzy, c-format
+msgid "%s set to manual installed.\n"
+msgstr "但是『%s』卻將被安裝。"
+
+#: cmdline/apt-get.cc:1708
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1711
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1019,7 +1069,7 @@ msgstr ""
 "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
 "定一個解決辦法)。"
 
-#: cmdline/apt-get.cc:1561
+#: cmdline/apt-get.cc:1723
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1030,7 +1080,7 @@ msgstr ""
 "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
 "或從 Incoming 目錄移除。"
 
-#: cmdline/apt-get.cc:1569
+#: cmdline/apt-get.cc:1731
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1040,126 +1090,122 @@ msgstr ""
 "該套件無法安裝,您最好提交一個針對這個套件\n"
 "的臭蟲報告。"
 
-#: cmdline/apt-get.cc:1574
-msgid "The following information may help to resolve the situation:"
-msgstr "底下的資訊有助於解決現在的情況:"
-
-#: cmdline/apt-get.cc:1577
+#: cmdline/apt-get.cc:1739
 msgid "Broken packages"
 msgstr "損毀的套件"
 
-#: cmdline/apt-get.cc:1603
+#: cmdline/apt-get.cc:1770
 msgid "The following extra packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1859
 msgid "Suggested packages:"
 msgstr "建議(Suggested)的套件:"
 
-#: cmdline/apt-get.cc:1693
+#: cmdline/apt-get.cc:1860
 msgid "Recommended packages:"
 msgstr "推薦(Recommended)的套件:"
 
-#: cmdline/apt-get.cc:1713
+#: cmdline/apt-get.cc:1888
 msgid "Calculating upgrade... "
 msgstr "籌畫升級套件中..."
 
-#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:1721
+#: cmdline/apt-get.cc:1896
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
+#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971
 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，problem resolver 處理失敗"
 
-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:2071
 msgid "Must specify at least one package to fetch source for"
 msgstr "必須指定至少一個對應的套件才能下載源碼"
 
-#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
+#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 套件的源碼"
 
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2145
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "略過已被下載的檔案“%s”\n"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2169
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "『%s』內沒有足夠的空間。"
 
-#: cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:2174
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
 
-#: cmdline/apt-get.cc:2000
+#: cmdline/apt-get.cc:2177
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始檔案。\n"
 
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2183
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下載源碼 %s\n"
 
-#: cmdline/apt-get.cc:2037
+#: cmdline/apt-get.cc:2214
 msgid "Failed to fetch some archives."
 msgstr "無法下載某些檔案。"
 
-#: cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:2242
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
 
-#: cmdline/apt-get.cc:2077
+#: cmdline/apt-get.cc:2254
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "執行解開套件指令 '%s' 時失敗。\n"
 
-#: cmdline/apt-get.cc:2078
+#: cmdline/apt-get.cc:2255
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "請檢查是否安裝了“dpkg-dev”套件。\n"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2272
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "執行建立套件指令 '%s' 時失敗。\n"
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2291
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2307
 msgid "Must specify at least one package to check builddeps for"
 msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
 
-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2335
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的建構相依關係。"
 
-#: cmdline/apt-get.cc:2178
+#: cmdline/apt-get.cc:2355
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 無建立相依關係訊息。\n"
 
-#: cmdline/apt-get.cc:2230
+#: cmdline/apt-get.cc:2407
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2459
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1168,30 +1214,30 @@ msgstr ""
 "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
 "相依關係"
 
-#: cmdline/apt-get.cc:2317
+#: cmdline/apt-get.cc:2494
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2519
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
 
-#: cmdline/apt-get.cc:2356
+#: cmdline/apt-get.cc:2533
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 所要求的建構相依關係。"
 
-#: cmdline/apt-get.cc:2360
+#: cmdline/apt-get.cc:2537
 msgid "Failed to process build dependencies"
 msgstr "無法處理建構相依關係"
 
-#: cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:2569
 msgid "Supported modules:"
 msgstr "支援模組:"
 
-#: cmdline/apt-get.cc:2433
+#: cmdline/apt-get.cc:2610
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1527,9 +1573,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr "資料目錄與暫存目錄需在同一檔案系統"
 
 #. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752
+#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
+#: apt-pkg/pkgcachegen.cc:949
 msgid "Reading package lists"
 msgstr "讀取套件清單中"
 
@@ -1662,11 +1708,12 @@ msgid "File not found"
 msgstr "找不到檔案"
 
 #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150
+#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
 msgid "Failed to stat"
 msgstr "無法讀取資料"
 
 #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/rred.cc:240
 msgid "Failed to set modification time"
 msgstr "日期更新失敗"
 
@@ -1792,7 +1839,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法允許連線"
 
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "問題雜湊表"
 
@@ -1923,76 +1970,76 @@ msgstr "無法開啟管線給 %s 使用"
 msgid "Read error from %s process"
 msgstr "從 %s 進程讀取錯誤"
 
-#: methods/http.cc:377
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "等待標頭"
 
-#: methods/http.cc:523
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 
-#: methods/http.cc:531
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "壞的標頭"
 
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http 伺服器傳送一個無效的回覆標頭"
 
-#: methods/http.cc:586
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
 
-#: methods/http.cc:601
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
 
-#: methods/http.cc:603
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "http 伺服器有損毀的範圍支援"
 
-#: methods/http.cc:627
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
-#: methods/http.cc:774
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Select 失敗"
 
-#: methods/http.cc:779
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:802
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "寫入輸出檔時發生錯誤"
 
-#: methods/http.cc:833
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "寫入檔案時發生錯誤"
 
-#: methods/http.cc:861
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "寫入檔案時發生錯誤"
 
-#: methods/http.cc:875
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "從遠端主機讀取錯誤，關閉連線"
 
-#: methods/http.cc:877
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "從伺服器讀取發生錯誤"
 
-#: methods/http.cc:1108
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "壞的標頭資料"
 
-#: methods/http.cc:1125
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/http.cc:1216
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "內部錯誤"
 
@@ -2005,7 +2052,7 @@ msgstr "不能將空白檔案讀入記憶體"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "無法讀入檔案 %lu 位元組至記憶體"
 
-#: apt-pkg/contrib/strutl.cc:938
+#: apt-pkg/contrib/strutl.cc:981
 #, c-format
 msgid "Selection %s not found"
 msgstr "選項『%s』找不到。"
@@ -2202,87 +2249,106 @@ msgstr "程式刪除檔案"
 msgid "Problem syncing the file"
 msgstr "程式同步檔案"
 
-#: apt-pkg/pkgcache.cc:126
+#: apt-pkg/pkgcache.cc:132
 msgid "Empty package cache"
 msgstr "套件暫存檔是空的。"
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:138
 msgid "The package cache file is corrupted"
 msgstr "套件暫存檔損壞。"
 
-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:143
 msgid "The package cache file is an incompatible version"
 msgstr "套件暫存檔版本不符合。"
 
-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:148
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本軟體不支持『%s』版本系統。"
 
-#: apt-pkg/pkgcache.cc:147
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache was built for a different architecture"
 msgstr "套件暫存檔是在另一種系統上產生的。"
 
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
 msgid "Depends"
 msgstr "依存關係"
 
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
 msgid "PreDepends"
 msgstr "特別依存關係"
 
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
 msgid "Suggests"
 msgstr "建議"
 
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
 msgid "Recommends"
 msgstr "推薦"
 
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
 msgid "Conflicts"
 msgstr "衝突"
 
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
 msgid "Replaces"
 msgstr "取代"
 
-#: apt-pkg/pkgcache.cc:220
+#: apt-pkg/pkgcache.cc:226
 msgid "Obsoletes"
 msgstr "淘汰"
 
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:237
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:237
 msgid "required"
 msgstr "必要"
 
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:237
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:238
 msgid "optional"
 msgstr "次要"
 
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:238
 msgid "extra"
 msgstr "添加"
 
-#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127
 msgid "Building dependency tree"
 msgstr "了解套件依存關係中"
 
-#: apt-pkg/depcache.cc:62
+#: apt-pkg/depcache.cc:99
 msgid "Candidate versions"
 msgstr "候選版本"
 
-#: apt-pkg/depcache.cc:91
+#: apt-pkg/depcache.cc:128
 msgid "Dependency generation"
 msgstr "產生套件依存關係"
 
+#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
+#, fuzzy
+msgid "Reading state information"
+msgstr "結合現有資料中"
+
+#: apt-pkg/depcache.cc:196
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 %s"
+
+#: apt-pkg/depcache.cc:202
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "寫入檔案 %s 失敗"
+
 #: apt-pkg/tagfile.cc:106
 #, c-format
 msgid "Unable to parse package file %s (1)"
@@ -2323,7 +2389,7 @@ msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。"
 msgid "Opening %s"
 msgstr "開啟『%s』中"
 
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "來源檔『%2$s』第 %1$u 行太長。"
@@ -2343,7 +2409,7 @@ msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。"
 
-#: apt-pkg/packagemanager.cc:402
+#: apt-pkg/packagemanager.cc:403
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2358,19 +2424,19 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "本軟體不支持『%s』型的索引檔。"
 
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:248
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。"
 
-#: apt-pkg/algorithms.cc:1066
+#: apt-pkg/algorithms.cc:1104
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr "無法解決依存關係。可能原因是某些套件被押後。"
 
-#: apt-pkg/algorithms.cc:1068
+#: apt-pkg/algorithms.cc:1106
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法解決問題，因為某些損毀的套件被押後。"
 
@@ -2406,17 +2472,17 @@ msgstr "找不到安裝方式『%s』的驅動程式。"
 msgid "Method %s did not start correctly"
 msgstr "安裝方式『%s』沒有正確啟動。"
 
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。"
 
-#: apt-pkg/init.cc:120
+#: apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "本軟體不支持『%s』包裝法。"
 
-#: apt-pkg/init.cc:136
+#: apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr "無法明白系統類別。"
 
@@ -2450,119 +2516,135 @@ msgstr "本軟體不支持『%s』型的版本釘子。"
 msgid "No priority (or zero) specified for pin"
 msgstr "對於釘住的檔案無優先順序"
 
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
 msgid "Cache has an incompatible versioning system"
 msgstr "套件暫存檔使用的是不相容的版本系統。"
 
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "處理『%s』時發生錯誤 (NewPackage)。"
 
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:134
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "處理『%s』時發生錯誤 (UsePackage1)。"
 
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:157
+#, fuzzy, c-format
+msgid "Error occured while processing %s (NewFileDesc1)"
+msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
+
+#: apt-pkg/pkgcachegen.cc:182
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "處理『%s』時發生錯誤 (UsePackage2)。"
 
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:186
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
 
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:217
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "處理『%s』時發生錯誤 (NewVersion1)。"
 
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:221
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "處理『%s』時發生錯誤 (UsePackage3)。"
 
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:225
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "處理『%s』時發生錯誤 (NewVersion2)。"
 
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:249
+#, fuzzy, c-format
+msgid "Error occured while processing %s (NewFileDesc2)"
+msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
+
+#: apt-pkg/pkgcachegen.cc:255
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "套件數量超過本程式的能力。"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:258
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "套件版本數量超過本程式的能力。"
 
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:261
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "套件版本數量超過本程式的能力。"
+
+#: apt-pkg/pkgcachegen.cc:264
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "依存關係數量超過本程式的能力。"
 
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:292
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "處理『%s』時發生錯誤 (FindPkg)。"
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:305
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。"
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:311
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "當計算相依性時找不到套件 %s %s "
 
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:682
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "無法讀取來源檔『%s』的目錄資料。"
 
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:767
 msgid "Collecting File Provides"
 msgstr "收集檔案供應"
 
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
 msgid "IO Error saving source cache"
 msgstr "無法寫入來源暫存檔。"
 
-#: apt-pkg/acquire-item.cc:126
+#: apt-pkg/acquire-item.cc:127
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "檔名因『%s』更換失敗 (%s → %s)。"
 
-#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
+#: apt-pkg/acquire-item.cc:405 apt-pkg/acquire-item.cc:662
+#: apt-pkg/acquire-item.cc:1412
 msgid "MD5Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 
-#: apt-pkg/acquire-item.cc:647
+#: apt-pkg/acquire-item.cc:1107
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 key ID 沒有可用的公鑰：\n"
 
-#: apt-pkg/acquire-item.cc:760
+#: apt-pkg/acquire-item.cc:1220
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
 
-#: apt-pkg/acquire-item.cc:819
+#: apt-pkg/acquire-item.cc:1279
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
 
-#: apt-pkg/acquire-item.cc:855
+#: apt-pkg/acquire-item.cc:1315
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
 
-#: apt-pkg/acquire-item.cc:942
+#: apt-pkg/acquire-item.cc:1402
 msgid "Size mismatch"
 msgstr "檔案大小不符合。"
 
@@ -2571,7 +2653,7 @@ msgstr "檔案大小不符合。"
 msgid "Vendor block %s contains no fingerprint"
 msgstr "廠商區段%s有錯誤。"
 
-#: apt-pkg/cdrom.cc:507
+#: apt-pkg/cdrom.cc:531
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -2580,52 +2662,54 @@ msgstr ""
 "使用光碟機掛載點 %s\n"
 "掛載光碟機中\n"
 
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
 msgid "Identifying.. "
 msgstr "標識中.."
 
-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:565
 #, c-format
 msgid "Stored label: %s \n"
 msgstr "保存標誌：%s \n"
 
-#: apt-pkg/cdrom.cc:561
+#: apt-pkg/cdrom.cc:585
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "使用光碟機掛載點 %s\n"
 
-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:603
 msgid "Unmounting CD-ROM\n"
 msgstr "卸載光碟機中\n"
 
-#: apt-pkg/cdrom.cc:583
+#: apt-pkg/cdrom.cc:607
 msgid "Waiting for disc...\n"
 msgstr "等待磁碟中...\n"
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:615
 msgid "Mounting CD-ROM...\n"
 msgstr "掛載光碟機中... \n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:633
 msgid "Scanning disc for index files..\n"
 msgstr "掃描碟片中的索引檔案..\n"
 
-#: apt-pkg/cdrom.cc:647
-#, c-format
-msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+#: apt-pkg/cdrom.cc:673
+#, fuzzy, c-format
+msgid ""
+"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"signatures\n"
 msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
 
-#: apt-pkg/cdrom.cc:683
+#: apt-pkg/cdrom.cc:710
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "保存標誌：%s \n"
 
-#: apt-pkg/cdrom.cc:712
+#: apt-pkg/cdrom.cc:739
 msgid "That is not a valid name, try again.\n"
 msgstr "這不是合法名稱，重試一下。\n"
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:755
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2634,39 +2718,39 @@ msgstr ""
 "這個碟片名為：\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:732
+#: apt-pkg/cdrom.cc:759
 msgid "Copying package lists..."
 msgstr "複製套件清單中"
 
-#: apt-pkg/cdrom.cc:756
+#: apt-pkg/cdrom.cc:785
 msgid "Writing new source list\n"
 msgstr "寫入新的來源列表中\n"
 
-#: apt-pkg/cdrom.cc:765
+#: apt-pkg/cdrom.cc:794
 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來源列表項目為：\n"
 
-#: apt-pkg/cdrom.cc:807
+#: apt-pkg/cdrom.cc:836
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "卸載光碟機中..."
 
-#: apt-pkg/indexcopy.cc:261
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "寫入 %i 筆紀錄。\n"
 
-#: apt-pkg/indexcopy.cc:263
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "寫入 %i 筆遺失 %i 個檔案的紀錄。\n"
 
-#: apt-pkg/indexcopy.cc:266
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n"
 
-#: apt-pkg/indexcopy.cc:269
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
@@ -2725,12 +2809,13 @@ msgstr "已完整移除%s"
 msgid "Connection closed prematurely"
 msgstr "連線不預期的結束"
 
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "無法開啟『%s』檔案。"
+
 #~ msgid "File date has changed %s"
 #~ msgstr "檔案資料已更改 %s"
 
-#~ msgid "Could not patch file"
-#~ msgstr "無法開啟『%s』檔案。"
-
 #~ msgid "Reading file list"
 #~ msgstr "讀取軟件表中"