* merged apt--main and make sure that the po files come from apt--main (because they...

[apt.git] / po / zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9a8ce59389e373bd99a6b3646ca6b4de16f66548..cafc2bd5f2107eae42215acf50ddb026a4b3a032 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-02-05 19:52+0100\n"
+"POT-Creation-Date: 2005-03-29 07:17+0200\n"

 "PO-Revision-Date: 2005-02-19 22:24+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
 "PO-Revision-Date: 2005-02-19 22:24+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"


@@ -29,23 +29,23 @@ msgid "Unable to locate package %s"
 msgstr "無法找出套件 %s 的位置"
 
 #: cmdline/apt-cache.cc:232
 msgstr "無法找出套件 %s 的位置"
 
 #: cmdline/apt-cache.cc:232

-msgid "Total Package Names : "
+msgid "Total package names : "

 msgstr "所有套件的名稱"
 
 #: cmdline/apt-cache.cc:272
 msgstr "所有套件的名稱"
 
 #: cmdline/apt-cache.cc:272

-msgid "  Normal Packages: "
+msgid "  Normal packages: "

 msgstr "  普通套件："
 
 #: cmdline/apt-cache.cc:273
 msgstr "  普通套件："
 
 #: cmdline/apt-cache.cc:273

-msgid "  Pure Virtual Packages: "
+msgid "  Pure virtual packages: "

 msgstr "  虛擬套件："
 
 #: cmdline/apt-cache.cc:274
 msgstr "  虛擬套件："
 
 #: cmdline/apt-cache.cc:274

-msgid "  Single Virtual Packages: "
+msgid "  Single virtual packages: "

 msgstr "  單虛擬套件："
 
 #: cmdline/apt-cache.cc:275
 msgstr "  單虛擬套件："
 
 #: cmdline/apt-cache.cc:275

-msgid "  Mixed Virtual Packages: "
+msgid "  Mixed virtual packages: "

 msgstr "  混合虛擬套件："
 
 #: cmdline/apt-cache.cc:276
 msgstr "  混合虛擬套件："
 
 #: cmdline/apt-cache.cc:276


@@ -53,35 +53,35 @@ msgid "  Missing: "
 msgstr "  失蹤："
 
 #: cmdline/apt-cache.cc:278
 msgstr "  失蹤："
 
 #: cmdline/apt-cache.cc:278

-msgid "Total Distinct Versions: "
+msgid "Total distinct versions: "

 msgstr "所有不同版本"
 
 #: cmdline/apt-cache.cc:280
 msgstr "所有不同版本"
 
 #: cmdline/apt-cache.cc:280

-msgid "Total Dependencies: "
+msgid "Total dependencies: "

 msgstr "所有依存關係："
 
 #: cmdline/apt-cache.cc:283
 msgstr "所有依存關係："
 
 #: cmdline/apt-cache.cc:283

-msgid "Total Ver/File relations: "
+msgid "Total ver/file relations: "

 msgstr "所有版本/檔案關聯："
 
 #: cmdline/apt-cache.cc:285
 msgstr "所有版本/檔案關聯："
 
 #: cmdline/apt-cache.cc:285

-msgid "Total Provides Mappings: "
+msgid "Total Provides mappings: "

 msgstr "所有提供套件對應："
 
 #: cmdline/apt-cache.cc:297
 msgstr "所有提供套件對應："
 
 #: cmdline/apt-cache.cc:297

-msgid "Total Globbed Strings: "
+msgid "Total globbed strings: "

 msgstr "Glob 字串共計:"
 
 #: cmdline/apt-cache.cc:311
 msgstr "Glob 字串共計:"
 
 #: cmdline/apt-cache.cc:311

-msgid "Total Dependency Version space: "
+msgid "Total dependency version space: "

 msgstr "所有相依版本空間:"
 
 #: cmdline/apt-cache.cc:316
 msgstr "所有相依版本空間:"
 
 #: cmdline/apt-cache.cc:316

-msgid "Total Slack space: "
+msgid "Total slack space: "

 msgstr "Slack 空間共計:"
 
 #: cmdline/apt-cache.cc:324
 msgstr "Slack 空間共計:"
 
 #: cmdline/apt-cache.cc:324

-msgid "Total Space Accounted for: "
+msgid "Total space accounted for: "

 msgstr "所有統計後的空間:"
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 msgstr "所有統計後的空間:"
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189


@@ -98,7 +98,7 @@ msgid "No packages found"
 msgstr "未找到套件"
 
 #: cmdline/apt-cache.cc:1462
 msgstr "未找到套件"
 
 #: cmdline/apt-cache.cc:1462

-msgid "Package Files:"
+msgid "Package files:"

 msgstr "套件檔案:"
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgstr "套件檔案:"
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555


@@ -112,7 +112,7 @@ msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482

-msgid "Pinned Packages:"
+msgid "Pinned packages:"

 msgstr "鎖定的套件:"
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 msgstr "鎖定的套件:"
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535


@@ -134,12 +134,12 @@ msgid "  Candidate: "
 msgstr "  候選:"
 
 #: cmdline/apt-cache.cc:1532
 msgstr "  候選:"
 
 #: cmdline/apt-cache.cc:1532

-msgid "  Package Pin: "
+msgid "  Package pin: "

 msgstr "  套件鎖定: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
 msgstr "  套件鎖定: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541

-msgid "  Version Table:"
+msgid "  Version table:"

 msgstr "  版本表格:"
 
 #: cmdline/apt-cache.cc:1556
 msgstr "  版本表格:"
 
 #: cmdline/apt-cache.cc:1556


@@ -306,7 +306,7 @@ msgstr "套件延伸列表過長"
 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
 #, c-format
 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
 #, c-format

-msgid "Error Processing directory %s"
+msgid "Error processing directory %s"

 msgstr "處理目錄 %s 時錯誤"
 
 #: ftparchive/apt-ftparchive.cc:250
 msgstr "處理目錄 %s 時錯誤"
 
 #: ftparchive/apt-ftparchive.cc:250


@@ -319,10 +319,11 @@ msgstr "寫入標頭資訊到目錄檔案時出錯"
 
 #: ftparchive/apt-ftparchive.cc:397
 #, c-format
 
 #: ftparchive/apt-ftparchive.cc:397
 #, c-format

-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"

 msgstr "處理目錄 %s 時出錯"
 
 #: ftparchive/apt-ftparchive.cc:551
 msgstr "處理目錄 %s 時出錯"
 
 #: ftparchive/apt-ftparchive.cc:551

+#, fuzzy

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -361,7 +362,7 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"

-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"

 msgstr ""
 "用法: apt-ftparchive [選項] 命令\n"
 "命令: packages 二進制套件搜索路徑 [overridefile [pathprefix]]\n"
 msgstr ""
 "用法: apt-ftparchive [選項] 命令\n"
 "命令: packages 二進制套件搜索路徑 [overridefile [pathprefix]]\n"


@@ -522,7 +523,7 @@ msgstr "  %s 套件維護者是 %s 非 %s\n"
 
 #: ftparchive/contents.cc:317
 #, c-format
 
 #: ftparchive/contents.cc:317
 #, c-format

-msgid "Internal Error, could not locate member %s"
+msgid "Internal error, could not locate member %s"

 msgstr "內部錯誤：無法找到成員 %s"
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
 msgstr "內部錯誤：無法找到成員 %s"
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384


@@ -556,7 +557,7 @@ msgstr "無法讀取 override 檔案 %s"
 
 #: ftparchive/multicompress.cc:75
 #, c-format
 
 #: ftparchive/multicompress.cc:75
 #, c-format

-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"

 msgstr "未知的壓縮演算法 '%s'"
 
 #: ftparchive/multicompress.cc:105
 msgstr "未知的壓縮演算法 '%s'"
 
 #: ftparchive/multicompress.cc:105


@@ -577,12 +578,12 @@ msgid "Failed to fork"
 msgstr "fork 時失敗"
 
 #: ftparchive/multicompress.cc:215
 msgstr "fork 時失敗"
 
 #: ftparchive/multicompress.cc:215

-msgid "Compress Child"
+msgid "Compress child"

 msgstr "壓縮子程序"
 
 #: ftparchive/multicompress.cc:238
 #, c-format
 msgstr "壓縮子程序"
 
 #: ftparchive/multicompress.cc:238
 #, c-format

-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"

 msgstr "內部錯誤,無法建立 %s"
 
 #: ftparchive/multicompress.cc:289
 msgstr "內部錯誤,無法建立 %s"
 
 #: ftparchive/multicompress.cc:289


@@ -753,7 +754,7 @@ msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告：下列的套件驗證失敗！"
 
 #: cmdline/apt-get.cc:698
 msgstr "警告：下列的套件驗證失敗！"
 
 #: cmdline/apt-get.cc:698

-msgid "Install these packages without verification? [y/N] "
+msgid "Install these packages without verification [y/N]? "

 msgstr "不驗證這些套件就直接安裝？[y/N]"
 
 #: cmdline/apt-get.cc:700
 msgstr "不驗證這些套件就直接安裝？[y/N]"
 
 #: cmdline/apt-get.cc:700


@@ -765,7 +766,7 @@ msgid "There are problems and -y was used without --force-yes"
 msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
 
 #: cmdline/apt-get.cc:762
 msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
 
 #: cmdline/apt-get.cc:762

-msgid "Packages need to be removed but Remove is disabled."
+msgid "Packages need to be removed but remove is disabled."

 msgstr "有套件需要被移除,但移除動作被禁止。"
 
 #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
 msgstr "有套件需要被移除,但移除動作被禁止。"
 
 #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802


@@ -826,7 +827,7 @@ msgid "Abort."
 msgstr "放棄執行。"
 
 #: cmdline/apt-get.cc:886
 msgstr "放棄執行。"
 
 #: cmdline/apt-get.cc:886

-msgid "Do you want to continue? [Y/n] "
+msgid "Do you want to continue [Y/n]? "

 msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
 
 #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
 msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
 
 #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959


@@ -859,7 +860,7 @@ msgid "Unable to correct missing packages."
 msgstr "無法更正遺失的套件。"
 
 #: cmdline/apt-get.cc:993
 msgstr "無法更正遺失的套件。"
 
 #: cmdline/apt-get.cc:993

-msgid "Aborting Install."
+msgid "Aborting install."

 msgstr "放棄安裝。"
 
 #: cmdline/apt-get.cc:1026
 msgstr "放棄安裝。"
 
 #: cmdline/apt-get.cc:1026


@@ -950,7 +951,7 @@ msgid ""
 msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
 
 #: cmdline/apt-get.cc:1372
 msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
 
 #: cmdline/apt-get.cc:1372

-msgid "Internal Error, AllUpgrade broke stuff"
+msgid "Internal error, AllUpgrade broke stuff"

 msgstr "內部錯誤,AllUpgrade 造成錯誤"
 
 #: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
 msgstr "內部錯誤,AllUpgrade 造成錯誤"
 
 #: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498


@@ -1017,7 +1018,7 @@ msgid "Recommended packages:"
 msgstr "推薦(Recommended)的套件:"
 
 #: cmdline/apt-get.cc:1664
 msgstr "推薦(Recommended)的套件:"
 
 #: cmdline/apt-get.cc:1664

-msgid "Calculating Upgrade... "
+msgid "Calculating upgrade... "

 msgstr "籌畫升級套件中..."
 
 #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
 msgstr "籌畫升級套件中..."
 
 #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99


@@ -1054,7 +1055,7 @@ msgstr "需要下載 %sB 的原始檔案。\n"
 
 #: cmdline/apt-get.cc:1933
 #, c-format
 
 #: cmdline/apt-get.cc:1933
 #, c-format

-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"

 msgstr "下載源碼 %s\n"
 
 #: cmdline/apt-get.cc:1964
 msgstr "下載源碼 %s\n"
 
 #: cmdline/apt-get.cc:1964


@@ -1130,7 +1131,7 @@ msgid "Failed to process build dependencies"
 msgstr "無法處理建構相依關係"
 
 #: cmdline/apt-get.cc:2318
 msgstr "無法處理建構相依關係"
 
 #: cmdline/apt-get.cc:2318

-msgid "Supported Modules:"
+msgid "Supported modules:"

 msgstr "支援模組:"
 
 #: cmdline/apt-get.cc:2359
 msgstr "支援模組:"
 
 #: cmdline/apt-get.cc:2359


@@ -1242,7 +1243,7 @@ msgstr " [工作中]"
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""

-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"

 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""


@@ -1305,7 +1306,7 @@ msgid ""
 msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
 
 #: dselect/update:30
 msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
 
 #: dselect/update:30

-msgid "Merging Available information"
+msgid "Merging available information"

 msgstr "結合現有資料中"
 
 #: apt-inst/contrib/extracttar.cc:117
 msgstr "結合現有資料中"
 
 #: apt-inst/contrib/extracttar.cc:117


@@ -1321,8 +1322,8 @@ msgid "Corrupted archive"
 msgstr "損毀的檔案"
 
 #: apt-inst/contrib/extracttar.cc:195
 msgstr "損毀的檔案"
 
 #: apt-inst/contrib/extracttar.cc:195

-msgid "Tar Checksum failed, archive corrupted"
-msgstr "Tar Checksum 失敗,檔案已損毀"
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar checksum 失敗,檔案已損毀"

 
 #: apt-inst/contrib/extracttar.cc:298
 #, c-format
 
 #: apt-inst/contrib/extracttar.cc:298
 #, c-format


@@ -1362,7 +1363,7 @@ msgid "Failed to allocate diversion"
 msgstr "分配轉移(diversion)失敗"
 
 #: apt-inst/filelist.cc:468
 msgstr "分配轉移(diversion)失敗"
 
 #: apt-inst/filelist.cc:468

-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"

 msgstr "內部錯誤於 AddDiversion"
 
 #: apt-inst/filelist.cc:481
 msgstr "內部錯誤於 AddDiversion"
 
 #: apt-inst/filelist.cc:481


@@ -1471,7 +1472,7 @@ msgstr "資料目錄與暫存目錄需在同一檔案系統"
 #: 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:643
 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
 #: apt-pkg/pkgcachegen.cc:840

-msgid "Reading Package Lists"
+msgid "Reading package lists"

 msgstr "讀取套件清單中"
 
 #: apt-inst/deb/dpkgdb.cc:180
 msgstr "讀取套件清單中"
 
 #: apt-inst/deb/dpkgdb.cc:180


@@ -1481,11 +1482,11 @@ msgstr "無法變換 admin 目錄至 %sinfo"
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448

-msgid "Internal Error getting a Package Name"
+msgid "Internal error getting a package name"

 msgstr "內部錯誤，無法取得套件名稱"
 
 #: apt-inst/deb/dpkgdb.cc:205
 msgstr "內部錯誤，無法取得套件名稱"
 
 #: apt-inst/deb/dpkgdb.cc:205

-msgid "Reading File Listing"
+msgid "Reading file listing"

 msgstr "讀取軟件表中"
 
 #: apt-inst/deb/dpkgdb.cc:216
 msgstr "讀取軟件表中"
 
 #: apt-inst/deb/dpkgdb.cc:216


@@ -1504,7 +1505,7 @@ msgid "Failed reading the list file %sinfo/%s"
 msgstr "讀取清單檔案「%sinfo/%s」失敗"
 
 #: apt-inst/deb/dpkgdb.cc:266
 msgstr "讀取清單檔案「%sinfo/%s」失敗"
 
 #: apt-inst/deb/dpkgdb.cc:266

-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"

 msgstr "內部錯誤，無法取得節點"
 
 #: apt-inst/deb/dpkgdb.cc:309
 msgstr "內部錯誤，無法取得節點"
 
 #: apt-inst/deb/dpkgdb.cc:309


@@ -1523,20 +1524,20 @@ msgid "Invalid line in the diversion file: %s"
 msgstr "無效的行於轉移檔案 %s 中"
 
 #: apt-inst/deb/dpkgdb.cc:362
 msgstr "無效的行於轉移檔案 %s 中"
 
 #: apt-inst/deb/dpkgdb.cc:362

-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"

 msgstr "內部錯誤：新增轉移(diversion)失敗"
 
 #: apt-inst/deb/dpkgdb.cc:383
 msgstr "內部錯誤：新增轉移(diversion)失敗"
 
 #: apt-inst/deb/dpkgdb.cc:383

-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"

 msgstr "套件快取必須先初始化"
 
 #: apt-inst/deb/dpkgdb.cc:386
 msgstr "套件快取必須先初始化"
 
 #: apt-inst/deb/dpkgdb.cc:386

-msgid "Reading File List"
+msgid "Reading file list"

 msgstr "讀取軟件表中"
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgstr "讀取軟件表中"
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format

-msgid "Failed to find a Package: Header, offset %lu"
+msgid "Failed to find a Package: header, offset %lu"

 msgstr "開啟套件失敗：檔案標頭，位移(offset) %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465
 msgstr "開啟套件失敗：檔案標頭，位移(offset) %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465


@@ -1565,7 +1566,7 @@ msgid "Couldn't change to %s"
 msgstr "無法變換目錄至 %s"
 
 #: apt-inst/deb/debfile.cc:138
 msgstr "無法變換目錄至 %s"
 
 #: apt-inst/deb/debfile.cc:138

-msgid "Internal Error, could not locate member"
+msgid "Internal error, could not locate member"

 msgstr "內部錯誤：無法找到成員"
 
 #: apt-inst/deb/debfile.cc:171
 msgstr "內部錯誤：無法找到成員"
 
 #: apt-inst/deb/debfile.cc:171


@@ -1573,7 +1574,7 @@ msgid "Failed to locate a valid control file"
 msgstr "找不到有效的 control 檔案"
 
 #: apt-inst/deb/debfile.cc:256
 msgstr "找不到有效的 control 檔案"
 
 #: apt-inst/deb/debfile.cc:256

-msgid "Unparsible control file"
+msgid "Unparsable control file"

 msgstr "無法分析的 control 檔案"
 
 #: methods/cdrom.cc:113
 msgstr "無法分析的 control 檔案"
 
 #: methods/cdrom.cc:113


@@ -1583,14 +1584,14 @@ msgstr "無法讀取碟片資料庫『%s』。"
 
 #: methods/cdrom.cc:122
 msgid ""
 
 #: methods/cdrom.cc:122
 msgid ""

-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"

 msgstr ""
 "要讓本程式辨認此碟片，請用『apt-cdrom』工具。『apt-get update』不能用來製造新"
 "的碟片。"
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
 msgstr ""
 "要讓本程式辨認此碟片，請用『apt-cdrom』工具。『apt-get update』不能用來製造新"
 "的碟片。"
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168

-msgid "Wrong CD"
+msgid "Wrong CD-ROM"

 msgstr "碟片不正確。"
 
 #: methods/cdrom.cc:163
 msgstr "碟片不正確。"
 
 #: methods/cdrom.cc:163


@@ -1598,7 +1599,7 @@ msgstr "碟片不正確。"
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。"
 
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。"
 

-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264

 msgid "File not found"
 msgstr "找不到檔案"
 
 msgid "File not found"
 msgstr "找不到檔案"
 


@@ -1629,7 +1630,7 @@ msgstr "無法解析本機名稱。"
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format

-msgid "Server refused our connection and said: %s"
+msgid "The server refused the connection and said: %s"

 msgstr "伺服器因『%s』不受理。"
 
 #: methods/ftp.cc:210
 msgstr "伺服器因『%s』不受理。"
 
 #: methods/ftp.cc:210


@@ -1678,9 +1679,9 @@ msgstr "答覆超過緩衝區長度。"
 msgid "Protocol corruption"
 msgstr "協定失敗。"
 
 msgid "Protocol corruption"
 msgstr "協定失敗。"
 

-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
-msgstr "寫入錯誤"
+#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
+msgid "Write error"
+msgstr "寫入失敗。"

 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"


@@ -1840,19 +1841,19 @@ msgid "Bad header line"
 msgstr "壞的標頭"
 
 #: methods/http.cc:517 methods/http.cc:524
 msgstr "壞的標頭"
 
 #: methods/http.cc:517 methods/http.cc:524

-msgid "The http server sent an invalid reply header"
+msgid "The HTTP server sent an invalid reply header"

 msgstr "http 伺服器傳送一個無效的回覆標頭"
 
 #: methods/http.cc:553
 msgstr "http 伺服器傳送一個無效的回覆標頭"
 
 #: methods/http.cc:553

-msgid "The http server sent an invalid Content-Length header"
+msgid "The HTTP server sent an invalid Content-Length header"

 msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
 
 #: methods/http.cc:568
 msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
 
 #: methods/http.cc:568

-msgid "The http server sent an invalid Content-Range header"
+msgid "The HTTP server sent an invalid Content-Range header"

 msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
 
 #: methods/http.cc:570
 msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
 
 #: methods/http.cc:570

-msgid "This http server has broken range support"
+msgid "This HTTP server has broken range support"

 msgstr "http 伺服器有損毀的範圍支援"
 
 #: methods/http.cc:594
 msgstr "http 伺服器有損毀的範圍支援"
 
 #: methods/http.cc:594


@@ -1880,7 +1881,7 @@ msgid "Error writing to the file"
 msgstr "寫入檔案時發生錯誤"
 
 #: methods/http.cc:832
 msgstr "寫入檔案時發生錯誤"
 
 #: methods/http.cc:832

-msgid "Error reading from server Remote end closed connection"
+msgid "Error reading from server. Remote end closed connection"

 msgstr "從遠端主機讀取錯誤，關閉連線"
 
 #: methods/http.cc:834
 msgstr "從遠端主機讀取錯誤，關閉連線"
 
 #: methods/http.cc:834


@@ -1888,7 +1889,7 @@ msgid "Error reading from server"
 msgstr "從伺服器讀取發生錯誤"
 
 #: methods/http.cc:1065
 msgstr "從伺服器讀取發生錯誤"
 
 #: methods/http.cc:1065

-msgid "Bad header Data"
+msgid "Bad header data"

 msgstr "壞的標頭資料"
 
 #: methods/http.cc:1082
 msgstr "壞的標頭資料"
 
 #: methods/http.cc:1082


@@ -1899,10 +1900,6 @@ msgstr "連線失敗"
 msgid "Internal error"
 msgstr "內部錯誤"
 
 msgid "Internal error"
 msgstr "內部錯誤"
 

-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "找不到檔案"
-

 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "連線不預期的結束"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "連線不預期的結束"


@@ -1943,7 +1940,7 @@ msgstr "語法錯誤 %s:%u: 區塊沒有名稱"
 
 #: apt-pkg/contrib/configuration.cc:586
 #, c-format
 
 #: apt-pkg/contrib/configuration.cc:586
 #, c-format

-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"

 msgstr "語法錯誤 %s:%u: 無效的標籤"
 
 #: apt-pkg/contrib/configuration.cc:603
 msgstr "語法錯誤 %s:%u: 無效的標籤"
 
 #: apt-pkg/contrib/configuration.cc:603


@@ -2068,7 +2065,7 @@ msgstr "無法取得『%s』鎖。"
 
 #: apt-pkg/contrib/fileutl.cc:359
 #, c-format
 
 #: apt-pkg/contrib/fileutl.cc:359
 #, c-format

-msgid "Waited, for %s but it wasn't there"
+msgid "Waited for %s but it wasn't there"

 msgstr "等待 %s 但是它不存在"
 
 #: apt-pkg/contrib/fileutl.cc:369
 msgstr "等待 %s 但是它不存在"
 
 #: apt-pkg/contrib/fileutl.cc:369


@@ -2096,10 +2093,6 @@ msgstr "無法開啟『%s』檔案。"
 msgid "read, still have %lu to read but none left"
 msgstr "讀取，仍有 %lu 未讀"
 
 msgid "read, still have %lu to read but none left"
 msgstr "讀取，仍有 %lu 未讀"
 

-#: apt-pkg/contrib/fileutl.cc:492
-msgid "Write error"
-msgstr "寫入失敗。"
-

 #: apt-pkg/contrib/fileutl.cc:504
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 #: apt-pkg/contrib/fileutl.cc:504
 #, c-format
 msgid "write, still have %lu to write but couldn't"


@@ -2131,7 +2124,7 @@ msgstr "套件暫存檔版本不符合。"
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format

-msgid "This APT does not support the Versioning System '%s'"
+msgid "This APT does not support the versioning system '%s'"

 msgstr "本軟體不支持『%s』版本系統。"
 
 #: apt-pkg/pkgcache.cc:147
 msgstr "本軟體不支持『%s』版本系統。"
 
 #: apt-pkg/pkgcache.cc:147


@@ -2187,15 +2180,15 @@ msgid "extra"
 msgstr "添加"
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
 msgstr "添加"
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89

-msgid "Building Dependency Tree"
+msgid "Building dependency tree"

 msgstr "了解套件依存關係中"
 
 #: apt-pkg/depcache.cc:61
 msgstr "了解套件依存關係中"
 
 #: apt-pkg/depcache.cc:61

-msgid "Candidate Versions"
+msgid "Candidate versions"

 msgstr "候選版本"
 
 #: apt-pkg/depcache.cc:90
 msgstr "候選版本"
 
 #: apt-pkg/depcache.cc:90

-msgid "Dependency Generation"
+msgid "Dependency generation"

 msgstr "產生套件依存關係"
 
 #: apt-pkg/tagfile.cc:73
 msgstr "產生套件依存關係"
 
 #: apt-pkg/tagfile.cc:73


@@ -2225,7 +2218,7 @@ msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)
 
 #: apt-pkg/sourcelist.cc:98
 #, c-format
 
 #: apt-pkg/sourcelist.cc:98
 #, c-format

