X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/53391d0fc55f118194467b3d436f91fbc1097c31..0b7d641cf12761c3dcc5edb4031adfc9709963e4:/po/zh_CN.po diff --git a/po/zh_CN.po b/po/zh_CN.po index abb4585ce..0ae36fef2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,177 +3,175 @@ # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008. # Tchaikov <tchaikov@sjtu.org>, 2005, 2007. # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006. +# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010. # msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2009-06-01 15:54+0800\n" -"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n" -"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" +"POT-Creation-Date: 2011-07-26 12:05+0200\n" +"PO-Revision-Date: 2010-08-26 14:42+0800\n" +"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" +"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: cmdline/apt-cache.cc:143 +#: cmdline/apt-cache.cc:154 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "çæ¬ä¸º %2$s ç软件å %1$s ææªæ»¡è¶³çä¾èµå ³ç³»ï¼\n" -#: 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:247 +#: cmdline/apt-cache.cc:282 msgid "Total package names: " msgstr "软件å å称æ»æ°ï¼" -#: cmdline/apt-cache.cc:287 +#: cmdline/apt-cache.cc:284 +msgid "Total package structures: " +msgstr "å ¨é¨è½¯ä»¶å ç»æï¼" + +#: cmdline/apt-cache.cc:324 msgid " Normal packages: " msgstr " æ®é软件å ï¼" -#: cmdline/apt-cache.cc:288 +#: cmdline/apt-cache.cc:325 msgid " Pure virtual packages: " msgstr " å®å ¨èæ软件å ï¼" -#: cmdline/apt-cache.cc:289 +#: cmdline/apt-cache.cc:326 msgid " Single virtual packages: " msgstr " åèæ软件å ï¼" -#: cmdline/apt-cache.cc:290 +#: cmdline/apt-cache.cc:327 msgid " Mixed virtual packages: " msgstr " æ··åèæ软件å ï¼" -#: cmdline/apt-cache.cc:291 +#: cmdline/apt-cache.cc:328 msgid " Missing: " -msgstr " 缺æ¼çï¼" +msgstr " 缺失ï¼" -#: cmdline/apt-cache.cc:293 +#: cmdline/apt-cache.cc:330 msgid "Total distinct versions: " msgstr "æçæ¬å ±è®¡ï¼" -#: cmdline/apt-cache.cc:295 +#: cmdline/apt-cache.cc:332 msgid "Total distinct descriptions: " msgstr "æä¸åç说æå ±è®¡ï¼" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:334 msgid "Total dependencies: " msgstr "æä¾èµå ³ç³»å ±è®¡ï¼" -#: cmdline/apt-cache.cc:300 +#: cmdline/apt-cache.cc:337 msgid "Total ver/file relations: " msgstr "æçæ¬/æä»¶å ³ç³»å ±è®¡ï¼" -#: cmdline/apt-cache.cc:302 +#: cmdline/apt-cache.cc:339 msgid "Total Desc/File relations: " msgstr "æ说æ/æä»¶å ³ç³»å ±è®¡ï¼" -#: cmdline/apt-cache.cc:304 +#: cmdline/apt-cache.cc:341 msgid "Total Provides mappings: " msgstr "æä¾æ å°å ±è®¡ï¼" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:353 msgid "Total globbed strings: " msgstr "Glob åä¸²å ±è®¡ï¼" -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:367 msgid "Total dependency version space: " msgstr "ä¾èµå ³ç³»çæ¬åæå 空é´å ±è®¡ï¼" -#: cmdline/apt-cache.cc:335 +#: cmdline/apt-cache.cc:372 msgid "Total slack space: " msgstr "Slack 空é´å ±è®¡ï¼" -#: cmdline/apt-cache.cc:343 +#: cmdline/apt-cache.cc:380 msgid "Total space accounted for: " msgstr "æ»å ç¨ç©ºé´ï¼" -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139 #, c-format msgid "Package file %s is out of sync." -msgstr "软件å æ件 %s å°æªåæ¥(sync)ã" - -#: cmdline/apt-cache.cc:1293 -msgid "You must give exactly one pattern" -msgstr "æ¨å¿ é¡»æç¡®å°ç»åºä¸ä¸ªè¡¨è¾¾å¼" +msgstr "软件å æ件 %s å°æªåæ¥ã" -#: cmdline/apt-cache.cc:1447 +#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374 +#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37 +#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160 msgid "No packages found" -msgstr "没æåç°å»åç软件å " +msgstr "没æåç°å¹é ç软件å " -#: cmdline/apt-cache.cc:1524 +#: cmdline/apt-cache.cc:1218 +msgid "You must give at least one search pattern" +msgstr "æ¨å¿ é¡»æç¡®å°ç»åºè³å°ä¸ä¸ªè¡¨è¾¾å¼" + +#: cmdline/apt-cache.cc:1353 +msgid "This command is deprecated. Please use 'apt-mark showauto' instead." +msgstr "" + +#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440 +#, c-format +msgid "Unable to locate package %s" +msgstr "æªåç°è½¯ä»¶å %s" + +#: cmdline/apt-cache.cc:1478 msgid "Package files:" msgstr "软件å æ件ï¼" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "ç¼åå°æªåæ¥(sync)ï¼æ æ³äº¤å·®å¼è¯(x-ref)ä¸ä¸ªè½¯ä»¶å æ件" - -#: cmdline/apt-cache.cc:1532 -#, c-format -msgid "%4i %s\n" -msgstr "%4i %s\n" +msgstr "ç¼åå°æªåæ¥ï¼æ æ³äº¤å·®å¼è¯(x-ref)ä¸ä¸ªè½¯ä»¶å æ件" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1544 +#: cmdline/apt-cache.cc:1499 msgid "Pinned packages:" -msgstr "被éå®(pinned)ç软件å ï¼" +msgstr "被éå®ç软件å ï¼" -#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 msgid "(not found)" msgstr "(没ææ¾å°)" -#. Installed version -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1519 msgid " Installed: " msgstr " å·²å®è£ ï¼" -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +#: cmdline/apt-cache.cc:1520 +msgid " Candidate: " +msgstr " åé软件å ï¼" + +#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546 msgid "(none)" msgstr "(æ )" -#. Candidate Version -#: cmdline/apt-cache.cc:1584 -msgid " Candidate: " -msgstr " åéç软件å ï¼" - -#: cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1553 msgid " Package pin: " -msgstr " 软件å é(Pin)ï¼" +msgstr " 软件å éï¼" #. Show the priority tables -#: cmdline/apt-cache.cc:1603 +#: cmdline/apt-cache.cc:1562 msgid " Version table:" msgstr " çæ¬å表ï¼" -#: cmdline/apt-cache.cc:1618 -#, c-format -msgid " %4i %s\n" -msgstr " %4i %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:2573 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 +#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s for %s ç¼è¯äº %s %s\n" +msgstr "%s %sï¼ç¨äº %s ææ¶ï¼ç¼è¯äº %s %s\n" -#: cmdline/apt-cache.cc:1721 +#: cmdline/apt-cache.cc:1682 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" -" apt-cache [options] add file1 [file2 ...]\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" "\n" -"apt-cache is a low-level tool used to manipulate APT's binary\n" -"cache files, and query information from them\n" +"apt-cache is a low-level tool used to query information\n" +"from APT's binary cache files\n" "\n" "Commands:\n" -" add - Add a package file to the source cache\n" " gencaches - Build both the package and source cache\n" " showpkg - Show some general information for a single package\n" " showsrc - Show source records\n" @@ -201,25 +199,26 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "ç¨æ³ï¼ apt-cache [é项] å½ä»¤\n" -" apt-cache [é项] add æä»¶ç² [æä»¶ä¹ ...]\n" -" apt-cache [é项] showpkg 软件å ç² [软件å ä¹ ...]\n" -" apt-cache [é项] showsrc 软件å ç² [软件å ä¹ ...]\n" +"ããã apt-cache [é项] add æ件1 [æ件2 ...]\n" +"ããã apt-cache [é项] showpkg 软件å 1 [软件å 2 ...]\n" +"ããã apt-cache [é项] showsrc 软件å 1 [软件å 2 ...]\n" "\n" "apt-cache æ¯ä¸ä¸ªåºå±çå·¥å ·ï¼æ们ç¨å®æ¥æ纵 APT çäºè¿å¶\n" "ç¼åæ件ï¼ä¹ç¨æ¥å¨é£äºæ件ä¸æ¥è¯¢ç¸å ³ä¿¡æ¯\n" "\n" "å½ä»¤ï¼\n" -" add - å¾æºç¼åå å ¥ä¸ä¸ªè½¯ä»¶å æ件\n" -" gencaches - ä¸å¹¶çæ软件å åæºä»£ç å çç¼å\n" +" add - åæºç¼åå å ¥ä¸ä¸ªè½¯ä»¶å æ件\n" +" gencaches - åæ¶çæ软件å åæºä»£ç å çç¼å\n" " showpkg - æ¾ç¤ºæ个软件å çå ¨é¢ä¿¡æ¯\n" " showsrc - æ¾ç¤ºæºæ件çå项记å½\n" -" stats - æ¾ç¤ºä¸äºåºæ¬çç»è®¡ä¿¡æ¯\n" +" stats - æ¾ç¤ºåºæ¬çç»è®¡ä¿¡æ¯\n" " dump - ç®è¦æ¾ç¤ºæ´ä¸ªç¼åæ件çå 容\n" " dumpavail - æææææçå æ件å表æå°å°æ åè¾åº\n" " unmet - æ¾ç¤ºæææªæ»¡è¶³çä¾èµå ³ç³»\n" " search - æ ¹æ®æ£å表达å¼æ索软件å å表\n" " show - 以便äºé 读çæ ¼å¼ä»ç»è¯¥è½¯ä»¶å \n" -" depends - ååæ¬æ¬å°æ¾ç¤ºè¯¥è½¯ä»¶å çä¾èµä¿¡æ¯\n" +" showauto - æ¾ç¤ºèªå¨å®è£ ç软件å çå表\n" +" depends - æ¾ç¤ºè¯¥è½¯ä»¶å çä¾èµå ³ç³»ä¿¡æ¯\n" " rdepends - æ¾ç¤ºææä¾èµäºè¯¥è½¯ä»¶å ç软件å åå\n" " pkgnames - ååºææ软件å çåå\n" " dotty - çæå¯ç¨ GraphViz å¤çç软件å å ³ç³»å¾\n" @@ -236,23 +235,28 @@ msgstr "" " -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'" -msgstr "请ç»è¿å¼ å ç起个ååï¼æ¯å¦è¯´âDebian 2.1r1 Disk 1â" +#: cmdline/apt-cdrom.cc:77 +msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" +msgstr "请ç»è¿å¼ çç起个ååï¼æ¯å¦âDebian 5.0.3 Disk 1â" -#: cmdline/apt-cdrom.cc:93 +#: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" -msgstr "请æå çç¢çæå ¥é©±å¨å¨åæå车é®" +msgstr "请æççæå ¥é©±å¨å¨åæå车é®" -#: cmdline/apt-cdrom.cc:117 +#: cmdline/apt-cdrom.cc:127 +#, c-format +msgid "Failed to mount '%s' to '%s'" +msgstr "æ æ³å° %s æè½½å° %s" + +#: cmdline/apt-cdrom.cc:162 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "请对æ¨çå çå¥ä»¶ä¸çå ¶å®å çéå¤ç¸åçæä½ã" +msgstr "请对æ¨çççå¥ä»¶ä¸çå ¶å®ççéå¤ç¸åçæä½ã" -#: cmdline/apt-config.cc:41 +#: cmdline/apt-config.cc:44 msgid "Arguments not in pairs" msgstr "åæ°æ²¡ææ对" -#: cmdline/apt-config.cc:76 +#: cmdline/apt-config.cc:79 msgid "" "Usage: apt-config [options] command\n" "\n" @@ -269,7 +273,7 @@ msgid "" msgstr "" "ç¨æ³ï¼apt-config [é项] å½ä»¤\n" "\n" -"apt-config æ¯ä¸ä¸ªç¨äºè¯»å APT é ç½®æ件çç®åå·¥å ·\n" +"apt-config æ¯ä¸ä¸ªç¨äºè¯»åAPT é ç½®æ件çç®åå·¥å ·\n" "\n" "å½ä»¤ï¼\n" " shell - Shell 模å¼\n" @@ -309,40 +313,40 @@ 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:1149 #, c-format msgid "Unable to write to %s" msgstr "æ æ³åå ¥ %s" -#: cmdline/apt-extracttemplates.cc:310 +#: cmdline/apt-extracttemplates.cc:309 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "æ æ³è·å¾ debconf ççæ¬ãæ¨å®è£ äº debconf å?" +msgstr "æ æ³è·å¾ debconf ççæ¬ãæ¨å®è£ äº debconf åï¼" -#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347 msgid "Package extension list is too long" -msgstr "软件å çæ©å±åè¡¨è¶ é¿" +msgstr "软件å çæ©å±å表太é¿" -#: 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 +#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189 +#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298 #, c-format msgid "Error processing directory %s" msgstr "å¤çç®å½ %s æ¶åºé" -#: ftparchive/apt-ftparchive.cc:251 +#: ftparchive/apt-ftparchive.cc:260 msgid "Source extension list is too long" -msgstr "æºæ©å±åè¡¨è¶ é¿" +msgstr "æºæ©å±å表太é¿" -#: ftparchive/apt-ftparchive.cc:368 +#: ftparchive/apt-ftparchive.cc:377 msgid "Error writing header to contents file" -msgstr "å° header åå° contents æ件æ¶åºé" +msgstr "å°å¤´åå ¥å°ç®å½æ件æ¶åºé" -#: ftparchive/apt-ftparchive.cc:398 +#: ftparchive/apt-ftparchive.cc:407 #, c-format msgid "Error processing contents %s" -msgstr "å¤ç Contents %s æ¶åºé" +msgstr "å¤çç®å½ %s æ¶åºé" -#: ftparchive/apt-ftparchive.cc:553 +#: ftparchive/apt-ftparchive.cc:595 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -422,11 +426,11 @@ msgstr "" " -c=? 读åæå®é ç½®æ件\n" " -o=? 设置任ææå®çé ç½®é项" -#: ftparchive/apt-ftparchive.cc:759 +#: ftparchive/apt-ftparchive.cc:801 msgid "No selections matched" msgstr "没æä»»ä½éå®é¡¹æ¯å¹é ç" -#: ftparchive/apt-ftparchive.cc:832 +#: ftparchive/apt-ftparchive.cc:879 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件å æ件ç»â%sâä¸ç¼ºå°ä¸äºæ件" @@ -434,132 +438,127 @@ msgstr "软件å æ件ç»â%sâä¸ç¼ºå°ä¸äºæ件" #: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "ç¼åæ°æ®åºè¢«æåäºï¼è¯¥æ°æ®åºæ件çæ件åå·²æ¹æ %s.old" +msgstr "æ°æ®åºè¢«æåï¼è¯¥æ°æ®åºæ件çæ件åå·²æ¹æ %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB å·²è¿æ¶ï¼ç°è¯å¾è¿è¡å级 %s" +msgstr "æ°æ®åºå·²è¿æï¼ç°å°è¯è¿è¡å级 %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -"DB æ ¼å¼æ¯æ æçãå¦æä½ æ¯ä»ä¸ä¸ªèçæ¬ç apt å级èæ¥ï¼è¯·å é¤æ°æ®åºå¹¶é建å®ã" +"æ°æ®åºæ ¼å¼æ æãå¦ææ¨æ¯ä»ä¸ä¸ªèçæ¬ç apt å级èæ¥ï¼è¯·å é¤æ°æ®åºå¹¶é建å®ã" #: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "æ æ³æå¼ DB æ件 %sï¼%s" +msgstr "æ æ³æå¼æ°æ®åºæ件 %sï¼%s" #: 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 #, c-format msgid "Failed to stat %s" -msgstr "æ æ³è¯»å %s çç¶æ" +msgstr "æ æ³è·å¾ %s çç¶æ" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" -msgstr "å档没æå å«æ§å¶å段" +msgstr "å½æ¡£æ件没æå å«æ§å¶å段" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" -msgstr "æ æ³è·å¾æ¸¸æ (cursor)" +msgstr "æ æ³è·å¾æ¸¸æ " -#: ftparchive/writer.cc:76 +#: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "è¦åï¼æ æ³è¯»åç®å½ %s\n" -#: ftparchive/writer.cc:81 +#: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" -msgstr "è¦åï¼æ æ³å¯¹ %s è¿è¡ç»è®¡\n" +msgstr "è¦åï¼æ æ³è·å¾ %s çç¶æ\n" -#: ftparchive/writer.cc:132 +#: ftparchive/writer.cc:139 msgid "E: " msgstr "é误ï¼" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:141 msgid "W: " msgstr "è¦åï¼" -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:148 msgid "E: Errors apply to file " msgstr "é误ï¼å¤çæ件æ¶åºé " -#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#: ftparchive/writer.cc:166 ftparchive/writer.cc:198 #, c-format msgid "Failed to resolve %s" -msgstr "æ æ³è§£æè·¯å¾ %s" +msgstr "æ æ³è§£æ %s" -#: ftparchive/writer.cc:170 +#: ftparchive/writer.cc:179 msgid "Tree walking failed" msgstr "æ æ³éåç®å½æ " -#: ftparchive/writer.cc:195 +#: ftparchive/writer.cc:206 #, c-format msgid "Failed to open %s" msgstr "æ æ³æå¼ %s" -#: ftparchive/writer.cc:254 +#: ftparchive/writer.cc:265 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:262 +#: ftparchive/writer.cc:273 #, c-format msgid "Failed to readlink %s" msgstr "æ æ³è¯»å符å·é¾æ¥ %s" -#: ftparchive/writer.cc:266 +#: ftparchive/writer.cc:277 #, c-format msgid "Failed to unlink %s" -msgstr "æ æ³ unlink %s" +msgstr "æ æ³ä½¿ç¨ unlink å é¤ %s" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:284 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** æ æ³å° %s é¾æ¥å° %s" -#: ftparchive/writer.cc:283 +#: ftparchive/writer.cc:294 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " è¾¾å°äº DeLink çä¸é %sBã\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:398 msgid "Archive had no package field" -msgstr "å档没æå å«è½¯ä»¶å (package)å段" +msgstr "å½æ¡£æ件没æå å« package å段" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:406 ftparchive/writer.cc:703 #, c-format msgid " %s has no override entry\n" msgstr " %s ä¸æ²¡æ override 项\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:472 ftparchive/writer.cc:811 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s çç»´æ¤è %s 并é %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:713 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没ææºä»£ç ç override 项\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:717 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ä¸æ²¡æäºè¿å¶æ件ç override 项\n" -#: ftparchive/contents.cc:321 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "å é¨é误ï¼æ æ³å®ä½å å æ件 %s" - -#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 msgid "realloc - Failed to allocate memory" -msgstr "realloc - æ æ³ååé å å" +msgstr "realloc - åé å å失败" #: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format @@ -586,284 +585,381 @@ msgstr "override æ件 %s 第 %lu è¡çæ ¼å¼æ误 #3" msgid "Failed to read the override file %s" msgstr "æ æ³è¯»å override æ件 %s" -#: ftparchive/multicompress.cc:72 +#: ftparchive/multicompress.cc:67 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "æªç¥çå缩ç®æ³â%sâ" -#: ftparchive/multicompress.cc:102 +#: ftparchive/multicompress.cc:97 #, c-format msgid "Compressed output %s needs a compression set" msgstr "å缩åçè¾åºæ件 %s è¦æ±æä¸ä¸ªå缩æ件éå" -#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:165 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "æ æ³ä¸ºåè¿ç¨å建 IPC 管é" -#: ftparchive/multicompress.cc:195 +#: ftparchive/multicompress.cc:191 msgid "Failed to create FILE*" msgstr "æ æ³å建 FILE*" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to fork" msgstr "æ æ³ fork" -#: ftparchive/multicompress.cc:212 +#: ftparchive/multicompress.cc:208 msgid "Compress child" msgstr "å缩åè¿ç¨" -#: ftparchive/multicompress.cc:235 +#: ftparchive/multicompress.cc:231 #, c-format msgid "Internal error, failed to create %s" -msgstr "å é¨é误ï¼æ æ³å»ºç« %s" +msgstr "å é¨é误ï¼æ æ³å建 %s" -#: ftparchive/multicompress.cc:286 +#: ftparchive/multicompress.cc:282 msgid "Failed to create subprocess IPC" -msgstr "æ æ³å»ºç«åè¿ç¨ç IPC 管é" +msgstr "æ æ³å建åè¿ç¨ç IPC 管é" -#: ftparchive/multicompress.cc:321 +#: ftparchive/multicompress.cc:319 msgid "Failed to exec compressor " msgstr "æ æ³æ§è¡å缩ç¨åº" -#: ftparchive/multicompress.cc:360 +#: ftparchive/multicompress.cc:358 msgid "decompressor" msgstr "解åç¨åº" -#: ftparchive/multicompress.cc:403 +#: ftparchive/multicompress.cc:401 msgid "IO to subprocess/file failed" msgstr "æ æ³å¯¹åè¿ç¨ææ件è¿è¡è¯»å" -#: ftparchive/multicompress.cc:455 +#: ftparchive/multicompress.cc:453 msgid "Failed to read while computing MD5" -msgstr "å¨è®¡ç® MD5 æ ¡éªåæ¶ï¼æ æ³è¯»åæ°æ®" +msgstr "å¨è®¡ç® MD5 æ ¡éªåæ¶æ æ³è¯»åæ°æ®" -#: ftparchive/multicompress.cc:472 +#: ftparchive/multicompress.cc:470 #, c-format msgid "Problem unlinking %s" -msgstr "å¨ unlink %s æ¶åºé" +msgstr "å¨ä½¿ç¨ unlink å é¤ %s æ¶åºé" -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "æ æ³å° %s éå½å为 %s" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:135 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29 #, c-format msgid "Regex compilation error - %s" msgstr "ç¼è¯æ£å表达å¼æ¶åºé - %s" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:252 msgid "The following packages have unmet dependencies:" -msgstr "ä¸åç软件å æä¸è½æ»¡è¶³çä¾èµå ³ç³»ï¼" +msgstr "ä¸å软件å ææªæ»¡è¶³çä¾èµå ³ç³»ï¼" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:342 #, c-format msgid "but %s is installed" -msgstr "ä½æ¯ %s å·²ç»å®è£ äº" +msgstr "ä½æ¯ %s å·²ç»å®è£ " -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:344 #, c-format msgid "but %s is to be installed" msgstr "ä½æ¯ %s æ£è¦è¢«å®è£ " -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:351 msgid "but it is not installable" -msgstr "ä½å´æ æ³å®è£ å®" +msgstr "ä½æ æ³å®è£ å®" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:353 msgid "but it is a virtual package" -msgstr "ä½æ¯å®åªæ¯ä¸ªèæ软件å " +msgstr "ä½æ¯å®æ¯èæ软件å " -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:356 msgid "but it is not installed" msgstr "ä½æ¯å®è¿æ²¡æ被å®è£ " -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:356 msgid "but it is not going to be installed" msgstr "ä½æ¯å®å°ä¸ä¼è¢«å®è£ " -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:361 msgid " or" msgstr " æ" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:390 msgid "The following NEW packages will be installed:" msgstr "ä¸åãæ°ã软件å å°è¢«å®è£ ï¼" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:416 msgid "The following packages will be REMOVED:" msgstr "ä¸å软件å å°è¢«ãå¸è½½ãï¼" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:438 msgid "The following packages have been kept back:" -msgstr "ä¸åç软件å ççæ¬å°ä¿æä¸åï¼" +msgstr "ä¸å软件å ççæ¬å°ä¿æä¸åï¼" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:459 msgid "The following packages will be upgraded:" -msgstr "ä¸åç软件å å°è¢«å级ï¼" +msgstr "ä¸å软件å å°è¢«å级ï¼" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:480 msgid "The following packages will be DOWNGRADED:" msgstr "ä¸å软件å å°è¢«ãé级ãï¼" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:500 msgid "The following held packages will be changed:" msgstr "ä¸å被è¦æ±ä¿æçæ¬ä¸åç软件å å°è¢«æ¹åï¼" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:555 #, c-format msgid "%s (due to %s) " msgstr "%s (æ¯ç±äº %s) " -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:563 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ãè¦åãï¼ä¸åçåºç¡è½¯ä»¶å å°è¢«å¸è½½ã\n" +"ãè¦åãï¼ä¸ååºç¡è½¯ä»¶å å°è¢«å¸è½½ã\n" "请å¿å°è¯ï¼é¤éæ¨ç¡®å®ç¥éæ¨å¨åä»ä¹ï¼" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:594 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "å ±åçº§äº %lu 个软件å ï¼æ°å®è£ äº %lu 个软件å ï¼" +msgstr "åçº§äº %lu 个软件å ï¼æ°å®è£ äº %lu 个软件å ï¼" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:598 #, c-format msgid "%lu reinstalled, " -msgstr "å ±éæ°å®è£ äº %lu 个软件å ï¼" +msgstr "éæ°å®è£ äº %lu 个软件å ï¼" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:600 #, c-format msgid "%lu downgraded, " msgstr "éçº§äº %lu 个软件å ï¼" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:602 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "è¦å¸è½½ %lu 个软件å ï¼æ %lu 个软件æªè¢«å级ã\n" +msgstr "è¦å¸è½½ %lu 个软件å ï¼æ %lu 个软件å æªè¢«å级ã\n" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:606 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "æ %lu 个软件å 没æ被å®å ¨å®è£ æå¸è½½ã\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:628 +#, c-format +msgid "Note, selecting '%s' for task '%s'\n" +msgstr "注æï¼ä¸ºä»»å¡ %2$s éä¸äº %1$s\n" + +#: cmdline/apt-get.cc:634 +#, c-format +msgid "Note, selecting '%s' for regex '%s'\n" +msgstr "注æï¼æ ¹æ®æ£åè¡¨è¾¾å¼ %2$s éä¸äº %1$s\n" + +#: cmdline/apt-get.cc:651 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "软件å %s æ¯ä¸ä¸ªç±ä¸é¢ç软件å æä¾çèæ软件å ï¼\n" + +#: cmdline/apt-get.cc:662 +msgid " [Installed]" +msgstr " [å·²å®è£ ]" + +#: cmdline/apt-get.cc:671 +msgid " [Not candidate version]" +msgstr " [æ åéçæ¬]" + +#: cmdline/apt-get.cc:673 +msgid "You should explicitly select one to install." +msgstr "请æ¨æç¡®å°éæ©ä¸ä¸ªæ¥è¿è¡å®è£ ã" + +#: cmdline/apt-get.cc:676 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" +"ç°å¨æ²¡æå¯ç¨ç软件å %sï¼ä½æ¯å®è¢«å ¶å®ç软件å å¼ç¨äºã\n" +"è¿å¯è½æå³çè¿ä¸ªç¼ºå¤±ç软件å å¯è½å·²è¢«åºå¼ï¼\n" +"æè åªè½å¨å ¶ä»åå¸æºä¸æ¾å°\n" + +#: cmdline/apt-get.cc:694 +msgid "However the following packages replace it:" +msgstr "å¯æ¯ä¸å软件å å代äºå®ï¼" + +#: cmdline/apt-get.cc:706 +#, c-format +msgid "Package '%s' has no installation candidate" +msgstr "软件å %s 没æå¯ä¾å®è£ çåéè " + +#: cmdline/apt-get.cc:717 +#, c-format +msgid "Virtual packages like '%s' can't be removed\n" +msgstr "类似 %s çèæ软件å å¯ä»¥å¸è½½\n" + +#: cmdline/apt-get.cc:748 +#, c-format +msgid "Note, selecting '%s' instead of '%s'\n" +msgstr "注æï¼éå %s èé %s\n" + +#: cmdline/apt-get.cc:778 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "忽ç¥äº %sï¼å®å·²ç»è¢«å®è£ èä¸æ²¡ææå®è¦å级ã\n" + +#: cmdline/apt-get.cc:782 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "忽ç¥äº %sï¼å®å·²ç»è¢«å®è£ èä¸ä» 请æ±äºå级ã\n" + +#: cmdline/apt-get.cc:794 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "ä¸è½éæ°å®è£ %sï¼å 为æ æ³ä¸è½½å®ã\n" + +#: cmdline/apt-get.cc:799 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s å·²ç»æ¯ææ°ççæ¬äºã\n" + +#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s 被设置为æå¨å®è£ ã\n" + +#: cmdline/apt-get.cc:844 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "为 %3$s éå®äºçæ¬ %1$s (%2$s)\n" + +#: cmdline/apt-get.cc:849 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "为 %3$s éå®äºçæ¬ %1$s (%2$s)\n" + +#: cmdline/apt-get.cc:893 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "软件å %s è¿æªå®è£ ï¼å èä¸ä¼è¢«å¸è½½\n" + +#: cmdline/apt-get.cc:971 msgid "Correcting dependencies..." msgstr "æ£å¨æ´æ£ä¾èµå ³ç³»..." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:974 msgid " failed." msgstr " 失败ã" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:977 msgid "Unable to correct dependencies" msgstr "æ æ³æ´æ£ä¾èµå ³ç³»" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:980 msgid "Unable to minimize the upgrade set" msgstr "æ æ³æå°åè¦å级ç软件å éå" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:982 msgid " Done" msgstr " å®æ" -#: cmdline/apt-get.cc:682 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "æ¨ä¹è®¸éè¦è¿è¡âapt-get -f installâæ¥çº æ£ä¸é¢çé误ã" +#: cmdline/apt-get.cc:986 +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "æ¨ä¹è®¸éè¦è¿è¡âapt-get -f installâæ¥ä¿®æ£ä¸é¢çé误ã" -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:989 msgid "Unmet dependencies. Try using -f." msgstr "ä¸è½æ»¡è¶³ä¾èµå ³ç³»ãä¸å¦¨è¯ä¸ä¸ -f é项ã" -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:1014 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ãè¦åãï¼ä¸åç软件å ä¸è½éè¿éªè¯ï¼" +msgstr "ãè¦åãï¼ä¸å软件å ä¸è½éè¿éªè¯ï¼" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:1018 msgid "Authentication warning overridden.\n" msgstr "忽ç¥äºè®¤è¯è¦åã\n" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:1025 msgid "Install these packages without verification [y/N]? " -msgstr "ä¸ç»éªè¯å°±å®è£ è¿äºè½¯ä»¶å ä¹ï¼[y/N] " +msgstr "ä¸ç»éªè¯å°±å®è£ è¿äºè½¯ä»¶å åï¼[y/N] " -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:1027 msgid "Some packages could not be authenticated" msgstr "æäºè½¯ä»¶å ä¸è½éè¿éªè¯" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 msgid "There are problems and -y was used without --force-yes" msgstr "碰å°äºä¸äºé®é¢ï¼æ¨ä½¿ç¨äº -y é项ï¼ä½æ¯æ²¡æç¨ --force-yes" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:1077 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "å é¨é误ï¼InstallPackages 被ç¨å¨äºæ æ³å®è£ ç软件å ä¸ï¼" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:1086 msgid "Packages need to be removed but remove is disabled." msgstr "æ软件å éè¦è¢«å¸è½½ï¼ä½æ¯å¸è½½å¨ä½è¢«ç¨åºè®¾ç½®æç¦æ¢ã" -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:1097 msgid "Internal error, Ordering didn't finish" msgstr "å é¨é误ï¼Ordering æªè½å®æ" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 -msgid "Unable to lock the download directory" -msgstr "æ æ³å¯¹ä¸è½½ç®å½å é" - -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 -#: apt-pkg/cachefile.cc:65 -msgid "The list of sources could not be read." -msgstr "æ æ³è¯»åå®è£ æºå表ã" - -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:1135 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "æªäºâ¦â¦æ件大å°ä¸ç¬¦ï¼åä¿¡ç» apt@packages.debian.org å§" +msgstr "æªäºâ¦â¦æ件大å°ä¸ç¬¦ï¼è¯·åä¿¡ç» apt@packages.debian.org å§" -#: cmdline/apt-get.cc:839 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1142 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "éè¦ä¸è½½ %sB/%sB ç软件å ã\n" -#: cmdline/apt-get.cc:842 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1147 #, c-format msgid "Need to get %sB of archives.\n" msgstr "éè¦ä¸è½½ %sB ç软件å ã\n" -#: cmdline/apt-get.cc:847 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1154 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解å缩åä¼æ¶èæ %sB çé¢å¤ç©ºé´ã\n" -#: cmdline/apt-get.cc:850 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1159 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "解å缩åå°ä¼ç©ºåº %sB ç空é´ã\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499 +#: cmdline/apt-get.cc:2502 #, c-format msgid "Couldn't determine free space in %s" -msgstr "æ æ³è·ç¥æ¨å¨ %s ä¸ç空ä½ç©ºé´" +msgstr "æ æ³è·ç¥æ¨å¨ %s ä¸çå¯ç¨ç©ºé´" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:1187 #, c-format msgid "You don't have enough free space in %s." -msgstr "æ¨å¨ %s ä¸æ²¡æ足å¤ç空ä½ç©ºé´ã" +msgstr "æ¨å¨ %s ä¸æ²¡æ足å¤çå¯ç¨ç©ºé´ã" -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "è½ç¶æ¨æå®äº Trivial Onlyï¼ä½è¿ä¸æ¯ä¸ªæ¥å¸¸(trivial)æä½ã" +msgstr "è½ç¶æ¨æå®äºä» æ§è¡å¸¸è§æä½ï¼ä½è¿ä¸æ¯ä¸ªå¸¸è§æä½ã" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:1205 msgid "Yes, do as I say!" -msgstr "Yes, do as I say!" +msgstr "æ¯ï¼ææ说çåï¼" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:1207 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -874,28 +970,28 @@ msgstr "" "è¥è¿æ³ç»§ç»çè¯ï¼å°±è¾å ¥ä¸é¢ççå¥â%sâ\n" " ?] " -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 msgid "Abort." msgstr "ä¸æ¢æ§è¡ã" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:1228 msgid "Do you want to continue [Y/n]? " msgstr "æ¨å¸æ继ç»æ§è¡åï¼[Y/n]" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438 #, c-format msgid "Failed to fetch %s %s\n" msgstr "æ æ³ä¸è½½ %s %s\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1318 msgid "Some files failed to download" -msgstr "æä¸äºæ件ä¸è½½å¤±è´¥" +msgstr "æä¸äºæ件æ æ³ä¸è½½" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576 msgid "Download complete and in download only mode" msgstr "ä¸è½½å®æ¯ï¼ç®åæ¯âä» ä¸è½½â模å¼" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1325 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -903,118 +999,60 @@ msgstr "" "æå 个软件å æ æ³ä¸è½½ï¼æ¨å¯ä»¥è¿è¡ apt-get update æè å ä¸ --fix-missing çé项" "åè¯è¯ï¼" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1329 msgid "--fix-missing and media swapping is not currently supported" -msgstr "ç®åè¿ä¸æ¯æ --fix-missing åä»è´¨äº¤æ¢(media swapping)" +msgstr "ç®åè¿ä¸æ¯æ --fix-missing åä»è´¨äº¤æ¢" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1334 msgid "Unable to correct missing packages." msgstr "æ æ³æ´æ£ç¼ºå°ç软件å ã" -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1335 msgid "Aborting install." -msgstr "æ¾å¼å®è£ ã" - -#: cmdline/apt-get.cc:1053 -#, c-format -msgid "Note, selecting %s instead of %s\n" -msgstr "注æï¼éå %s èé %s\n" +msgstr "ä¸æ¢å®è£ ã" -#: cmdline/apt-get.cc:1063 -#, c-format -msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "忽ç¥äº %sï¼å®å·²ç»è¢«å®è£ èä¸æ²¡ææå®è¦å级ã\n" - -#: cmdline/apt-get.cc:1081 -#, c-format -msgid "Package %s is not installed, so not removed\n" -msgstr "软件å %s è¿æªå®è£ ï¼å èä¸ä¼è¢«å¸è½½\n" - -#: cmdline/apt-get.cc:1092 -#, c-format -msgid "Package %s is a virtual package provided by:\n" -msgstr "软件å %s æ¯ä¸ä¸ªç±ä¸é¢ç软件å æä¾çèæ软件å ï¼\n" - -#: cmdline/apt-get.cc:1104 -msgid " [Installed]" -msgstr " [å·²å®è£ ]" - -#: cmdline/apt-get.cc:1109 -msgid "You should explicitly select one to install." -msgstr "请æ¨æç¡®å°éæ©ä¸ä¸ªæ¥è¿è¡å®è£ ã" - -#: cmdline/apt-get.cc:1114 -#, c-format +#: cmdline/apt-get.cc:1363 msgid "" -"Package %s is not available, but is referred to by another package.\n" -"This may mean that the package is missing, has been obsoleted, or\n" -"is only available from another source\n" -msgstr "" -"ç°å¨æ²¡æå¯ç¨ç软件å %sï¼ä½æ¯å®è¢«å ¶å®ç软件å å¼ç¨äºã\n" -"è¿å¯è½æå³çè¿ä¸ªç¼ºå¤±ç软件å å¯è½å·²è¢«åºå¼ï¼\n" -"æè åªè½å¨å ¶ä»åå¸æºä¸æ¾å°\n" - -#: cmdline/apt-get.cc:1133 -msgid "However the following packages replace it:" -msgstr "å¯æ¯ä¸åç软件å å代äºå®ï¼" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "以ä¸è½¯ä»¶å å 为æä»¶å·²è¢«å ¶ä»è½¯ä»¶å è¦çèæ¶å¤±ï¼" -#: cmdline/apt-get.cc:1136 -#, c-format -msgid "Package %s has no installation candidate" -msgstr "软件å %s è¿æ²¡æå¯ä¾å®è£ çåéè " +#: cmdline/apt-get.cc:1367 +msgid "Note: This is done automatic and on purpose by dpkg." +msgstr "注æï¼è¿æ¯èªå¨è¢« dpkg ææå®æçã" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1505 #, c-format -msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "ä¸è½éæ°å®è£ %sï¼å 为æ æ³ä¸è½½å®ã\n" +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "忽ç¥ä¸å¯ç¨ç软件å %2$s çç®æ åè¡çæ¬ %1$s" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1537 #, c-format -msgid "%s is already the newest version.\n" -msgstr "%s å·²ç»æ¯ææ°ççæ¬äºã\n" - -#: cmdline/apt-get.cc:1193 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "æªæ¾å°â%2$sâçâ%1$sâåå¸çæ¬" - -#: cmdline/apt-get.cc:1195 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "æªæ¾å°â%2$sâçâ%1$sâçæ¬" +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "éæ© %s ä½ä¸ºæºä»£ç å èé %s\n" -#: cmdline/apt-get.cc:1201 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1575 #, c-format -msgid "Selected version %s (%s) for %s\n" -msgstr "éå®äºçæ¬ä¸º %s (%s) ç %s\n" +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "忽ç¥ä¸å¯ç¨ç %2$s 软件å ç %1$s ç" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1591 msgid "The update command takes no arguments" -msgstr " update å½ä»¤æ¯ä¸éä»»ä½åæ°ç" - -#: cmdline/apt-get.cc:1351 -msgid "Unable to lock the list directory" -msgstr "æ æ³å¯¹ç¶æå表ç®å½å é" +msgstr " update å½ä»¤ä¸éè¦åæ°" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1653 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "æ们ä¸åºè¯¥è¿è¡å é¤ï¼æ æ³å¯å¨èªå¨å é¤å¨" -#: cmdline/apt-get.cc:1435 -msgid "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr "ä¸å软件å æ¯èªå¨å®è£ ç并ä¸ç°å¨ä¸å被使ç¨äºï¼" - -#: cmdline/apt-get.cc:1437 -msgid "Use 'apt-get autoremove' to remove them." -msgstr "使ç¨'apt-get autoremove'æ¥å é¤å®ä»¬" - -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1748 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." -msgstr "ä¼¼ä¹èªå¨å é¤å¨æ¯æäºä¸äºè½¯ä»¶ï¼è¿ä¸åºè¯¥åçã请å apt æ交é误æ¥åã" +msgstr "ä¼¼ä¹èªå¨å¸è½½å·¥å ·æåäºä¸äºè½¯ä»¶ï¼è¿ä¸åºè¯¥åçã请å apt æ交é误æ¥åã" #. #. if (Packages == 1) @@ -1026,43 +1064,42 @@ msgstr "ä¼¼ä¹èªå¨å é¤å¨æ¯æäºä¸äºè½¯ä»¶ï¼è¿ä¸åºè¯¥åçã请å #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921 msgid "The following information may help to resolve the situation:" -msgstr "ä¸åçä¿¡æ¯å¯è½ä¼å¯¹è§£å³é®é¢ææ帮å©ï¼" +msgstr "ä¸åä¿¡æ¯å¯è½ä¼å¯¹è§£å³é®é¢ææ帮å©ï¼" -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1755 msgid "Internal Error, AutoRemover broke stuff" -msgstr "å é¨é误ï¼èªå¨å é¤å¨åäºäº" +msgstr "å é¨é误ï¼èªå¨å¸è½½å·¥å ·åäºäº" -#: cmdline/apt-get.cc:1468 -msgid "Internal error, AllUpgrade broke stuff" -msgstr "å é¨é误ï¼å ¨é¨å级åäºäº" - -#: cmdline/apt-get.cc:1523 -#, c-format -msgid "Couldn't find task %s" -msgstr "æ æ³æ¾å°ä»»å¡ %s" +#: cmdline/apt-get.cc:1762 +msgid "" +"The following package was automatically installed and is no longer required:" +msgid_plural "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[0] "ä¸å软件å æ¯èªå¨å®è£ ç并ä¸ç°å¨ä¸éè¦äºï¼" -#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1766 #, c-format -msgid "Couldn't find package %s" -msgstr "æ æ³æ¾å°è½¯ä»¶å %s" +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "%lu 个èªå¨å®è£ çç软件å ç°å¨å·²ä¸åéè¦äºã\n" -#: cmdline/apt-get.cc:1661 -#, c-format -msgid "Note, selecting %s for regex '%s'\n" -msgstr "注æï¼æ ¹æ®æ£å表达å¼â%2$sâéä¸äº %1$s\n" +#: cmdline/apt-get.cc:1768 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "使ç¨'apt-get autoremove'æ¥å¸è½½å®ä»¬" -#: cmdline/apt-get.cc:1692 -#, c-format -msgid "%s set to manually installed.\n" -msgstr "%s 被设置为æå¨å®è£ ã\n" +#: cmdline/apt-get.cc:1787 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "å é¨é误ï¼å ¨é¨åçº§å·¥å ·åäºäº" -#: cmdline/apt-get.cc:1705 -msgid "You might want to run `apt-get -f install' to correct these:" +#: cmdline/apt-get.cc:1886 +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "æ¨å¯è½éè¦è¿è¡âapt-get -f installâæ¥çº æ£ä¸åé误ï¼" -#: cmdline/apt-get.cc:1708 +#: cmdline/apt-get.cc:1890 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1070,165 +1107,241 @@ msgstr "" "ææªè½æ»¡è¶³çä¾èµå ³ç³»ã请å°è¯ä¸ææ软件å çååæ¥è¿è¡âapt-get -f installâ(ä¹å¯" "以æå®ä¸ä¸ªè§£å³åæ³)ã" -#: cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:1906 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" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"æä¸äºè½¯ä»¶å æ æ³è¢«å®è£ ãå¦ææ¨ç¨çæ¯ä¸ç¨³å®(unstable)åè¡çï¼è¿ä¹è®¸æ¯\n" +"æä¸äºè½¯ä»¶å æ æ³è¢«å®è£ ãå¦ææ¨ç¨çæ¯ unstable åè¡çï¼è¿ä¹è®¸æ¯\n" "å 为系ç»æ æ³è¾¾å°æ¨è¦æ±çç¶æé æçã该çæ¬ä¸å¯è½ä¼æä¸äºæ¨éè¦ç软件\n" -"å å°æªè¢«å建ææ¯å®ä»¬è¿å¨æ°å°(incoming)ç®å½ä¸ã" +"å å°æªè¢«å建ææ¯å®ä»¬å·²è¢«ä»æ°å°(Incoming)ç®å½ç§»åºã" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1924 msgid "Broken packages" -msgstr "æ æ³å®è£ ç软件å " +msgstr "ç ´æç软件å " -#: cmdline/apt-get.cc:1767 +#: cmdline/apt-get.cc:1950 msgid "The following extra packages will be installed:" msgstr "å°ä¼å®è£ ä¸åé¢å¤ç软件å ï¼" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:2040 msgid "Suggested packages:" msgstr "建议å®è£ ç软件å ï¼" -#: cmdline/apt-get.cc:1857 +#: cmdline/apt-get.cc:2041 msgid "Recommended packages:" msgstr "æ¨èå®è£ ç软件å ï¼" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:2083 +#, c-format +msgid "Couldn't find package %s" +msgstr "æ æ³æ¾å°è½¯ä»¶å %s" + +#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61 +#, c-format +msgid "%s set to automatically installed.\n" +msgstr "%s 被设置为æå¨å®è£ ã\n" + +#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105 +msgid "" +"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " +"instead." +msgstr "" + +#: cmdline/apt-get.cc:2114 msgid "Calculating upgrade... " -msgstr "æ£å¨ç¹åå级... " +msgstr "æ£å¨å¯¹å级è¿è¡è®¡ç®... " -#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:2122 msgid "Done" msgstr "å®æ" -#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197 msgid "Internal error, problem resolver broke stuff" -msgstr "å é¨é误ï¼é®é¢è§£å³å¨åäºäº" +msgstr "å é¨é误ï¼é®é¢è§£å³å·¥å ·åäºäº" + +#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254 +msgid "Unable to lock the download directory" +msgstr "æ æ³éå®ä¸è½½ç®å½" + +#: cmdline/apt-get.cc:2305 +#, c-format +msgid "Downloading %s %s" +msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2361 msgid "Must specify at least one package to fetch source for" msgstr "è¦ä¸è½½æºä»£ç ï¼å¿ é¡»æå®è³å°ä¸ä¸ªå¯¹åºç软件å " -#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 +#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713 #, c-format msgid "Unable to find a source package for %s" msgstr "æ æ³æ¾å°ä¸ %s 对åºçæºä»£ç å " -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2418 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" +"æ示ï¼%s çæå å·¥ä½è¢«ç»´æ¤äºä»¥ä¸ä½ç½®ç %s çæ¬æ§å¶ç³»ç»ä¸ï¼\n" +"%s\n" + +#: cmdline/apt-get.cc:2423 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possibly unreleased) updates to the package.\n" +msgstr "" +"请使ç¨ï¼\n" +"bzr get %s\n" +"è·å¾è¯¥è½¯ä»¶å çæè¿æ´æ°(å¯è½å°æªæ£å¼åå¸)ã\n" + +#: cmdline/apt-get.cc:2476 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽ç¥å·²ä¸è½½è¿çæ件â%sâ\n" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2513 #, c-format msgid "You don't have enough free space in %s" -msgstr "æ¨å¨ %s ä¸æ²¡æ足å¤ç空ä½ç©ºé´" +msgstr "æ¨å¨ %s ä¸æ²¡æ足å¤çå¯ç¨ç©ºé´" -#: cmdline/apt-get.cc:2181 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:2522 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "éè¦ä¸è½½ %sB/%sB çæºä»£ç å ã\n" -#: cmdline/apt-get.cc:2184 +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:2527 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "éè¦ä¸è½½ %sB çæºä»£ç å ã\n" -#: cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2533 #, c-format msgid "Fetch source %s\n" msgstr "ä¸è½½æºä»£ç %s\n" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2571 msgid "Failed to fetch some archives." msgstr "æä¸äºå æ件æ æ³ä¸è½½ã" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2602 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "对äºå·²ç»è¢«è§£å å° %s ç®å½çæºä»£ç å å°±ä¸å解å¼äº\n" +msgstr "忽ç¥å·²ç»è¢«è§£å å° %s ç®å½çæºä»£ç å \n" -#: cmdline/apt-get.cc:2261 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "è¿è¡è§£å çå½ä»¤â%sâåºéã\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2615 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请æ£æ¥æ¯å¦å®è£ äºâdpkg-devâ软件å ã\n" -#: cmdline/apt-get.cc:2279 +#: cmdline/apt-get.cc:2637 #, c-format msgid "Build command '%s' failed.\n" msgstr "æ§è¡æé 软件å å½ä»¤â%sâ失败ã\n" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2657 msgid "Child process failed" msgstr "åè¿ç¨åºé" -#: cmdline/apt-get.cc:2314 +#: cmdline/apt-get.cc:2676 msgid "Must specify at least one package to check builddeps for" -msgstr "è¦æ£æ¥çæ软件å çæ建ä¾èµå ³ç³»(builddeps)ï¼å¿ é¡»æå®è³å°ä¸ä¸ªè½¯ä»¶å " +msgstr "è¦æ£æ¥çæ软件å çæ建ä¾èµå ³ç³»ï¼å¿ é¡»æå®è³å°ä¸ä¸ªè½¯ä»¶å " + +#: cmdline/apt-get.cc:2701 +#, c-format +msgid "" +"No architecture information available for %s. See apt.conf(5) APT::" +"Architectures for setup" +msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2718 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "æ æ³è·å¾ %s çæ建ä¾èµå ³ç³»(build-dependency)ä¿¡æ¯" +msgstr "æ æ³è·å¾ %s çæ建ä¾èµå ³ç³»ä¿¡æ¯" -#: cmdline/apt-get.cc:2362 +#: cmdline/apt-get.cc:2738 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没ææ建ä¾èµå ³ç³»ä¿¡æ¯ã\n" -#: cmdline/apt-get.cc:2414 +#: cmdline/apt-get.cc:2868 +#, fuzzy, c-format +msgid "" +"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " +"packages" +msgstr "ç±äºæ æ³æ¾å°è½¯ä»¶å %3$s ï¼å æ¤ä¸è½æ»¡è¶³ %2$s æè¦æ±ç %1$s ä¾èµå ³ç³»" + +#: cmdline/apt-get.cc:2889 #, 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:2467 +#: cmdline/apt-get.cc:2912 #, 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:2951 +#, fuzzy, c-format msgid "" -"%s dependency for %s cannot be satisfied because no available versions of " -"package %s can satisfy version requirements" +"%s dependency for %s cannot be satisfied because candidate version of " +"package %s can't satisfy version requirements" msgstr "" -"ç±äºæ æ³æ¾å°ç¬¦åè¦æ±ç软件å %3$s çå¯ç¨çæ¬ï¼å æ¤ä¸è½æ»¡è¶³ %2$s æè¦æ±ç %1" -"$s ä¾èµå ³ç³»" +"ç±äºæ æ³æ¾å°ç¬¦åè¦æ±ç软件å %3$s çå¯ç¨çæ¬ï¼å æ¤ä¸è½æ»¡è¶³ %2$s æè¦æ±ç " +"%1$s ä¾èµå ³ç³»" -#: cmdline/apt-get.cc:2503 -#, 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:2957 +#, fuzzy, c-format +msgid "" +"%s dependency for %s cannot be satisfied because package %s has no candidate " +"version" +msgstr "ç±äºæ æ³æ¾å°è½¯ä»¶å %3$s ï¼å æ¤ä¸è½æ»¡è¶³ %2$s æè¦æ±ç %1$s ä¾èµå ³ç³»" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2980 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "æ æ³æ»¡è¶³ %2$s æè¦æ± %1$s ä¾èµå ³ç³»ï¼%3$s" -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2996 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ä¸è½æ»¡è¶³è½¯ä»¶å %s æè¦æ±çæ建ä¾èµå ³ç³»ã" -#: cmdline/apt-get.cc:2546 +#: cmdline/apt-get.cc:3001 msgid "Failed to process build dependencies" msgstr "æ æ³å¤çæ建ä¾èµå ³ç³»" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106 +#, fuzzy, c-format +msgid "Changelog for %s (%s)" +msgstr "æ£å¨è¿æ¥ %s (%s)" + +#: cmdline/apt-get.cc:3225 msgid "Supported modules:" -msgstr "被æ¯æ模åï¼" +msgstr "æ¯æç模åï¼" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:3266 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1244,7 +1357,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove and purge packages\n" +" purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1252,6 +1365,8 @@ msgid "" " clean - Erase downloaded archive files\n" " autoclean - Erase old downloaded archive files\n" " check - Verify that there are no broken dependencies\n" +" changelog - Download and display the changelog for the given package\n" +" download - Download the binary package into the current directory\n" "\n" "Options:\n" " -h This help text.\n" @@ -1272,8 +1387,8 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "ç¨æ³ï¼ apt-get [é项] å½ä»¤\n" -" apt-get [é项] install|remove 软件å 1 [软件å 2 ...]\n" -" apt-get [é项] source 软件å 1 [软件å 2 ...]\n" +"ããã apt-get [é项] install|remove 软件å 1 [软件å 2 ...]\n" +"ããã apt-get [é项] source 软件å 1 [软件å 2 ...]\n" "\n" "apt-get æä¾äºä¸ä¸ªç¨äºä¸è½½åå®è£ 软件å çç®æå½ä»¤è¡çé¢ã\n" "æ常ç¨å½ä»¤æ¯ update å installã\n" @@ -1281,17 +1396,19 @@ msgstr "" "å½ä»¤ï¼\n" " update - ååæ´æ°ç软件å å表信æ¯\n" " upgrade - è¿è¡ä¸æ¬¡å级\n" -" install - å®è£ æ°ç软件å (注ï¼å åæ¯ libc6 èé libc6.deb)\n" +" install - å®è£ æ°ç软件å (注ï¼è½¯ä»¶å åç§°æ¯ libc6 èé libc6.deb)\n" " remove - å¸è½½è½¯ä»¶å \n" " autoremove - å¸è½½ææèªå¨å®è£ ä¸ä¸å使ç¨ç软件å \n" " purge - å¸è½½å¹¶æ¸ é¤è½¯ä»¶å çé ç½®\n" " source - ä¸è½½æºç å æ件\n" -" build-dep - 为æºç å é ç½®æéçæ建ä¾èµå ³ç³»\n" +" build-dep - 为æºç å é ç½®æéçç¼è¯ä¾èµå ³ç³»\n" " dist-upgrade - åå¸çå级ï¼è§ apt-get(8)\n" " dselect-upgrade - æ ¹æ® dselect çéæ©æ¥è¿è¡å级\n" " clean - å é¤ææå·²ä¸è½½çå æ件\n" " autoclean - å é¤èçæ¬çå·²ä¸è½½çå æ件\n" " check - æ ¸å¯¹ä»¥ç¡®è®¤ç³»ç»çä¾èµå ³ç³»çå®æ´æ§\n" +" markauto - æ è®°æå®ç软件å 为èªå¨å®è£ \n" +" unmarkauto - æ è®°æå®ç软件å 为æå¨å®è£ \n" "\n" "é项ï¼\n" " -h æ¬å¸®å©ææ¡£ã\n" @@ -1300,8 +1417,8 @@ msgstr "" " -d ä» ä» ä¸è½½ - ãä¸ãå®è£ æ解å¼å æ件\n" " -s ä¸ä½å®é æä½ãåªæ¯ä¾æ¬¡æ¨¡ææ§è¡å½ä»¤\n" " -y 对ææ询é®é½åçæ¯(Yes)ï¼åæ¶ä¸ä½ä»»ä½æ示\n" -" -f å½åºç°ç ´æçä¾èµå ³ç³»æ¶ï¼ç¨åºå°è¯å¾ä¿®æ£ç³»ç»\n" -" -m å½æå æ件æ æ³æ¾å°æ¶ï¼ç¨åºä»è¯å¾ç»§ç»æ§è¡\n" +" -f å½åºç°ç ´æçä¾èµå ³ç³»æ¶ï¼ç¨åºå°å°è¯ä¿®æ£ç³»ç»\n" +" -m å½æå æ件æ æ³æ¾å°æ¶ï¼ç¨åºä»å°è¯ç»§ç»æ§è¡\n" " -u æ¾ç¤ºå·²å级ç软件å å表\n" " -b å¨ä¸è½½å®æºç å åï¼ç¼è¯çæç¸åºç软件å \n" " -V æ¾ç¤ºè¯¦å°½ççæ¬å·\n" @@ -1309,35 +1426,46 @@ msgstr "" " -o=? 设置任ææå®çé ç½®é项ï¼ä¾å¦ -o dir::cache=/tmp\n" "请æ¥é apt-get(8)ãsources.list(5) å apt.conf(5)çåèæå\n" "以è·åæ´å¤ä¿¡æ¯åé项ã\n" -" æ¬ APT æçè¶ çº§çåã\n" +" æ¬ APT å ·æè¶ çº§çåã\n" + +#: cmdline/apt-get.cc:3429 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" +"注æï¼è¿åªæ¯æ¨¡æï¼\n" +"ãããapt-get éè¦ root ç¹æè¿è¡å®é çæ§è¡ã\n" +"ãããåæ¶è¯·è®°ä½æ¤æ¶å¹¶æªéå®ï¼æ以请å¿å®å ¨ç¸ä¿¡å½åçæ åµï¼" -#: cmdline/acqprogress.cc:55 +#: cmdline/acqprogress.cc:57 msgid "Hit " msgstr "å½ä¸ " -#: cmdline/acqprogress.cc:79 +#: cmdline/acqprogress.cc:81 msgid "Get:" msgstr "è·åï¼" -#: cmdline/acqprogress.cc:110 +#: cmdline/acqprogress.cc:112 msgid "Ign " msgstr "å¿½ç¥ " -#: cmdline/acqprogress.cc:114 +#: cmdline/acqprogress.cc:116 msgid "Err " msgstr "é误 " -#: cmdline/acqprogress.cc:135 +#: cmdline/acqprogress.cc:137 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "ä¸è½½ %sBï¼èæ¶ %s (%sB/s)\n" -#: cmdline/acqprogress.cc:225 +#: cmdline/acqprogress.cc:227 #, c-format msgid " [Working]" msgstr " [æ§è¡ä¸]" -#: cmdline/acqprogress.cc:271 +#: cmdline/acqprogress.cc:283 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1346,7 +1474,68 @@ msgid "" msgstr "" "æ´æ¢ä»è´¨ï¼è¯·ææ æ\n" "â%sâ\n" -"çç¢çæå ¥é©±å¨å¨â%sâåæå车é®\n" +"çççæå ¥é©±å¨å¨â%sâåæå车é®\n" + +#: cmdline/apt-mark.cc:46 +#, fuzzy, c-format +msgid "%s can not be marked as it is not installed.\n" +msgstr "ä½æ¯å®è¿æ²¡æ被å®è£ " + +#: cmdline/apt-mark.cc:52 +#, fuzzy, c-format +msgid "%s was already set to manually installed.\n" +msgstr "%s 被设置为æå¨å®è£ ã\n" + +#: cmdline/apt-mark.cc:54 +#, fuzzy, c-format +msgid "%s was already set to automatically installed.\n" +msgstr "%s 被设置为æå¨å®è£ ã\n" + +#: cmdline/apt-mark.cc:169 +#, fuzzy, c-format +msgid "%s was already set on hold.\n" +msgstr "%s å·²ç»æ¯ææ°ççæ¬äºã\n" + +#: cmdline/apt-mark.cc:171 +#, fuzzy, c-format +msgid "%s was already not hold.\n" +msgstr "%s å·²ç»æ¯ææ°ççæ¬äºã\n" + +#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 +#, fuzzy, c-format +msgid "%s set on hold.\n" +msgstr "%s 已设置为æå¨å®è£ ã\n" + +#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 +#, fuzzy, c-format +msgid "Canceled hold on %s.\n" +msgstr "æ æ³æå¼ %s" + +#: cmdline/apt-mark.cc:220 +msgid "Executing dpkg failed. Are you root?" +msgstr "" + +#: cmdline/apt-mark.cc:268 +msgid "" +"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +"\n" +"apt-mark is a simple command line interface for marking packages\n" +"as manual or automatical installed. It can also list marks.\n" +"\n" +"Commands:\n" +" auto - Mark the given packages as automatically installed\n" +" manual - Mark the given packages as manually installed\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -s No-act. Just prints what would be done.\n" +" -f read/write auto/manual marking in the given file\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-mark(8) and apt.conf(5) manual pages for more information." +msgstr "" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1390,12 +1579,12 @@ msgid "Do you want to erase any previously downloaded .deb files?" msgstr "æ¨æ³è¦å é¤ä¹åä¸è½½çææ .deb æ件åï¼" #: dselect/install:101 -msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "å¨è§£å æ¶åçäºä¸äºé误ãææ£åå¤é ç½®" +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" -msgstr "å·²ç»å®è£ ç软件å ãè¿ä¸ªæä½å¯è½ä¼å¯¼è´åºç°éå¤çé误" +msgid "will be configured. This may result in duplicate errors" +msgstr "å°è¢«é ç½®ãè¿ä¸ªæä½å¯è½ä¼å¯¼è´åºç°éå¤çé误" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" @@ -1408,7 +1597,7 @@ msgstr "è¿ä¸ªæ示ä¹åçé误æ¶æ¯æå¼å¾æ¨æ³¨æã请æ´æ£å®ä»¬ï¼ #: dselect/update:30 msgid "Merging available information" -msgstr "æ£å¨å并ç°æä¿¡æ¯" +msgstr "æ£å¨å并å¯ç¨ä¿¡æ¯" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" @@ -1418,38 +1607,43 @@ msgstr "æ æ³å建管é" msgid "Failed to exec gzip " msgstr "æ æ³æ§è¡ gzip" -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 msgid "Corrupted archive" msgstr "å æ件已被æå" #: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "tar çæ ¡éªç ä¸ç¬¦ï¼å æ件已被æå" +msgstr "Tar çæ ¡éªåä¸ç¬¦ï¼æ件已æå" -#: apt-inst/contrib/extracttar.cc:296 +#: apt-inst/contrib/extracttar.cc:300 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "æªç¥ç TAR æ°æ®å¤´ç±»å %uï¼æå %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" -msgstr "æ æçæå æ件ç¹å¾å·(signature)" +msgstr "æ æçå½æ¡£ç¾å" #: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "读åæå æ件ä¸çæåæ件头åºé" +msgstr "读åå½æ¡£æåæ件头åºé" + +#: apt-inst/contrib/arfile.cc:90 +#, c-format +msgid "Invalid archive member header %s" +msgstr "å½æ¡£æ件ä¸æåæ件头 %s æ æ" -#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +#: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "æå æ件ä¸æåæ件头æ æ" +msgstr "å½æ¡£æ件ä¸æåæ件头æ æ" #: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" -msgstr "å档太çäº" +msgstr "å½æ¡£æ件太ç" #: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "æ æ³è¯»åæå æ件çæ°æ®å¤´" +msgstr "æ æ³è¯»åå½æ¡£æ件çæ°æ®å¤´" #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" @@ -1457,11 +1651,11 @@ msgstr "æ DropNode ç¨å¨äºä»å¨é¾è¡¨ä¸çèç¹ä¸" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "æ æ³åé æ£å表项ï¼" +msgstr "æ æ³å®ä½åå¸è¡¨å ç´ ï¼" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "æ æ³åé 转移项(diversion)" +msgstr "æ æ³åé 转移项" #: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" @@ -1470,24 +1664,24 @@ msgstr "å é¨é误ï¼åºç°å¨ AddDiversion" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "è¯å¾è¦çä¸ä¸ªè½¬ç§»é¡¹(diversion)ï¼%s -> %s å³ %s/%s" +msgstr "å°è¯è¦çä¸ä¸ªè½¬ç§»é¡¹ï¼%s -> %s å %s/%s" #: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "æ·»å äºä¸¤ä¸ªè½¬ç§»é¡¹(diversion) %s-> %s" +msgstr "æ·»å äºä¸¤ä¸ªè½¬ç§»é¡¹ %s-> %s" #: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "éå¤çé ç½®æ件 %s/%s" -#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53 #, c-format msgid "Failed to write file %s" msgstr "æ æ³åå ¥æ件 %s" -#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "æ æ³å ³éæ件 %s" @@ -1495,7 +1689,7 @@ msgstr "æ æ³å ³éæ件 %s" #: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" -msgstr "è·¯å¾å %s è¿é¿" +msgstr "è·¯å¾å %s 太é¿" #: apt-inst/extract.cc:124 #, c-format @@ -1505,16 +1699,16 @@ msgstr "%s 被解å äºä¸åªä¸æ¬¡" #: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "ç®å½ %s 已被转移(diverted)" +msgstr "ç®å½ %s 已被转移" #: 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" +msgstr "该软件å æ£å°è¯åå ¥è½¬ç§»å¯¹è±¡ %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "该转移路å¾(diversion path)è¿é¿" +msgstr "该转移路å¾å¤ªé¿" #: apt-inst/extract.cc:240 #, c-format @@ -1523,30 +1717,34 @@ msgstr "ç®å½ %s è¦è¢«ä¸ä¸ªéç®å½çæ件æ¿æ¢" #: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "æ æ³å¨å ¶æ£å桶(hash bucket)ä¸åé èç¹" +msgstr "æ æ³å¨å ¶æ£å桶ä¸åé èç¹" #: apt-inst/extract.cc:284 msgid "The path is too long" -msgstr "è·¯å¾åè¿é¿" +msgstr "è·¯å¾å太é¿" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:412 #, c-format msgid "Overwrite package match with no version for %s" msgstr "ç¨æ¥è¦çç软件å ä¸å±äº %s çä»»ä½çæ¬" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:429 #, c-format 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:821 -#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 +#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104 +#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352 +#: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" msgstr "æ æ³è¯»å %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:489 #, c-format msgid "Unable to stat %s" msgstr "æ æ³è¯»å %s çç¶æ" @@ -1554,7 +1752,7 @@ msgstr "æ æ³è¯»å %s çç¶æ" #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" -msgstr "æ æ³å é¤ %s" +msgstr "æ æ³å¸è½½ %s" #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format @@ -1570,10 +1768,9 @@ msgstr "æ æ³è¯»å %sinfo çç¶æ" 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: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:1048 +#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158 +#: apt-pkg/pkgcachegen.cc:1320 msgid "Reading package lists" msgstr "æ£å¨è¯»å软件å å表" @@ -1598,8 +1795,8 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"æ æ³æå¼å表æ件â%sinfo/%sâãå¦ææ¨ä¸è½æ¢å¤è¿ä¸ªæ件ï¼é£ä¹å°±æ¸ 空该æ件ï¼å马ä¸" -"éæ°å®è£ ç¸åçæ¬çè¿ä¸ªè½¯ä»¶å ï¼" +"æ æ³æå¼å表æ件â%sinfo/%sâãå¦ææ¨ä¸è½æ¢å¤è¿ä¸ªæ件ï¼é£ä¹å°±æ¸ 空该æ件并马ä¸é" +"æ°å®è£ ç¸åçæ¬çè¿ä¸ªè½¯ä»¶å ï¼" #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format @@ -1613,11 +1810,11 @@ msgstr "è·å¾ä¸ä¸ªèç¹æ¶åºç°å é¨é误" #: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "æ æ³æå¼è½¬ç§»é ç½®æ件(diversions file) %sdiversions" +msgstr "æ æ³æå¼è½¬ç§»é ç½®æ件 %sdiversions" #: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "该转移é ç½®æ件(diversion file)被æåäº" +msgstr "该转移é ç½®æ件被æåäº" #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 #: apt-inst/deb/dpkgdb.cc:337 @@ -1627,7 +1824,7 @@ msgstr "转移é ç½®æ件ä¸æä¸è¡æ¯æ æçï¼%s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "æ·»å diversion æ¶åºç°å é¨é误" +msgstr "æ·»å 转移é ç½®æ¶åºç°å é¨é误" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" @@ -1646,482 +1843,534 @@ msgstr "ç¶ææ件ä¸æé误ç ConfFile 段ãä½äºå移ä½ç½® %lu" #: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "æ æ³è§£æ MD5 ç ãæ件å å移é为 %lu" +msgstr "解æ MD5 åºéãæ件å å移é为 %lu" -#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 +#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "è¿ä¸æ¯ä¸ä¸ªææç DEB å æ件ï¼å ¶å å éæ¼äºâ%sâ" -#: apt-inst/deb/debfile.cc:50 +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain +#: apt-inst/deb/debfile.cc:53 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "è¿ä¸æ¯ä¸ä¸ªææç DEB å æ件ï¼å ¶å å éæ¼äºâ%sâï¼â%sâæè â%sâ" -#: apt-inst/deb/debfile.cc:110 +#: apt-inst/deb/debfile.cc:113 #, c-format msgid "Couldn't change to %s" msgstr "æ æ³åæ¢å·¥ä½ç®å½å° %s" -#: apt-inst/deb/debfile.cc:140 -msgid "Internal error, could not locate member" -msgstr "å é¨é误ï¼æ æ³å®ä½å å æ件" +#: apt-inst/deb/debfile.cc:154 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "å é¨é误ï¼æ æ³å®ä½å å æ件 %s" -#: apt-inst/deb/debfile.cc:173 +#: apt-inst/deb/debfile.cc:189 msgid "Failed to locate a valid control file" -msgstr "æ æ³å¨æå æ件ä¸æ¾å°ææç主æ§æ件" +msgstr "æ æ³å¨å½æ¡£æ件ä¸æ¾å°ææç主æ§æ件" -#: apt-inst/deb/debfile.cc:258 +#: apt-inst/deb/debfile.cc:274 msgid "Unparsable control file" msgstr "ä¸è½è§£æç主æ§æ件" -#: methods/cdrom.cc:114 +#: methods/bzip2.cc:60 methods/gzip.cc:52 +msgid "Empty files can't be valid archives" +msgstr "" + +#: methods/bzip2.cc:64 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "æ æ³ä¸º %s å¼å¯ç®¡é" + +#: methods/bzip2.cc:108 +#, c-format +msgid "Read error from %s process" +msgstr "ä» %s è¿ç¨è¯»åæ°æ®åºé" + +#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 +#: methods/rred.cc:533 +msgid "Failed to stat" +msgstr "æ æ³è¯»åç¶æ" + +#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 +#: methods/rred.cc:530 +msgid "Failed to set modification time" +msgstr "æ æ³è®¾ç½®æ件çä¿®æ¹æ¥æ" + +#: methods/cdrom.cc:199 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "æ æ³è¯»åå çæ°æ®åº %s" +msgstr "æ æ³è¯»åççæ°æ®åº %s" -#: methods/cdrom.cc:123 +#: methods/cdrom.cc:208 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 upgdate ä¸è½è¢«ç¨æ¥" -"å å ¥æ°çå çã" +"è¯·ä½¿ç¨ apt-cdromï¼éè¿å®å°±å¯ä»¥è®© APT è½è¯å«è¯¥ççãapt-get upgdate ä¸è½è¢«ç¨æ¥" +"å å ¥æ°çççã" -#: methods/cdrom.cc:131 +#: methods/cdrom.cc:218 msgid "Wrong CD-ROM" -msgstr "é误çå ç" +msgstr "é误ç CD-ROM" -#: 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 ç CD-ROMï¼å®å¯è½æ£å¨ä½¿ç¨ä¸ã" -#: methods/cdrom.cc:171 +#: methods/cdrom.cc:250 msgid "Disk not found." -msgstr "æ¾ä¸å°å çã" +msgstr "æ¾ä¸å°ççã" -#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 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 -msgid "Failed to stat" -msgstr "æ æ³è¯»åç¶æ" - -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 -msgid "Failed to set modification time" -msgstr "æ æ³è®¾ç½®æ件çä¿®æ¹æ¥æ" - #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "æ æç URIï¼æ¬å°ç URI ä¸è½ä»¥ // å¼å¤´" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:162 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "æ£å¨ç»å½" -#: methods/ftp.cc:168 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "æ æ³è·ç¥å¯¹æ¹ä¸»æºå" -#: methods/ftp.cc:173 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "æ æ³è·ç¥æ¬å°ä¸»æºå" -#: methods/ftp.cc:204 methods/ftp.cc:232 +#: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" -msgstr "æå¡å¨æç»äºæ们çè¿æ¥ï¼å®ååºéï¼%s" +msgstr "æå¡å¨æç»äºæ们çè¿æ¥ï¼ååºä¿¡æ¯ä¸ºï¼%s" -#: methods/ftp.cc:210 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" -msgstr "USER æ令åºéï¼æå¡å¨ååºéï¼%s" +msgstr "USER æ令åºéï¼æå¡å¨ååºä¿¡æ¯ä¸ºï¼%s" -#: methods/ftp.cc:217 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS æ令åºéï¼æå¡å¨ååºéï¼%s" +msgstr "PASS æ令åºéï¼æå¡å¨ååºä¿¡æ¯ä¸ºï¼%s" -#: methods/ftp.cc:237 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "æ¨æå®äºä»£çæå¡å¨ï¼ä½æ¯æ²¡æç»éèæ¬ï¼Acquire::ftp::ProxyLogin 设置为空ã" -#: methods/ftp.cc:265 +#: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "ç»å½èæ¬å½ä»¤â%sâåºéï¼æå¡å¨ååºéï¼%s" +msgstr "ç»å½èæ¬å½ä»¤â%sâåºéï¼æå¡å¨ååºä¿¡æ¯ä¸ºï¼%s" -#: methods/ftp.cc:291 +#: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" -msgstr "TYPE æ令åºéï¼æå¡å¨ååºéï¼%s" +msgstr "TYPE æ令åºéï¼æå¡å¨ååºä¿¡æ¯ä¸ºï¼%s" -#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "è¿æ¥è¶ æ¶" -#: methods/ftp.cc:335 +#: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "æå¡å¨å ³éäºè¿æ¥" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 msgid "Read error" msgstr "读é误" -#: methods/ftp.cc:345 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "ååºè¶ åºäºç¼ååºå¤§å°ã" -#: methods/ftp.cc:362 methods/ftp.cc:374 +#: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "åè®®æ误" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 msgid "Write error" -msgstr "åæ件åºé" +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 "ä¸è½å建å¥æ¥å" +msgstr "æ æ³å建å¥æ¥å" -#: methods/ftp.cc:698 +#: methods/ftp.cc:703 msgid "Could not connect data socket, connection timed out" msgstr "æ æ³è¿æ¥ä¸æ°æ®å¥æ¥åï¼è¿æ¥è¶ æ¶" -#: methods/ftp.cc:704 +#: methods/ftp.cc:709 msgid "Could not connect passive socket." msgstr "æ æ³è¿æ¥è¢«å¨æ¨¡å¼çå¥æ¥åã" -#: methods/ftp.cc:722 +#: methods/ftp.cc:727 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo æ æ³å¾å°ä¾¦å¬å¥æ¥å" +msgstr "getaddrinfo æ æ³å¾å°çå¬å¥æ¥å" -#: methods/ftp.cc:736 +#: methods/ftp.cc:741 msgid "Could not bind a socket" msgstr "æ æ³ç»å®å¥æ¥å" -#: methods/ftp.cc:740 +#: methods/ftp.cc:745 msgid "Could not listen on the socket" -msgstr "æ æ³å¨å¥æ¥åä¸ä¾¦å¬" +msgstr "æ æ³å¨å¥æ¥åä¸çå¬" -#: methods/ftp.cc:747 +#: methods/ftp.cc:752 msgid "Could not determine the socket's name" msgstr "æ æ³ç¡®å®å¥æ¥åçåå" -#: 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" +msgstr "EPRT æ令åºéï¼æå¡å¨ååºä¿¡æ¯ä¸ºï¼%s" -#: methods/ftp.cc:818 +#: methods/ftp.cc:823 msgid "Data socket connect timed out" msgstr "æ°æ®å¥æ¥åè¿æ¥è¶ æ¶" -#: methods/ftp.cc:825 +#: methods/ftp.cc:830 msgid "Unable to accept connection" msgstr "æ æ³æ¥åè¿æ¥" -#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "ææ件å å ¥æ£å表æ¶åºé" +msgstr "ææ件å å ¥åå¸è¡¨æ¶åºé" -#: methods/ftp.cc:877 +#: methods/ftp.cc:882 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "æ æ³è·åæ件ï¼æå¡å¨ååºéâ%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 "æ°æ®å¥æ¥åè¶ æ¶" -#: methods/ftp.cc:922 +#: methods/ftp.cc:927 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "æ°æ®ä¼ éåºéï¼æå¡å¨ååºéâ%sâ" +msgstr "æ°æ®ä¼ éåºéï¼æå¡å¨ååºä¿¡æ¯ä¸ºâ%sâ" #. Get the files information -#: methods/ftp.cc:997 +#: methods/ftp.cc:1004 msgid "Query" msgstr "æ¥è¯¢" -#: methods/ftp.cc:1109 +#: methods/ftp.cc:1116 msgid "Unable to invoke " msgstr "æ æ³è°ç¨ " -#: methods/connect.cc:70 +#: methods/connect.cc:71 #, c-format msgid "Connecting to %s (%s)" msgstr "æ£å¨è¿æ¥ %s (%s)" -#: methods/connect.cc:81 +#: methods/connect.cc:82 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:90 +#: methods/connect.cc:89 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "æ æ³ä¸º %s å建å¥æ¥å(f=%u t=%u p=%u)" -#: methods/connect.cc:96 +#: methods/connect.cc:95 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "æ æ³åèµ·ä¸ %s:%s (%s) çè¿æ¥" -#: methods/connect.cc:104 +#: methods/connect.cc:103 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "æ æ³è¿æ¥ä¸ %s:%s (%s)ï¼è¿æ¥è¶ æ¶" -#: methods/connect.cc:119 +#: methods/connect.cc:121 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "æ æ³è¿æ¥ä¸ %s:%s (%s)ã" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:147 methods/rsh.cc:425 +#: methods/connect.cc:149 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "æ£å¨è¿æ¥ %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:168 methods/connect.cc:187 #, c-format msgid "Could not resolve '%s'" msgstr "æ æ³è§£æååâ%sâ" -#: methods/connect.cc:190 +#: methods/connect.cc:193 #, c-format msgid "Temporary failure resolving '%s'" msgstr "ææ¶ä¸è½è§£æååâ%sâ" -#: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "解æâ%s:%sâæ¶ï¼åºç°äºæäºæ é (%i)" - -#: methods/connect.cc:240 +#: methods/connect.cc:196 #, c-format -msgid "Unable to connect to %s %s:" -msgstr "ä¸è½è¿æ¥ä¸ %s %sï¼" +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" +msgstr "解æâ%s:%sâæ¶ï¼åºç°äºæäºæ é(%i - %s)" -#: methods/gpgv.cc:65 +#: methods/connect.cc:243 #, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "æ æ³è®¿é®å¯åï¼â%sâ" - -#: methods/gpgv.cc:101 -msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "é误ï¼Acquire::gpgv::Options çåæ°åè¡¨è¶ é¿ãç»æè¿è¡ã" +msgid "Unable to connect to %s:%s:" +msgstr "ä¸è½è¿æ¥å° %sï¼%sï¼" -#: methods/gpgv.cc:205 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "å é¨é误ï¼ç¾åæ£ç¡®æ 误ï¼ä½æ¯æ æ³ç¡®è®¤å¯é¥çæ纹(key fingerprint)ï¼ï¼" +msgstr "å é¨é误ï¼ç¾åæ£ç¡®æ 误ï¼ä½æ¯æ æ³ç¡®è®¤å¯é¥æ纹ï¼ï¼" -#: methods/gpgv.cc:210 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "è³å°åç°ä¸ä¸ªæ æçç¾åã" -#: methods/gpgv.cc:214 -#, c-format -msgid "Could not execute '%s' to verify signature (is gpgv installed?)" -msgstr "æ æ³è¿è¡\"%s\"以éªè¯ç¾å(æ¨å®è£ äº gpgv ä¹ï¼)" +#: methods/gpgv.cc:175 +msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" +msgstr "æ æ³è¿è¡ gpgv 以éªè¯ç¾å(æ¨å®è£ äº gpgv åï¼)" -#: methods/gpgv.cc:219 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "è¿è¡ gpgv æ¶åçæªç¥é误" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "ä¸åç¾åæ æï¼\n" -#: methods/gpgv.cc:257 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" -msgstr "ç±äºæ²¡æå ¬é¥ï¼ä¸åç¾åæ æ³è¿è¡éªè¯ï¼\n" - -#: methods/gzip.cc:64 -#, c-format -msgid "Couldn't open pipe for %s" -msgstr "æ æ³ä¸º %s å¼å¯ç®¡é" - -#: methods/gzip.cc:109 -#, c-format -msgid "Read error from %s process" -msgstr "ä» %s è¿ç¨è¯»åæ°æ®åºé" +msgstr "ç±äºæ²¡æå ¬é¥ï¼æ æ³éªè¯ä¸åç¾åï¼\n" -#: methods/http.cc:377 +#: methods/http.cc:385 msgid "Waiting for headers" msgstr "æ£å¨çå¾ æ¥å¤´" -#: methods/http.cc:523 +#: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" -msgstr "åå°äºä¸è¡æ¥å¤´æ¡ç®ï¼å®çé¿åº¦è¶ è¿äº %u 个å符" +msgstr "æ¥æ¶å°ä¸è¡æ¥å¤´è¡ï¼å®çé¿åº¦è¶ è¿äº %u 个å符" -#: methods/http.cc:531 +#: methods/http.cc:539 msgid "Bad header line" -msgstr "é误çæ¥å¤´æ¡ç®" +msgstr "é误çæ¥å¤´è¡" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:564 methods/http.cc:571 msgid "The HTTP server sent an invalid reply header" -msgstr "该 http æå¡å¨åéäºä¸ä¸ªæ æçåºçæ¥å¤´" +msgstr "该 HTTP æå¡å¨åéäºä¸ä¸ªæ æçåºçæ¥å¤´" -#: methods/http.cc:586 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "该 http æå¡å¨åéäºä¸ä¸ªæ æç Content-Length æ¥å¤´" +msgstr "该 HTTP æå¡å¨åéäºä¸ä¸ªæ æç Content-Length æ¥å¤´" -#: methods/http.cc:601 +#: methods/http.cc:615 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "该 http æå¡å¨åéäºä¸ä¸ªæ æç Content-Range æ¥å¤´" +msgstr "该 HTTP æå¡å¨åéäºä¸ä¸ªæ æç Content-Range æ¥å¤´" -#: methods/http.cc:603 +#: methods/http.cc:617 msgid "This HTTP server has broken range support" -msgstr "该 http æå¡å¨ç range æ¯æä¸æ£å¸¸" +msgstr "该 HTTP æå¡å¨ç range æ¯æä¸æ£å¸¸" -#: methods/http.cc:627 +#: methods/http.cc:641 msgid "Unknown date format" msgstr "æ æ³è¯å«çæ¥ææ ¼å¼" -#: methods/http.cc:774 +#: methods/http.cc:800 msgid "Select failed" msgstr "select è°ç¨åºé" -#: methods/http.cc:779 +#: methods/http.cc:805 msgid "Connection timed out" -msgstr "è¿æ¥æå¡å¨è¶ æ¶" +msgstr "è¿æ¥è¶ æ¶" -#: methods/http.cc:802 +#: methods/http.cc:828 msgid "Error writing to output file" msgstr "åè¾åºæ件æ¶åºé" -#: methods/http.cc:833 +#: methods/http.cc:859 msgid "Error writing to file" -msgstr "åæ件æ¶åºé" +msgstr "åå ¥æ件åºé" -#: methods/http.cc:861 +#: methods/http.cc:887 msgid "Error writing to the file" -msgstr "åæ件æ¶åºé" +msgstr "åå ¥æ件åºé" -#: methods/http.cc:875 +#: methods/http.cc:901 msgid "Error reading from server. Remote end closed connection" msgstr "ä»æå¡å¨è¯»åæ°æ®æ¶åºéï¼å¯¹æ¹å ³éäºè¿æ¥" -#: methods/http.cc:877 +#: methods/http.cc:903 msgid "Error reading from server" msgstr "ä»æå¡å¨è¯»åæ°æ®åºé" -#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291 msgid "Failed to truncate file" -msgstr "æªææ件失败" +msgstr "æ æ³æªææ件" -#: methods/http.cc:1105 +#: methods/http.cc:1183 msgid "Bad header data" msgstr "é误çæ¥å¤´æ°æ®" -#: methods/http.cc:1122 methods/http.cc:1177 +#: methods/http.cc:1200 methods/http.cc:1255 msgid "Connection failed" msgstr "è¿æ¥å¤±è´¥" -#: methods/http.cc:1229 +#: methods/http.cc:1347 msgid "Internal error" msgstr "å é¨é误" -#: apt-pkg/contrib/mmap.cc:80 +#: apt-pkg/contrib/mmap.cc:77 msgid "Can't mmap an empty file" msgstr "æ æ³ mmap ä¸ä¸ªç©ºæ件" -#: apt-pkg/contrib/mmap.cc:85 +#: apt-pkg/contrib/mmap.cc:89 +#, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "æ æ³ä¸ºå¤å¶æ件æ述符 %i" + +#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258 #, 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:124 +msgid "Unable to close mmap" +msgstr "æ æ³å ³é mmap" + +#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 +msgid "Unable to synchronize mmap" +msgstr "æ æ³åæ¥ mmap " + +#: apt-pkg/contrib/mmap.cc:310 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -"å¨æ MMap 没æ空é´äºã请å¢å¤§ APT::Cache-Limit çå¤§ä¾ ãå½åå¼ï¼%luã(man 5 " +"å¨æ MMap 没æ空é´äºã请å¢å¤§ APT::Cache-Limit ç大å°ãå½åå¼ï¼%luã(man 5 " "apt.conf)" -#: apt-pkg/contrib/strutl.cc:1014 +#: apt-pkg/contrib/mmap.cc:409 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "æ æ³å¢å MMap ç大å°ï¼å 为已ç»è¾¾å° %lu åèçéå¶ã" + +#: apt-pkg/contrib/mmap.cc:412 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "æ æ³å¢å MMap 大å°ï¼å 为ç¨æ·å·²ç¦ç¨èªå¨å¢å ã" + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:371 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%li天 %liå°æ¶ %liå %liç§" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:378 +#, c-format +msgid "%lih %limin %lis" +msgstr "%liå°æ¶ %liå %liç§" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:385 +#, c-format +msgid "%limin %lis" +msgstr "%liå %liç§" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:390 +#, c-format +msgid "%lis" +msgstr "%liç§" + +#: apt-pkg/contrib/strutl.cc:1138 #, c-format msgid "Selection %s not found" -msgstr "没æåç°æ¨çæé %s" +msgstr "æ¾ä¸å°æ¨éåç %s" -#: apt-pkg/contrib/configuration.cc:439 +#: apt-pkg/contrib/configuration.cc:465 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "æ æ³è¯å«çç±»å缩åï¼â%câ" -#: apt-pkg/contrib/configuration.cc:497 +#: apt-pkg/contrib/configuration.cc:523 #, c-format msgid "Opening configuration file %s" msgstr "æ£å¨æå¼é ç½®æ件 %s" -#: apt-pkg/contrib/configuration.cc:662 +#: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "è¯æ³é误 %s:%uï¼é ç½®å°è没æ以ååå¼å¤´" -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:710 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "è¯æ³é误 %s:%uï¼æ ç¾æ ¼å¼æ误" -#: apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:727 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "è¯æ³é误 %s:%u: é ç½®å¼åæå¤ä½çæ æä¹æ°æ®" +msgstr "è¯æ³é误 %s:%uï¼é ç½®å¼åæå¤ä½çæ æä¹æ°æ®" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:767 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "è¯æ³é误 %s:%u: åªè½å¨é¡¶å±é ç½®æ件ä¸ä½¿ç¨æ示" +msgstr "è¯æ³é误 %s:%uï¼åªè½å¨é¡¶å±é ç½®æ件ä¸ä½¿ç¨æ示" -#: apt-pkg/contrib/configuration.cc:745 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "è¯æ³é误 %s:%uï¼å¤ªå¤çåµå¥ include å½ä»¤" -#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "è¯æ³é误 %s:%u: Included from here" +msgstr "è¯æ³é误 %s:%uï¼Included from here" -#: apt-pkg/contrib/configuration.cc:758 +#: apt-pkg/contrib/configuration.cc:787 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "è¯æ³é误 %s:%u: ä¸æ¯æçæ令â%sâ" +msgstr "è¯æ³é误 %s:%uï¼ä¸æ¯æçæ令â%sâ" + +#: apt-pkg/contrib/configuration.cc:790 +#, c-format +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgstr "è¯æ³é误 %s:%uï¼clean æ令éè¦ä¸ä¸ªé项æ ä½ä¸ºåæ°" -#: apt-pkg/contrib/configuration.cc:809 +#: apt-pkg/contrib/configuration.cc:840 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "è¯æ³é误 %s:%u: æ件尾é¨æå¤ä½çæ æä¹çæ°æ®" +msgstr "è¯æ³é误 %s:%uï¼æ件尾é¨æå¤ä½çæ æä¹çæ°æ®" #: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... æé误!" +msgstr "%c%s... æé误ï¼" #: apt-pkg/contrib/progress.cc:155 #, c-format @@ -2131,7 +2380,7 @@ msgstr "%c%s... å®æ" #: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "æªç¥çå½ä»¤è¡é项â%câ[æ¥èª %s]" +msgstr "æªç¥çå½ä»¤è¡é项â%câ [æ¥èª %s]" #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 #: apt-pkg/contrib/cmndline.cc:119 @@ -2142,34 +2391,34 @@ msgstr "æ æ³è¯å«å½ä»¤è¡é项 %s" #: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "å½ä»¤è¡é项 %s ä¸æ¯ä¸ªå¸å°å¼" +msgstr "å½ä»¤è¡é项 %s ä¸æ¯å¸å°å¼" -#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 #, c-format msgid "Option %s requires an argument." msgstr "é项 %s è¦æ±æä¸ä¸ªåæ°" -#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "é项 %sï¼é 置项åå¿ é¡»å å«æå½¢å¦â=<åé>âçå ·ä½æå®" -#: apt-pkg/contrib/cmndline.cc:234 +#: apt-pkg/contrib/cmndline.cc:236 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "é项 %s è¦æ±æä¸ä¸ªæ´æ°ä½ä¸ºåæ°ï¼èä¸æ¯â%sâ" -#: apt-pkg/contrib/cmndline.cc:265 +#: apt-pkg/contrib/cmndline.cc:267 #, c-format msgid "Option '%s' is too long" -msgstr "é项â%sâè¶ é¿" +msgstr "é项â%sâ太é¿" -#: apt-pkg/contrib/cmndline.cc:298 +#: apt-pkg/contrib/cmndline.cc:300 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "ä¸è½è¯å«åæ° %sï¼è¯·ç¨ true æ false" -#: apt-pkg/contrib/cmndline.cc:348 +#: apt-pkg/contrib/cmndline.cc:350 #, c-format msgid "Invalid operation %s" msgstr "æ æçæä½ %s" @@ -2179,178 +2428,226 @@ msgstr "æ æçæä½ %s" 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:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40 +#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 +#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 +#: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" msgstr "æ æ³åæ¢å·¥ä½ç®å½å° %s" -#: apt-pkg/contrib/cdromutl.cc:188 +#: apt-pkg/contrib/cdromutl.cc:220 msgid "Failed to stat the cdrom" -msgstr "æ æ³è¯»åå ççç¶æ" +msgstr "æ æ³è¯»åçççç¶æ" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:168 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "ç±äºæ件系ç»ä¸ºåªè¯»ï¼å èæ æ³ä½¿ç¨æ件é%s" +msgstr "ç±äºæ件系ç»ä¸ºåªè¯»ï¼å èæ æ³ä½¿ç¨æ件é %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:173 #, c-format msgid "Could not open lock file %s" msgstr "æ æ³æå¼éæ件 %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:191 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "æ æ³å¨ nfs æ件系ç»ä¸ä½¿ç¨æ件é %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format msgid "Could not get lock %s" msgstr "æ æ³è·å¾é %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:335 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:362 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:380 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:389 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Waited for %s but it wasn't there" msgstr "çå¾ åè¿ç¨ %s çéåºï¼ä½æ¯å®å¹¶ä¸åå¨" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:691 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "åè¿ç¨ %s åçäºæ®µé误" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:693 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "åè¿ç¨ %s æ¶å°ä¿¡å· %uã" + +#: apt-pkg/contrib/fileutl.cc:697 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "åè¿ç¨ %s è¿åäºä¸ä¸ªéè¯¯å· (%u)" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:699 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "åè¿ç¨ %s å¼å¸¸éåºäº" +msgstr "åè¿ç¨ %s å¼å¸¸éåº" -#: apt-pkg/contrib/fileutl.cc:503 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "æ æ³æå¼æ件 %s" -#: apt-pkg/contrib/fileutl.cc:559 +#: apt-pkg/contrib/fileutl.cc:781 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "æ æ³æå¼æ件æ述符 %d" + +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "read, still have %lu to read but none left" -msgstr "读æ件æ¶åºéï¼è¿å© %lu åè没æ读åº" +msgstr "读åæ件åºéï¼è¿å© %lu åè没æ读åº" -#: apt-pkg/contrib/fileutl.cc:589 +#: apt-pkg/contrib/fileutl.cc:874 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "åæ件æ¶åºéï¼è¿å© %lu åè没æä¿å" +msgstr "åå ¥æ件åºéï¼è¿å© %lu åè没æä¿å" + +#: apt-pkg/contrib/fileutl.cc:1010 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "å ³é gzip %s æ件åºé" -#: apt-pkg/contrib/fileutl.cc:664 -msgid "Problem closing the file" -msgstr "å ³éæ件æ¶åºé" +#: apt-pkg/contrib/fileutl.cc:1013 +#, c-format +msgid "Problem closing the file %s" +msgstr "å ³éæ件 %s åºé" -#: apt-pkg/contrib/fileutl.cc:670 -msgid "Problem unlinking the file" -msgstr "ç¨ unlink å é¤æ件æ¶åºé" +#: apt-pkg/contrib/fileutl.cc:1018 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "éå½åæ件 %s 为 %s åºé" + +#: apt-pkg/contrib/fileutl.cc:1029 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "ç¨ unlink å é¤æ件 %s åºé" -#: apt-pkg/contrib/fileutl.cc:681 +#: apt-pkg/contrib/fileutl.cc:1042 msgid "Problem syncing the file" -msgstr "åæ¥æ件æ¶åºé" +msgstr "åæ¥æ件åºé" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:145 msgid "Empty package cache" msgstr "软件å ç¼ååºæ¯ç©ºç" -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:151 msgid "The package cache file is corrupted" -msgstr "软件å ç¼ååºæ件æåäº" +msgstr "软件å ç¼åæ件æåäº" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:156 msgid "The package cache file is an incompatible version" msgstr "软件å ç¼ååºæ件ççæ¬ä¸å ¼å®¹" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:161 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "æ¬ç¨åºç®åä¸æ¯æâ%sâè¿ä¸ªçæ¬æ§å¶ç³»ç»" +msgstr "æ¬ç¨åºç®åä¸æ¯æâ%sâçæ¬ç³»ç»" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache was built for a different architecture" -msgstr "软件å ç¼ååºæ¯ä¸ºå ¶å®æ¶æç主æºæé ç" +msgstr "软件å ç¼ååºæ¯ä¸ºå ¶å®æ¶æç硬件æ建ç" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:299 msgid "Depends" msgstr "ä¾èµ" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:299 msgid "PreDepends" msgstr "é¢ä¾èµ" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:299 msgid "Suggests" msgstr "建议" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:300 msgid "Recommends" msgstr "æ¨è" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:300 msgid "Conflicts" msgstr "å²çª" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:300 msgid "Replaces" msgstr "æ¿æ¢" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:301 msgid "Obsoletes" msgstr "åºå¼" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:301 msgid "Breaks" msgstr "ç ´å" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:301 +msgid "Enhances" +msgstr "å¢å¼º" + +#: apt-pkg/pkgcache.cc:312 msgid "important" msgstr "éè¦" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:312 msgid "required" -msgstr "å¿ è¦" +msgstr "å¿ é" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:312 msgid "standard" msgstr "æ å" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:313 msgid "optional" msgstr "å¯é" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:313 msgid "extra" msgstr "é¢å¤" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154 msgid "Building dependency tree" msgstr "æ£å¨åæ软件å çä¾èµå ³ç³»æ " -#: apt-pkg/depcache.cc:122 +#: apt-pkg/depcache.cc:126 msgid "Candidate versions" msgstr "åéçæ¬" -#: apt-pkg/depcache.cc:151 +#: apt-pkg/depcache.cc:155 msgid "Dependency generation" msgstr "çæä¾èµå ³ç³»" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212 msgid "Reading state information" msgstr "æ£å¨è¯»åç¶æä¿¡æ¯" -#: apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:237 #, c-format msgid "Failed to open StateFile %s" msgstr "æ æ³æå¼ç¶ææ件 %s" -#: apt-pkg/depcache.cc:225 +#: apt-pkg/depcache.cc:243 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "æ æ³åå ¥ä¸´æ¶ç¶ææ件 %s" @@ -2365,57 +2662,86 @@ msgstr "æ æ³è§£æ软件å æ件 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "æ æ³è§£æ软件å æ件 %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:92 +#, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误([é项] æ æ³è§£æ)" + +#: apt-pkg/sourcelist.cc:95 +#, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误([é项] 太ç)" + +#: apt-pkg/sourcelist.cc:106 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误([%3$s] ä¸æ¯ä¸ä¸ªä»»å¡)" + +#: apt-pkg/sourcelist.cc:112 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误([%3$s] 没æé®)" + +#: apt-pkg/sourcelist.cc:115 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误([%3$s] é® %4$s 没æå¼)" + +#: apt-pkg/sourcelist.cc:128 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡çæ ¼å¼æ误 (URI)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡çæ ¼å¼æ误(URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:130 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误 (dist)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误(åè¡ç)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误 (URI parse)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误(URI 解æ)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:139 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误 (Ablolute dist)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误(ç¬ç«åè¡ç)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:146 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误 (dist parse)" +msgstr "å®è£ æºé ç½®æ件â%2$sâ第 %1$lu è¡æé误(åè¡ç解æ)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Opening %s" msgstr "æ£å¨æå¼ %s" -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 +#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444 #, c-format msgid "Line %u too long in source list %s." -msgstr "软件å æ¥æºæ¡£ %2$s ç第 %1$u è¡è¶ é¿äºã" +msgstr "æºå表 %2$s ç第 %1$u è¡å¤ªé¿äºã" -#: apt-pkg/sourcelist.cc:236 +#: apt-pkg/sourcelist.cc:281 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "å¨å®è£ æºåè¡¨ä¸ %2$s ä¸ç¬¬ %1$u è¡çæ ¼å¼æ误 (type)" +msgstr "å¨æºå表 %2$s ä¸ç¬¬ %1$u è¡çæ ¼å¼æ误(ç±»å)" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:285 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "æ æ³è¯å«å¨å®è£ æºå表 %3$s éï¼ç¬¬ %2$u è¡ä¸ç软件å ç±»å«â%1$sâ" +msgstr "æ æ³è¯å«å¨æºå表 %3$s éï¼ç¬¬ %2$u è¡ä¸ç软件å ç±»å«â%1$sâ" -#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 +#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623 #, c-format -msgid "Malformed line %u in source list %s (vendor id)" -msgstr "å¨å®è£ æºåè¡¨ä¸ %2$s ä¸ç¬¬ %1$u è¡çæ ¼å¼æ误 (vendor id)" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" +"æ æ³ç«å³å¯¹ %s è¿è¡é ç½®ã请æ¥ç man 5 apt.conf ä¸ç APT::Immediate-Configure " +"(%d)" -#: apt-pkg/packagemanager.cc:428 +#: apt-pkg/packagemanager.cc:456 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2426,18 +2752,27 @@ msgstr "" "å°ç软件å %sãé常并ä¸å»ºè®®è¿æ ·åï¼ä½æ¯å¦ææ¨ç¡®å®å¸æå¦æ¤ï¼å¯ä»¥æå¼ APT::" "Force-LoopBreak é项ã" +#: apt-pkg/packagemanager.cc:501 +#, 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 "" +"æ æ³ç«å³å¯¹å·²ç»è§£å ç %s è¿è¡é ç½®ã请æ¥ç man 5 apt.conf ä¸ç APT::Immediate-" +"Configureã" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "ä¸æ¯æç´¢å¼æ件类åâ%sâ" -#: apt-pkg/algorithms.cc:248 +#: 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:1107 +#: apt-pkg/algorithms.cc:1158 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2445,37 +2780,43 @@ msgstr "" "é误ï¼pkgProblemResolver::Resolve åçæ éï¼è¿å¯è½æ¯æ软件å 被è¦æ±ä¿æç°ç¶ç" "ç¼æ ã" -#: apt-pkg/algorithms.cc:1109 +#: apt-pkg/algorithms.cc:1160 msgid "Unable to correct problems, you have held broken packages." msgstr "" "æ æ³ä¿®æ£é误ï¼å 为æ¨è¦æ±æäºè½¯ä»¶å ä¿æç°ç¶ï¼å°±æ¯å®ä»¬ç ´åäºè½¯ä»¶å é´çä¾èµå ³" "ç³»ã" -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 +#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " +"Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" "æä¸äºç´¢å¼æ件ä¸è½ä¸è½½ï¼å®ä»¬å¯è½è¢«å¿½ç¥äºï¼ä¹å¯è½è½¬è使ç¨äºæ§çç´¢å¼æ件ã" -#: apt-pkg/acquire.cc:59 +#: apt-pkg/acquire.cc:79 +#, c-format +msgid "List directory %spartial is missing." +msgstr "软件å å表çç®å½ %spartial 缺失ã" + +#: apt-pkg/acquire.cc:83 #, c-format -msgid "Lists directory %spartial is missing." -msgstr "软件å å表çç®å½ %spartial ä¸è§äºã" +msgid "Archives directory %spartial is missing." +msgstr "ä»åºç®å½ %spartial ç¡®å®ã" -#: apt-pkg/acquire.cc:63 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Archive directory %spartial is missing." -msgstr "æ¾ä¸å°â%spartialâè¿ä¸ªç®å½ã" +msgid "Unable to lock directory %s" +msgstr "æ æ³å¯¹ç®å½ %s å é" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:828 +#: apt-pkg/acquire.cc:857 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "æ£å¨ä¸è½½ç¬¬ %li 个æ件ï¼å ± %li 个(è¿å© %s 个)" -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:859 #, c-format msgid "Retrieving file %li of %li" msgstr "æ£å¨ä¸è½½ç¬¬ %li 个æ件ï¼å ± %li 个" @@ -2490,161 +2831,208 @@ msgstr "æ æ³æ¾å°è·å软件å çæ¸ é %s æéç驱å¨ç¨åºã" msgid "Method %s did not start correctly" msgstr "è·å软件å çæ¸ é %s æéç驱å¨ç¨åºæ²¡ææ£å¸¸å¯å¨ã" -#: apt-pkg/acquire-worker.cc:399 +#: apt-pkg/acquire-worker.cc:423 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "请ææ æ â%sâ çç¢çæå ¥é©±å¨å¨â%sâåæå车é®ã" +msgstr "请ææ æâ%sâçççæå ¥é©±å¨å¨â%sâåæå车é®ã" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:147 #, c-format msgid "Packaging system '%s' is not supported" msgstr "ä¸æ¯æâ%sâæå ç³»ç»" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:163 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 çç¶æã" #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "æ¨å¿ é¡»å¨æ¨ç sources.list åå ¥ä¸äºâ软件å æºâç URI" +msgstr "æ¨å¿ é¡»å¨æ¨ç sources.list åå ¥ä¸äºâ软件æºâç URI" -#: apt-pkg/cachefile.cc:71 +#: apt-pkg/cachefile.cc:84 msgid "The package lists or status file could not be parsed or opened." msgstr "æ æ³è§£æææå¼è½¯ä»¶å çå表ææ¯ç¶ææ件ã" -#: apt-pkg/cachefile.cc:75 +#: apt-pkg/cachefile.cc:88 msgid "You may want to run apt-get update to correct these problems" msgstr "æ¨å¯è½éè¦è¿è¡ apt-get update æ¥è§£å³è¿äºé®é¢" -#: apt-pkg/policy.cc:267 -msgid "Invalid record in the preferences file, no Package header" -msgstr "å好设å®(preferences)æ件ä¸åç°ææ æçè®°å½ï¼æ Package å段头" +#: apt-pkg/cachefile.cc:106 +msgid "The list of sources could not be read." +msgstr "æ æ³è¯»åæºå表ã" + +#: apt-pkg/policy.cc:71 +#, c-format +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" + +#: apt-pkg/policy.cc:389 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "é¦é项æ件 %s ä¸åç°ææ æçè®°å½ï¼æ Package å段头" -#: apt-pkg/policy.cc:289 +#: apt-pkg/policy.cc:411 #, c-format msgid "Did not understand pin type %s" -msgstr "æ æ³è¯å«éå®çç±»å(pin type) %s" +msgstr "æ æ³è¯å«éå®çç±»å %s" -#: apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:419 msgid "No priority (or zero) specified for pin" msgstr "没æ为çæ¬éå®æå®ä¼å 级(æ为é¶)" -#: apt-pkg/pkgcachegen.cc:72 +#: apt-pkg/pkgcachegen.cc:80 msgid "Cache has an incompatible versioning system" msgstr "软件å æååºä½¿ç¨çæ¯ä¸å ¼å®¹ççæ¬æ§å¶ç³»ç»" -#: apt-pkg/pkgcachegen.cc:115 +#: apt-pkg/pkgcachegen.cc:187 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "å¤ç %s (NewPackage)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:130 +#: apt-pkg/pkgcachegen.cc:204 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "å¤ç %s (UsePackage1)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:164 +#: apt-pkg/pkgcachegen.cc:242 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "å¤ç %s (NewFileDesc1)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:189 +#: apt-pkg/pkgcachegen.cc:274 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "å¤ç %s (UsePackage2)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:193 +#: apt-pkg/pkgcachegen.cc:278 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "å¤ç %s (NewFileVer1)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:224 +#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 +#: apt-pkg/pkgcachegen.cc:313 #, c-format -msgid "Error occurred while processing %s (NewVersion1)" -msgstr "å¤ç %s (NewVersion1)æ¶åºé" +msgid "Error occurred while processing %s (NewVersion%d)" +msgstr "å¤ç %s (NewVersion%d)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:309 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "å¤ç %s (UsePackage3)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:232 -#, c-format -msgid "Error occurred while processing %s (NewVersion2)" -msgstr "å¤ç %s (NewVersion2)æ¶åºé" - -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:342 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "å¤ç %s (NewFileDesc2)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:348 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "ç³äºï¼è½¯ä»¶å çæ°éäºè¶ åºæ¬ç¨åºçå¤çè½åã" +msgstr "åï¼è½¯ä»¶å æ°éè¶ åºäºæ¬ APT çå¤çè½åã" -#: apt-pkg/pkgcachegen.cc:265 +#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "ç³äºï¼è½¯ä»¶å çæ¬çæ°éäºè¶ åºæ¬ç¨åºçå¤çè½åã" +msgstr "åï¼è½¯ä»¶å çæ¬æ°éè¶ åºäºæ¬ APT çå¤çè½åã" -#: apt-pkg/pkgcachegen.cc:268 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "ç³äºï¼è½¯ä»¶å 说æçæ°éäºè¶ åºæ¬ç¨åºçå¤çè½åã" +msgstr "åï¼è½¯ä»¶å 说ææ°éè¶ åºäºæ¬ APT çå¤çè½åã" -#: apt-pkg/pkgcachegen.cc:271 +#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "ç³äºï¼ä¾èµå ³ç³»çæ°éè¶ åºäºæ¬ç¨åºçå¤çè½åã" +msgstr "åï¼ä¾èµå ³ç³»æ°éè¶ åºäºæ¬ APT çå¤çè½åã" -#: apt-pkg/pkgcachegen.cc:299 +#: apt-pkg/pkgcachegen.cc:386 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "å¤ç %s (FindPkg)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:312 +#: apt-pkg/pkgcachegen.cc:400 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "å¤ç %s (CollectFileProvides)æ¶åºé" -#: apt-pkg/pkgcachegen.cc:318 +#: apt-pkg/pkgcachegen.cc:406 #, 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:960 #, c-format msgid "Couldn't stat source package list %s" msgstr "æ æ³è·åæºè½¯ä»¶å å表 %s çç¶æ" -#: apt-pkg/pkgcachegen.cc:775 +#: apt-pkg/pkgcachegen.cc:1065 msgid "Collecting File Provides" msgstr "æ£å¨æ¶éæ件ææä¾ç软件å " -#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 +#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266 msgid "IO Error saving source cache" -msgstr "æ æ³åå ¥æ¥æºç¼åæ件" +msgstr "æ æ³è¯»åæåå ¥è½¯ä»¶æºç¼å" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:135 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "æ æ³éå½åæ件ï¼%s (%s -> %s)ã" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5 æ ¡éªåä¸ç¬¦" -#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848 +#: apt-pkg/acquire-item.cc:1991 msgid "Hash Sum mismatch" msgstr "Hash æ ¡éªåä¸ç¬¦" -#: apt-pkg/acquire-item.cc:1118 +#: apt-pkg/acquire-item.cc:1388 +#, 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:1403 +#, fuzzy, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "æ æ³è§£æ软件å ä»åº Release æ件 %s" + +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" -msgstr "ä»¥ä¸ key ID 没æå¯ç¨çå ¬é¥ï¼\n" +msgstr "ä»¥ä¸ ID çå¯é¥æ²¡æå¯ç¨çå ¬é¥ï¼\n" + +#: apt-pkg/acquire-item.cc:1477 +#, 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 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "å²çªçåè¡çï¼%s (ææ %s ä½å¾å° %s)" + +#: apt-pkg/acquire-item.cc:1532 +#, c-format +msgid "" +"A error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used. GPG error: %s: %s\n" +msgstr "" +"æ ¡éªç¾ååºéãæ¤ä»åºæªè¢«æ´æ°ï¼ä»ç¶ä½¿ç¨ä»¥åçç´¢å¼æ件ãGPG é误ï¼%s: %s\n" + +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +#, c-format +msgid "GPG error: %s: %s" +msgstr "GPG é误ï¼%s: %s" -#: apt-pkg/acquire-item.cc:1231 +#: apt-pkg/acquire-item.cc:1639 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2653,30 +3041,55 @@ msgstr "" "ææ æ³æ¾å°ä¸ä¸ªå¯¹åº %s 软件å çæ件ãå¨è¿ç§æ åµä¸å¯è½éè¦æ¨æå¨ä¿®æ£è¿ä¸ªè½¯ä»¶" "å ã(ç¼äºæ¶æ缺失)" -#: apt-pkg/acquire-item.cc:1290 +#: apt-pkg/acquire-item.cc:1698 #, c-format msgid "" -"I wasn't able to locate file for the %s package. This might mean you need to " -"manually fix this package." +"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:1331 +#: 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:1418 +#: apt-pkg/acquire-item.cc:1840 msgid "Size mismatch" msgstr "大å°ä¸ç¬¦" -#: apt-pkg/vendorlist.cc:66 +#: apt-pkg/indexrecords.cc:53 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "æ æ³è§£æ软件å ä»åº Release æ件 %s" + +#: apt-pkg/indexrecords.cc:63 +#, c-format +msgid "No sections in Release file %s" +msgstr "软件å ä»åº Release æ件 %s å æ ç»ä»¶ç« èä¿¡æ¯" + +#: apt-pkg/indexrecords.cc:97 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "软件å ä»åº Release æ件 %s å æ åå¸æ¡ç®" + +#: apt-pkg/indexrecords.cc:110 +#, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "软件å ä»åº Release æ件 %s å Valid-Until æ¡ç®æ æ" + +#: apt-pkg/indexrecords.cc:125 +#, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "软件å ä»åº Release æ件 %s å Date æ¡ç®æ æ" + +#: apt-pkg/vendorlist.cc:71 #, c-format 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" @@ -2685,183 +3098,398 @@ msgstr "" "ç°æ %s ä½ä¸ºäº CD-ROM çæè½½ç¹\n" "æ£å¨æè½½ CD-ROM\n" -#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631 msgid "Identifying.. " msgstr "æ£å¨é´å«.. " -#: apt-pkg/cdrom.cc:563 +#: apt-pkg/cdrom.cc:562 #, c-format msgid "Stored label: %s\n" -msgstr "å·²åæ¡£çæ ç¾ï¼%s\n" +msgstr "å·²å½æ¡£æ件çæ ç¾ï¼%s\n" -#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847 msgid "Unmounting CD-ROM...\n" msgstr "æ£å¨å¸è½½ CD-ROM...\n" -#: apt-pkg/cdrom.cc:590 +#: apt-pkg/cdrom.cc:591 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "ç°æ %s ä½ä¸ºäº CD-ROM çæè½½ç¹\n" -#: apt-pkg/cdrom.cc:608 +#: apt-pkg/cdrom.cc:609 msgid "Unmounting CD-ROM\n" msgstr "æ£å¨å¸è½½ CD-ROM æ件系ç»\n" -#: apt-pkg/cdrom.cc:612 +#: apt-pkg/cdrom.cc:614 msgid "Waiting for disc...\n" msgstr "çå¾ æå ¥ççâ¦â¦\n" -#. Mount the new CDROM -#: apt-pkg/cdrom.cc:620 +#: apt-pkg/cdrom.cc:623 msgid "Mounting CD-ROM...\n" msgstr "æ£å¨æè½½ CD-ROM æ件系ç»â¦â¦\n" -#: apt-pkg/cdrom.cc:638 +#: apt-pkg/cdrom.cc:642 msgid "Scanning disc for index files..\n" -msgstr "æ£å¨å çä¸æ¥æ¾ç´¢å¼æ件..\n" +msgstr "æ£å¨ççä¸æ¥æ¾ç´¢å¼æ件..\n" -#: apt-pkg/cdrom.cc:678 +#: apt-pkg/cdrom.cc:684 #, c-format msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" -"zu signatures\n" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" msgstr "" "æ¾å°äº %zu 个软件å ç´¢å¼ã%zu 个æºä»£ç å ç´¢å¼ã%zu 个翻è¯ç´¢å¼å %zu 个æ°åç¾" "å\n" -#: apt-pkg/cdrom.cc:715 +#: apt-pkg/cdrom.cc:695 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"æ æ³ç¡®å®ä»»ä½å æ件çä½ç½®ï¼å¯è½è¿ä¸æ¯ä¸å¼ Debian ççæè æ¯éæ©äºé误ç硬件æ" +"æ¶ã" + +#: apt-pkg/cdrom.cc:722 #, c-format msgid "Found label '%s'\n" msgstr "æ¾å°æ ç¾ '%s'\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:751 msgid "That is not a valid name, try again.\n" -msgstr "è¿ä¸æ¯ä¸ä¸ªææçååï¼è¯·å次å½åã\n" +msgstr "è¿ä¸æ¯ä¸ä¸ªææçååï¼è¯·éè¯ã\n" -#: apt-pkg/cdrom.cc:760 +#: apt-pkg/cdrom.cc:768 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"è¿å¼ å çç°å¨çååæ¯ï¼\n" +"è¿å¼ ççç°å¨çååæ¯ï¼\n" "â%sâ\n" -#: apt-pkg/cdrom.cc:764 +#: apt-pkg/cdrom.cc:770 msgid "Copying package lists..." msgstr "æ£å¨å¤å¶è½¯ä»¶å å表â¦â¦" -#: apt-pkg/cdrom.cc:790 +#: apt-pkg/cdrom.cc:797 msgid "Writing new source list\n" -msgstr "æ£å¨åå ¥æ°ç软件å æºå表\n" +msgstr "æ£å¨åå ¥æ°çæºå表\n" -#: apt-pkg/cdrom.cc:799 +#: apt-pkg/cdrom.cc:805 msgid "Source list entries for this disc are:\n" -msgstr "对åºäºè¯¥å çç软件å æºè®¾ç½®é¡¹æ¯ï¼\n" +msgstr "对åºäºè¯¥ççç软件æºè®¾ç½®é¡¹æ¯ï¼\n" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "å·²åå ¥ %i æ¡è®°å½ã\n" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "å·²åå ¥ %i æ¡è®°å½ï¼å¹¶æ %i 个æ件缺失ã\n" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "å·²åå ¥ %i æ¡è®°å½ï¼å¹¶æ %i 个æ件ä¸å»å\n" +msgstr "å·²åå ¥ %i æ¡è®°å½ï¼å¹¶æ %i 个æ件ä¸å¹é \n" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "å·²åå ¥ %i æ¡è®°å½ï¼å¹¶æ %i 个缺失ï¼ä»¥å %i 个æ件ä¸å»å\n" +msgstr "å·²åå ¥ %i æ¡è®°å½ï¼å¹¶æ %i 个缺失ï¼ä»¥å %i 个æ件ä¸å¹é \n" + +#: apt-pkg/indexcopy.cc:537 +#, c-format +msgid "Skipping nonexistent file %s" +msgstr "è·³è¿ä¸åå¨çæ件 %s" + +#: apt-pkg/indexcopy.cc:543 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "æ æ³æ¾å°è®¤è¯è®°å½ï¼%s" + +#: apt-pkg/indexcopy.cc:549 +#, c-format +msgid "Hash mismatch for: %s" +msgstr "Hash æ ¡éªåä¸ç¬¦ï¼%s" + +#: apt-pkg/indexcopy.cc:677 +#, 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:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "%s ä¸æ²¡æå®è£ å¯é¥ç¯ã" + +#: apt-pkg/cacheset.cc:337 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "æªæ¾å°â%2$sâçâ%1$sâåå¸çæ¬" + +#: apt-pkg/cacheset.cc:340 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "æªæ¾å°â%2$sâçâ%1$sâçæ¬" + +#: apt-pkg/cacheset.cc:447 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "æ æ³æ¾å°ä»»å¡ %s" + +#: apt-pkg/cacheset.cc:454 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "æ æ³æç §æ£åè¡¨è¾¾å¼ %s æ¾å°ä»»ä½è½¯ä»¶å " + +#: apt-pkg/cacheset.cc:467 +#, c-format +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "æ æ³ä»å®å ¨èæç软件å %s ä¸éæ©çæ¬" + +#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "å 为软件å %s 没æå·²å®è£ æåéççæ¬ï¼æ æ³è¿è¡éæ©" + +#: apt-pkg/cacheset.cc:491 +#, c-format +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "å 为软件å %s æ¯å®å ¨çèæ软件å ï¼æ æ³éæ©å®çææ°ç" + +#: apt-pkg/cacheset.cc:499 +#, c-format +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "å 为软件å %s 没æåéçæ¬ï¼æ æ³è¿è¡éæ©" + +#: apt-pkg/cacheset.cc:507 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "å 为软件å %s 没æå®è£ ï¼æ æ³éæ©å®çå·²å®è£ çæ¬" -#: apt-pkg/deb/dpkgpm.cc:49 +#: apt-pkg/deb/dpkgpm.cc:54 #, c-format msgid "Installing %s" msgstr "æ£å¨å®è£ %s" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848 #, c-format msgid "Configuring %s" msgstr "æ£å¨é ç½® %s" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855 #, c-format msgid "Removing %s" msgstr "æ£å¨å é¤ %s" -#: apt-pkg/deb/dpkgpm.cc:52 +#: apt-pkg/deb/dpkgpm.cc:57 +#, c-format +msgid "Completely removing %s" +msgstr "å®å ¨å é¤ %s" + +#: apt-pkg/deb/dpkgpm.cc:58 +#, c-format +msgid "Noting disappearance of %s" +msgstr "注æå° %s å·²ç»æ¶å¤±" + +#: apt-pkg/deb/dpkgpm.cc:59 #, c-format msgid "Running post-installation trigger %s" msgstr "æ§è¡å®è£ åæ§è¡ç触åå¨ %s" -#: apt-pkg/deb/dpkgpm.cc:521 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Directory '%s' missing" -msgstr "ç®å½ %s ä¸è§äº" +msgstr "ç®å½ %s 缺失" + +#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689 +#, c-format +msgid "Could not open file '%s'" +msgstr "æ æ³æå¼æ件 %s" -#: apt-pkg/deb/dpkgpm.cc:605 +#: apt-pkg/deb/dpkgpm.cc:841 #, c-format msgid "Preparing %s" msgstr "æ£å¨åå¤ %s" -#: apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:842 #, c-format msgid "Unpacking %s" msgstr "æ£å¨è§£å缩 %s" -#: apt-pkg/deb/dpkgpm.cc:611 +#: apt-pkg/deb/dpkgpm.cc:847 #, c-format msgid "Preparing to configure %s" msgstr "æ£å¨åå¤é ç½® %s" -#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 -#, c-format -msgid "Processing triggers for %s" -msgstr "å¯å¨å¯¹ %s çå¤ç" - -#: apt-pkg/deb/dpkgpm.cc:617 +#: apt-pkg/deb/dpkgpm.cc:849 #, c-format msgid "Installed %s" msgstr "å·²å®è£ %s" -#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624 -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:854 #, c-format msgid "Preparing for removal of %s" msgstr "æ£å¨åå¤ %s çå é¤æä½" -#: apt-pkg/deb/dpkgpm.cc:628 +#: apt-pkg/deb/dpkgpm.cc:856 #, c-format msgid "Removed %s" msgstr "å·²å é¤ %s" -#: apt-pkg/deb/dpkgpm.cc:633 +#: apt-pkg/deb/dpkgpm.cc:861 #, c-format msgid "Preparing to completely remove %s" msgstr "æ£å¨åå¤å®å ¨å é¤ %s" -#: apt-pkg/deb/dpkgpm.cc:634 +#: apt-pkg/deb/dpkgpm.cc:862 #, c-format msgid "Completely removed %s" msgstr "å®å ¨å é¤äº %s" -#: apt-pkg/deb/dpkgpm.cc:791 +#: apt-pkg/deb/dpkgpm.cc:1082 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "æ æ³åå ¥æ¥å¿ã openpty() 失败 (/dev/pts 没æ mount ä¸ï¼)\n" +msgstr "æ æ³åå ¥æ¥å¿ã openpty() 失败(没ææè½½ /dev/pts ï¼)\n" + +#: apt-pkg/deb/dpkgpm.cc:1113 +msgid "Running dpkg" +msgstr "æ£å¨è¿è¡ dpkg" + +#: apt-pkg/deb/dpkgpm.cc:1338 +msgid "No apport report written because MaxReports is reached already" +msgstr "ç±äºå·²ç»è¾¾å° MaxReports éå¶ï¼æ²¡æåå ¥ apport æ¥åã" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1343 +msgid "dependency problems - leaving unconfigured" +msgstr "ä¾èµé®é¢ - ä¿ææªé ç½®" + +#: apt-pkg/deb/dpkgpm.cc:1345 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "å 为é误æ¶æ¯æ示è¿æ¯ç±äºä¸ä¸ä¸ªé®é¢å¯¼è´çé误ï¼æ²¡æåå ¥ apport æ¥åã" + +#: apt-pkg/deb/dpkgpm.cc:1351 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "å 为é误æ¶æ¯æ示è¿æ¯ç±äºç£ç已满ï¼æ²¡æåå ¥ apport æ¥åã" + +#: apt-pkg/deb/dpkgpm.cc:1357 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "å 为é误æ¶æ¯æ示è¿æ¯ç±äºå åä¸è¶³ï¼æ²¡æåå ¥ apport æ¥åã" + +#: apt-pkg/deb/dpkgpm.cc:1364 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "å 为é误æ¶æ¯æ示è¿æ¯ä¸ä¸ª dpkg I/O é误ï¼æ²¡æåå ¥ apport æ¥åã" + +#: apt-pkg/deb/debsystem.cc:69 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "æ æ³éå®ç®¡çç®å½(%s)ï¼æ¯å¦æå ¶ä»è¿ç¨æ£å ç¨å®ï¼" + +#: apt-pkg/deb/debsystem.cc:72 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "æ æ³å¯¹ç¶æå表ç®å½å é(%s)ï¼è¯·æ¥çæ¨æ¯å¦æ£ä»¥ root ç¨æ·è¿è¡ï¼" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:88 +#, c-format +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "dpkg 被ä¸æï¼æ¨å¿ é¡»æå·¥è¿è¡ %s 解å³æ¤é®é¢ã" + +#: apt-pkg/deb/debsystem.cc:106 +msgid "Not locked" +msgstr "æªéå®" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:260 +#, c-format +msgid "No mirror file '%s' found " +msgstr "没ææ¾å°éåæ件 %s" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:267 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "没ææ¾å°éåæ件 %s" + +#: methods/mirror.cc:422 +#, c-format +msgid "[Mirror: %s]" +msgstr "[éåï¼%s]" + +#: methods/rred.cc:503 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "æ æ³è¿å mmap åæ件æä½ç¨é为 %s æè¡¥ä¸ - è¡¥ä¸å¯è½å·²æåã" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "æ æ³æå¼è¡¥ä¸æ件" +#: methods/rred.cc:508 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "æ æ³è¿å mmap 为 %s æè¡¥ä¸(ä½æ²¡æ mmap çé误) - è¡¥ä¸å¯è½å·²æåã" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "è¿æ¥è¢«æ°¸ä¹ å ³é" +#~ msgid "Internal error, could not locate member" +#~ msgstr "å é¨é误ï¼æ æ³å®ä½å å æ件" + +#~ msgid "Internal error, group '%s' has no installable pseudo package" +#~ msgstr "å é¨é误ï¼ç» %s 没æå¯å®è£ ç pseudo 软件å " + +#~ msgid "Release file expired, ignoring %s (invalid since %s)" +#~ msgstr "Release æ件已è¿æï¼å¿½ç¥ %s (ä» %s èµ·æ æ)" + +#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +#~ msgstr "é误ï¼Acquire::gpgv::Options çåæ°å表太é¿ãç»æè¿è¡ã" + +#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgstr "å¤ç %s (NewVersion2)æ¶åºé" + +#~ msgid "Malformed line %u in source list %s (vendor id)" +#~ msgstr "å¨æºåè¡¨ä¸ %2$s ä¸ç¬¬ %1$u è¡çæ ¼å¼æ误(ä¾åºå ID)" + +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "æ æ³è®¿é®å¯é¥ç¯ï¼â%sâ" + +#~ msgid "Could not patch file" +#~ msgstr "æ æ³æå¼è¡¥ä¸æ件" + +#~ msgid " %4i %s\n" +#~ msgstr " %4i %s\n" + +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "没ææºä»£ç å â%sâï¼ä½¿ç¨â%sâ代æ¿\n" + +#~ msgid "%4i %s\n" +#~ msgstr "%4i %s\n" + +#~ msgid "Processing triggers for %s" +#~ msgstr "å¯å¨å¯¹ %s çå¤ç" + #~ msgid "Dynamic MMap ran out of room" #~ msgstr "å¨æå åæ å°(Dynamic MMap)空é´ä¸è¶³" @@ -2874,7 +3502,7 @@ msgstr "è¿æ¥è¢«æ°¸ä¹ å ³é" #~ "æ¨æ好æ交ä¸ä¸ªé对è¿ä¸ªè½¯ä»¶å çæ éæ¥åã" #~ msgid "Line %d too long (max %lu)" -#~ msgstr "第 %d è¡è¶ é¿äº(é¿åº¦éå¶ä¸º %lu)ã" +#~ msgstr "第 %d è¡å¤ªé¿äº(é¿åº¦éå¶ä¸º %lu)ã" #~ msgid "After unpacking %sB of additional disk space will be used.\n" #~ msgstr "解å缩åä¼æ¶èæ %sB çé¢å¤ç©ºé´ã\n" @@ -2882,11 +3510,8 @@ msgstr "è¿æ¥è¢«æ°¸ä¹ å ³é" #~ msgid "After unpacking %sB disk space will be freed.\n" #~ msgstr "解å缩åå°ä¼ç©ºåº %sB ç空é´ã\n" -#~ msgid "%s set to manual installed.\n" -#~ msgstr "%s 已设置为æå¨å®è£ ã\n" - #~ msgid "Line %d too long (max %d)" -#~ msgstr "第 %d è¡è¶ é¿äº(é¿åº¦éå¶ä¸º %d)" +#~ msgstr "第 %d è¡å¤ªé¿äº(é¿åº¦éå¶ä¸º %d)" #~ msgid "Error occured while processing %s (NewFileDesc1)" #~ msgstr "å¤ç %s (NewFileDesc1)æ¶åºé" @@ -2895,11 +3520,11 @@ msgstr "è¿æ¥è¢«æ°¸ä¹ å ³é" #~ msgstr "å¤ç %s (NewFileDesc2)æ¶åºé" #~ msgid "Stored label: %s \n" -#~ msgstr "åæ¡£æ ç¾ï¼%s \n" +#~ msgstr "å½æ¡£æ件æ ç¾ï¼%s \n" #~ msgid "" -#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" -#~ "i signatures\n" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and " +#~ "%i signatures\n" #~ msgstr "" #~ "æ¾å°äº %i 个软件å ç´¢å¼ã%i 个æºä»£ç å ç´¢å¼ï¼%i 个翻è¯ç´¢å¼å %i 个æ°åç¾å\n" @@ -2923,5 +3548,4 @@ msgstr "è¿æ¥è¢«æ°¸ä¹ å ³é" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" -#~ "å¨å®è£ æºå表 %3$s ç第 %2$u è¡åç°äºæ æ³è¯å«ç软件æä¾å ID (vendor ID) â%" -#~ "1$sâ" +#~ "å¨æºå表 %3$s ç第 %2$u è¡åç°äºæ æ³è¯å«ç软件æä¾å ID (vendor ID) â%1$sâ"