X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/66a9a58e391f3923b82e579e2d9d5316ee255718..b5cabd30cc1be1c6c1ca675ceb359bab577c1905:/po/en_GB.po diff --git a/po/en_GB.po b/po/en_GB.po index 96b6c5219..4e2344b42 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-26 11:38+0200\n" +"POT-Creation-Date: 2010-05-04 13:37+0200\n" "PO-Revision-Date: 2008-11-13 11:47+0000\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" @@ -20,9 +20,10 @@ msgstr "" msgid "Package %s version %s has an unmet dep:\n" msgstr "Package %s version %s has an unmet dep:\n" -#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644 -#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021 -#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646 +#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023 +#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523 +#: cmdline/apt-cache.cc:1606 #, c-format msgid "Unable to locate package %s" msgstr "Unable to locate package %s" @@ -31,132 +32,130 @@ msgstr "Unable to locate package %s" msgid "Total package names: " msgstr "Total package names: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:247 +#, fuzzy +msgid "Total package structures: " +msgstr "Total package names: " + +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normal packages: " -#: cmdline/apt-cache.cc:286 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pure virtual packages: " -#: cmdline/apt-cache.cc:287 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Single virtual packages: " -#: cmdline/apt-cache.cc:288 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Mixed virtual packages: " -#: cmdline/apt-cache.cc:289 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Missing: " -#: cmdline/apt-cache.cc:291 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total distinct versions: " -#: cmdline/apt-cache.cc:293 +#: cmdline/apt-cache.cc:295 msgid "Total distinct descriptions: " msgstr "Total distinct descriptions: " -#: cmdline/apt-cache.cc:295 +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total dependencies: " -#: cmdline/apt-cache.cc:298 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total ver/file relations: " -#: cmdline/apt-cache.cc:300 +#: cmdline/apt-cache.cc:302 msgid "Total Desc/File relations: " msgstr "Total Desc/File relations: " -#: cmdline/apt-cache.cc:302 +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total Provides mappings: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total globbed strings: " -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total dependency version space: " -#: cmdline/apt-cache.cc:333 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total slack space: " -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total space accounted for: " -#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223 #, c-format msgid "Package file %s is out of sync." msgstr "Package file %s is out of sync." -#: cmdline/apt-cache.cc:1297 +#: cmdline/apt-cache.cc:1299 msgid "You must give exactly one pattern" msgstr "You must give exactly one pattern" -#: cmdline/apt-cache.cc:1451 +#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529 msgid "No packages found" msgstr "No packages found" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1548 msgid "Package files:" msgstr "Package files:" -#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622 +#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache is out of sync, can't x-ref a package file" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1549 +#: cmdline/apt-cache.cc:1569 msgid "Pinned packages:" msgstr "Pinned packages:" -#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602 +#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637 msgid "(not found)" msgstr "(not found)" -#. Installed version -#: cmdline/apt-cache.cc:1582 +#: cmdline/apt-cache.cc:1590 msgid " Installed: " msgstr " Installed: " -#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592 -msgid "(none)" -msgstr "(none)" - -#. Candidate Version -#: cmdline/apt-cache.cc:1589 +#: cmdline/apt-cache.cc:1591 msgid " Candidate: " msgstr " Candidate: " -#: cmdline/apt-cache.cc:1599 +#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627 +msgid "(none)" +msgstr "(none)" + +#: cmdline/apt-cache.cc:1634 msgid " Package pin: " msgstr " Package pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1608 +#: cmdline/apt-cache.cc:1643 msgid " Version table:" msgstr " Version table:" -#: cmdline/apt-cache.cc:1623 -#, c-format -msgid " %4i %s\n" -msgstr " %4i %s\n" - -#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584 +#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s compiled on %s %s\n" -#: cmdline/apt-cache.cc:1725 +#: cmdline/apt-cache.cc:1761 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -231,14 +230,20 @@ msgstr "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" #: cmdline/apt-cdrom.cc:77 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +#, fuzzy +msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’" #: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" msgstr "Please insert a Disc in the drive and press enter" -#: cmdline/apt-cdrom.cc:114 +#: cmdline/apt-cdrom.cc:127 +#, fuzzy, c-format +msgid "Failed to mount '%s' to '%s'" +msgstr "Failed to rename %s to %s" + +#: cmdline/apt-cdrom.cc:162 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repeat this process for the rest of the CDs in your set." @@ -303,7 +308,7 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -312,31 +317,31 @@ msgstr "Unable to write to %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Cannot get debconf version. Is debconf installed?" -#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345 msgid "Package extension list is too long" msgstr "Package extension list is too long" -#: 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:170 ftparchive/apt-ftparchive.cc:187 +#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260 +#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296 #, c-format msgid "Error processing directory %s" msgstr "Error processing directory %s" -#: ftparchive/apt-ftparchive.cc:251 +#: ftparchive/apt-ftparchive.cc:258 msgid "Source extension list is too long" msgstr "Source extension list is too long" -#: ftparchive/apt-ftparchive.cc:368 +#: ftparchive/apt-ftparchive.cc:375 msgid "Error writing header to contents file" msgstr "Error writing header to contents file" -#: ftparchive/apt-ftparchive.cc:398 +#: ftparchive/apt-ftparchive.cc:405 #, c-format msgid "Error processing contents %s" msgstr "Error processing contents %s" -#: ftparchive/apt-ftparchive.cc:553 +#: ftparchive/apt-ftparchive.cc:590 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -416,11 +421,11 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" -#: ftparchive/apt-ftparchive.cc:759 +#: ftparchive/apt-ftparchive.cc:796 msgid "No selections matched" msgstr "No selections matched" -#: ftparchive/apt-ftparchive.cc:832 +#: ftparchive/apt-ftparchive.cc:874 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Some files are missing in the package file group ‘%s’" @@ -436,8 +441,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" #: ftparchive/cachedb.cc:72 +#, fuzzy 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 format is invalid. If you upgraded from a older version of apt, please " @@ -454,95 +460,95 @@ msgstr "Unable to open DB file %s: %s" msgid "Failed to stat %s" msgstr "Failed to stat %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" -#: ftparchive/writer.cc:76 +#: ftparchive/writer.cc:73 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Unable to read directory %s\n" -#: ftparchive/writer.cc:81 +#: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Unable to stat %s\n" -#: ftparchive/writer.cc:132 +#: ftparchive/writer.cc:134 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:136 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:143 msgid "E: Errors apply to file " msgstr "E: Errors apply to file " -#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 #, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" -#: ftparchive/writer.cc:170 +#: ftparchive/writer.cc:174 msgid "Tree walking failed" msgstr "Tree walking failed" -#: ftparchive/writer.cc:195 +#: ftparchive/writer.cc:201 #, c-format msgid "Failed to open %s" msgstr "Failed to open %s" -#: ftparchive/writer.cc:254 +#: ftparchive/writer.cc:260 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:262 +#: ftparchive/writer.cc:268 #, c-format msgid "Failed to readlink %s" msgstr "Failed to readlink %s" -#: ftparchive/writer.cc:266 +#: ftparchive/writer.cc:272 #, c-format msgid "Failed to unlink %s" msgstr "Failed to unlink %s" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:279 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Failed to link %s to %s" -#: ftparchive/writer.cc:283 +#: ftparchive/writer.cc:289 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:393 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:401 ftparchive/writer.cc:688 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:464 ftparchive/writer.cc:790 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:698 #, c-format msgid " %s has no source override entry\n" msgstr " %s has no source override entry\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:702 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s has no binary override entry either\n" @@ -646,7 +652,7 @@ msgstr "Failed to rename %s to %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" @@ -685,36 +691,36 @@ msgstr "but it is not going to be installed" msgid " or" msgstr " or" -#: cmdline/apt-get.cc:382 +#: cmdline/apt-get.cc:384 msgid "The following NEW packages will be installed:" msgstr "The following NEW packages will be installed" -#: cmdline/apt-get.cc:408 +#: cmdline/apt-get.cc:412 msgid "The following packages will be REMOVED:" msgstr "The following packages will be REMOVED" -#: cmdline/apt-get.cc:430 +#: cmdline/apt-get.cc:434 msgid "The following packages have been kept back:" msgstr "The following packages have been kept back:" -#: cmdline/apt-get.cc:451 +#: cmdline/apt-get.cc:457 msgid "The following packages will be upgraded:" msgstr "The following packages will be upgraded:" -#: cmdline/apt-get.cc:472 +#: cmdline/apt-get.cc:480 msgid "The following packages will be DOWNGRADED:" msgstr "The following packages will be DOWNGRADED:" -#: cmdline/apt-get.cc:492 +#: cmdline/apt-get.cc:500 msgid "The following held packages will be changed:" msgstr "The following held packages will be changed:" -#: cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:553 #, c-format msgid "%s (due to %s) " msgstr "%s (due to %s) " -#: cmdline/apt-get.cc:553 +#: cmdline/apt-get.cc:561 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -722,143 +728,140 @@ msgstr "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" -#: cmdline/apt-get.cc:584 +#: cmdline/apt-get.cc:595 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu upgraded, %lu newly installed, " -#: cmdline/apt-get.cc:588 +#: cmdline/apt-get.cc:599 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalled, " -#: cmdline/apt-get.cc:590 +#: cmdline/apt-get.cc:601 #, c-format msgid "%lu downgraded, " msgstr "%lu downgraded, " -#: cmdline/apt-get.cc:592 +#: cmdline/apt-get.cc:603 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu to remove and %lu not upgraded.\n" -#: cmdline/apt-get.cc:596 +#: cmdline/apt-get.cc:607 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu not fully installed or removed.\n" -#: cmdline/apt-get.cc:669 +#: cmdline/apt-get.cc:680 msgid "Correcting dependencies..." msgstr "Correcting dependencies..." -#: cmdline/apt-get.cc:672 +#: cmdline/apt-get.cc:683 msgid " failed." msgstr " failed." -#: cmdline/apt-get.cc:675 +#: cmdline/apt-get.cc:686 msgid "Unable to correct dependencies" msgstr "Unable to correct dependencies" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:689 msgid "Unable to minimize the upgrade set" msgstr "Unable to minimise the upgrade set" -#: cmdline/apt-get.cc:680 +#: cmdline/apt-get.cc:691 msgid " Done" msgstr "Done" -#: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +#: cmdline/apt-get.cc:695 +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:698 msgid "Unmet dependencies. Try using -f." msgstr "Unmet dependencies. Try using -f." -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:723 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNING: The following packages cannot be authenticated!" -#: cmdline/apt-get.cc:716 +#: cmdline/apt-get.cc:727 msgid "Authentication warning overridden.\n" msgstr "Authentication warning overridden.\n" -#: cmdline/apt-get.cc:723 +#: cmdline/apt-get.cc:734 msgid "Install these packages without verification [y/N]? " msgstr "Install these packages without verification [y/N]? " -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:736 msgid "Some packages could not be authenticated" msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900 msgid "There are problems and -y was used without --force-yes" msgstr "There are problems and -y was used without --force-yes" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:786 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internal error, InstallPackages was called with broken packages!" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:795 msgid "Packages need to be removed but remove is disabled." msgstr "Packages need to be removed but remove is disabled." -#: cmdline/apt-get.cc:795 +#: cmdline/apt-get.cc:806 msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 -msgid "Unable to lock the download directory" -msgstr "Unable to lock the download directory" - -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." -#: cmdline/apt-get.cc:836 +#: cmdline/apt-get.cc:846 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org" -#: cmdline/apt-get.cc:841 +#: cmdline/apt-get.cc:851 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Need to get %sB/%sB of archives.\n" -#: cmdline/apt-get.cc:844 +#: cmdline/apt-get.cc:854 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Need to get %sB of archives.\n" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:859 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "After this operation, %sB of additional disk space will be used.\n" -#: cmdline/apt-get.cc:852 +#: cmdline/apt-get.cc:862 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "After this operation, %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2311 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:890 #, c-format msgid "You don't have enough free space in %s." msgstr "You don't have enough free space in %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only specified but this is not a trivial operation." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:908 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:910 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -869,28 +872,28 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:931 msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1021 msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1028 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -898,47 +901,57 @@ msgstr "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1032 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1037 msgid "Unable to correct missing packages." msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1038 msgid "Aborting install." msgstr "Aborting install." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s instead of %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1107 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Skipping %s, it is already installed and upgrade is not set.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1117 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Skipping %s, it is already installed and upgrade is not set.\n" + +#: cmdline/apt-get.cc:1135 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Package %s is not installed, so not removed\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1146 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Package %s is a virtual package provided by:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1159 msgid " [Installed]" msgstr " [Installed]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1168 +#, fuzzy +msgid " [Not candidate version]" +msgstr "Candidate versions" + +#: cmdline/apt-get.cc:1170 msgid "You should explicitly select one to install." msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1175 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -949,77 +962,95 @@ msgstr "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1194 msgid "However the following packages replace it:" msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1197 #, c-format msgid "Package %s has no installation candidate" msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1217 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1225 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1254 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1256 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1262 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1363 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1395 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Couldn't stat source package list %s" + +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1433 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1449 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1398 -msgid "Unable to lock the list directory" -msgstr "Unable to lock the list directory" - -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1514 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We are not supposed to delete stuff, cannot start AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1562 +#, fuzzy msgid "" +"The following package is automatically installed and is no longer required:" +msgid_plural "" "The following packages were automatically installed and are no longer " "required:" -msgstr "" +msgstr[0] "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[1] "" "The following packages were automatically installed and are no longer " "required:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1566 #, fuzzy, c-format -msgid "%lu packages were automatically installed and are no longer required.\n" -msgstr "" +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] "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[1] "" "The following packages were automatically installed and are no longer " "required:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1568 msgid "Use 'apt-get autoremove' to remove them." msgstr "Use 'apt-get autoremove' to remove them." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1573 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1037,43 +1068,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871 msgid "The following information may help to resolve the situation:" msgstr "The following information may help to resolve the situation:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1580 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internal Error, AutoRemoved broke stuff" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1599 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1654 #, c-format msgid "Couldn't find task %s" msgstr "Couldn't find task %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1795 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1828 #, c-format msgid "%s set to manually installed.\n" msgstr "%s set to manually installed.\n" -#: cmdline/apt-get.cc:1774 -msgid "You might want to run `apt-get -f install' to correct these:" +#: cmdline/apt-get.cc:1841 +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "You might want to run 'apt-get -f install' to correct these:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1844 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1081,7 +1112,7 @@ msgstr "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1856 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" @@ -1093,116 +1124,120 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1874 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1903 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1992 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1993 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:2022 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:2030 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162 +msgid "Unable to lock the download directory" +msgstr "Unable to lock the download directory" + +#: cmdline/apt-get.cc:2205 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2286 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2321 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2330 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2369 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2398 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2410 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2411 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2428 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2448 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2464 msgid "Must specify at least one package to check builddeps for" msgstr "" "Must specify at least one package for which you want to check builddeps" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2494 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2514 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2566 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1211,7 +1246,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2619 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1220,31 +1255,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2682 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2698 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2703 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2734 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2775 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1329,7 +1364,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2944 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1416,11 +1451,13 @@ msgid "Do you want to erase any previously downloaded .deb files?" msgstr "Do you want to erase any previously downloaded .deb files?" #: dselect/install:101 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "Some errors occurred while unpacking. I'm going to configure the" #: dselect/install:102 -msgid "packages that were installed. This may result in duplicate errors" +#, fuzzy +msgid "will be configured. This may result in duplicate errors" msgstr "packages that were installed. This may result in duplicate errors" #: dselect/install:103 @@ -1573,11 +1610,10 @@ msgstr "File %s/%s overwrites the one in the package %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166 +#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92 +#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296 #, c-format msgid "Unable to read %s" msgstr "Unable to read %s" @@ -1607,9 +1643,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "The info and temp directories need to be on the same filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947 +#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037 +#: apt-pkg/pkgcachegen.cc:1181 msgid "Reading package lists" msgstr "Reading package lists" @@ -1712,12 +1748,12 @@ msgstr "Failed to locate a valid control file" msgid "Unparsable control file" msgstr "Unparsable control file" -#: methods/cdrom.cc:200 +#: methods/cdrom.cc:199 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Unable to read the cdrom database %s" -#: methods/cdrom.cc:209 +#: 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" @@ -1725,7 +1761,7 @@ msgstr "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" -#: methods/cdrom.cc:219 +#: methods/cdrom.cc:218 msgid "Wrong CD-ROM" msgstr "Wrong CD-ROM" @@ -1743,11 +1779,11 @@ msgid "File not found" msgstr "File not found" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Failed to stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1756,34 +1792,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Invalid URI, local URIS must not start with //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:167 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "Logging in" -#: methods/ftp.cc:173 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "Unable to determine the peer name" -#: methods/ftp.cc:178 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "Unable to determine the local name" -#: methods/ftp.cc:209 methods/ftp.cc:237 +#: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" msgstr "The server refused the connection and said: %s" -#: methods/ftp.cc:215 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "USER failed, server said: %s" -#: methods/ftp.cc:222 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS failed, server said: %s" -#: methods/ftp.cc:242 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -1791,114 +1827,114 @@ msgstr "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." -#: methods/ftp.cc:270 +#: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Login script command ‘%s’ failed, server said: %s" -#: methods/ftp.cc:296 +#: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE failed, server said: %s" -#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "Connection timeout" -#: methods/ftp.cc:340 +#: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "Server closed the connection" -#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190 msgid "Read error" msgstr "Read error" -#: methods/ftp.cc:350 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "A response overflowed the buffer." -#: methods/ftp.cc:367 methods/ftp.cc:379 +#: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "Protocol corruption" -#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232 msgid "Write error" msgstr "Write error" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "Could not create a socket" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "Could not connect data socket, connection timed out" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "Could not connect, passive socket." -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo was unable to get a listening socket" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "Could not bind a socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "Could not listen on the socket" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "Could not determine the name of the socket" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "Unable to send PORT command" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Unknown address family %u (AF_*)" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT failed, server said: %s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "Data socket connect timed out" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Unable to fetch file, server said ‘%s’" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Data socket timed out" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Data transfer failed, server said ‘%s’" #. Get the files information -#: methods/ftp.cc:1002 +#: methods/ftp.cc:1005 msgid "Query" msgstr "Query" -#: methods/ftp.cc:1114 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "Unable to invoke" @@ -1927,71 +1963,76 @@ msgstr "Cannot initiate the connection to %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Could not connect to %s:%s (%s), connection timed out" -#: methods/connect.cc:119 +#: methods/connect.cc:122 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Could not connect to %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:150 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connecting to %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:169 methods/connect.cc:188 #, c-format msgid "Could not resolve '%s'" msgstr "Could not resolve ‘%s’" -#: methods/connect.cc:190 +#: methods/connect.cc:194 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporary failure resolving ‘%s’" -#: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#: methods/connect.cc:197 +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" -#: methods/connect.cc:240 -#, c-format -msgid "Unable to connect to %s %s:" +#: methods/connect.cc:244 +#, fuzzy, c-format +msgid "Unable to connect to %s:%s:" msgstr "Unable to connect to %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Aborting install." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internal error: Good signature, but could not determine key fingerprint?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "At least one invalid signature was encountered." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Could not execute '%s' to verify signature (is gpgv installed?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Unknown error executing gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "The following signatures were invalid:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2009,174 +2050,201 @@ msgstr "Couldn't open pipe for %s" msgid "Read error from %s process" msgstr "Read error from %s process" -#: methods/http.cc:384 +#: methods/http.cc:385 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:530 +#: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" msgstr "Got a single header line over %u chars" -#: methods/http.cc:538 +#: methods/http.cc:539 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:557 methods/http.cc:564 +#: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:593 +#: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" msgstr "The HTTP server sent an invalid Content-Length header" -#: methods/http.cc:608 +#: methods/http.cc:609 msgid "The HTTP server sent an invalid Content-Range header" msgstr "The HTTP server sent an invalid Content-Range header" -#: methods/http.cc:610 +#: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:634 +#: methods/http.cc:635 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:787 +#: methods/http.cc:793 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:792 +#: methods/http.cc:798 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:815 +#: methods/http.cc:821 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:846 +#: methods/http.cc:852 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:874 +#: methods/http.cc:880 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:888 +#: methods/http.cc:894 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:890 +#: methods/http.cc:896 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281 msgid "Failed to truncate file" msgstr "Failed to truncate file" -#: methods/http.cc:1146 +#: methods/http.cc:1156 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1173 methods/http.cc:1228 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1310 +#: methods/http.cc:1320 msgid "Internal error" msgstr "Internal error" -#: apt-pkg/contrib/mmap.cc:76 +#: apt-pkg/contrib/mmap.cc:77 msgid "Can't mmap an empty file" msgstr "Cannot mmap an empty file" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:89 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "Couldn't open pipe for %s" + +#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Couldn't make mmap of %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:124 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Unable to open %s" + +#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Unable to invoke" + +#: apt-pkg/contrib/mmap.cc:300 #, 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 "" +#: apt-pkg/contrib/mmap.cc:395 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:346 +#: apt-pkg/contrib/strutl.cc:371 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:353 +#: apt-pkg/contrib/strutl.cc:378 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:360 +#: apt-pkg/contrib/strutl.cc:385 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:365 +#: apt-pkg/contrib/strutl.cc:390 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1040 +#: apt-pkg/contrib/strutl.cc:1083 #, c-format msgid "Selection %s not found" msgstr "Selection %s not found" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Unrecognized type abbreviation: ‘%c’" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Opening configuration file %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Block starts with no name." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Malformed tag" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: Extra junk after value" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntax error %s:%u: Directives can only be done at the top level" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Too many nested includes" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:777 +#, fuzzy, c-format +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgstr "Syntax error %s:%u: Directives can only be done at the top level" + +#: apt-pkg/contrib/configuration.cc:827 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: Extra junk at end of file" @@ -2207,32 +2275,32 @@ msgstr "Command line option %s is not understood" msgid "Command line option %s is not boolean" msgstr "Command line option %s is not boolean" -#: 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 "Option %s requires an argument." -#: 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 =." msgstr "Option %s: Configuration item specification must have an =." -#: apt-pkg/contrib/cmndline.cc:234 +#: apt-pkg/contrib/cmndline.cc:236 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Option %s requires an integer argument, not ‘%s’" -#: apt-pkg/contrib/cmndline.cc:265 +#: apt-pkg/contrib/cmndline.cc:267 #, c-format msgid "Option '%s' is too long" msgstr "Option '%s' is too long" -#: 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 "Sense %s is not understood, try true or false." -#: apt-pkg/contrib/cmndline.cc:348 +#: apt-pkg/contrib/cmndline.cc:350 #, c-format msgid "Invalid operation %s" msgstr "Invalid operation %s" @@ -2242,191 +2310,196 @@ msgstr "Invalid operation %s" msgid "Unable to stat the mount point %s" msgstr "Unable to stat the mount point %s" -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187 -#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39 +#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196 +#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39 #, c-format msgid "Unable to change to %s" msgstr "Unable to change to %s" -#: apt-pkg/contrib/cdromutl.cc:195 +#: apt-pkg/contrib/cdromutl.cc:204 msgid "Failed to stat the cdrom" msgstr "Failed to stat the cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Not using locking for read only lock file %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:157 #, c-format msgid "Could not open lock file %s" msgstr "Could not open lock file %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:175 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Not using locking for nfs mounted lock file %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:179 #, c-format msgid "Could not get lock %s" msgstr "Could not get lock %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:615 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:627 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:629 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:633 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-process %s returned an error code (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:635 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-process %s exited unexpectedly" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Could not open file %s" msgstr "Could not open file %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:735 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, still have %lu to read but none left" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:765 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, still have %lu to write but couldn't" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:840 msgid "Problem closing the file" msgstr "Problem closing the file" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:846 msgid "Problem unlinking the file" msgstr "Problem unlinking the file" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:857 msgid "Problem syncing the file" msgstr "Problem syncing the file" -#: apt-pkg/pkgcache.cc:133 +#: apt-pkg/pkgcache.cc:139 msgid "Empty package cache" msgstr "Empty package cache" -#: apt-pkg/pkgcache.cc:139 +#: apt-pkg/pkgcache.cc:145 msgid "The package cache file is corrupted" msgstr "The package cache file is corrupted" -#: apt-pkg/pkgcache.cc:144 +#: apt-pkg/pkgcache.cc:150 msgid "The package cache file is an incompatible version" msgstr "The package cache file is an incompatible version" -#: apt-pkg/pkgcache.cc:149 +#: apt-pkg/pkgcache.cc:155 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "This APT does not support the versioning system ‘%s’" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:160 msgid "The package cache was built for a different architecture" msgstr "The package cache was built for a different architecture" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:287 msgid "Depends" msgstr "Depends" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:287 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:287 msgid "Suggests" msgstr "Suggests" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:288 msgid "Recommends" msgstr "Recommends" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:288 msgid "Conflicts" msgstr "Conflicts" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:288 msgid "Replaces" msgstr "Replaces" -#: apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:289 msgid "Obsoletes" msgstr "Obsoletes" -#: apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:289 msgid "Breaks" msgstr "Breaks" -#: apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:289 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:300 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:300 msgid "required" msgstr "required" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:300 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:239 +#: apt-pkg/pkgcache.cc:301 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:239 +#: apt-pkg/pkgcache.cc:301 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 +#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:124 +#: apt-pkg/depcache.cc:125 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:153 +#: apt-pkg/depcache.cc:154 msgid "Dependency generation" msgstr "Dependency generation" -#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 +#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211 msgid "Reading state information" msgstr "Reading state information" -#: apt-pkg/depcache.cc:223 +#: apt-pkg/depcache.cc:236 #, c-format msgid "Failed to open StateFile %s" msgstr "Failed to open StateFile %s" -#: apt-pkg/depcache.cc:229 +#: apt-pkg/depcache.cc:242 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Failed to write temporary StateFile %s" +#: apt-pkg/depcache.cc:851 +#, c-format +msgid "Internal error, group '%s' has no installable pseudo package" +msgstr "" + #: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" @@ -2437,57 +2510,84 @@ msgstr "Unable to parse package file %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:92 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Malformed line %lu in source list %s (dist parse)" + +#: apt-pkg/sourcelist.cc:95 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Malformed line %lu in source list %s (dist)" + +#: apt-pkg/sourcelist.cc:106 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "Malformed line %lu in source list %s (dist parse)" + +#: apt-pkg/sourcelist.cc:112 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "Malformed line %lu in source list %s (dist parse)" + +#: apt-pkg/sourcelist.cc:115 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "Malformed line %lu in source list %s (dist parse)" + +#: apt-pkg/sourcelist.cc:128 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Malformed line %lu in source list %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:130 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Malformed line %lu in source list %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Malformed line %lu in source list %s (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:139 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Malformed line %lu in source list %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:146 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Malformed line %lu in source list %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:281 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Malformed line %u in source list %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:285 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type ‘%s’ is not known on line %u in source list %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615 #, c-format -msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Malformed line %u in source list %s (vendor id)" +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:452 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2498,19 +2598,26 @@ msgstr "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." +#: apt-pkg/packagemanager.cc:495 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" -#: apt-pkg/algorithms.cc:248 +#: apt-pkg/algorithms.cc:292 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "The package %s needs to be reinstalled, but I can't find an archive for it." -#: apt-pkg/algorithms.cc:1138 +#: apt-pkg/algorithms.cc:1182 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2518,11 +2625,11 @@ msgstr "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -#: apt-pkg/algorithms.cc:1140 +#: apt-pkg/algorithms.cc:1184 msgid "Unable to correct problems, you have held broken packages." msgstr "Unable to correct problems, you have held broken packages." -#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417 +#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2530,24 +2637,29 @@ msgstr "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -#: apt-pkg/acquire.cc:60 -#, c-format -msgid "Lists directory %spartial is missing." +#: apt-pkg/acquire.cc:79 +#, fuzzy, c-format +msgid "List directory %spartial is missing." msgstr "Lists directory %spartial is missing." -#: apt-pkg/acquire.cc:64 -#, c-format -msgid "Archive directory %spartial is missing." +#: apt-pkg/acquire.cc:83 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." msgstr "Archive directory %spartial is missing." +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "Unable to lock the list directory" + #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:826 +#: apt-pkg/acquire.cc:878 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Retrieving file %li of %li (%s remaining)" -#: apt-pkg/acquire.cc:828 +#: apt-pkg/acquire.cc:880 #, c-format msgid "Retrieving file %li of %li" msgstr "Retrieving file %li of %li" @@ -2568,12 +2680,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -#: apt-pkg/init.cc:132 +#: apt-pkg/init.cc:135 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:148 +#: apt-pkg/init.cc:151 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" @@ -2594,110 +2706,110 @@ msgstr "The package lists or status file could not be parsed or opened." msgid "You may want to run apt-get update to correct these problems" msgstr "You may want to run apt-get update to correct these problems" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:333 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Invalid record in the preferences file, no Package header" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:355 #, c-format msgid "Did not understand pin type %s" msgstr "Did not understand pin type %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:363 msgid "No priority (or zero) specified for pin" msgstr "No priority (or zero) specified for pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:75 msgid "Cache has an incompatible versioning system" msgstr "Cache has an incompatible versioning system" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Error occurred while processing %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:132 +#: apt-pkg/pkgcachegen.cc:146 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Error occurred while processing %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:166 +#: apt-pkg/pkgcachegen.cc:180 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Error occurred while processing %s (NewFileDesc1)" -#: apt-pkg/pkgcachegen.cc:191 +#: apt-pkg/pkgcachegen.cc:210 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Error occurred while processing %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:195 +#: apt-pkg/pkgcachegen.cc:214 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Error occurred while processing %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:226 +#: apt-pkg/pkgcachegen.cc:234 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Error occurred while processing %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:230 +#: apt-pkg/pkgcachegen.cc:238 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Error occurred while processing %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:242 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Error occurred while processing %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:258 +#: apt-pkg/pkgcachegen.cc:266 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Error occurred while processing %s (NewFileDesc2)" -#: apt-pkg/pkgcachegen.cc:264 +#: apt-pkg/pkgcachegen.cc:273 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wow, you exceeded the number of package names this APT can handle.." -#: apt-pkg/pkgcachegen.cc:267 +#: apt-pkg/pkgcachegen.cc:276 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, you exceeded the number of versions this APT can handle." -#: apt-pkg/pkgcachegen.cc:270 +#: apt-pkg/pkgcachegen.cc:279 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Wow, you exceeded the number of descriptions this APT can handle." -#: apt-pkg/pkgcachegen.cc:273 +#: apt-pkg/pkgcachegen.cc:282 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, you exceeded the number of dependencies this APT can handle." -#: apt-pkg/pkgcachegen.cc:301 +#: apt-pkg/pkgcachegen.cc:310 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Error occurred while processing %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:314 +#: apt-pkg/pkgcachegen.cc:323 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Error occurred while processing %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:320 +#: apt-pkg/pkgcachegen.cc:329 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Package %s %s was not found while processing file dependencies" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:860 #, c-format msgid "Couldn't stat source package list %s" msgstr "Couldn't stat source package list %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:962 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" @@ -2706,19 +2818,19 @@ msgstr "IO Error saving source cache" msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469 msgid "Hash Sum mismatch" msgstr "Hash Sum mismatch" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2727,7 +2839,7 @@ msgstr "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2736,14 +2848,14 @@ msgstr "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1374 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "The package index files are corrupted. No Filename: field for package %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1461 msgid "Size mismatch" msgstr "Size mismatch" @@ -2767,7 +2879,7 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "Vendor block %s contains no fingerprint" -#: apt-pkg/cdrom.cc:525 +#: apt-pkg/cdrom.cc:518 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2776,42 +2888,42 @@ msgstr "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" -#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 +#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 msgid "Identifying.. " msgstr "Identifying.. " -#: apt-pkg/cdrom.cc:559 +#: apt-pkg/cdrom.cc:552 #, c-format msgid "Stored label: %s\n" msgstr "Stored label: %s\n" -#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 +#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 msgid "Unmounting CD-ROM...\n" msgstr "Unmounting CD-ROM...\n" -#: apt-pkg/cdrom.cc:585 +#: apt-pkg/cdrom.cc:578 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Using CD-ROM mount point %s\n" -#: apt-pkg/cdrom.cc:603 +#: apt-pkg/cdrom.cc:596 msgid "Unmounting CD-ROM\n" msgstr "Unmounting CD-ROM\n" -#: apt-pkg/cdrom.cc:607 +#: apt-pkg/cdrom.cc:600 msgid "Waiting for disc...\n" msgstr "Waiting for disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:608 msgid "Mounting CD-ROM...\n" msgstr "Mounting CD-ROM...\n" -#: apt-pkg/cdrom.cc:633 +#: apt-pkg/cdrom.cc:626 msgid "Scanning disc for index files..\n" msgstr "Scanning disc for index files..\n" -#: apt-pkg/cdrom.cc:673 +#: apt-pkg/cdrom.cc:666 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and %" @@ -2820,22 +2932,22 @@ msgstr "" "Found %zu package indices, %zu source indices, %zu translation indices and %" "zu signatures\n" -#: apt-pkg/cdrom.cc:684 +#: apt-pkg/cdrom.cc:677 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:703 #, c-format msgid "Found label '%s'\n" msgstr "Found label: %s\n" -#: apt-pkg/cdrom.cc:739 +#: apt-pkg/cdrom.cc:732 msgid "That is not a valid name, try again.\n" msgstr "That is not a valid name, try again.\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:748 #, c-format msgid "" "This disc is called: \n" @@ -2844,15 +2956,15 @@ msgstr "" "This disc is called: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:759 +#: apt-pkg/cdrom.cc:752 msgid "Copying package lists..." msgstr "Copying package lists..." -#: apt-pkg/cdrom.cc:785 +#: apt-pkg/cdrom.cc:778 msgid "Writing new source list\n" msgstr "Writing new source list\n" -#: apt-pkg/cdrom.cc:794 +#: apt-pkg/cdrom.cc:787 msgid "Source list entries for this disc are:\n" msgstr "Source list entries for this disc are:\n" @@ -2876,76 +2988,101 @@ msgstr "Wrote %i records with %i mismatched files\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Wrote %i records with %i missing files and %i mismatched files\n" +#: apt-pkg/indexcopy.cc:530 +#, fuzzy, c-format +msgid "Skipping nonexistent file %s" +msgstr "Opening configuration file %s" + +#: apt-pkg/indexcopy.cc:536 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" + +#: apt-pkg/indexcopy.cc:542 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Hash Sum mismatch" + #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" msgstr "Installing %s" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737 #, c-format msgid "Configuring %s" msgstr "Configuring %s" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744 #, c-format msgid "Removing %s" msgstr "Removing %s" #: apt-pkg/deb/dpkgpm.cc:52 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Completely removed %s" + +#: apt-pkg/deb/dpkgpm.cc:53 #, c-format msgid "Running post-installation trigger %s" msgstr "Running post-installation trigger %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Directory '%s' missing" msgstr "Directory '%s' missing." -#: apt-pkg/deb/dpkgpm.cc:653 +#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Could not open file %s" + +#: apt-pkg/deb/dpkgpm.cc:730 #, c-format msgid "Preparing %s" msgstr "Preparing %s" -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:731 #, c-format msgid "Unpacking %s" msgstr "Unpacking %s" -#: apt-pkg/deb/dpkgpm.cc:659 +#: apt-pkg/deb/dpkgpm.cc:736 #, c-format msgid "Preparing to configure %s" msgstr "Preparing to configure %s" -#: apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:738 #, c-format msgid "Installed %s" msgstr "Installed %s" -#: apt-pkg/deb/dpkgpm.cc:666 +#: apt-pkg/deb/dpkgpm.cc:743 #, c-format msgid "Preparing for removal of %s" msgstr "Preparing for removal of %s" -#: apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:745 #, c-format msgid "Removed %s" msgstr "Removed %s" -#: apt-pkg/deb/dpkgpm.cc:673 +#: apt-pkg/deb/dpkgpm.cc:750 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparing to completely remove %s" -#: apt-pkg/deb/dpkgpm.cc:674 +#: apt-pkg/deb/dpkgpm.cc:751 #, c-format msgid "Completely removed %s" msgstr "Completely removed %s" -#: apt-pkg/deb/dpkgpm.cc:878 +#: apt-pkg/deb/dpkgpm.cc:955 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -#: apt-pkg/deb/dpkgpm.cc:907 +#: apt-pkg/deb/dpkgpm.cc:986 msgid "Running dpkg" msgstr "" @@ -2971,14 +3108,36 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" +#~ msgid "Malformed line %u in source list %s (vendor id)" +#~ msgstr "Malformed line %u in source list %s (vendor id)" + +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Couldn't access keyring: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Could not patch file" + +#~ msgid " %4i %s\n" +#~ msgstr " %4i %s\n" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n"