-msgid "Malformed line %lu in source list %s (Absolute dist)"
+msgid "Malformed line %lu in source list %s (absolute dist)"

 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。"
 
 #: apt-pkg/sourcelist.cc:105
 msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。"
 
 #: apt-pkg/sourcelist.cc:105


@@ -2354,37 +2347,37 @@ msgstr "套件暫存檔使用的是不相容的版本系統。"
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format

-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"

 msgstr "處理『%s』時發生錯誤 (NewPackage)。"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
 msgstr "處理『%s』時發生錯誤 (NewPackage)。"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format

-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"

 msgstr "處理『%s』時發生錯誤 (UsePackage1)。"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
 msgstr "處理『%s』時發生錯誤 (UsePackage1)。"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format

-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"

 msgstr "處理『%s』時發生錯誤 (UsePackage2)。"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
 msgstr "處理『%s』時發生錯誤 (UsePackage2)。"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format

-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"

 msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
 msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format

-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"

 msgstr "處理『%s』時發生錯誤 (NewVersion1)。"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
 msgstr "處理『%s』時發生錯誤 (NewVersion1)。"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format

-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"

 msgstr "處理『%s』時發生錯誤 (UsePackage3)。"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
 msgstr "處理『%s』時發生錯誤 (UsePackage3)。"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format

