X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/2ca0a410fadaa3c01d4573a87c074cb8e64a02c4..18a14a834e4068917d97467a3a52f17ed6055da3:/po/zh_CN.po?ds=inline diff --git a/po/zh_CN.po b/po/zh_CN.po index f887f3328..82ae505ef 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,159 +1,169 @@ # Chinese/Simplified translation of apt. # This file is put in the public domain. -# Tchaikov <tchaikov@sjtu.edu.cn>, 2005. +# Tchaikov <tchaikov@sjtu.org>, 2005,2007. # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006 # msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" -"PO-Revision-Date: 2006-02-22 14:20+1300\n" -"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n" +"POT-Creation-Date: 2007-08-04 09:09+0200\n" +"PO-Revision-Date: 2007-03-29 17:14+0800\n" +"Last-Translator: Kov Chai <tchaikov@sjtu.org>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "çæ¬ä¸º %2$s ç软件å %1$s ææªæ»¡è¶³çä¾èµå ³ç³»ï¼\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "æªåç°è½¯ä»¶å %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "软件å æ»æ°(æå称计)ï¼" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " æ®é软件å ï¼" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " å®å ¨èæ软件å ï¼" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " åèæ软件å ï¼" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " æ··åèæ软件å ï¼" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " 缺æ¼çï¼" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "æçæ¬å ±è®¡ï¼" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "æçæ¬å ±è®¡ï¼" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "æä¾èµå ³ç³»å ±è®¡ï¼" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "æçæ¬/æä»¶å ³ç³»å ±è®¡ï¼" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "æçæ¬/æä»¶å ³ç³»å ±è®¡ï¼" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "æä¾æ å°å ±è®¡ï¼" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Glob åä¸²å ±è®¡ï¼" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "ä¾èµå ³ç³»çæ¬åæå 空é´å ±è®¡ï¼" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Slack 空é´å ±è®¡ï¼" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "æ»å ç¨ç©ºé´ï¼" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "软件å æ件 %s å°æªåæ¥(sync)ã" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "æ¨å¿ é¡»æç¡®å°ç»åºä¸ä¸ªè¡¨è¾¾å¼" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "没æåç°å»åç软件å " -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "软件å æ件ï¼" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "ç¼åå°æªåæ¥(sync)ï¼æ æ³äº¤å·®å¼è¯(x-ref)ä¸ä¸ªè½¯ä»¶å æ件" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "被éå®(pinned)ç软件å ï¼" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(没ææ¾å°)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " å·²å®è£ ï¼" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(æ )" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " åéç软件å ï¼" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " 软件å é(Pin)ï¼" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " çæ¬å表ï¼" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" 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 -#, c-format -msgid "%s %s for %s %s compiled on %s %s\n" +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s ï¼ç¼è¯äº %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,7 @@ msgstr "" " -c=? 读æå®çé ç½®æ件\n" " -o=? 设置任ææå®çé ç½®é项ï¼ä¾å¦ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "æ æ³åå ¥ %s" @@ -309,31 +319,31 @@ msgstr "æ æ³åå ¥ %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "æ æ³è·å¾ debconf ççæ¬ãæ¨å®è£ äº debconf å?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "软件å çæ©å±åè¡¨è¶ é¿" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "å¤çç®å½ %s æ¶åºé" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "æºæ©å±åè¡¨è¶ é¿" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "å° header åå° contents æ件æ¶åºé" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "å¤ç Contents %s æ¶åºé" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -413,124 +423,136 @@ msgstr "" " -c=? 读åæå®é ç½®æ件\n" " -o=? 设置任ææå®çé ç½®é项" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "没æä»»ä½éå®é¡¹æ¯å¹é ç" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件å æ件ç»â%sâä¸ç¼ºå°ä¸äºæ件" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "ç¼åæ°æ®åºè¢«æåäºï¼è¯¥æ°æ®åºæ件çæ件åå·²æ¹æ %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB å·²è¿æ¶ï¼ç°è¯å¾è¿è¡å级 %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:72 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB æ ¼å¼æ¯æ æçãå¦æä½ æ¯ä»ä¸ä¸ªèçæ¬ç apt å级èæ¥ï¼è¯·å é¤æ°æ®åºå¹¶é建å®ã" + +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "æ æ³æå¼ DB æ件 %sï¼%s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 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:238 msgid "Archive has no control record" msgstr "å档没æå å«æ§å¶å段" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "æ æ³è·å¾æ¸¸æ (cursor)" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "è¦åï¼æ æ³è¯»åç®å½ %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "è¦åï¼æ æ³å¯¹ %s è¿è¡ç»è®¡\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "é误ï¼" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "è¦åï¼" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "é误ï¼å¤çæ件æ¶åºé " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "æ æ³è§£æè·¯å¾ %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "æ æ³éåç®å½æ " -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "æ æ³æå¼ %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "æ æ³è¯»å符å·é¾æ¥ %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "æ æ³ unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** æ æ³å° %s é¾æ¥å° %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:282 #, 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 msgid "Archive had no package field" msgstr "å档没æå å«è½¯ä»¶å (package)å段" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s ä¸æ²¡æ override 项\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s çç»´æ¤è %s 并é %s\n" +#: ftparchive/writer.cc:619 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s 没ææºä»£ç ç override 项\n" + +#: ftparchive/writer.cc:623 +#, 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" @@ -540,165 +562,165 @@ msgstr "å é¨é误ï¼æ æ³å®ä½å å æ件 %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - æ æ³ååé å å" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "æ æ³æå¼ %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "override æ件 %s 第 %lu è¡çæ ¼å¼æ误 #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "override æ件 %s 第 %lu è¡çæ ¼å¼æ误 #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "override æ件 %s 第 %lu è¡çæ ¼å¼æ误 #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "æ æ³è¯»å override æ件 %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "æªç¥çå缩ç®æ³â%sâ" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "å缩åçè¾åºæ件 %s è¦æ±æä¸ä¸ªå缩æ件éå" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "æ æ³ä¸ºåè¿ç¨å建 IPC 管é" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "æ æ³å建 FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "æ æ³ fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "å缩åè¿ç¨" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "å é¨é误ï¼æ æ³å»ºç« %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "æ æ³å»ºç«åè¿ç¨ç IPC 管é" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "æ æ³æ§è¡å缩ç¨åº" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "解åç¨åº" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "æ æ³å¯¹åè¿ç¨ææ件è¿è¡è¯»å" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "å¨è®¡ç® MD5 æ ¡éªåæ¶ï¼æ æ³è¯»åæ°æ®" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "å¨ unlink %s æ¶åºé" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "æ æ³å° %s éå½å为 %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673 #, c-format msgid "Regex compilation error - %s" msgstr "ç¼è¯æ£å表达å¼æ¶åºé - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "ä¸åç软件å æä¸è½æ»¡è¶³çä¾èµå ³ç³»ï¼" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "ä½æ¯ %s å·²ç»å®è£ äº" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "ä½æ¯ %s æ£è¦è¢«å®è£ " -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ä½å´æ æ³å®è£ å®" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ä½æ¯å®åªæ¯ä¸ªèæ软件å " -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ä½æ¯å®è¿æ²¡æ被å®è£ " -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "ä½æ¯å®å°ä¸ä¼è¢«å®è£ " -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " æ" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "ä¸åãæ°ã软件å å°è¢«å®è£ ï¼" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "ä¸å软件å å°è¢«ãå¸è½½ãï¼" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "ä¸åç软件å ççæ¬å°ä¿æä¸åï¼" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "ä¸åç软件å å°è¢«å级ï¼" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "ä¸å软件å å°è¢«ãé级ãï¼" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "ä¸å被è¦æ±ä¿æçæ¬ä¸åç软件å å°è¢«æ¹åï¼" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (æ¯ç±äº %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -706,143 +728,143 @@ msgstr "" "ãè¦åãï¼ä¸åçéè¦è½¯ä»¶å å°è¢«å¸è½½ \n" "请å¿å°è¯ï¼é¤éæ¨ç¡®å®ç¥éæ¨å¨åä»ä¹ï¼" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "å ±åçº§äº %lu 个软件å ï¼æ°å®è£ äº %lu 个软件å ï¼" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "å ±éæ°å®è£ äº %lu 个软件å ï¼" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "éçº§äº %lu 个软件å ï¼" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "è¦å¸è½½ %lu 个软件å ï¼æ %lu 个软件æªè¢«å级ã\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "æ %lu 个软件å 没æ被å®å ¨å®è£ æå¸è½½ã\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "æ£å¨æ´æ£ä¾èµå ³ç³»..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " 失败ã" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "æ æ³æ´æ£ä¾èµå ³ç³»" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "æ æ³æå°åè¦å级ç软件å éå" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " å®æ" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "æ¨ä¹è®¸éè¦è¿è¡âapt-get -f installâæ¥çº æ£ä¸é¢çé误ã" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "ä¸è½æ»¡è¶³ä¾èµå ³ç³»ãä¸å¦¨è¯ä¸ä¸ -f é项ã" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ãè¦åãï¼ä¸åç软件å ä¸è½éè¿éªè¯ï¼" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "忽ç¥äºè®¤è¯è¦åã\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "ä¸ç»éªè¯å°±å®è£ è¿äºè½¯ä»¶å ä¹ï¼[y/N] " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "æäºè½¯ä»¶å ä¸è½éè¿éªè¯" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "碰å°äºä¸äºé®é¢ï¼æ¨ä½¿ç¨äº -y é项ï¼ä½æ¯æ²¡æç¨ --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "å é¨é误ï¼InstallPackages 被ç¨å¨äºæ æ³å®è£ ç软件å ä¸ï¼" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "æ软件å éè¦è¢«å¸è½½ï¼ä½æ¯å¸è½½å¨ä½è¢«ç¨åºè®¾ç½®æç¦æ¢ã" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" -msgstr "å é¨é误ï¼Ordering 没æå®æ" +msgstr "å é¨é误ï¼Ordering æªè½å®æ" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044 msgid "Unable to lock the download directory" msgstr "æ æ³å¯¹ä¸è½½ç®å½å é" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "æ æ³è¯»åå®è£ æºå表ã" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "æªäºâ¦â¦æ件大å°ä¸ç¬¦ï¼åä¿¡ç» apt@packages.debian.org å§" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "éè¦ä¸è½½ %sB/%sB ç软件å ã\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "éè¦ä¸è½½ %sB ç软件å ã\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解å缩åä¼æ¶èæ %sB çé¢å¤ç©ºé´ã\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解å缩åå°ä¼ç©ºåº %sB ç空é´ã\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187 #, c-format msgid "Couldn't determine free space in %s" msgstr "æ æ³è·ç¥æ¨å¨ %s ä¸ç空ä½ç©ºé´" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "æ¨å¨ %s ä¸æ²¡æ足å¤ç空ä½ç©ºé´ã" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "è½ç¶æ¨æå®äº Trivial Onlyï¼ä½è¿ä¸æ¯ä¸ªæ¥å¸¸(trivial)æä½ã" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -853,28 +875,28 @@ msgstr "" "è¥è¿æ³ç»§ç»çè¯ï¼å°±è¾å ¥ä¸é¢ççå¥â%sâ\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "ä¸æ¢æ§è¡ã" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 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:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230 #, c-format msgid "Failed to fetch %s %s\n" msgstr "æ æ³ä¸è½½ %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "æä¸äºæ件ä¸è½½å¤±è´¥" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239 msgid "Download complete and in download only mode" msgstr "ä¸è½½å®æ¯ï¼ç®åæ¯âä» ä¸è½½â模å¼" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -882,47 +904,47 @@ msgstr "" "æå 个软件å æ æ³ä¸è½½ï¼æ¨å¯ä»¥è¿è¡ apt-get update æè å ä¸ --fix-missing çé项" "åè¯è¯ï¼" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "ç®åè¿ä¸æ¯æ --fix-missing åä»è´¨äº¤æ¢(media swapping)" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "æ æ³æ´æ£ç¼ºå°ç软件å ã" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "æ¾å¼å®è£ ã" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注æï¼æéäº %s èé %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽ç¥äº %sï¼å®å·²ç»è¢«å®è£ èä¸æ²¡ææå®è¦å级ã\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件å %s è¿æªå®è£ ï¼å èä¸ä¼è¢«å¸è½½\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件å %s æ¯ä¸ä¸ªç±ä¸é¢ç软件å æä¾çèæ软件å ï¼\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [å·²å®è£ ]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "请æ¨æç¡®å°éæ©ä¸ä¸ªæ¥è¿è¡å®è£ ã" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -933,74 +955,114 @@ msgstr "" "è¿å¯è½æå³çè¿ä¸ªç¼ºå¤±ç软件å å¯è½å·²è¢«åºå¼ï¼\n" "æè åªè½å¨å ¶ä»åå¸æºä¸æ¾å°\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "å¯æ¯ä¸åç软件å å代äºå®ï¼" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "软件å %s è¿æ²¡æå¯ä¾å®è£ çåéè " -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ä¸è½éæ°å®è£ %sï¼å 为æ æ³ä¸è½½å®ã\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s å·²ç»æ¯ææ°ççæ¬äºã\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "æªæ¾å°â%2$sâçâ%1$sâåå¸çæ¬" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "æªæ¾å°â%2$sâçâ%1$sâçæ¬" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "éå®äºçæ¬ä¸º %s (%s) ç %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr " update å½ä»¤æ¯ä¸éä»»ä½åæ°ç" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "æ æ³å¯¹ç¶æå表ç®å½å é" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" "æä¸äºç´¢å¼æ件ä¸è½ä¸è½½ï¼å®ä»¬å¯è½è¢«å¿½ç¥äºï¼ä¹å¯è½è½¬è使ç¨äºæ§çç´¢å¼æ件ã" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "ä¸åãæ°ã软件å å°è¢«å®è£ ï¼" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754 +msgid "The following information may help to resolve the situation:" +msgstr "ä¸åçä¿¡æ¯å¯è½ä¼å¯¹è§£å³é®é¢ææ帮å©ï¼" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "å é¨é误ï¼problem resolver åäºäº" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "å é¨é误ï¼AllUpgrade åäºäº" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1545 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "æ æ³æ¾å°è½¯ä»¶å %s" + +#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696 #, c-format msgid "Couldn't find package %s" msgstr "æ æ³æ¾å°è½¯ä»¶å %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1683 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注æï¼æ ¹æ®æ£å表达å¼â%2$sâéä¸äº %1$s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1713 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "ä½æ¯ %s æ£è¦è¢«å®è£ " + +#: cmdline/apt-get.cc:1726 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "æ¨å¯è½éè¦è¿è¡âapt-get -f installâæ¥çº æ£ä¸åé误ï¼" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1729 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1008,7 +1070,7 @@ msgstr "" "ææªè½æ»¡è¶³çä¾èµå ³ç³»ã请å°è¯ä¸ææ软件å çååæ¥è¿è¡âapt-get -f installâ(ä¹å¯" "以æå®ä¸ä¸ªè§£å³åæ³)ã" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1741 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" @@ -1019,7 +1081,7 @@ msgstr "" "å 为系ç»æ æ³è¾¾å°æ¨è¦æ±çç¶æé æçã该çæ¬ä¸å¯è½ä¼æä¸äºæ¨éè¦ç软件\n" "å å°æªè¢«å建ææ¯å®ä»¬è¿å¨æ°å°(incoming)ç®å½ä¸ã" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1749 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1028,126 +1090,122 @@ msgstr "" "æ¨ä» è¦æ±å¯¹åä¸è½¯ä»¶å è¿è¡æä½ï¼è¿ææå¯è½æ¯å 为该软件å å®è£ ä¸ä¸ï¼åæ¶ï¼\n" "æ¨æ好æ交ä¸ä¸ªé对è¿ä¸ªè½¯ä»¶å çæ éæ¥åã" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "ä¸åçä¿¡æ¯å¯è½ä¼å¯¹è§£å³é®é¢ææ帮å©ï¼" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1757 msgid "Broken packages" msgstr "æ æ³å®è£ ç软件å " -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1786 msgid "The following extra packages will be installed:" msgstr "å°ä¼å®è£ ä¸åé¢å¤ç软件å ï¼" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1875 msgid "Suggested packages:" msgstr "建议å®è£ ç软件å ï¼" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1876 msgid "Recommended packages:" msgstr "æ¨èå®è£ ç软件å ï¼" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1904 msgid "Calculating upgrade... " msgstr "æ£å¨ç¹åå级... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1912 msgid "Done" msgstr "å®æ" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987 msgid "Internal error, problem resolver broke stuff" msgstr "å é¨é误ï¼problem resolver åäºäº" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:2087 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:2117 cmdline/apt-get.cc:2351 #, c-format msgid "Unable to find a source package for %s" msgstr "æ æ³æ¾å°ä¸ %s 对åºçæºä»£ç å " -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:2166 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽ç¥å·²ä¸è½½è¿çæ件â%sâ\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2190 #, c-format msgid "You don't have enough free space in %s" msgstr "æ¨å¨ %s ä¸æ²¡æ足å¤ç空ä½ç©ºé´" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2195 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "éè¦ä¸è½½ %sB/%sB çæºä»£ç å ã\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2198 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "éè¦ä¸è½½ %sB çæºä»£ç å ã\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2204 #, c-format msgid "Fetch source %s\n" msgstr "ä¸è½½æºä»£ç %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2235 msgid "Failed to fetch some archives." msgstr "æä¸äºå æ件æ æ³ä¸è½½ã" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2263 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对äºå·²ç»è¢«è§£å å° %s ç®å½çæºä»£ç å å°±ä¸å解å¼äº\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2275 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "è¿è¡è§£å çå½ä»¤â%sâåºéã\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2276 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请æ£æ¥æ¯å¦å®è£ äºâdpkg-devâ软件å ã\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2293 #, c-format msgid "Build command '%s' failed.\n" msgstr "æ§è¡æé 软件å å½ä»¤â%sâ失败ã\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2312 msgid "Child process failed" msgstr "åè¿ç¨åºé" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2328 msgid "Must specify at least one package to check builddeps for" msgstr "è¦æ£æ¥çæ软件å çæ建ä¾èµå ³ç³»(builddeps)ï¼å¿ é¡»æå®è³å°ä¸ä¸ªè½¯ä»¶å " -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "æ æ³è·å¾ %s çæ建ä¾èµå ³ç³»(build-dependency)ä¿¡æ¯" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2376 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没ææ建ä¾èµå ³ç³»ä¿¡æ¯ã\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2428 #, 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:2480 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1156,30 +1214,31 @@ msgstr "" "ç±äºæ æ³æ¾å°ç¬¦åè¦æ±ç软件å %3$s çå¯ç¨çæ¬ï¼å æ¤ä¸è½æ»¡è¶³ %2$s æè¦æ±ç %1" "$s ä¾èµå ³ç³»" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2515 #, 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:2540 #, 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:2554 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ä¸è½æ»¡è¶³è½¯ä»¶å %s æè¦æ±çæ建ä¾èµå ³ç³»ã" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2558 msgid "Failed to process build dependencies" msgstr "æ æ³å¤çæ建ä¾èµå ³ç³»" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2590 msgid "Supported modules:" msgstr "被æ¯æ模åï¼" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2631 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1194,6 +1253,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1352,188 +1412,188 @@ msgstr "è¿ä¸ªæ示ä¹åçé误æ¶æ¯æå¼å¾æ¨æ³¨æã请æ´æ£å®ä»¬ï¼ msgid "Merging available information" msgstr "æ£å¨å并ç°æä¿¡æ¯" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "æ æ³å建管é" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "æ æ³æ§è¡ gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "å æ件已被æå" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "tar çæ ¡éªç ä¸ç¬¦ï¼å æ件已被æå" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "æªç¥ç TAR æ°æ®å¤´ç±»å %uï¼æå %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "æ æçæå æ件ç¹å¾å·(signature)" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "读åæå æ件ä¸çæåæ件头åºé" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "æå æ件ä¸æåæ件头æ æ" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "å档太çäº" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "æ æ³è¯»åæå æ件çæ°æ®å¤´" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "æ DropNode ç¨å¨äºä»å¨é¾è¡¨ä¸çèç¹ä¸" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "æ æ³åé æ£å表项ï¼" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "æ æ³åé 转移项(diversion)" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "å é¨é误ï¼åºç°å¨ AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "è¯å¾è¦çä¸ä¸ªè½¬ç§»é¡¹(diversion)ï¼%s -> %s å³ %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "æ·»å äºä¸¤ä¸ªè½¬ç§»é¡¹(diversion) %s-> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "éå¤çé ç½®æ件 %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "æ æ³åå ¥æ件 %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "æ æ³å ³éæ件 %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "è·¯å¾å %s è¿é¿" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s 被解å äºä¸åªä¸æ¬¡" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "ç®å½ %s 已被转移(diverted)" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "该软件å æ£å°è¯åå ¥è½¬ç§»å¯¹è±¡(diversion target) %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "该转移路å¾(diversion path)è¿é¿" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ç®å½ %s è¦è¢«ä¸ä¸ªéç®å½çæ件æ¿æ¢" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "æ æ³å¨å ¶æ£å桶(hash bucket)ä¸åé èç¹" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "è·¯å¾åè¿é¿" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "ç¨æ¥è¦çç软件å ä¸å±äº %s çä»»ä½çæ¬" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "æ件 %s/%s ä¼è¦çå±äºè½¯ä»¶å %s ä¸çååæ件" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format msgid "Unable to read %s" msgstr "æ æ³è¯»å %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "æ æ³è¯»å %s çç¶æ" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "æ æ³å é¤ %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "æ æ³å建 %s " -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "æ æ³è¯»å %sinfo çç¶æ" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "info å temp ç®å½è¦æ±å¤äºåä¸æ件系ç»ä¹ä¸" #. Build the status cache -#: 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:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "æ£å¨è¯»å软件å å表" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" 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:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "å¨è·å软件å ååæ¶åºç°å é¨é误" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "æ£å¨è¯»åæ件å表" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1543,77 +1603,77 @@ msgstr "" "æ æ³æå¼å表æ件â%sinfo/%sâãå¦ææ¨ä¸è½æ¢å¤è¿ä¸ªæ件ï¼é£ä¹å°±æ¸ 空该æ件ï¼å马ä¸" "éæ°å®è£ ç¸åçæ¬çè¿ä¸ªè½¯ä»¶å ï¼" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "æ æ³è¯»åå表æ件 %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "è·å¾ä¸ä¸ªèç¹æ¶åºç°å é¨é误" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "æ æ³æå¼è½¬ç§»é ç½®æ件(diversions file) %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "该转移é ç½®æ件(diversion file)被æåäº" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "转移é ç½®æ件ä¸æä¸è¡æ¯æ æçï¼%s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "æ·»å diversion æ¶åºç°å é¨é误" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "å¿ é¡»é¦å åå§å软件å ç¼å" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "æ æ³æ¾å°æ个软件å ï¼å 头ï¼äºå移ä½ç½® %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "ç¶ææ件ä¸æé误ç ConfFile 段ãä½äºå移ä½ç½® %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "æ æ³è§£æ MD5 ç ãæ件å å移é为 %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "è¿ä¸æ¯ä¸ä¸ªææç DEB å æ件ï¼å ¶å å éæ¼äºâ%sâ" -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "è¿ä¸æ¯ä¸ä¸ªææç DEB å æ件ï¼å ¶å å éæ¼äºâ%sâæè â%sâ" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "æ æ³åæ¢å·¥ä½ç®å½å° %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "å é¨é误ï¼æ æ³å®ä½å å æ件" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "æ æ³å¨æå æ件ä¸æ¾å°ææç主æ§æ件" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "ä¸è½è§£æç主æ§æ件" @@ -1634,25 +1694,26 @@ 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 ç CD-ROMï¼å®å¯è½æ£å¨ä½¿ç¨ä¸ã" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." 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 methods/rred.cc:234 methods/rred.cc:243 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 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "æ æ³è®¾ç½®æ件çä¿®æ¹æ¥æ" @@ -1713,7 +1774,7 @@ msgstr "è¿æ¥è¶ æ¶" msgid "Server closed the connection" msgstr "æå¡å¨å ³éäºè¿æ¥" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "读é误" @@ -1725,7 +1786,7 @@ msgstr "ååºè¶ åºäºç¼ååºå¤§å°ã" msgid "Protocol corruption" msgstr "åè®®æ误" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "åæ件åºé" @@ -1779,7 +1840,7 @@ msgstr "æ°æ®å¥æ¥åè¿æ¥è¶ æ¶" 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 "ææ件å å ¥æ£å表æ¶åºé" @@ -1863,474 +1924,493 @@ 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 "æ æ³è®¿é®å¯åï¼â%sâ" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "é误ï¼Acquire::gpgv::Options çåæ°åè¡¨è¶ é¿ãç»æè¿è¡ã" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "å é¨é误ï¼ç¾åæ£ç¡®æ 误ï¼ä½æ¯æ æ³ç¡®è®¤å¯é¥çæ纹(key fingerprint)ï¼ï¼" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "è³å°åç°ä¸ä¸ªæ æçç¾åã" -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "ç¨äºéªè¯ç¾å(æ¨å®è£ äº gnupg ä¹ï¼)" +msgstr "æ æ³è¿è¡\"%s\"以便éªè¯ç¾å(æ¨å®è£ äº gnupg ä¹ï¼)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "è¿è¡ gpgv æ¶åçæªç¥é误" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" 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 "ç±äºæ²¡æå ¬é¥ï¼ä¸åç¾åæ æ³è¿è¡éªè¯ï¼\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 æå¡å¨ç range æ¯æä¸æ£å¸¸" -#: 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:1104 msgid "Bad header data" msgstr "é误çæ¥å¤´æ°æ®" -#: methods/http.cc:1124 +#: methods/http.cc:1121 methods/http.cc:1176 msgid "Connection failed" msgstr "è¿æ¥å¤±è´¥" -#: methods/http.cc:1215 +#: methods/http.cc:1228 msgid "Internal error" msgstr "å é¨é误" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "æ æ³ mmap ä¸ä¸ªç©ºæ件" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "æ æ³ mmap %lu åèçæ°æ®" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "没æåç°æ¨çæé %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "æ æ³è¯å«çç±»å缩åï¼â%câ" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "æ£å¨æå¼é ç½®æ件 %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" +#: apt-pkg/contrib/configuration.cc:510 +#, fuzzy, c-format +msgid "Line %d too long (max %u)" msgstr "软件å æ¥æºæ¡£ç第 %d è¡è¶ é¿äº(é¿åº¦éå¶ä¸º %d)ã" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "è¯æ³é误 %s:%uï¼é ç½®å°è没æ以ååå¼å¤´" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "è¯æ³é误 %s:%uï¼æ ç¾æ ¼å¼æ误" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "è¯æ³é误 %s:%u: é ç½®å¼åæå¤ä½çæ æä¹æ°æ®" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "è¯æ³é误 %s:%u: åªè½å¨é¡¶å±é ç½®æ件ä¸ä½¿ç¨æ示" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "è¯æ³é误 %s:%uï¼å¤ªå¤çåµå¥ include å½ä»¤" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "è¯æ³é误 %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "è¯æ³é误 %s:%u: ä¸æ¯æçæ令â%sâ" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:736 #, c-format 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:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... æé误!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... å®æ" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "æªç¥çå½ä»¤è¡é项â%câ[æ¥èª %s]" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "æ æ³è¯å«å½ä»¤è¡é项 %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "å½ä»¤è¡é项 %s ä¸æ¯ä¸ªå¸å°å¼" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "é项 %s è¦æ±æä¸ä¸ªåæ°" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "é项 %sï¼é 置项åå¿ é¡»å å«æå½¢å¦â=<åé>âçå ·ä½æå®" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "é项 %s è¦æ±æä¸ä¸ªæ´æ°ä½ä¸ºåæ°ï¼èä¸æ¯â%sâ" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "é项â%sâè¶ é¿" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "ä¸è½è¯å«åæ° %sï¼è¯·ç¨ true æ false" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "æ æçæä½ %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "æ æ³è¯»åæ件系ç»æè½½ç¹ %s çç¶æ" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 #, c-format msgid "Unable to change to %s" msgstr "æ æ³åæ¢å·¥ä½ç®å½å° %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "æ æ³è¯»åå ççç¶æ" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "ç±äºæ件系ç»ä¸ºåªè¯»ï¼å èæ æ³ä½¿ç¨æ件é%s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "æ æ³æå¼éæ件 %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "æ æ³å¨ nfs æ件系ç»ä¸ä½¿ç¨æ件é %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "æ æ³è·å¾é %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "çå¾ åè¿ç¨ %s çéåºï¼ä½æ¯å®å¹¶ä¸åå¨" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "åè¿ç¨ %s åçäºæ®µé误" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "åè¿ç¨ %s è¿åäºä¸ä¸ªéè¯¯å· (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "åè¿ç¨ %s å¼å¸¸éåºäº" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "æ æ³æå¼æ件 %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "读æ件æ¶åºéï¼è¿å© %lu åè没æ读åº" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "åæ件æ¶åºéï¼è¿å© %lu åè没æä¿å" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "å ³éæ件æ¶åºé" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "ç¨ unlink å é¤æ件æ¶åºé" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "åæ¥æ件æ¶åºé" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "软件å ç¼ååºæ¯ç©ºç" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "软件å ç¼ååºæ件æåäº" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "软件å ç¼ååºæ件ççæ¬ä¸å ¼å®¹" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "æ¬ç¨åºç®åä¸æ¯æâ%sâè¿ä¸ªçæ¬æ§å¶ç³»ç»" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "软件å ç¼ååºæ¯ä¸ºå ¶å®æ¶æç主æºæé ç" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "ä¾èµ" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "é¢ä¾èµ" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "建议" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "æ¨è" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "å²çª" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "æ¿æ¢" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "åºå¼" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "éè¦" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "å¿ è¦" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "æ å" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "å¯é" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "é¢å¤" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "æ£å¨åæ软件å çä¾èµå ³ç³»æ " -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "åéçæ¬" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "çæä¾èµå ³ç³»" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "æ£å¨å并ç°æä¿¡æ¯" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "æ æ³æå¼ %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "æ æ³åå ¥æ件 %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "æ æ³è§£æ软件å æ件 %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "æ æ³è§£æ软件å æ件 %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡çæ ¼å¼æ误 (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误 (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误 (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误 (Ablolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误 (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "æ£å¨æå¼ %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "软件å æ¥æºæ¡£ %2$s ç第 %1$u è¡è¶ é¿äºã" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "å¨å®è£ æºåè¡¨ä¸ %2$s ä¸ç¬¬ %1$u è¡çæ ¼å¼æ误 (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "æ æ³è¯å«å¨å®è£ æºå表 %3$s éï¼ç¬¬ %2$u è¡ä¸ç软件å ç±»å«â%1$sâ" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "å¨å®è£ æºåè¡¨ä¸ %2$s ä¸ç¬¬ %1$u è¡çæ ¼å¼æ误 (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2341,18 +2421,18 @@ msgstr "" "å°ç软件å %sãé常并ä¸å»ºè®®è¿æ ·åï¼ä½æ¯å¦ææ¨ç¡®å®å¸æå¦æ¤ï¼å¯ä»¥æå¼ APT::" "Force-LoopBreak é项ã" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "ä¸æ¯æç´¢å¼æ件类åâ%sâ" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format 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:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2360,181 +2440,201 @@ msgstr "" "é误ï¼pkgProblemResolver::Resolve åçæ éï¼è¿å¯è½æ¯æ软件å 被è¦æ±ä¿æç°ç¶ç" "ç¼æ ã" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "æ æ³ä¿®æ£é误ï¼å 为æ¨è¦æ±æäºè½¯ä»¶å ä¿æç°ç¶ï¼å°±æ¯å®ä»¬ç ´åäºè½¯ä»¶å é´çä¾èµå ³" "ç³»ã" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "软件å å表çç®å½ %spartial ä¸è§äºã" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "æ¾ä¸å°â%spartialâè¿ä¸ªç®å½ã" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:827 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "æ£å¨ä¸è½½ç¬¬ %li 个æ件(å ± %li 个ï¼å°é %s)" +msgstr "æ£å¨ä¸è½½ %li 个æ件ä¸ç第 %li 个(è¿æ %s 个)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:829 +#, c-format msgid "Retrieving file %li of %li" -msgstr "æ£å¨è¯»åæ件å表" +msgstr "æ£å¨ä¸è½½ %2$li 个æ件ä¸ç %1$li 个" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "æ æ³æ¾å°è·å软件å çæ¸ é %s æéç驱å¨ç¨åºã" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "è·å软件å çæ¸ é %s æéç驱å¨ç¨åºæ²¡ææ£å¸¸å¯å¨ã" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:396 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请ææ æ â%sâ çç¢çæå ¥é©±å¨å¨â%sâåæå车é®ã" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "ä¸æ¯æâ%sâæå ç³»ç»" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "æ æ³ç¡®å®éåçæå ç³»ç»ç±»å" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "æ æ³è¯»å %s çç¶æã" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "æ¨å¿ é¡»å¨æ¨ç sources.list åå ¥ä¸äºâ软件å æºâç URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "æ æ³è§£æææå¼è½¯ä»¶å çå表ææ¯ç¶ææ件ã" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "æ¨å¯è½éè¦è¿è¡ apt-get update æ¥è§£å³è¿äºé®é¢" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "å好设å®(preferences)æ件ä¸åç°ææ æçè®°å½ï¼æ Package å段头" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "æ æ³è¯å«éå®çç±»å(pin type) %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "没æ为çæ¬éå®æå®ä¼å 级(æ为é¶)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "软件å æååºä½¿ç¨çæ¯ä¸å ¼å®¹ççæ¬æ§å¶ç³»ç»" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "å¤ç %s (NewPackage)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "å¤ç %s (UsePackage1)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "å¤ç %s (NewFileVer1)æ¶åºé" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "å¤ç %s (UsePackage2)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "å¤ç %s (NewFileVer1)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "å¤ç %s (NewVersion1)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "å¤ç %s (UsePackage3)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "å¤ç %s (NewVersion2)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "å¤ç %s (NewFileVer1)æ¶åºé" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "ç³äºï¼è½¯ä»¶å çæ°éäºè¶ åºæ¬ç¨åºçå¤çè½åã" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "ç³äºï¼è½¯ä»¶å çæ¬çæ°éäºè¶ åºæ¬ç¨åºçå¤çè½åã" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "ç³äºï¼è½¯ä»¶å çæ¬çæ°éäºè¶ åºæ¬ç¨åºçå¤çè½åã" + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "ç³äºï¼ä¾èµå ³ç³»çæ°éè¶ åºäºæ¬ç¨åºçå¤çè½åã" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "å¤ç %s (FindPkg)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "å¤ç %s (CollectFileProvides)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "å½å¤çæ件ä¾èµå ³ç³»æ¶ï¼æ æ³æ¾å°è½¯ä»¶å %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "æ æ³è·åæºè½¯ä»¶å å表 %s çç¶æ" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "æ£å¨æ¶éæ件ææä¾ç软件å " -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "æ æ³åå ¥æ¥æºç¼åæ件" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, c-format 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:401 msgid "MD5Sum mismatch" msgstr "MD5 æ ¡éªåä¸ç¬¦" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "MD5 æ ¡éªåä¸ç¬¦" + +#: apt-pkg/acquire-item.cc:1097 +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:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2543,7 +2643,7 @@ msgstr "" "ææ æ³æ¾å°ä¸ä¸ªå¯¹åº %s 软件å çæ件ãå¨è¿ç§æ åµä¸å¯è½éè¦æ¨æå¨ä¿®æ£è¿ä¸ªè½¯ä»¶" "å ã(ç¼äºæ¶æ缺失)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2551,13 +2651,13 @@ msgid "" msgstr "" "ææ æ³æ¾å°å¯¹åº %s 软件å çæ件ãå¨è¿ç§æ åµä¸æ¨å¯è½éè¦æå¨ä¿®æ£è¿ä¸ªè½¯ä»¶å ã" -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:1310 #, 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:1397 msgid "Size mismatch" msgstr "大å°ä¸ç¬¦" @@ -2566,7 +2666,7 @@ msgstr "大å°ä¸ç¬¦" msgid "Vendor block %s contains no fingerprint" msgstr "软件æä¾è æ°æ®åå %s 没æå å«æ纹信æ¯" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2575,47 +2675,54 @@ msgstr "" "ç°æ %s ä½ä¸ºäº CD-ROM çæè½½ç¹\n" "æ£å¨æè½½ CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "æ£å¨é´å«.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "åæ¡£æ ç¾ï¼%s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "ç°æ %s ä½ä¸ºäº CD-ROM çæè½½ç¹\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "æ£å¨å¸è½½ CD-ROM æ件系ç»\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "çå¾ æå ¥ççâ¦â¦\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "æ£å¨æè½½ CD-ROM æ件系ç»â¦â¦\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "æ£å¨å çä¸æ¥æ¾ç´¢å¼æ件..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "æ¾å°äº %i 个软件å ç´¢å¼ã%i 个æºä»£ç å ç´¢å¼ï¼å %i 个æ°åç¾å\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:708 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "åæ¡£æ ç¾ï¼%s \n" + +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "è¿ä¸æ¯ä¸ä¸ªææçååï¼è¯·å次å½åã\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2624,96 +2731,114 @@ msgstr "" "è¿å¼ å çç°å¨çååæ¯ï¼\n" "â%sâ\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "æ£å¨å¤å¶è½¯ä»¶å å表â¦â¦" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "æ£å¨åå ¥æ°ç软件å æºå表\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "对åºäºè¯¥å çç软件å æºè®¾ç½®é¡¹æ¯ï¼\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:834 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "æ£å¨å¸è½½ CD-ROM æ件系ç»â¦â¦" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "å·²åå ¥ %i æ¡è®°å½ã\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "å·²åå ¥ %i æ¡è®°å½ï¼å¹¶æ %i 个æ件缺失ã\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "å·²åå ¥ %i æ¡è®°å½ï¼å¹¶æ %i 个æ件ä¸å»å\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "å·²åå ¥ %i æ¡è®°å½ï¼å¹¶æ %i 个缺失ï¼ä»¥å %i 个æ件ä¸å»å\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:522 #, c-format msgid "Preparing %s" msgstr "æ£å¨åå¤ %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:523 #, c-format msgid "Unpacking %s" msgstr "æ£å¨è§£å缩 %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:528 #, c-format msgid "Preparing to configure %s" msgstr "æ£å¨åå¤é ç½® %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:529 #, c-format msgid "Configuring %s" msgstr "æ£å¨é ç½® %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:530 #, c-format msgid "Installed %s" msgstr "å·²å®è£ %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:535 #, c-format msgid "Preparing for removal of %s" msgstr "æ£å¨åå¤ %s çå é¤æä½" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:536 #, c-format msgid "Removing %s" msgstr "æ£å¨å é¤ %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Removed %s" msgstr "å·²å é¤ %s" -#: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:542 +#, c-format msgid "Preparing to completely remove %s" -msgstr "æ£å¨åå¤é ç½® %s" +msgstr "æ£å¨åå¤å®å ¨å é¤ %s" -#: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:543 +#, c-format msgid "Completely removed %s" -msgstr "æ æ³å é¤ %s" +msgstr "å®å ¨å é¤äº %s" + +#: apt-pkg/deb/dpkgpm.cc:566 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "软件å å表çç®å½ %spartial ä¸è§äºã" + +#: apt-pkg/deb/dpkgpm.cc:709 +#, fuzzy, c-format +msgid "openpty failed\n" +msgstr "select è°ç¨åºé" + +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "æ æ³æå¼è¡¥ä¸æ件" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "è¿æ¥è¢«æ°¸ä¹ å ³é" +#~ msgid "File date has changed %s" +#~ msgstr "æ件 %s çæ¶é´å·²è¢«æ¹å¨" + #~ msgid "Reading file list" #~ msgstr "æ£å¨è¯»åæ件å表"