diff options
Diffstat (limited to 'po/en_GB.po')
| -rw-r--r-- | po/en_GB.po | 1010 |
1 files changed, 551 insertions, 459 deletions
diff --git a/po/en_GB.po b/po/en_GB.po index bc2153efe..76d443ee7 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-11 20:34+0200\n" +"POT-Creation-Date: 2007-07-06 06:51+0200\n" "PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n" "Language-Team: en_GB <en_gb@li.org>\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:143 #, 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Unable to locate package %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Total package names : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normal packages: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pure virtual packages: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Single virtual packages: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Mixed virtual packages: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Missing: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total distinct versions: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total distinct versions: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total dependencies: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total ver/file relations: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total ver/file relations: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total Provides mappings: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total globbed strings: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total dependency version space: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total slack space: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total space accounted for: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Package file %s is out of sync." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "You must give exactly one pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "No packages found" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Package files:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache is out of sync, can't x-ref a package file" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pinned packages:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(not found)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installed: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidate: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Package pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Version table:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2584 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:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,7 @@ msgstr "" " -c=? 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:815 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -309,31 +319,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:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Package extension list is too long" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Error processing directory %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Source extension list is too long" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Error writing header to contents file" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Error processing contents %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -413,26 +423,26 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "No selections matched" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format 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:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB was corrupted, file renamed to %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -440,106 +450,106 @@ msgstr "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Unable to open DB file %s: %s" -#: 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 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Failed to stat %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Unable to read directory %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Unable to stat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Errors apply to file " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Tree walking failed" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Failed to open %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Failed to readlink %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Failed to unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Failed to link %s to %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s has no source override entry\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s has no binary override entry either\n" @@ -553,165 +563,165 @@ msgstr "Internal error, could not locate member %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Failed to allocate memory" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Unable to open %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Malformed override %s line %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Malformed override %s line %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Malformed override %s line %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Failed to read the override file %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Unknown compression algorithm ‘%s’" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Compressed output %s needs a compression set" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Failed to create IPC pipe to subprocess" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Failed to create FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Failed to fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Compress child" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Internal error, failed to create %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Failed to create subprocess IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Failed to exec compressor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "decompressor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO to subprocess/file failed" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Failed to read while computing MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problem unlinking %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "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:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, 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!" @@ -719,143 +729,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 minimise 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:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332 +#: apt-pkg/cachefile.cc:63 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:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186 #, 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" @@ -866,28 +876,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:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229 #, 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:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238 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?" @@ -895,47 +905,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" @@ -946,49 +956,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:1343 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -996,25 +1006,65 @@ 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:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "The following NEW packages will be installed" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 +msgid "The following information may help to resolve the situation:" +msgstr "The following information may help to resolve the situation:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Internal error, problem resolver broke stuff" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1544 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Couldn't find package %s" + +#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1712 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "but %s is to be installed" + +#: cmdline/apt-get.cc:1725 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:1549 +#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1022,7 +1072,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1740 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" @@ -1034,7 +1084,7 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1748 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" @@ -1044,119 +1094,115 @@ msgstr "" "the package is simply not installable and a bug report against\n" "that package should be filed." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "The following information may help to resolve the situation:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2086 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:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2165 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2189 #, 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:1997 +#: cmdline/apt-get.cc:2194 #, 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:2000 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2203 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2234 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2262 #, 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:2077 +#: cmdline/apt-get.cc:2274 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2275 #, 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:2095 +#: cmdline/apt-get.cc:2292 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2311 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2327 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:2158 +#: cmdline/apt-get.cc:2355 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2375 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2427 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1165,7 +1211,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2479 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1174,31 +1220,32 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2514 #, 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:2342 +#: cmdline/apt-get.cc:2539 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2553 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2557 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2589 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2630 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1213,6 +1260,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1374,188 +1422,188 @@ msgstr "" msgid "Merging available information" msgstr "Merging available information" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Failed to create pipes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Failed to exec gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Corrupted archive" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum failed, archive corrupted" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unknown TAR header type %u, member %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Invalid archive signature" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Error reading archive member header" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Invalid archive member header" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archive is too short" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Failed to read the archive headers" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode called on still linked node" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Failed to locate the hash element!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Failed to allocate diversion" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internal error in AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Trying to overwrite a diversion, %s -> %s and %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Double add of diversion %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicate conf file %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Failed to write file ‘%s’" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Failed to close file %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "The path %s is too long" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Unpacking %s more than once" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "The directory %s is diverted" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "The package is trying to write to the diversion target %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "The diversion path is too long" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "The directory %s is being replaced by a non-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Failed to locate node in its hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "The path is too long" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Overwrite package match with no version for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overwrites the one in the package %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format msgid "Unable to read %s" msgstr "Unable to read %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Unable to stat %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Failed to remove %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Unable to create %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Failed to stat %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "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:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Reading package lists" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Failed to change to the admin dir %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Internal error getting a package name" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Reading file listing" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1566,77 +1614,77 @@ msgstr "" "then make it empty and immediately re-install the same version of the " "package!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Failed reading the list file %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Internal error getting a node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Failed to open the diversions file %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "The diversion file is corrupted" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Invalid line in the diversion file: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Internal error adding a diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "The pkg cache must be initialised first" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Failed to find a Package: header, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Bad ConfFile section in the status file. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Error parsing MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "This is not a valid DEB archive, missing ‘%s’ member" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "This is not a valid DEB archive, it has no %s or ‘%s’ member" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Couldn't change to %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Internal error, could not locate member" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Failed to locate a valid control file" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Unparsable control file" @@ -1657,25 +1705,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Wrong CD-ROM" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Unable to unmount the CD-ROM in %s, it may still be in use." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk not found." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "File not found" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Failed to stat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1737,7 +1786,7 @@ msgstr "Connection timeout" msgid "Server closed the connection" msgstr "Server closed the connection" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Read error" @@ -1749,7 +1798,7 @@ msgstr "A response overflowed the buffer." msgid "Protocol corruption" msgstr "Protocol corruption" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Write error" @@ -1803,7 +1852,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:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1937,427 +1986,446 @@ 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:377 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:531 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:585 +#: methods/http.cc:586 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:601 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:603 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:874 +#: methods/http.cc:875 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:877 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Internal error" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Cannot mmap an empty file" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format 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:978 #, c-format msgid "Selection %s not found" msgstr "Selection %s not found" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Unrecognized type abbreviation: ‘%c’" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Opening configuration file %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" +#: apt-pkg/contrib/configuration.cc:510 +#, fuzzy, c-format +msgid "Line %d too long (max %lu)" msgstr "Line %d too long (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Block starts with no name." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Malformed tag" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:642 #, 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:684 +#: apt-pkg/contrib/configuration.cc:682 #, 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:691 +#: apt-pkg/contrib/configuration.cc:689 #, 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:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: Extra junk at end of file" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Done" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Command line option ‘%c’ [from %s] is not known." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Command line option %s is not understood" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Command line option %s is not boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Option %s requires an argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Option %s: Configuration item specification must have an =<val>." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, 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:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Option ‘%s’ is too long" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Sense %s is not understood, try true or false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Invalid operation %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Unable to stat the mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 #, c-format msgid "Unable to change to %s" msgstr "Unable to change to %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Failed to stat the cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Not using locking for read only lock file %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Could not open lock file %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Not using locking for nfs mounted lock file %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Could not get lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, 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:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-process %s exited unexpectedly" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Could not open file %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, still have %lu to read but none left" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, still have %lu to write but couldn't" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problem closing the file" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problem unlinking the file" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problem syncing the file" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Empty package cache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "The package cache file is corrupted" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 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:148 #, 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:153 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:224 msgid "Depends" msgstr "Depends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggests" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recommends" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicts" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Replaces" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoletes" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "required" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Dependency generation" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Merging available information" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Failed to open %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Failed to write file ‘%s’" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Unable to parse package file %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Malformed line %lu in source list %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Malformed line %lu in source list %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, 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:105 +#: apt-pkg/sourcelist.cc:101 #, 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:112 +#: apt-pkg/sourcelist.cc:108 #, 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:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Malformed line %u in source list %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type ‘%s’ is not known on line %u in source list %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Malformed line %u in source list %s (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2368,19 +2436,19 @@ 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/pkgrecords.cc:37 +#: 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:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "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:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2388,181 +2456,196 @@ msgstr "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Unable to correct problems, you have held broken packages." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Lists directory %spartial is missing." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archive directory %spartial is missing." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Retrieving file %li of %li (%s remaining)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Retrieving file %li of %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "The method driver %s could not be found." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Method %s did not start correctly" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format 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:126 #, 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:142 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Unable to stat %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "You must put some ‘source’ URIs in your sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "The package lists or status file could not be parsed or opened." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 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:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Invalid record in the preferences file, no Package header" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Did not understand pin type %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 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:72 msgid "Cache has an incompatible versioning system" msgstr "Cache has an incompatible versioning system" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, 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:130 #, 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:153 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Error occurred while processing %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, 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:182 #, 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:213 #, 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:217 #, 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:221 #, 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:245 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Error occurred while processing %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 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:254 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:257 +#, 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:260 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:288 #, 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:301 #, 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:307 #, 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:678 #, 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:763 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, 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:945 +#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 +#: apt-pkg/acquire-item.cc:1411 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:640 -#, fuzzy -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:1106 +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:753 +#: apt-pkg/acquire-item.cc:1219 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2571,7 +2654,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:812 +#: apt-pkg/acquire-item.cc:1278 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2580,14 +2663,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:848 +#: apt-pkg/acquire-item.cc:1314 #, 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:935 +#: apt-pkg/acquire-item.cc:1401 msgid "Size mismatch" msgstr "Size mismatch" @@ -2596,7 +2679,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:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2605,47 +2688,54 @@ 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:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identifying.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Stored label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, 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:601 msgid "Unmounting CD-ROM\n" msgstr "Unmounting CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Waiting for disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Mounting CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 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:671 +#, 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:708 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Stored label: %s \n" + +#: 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" @@ -2654,95 +2744,97 @@ 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 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:834 +#, fuzzy +msgid "Unmounting CD-ROM...\n" 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:355 #, c-format msgid "Preparing %s" msgstr "Preparing %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:356 #, c-format msgid "Unpacking %s" msgstr "Unpacking %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:361 #, c-format msgid "Preparing to configure %s" msgstr "Preparing to configure %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:362 #, c-format msgid "Configuring %s" msgstr "Configuring %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Installed %s" msgstr "Installed %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:368 #, c-format msgid "Preparing for removal of %s" msgstr "Preparing for removal of %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:369 #, c-format msgid "Removing %s" msgstr "Removing %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Removed %s" msgstr "Removed %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:375 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparing to completely remove %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:376 #, c-format msgid "Completely removed %s" msgstr "Completely removed %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Could not patch file" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" - -#~ msgid "Could not patch file" -#~ msgstr "Could not patch file" |