merged from debian

1 files changed, 144 insertions, 164 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index acaf0577d..bcada53c2 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: 2008-01-09 22:34+0000\n"
+"POT-Creation-Date: 2008-05-04 09:18+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"
@@ -29,7 +29,7 @@ msgid "Unable to locate package %s"
 msgstr "無法找出套件 %s 的位置"
 
 #: cmdline/apt-cache.cc:247
-msgid "Total package names : "
+msgid "Total package names: "
 msgstr "所有套件的名稱"
 
 #: cmdline/apt-cache.cc:287
@@ -58,7 +58,7 @@ msgstr "所有不同版本"
 
 #: cmdline/apt-cache.cc:295
 #, fuzzy
-msgid "Total Distinct Descriptions: "
+msgid "Total distinct descriptions: "
 msgstr "所有不同版本"
 
 #: cmdline/apt-cache.cc:297
@@ -159,7 +159,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2571 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
@@ -652,7 +652,7 @@ msgstr "無法將 %s 更名為 %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示法出錯 - %s"
@@ -813,11 +813,11 @@ msgstr "有套件需要被移除,但移除動作被禁止。"
 msgid "Internal error, Ordering didn't finish"
 msgstr "內部錯誤，Ordering didn't finish"
 
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載的目錄"
 
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源單。"
@@ -846,7 +846,7 @@ msgstr "解壓縮後將消耗 %sB 的空間。\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解壓縮後將空出 %sB 的空間。\n"
 
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s 無法足夠的空間。"
@@ -883,7 +883,7 @@ msgstr "放棄執行。"
 msgid "Do you want to continue [Y/n]? "
 msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
 
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法下載『%s』檔案。%s\n"
@@ -892,7 +892,7 @@ msgstr "無法下載『%s』檔案。%s\n"
 msgid "Some files failed to download"
 msgstr "部份檔案無法下載"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223
 msgid "Download complete and in download only mode"
 msgstr "下載完畢,目前是“僅下載”模式"
 
@@ -997,65 +997,65 @@ msgstr "update 指令不需任何參數"
 msgid "Unable to lock the list directory"
 msgstr "無法鎖定列表目錄"
 
-#: cmdline/apt-get.cc:1402
+#: cmdline/apt-get.cc:1403
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1434
+#: cmdline/apt-get.cc:1435
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "下列的【新】套件都將被安裝："
 
-#: cmdline/apt-get.cc:1436
+#: cmdline/apt-get.cc:1437
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1441
+#: cmdline/apt-get.cc:1442
 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:1444 cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733
 msgid "The following information may help to resolve the situation:"
 msgstr "底下的資訊有助於解決現在的情況:"
 
-#: cmdline/apt-get.cc:1448
+#: cmdline/apt-get.cc:1449
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，problem resolver 處理失敗"
 
-#: cmdline/apt-get.cc:1467
+#: cmdline/apt-get.cc:1468
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤,AllUpgrade 造成錯誤"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1523
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "無法找到 %s 套件。"
 
-#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665
+#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到 %s 套件。"
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1661
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
 
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1692
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "但是『%s』卻將被安裝。"
 
-#: cmdline/apt-get.cc:1696
+#: cmdline/apt-get.cc:1705
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 
-#: cmdline/apt-get.cc:1699
+#: cmdline/apt-get.cc:1708
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1063,7 +1063,7 @@ msgstr ""
 "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
 "定一個解決辦法)。"
 
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1720
 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"
@@ -1074,7 +1074,7 @@ msgstr ""
 "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
 "或從 Incoming 目錄移除。"
 
-#: cmdline/apt-get.cc:1719
+#: cmdline/apt-get.cc:1728
 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"
@@ -1084,137 +1084,122 @@ msgstr ""
 "該套件無法安裝,您最好提交一個針對這個套件\n"
 "的臭蟲報告。"
 
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1736
 msgid "Broken packages"
 msgstr "損毀的套件"
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1765
 msgid "The following extra packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
 msgid "Suggested packages:"
 msgstr "建議(Suggested)的套件:"
 
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:1855
 msgid "Recommended packages:"
 msgstr "推薦(Recommended)的套件:"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1883
 msgid "Calculating upgrade... "
 msgstr "籌畫升級套件中..."
 