-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"

 msgstr "處理『%s』時發生錯誤 (NewVersion2)。"
 
 #: apt-pkg/pkgcachegen.cc:207
 msgstr "處理『%s』時發生錯誤 (NewVersion2)。"
 
 #: apt-pkg/pkgcachegen.cc:207


@@ -2401,12 +2394,12 @@ msgstr "依存關係數量超過本程式的能力。"
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format

-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"

 msgstr "處理『%s』時發生錯誤 (FindPkg)。"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
 msgstr "處理『%s』時發生錯誤 (FindPkg)。"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format

-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"

 msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。"
 
 #: apt-pkg/pkgcachegen.cc:260
 msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。"
 
 #: apt-pkg/pkgcachegen.cc:260


@@ -2432,31 +2425,31 @@ msgstr "無法寫入來源暫存檔。"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "檔名因『%s』更換失敗 (%s → %s)。"
 
 msgid "rename failed, %s (%s -> %s)."
 msgstr "檔名因『%s』更換失敗 (%s → %s)。"
 

-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894

 msgid "MD5Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 
 msgid "MD5Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 

-#: apt-pkg/acquire-item.cc:718
+#: apt-pkg/acquire-item.cc:708

 #, 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』需要的某檔案。請您修理這個套件再試試。"
 
 #, 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:771
