From 68225779d1337336707c33c0265fc537ae256813 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 18 Jan 2013 01:09:43 -0700 Subject: =?UTF-8?q?*=20Merge=20from=20Debian=20unstable,=20pulling=20in=20?= =?UTF-8?q?new=20translations=20and=20fixes.=20*=20Add=20linux-headers=20t?= =?UTF-8?q?o=20/etc/kernel/postinst.d/apt-auto-removal=20guard.=20*=20Cata?= =?UTF-8?q?lan=20(Jordi=20Mallach)=20*=20Drop=20a=20confusing=20non-breaki?= =?UTF-8?q?ng=20space.=20Closes:=20#691024=20*=20Thai=20(Theppitak=20Karoo?= =?UTF-8?q?nboonyanan).=20Closes:=20#691613=20*=20Vietnamese=20(Tr?= =?UTF-8?q?=E1=BA=A7n=20Ng=E1=BB=8Dc=20Qu=C3=A2n).=20Closes:=20#693773=20*?= =?UTF-8?q?=20Fix=20Plural=20forms=20in=20German,=20French,=20Japanese=20a?= =?UTF-8?q?nd=20Portuguese=20=20=20translations.=20Thanks=20to=20Jakub=20W?= =?UTF-8?q?ilk=20for=20reporting=20these=20errors.=20*=20apt-pkg/packagema?= =?UTF-8?q?nager.cc:=20=20=20-=20do=20not=20do=20lock-step=20configuration?= =?UTF-8?q?=20for=20a=20M-A:same=20package=20if=20it=20isn't=20=20=20=20?= =?UTF-8?q?=20unpacked=20yet=20in=20SmartConfigure=20and=20do=20not=20unpa?= =?UTF-8?q?ck=20a=20M-A:same=20package=20=20=20=20=20again=20in=20SmartUnP?= =?UTF-8?q?ack=20if=20we=20have=20already=20configured=20it=20(LP:=20#1062?= =?UTF-8?q?503)=20*=20apt-pkg/depcache.cc:=20=20=20-=20don't=20call=20Mark?= =?UTF-8?q?Install=20with=20the=20FromUser=20flag=20set=20for=20packages?= =?UTF-8?q?=20=20=20=20=20which=20are=20dependencies=20of=20APT::Never-Mar?= =?UTF-8?q?kAuto-Sections=20matchers=20=20=20-=20no=20mode=20changes=20sho?= =?UTF-8?q?uld=20obviously=20be=20ok=20for=20pkgDepCache::IsModeChangeOk?= =?UTF-8?q?=20*=20cmdline/apt-get.cc:=20=20=20-=20do=20not=20call=20Mark{I?= =?UTF-8?q?nstall,Delete}=20from=20the=20autoremove=20code=20with=20=20=20?= =?UTF-8?q?=20=20the=20FromUser=20bit=20set=20to=20avoid=20modifying=20the?= =?UTF-8?q?=20auto-installed=20bit=20*=20apt-pkg/algorithms.cc:=20=20=20-?= =?UTF-8?q?=20ensure=20pkgProblemResolver=20calls=20MarkDelete=20without?= =?UTF-8?q?=20FromUser=20set=20=20=20=20=20so=20that=20it=20can't=20overru?= =?UTF-8?q?le=20holds=20and=20the=20protection=20flag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * change permissions of /var/log/apt/term.log to 0640 (LP: #975199) * apt-pkg/algorithms.cc: - fix package-pointer array memory leak in ResolveByKeepInternal() * Portuguese (Américo Monteiro) (Closes: #686975) * handle packages without a mandatory architecture (debian-policy §5.3) by introducing a pseudo-architecture 'none' so that the small group of users with these packages can get right of them without introducing too much hassle for other users (Closes: #686346) * merged the latest debian-sid fixes Correct fi translation for hash sum mismatches (lp:420403) --- po/zh_TW.po | 316 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 157 insertions(+), 159 deletions(-) (limited to 'po/zh_TW.po') diff --git a/po/zh_TW.po b/po/zh_TW.po index ca1db78fe..cf0f8953d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-11-29 15:43+0000\n" +"POT-Creation-Date: 2012-10-15 09:49+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] %s)。" msgid "MD5Sum mismatch" msgstr "MD5Sum 不符" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870 -#: apt-pkg/acquire-item.cc:2013 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:2002 msgid "Hash Sum mismatch" msgstr "Hash Sum 不符" -#: apt-pkg/acquire-item.cc:1381 +#: apt-pkg/acquire-item.cc:1370 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1386 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1439 +#: apt-pkg/acquire-item.cc:1428 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰:\n" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1466 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1499 +#: apt-pkg/acquire-item.cc:1488 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突:%s(應當是 %s 但卻得到 %s)" -#: apt-pkg/acquire-item.cc:1532 +#: apt-pkg/acquire-item.cc:1521 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2963,12 +2961,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 錯誤: %s: %s" -#: apt-pkg/acquire-item.cc:1646 +#: apt-pkg/acquire-item.cc:1635 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2977,20 +2975,20 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平" "台)" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/acquire-item.cc:1694 #, 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." msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。" -#: apt-pkg/acquire-item.cc:1764 +#: apt-pkg/acquire-item.cc:1753 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/acquire-item.cc:1862 +#: apt-pkg/acquire-item.cc:1851 msgid "Size mismatch" msgstr "大小不符" @@ -3110,22 +3108,22 @@ msgstr "正在寫入新的來源列表\n" msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884 #, c-format msgid "Wrote %i records.\n" msgstr "寫入 %i 筆紀錄。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案不符\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了,有 %i 個檔案不符\n" @@ -3140,13 +3138,13 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum 不符" -#: apt-pkg/indexcopy.cc:662 +#: apt-pkg/indexcopy.cc:665 #, c-format msgid "File %s doesn't start with a clearsigned message" msgstr "" #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/indexcopy.cc:692 +#: apt-pkg/indexcopy.cc:696 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "放棄安裝。" @@ -3218,115 +3216,115 @@ msgstr "" msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:72 +#: apt-pkg/deb/dpkgpm.cc:73 #, c-format msgid "Installing %s" msgstr "正在安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 #, c-format msgid "Configuring %s" msgstr "正在設定 %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 #, c-format msgid "Removing %s" msgstr "正在移除 %s" -#: apt-pkg/deb/dpkgpm.cc:75 +#: apt-pkg/deb/dpkgpm.cc:76 #, fuzzy, c-format msgid "Completely removing %s" msgstr "已完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:76 +#: apt-pkg/deb/dpkgpm.cc:77 #, c-format msgid "Noting disappearance of %s" msgstr "剛注意到 %s 消失" -#: apt-pkg/deb/dpkgpm.cc:77 +#: apt-pkg/deb/dpkgpm.cc:78 #, c-format msgid "Running post-installation trigger %s" msgstr "正在執行安裝後套件後續處理程式 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:704 +#: apt-pkg/deb/dpkgpm.cc:705 #, c-format msgid "Directory '%s' missing" msgstr "找不到 '%s' 目錄" -#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739 +#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "無法開啟檔案 %s" -#: apt-pkg/deb/dpkgpm.cc:944 +#: apt-pkg/deb/dpkgpm.cc:945 #, c-format msgid "Preparing %s" msgstr "正在準備 %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:946 #, c-format msgid "Unpacking %s" msgstr "正在解開 %s" -#: apt-pkg/deb/dpkgpm.cc:950 +#: apt-pkg/deb/dpkgpm.cc:951 #, c-format msgid "Preparing to configure %s" msgstr "正在準備設定 %s" -#: apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:953 #, c-format msgid "Installed %s" msgstr "已安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:957 +#: apt-pkg/deb/dpkgpm.cc:958 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備移除 %s" -#: apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:960 #, c-format msgid "Removed %s" msgstr "已移除 %s" -#: apt-pkg/deb/dpkgpm.cc:964 +#: apt-pkg/deb/dpkgpm.cc:965 #, c-format msgid "Preparing to completely remove %s" msgstr "正在準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:966 #, c-format msgid "Completely removed %s" msgstr "已完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:1212 +#: apt-pkg/deb/dpkgpm.cc:1213 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "無法寫入記錄檔,openpty() 失敗(/dev/pts 未掛載?)\n" -#: apt-pkg/deb/dpkgpm.cc:1242 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Running dpkg" msgstr "執行 dpkg" -#: apt-pkg/deb/dpkgpm.cc:1414 +#: apt-pkg/deb/dpkgpm.cc:1415 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1476 +#: apt-pkg/deb/dpkgpm.cc:1477 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1481 +#: apt-pkg/deb/dpkgpm.cc:1482 msgid "dependency problems - leaving unconfigured" msgstr "依存關係問題 - 維持為未設定" -#: apt-pkg/deb/dpkgpm.cc:1483 +#: apt-pkg/deb/dpkgpm.cc:1484 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1489 +#: apt-pkg/deb/dpkgpm.cc:1490 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3338,13 +3336,7 @@ msgid "" "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1530 +#: apt-pkg/deb/dpkgpm.cc:1503 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3373,6 +3365,12 @@ msgstr "dpkg 作業遭中斷,必須手動執行 '%s' 以修正問題。 " msgid "Not locked" msgstr "未鎖定" +#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + #, fuzzy #~ msgid "Skipping nonexistent file %s" #~ msgstr "開啟設定檔 %s" -- cgit v1.2.3