-#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100
+#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:1882
+#: cmdline/apt-get.cc:1891
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966
 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，problem resolver 處理失敗"
 
-#: cmdline/apt-get.cc:2057
+#: cmdline/apt-get.cc:2066
 msgid "Must specify at least one package to fetch source for"
 msgstr "必須指定至少一個對應的套件才能下載源碼"
 
-#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353
+#: cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2335
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 套件的源碼"
 
-#: cmdline/apt-get.cc:2103
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2108
-#, c-format
-msgid ""
-"Please use:\n"
-"bzr get %s\n"
-"to retrieve the latest (possible unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:2145
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "略過已被下載的檔案“%s”\n"
 
-#: cmdline/apt-get.cc:2191
+#: cmdline/apt-get.cc:2173
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "『%s』內沒有足夠的空間。"
 
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2179
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
 
-#: cmdline/apt-get.cc:2200
+#: cmdline/apt-get.cc:2182
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始檔案。\n"
 
-#: cmdline/apt-get.cc:2206
+#: cmdline/apt-get.cc:2188
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下載源碼 %s\n"
 
-#: cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2219
 msgid "Failed to fetch some archives."
 msgstr "無法下載某些檔案。"
 
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2247
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
 
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "執行解開套件指令 '%s' 時失敗。\n"
 
-#: cmdline/apt-get.cc:2278
+#: cmdline/apt-get.cc:2260
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "請檢查是否安裝了“dpkg-dev”套件。\n"
 
-#: cmdline/apt-get.cc:2295
+#: cmdline/apt-get.cc:2277
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "執行建立套件指令 '%s' 時失敗。\n"
 
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2296
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2312
 msgid "Must specify at least one package to check builddeps for"
 msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
 
-#: cmdline/apt-get.cc:2358
+#: cmdline/apt-get.cc:2340
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的建構相依關係。"
 
-#: cmdline/apt-get.cc:2378
+#: cmdline/apt-get.cc:2360
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 無建立相依關係訊息。\n"
 
-#: cmdline/apt-get.cc:2430
+#: cmdline/apt-get.cc:2412
 #, 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:2483
+#: cmdline/apt-get.cc:2465
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1223,30 +1208,30 @@ msgstr ""
 "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
 "相依關係"
 
-#: cmdline/apt-get.cc:2519
+#: cmdline/apt-get.cc:2501
 #, 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:2544
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
 
-#: cmdline/apt-get.cc:2558
+#: cmdline/apt-get.cc:2540
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 所要求的建構相依關係。"
 
-#: cmdline/apt-get.cc:2562
+#: cmdline/apt-get.cc:2544
 msgid "Failed to process build dependencies"
 msgstr "無法處理建構相依關係"
 
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:2576
 msgid "Supported modules:"
 msgstr "支援模組:"
 
-#: cmdline/apt-get.cc:2635
+#: cmdline/apt-get.cc:2617
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1262,7 +1247,7 @@ msgid ""
 "   upgrade - Perform an upgrade\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
-"   autoremove - Remove all automatic unused packages\n"
+"   autoremove - Remove automatically all unused packages\n"
 "   purge - Remove and purge packages\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
@@ -1279,7 +1264,7 @@ msgid ""
 "  -d  Download only - do NOT install or unpack archives\n"
 "  -s  No-act. Perform ordering simulation\n"
 "  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to continue if the integrity check fails\n"
+"  -f  Attempt to correct a system with broken dependencies in place\n"
 "  -m  Attempt to continue if archives are unlocatable\n"
 "  -u  Show a list of upgraded packages as well\n"
 "  -b  Build the source package after fetching it\n"
@@ -1398,24 +1383,28 @@ msgstr ""
 msgid "Bad default setting!"
 msgstr "錯誤的預設設定!"
 
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
 msgid "Press enter to continue."
 msgstr "請按 [Enter] 鍵繼續。"
 