+#: apt-pkg/acquire-item.cc:761

 #, 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』需要的某檔案。請您修理這個套件再試試。"
 
 #, 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:807
+#: apt-pkg/acquire-item.cc:797

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
 

-#: apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:884

 msgid "Size mismatch"
 msgstr "檔案大小不符合。"
 
 msgid "Size mismatch"
 msgstr "檔案大小不符合。"
 


@@ -2465,7 +2458,7 @@ msgstr "檔案大小不符合。"
 msgid "Vendor block %s contains no fingerprint"
 msgstr "廠商區段%s有錯誤。"
 
 msgid "Vendor block %s contains no fingerprint"
 msgstr "廠商區段%s有錯誤。"
 

-#: apt-pkg/cdrom.cc:487
+#: apt-pkg/cdrom.cc:504

 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"


@@ -2474,68 +2467,68 @@ msgstr ""
 "使用光碟機掛載點 %s\n"
 "掛載光碟機中\n"
 
 "使用光碟機掛載點 %s\n"
 "掛載光碟機中\n"
 

-#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595

 msgid "Identifying.. "
 msgstr "標識中.."
 
 msgid "Identifying.. "
 msgstr "標識中.."
 

-#: apt-pkg/cdrom.cc:521
+#: apt-pkg/cdrom.cc:538

 #, c-format
 #, c-format

