X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/9d9ffdd4601a221e5dffa0d273e231d717b59d37..f9ac6f71de1df7302e35514afefe3fd54cf3ec24:/po/zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 062ce5656..3b1329fab 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 07:33-0500\n"
-"PO-Revision-Date: 2005-02-19 22:24+0800\n"
+"POT-Creation-Date: 2007-05-08 11:03+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"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2387 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"
@@ -230,19 +230,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "請給這張光碟取個名字，比如說“Debian 2.1r1 Disk 1”"
 
 #: cmdline/apt-cdrom.cc:93
-#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"更換媒體:請把名為\n"
-" '%s' 的光碟\n"
-"插入 '%s' 碟機,然後按 [Enter] 鍵。\n"
+msgstr "請放入光碟至光碟機，然後按 [Enter] 鍵。"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "請對您的光碟套件中的其它光碟重復相同的操作。"
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -339,7 +335,6 @@ msgid "Error processing contents %s"
 msgstr "處理目錄 %s 時出錯"
 
 #: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -428,115 +423,126 @@ msgstr "找不到符合的選項"
 msgid "Some files are missing in the package file group `%s'"
 msgstr "套件檔案組  `%s' 缺少部份檔案"
 
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB 已損毀,檔案被更名成 %s.old"
 
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB 過舊,嘗試更新 %s"
 
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr "資料庫格式錯誤。如果您升級舊版的 apt，請移除並重建資料庫。"
+
+#: ftparchive/cachedb.cc:81
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "無法開啟 DB 檔案 %s:%s"
 
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
 #, c-format
-msgid "File date has changed %s"
-msgstr "檔案資料已更改 %s"
+msgid "Failed to stat %s"
+msgstr "無法取得 %s 的狀態"
 
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
 msgid "Archive has no control record"
 msgstr "檔案沒有 control 記錄"
 
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
 msgid "Unable to get a cursor"
 msgstr "無法取得游標"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W:無法讀取目錄 %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W:無法取得 %s 狀態\n"
 
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
 msgid "E: "
 msgstr "錯誤："
 
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
 msgid "W: "
 msgstr "警告："
 
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
 msgid "E: Errors apply to file "
 msgstr "E:套用到檔案時出錯"
 
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "無法解析路徑 %s"
 
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
 msgid "Tree walking failed"
 msgstr "無法走訪目錄樹"
 
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
 #, c-format
 msgid "Failed to open %s"
 msgstr "無法開啟 %s"
 
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " 移除連結 %s [%s]\n"
 
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "無法讀取符號鏈接 %s"
 
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "無法 unlink %s"
 
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 無法將 %s 鏈接到 %s"
 
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 達到了 DeLink 的上限 %sB。\n"
 
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
-#, c-format
-msgid "Failed to stat %s"
-msgstr "無法取得 %s 的狀態"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
 msgid "Archive had no package field"
 msgstr "檔案無套件字符"
 
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 無 override 項目\n"
 
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 套件維護者是 %s 非 %s\n"
 
+#: ftparchive/writer.cc:623
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 無原始碼 override 項目\n"
+
+#: ftparchive/writer.cc:627
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 無二元碼 override 項目\n"
+
 #: ftparchive/contents.cc:317
 #, c-format
 msgid "Internal error, could not locate member %s"
@@ -705,12 +711,11 @@ msgid "%s (due to %s) "
 msgstr "%s（因為 %s）"
 
 #: cmdline/apt-get.cc:546
-#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"警告：下列的重要套件都將被刪除\n"
+"警告：下列的基本套件都將被移除。\n"
 "除非您很清楚在做什麼，請勿輕易嘗試。"
 
 #: cmdline/apt-get.cc:577
@@ -772,7 +777,7 @@ msgstr "警告：下列的套件驗證失敗！"
 
 #: cmdline/apt-get.cc:693
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "忽略了認證警告。\n"
 
 #: cmdline/apt-get.cc:700
 msgid "Install these packages without verification [y/N]? "
@@ -788,29 +793,28 @@ msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
 
 #: cmdline/apt-get.cc:755
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！"
 
 #: cmdline/apt-get.cc:764
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有套件需要被移除,但移除動作被禁止。"
 
 #: cmdline/apt-get.cc:775
