X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/20a8adb3d45a4419cd8c1de5e63f4b10ca190a3f..3d5f395664fdff700646ffecf9c0e026e97e8825:/po/en_GB.po?ds=sidebyside diff --git a/po/en_GB.po b/po/en_GB.po index fc636658e..1f6b283e0 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 14:01+0100\n" +"POT-Creation-Date: 2006-08-15 15:55+0200\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Package %s version %s has an unmet dep:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Unable to locate package %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Total package names : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normal packages: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Pure virtual packages: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Single virtual packages: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Mixed virtual packages: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Missing: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Total distinct versions: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total distinct versions: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Total dependencies: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Total ver/file relations: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total ver/file relations: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Total Provides mappings: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Total globbed strings: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total dependency version space: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Total slack space: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total space accounted for: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Package file %s is out of sync." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "You must give exactly one pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "No packages found" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Package files:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 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" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pinned packages:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(not found)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Installed: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidate: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Package pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Version table:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s compiled on %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,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:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -422,115 +432,126 @@ msgstr "No selections matched" msgid "Some files are missing in the package file group `%s'" msgstr "Some files are missing in the package file group ‘%s’" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB was corrupted, file renamed to %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Unable to open DB file %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "File date has changed %s" +msgid "Failed to stat %s" +msgstr "Failed to stat %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Unable to read directory %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Unable to stat %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E:" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W:" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Errors apply to file " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Tree walking failed" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Failed to open %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Failed to readlink %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Failed to unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Failed to link %s to %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260 -#, c-format -msgid "Failed to stat %s" -msgstr "Failed to stat %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s has no override entry\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s has no override entry\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -626,79 +647,79 @@ msgstr "Problem unlinking %s" msgid "Failed to rename %s to %s" msgstr "Failed to rename %s to %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "The following packages have unmet dependencies." -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "but %s is installed" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "but %s is to be installed" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "but it is not installable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "but it is a virtual package" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "but it is not installed" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "but it is not going to be installed" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr "or" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "The following NEW packages will be installed" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "The following packages will be REMOVED" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "The following packages have been kept back:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "The following packages will be upgraded:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "The following packages will be DOWNGRADED:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "The following held packages will be changed:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (due to %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -706,143 +727,143 @@ 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:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu upgraded, %lu newly installed, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalled, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu downgraded, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu to remove and %lu not upgraded.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu not fully installed or removed.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Correcting dependencies..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " failed." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Unable to correct dependencies" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Unable to minimize the upgrade set" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr "Done" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 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:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Unmet dependencies. Try using -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNING: The following packages cannot be authenticated!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Authentication warning overridden.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Install these packages without verification [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "There are problems and -y was used without --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internal error, InstallPackages was called with broken packages!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Packages need to be removed but remove is disabled." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 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:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Need to get %sB/%sB of archives.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Need to get %sB of archives.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "After unpacking %sB of additional disk space will be used.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "After unpacking %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, 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:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only specified but this is not a trivial operation." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -853,28 +874,28 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -882,47 +903,47 @@ msgstr "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Aborting install." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Skipping %s, it is already installed and upgrade is not set.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, 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:1069 +#: cmdline/apt-get.cc:1084 #, 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:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installed]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -933,49 +954,49 @@ 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:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -983,25 +1004,44 @@ msgstr "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1415 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1440 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 +msgid "The following information may help to resolve the situation:" +msgstr "The following information may help to resolve the situation:" + +#: cmdline/apt-get.cc:1447 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Internal error, problem resolver broke stuff" + +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1584 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1555 +#: cmdline/apt-get.cc:1614 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:1558 +#: cmdline/apt-get.cc:1617 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1009,7 +1049,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1570 +#: cmdline/apt-get.cc:1629 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" @@ -1021,7 +1061,7 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1578 +#: cmdline/apt-get.cc:1637 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1031,119 +1071,115 @@ msgstr "" "the package is simply not installable and a bug report against\n" "that package should be filed." -#: cmdline/apt-get.cc:1583 -msgid "The following information may help to resolve the situation:" -msgstr "The following information may help to resolve the situation:" - -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1645 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1676 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1765 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1766 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1786 msgid "Calculating upgrade... " msgstr "Calculating upgrade..." -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1794 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 +#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1969 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:1915 cmdline/apt-get.cc:2144 +#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:2043 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:2067 #, 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:1988 +#: cmdline/apt-get.cc:2072 #, 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:1991 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2081 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2112 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2140 #, 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:2068 +#: cmdline/apt-get.cc:2152 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2153 #, 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:2086 +#: cmdline/apt-get.cc:2170 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2189 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2205 msgid "Must specify at least one package to check builddeps for" msgstr "Must specify at least one package to check builddeps for" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2233 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2253 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2305 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1152,7 +1188,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:2357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,31 +1197,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2392 #, 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:2333 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2431 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2435 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2467 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2508 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1365,19 +1401,19 @@ msgstr "Merging available information" msgid "Failed to create pipes" msgstr "Failed to create pipes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Failed to exec gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Corrupted archive" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum failed, archive corrupted" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unknown TAR header type %u, member %s" @@ -1522,9 +1558,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:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Reading package lists" @@ -1538,7 +1574,7 @@ msgstr "Failed to change to the admin dir %sinfo" msgid "Internal error getting a package name" msgstr "Internal error getting a package name" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Reading file listing" @@ -1585,10 +1621,6 @@ msgstr "Internal error adding a diversion" msgid "The pkg cache must be initialized first" msgstr "The pkg cache must be initialized first" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Reading file list" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1661,12 +1693,13 @@ msgstr "Disk not found." msgid "File not found" msgstr "File not found" -#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Failed to stat" -#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1794,7 +1827,7 @@ msgstr "Data socket connect timed out" msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1817,7 +1850,7 @@ msgstr "Data transfer failed, server said ‘%s’" msgid "Query" msgstr "Query" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Unable to invoke" @@ -1846,70 +1879,71 @@ 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:106 +#: methods/connect.cc:108 #, 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:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connecting to %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Could not resolve ‘%s’" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporary failure resolving ‘%s’" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Unable to connect to %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:65 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Could not resolve ‘%s’" + +#: methods/gpgv.cc:100 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:191 +#: methods/gpgv.cc:204 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:196 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "At least one invalid signature was encountered." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "Could not execute " - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:213 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " to verify signature (is gnupg installed?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Unknown error executing gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "The following signatures were invalid:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1927,76 +1961,76 @@ msgstr "Couldn't open pipe for %s" msgid "Read error from %s process" msgstr "Read error from %s process" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "Got a single header line over %u chars" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "The HTTP server sent an invalid Content-Length header" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "The HTTP server sent an invalid Content-Range header" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Internal error" @@ -2009,7 +2043,7 @@ msgstr "Cannot mmap an empty file" msgid "Couldn't make mmap of %lu bytes" msgstr "Couldn't make mmap of %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Selection %s not found" @@ -2206,93 +2240,108 @@ msgstr "Problem unlinking the file" msgid "Problem syncing the file" msgstr "Problem syncing the file" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 msgid "Empty package cache" msgstr "Empty package cache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is corrupted" msgstr "The package cache file is corrupted" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 msgid "The package cache file is an incompatible version" msgstr "The package cache file is an incompatible version" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 #, 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:147 +#: apt-pkg/pkgcache.cc:158 msgid "The package cache was built for a different architecture" msgstr "The package cache was built for a different architecture" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "Depends" msgstr "Depends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "Suggests" msgstr "Suggests" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Recommends" msgstr "Recommends" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Conflicts" msgstr "Conflicts" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Replaces" msgstr "Replaces" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 msgid "Obsoletes" msgstr "Obsoletes" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "required" msgstr "required" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:102 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:131 msgid "Dependency generation" msgstr "Dependency generation" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#, fuzzy +msgid "Reading state information" +msgstr "Merging available information" + +#: apt-pkg/depcache.cc:199 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Failed to open %s" + +#: apt-pkg/depcache.cc:205 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Failed to write file ‘%s’" + +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Unable to parse package file %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" @@ -2327,7 +2376,7 @@ msgstr "Malformed line %lu in source list %s (dist parse)" msgid "Opening %s" msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." @@ -2363,14 +2412,14 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:245 #, 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:1059 +#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2378,7 +2427,7 @@ msgstr "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Unable to correct problems, you have held broken packages." @@ -2392,11 +2441,18 @@ msgstr "Lists directory %spartial is missing." msgid "Archive directory %spartial is missing." msgstr "Archive directory %spartial is missing." -#: apt-pkg/acquire.cc:821 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" msgstr "Downloading file %li of %li (%s remaining)" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Reading file listing" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2413,12 +2469,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:120 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" @@ -2452,99 +2508,115 @@ msgstr "Did not understand pin type %s" 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:76 msgid "Cache has an incompatible versioning system" msgstr "Cache has an incompatible versioning system" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Error occurred while processing %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Error occurred while processing %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Error occurred while processing %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Error occurred while processing %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Error occurred while processing %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Error occurred while processing %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Error occurred while processing %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Error occurred while processing %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Error occurred while processing %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 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:210 +#: apt-pkg/pkgcachegen.cc:258 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:213 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, you exceeded the number of versions this APT can handle." + +#: apt-pkg/pkgcachegen.cc:264 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:241 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Error occurred while processing %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Error occurred while processing %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:311 #, 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:574 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Couldn't stat source package list %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:645 +#: apt-pkg/acquire-item.cc:1097 msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:758 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2553,7 +2625,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:817 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2562,14 +2634,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:853 +#: apt-pkg/acquire-item.cc:1305 #, 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:940 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Size mismatch" @@ -2578,7 +2650,7 @@ msgstr "Size mismatch" msgid "Vendor block %s contains no fingerprint" msgstr "Vendor block %s contains no fingerprint" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2587,47 +2659,49 @@ msgstr "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identifying.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Stored label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Using CD-ROM mount point %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Unmounting CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Waiting for disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Mounting CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Scanning disc for index files..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Found %i package indexes, %i source indexes and %i signatures\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "That is not a valid name, try again.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2636,38 +2710,38 @@ msgstr "" "This disc is called: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copying package lists..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Writing new source list\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Source list entries for this disc are:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Unmounting CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Wrote %i records.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Wrote %i records with %i missing files.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Wrote %i records with %i mismatched files\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format 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" @@ -2713,19 +2787,39 @@ msgid "Removed %s" msgstr "Removed %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "Preparing for remove with config %s" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparing to configure %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "Removed with config %s" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Failed to remove %s" + +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Could not open file %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" +#~ msgid "File date has changed %s" +#~ msgstr "File date has changed %s" + +#~ msgid "Reading file list" +#~ msgstr "Reading file list" + +#~ msgid "Could not execute " +#~ msgstr "Could not execute " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Preparing for remove with config %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Removed with config %s" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s"