-msgid "Stored Label: %s \n"
+msgid "Stored label: %s \n"

 msgstr "保存標誌：%s \n"
 
 msgstr "保存標誌：%s \n"
 

-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:558

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "使用光碟機掛載點 %s\n"
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "使用光碟機掛載點 %s\n"
 

-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:576

 msgid "Unmounting CD-ROM\n"
 msgstr "卸載光碟機中\n"
 
 msgid "Unmounting CD-ROM\n"
 msgstr "卸載光碟機中\n"
 

-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:580

 msgid "Waiting for disc...\n"
 msgstr "等待磁碟中...\n"
 
 #. Mount the new CDROM
 msgid "Waiting for disc...\n"
 msgstr "等待磁碟中...\n"
 
 #. Mount the new CDROM

-#: apt-pkg/cdrom.cc:571
+#: apt-pkg/cdrom.cc:588

 msgid "Mounting CD-ROM...\n"
 msgstr "掛載光碟機中... \n"
 
 msgid "Mounting CD-ROM...\n"
 msgstr "掛載光碟機中... \n"
 

-#: apt-pkg/cdrom.cc:589
-msgid "Scanning Disc for index files..\n"
+#: apt-pkg/cdrom.cc:606
+msgid "Scanning disc for index files..\n"

 msgstr "掃描碟片中的索引檔案..\n"
 
 msgstr "掃描碟片中的索引檔案..\n"
 

