diff options
Diffstat (limited to 'po/en_GB.po')
| -rw-r--r-- | po/en_GB.po | 597 |
1 files changed, 256 insertions, 341 deletions
diff --git a/po/en_GB.po b/po/en_GB.po index f95a35ed3..decb2b629 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: 2007-06-07 00:57+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+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,155 +15,145 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:143 +#: cmdline/apt-cache.cc:135 #, 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: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 +#: 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 #, c-format msgid "Unable to locate package %s" msgstr "Unable to locate package %s" -#: cmdline/apt-cache.cc:247 +#: cmdline/apt-cache.cc:232 msgid "Total package names : " msgstr "Total package names : " -#: cmdline/apt-cache.cc:287 +#: cmdline/apt-cache.cc:272 msgid " Normal packages: " msgstr " Normal packages: " -#: cmdline/apt-cache.cc:288 +#: cmdline/apt-cache.cc:273 msgid " Pure virtual packages: " msgstr " Pure virtual packages: " -#: cmdline/apt-cache.cc:289 +#: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " msgstr " Single virtual packages: " -#: cmdline/apt-cache.cc:290 +#: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " msgstr " Mixed virtual packages: " -#: cmdline/apt-cache.cc:291 +#: cmdline/apt-cache.cc:276 msgid " Missing: " msgstr " Missing: " -#: cmdline/apt-cache.cc:293 +#: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " msgstr "Total distinct versions: " -#: cmdline/apt-cache.cc:295 -#, fuzzy -msgid "Total Distinct Descriptions: " -msgstr "Total distinct versions: " - -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:280 msgid "Total dependencies: " msgstr "Total dependencies: " -#: cmdline/apt-cache.cc:300 +#: cmdline/apt-cache.cc:283 msgid "Total ver/file relations: " msgstr "Total ver/file relations: " -#: cmdline/apt-cache.cc:302 -#, fuzzy -msgid "Total Desc/File relations: " -msgstr "Total ver/file relations: " - -#: cmdline/apt-cache.cc:304 +#: cmdline/apt-cache.cc:285 msgid "Total Provides mappings: " msgstr "Total Provides mappings: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:297 msgid "Total globbed strings: " msgstr "Total globbed strings: " -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:311 msgid "Total dependency version space: " msgstr "Total dependency version space: " -#: cmdline/apt-cache.cc:335 +#: cmdline/apt-cache.cc:316 msgid "Total slack space: " msgstr "Total slack space: " -#: cmdline/apt-cache.cc:343 +#: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " msgstr "Total space accounted for: " -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "Package file %s is out of sync." -#: cmdline/apt-cache.cc:1293 +#: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" msgstr "You must give exactly one pattern" -#: cmdline/apt-cache.cc:1447 +#: cmdline/apt-cache.cc:1385 msgid "No packages found" msgstr "No packages found" -#: cmdline/apt-cache.cc:1524 +#: cmdline/apt-cache.cc:1462 msgid "Package files:" msgstr "Package files:" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 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:1532 +#: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1544 +#: cmdline/apt-cache.cc:1482 msgid "Pinned packages:" msgstr "Pinned packages:" -#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(not found)" #. Installed version -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1515 msgid " Installed: " msgstr " Installed: " -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1522 msgid " Candidate: " msgstr " Candidate: " -#: cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1532 msgid " Package pin: " msgstr " Package pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1603 +#: cmdline/apt-cache.cc:1541 msgid " Version table:" msgstr " Version table:" -#: cmdline/apt-cache.cc:1618 +#: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-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:2564 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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:1721 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -310,7 +300,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:819 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -649,79 +639,79 @@ msgstr "Problem unlinking %s" msgid "Failed to rename %s to %s" msgstr "Failed to rename %s to %s" -#: cmdline/apt-get.cc:121 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" -#: cmdline/apt-get.cc:238 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "The following packages have unmet dependencies." -#: cmdline/apt-get.cc:328 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "but %s is installed" -#: cmdline/apt-get.cc:330 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "but %s is to be installed" -#: cmdline/apt-get.cc:337 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "but it is not installable" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "but it is a virtual package" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "but it is not installed" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "but it is not going to be installed" -#: cmdline/apt-get.cc:347 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " or" -#: cmdline/apt-get.cc:376 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "The following NEW packages will be installed" -#: cmdline/apt-get.cc:402 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "The following packages will be REMOVED" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "The following packages have been kept back:" -#: cmdline/apt-get.cc:445 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "The following packages will be upgraded:" -#: cmdline/apt-get.cc:466 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "The following packages will be DOWNGRADED:" -#: cmdline/apt-get.cc:486 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "The following held packages will be changed:" -#: cmdline/apt-get.cc:539 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (due to %s) " -#: cmdline/apt-get.cc:547 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -729,143 +719,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:578 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu upgraded, %lu newly installed, " -#: cmdline/apt-get.cc:582 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalled, " -#: cmdline/apt-get.cc:584 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu downgraded, " -#: cmdline/apt-get.cc:586 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu to remove and %lu not upgraded.\n" -#: cmdline/apt-get.cc:590 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu not fully installed or removed.\n" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Correcting dependencies..." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " failed." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Unable to correct dependencies" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Unable to minimise the upgrade set" -#: cmdline/apt-get.cc:675 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr "Done" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:664 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:682 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Unmet dependencies. Try using -f." -#: cmdline/apt-get.cc:704 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNING: The following packages cannot be authenticated!" -#: cmdline/apt-get.cc:708 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "Authentication warning overridden.\n" -#: cmdline/apt-get.cc:715 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Install these packages without verification [y/N]? " -#: cmdline/apt-get.cc:717 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 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:770 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internal error, InstallPackages was called with broken packages!" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Packages need to be removed but remove is disabled." -#: cmdline/apt-get.cc:790 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: 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:831 +#: cmdline/apt-get.cc:816 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:836 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Need to get %sB/%sB of archives.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Need to get %sB of archives.\n" -#: cmdline/apt-get.cc:844 +#: cmdline/apt-get.cc:829 #, 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:847 +#: cmdline/apt-get.cc:832 #, 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:861 cmdline/apt-get.cc:2166 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:849 #, 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:879 cmdline/apt-get.cc:899 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 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:881 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -876,28 +866,28 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:904 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -905,47 +895,47 @@ msgstr "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" -#: cmdline/apt-get.cc:1005 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:1010 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Aborting install." -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1040 #, 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:1073 +#: cmdline/apt-get.cc:1058 #, 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:1084 +#: cmdline/apt-get.cc:1069 #, 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:1096 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Installed]" -#: cmdline/apt-get.cc:1101 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -956,49 +946,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:1125 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1128 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1148 +#: cmdline/apt-get.cc:1133 #, 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:1156 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1185 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1187 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1330 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1006,65 +996,25 @@ msgstr "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -#: 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:1736 -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 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1543 -#, fuzzy, c-format -msgid "Couldn't find task %s" -msgstr "Couldn't find package %s" - -#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1665 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1695 -#, fuzzy, c-format -msgid "%s set to manual installed.\n" -msgstr "but %s is to be installed" - -#: cmdline/apt-get.cc:1708 +#: cmdline/apt-get.cc:1546 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:1711 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1072,7 +1022,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1723 +#: cmdline/apt-get.cc:1561 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" @@ -1084,7 +1034,7 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1731 +#: cmdline/apt-get.cc:1569 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" @@ -1094,115 +1044,119 @@ msgstr "" "the package is simply not installable and a bug report against\n" "that package should be filed." -#: cmdline/apt-get.cc:1739 +#: 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 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1770 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1859 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1860 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1888 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1896 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:1894 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:2101 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:2145 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:1992 #, 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:2174 +#: cmdline/apt-get.cc:1997 #, 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:2177 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2214 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2242 +#: cmdline/apt-get.cc:2065 #, 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:2254 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2078 #, 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:2272 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2291 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2130 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:2335 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2355 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2407 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1211,7 +1165,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2459 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1220,31 +1174,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2494 +#: cmdline/apt-get.cc:2317 #, 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:2519 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2533 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2569 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2610 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1581,9 +1535,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:752 -#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 -#: apt-pkg/pkgcachegen.cc:949 +#: 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 msgid "Reading package lists" msgstr "Reading package lists" @@ -1717,12 +1671,11 @@ 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/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:150 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" @@ -1850,7 +1803,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" @@ -1984,76 +1937,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: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" @@ -2066,7 +2019,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:981 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selection %s not found" @@ -2263,106 +2216,87 @@ msgstr "Problem unlinking the file" msgid "Problem syncing the file" msgstr "Problem syncing the file" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" msgstr "Empty package cache" -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:132 msgid "The package cache file is corrupted" msgstr "The package cache file is corrupted" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:137 msgid "The package cache file is an incompatible version" msgstr "The package cache file is an incompatible version" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:142 #, 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:153 +#: apt-pkg/pkgcache.cc:147 msgid "The package cache was built for a different architecture" msgstr "The package cache was built for a different architecture" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:218 msgid "Depends" msgstr "Depends" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:218 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:218 msgid "Suggests" msgstr "Suggests" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:219 msgid "Recommends" msgstr "Recommends" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:219 msgid "Conflicts" msgstr "Conflicts" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:219 msgid "Replaces" msgstr "Replaces" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:220 msgid "Obsoletes" msgstr "Obsoletes" -#: apt-pkg/pkgcache.cc:226 -msgid "Breaks" -msgstr "" - -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:231 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:231 msgid "required" msgstr "required" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:231 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:232 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:232 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:99 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:128 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Dependency generation" -#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 -#, fuzzy -msgid "Reading state information" -msgstr "Merging available information" - -#: apt-pkg/depcache.cc:196 -#, fuzzy, c-format -msgid "Failed to open StateFile %s" -msgstr "Failed to open %s" - -#: apt-pkg/depcache.cc:202 -#, fuzzy, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Failed to write file ‘%s’" - #: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" @@ -2403,7 +2337,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:450 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." @@ -2423,7 +2357,7 @@ msgstr "Type ‘%s’ is not known on line %u in source list %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Malformed line %u in source list %s (vendor id)" -#: apt-pkg/packagemanager.cc:403 +#: apt-pkg/packagemanager.cc:402 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2439,14 +2373,14 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" -#: apt-pkg/algorithms.cc:248 +#: apt-pkg/algorithms.cc:241 #, 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:1104 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2454,7 +2388,7 @@ msgstr "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -#: apt-pkg/algorithms.cc:1106 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Unable to correct problems, you have held broken packages." @@ -2490,18 +2424,18 @@ msgstr "The method driver %s could not be found." msgid "Method %s did not start correctly" msgstr "Method %s did not start correctly" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, 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:125 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:141 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" @@ -2535,115 +2469,99 @@ 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:76 +#: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" msgstr "Cache has an incompatible versioning system" -#: apt-pkg/pkgcachegen.cc:119 +#: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Error occurred while processing %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:134 +#: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Error occurred while processing %s (UsePackage1)" -#: 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 +#: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Error occurred while processing %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Error occurred while processing %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:217 +#: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Error occurred while processing %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:221 +#: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Error occurred while processing %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:225 +#: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Error occurred while processing %s (NewVersion2)" -#: 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 +#: apt-pkg/pkgcachegen.cc:207 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:258 +#: apt-pkg/pkgcachegen.cc:210 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: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 +#: apt-pkg/pkgcachegen.cc:213 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:292 +#: apt-pkg/pkgcachegen.cc:241 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Error occurred while processing %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:305 +#: apt-pkg/pkgcachegen.cc:254 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Error occurred while processing %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:311 +#: apt-pkg/pkgcachegen.cc:260 #, 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:682 +#: apt-pkg/pkgcachegen.cc:574 #, c-format msgid "Couldn't stat source package list %s" msgstr "Couldn't stat source package list %s" -#: apt-pkg/pkgcachegen.cc:767 +#: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:405 apt-pkg/acquire-item.cc:662 -#: apt-pkg/acquire-item.cc:1412 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:1107 +#: apt-pkg/acquire-item.cc:647 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:1220 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2652,7 +2570,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:1279 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2661,14 +2579,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:1315 +#: apt-pkg/acquire-item.cc:855 #, 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:1402 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Size mismatch" @@ -2677,7 +2595,7 @@ msgstr "Size mismatch" msgid "Vendor block %s contains no fingerprint" msgstr "Vendor block %s contains no fingerprint" -#: apt-pkg/cdrom.cc:531 +#: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2686,54 +2604,52 @@ msgstr "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" -#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 +#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identifying.. " -#: apt-pkg/cdrom.cc:565 +#: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Stored label: %s \n" -#: apt-pkg/cdrom.cc:585 +#: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Using CD-ROM mount point %s\n" -#: apt-pkg/cdrom.cc:603 +#: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Unmounting CD-ROM\n" -#: apt-pkg/cdrom.cc:607 +#: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Waiting for disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Mounting CD-ROM...\n" -#: apt-pkg/cdrom.cc:633 +#: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Scanning disc for index files..\n" -#: apt-pkg/cdrom.cc:673 -#, fuzzy, c-format -msgid "" -"Found %i package indexes, %i source indexes, %i translation indexes and %i " -"signatures\n" +#: apt-pkg/cdrom.cc:647 +#, c-format +msgid "Found %i package indexes, %i source 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:683 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Stored label: %s \n" -#: apt-pkg/cdrom.cc:739 +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "That is not a valid name, try again.\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2742,39 +2658,39 @@ msgstr "" "This disc is called: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:759 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Copying package lists..." -#: apt-pkg/cdrom.cc:785 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Writing new source list\n" -#: apt-pkg/cdrom.cc:794 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Source list entries for this disc are:\n" -#: apt-pkg/cdrom.cc:836 +#: apt-pkg/cdrom.cc:807 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Unmounting CD-ROM..." -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 +#: apt-pkg/indexcopy.cc:261 #, c-format msgid "Wrote %i records.\n" msgstr "Wrote %i records.\n" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 +#: apt-pkg/indexcopy.cc:263 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Wrote %i records with %i missing files.\n" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 +#: apt-pkg/indexcopy.cc:266 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Wrote %i records with %i mismatched files\n" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 +#: apt-pkg/indexcopy.cc:269 #, 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" @@ -2833,6 +2749,5 @@ msgstr "Completely removed %s" msgid "Connection closed prematurely" msgstr "Connection closed prematurely" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Could not patch file" +#~ msgid "Could not patch file" +#~ msgstr "Could not patch file" |