-#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr "內部錯誤：新增轉移(diversion)失敗"
+msgstr "內部錯誤，Ordering didn't finish"
 
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載的目錄"
 
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源單。"
 
 #: cmdline/apt-get.cc:816
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧"
 
 #: cmdline/apt-get.cc:821
 #, c-format
@@ -832,10 +836,10 @@ msgstr "解壓縮後將消耗 %sB 的空間。\n"
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解壓縮後將空出 %sB 的空間。\n"
 
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "『%s』內沒有足夠的空間。"
+msgstr "%s 無法足夠的空間。"
 
 #: cmdline/apt-get.cc:849
 #, c-format
@@ -851,7 +855,7 @@ msgid "Yes, do as I say!"
 msgstr "是的,請執行我所指定的"
 
 #: cmdline/apt-get.cc:868
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
@@ -869,7 +873,7 @@ msgstr "放棄執行。"
 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:2014
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法下載『%s』檔案。%s\n"
@@ -878,7 +882,7 @@ msgstr "無法下載『%s』檔案。%s\n"
 msgid "Some files failed to download"
 msgstr "部份檔案無法下載"
 
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 msgid "Download complete and in download only mode"
 msgstr "下載完畢,目前是“僅下載”模式"
 
@@ -1048,115 +1052,114 @@ msgstr "損毀的套件"
 msgid "The following extra packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 
-#: cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1692
 msgid "Suggested packages:"
 msgstr "建議(Suggested)的套件:"
 
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1693
 msgid "Recommended packages:"
 msgstr "推薦(Recommended)的套件:"
 
-#: cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1713
 msgid "Calculating upgrade... "
 msgstr "籌畫升級套件中..."
 
-#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1721
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
-#, fuzzy
+#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 msgid "Internal error, problem resolver broke stuff"
-msgstr "內部錯誤,AllUpgrade 造成錯誤"
+msgstr "內部錯誤，problem resolver 處理失敗"
 
-#: cmdline/apt-get.cc:1876
+#: cmdline/apt-get.cc:1894
 msgid "Must specify at least one package to fetch source for"
 msgstr "必須指定至少一個對應的套件才能下載源碼"
 
-#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 套件的源碼"
 
-#: cmdline/apt-get.cc:1950
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1968
+#, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
+msgstr "略過已被下載的檔案“%s”\n"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1992
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "『%s』內沒有足夠的空間。"
 
-#: cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:1997
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
 
-#: cmdline/apt-get.cc:1982
+#: cmdline/apt-get.cc:2000
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始檔案。\n"
 
-#: cmdline/apt-get.cc:1988
+#: cmdline/apt-get.cc:2006
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下載源碼 %s\n"
 
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:2037
 msgid "Failed to fetch some archives."
 msgstr "無法下載某些檔案。"
 
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2065
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
 
-#: cmdline/apt-get.cc:2059
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "執行解開套件指令 '%s' 時失敗。\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2078
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "請檢查是否安裝了“dpkg-dev”套件。\n"
 
-#: cmdline/apt-get.cc:2077
+#: cmdline/apt-get.cc:2095
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "執行建立套件指令 '%s' 時失敗。\n"
 
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2114
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2130
 msgid "Must specify at least one package to check builddeps for"
 msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
 
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2158
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的建構相依關係。"
 
-#: cmdline/apt-get.cc:2160
+#: cmdline/apt-get.cc:2178
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 無建立相依關係訊息。\n"
 
-#: cmdline/apt-get.cc:2212
+#: cmdline/apt-get.cc:2230
 #, 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:2264
+#: cmdline/apt-get.cc:2282
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1165,30 +1168,30 @@ msgstr ""
 "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
 "相依關係"
 
-#: cmdline/apt-get.cc:2299
+#: cmdline/apt-get.cc:2317
 #, 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:2324
+#: cmdline/apt-get.cc:2342
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
 