-#: apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:644

 #, c-format
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
 
 #, c-format
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
 

-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:701

 msgid "That is not a valid name, try again.\n"
 msgstr "這不是合法名稱，重試一下。\n"
 
 msgid "That is not a valid name, try again.\n"
 msgstr "這不是合法名稱，重試一下。\n"
 

-#: apt-pkg/cdrom.cc:700
+#: apt-pkg/cdrom.cc:717

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"This Disc is called: \n"
+"This disc is called: \n"

 "'%s'\n"
 msgstr ""
 "這個碟片名為：\n"
 "'%s'\n"
 
 "'%s'\n"
 msgstr ""
 "這個碟片名為：\n"
 "'%s'\n"
 

-#: apt-pkg/cdrom.cc:704
+#: apt-pkg/cdrom.cc:721

 msgid "Copying package lists..."
 msgstr "複製套件清單中"
 
 msgid "Copying package lists..."
 msgstr "複製套件清單中"
 

-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:745

 msgid "Writing new source list\n"
 msgstr "寫入新的來源列表中\n"
 
 msgid "Writing new source list\n"
 msgstr "寫入新的來源列表中\n"
 

-#: apt-pkg/cdrom.cc:737
-msgid "Source List entries for this Disc are:\n"
+#: apt-pkg/cdrom.cc:754
+msgid "Source list entries for this disc are:\n"

 msgstr "該碟片的來源列表項目為：\n"
 
 msgstr "該碟片的來源列表項目為：\n"
 

-#: apt-pkg/cdrom.cc:771
+#: apt-pkg/cdrom.cc:788

 msgid "Unmounting CD-ROM..."
 msgstr "卸載光碟機中..."
 
 msgid "Unmounting CD-ROM..."
 msgstr "卸載光碟機中..."
 


@@ -2551,10 +2544,10 @@ msgstr "寫入 %i 筆遺失 %i 個檔案的紀錄。\n"
 
 #: apt-pkg/indexcopy.cc:266
 #, c-format
 
 #: apt-pkg/indexcopy.cc:266
 #, c-format

-msgid "Wrote %i records with %i mismachted files\n"
+msgid "Wrote %i records with %i mismatched files\n"

 msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n"
 
 #: apt-pkg/indexcopy.cc:269
 #, c-format
 msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n"
 
 #: apt-pkg/indexcopy.cc:269
 #, c-format

-msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"

 msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
 msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"