-#: dselect/install:100
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr ""
+
+#: dselect/install:101
 msgid "Some errors occurred while unpacking. I'm going to configure the"
 msgstr "解開套件時發生錯誤。我要準備設定"
 
-#: dselect/install:101
+#: dselect/install:102
 msgid "packages that were installed. This may result in duplicate errors"
 msgstr "套件已安裝過。這將造成重複性的錯誤"
 
-#: dselect/install:102
+#: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "或因為失去相依關係所造成的錯誤。只有該錯誤可被容忍"
 
-#: dselect/install:103
+#: dselect/install:104
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
@@ -1553,9 +1542,9 @@ msgstr "複寫套件 %s 無符合版本"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
 #, c-format
 msgid "Unable to read %s"
 msgstr "無法讀取『%s』。"
@@ -1850,7 +1839,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法允許連線"
 
-#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "問題雜湊表"
 
@@ -1877,59 +1866,59 @@ msgstr "查詢"
 msgid "Unable to invoke "
 msgstr "無法讀取 "
 
-#: methods/connect.cc:65
+#: methods/connect.cc:70
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "連絡『%s (%s)』中"
 
-#: methods/connect.cc:72
+#: methods/connect.cc:81
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:79
+#: methods/connect.cc:90
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "無法建立到『%s』的 socket (族=%u 型=%u 協定=%u)。"
 
-#: methods/connect.cc:85
+#: methods/connect.cc:96
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 
-#: methods/connect.cc:92
+#: methods/connect.cc:104
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:119
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:135 methods/rsh.cc:425
+#: methods/connect.cc:147 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "聯絡主機『%s』中"
 
-#: methods/connect.cc:167
+#: methods/connect.cc:165 methods/connect.cc:184
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "無法解析位置 %s"
 
-#: methods/connect.cc:173
+#: methods/connect.cc:190
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "解析『%s』暫時失敗"
 
-#: methods/connect.cc:176
+#: methods/connect.cc:193
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "無法解析『%s:%s (%i)』。"
 
-#: methods/connect.cc:223
+#: methods/connect.cc:240
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "無法聯絡到主機『%s %s』："
@@ -1954,8 +1943,8 @@ msgstr "至少發現一個無效的簽名。"
 
 #: methods/gpgv.cc:214
 #, c-format
-msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr "無法執行“%s”來驗證簽名(您安裝了 gnupg 嗎？)"
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr "無法執行“%s”來驗證簽名(您安裝了 gpgv 嗎？)"
 
 #: methods/gpgv.cc:219
 msgid "Unknown error executing gpgv"
@@ -1981,76 +1970,76 @@ msgstr "無法開啟管線給 %s 使用"
 msgid "Read error from %s process"
 msgstr "從 %s 進程讀取錯誤"
 
-#: methods/http.cc:376
+#: methods/http.cc:377
 msgid "Waiting for headers"
 msgstr "等待標頭"
 
-#: methods/http.cc:522
+#: methods/http.cc:523
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 
-#: methods/http.cc:530
+#: methods/http.cc:531
 msgid "Bad header line"
 msgstr "壞的標頭"
 
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http 伺服器傳送一個無效的回覆標頭"
 
-#: methods/http.cc:585
+#: methods/http.cc:586
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
 
-#: methods/http.cc:600
+#: methods/http.cc:601
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
 
-#: methods/http.cc:602
+#: methods/http.cc:603
 msgid "This HTTP server has broken range support"
 msgstr "http 伺服器有損毀的範圍支援"
 
-#: methods/http.cc:626
+#: methods/http.cc:627
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
-#: methods/http.cc:773
+#: methods/http.cc:774
 msgid "Select failed"
 msgstr "Select 失敗"
 
-#: methods/http.cc:778
+#: methods/http.cc:779
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:801
+#: methods/http.cc:802
 msgid "Error writing to output file"
 msgstr "寫入輸出檔時發生錯誤"
 
