msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-21 15:49+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
#, c-format
msgid "Unable to locate package %s"
msgid "Total space accounted for: "
msgstr "統計後的空間合計："
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
#, c-format
msgid "Package file %s is out of sync."
msgstr "套件檔 %s 未同步。"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
-#: cmdline/apt-cache.cc:1726
+#: cmdline/apt-cache.cc:1725
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
"請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n"
-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+#: cmdline/apt-cdrom.cc:77
+#, fuzzy
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "請替這張光碟取個名字，像是 'Debian 2.1r1 Disk 1'"
-#: cmdline/apt-cdrom.cc:93
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "請把光碟放入光碟機，然後按下 [Enter] 鍵"
-#: cmdline/apt-cdrom.cc:117
+#: cmdline/apt-cdrom.cc:114
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "請對您的光碟組中的其它光碟重複相同的操作。"
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
#, c-format
msgid "Unable to write to %s"
msgstr "無法寫入 %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " 達到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
msgid "Archive had no package field"
msgstr "套件檔裡沒有套件資訊"
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 沒有重新定義項目\n"
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的維護者是 %s，而非 %s\n"
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 沒有原始碼重新定義項目\n"
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 也沒有二元碼重新定義項目\n"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示式時發生錯誤 - %s"
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個沒有完整得安裝或移除。\n"
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:669
msgid "Correcting dependencies..."
msgstr "正在修正相依關係..."
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:672
msgid " failed."
msgstr " 失敗。"
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:675
msgid "Unable to correct dependencies"
msgstr "無法修正相依關係"
-#: cmdline/apt-get.cc:679
+#: cmdline/apt-get.cc:678
msgid "Unable to minimize the upgrade set"
msgstr "無法將升級計劃最小化"
-#: cmdline/apt-get.cc:681
+#: cmdline/apt-get.cc:680
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:684
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "您也許得執行 `apt-get -f install' 以修正這些問題。"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:687
msgid "Unmet dependencies. Try using -f."
msgstr "未能滿足相依關係。試試 -f 選項。"
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:712
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】：無法驗證下列套件！"
-#: cmdline/apt-get.cc:714
+#: cmdline/apt-get.cc:716
msgid "Authentication warning overridden.\n"
msgstr "忽略了驗證警告。\n"
-#: cmdline/apt-get.cc:721
+#: cmdline/apt-get.cc:723
msgid "Install these packages without verification [y/N]? "
msgstr "是否不經驗證就安裝這些套件？[y/N]"
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:725
msgid "Some packages could not be authenticated"
msgstr "有部份套件無法驗證"
-#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
msgid "There are problems and -y was used without --force-yes"
msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用"
-#: cmdline/apt-get.cc:776
+#: cmdline/apt-get.cc:775
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:784
msgid "Packages need to be removed but remove is disabled."
msgstr "有套件需要被移除，但卻被禁止移除。"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:795
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤，排序未能完成"
-#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載目錄"
-#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "無法讀取來源列表。"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:836
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "怪哉... 檔案大小不符，請發信給 apt@packages.debian.org"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:841
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下載 %sB/%sB 的套件檔。\n"
-#: cmdline/apt-get.cc:845
+#: cmdline/apt-get.cc:844
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下載 %sB 的套件檔。\n"
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:849
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n"
-#: cmdline/apt-get.cc:853
+#: cmdline/apt-get.cc:852
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "無法確認 %s 的未使用空間"
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:880
#, c-format
msgid "You don't have enough free space in %s."
msgstr "在 %s 裡沒有足夠的的未使用空間。"
-#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 trivial 操作。"
-#: cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:898
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:900
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"請輸入 '%s' 這個句子以繼續進行\n"
" ?] "
-#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
msgid "Abort."
msgstr "放棄執行。"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:921
msgid "Do you want to continue [Y/n]? "
msgstr "是否繼續進行 [Y/n]？"
-#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s，%s\n"
-#: cmdline/apt-get.cc:1005
+#: cmdline/apt-get.cc:1011
msgid "Some files failed to download"
msgstr "有部份檔案無法下載"
-#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
msgid "Download complete and in download only mode"
msgstr "下載完成，且這是『僅下載』模式"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1018
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
"有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選"
"項？"
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1022
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前尚未支援 --fix-missing 和媒體抽換"
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1027
msgid "Unable to correct missing packages."
msgstr "無法修正欠缺的套件。"
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1028
msgid "Aborting install."
msgstr "放棄安裝。"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1086
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意，選擇了以 %s 替代 %s\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1097
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1115
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1126
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "套件 %s 是虛擬套件，提供者為：\n"
-#: cmdline/apt-get.cc:1107
+#: cmdline/apt-get.cc:1138
msgid " [Installed]"
msgstr "【已安裝】"
-#: cmdline/apt-get.cc:1112
+#: cmdline/apt-get.cc:1143
msgid "You should explicitly select one to install."
msgstr "請您明確地選擇一個來進行安裝。"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1148
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"無法取得套件 %s，但它卻被其它的套件引用了。\n"
"這意味著這個套件可能已經消失了、被廢棄了，或是只能由其他的來源取得\n"
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1167
msgid "However the following packages replace it:"
msgstr "然而，下列的套件取代了它："
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Package %s has no installation candidate"
msgstr "套件 %s 沒有可安裝的候選版本"
-#: cmdline/apt-get.cc:1159
+#: cmdline/apt-get.cc:1190
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "無法重新安裝 %s，因為它無法下載。\n"
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1198
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已經是最新版本了。\n"
-#: cmdline/apt-get.cc:1196
+#: cmdline/apt-get.cc:1227
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1229
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "找不到 '%s' 版的 '%s'"
-#: cmdline/apt-get.cc:1204
+#: cmdline/apt-get.cc:1235
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
-#: cmdline/apt-get.cc:1310
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
#, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1348
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "無法取得來源套件列表 %s 的狀態"
+
+#: cmdline/apt-get.cc:1383
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1396
msgid "Unable to lock the list directory"
msgstr "無法鎖定列表目錄"
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1452
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
-#: cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1501
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "以下套件是被自動安裝進來的，且已不再會被用到了："
-#: cmdline/apt-get.cc:1447
+#: cmdline/apt-get.cc:1503
+#, fuzzy, c-format
+msgid "%lu packages were automatically installed and are no longer required.\n"
+msgstr "以下套件是被自動安裝進來的，且已不再會被用到了："
+
+#: cmdline/apt-get.cc:1504
msgid "Use 'apt-get autoremove' to remove them."
msgstr "使用 'apt-get autoremove' 來將其移除。"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1509
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
msgid "The following information may help to resolve the situation:"
msgstr "以下的資訊或許有助於解決當前的情況："
-#: cmdline/apt-get.cc:1459
+#: cmdline/apt-get.cc:1516
msgid "Internal Error, AutoRemover broke stuff"
msgstr "內部錯誤，AutoRemover 處理失敗"
-#: cmdline/apt-get.cc:1478
+#: cmdline/apt-get.cc:1535
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤，AllUpgrade 造成了損壞"
-#: cmdline/apt-get.cc:1533
+#: cmdline/apt-get.cc:1590
#, c-format
msgid "Couldn't find task %s"
msgstr "無法找到主題 %s"
-#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:1728
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1759
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-get.cc:1715
+#: cmdline/apt-get.cc:1772
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您也許得執行 `apt-get -f install' 以修正這些問題："
-#: cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:1775
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
"決方案）。"
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1787
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"
"有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
"unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1805
msgid "Broken packages"
msgstr "損毀的套件"
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1834
msgid "The following extra packages will be installed:"
msgstr "下列的額外套件將被安裝："
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1923
msgid "Suggested packages:"
msgstr "建議套件："
-#: cmdline/apt-get.cc:1867
+#: cmdline/apt-get.cc:1924
msgid "Recommended packages:"
msgstr "推薦套件："
-#: cmdline/apt-get.cc:1896
+#: cmdline/apt-get.cc:1953
msgid "Calculating upgrade... "
msgstr "籌備升級中... "
-#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1961
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤，問題排除器造成了損壞"
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2136
msgid "Must specify at least one package to fetch source for"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 的原始碼套件"
-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2215
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已下載的檔案 '%s'\n"
-#: cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:2250
#, c-format
msgid "You don't have enough free space in %s"
msgstr "在 %s 裡沒有足夠的的未使用空間"
-#: cmdline/apt-get.cc:2192
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2259
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2201
+#: cmdline/apt-get.cc:2265
#, c-format
msgid "Fetch source %s\n"
msgstr "取得原始碼 %s\n"
-#: cmdline/apt-get.cc:2232
+#: cmdline/apt-get.cc:2296
msgid "Failed to fetch some archives."
msgstr "無法取得某些套件檔。"
-#: cmdline/apt-get.cc:2260
+#: cmdline/apt-get.cc:2324
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "不解開，因原始碼已解開至 %s\n"
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2337
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-#: cmdline/apt-get.cc:2290
+#: cmdline/apt-get.cc:2354
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "編譯指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2309
+#: cmdline/apt-get.cc:2373
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2389
msgid "Must specify at least one package to check builddeps for"
msgstr "在檢查編譯相依關係時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2353
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的編譯相依關係資訊"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2437
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 沒有編譯相依關係。\n"
-#: cmdline/apt-get.cc:2425
+#: cmdline/apt-get.cc:2489
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2542
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
msgstr ""
"無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2578
#, 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:2541
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
-#: cmdline/apt-get.cc:2555
+#: cmdline/apt-get.cc:2621
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 的編譯相依關係。"
-#: cmdline/apt-get.cc:2559
+#: cmdline/apt-get.cc:2626
msgid "Failed to process build dependencies"
msgstr "無法處理編譯相依關係"
-#: cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:2658
msgid "Supported modules:"
msgstr "已支援模組："
-#: cmdline/apt-get.cc:2632
+#: cmdline/apt-get.cc:2699
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
"以取得更多資訊和選項。\n"
" 該 APT 有著超級牛力。\n"
-#: cmdline/apt-get.cc:2799
+#: cmdline/apt-get.cc:2866
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
msgstr "您想移除所有先前下載的 .deb 檔嗎？"
#: dselect/install:101
-msgid "Some errors occurred while unpacking. I'm going to configure the"
+#, fuzzy
+msgid "Some errors occurred while unpacking. Packages that were installed"
msgstr "在解開套件時發生錯誤。我要準備設定"
#: dselect/install:102
-msgid "packages that were installed. This may result in duplicate errors"
+#, fuzzy
+msgid "will be configured. This may result in duplicate errors"
msgstr "套件已安裝過。這會造成重複錯誤"
#: dselect/install:103
msgid "Error reading archive member header"
msgstr "讀取套件檔的成員標頭訊息時發生錯誤"
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:90
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "無效的套件檔成員標頭"
+
+#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
msgstr "無效的套件檔成員標頭"
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:822
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
msgstr "無法讀取 %s"
msgstr "資料目錄與暫存目錄需位於同一檔案系統中"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
-#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
-#: apt-pkg/pkgcachegen.cc:957
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
+#: apt-pkg/pkgcachegen.cc:961
msgid "Reading package lists"
msgstr "正在讀取套件清單"
msgid "Unparsable control file"
msgstr "無法分析的 control 檔"
-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:200
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "無法讀取光碟片資料庫 %s"
-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:209
msgid ""
"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 能辨識這張光碟。apt-get update 是不能用來新增光碟的"
-#: methods/cdrom.cc:131
+#: methods/cdrom.cc:219
msgid "Wrong CD-ROM"
msgstr "不正確的光碟"
-#: methods/cdrom.cc:166
+#: methods/cdrom.cc:245
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。"
-#: methods/cdrom.cc:171
+#: methods/cdrom.cc:250
msgid "Disk not found."
msgstr "找不到磁碟。"
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "找不到檔案"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "無法取得狀態"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "無法設定修改時間"
msgstr "不正確的 URI，本機 URI 不應以 // 開頭"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
+#: methods/ftp.cc:167
msgid "Logging in"
msgstr "登入中"
-#: methods/ftp.cc:168
+#: methods/ftp.cc:173
msgid "Unable to determine the peer name"
msgstr "無法解析對方主機名稱"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:178
msgid "Unable to determine the local name"
msgstr "無法解析本機名稱"
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:209 methods/ftp.cc:237
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "伺服器不接受連線，並回應：%s"
-#: methods/ftp.cc:210
+#: methods/ftp.cc:215
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 指令失敗，伺服器回應：%s"
-#: methods/ftp.cc:217
+#: methods/ftp.cc:222
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 指令失敗，伺服器回應：%s"
-#: methods/ftp.cc:237
+#: methods/ftp.cc:242
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
"指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。"
-#: methods/ftp.cc:265
+#: methods/ftp.cc:270
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s"
-#: methods/ftp.cc:291
+#: methods/ftp.cc:296
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 指令失敗，伺服器回應：%s"
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "連線逾時"
-#: methods/ftp.cc:335
+#: methods/ftp.cc:340
msgid "Server closed the connection"
msgstr "伺服器已關閉連線"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
+#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "讀取錯誤"
-#: methods/ftp.cc:345 methods/rsh.cc:197
+#: methods/ftp.cc:350 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "回應超過緩衝區長度。"
-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:367 methods/ftp.cc:379
msgid "Protocol corruption"
msgstr "協定失敗"
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
+#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "寫入錯誤"
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
msgid "Could not create a socket"
msgstr "無法建立 Socket"
-#: methods/ftp.cc:698
+#: methods/ftp.cc:703
msgid "Could not connect data socket, connection timed out"
msgstr "無法和 data socket 連線，連線逾時"
-#: methods/ftp.cc:704
+#: methods/ftp.cc:709
msgid "Could not connect passive socket."
msgstr "無法和 passive socket 連線。"
-#: methods/ftp.cc:722
+#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo 無法取得監聽 socket"
-#: methods/ftp.cc:736
+#: methods/ftp.cc:741
msgid "Could not bind a socket"
msgstr "無法 bind 至 socket"
-#: methods/ftp.cc:740
+#: methods/ftp.cc:745
msgid "Could not listen on the socket"
msgstr "無法監聽 socket"
-#: methods/ftp.cc:747
+#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
msgstr "無法解析 socket 名稱"
-#: methods/ftp.cc:779
+#: methods/ftp.cc:784
msgid "Unable to send PORT command"
msgstr "無法送出 PORT 指令"
-#: methods/ftp.cc:789
+#: methods/ftp.cc:794
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "未知的地址家族 %u (AF_*)"
-#: methods/ftp.cc:798
+#: methods/ftp.cc:803
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 指令失敗，伺服器回應：%s"
-#: methods/ftp.cc:818
+#: methods/ftp.cc:823
msgid "Data socket connect timed out"
msgstr "Data socket 連線逾時"
-#: methods/ftp.cc:825
+#: methods/ftp.cc:830
msgid "Unable to accept connection"
msgstr "無法接受連線"
-#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "有問題的雜湊檔"
-#: methods/ftp.cc:877
+#: methods/ftp.cc:882
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "無法取得檔案，伺服器回應 '%s'"
-#: methods/ftp.cc:892 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Data socket 連線逾時"
-#: methods/ftp.cc:922
+#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "資料傳輸失敗，伺服器回應 '%s'"
#. Get the files information
-#: methods/ftp.cc:997
+#: methods/ftp.cc:1002
msgid "Query"
msgstr "查詢"
-#: methods/ftp.cc:1109
+#: methods/ftp.cc:1114
msgid "Unable to invoke "
msgstr "無法 invoke "
msgstr "暫時無法解析 '%s'"
#: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "在解析 '%s:%s' (%i) 時出了怪事"
#: methods/connect.cc:240
-#, c-format
-msgid "Unable to connect to %s %s:"
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
msgstr "無法連線至 %s %s："
#: methods/gpgv.cc:71
msgid "Read error from %s process"
msgstr "由 %s 程序讀取錯誤"
-#: methods/http.cc:379
+#: methods/http.cc:384
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:525
+#: methods/http.cc:530
#, c-format
msgid "Got a single header line over %u chars"
msgstr "取得一個單行超過 %u 字元的標頭"
-#: methods/http.cc:533
+#: methods/http.cc:538
msgid "Bad header line"
msgstr "標頭行錯誤"
-#: methods/http.cc:552 methods/http.cc:559
+#: methods/http.cc:557 methods/http.cc:564
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 伺服器傳送了一個無效的回覆標頭"
-#: methods/http.cc:588
+#: methods/http.cc:593
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭"
-#: methods/http.cc:603
+#: methods/http.cc:608
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭"
-#: methods/http.cc:605
+#: methods/http.cc:610
msgid "This HTTP server has broken range support"
msgstr "這個 HTTP 伺服器的範圍支援有問題"
-#: methods/http.cc:629
+#: methods/http.cc:634
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:782
+#: methods/http.cc:788
msgid "Select failed"
msgstr "選擇失敗"
-#: methods/http.cc:787
+#: methods/http.cc:793
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:810
+#: methods/http.cc:816
msgid "Error writing to output file"
msgstr "在寫入輸出檔時發生錯誤"
-#: methods/http.cc:841
+#: methods/http.cc:847
msgid "Error writing to file"
msgstr "在寫入檔案時發生錯誤"
-#: methods/http.cc:869
+#: methods/http.cc:875
msgid "Error writing to the file"
msgstr "在寫入該檔時發生錯誤"
-#: methods/http.cc:883
+#: methods/http.cc:889
msgid "Error reading from server. Remote end closed connection"
msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
-#: methods/http.cc:885
+#: methods/http.cc:891
msgid "Error reading from server"
msgstr "在讀取伺服器時發生錯誤"
-#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "無法截短檔案"
-#: methods/http.cc:1141
+#: methods/http.cc:1147
msgid "Bad header data"
msgstr "錯誤的標頭資料"
-#: methods/http.cc:1158 methods/http.cc:1213
+#: methods/http.cc:1164 methods/http.cc:1219
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1305
+#: methods/http.cc:1311
msgid "Internal error"
msgstr "內部錯誤"
-#: apt-pkg/contrib/mmap.cc:80
+#: apt-pkg/contrib/mmap.cc:76
msgid "Can't mmap an empty file"
msgstr "不能 mmap 空白檔案"
-#: apt-pkg/contrib/mmap.cc:85
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "無法 mmap 到 %lu 位元組"
-#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。"
"(man 5 apt.conf)"
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:335
+#: apt-pkg/contrib/strutl.cc:346
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:342
+#: apt-pkg/contrib/strutl.cc:353
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:349
+#: apt-pkg/contrib/strutl.cc:360
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:354
+#: apt-pkg/contrib/strutl.cc:365
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1029
+#: apt-pkg/contrib/strutl.cc:1040
#, c-format
msgid "Selection %s not found"
msgstr "選項 %s 找不到"
-#: apt-pkg/contrib/configuration.cc:439
+#: apt-pkg/contrib/configuration.cc:458
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "無法辨識的縮寫類型：'%c'"
-#: apt-pkg/contrib/configuration.cc:497
+#: apt-pkg/contrib/configuration.cc:516
#, c-format
msgid "Opening configuration file %s"
msgstr "開啟設定檔 %s"
-#: apt-pkg/contrib/configuration.cc:663
+#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。"
-#: apt-pkg/contrib/configuration.cc:682
+#: apt-pkg/contrib/configuration.cc:703
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "語法錯誤 %s:%u：標籤格式錯誤"
-#: apt-pkg/contrib/configuration.cc:699
+#: apt-pkg/contrib/configuration.cc:720
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾"
-#: apt-pkg/contrib/configuration.cc:739
+#: apt-pkg/contrib/configuration.cc:760
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
-#: apt-pkg/contrib/configuration.cc:746
+#: apt-pkg/contrib/configuration.cc:767
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
-#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
+#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "語法錯誤 %s:%u：從此引入"
-#: apt-pkg/contrib/configuration.cc:759
+#: apt-pkg/contrib/configuration.cc:780
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "語法錯誤 %s:%u：不支援的指令 '%s'"
-#: apt-pkg/contrib/configuration.cc:810
+#: apt-pkg/contrib/configuration.cc:831
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾"
msgid "Unable to stat the mount point %s"
msgstr "無法取得掛載點 %s 的狀態"
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
#, c-format
msgid "Unable to change to %s"
msgstr "無法切換至 %s"
-#: apt-pkg/contrib/cdromutl.cc:188
+#: apt-pkg/contrib/cdromutl.cc:195
msgid "Failed to stat the cdrom"
msgstr "無法取得 CD-ROM 的狀態"
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
-#: apt-pkg/contrib/fileutl.cc:455
+#: apt-pkg/contrib/fileutl.cc:456
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子程序 %s 收到一個記憶體錯誤。"
-#: apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:458
#, fuzzy, c-format
-#| msgid "Sub-process %s received a segmentation fault."
msgid "Sub-process %s received signal %u."
msgstr "子程序 %s 收到一個記憶體錯誤。"
-#: apt-pkg/contrib/fileutl.cc:460
+#: apt-pkg/contrib/fileutl.cc:462
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子程序 %s 傳回錯誤碼 (%u)"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:464
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子程序 %s 不預期得結束"
-#: apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:508
#, c-format
msgid "Could not open file %s"
msgstr "無法開啟檔案 %s"
-#: apt-pkg/contrib/fileutl.cc:562
+#: apt-pkg/contrib/fileutl.cc:564
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "讀取，仍有 %lu 未讀但已無空間"
-#: apt-pkg/contrib/fileutl.cc:592
+#: apt-pkg/contrib/fileutl.cc:594
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
-#: apt-pkg/contrib/fileutl.cc:667
+#: apt-pkg/contrib/fileutl.cc:669
msgid "Problem closing the file"
msgstr "在關閉檔案時發生問題"
-#: apt-pkg/contrib/fileutl.cc:673
+#: apt-pkg/contrib/fileutl.cc:675
msgid "Problem unlinking the file"
msgstr "在刪除檔案時發生問題"
-#: apt-pkg/contrib/fileutl.cc:684
+#: apt-pkg/contrib/fileutl.cc:686
msgid "Problem syncing the file"
msgstr "在同步檔案時發生問題"
msgid "Dependency generation"
msgstr "建立相依關係"
-#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
msgid "Reading state information"
msgstr "正在讀取狀態資料"
-#: apt-pkg/depcache.cc:221
+#: apt-pkg/depcache.cc:223
#, c-format
msgid "Failed to open StateFile %s"
msgstr "無法開啟 StateFile %s"
-#: apt-pkg/depcache.cc:227
+#: apt-pkg/depcache.cc:229
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "無法寫入暫存的 StateFile %s"
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:206
#, c-format
msgid "Opening %s"
msgstr "正在開啟 %s"
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:243
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:247
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（提供者 ID）"
-#: apt-pkg/packagemanager.cc:428
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但"
"若您執意進行，請設定 APT::Force-LoopBreak 選項。"
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。"
-#: apt-pkg/algorithms.cc:1154
+#: apt-pkg/algorithms.cc:1138
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套"
"件。"
-#: apt-pkg/algorithms.cc:1156
+#: apt-pkg/algorithms.cc:1140
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
-#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
+#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:826
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在取得檔案 %li/%li（還有 %s）"
-#: apt-pkg/acquire.cc:831
+#: apt-pkg/acquire.cc:828
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在取得檔案 %li/%li"
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:132
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支援的套件包裝系統 '%s'"
-#: apt-pkg/init.cc:141
+#: apt-pkg/init.cc:148
msgid "Unable to determine a suitable packaging system type"
msgstr "無法確認合適的套件包裝系統類型"
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:56
#, c-format
msgid "Unable to stat %s."
msgstr "無法取得 %s 的狀態。"
msgid "You may want to run apt-get update to correct these problems"
msgstr "您也許得執行 apt-get update 以修正這些問題"
-#: apt-pkg/policy.cc:329
+#: apt-pkg/policy.cc:347
#, fuzzy, c-format
-#| msgid "Invalid record in the preferences file, no Package header"
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭"
-#: apt-pkg/policy.cc:351
+#: apt-pkg/policy.cc:369
#, c-format
msgid "Did not understand pin type %s"
msgstr "無法分析鎖定類型 %s"
-#: apt-pkg/policy.cc:359
+#: apt-pkg/policy.cc:377
msgid "No priority (or zero) specified for pin"
msgstr "銷定並沒有優先順序之分（或零）"
-#: apt-pkg/pkgcachegen.cc:72
+#: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
msgstr "快取使用的是不相容的版本系統"
-#: apt-pkg/pkgcachegen.cc:115
+#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "在處理 %s 時發生錯誤 (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:130
+#: apt-pkg/pkgcachegen.cc:132
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "在處理 %s 時發生錯誤 (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:164
+#: apt-pkg/pkgcachegen.cc:166
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "在處理 %s 時發生錯誤 (NewFileDesc1)"
-#: apt-pkg/pkgcachegen.cc:189
+#: apt-pkg/pkgcachegen.cc:191
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "在處理 %s 時發生錯誤 (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:193
+#: apt-pkg/pkgcachegen.cc:195
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "在處理 %s 時發生錯誤 (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:224
+#: apt-pkg/pkgcachegen.cc:226
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "在處理 %s 時發生錯誤 (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:230
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "在處理 %s 時發生錯誤 (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:232
+#: apt-pkg/pkgcachegen.cc:234
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "在處理 %s 時發生錯誤 (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:258
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "在處理 %s 時發生錯誤 (NewFileDesc2)"
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
-#: apt-pkg/pkgcachegen.cc:265
+#: apt-pkg/pkgcachegen.cc:267
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
-#: apt-pkg/pkgcachegen.cc:268
+#: apt-pkg/pkgcachegen.cc:270
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
-#: apt-pkg/pkgcachegen.cc:271
+#: apt-pkg/pkgcachegen.cc:273
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
-#: apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:301
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:312
+#: apt-pkg/pkgcachegen.cc:314
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:318
+#: apt-pkg/pkgcachegen.cc:320
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "在計算檔案相依性時找不到套件 %s %s"
-#: apt-pkg/pkgcachegen.cc:690
+#: apt-pkg/pkgcachegen.cc:693
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "無法取得來源套件列表 %s 的狀態"
-#: apt-pkg/pkgcachegen.cc:775
+#: apt-pkg/pkgcachegen.cc:778
msgid "Collecting File Provides"
msgstr "正在收集檔案提供者"
-#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
+#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
msgid "IO Error saving source cache"
msgstr "在儲存來源快取時 IO 錯誤"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:128
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "無法重新命名，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:401
+#: apt-pkg/acquire-item.cc:396
msgid "MD5Sum mismatch"
msgstr "MD5Sum 不符"
-#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
msgid "Hash Sum mismatch"
msgstr "Hash Sum 不符"
-#: apt-pkg/acquire-item.cc:1118
+#: apt-pkg/acquire-item.cc:1114
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法取得以下的密鑰 ID 的公鑰：\n"
-#: apt-pkg/acquire-item.cc:1231
+#: apt-pkg/acquire-item.cc:1224
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平"
"台）"
-#: apt-pkg/acquire-item.cc:1290
+#: apt-pkg/acquire-item.cc:1283
#, 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:1331
+#: apt-pkg/acquire-item.cc:1324
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
-#: apt-pkg/acquire-item.cc:1418
+#: apt-pkg/acquire-item.cc:1411
msgid "Size mismatch"
msgstr "大小不符"
msgid "Vendor block %s contains no fingerprint"
msgstr "提供者區塊 %s 沒有包含指紋碼"
-#: apt-pkg/cdrom.cc:529
+#: apt-pkg/cdrom.cc:525
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"使用光碟機掛載點 %s\n"
"正在掛載光碟機\n"
-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
msgid "Identifying.. "
msgstr "正在識別.."
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:559
#, c-format
msgid "Stored label: %s\n"
msgstr "保存標籤：%s\n"
-#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
msgid "Unmounting CD-ROM...\n"
msgstr "正在卸載光碟機...\n"
-#: apt-pkg/cdrom.cc:590
+#: apt-pkg/cdrom.cc:585
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "使用光碟機掛載點 %s\n"
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:603
msgid "Unmounting CD-ROM\n"
msgstr "正在卸載光碟機\n"
-#: apt-pkg/cdrom.cc:612
+#: apt-pkg/cdrom.cc:607
msgid "Waiting for disc...\n"
msgstr "正在等待碟片...\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc:615
msgid "Mounting CD-ROM...\n"
msgstr "正在掛載光碟機... \n"
-#: apt-pkg/cdrom.cc:638
+#: apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
msgstr "正在掃描碟片中的索引檔..\n"
-#: apt-pkg/cdrom.cc:678
+#: apt-pkg/cdrom.cc:673
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
"zu signatures\n"
msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n"
-#: apt-pkg/cdrom.cc:689
+#: apt-pkg/cdrom.cc:684
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:715
+#: apt-pkg/cdrom.cc:710
#, c-format
msgid "Found label '%s'\n"
msgstr "找到標籤 '%s'\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
msgstr "這並不是正確的名稱，請重試。\n"
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid ""
"This disc is called: \n"
"這個碟片名為：\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:764
+#: apt-pkg/cdrom.cc:759
msgid "Copying package lists..."
msgstr "正在複製套件清單..."
-#: apt-pkg/cdrom.cc:790
+#: apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
msgstr "正在寫入新的來源列表\n"
-#: apt-pkg/cdrom.cc:799
+#: apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
msgstr "該碟片的來源列表項目為：\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
#, c-format
msgid "Wrote %i records.\n"
msgstr "寫入 %i 筆紀錄。\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n"
msgid "Installing %s"
msgstr "正在安裝 %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Configuring %s"
msgstr "正在設定 %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Removing %s"
msgstr "正在移除 %s"
msgid "Running post-installation trigger %s"
msgstr "正在執行安裝後套件後續處理程式 %s"
-#: apt-pkg/deb/dpkgpm.cc:546
+#: apt-pkg/deb/dpkgpm.cc:557
#, c-format
msgid "Directory '%s' missing"
msgstr "找不到 '%s' 目錄"
-#: apt-pkg/deb/dpkgpm.cc:635
+#: apt-pkg/deb/dpkgpm.cc:653
#, c-format
msgid "Preparing %s"
msgstr "正在準備 %s"
-#: apt-pkg/deb/dpkgpm.cc:636
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Unpacking %s"
msgstr "正在解開 %s"
-#: apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/deb/dpkgpm.cc:659
#, c-format
msgid "Preparing to configure %s"
msgstr "正在準備設定 %s"
-#: apt-pkg/deb/dpkgpm.cc:643
+#: apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Installed %s"
msgstr "已安裝 %s"
-#: apt-pkg/deb/dpkgpm.cc:648
+#: apt-pkg/deb/dpkgpm.cc:666
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在準備移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:650
+#: apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removed %s"
msgstr "已移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:673
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在準備完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:656
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Completely removed %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:878
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n"
-#: apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:907
msgid "Running dpkg"
msgstr ""
#: apt-pkg/deb/debsystem.cc:73
#, fuzzy, c-format
-#| msgid "Unable to lock the list directory"
msgid "Unable to lock the administration directory (%s), are you root?"
msgstr "無法鎖定列表目錄"
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "無法修補檔案"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "連線突然終止"
+#~ msgid "Could not patch file"
+#~ msgstr "無法修補檔案"
+
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
projects / apt.git / blobdiff