-#: cmdline/apt-get.cc:2338
+#: cmdline/apt-get.cc:2356
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 所要求的建構相依關係。"
 
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2360
 msgid "Failed to process build dependencies"
 msgstr "無法處理建構相依關係"
 
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2392
 msgid "Supported modules:"
 msgstr "支援模組:"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2433
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1367,19 +1370,19 @@ msgstr "結合現有資料中"
 msgid "Failed to create pipes"
 msgstr "無法建立管線"
 
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "無法執行 gzip"
 
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
 msgid "Corrupted archive"
 msgstr "損毀的檔案"
 
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar checksum 失敗,檔案已損毀"
 
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 標頭型別 %u, member 訊息 %s"
@@ -1436,7 +1439,7 @@ msgid "Duplicate conf file %s/%s"
 msgstr "重複的設定檔 %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
 msgstr "寫入檔案 %s 失敗"
 
@@ -1645,26 +1648,25 @@ msgstr ""
 msgid "Wrong CD-ROM"
 msgstr "碟片不正確。"
 
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。"
 
-#: methods/cdrom.cc:169
-#, fuzzy
+#: methods/cdrom.cc:171
 msgid "Disk not found."
-msgstr "找不到檔案"
+msgstr "找不到磁碟"
 
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "找不到檔案"
 
-#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150
 msgid "Failed to stat"
 msgstr "無法讀取資料"
 
-#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 msgid "Failed to set modification time"
 msgstr "日期更新失敗"
 
@@ -1790,7 +1792,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法允許連線"
 
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "問題雜湊表"
 
@@ -1874,124 +1876,123 @@ msgstr "無法解析『%s:%s (%i)』。"
 msgid "Unable to connect to %s %s:"
 msgstr "無法聯絡到主機『%s %s』："
 
-#: methods/gpgv.cc:64
-#, fuzzy, c-format
+#: methods/gpgv.cc:65
+#, c-format
 msgid "Couldn't access keyring: '%s'"
-msgstr "無法解析位置 %s"
+msgstr "無法存取keyring：%s"
 
-#: methods/gpgv.cc:99
+#: methods/gpgv.cc:100
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "錯誤：Acquire::gpgv::Options 的參數列表超長。結束執行。"
 
-#: methods/gpgv.cc:198
+#: methods/gpgv.cc:204
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "內部錯誤：簽名正確無誤，但是無法確認密鑰的指紋(key fingerprint)？！"
 
-#: methods/gpgv.cc:203
+#: methods/gpgv.cc:209
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "至少發現一個無效的簽名。"
 
-#: methods/gpgv.cc:207
+#: methods/gpgv.cc:213
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr "無法執行“%s”來驗證簽名(您安裝了 gnupg 嗎？)"
 
-#: methods/gpgv.cc:212
+#: methods/gpgv.cc:218
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "執行 gpgv 時發生未知錯誤"
 
-#: methods/gpgv.cc:243
-#, fuzzy
+#: methods/gpgv.cc:249
 msgid "The following signatures were invalid:\n"
-msgstr "下列的【新】套件都將被安裝："
+msgstr "下列的簽名皆不合法：\n"
 
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:256
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
-msgstr ""
+msgstr "由於沒有公鑰，下列簽名無法進行驗證：\n"
 
-#: methods/gzip.cc:57
+#: methods/gzip.cc:64
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "無法開啟管線給 %s 使用"
 
-#: methods/gzip.cc:102
+#: methods/gzip.cc:109
 #, c-format
 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:1107
+#: methods/http.cc:1108
 msgid "Bad header data"
 msgstr "壞的標頭資料"
 
-#: methods/http.cc:1124
+#: methods/http.cc:1125
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/http.cc:1215
+#: methods/http.cc:1216
 msgid "Internal error"
 msgstr "內部錯誤"
 
@@ -2064,12 +2065,12 @@ msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'"
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
 
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... 錯誤！"
 
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
@@ -2270,24 +2271,24 @@ msgstr "次要"
 msgid "extra"
 msgstr "添加"
 
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
 msgid "Building dependency tree"
 msgstr "了解套件依存關係中"
 
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62
 msgid "Candidate versions"
 msgstr "候選版本"
 
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91
 msgid "Dependency generation"
 msgstr "產生套件依存關係"
 