-#: methods/http.cc:832
+#: methods/http.cc:833
 msgid "Error writing to file"
 msgstr "寫入檔案時發生錯誤"
 
-#: methods/http.cc:860
+#: methods/http.cc:861
 msgid "Error writing to the file"
 msgstr "寫入檔案時發生錯誤"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error reading from server. Remote end closed connection"
 msgstr "從遠端主機讀取錯誤，關閉連線"
 
-#: methods/http.cc:876
+#: methods/http.cc:877
 msgid "Error reading from server"
 msgstr "從伺服器讀取發生錯誤"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1104
 msgid "Bad header data"
 msgstr "壞的標頭資料"
 
-#: methods/http.cc:1123 methods/http.cc:1178
+#: methods/http.cc:1121 methods/http.cc:1176
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/http.cc:1230
+#: methods/http.cc:1228
 msgid "Internal error"
 msgstr "內部錯誤"
 
@@ -2063,7 +2052,7 @@ msgstr "不能將空白檔案讀入記憶體"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "無法讀入檔案 %lu 位元組至記憶體"
 
-#: apt-pkg/contrib/strutl.cc:978
+#: apt-pkg/contrib/strutl.cc:1014
 #, c-format
 msgid "Selection %s not found"
 msgstr "選項『%s』找不到。"
@@ -2078,47 +2067,42 @@ msgstr "不認識的簡寫類型：%c"
 msgid "Opening configuration file %s"
 msgstr "開啟組態檔 %s"
 
-#: apt-pkg/contrib/configuration.cc:515
-#, fuzzy, c-format
-msgid "Line %d too long (max %u)"
-msgstr "第 %d 行太長（最長 %d）"
-
-#: apt-pkg/contrib/configuration.cc:611
+#: apt-pkg/contrib/configuration.cc:662
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "語法錯誤 %s:%u: 區塊沒有名稱"
 
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:681
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "語法錯誤 %s:%u: 無效的標籤"
 
-#: apt-pkg/contrib/configuration.cc:647
+#: apt-pkg/contrib/configuration.cc:698
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "語法錯誤 %s:%u: 值後有多餘的垃圾"
 
-#: apt-pkg/contrib/configuration.cc:687
+#: apt-pkg/contrib/configuration.cc:738
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "語法錯誤： %s:%u： 指令只能於最高層級執行"
 
-#: apt-pkg/contrib/configuration.cc:694
+#: apt-pkg/contrib/configuration.cc:745
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "語法錯誤 %s:%u: 太多重複引入檔案"
 
-#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "語法錯誤 %s:%u: 從此引入"
 
-#: apt-pkg/contrib/configuration.cc:707
+#: apt-pkg/contrib/configuration.cc:758
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'"
 
-#: apt-pkg/contrib/configuration.cc:741
+#: apt-pkg/contrib/configuration.cc:809
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
@@ -2185,7 +2169,6 @@ msgid "Unable to stat the mount point %s"
 msgstr "無法讀取掛載點 %s"
 
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
-#: methods/mirror.cc:91
 #, c-format
 msgid "Unable to change to %s"
 msgstr "無法進入『%s』目錄。"
@@ -2442,17 +2425,17 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。"
 
-#: apt-pkg/algorithms.cc:1105
+#: apt-pkg/algorithms.cc:1106
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr "無法解決依存關係。可能原因是某些套件被押後。"
 
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1108
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法解決問題，因為某些損毀的套件被押後。"
 
-#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371
+#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2495,12 +2478,12 @@ msgstr "安裝方式『%s』沒有正確啟動。"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。"
 
-#: apt-pkg/init.cc:125
+#: apt-pkg/init.cc:124
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "本軟體不支持『%s』包裝法。"
 
-#: apt-pkg/init.cc:141
+#: apt-pkg/init.cc:140
 msgid "Unable to determine a suitable packaging system type"
 msgstr "無法明白系統類別。"
 