-#: apt-pkg/tagfile.cc:72
+#: apt-pkg/tagfile.cc:106
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "無法辨識套件『%s』(1)。"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:193
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件『%s』(1)。"
@@ -2333,7 +2334,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行"
 
@@ -2363,13 +2364,13 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。"
 
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr "無法解決依存關係。可能原因是某些套件被押後。"
 
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法解決問題，因為某些損毀的套件被押後。"
 
@@ -2385,15 +2386,15 @@ msgstr "找不到『%spartial』檔案目錄。"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+msgstr "正在下載第 %li 個文件(共 %li 個，尚需 %s)"
 
-#: apt-pkg/acquire.cc:825
-#, fuzzy, c-format
+#: apt-pkg/acquire.cc:832
+#, c-format
 msgid "Retrieving file %li of %li"
-msgstr "讀取軟件表中"
+msgstr "正在下載第%li個檔案(共有%li)"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2406,12 +2407,9 @@ msgid "Method %s did not start correctly"
 msgstr "安裝方式『%s』沒有正確啟動。"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"更換媒體:請把名為\n"
-" '%s' 的光碟\n"
-"插入 '%s' 碟機,然後按 [Enter] 鍵。\n"
+msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。"
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2439,16 +2437,16 @@ msgstr "無法讀取套件清單或狀況檔。"
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
 msgid "Invalid record in the preferences file, no Package header"
 msgstr "喜好檔有錯誤—缺少套件前置檔。"
 
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "本軟體不支持『%s』型的版本釘子。"
 
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
 msgid "No priority (or zero) specified for pin"
 msgstr "對於釘住的檔案無優先順序"
 
@@ -2536,35 +2534,35 @@ msgstr "無法寫入來源暫存檔。"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "檔名因『%s』更換失敗 (%s → %s)。"
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
 msgid "MD5Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 
-#: apt-pkg/acquire-item.cc:640
-msgid "There are no public key available for the following key IDs:\n"
-msgstr ""
+#: apt-pkg/acquire-item.cc:647
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "以下 key ID 沒有可用的公鑰：\n"
 
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
 #, 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:812
+#: apt-pkg/acquire-item.cc:819
 #, 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:848
+#: apt-pkg/acquire-item.cc:855
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
 
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
 msgid "Size mismatch"
 msgstr "檔案大小不符合。"
 
@@ -2618,11 +2616,16 @@ msgstr "掃描碟片中的索引檔案..\n"
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
 
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "保存標誌：%s \n"
+
+#: apt-pkg/cdrom.cc:712
 msgid "That is not a valid name, try again.\n"
 msgstr "這不是合法名稱，重試一下。\n"
 
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2631,20 +2634,21 @@ msgstr ""
 "這個碟片名為：\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
 msgid "Copying package lists..."
 msgstr "複製套件清單中"
 
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
 msgid "Writing new source list\n"
 msgstr "寫入新的來源列表中\n"
 
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來源列表項目為：\n"
 
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
 msgstr "卸載光碟機中..."
 
 #: apt-pkg/indexcopy.cc:261
@@ -2668,62 +2672,67 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "開啟『%s』中"
+msgstr "準備配置%s中"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "開啟『%s』中"
+msgstr "解開%s中"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "開啟組態檔 %s"
+msgstr "準備設定%s檔"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "聯絡主機『%s』中"
+msgstr "設定%s中"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "已安裝:"
+msgstr "已安裝%s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "正在準備 %s 的刪除操作"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "開啟『%s』中"
+msgstr "移除%s中"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "推薦"
+msgstr "已移除%s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to completely remove %s"
-msgstr "開啟組態檔 %s"
+msgstr "準備完整移除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, fuzzy, c-format
+#, c-format
 msgid "Completely removed %s"
-msgstr "無法移除 %s"
+msgstr "已完整移除%s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "連線不預期的結束"
 
+#~ msgid "File date has changed %s"
+#~ msgstr "檔案資料已更改 %s"
+
+#~ msgid "Could not patch file"
+#~ msgstr "無法開啟『%s』檔案。"
+
 #~ msgid "Reading file list"
 #~ msgstr "讀取軟件表中"
 
-#, fuzzy
 #~ msgid "Could not execute "
 #~ msgstr "無法取得『%s』鎖。"