@@ -2628,45 +2611,45 @@ msgstr "收集檔案供應"
 msgid "IO Error saving source cache"
 msgstr "無法寫入來源暫存檔。"
 
-#: apt-pkg/acquire-item.cc:134
+#: apt-pkg/acquire-item.cc:127
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "檔名因『%s』更換失敗 (%s → %s)。"
 
-#: apt-pkg/acquire-item.cc:451
+#: apt-pkg/acquire-item.cc:401
 msgid "MD5Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 
-#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1100
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 key ID 沒有可用的公鑰：\n"
 
-#: apt-pkg/acquire-item.cc:1264
+#: apt-pkg/acquire-item.cc:1213
 #, 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:1323
+#: apt-pkg/acquire-item.cc:1272
 #, 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:1364
+#: apt-pkg/acquire-item.cc:1313
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
 
-#: apt-pkg/acquire-item.cc:1451
+#: apt-pkg/acquire-item.cc:1400
 msgid "Size mismatch"
 msgstr "檔案大小不符合。"
 
@@ -2723,8 +2706,8 @@ msgstr "掃描碟片中的索引檔案..\n"
 #: apt-pkg/cdrom.cc:678
 #, fuzzy, c-format
 msgid ""
-"Found %u package indexes, %u source indexes, %u translation indexes and %u "
-"signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
 msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
 
 #: apt-pkg/cdrom.cc:715
@@ -2777,63 +2760,63 @@ msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n"
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
 
-#: apt-pkg/deb/dpkgpm.cc:454
+#: apt-pkg/deb/dpkgpm.cc:452
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "找不到『%spartial』清單目錄。"
 
-#: apt-pkg/deb/dpkgpm.cc:537
+#: apt-pkg/deb/dpkgpm.cc:535
 #, c-format
 msgid "Preparing %s"
 msgstr "準備配置%s中"
 
-#: apt-pkg/deb/dpkgpm.cc:538
+#: apt-pkg/deb/dpkgpm.cc:536
 #, c-format
 msgid "Unpacking %s"
 msgstr "解開%s中"
 
-#: apt-pkg/deb/dpkgpm.cc:543
+#: apt-pkg/deb/dpkgpm.cc:541
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "準備設定%s檔"
 
-#: apt-pkg/deb/dpkgpm.cc:544
+#: apt-pkg/deb/dpkgpm.cc:542
 #, c-format
 msgid "Configuring %s"
 msgstr "設定%s中"
 
-#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547
+#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545
 #, fuzzy, c-format
 msgid "Processing triggers for %s"
 msgstr "處理目錄 %s 時錯誤"
 
-#: apt-pkg/deb/dpkgpm.cc:549
+#: apt-pkg/deb/dpkgpm.cc:547
 #, c-format
 msgid "Installed %s"
 msgstr "已安裝%s"
 
-#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554
+#: apt-pkg/deb/dpkgpm.cc:555
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在準備 %s 的刪除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:559
+#: apt-pkg/deb/dpkgpm.cc:557
 #, c-format
 msgid "Removing %s"
 msgstr "移除%s中"
 
-#: apt-pkg/deb/dpkgpm.cc:560
+#: apt-pkg/deb/dpkgpm.cc:558
 #, c-format
 msgid "Removed %s"
 msgstr "已移除%s"
 
-#: apt-pkg/deb/dpkgpm.cc:565
+#: apt-pkg/deb/dpkgpm.cc:563
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "準備完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:566
+#: apt-pkg/deb/dpkgpm.cc:564
 #, c-format
 msgid "Completely removed %s"
 msgstr "已完整移除%s"
@@ -2842,13 +2825,6 @@ msgstr "已完整移除%s"
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:170
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "無法開啟『%s』檔案。"
@@ -2858,6 +2834,10 @@ msgid "Connection closed prematurely"
 msgstr "連線不預期的結束"
 
 #, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "第 %d 行太長（最長 %d）"
+
+#, fuzzy
 #~ msgid "Line %d too long (max %d)"
 #~ msgstr "第 %d 行太長（最長 %d）"