diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2009-07-15 16:45:49 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2009-07-15 16:45:49 +0200 |
| commit | ef1dff93202fa61e0b8cda761906bbca31e217bc (patch) | |
| tree | 860a9c6462a2ea9ef09c01de9a10ee19a4944c78 | |
| parent | 13eb93fcb6a03afd8fc05fa2b4c60046473e8507 (diff) | |
| parent | 6e7c6c3f58193fd5db3d9d598ac65a1571522a58 (diff) | |
merge with lp:~mvo/apt/debian-sid
| -rw-r--r-- | apt-pkg/cachefile.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/policy.cc | 51 | ||||
| -rw-r--r-- | apt-pkg/policy.h | 1 | ||||
| -rw-r--r-- | cmdline/apt-cache.cc | 4 | ||||
| -rw-r--r-- | debian/apt.cron.daily | 7 | ||||
| -rw-r--r-- | debian/apt.dirs | 1 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | doc/examples/configure-index | 8 | ||||
| -rw-r--r-- | po/ast.po | 449 | ||||
| -rw-r--r-- | po/de.po | 388 | ||||
| -rw-r--r-- | po/fr.po | 463 |
13 files changed, 775 insertions, 615 deletions
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index f287a244c..0b1efb9ff 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -91,7 +91,7 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock) Policy = new pkgPolicy(Cache); if (_error->PendingError() == true) return false; - if (ReadPinFile(*Policy) == false) + if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false) return false; // Create the dependency cache diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 338bef66c..4abfb726f 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -67,6 +67,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Etc::main","apt.conf"); Cnf.Set("Dir::Etc::parts","apt.conf.d"); Cnf.Set("Dir::Etc::preferences","preferences"); + Cnf.Set("Dir::Etc::preferencesparts","preferences.d"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); // State diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index e33d563a1..26d1c17bd 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -32,6 +32,9 @@ #include <apti18n.h> +#include <dirent.h> +#include <sys/stat.h> +#include <algorithm> #include <iostream> #include <sstream> /*}}}*/ @@ -262,6 +265,52 @@ class PreferenceSection : public pkgTagSection } }; /*}}}*/ +// ReadPinDir - Load the pin files from this dir into a Policy /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool ReadPinDir(pkgPolicy &Plcy,string Dir) +{ + if (Dir.empty() == true) + Dir = _config->FindDir("Dir::Etc::PreferencesParts"); + + DIR *D = opendir(Dir.c_str()); + if (D == 0) + return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); + + vector<string> List; + + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) + { + if (Ent->d_name[0] == '.') + continue; + + // Skip bad file names ala run-parts + const char *C = Ent->d_name; + for (; *C != 0; C++) + if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-') + break; + if (*C != 0) + continue; + + // Make sure it is a file and not something else + string File = flCombine(Dir,Ent->d_name); + struct stat St; + if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) + continue; + + List.push_back(File); + } + closedir(D); + + sort(List.begin(),List.end()); + + // Read the files + for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++) + if (ReadPinFile(Plcy, *I) == false) + return false; + return true; +} + /*}}}*/ // ReadPinFile - Load the pin file into a Policy /*{{{*/ // --------------------------------------------------------------------- /* I'd like to see the preferences file store more than just pin information @@ -286,7 +335,7 @@ bool ReadPinFile(pkgPolicy &Plcy,string File) { string Name = Tags.FindS("Package"); if (Name.empty() == true) - return _error->Error(_("Invalid record in the preferences file, no Package header")); + return _error->Error(_("Invalid record in the preferences file %s, no Package header"), File.c_str()); if (Name == "*") Name = string(); diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index d5f3b2f75..4894682fa 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -84,5 +84,6 @@ class pkgPolicy : public pkgDepCache::Policy }; bool ReadPinFile(pkgPolicy &Plcy,string File = ""); +bool ReadPinDir(pkgPolicy &Plcy,string Dir = ""); #endif diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 93558fa88..57da9426f 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -401,7 +401,7 @@ bool DumpAvail(CommandLine &Cmd) pkgCache &Cache = *GCache; pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false) + if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false) return false; unsigned long Count = Cache.HeaderP->PackageCount+1; @@ -1511,7 +1511,7 @@ bool Policy(CommandLine &CmdL) pkgCache &Cache = *GCache; pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false) + if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false) return false; // Print out all of the package files diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 5c5ca88c7..b40bb2c30 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -76,6 +76,13 @@ check_stamp() #echo "stampfile: $1" #echo "interval=$interval, now=$now, stamp=$stamp, delta=$delta" + # remove timestamps a day (or more) in the future and force re-check + if [ $stamp -gt $(($now+86400)) ]; then + echo "WARNING: file $stamp_file has a timestamp in the future: $stamp" + rm -f "$stamp_file" + return 0 + fi + if [ $delta -ge $interval ]; then return 0 fi diff --git a/debian/apt.dirs b/debian/apt.dirs index 47f60e7e3..fb6716c35 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -3,6 +3,7 @@ usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt etc/apt/apt.conf.d +etc/apt/preferences.d etc/apt/sources.list.d etc/logrotate.d var/cache/apt/archives/partial diff --git a/debian/changelog b/debian/changelog index aba5e4cf4..786b8a86f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,9 +13,10 @@ apt (0.7.22) UNRELEASED; urgency=low - fr.po - it.po. Closes: #531758 - ca.po. Closes: #531921 + - de.po. Closes: #536430 * Added translations - ast.po (Asturian by Marcos Alvareez Costales). - Closes: #529007, #529730 + Closes: #529007, #529730, #535328 [ David Kalnischkies ] * [ABI break] support '#' in apt.conf and /etc/apt/preferences @@ -41,13 +42,19 @@ apt (0.7.22) UNRELEASED; urgency=low [ Michael Vogt ] * honor the dpkg hold state in new Marker hooks (closes: #64141) - + * debian/apt.cron.daily: + - if the timestamp is too far in the future, delete it + [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in ReadConfigFile. * Introduce support for the Enhances field. (Closes: #137583) + * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512) + * configure-index: document Dir::Etc::SourceParts and some other options + (Closes: #459605) + * Remove Eugene V. Lyubimkin from uploaders as requested. - -- Christian Perrier <bubulle@debian.org> Wed, 22 Apr 2009 10:13:54 +0200 + -- Julian Andres Klode <jak@debian.org> Fri, 03 Jul 2009 08:27:35 +0200 apt (0.7.21) unstable; urgency=low diff --git a/debian/control b/debian/control index 8f5d6ff75..84c411509 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, - Luca Bruno <lethalman88@gmail.com>, Eugene V. Lyubimkin <jackyf.devel@gmail.com> + Luca Bruno <lethalman88@gmail.com> Standards-Version: 3.8.1.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ diff --git a/doc/examples/configure-index b/doc/examples/configure-index index ce56f1563..2045ca1f3 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -220,10 +220,14 @@ Dir "/" // Config files Etc "etc/apt/" { - SourceList "sources.list"; Main "apt.conf"; - Preferences "preferences"; Parts "apt.conf.d/"; + Preferences "preferences"; + PreferencesParts "preferences.d"; + SourceList "sources.list"; + SourceParts "sources.list.d"; + VendorList "vendors.list"; + VendorParts "vendors.list.d"; }; // Locations of binaries @@ -2,9 +2,10 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2009-05-21 09:37+0100\n" -"Last-Translator: Marcos <marcos.alvarez.costales@gmail.com>\n" +"POT-Creation-Date: 2009-06-30 14:09+0200\n" +"PO-Revision-Date: 2009-07-01 18:09+0100\n" +"Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail." +"com>\n" "Language-Team: Asturian <alministradores@softastur.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -152,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compiláu en %s %s\n" @@ -647,79 +648,79 @@ msgstr "Problema al desenllazar %s" msgid "Failed to rename %s to %s" msgstr "Nun pudo renomase %s como %s" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:353 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -727,143 +728,143 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "ĄEsto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:596 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:670 msgid "Correcting dependencies..." msgstr "Iguando dependencies..." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:673 msgid " failed." msgstr " falló." -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:676 msgid "Unable to correct dependencies" msgstr "Nun pudieron iguase les dependencies" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:679 msgid "Unable to minimize the upgrade set" msgstr "Nun pue amenorgase'l conxuntu d'actualización" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:681 msgid " Done" msgstr " Fecho" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:685 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Habríes d'executar `apt-get -f install' para igualo." -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:688 msgid "Unmet dependencies. Try using -f." msgstr "Dependencies incumplíes. Téntalo usando -f." -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:710 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISU: ĄNun pudieron autenticase los siguientes paquetes!" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:714 msgid "Authentication warning overridden.\n" msgstr "Avisu d'autenticación saltáu.\n" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:721 msgid "Install these packages without verification [y/N]? " msgstr "żInstalar esos paquetes ensin verificación [s/N]? " -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:723 msgid "Some packages could not be authenticated" msgstr "Dellos paquetes nun pudieron autenticase" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884 msgid "There are problems and -y was used without --force-yes" msgstr "Hai problemes y utilizose -y ensin --force-yes" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:776 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error internu, ĄInstallPackages llamose con paquetes frańaos!" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:785 msgid "Packages need to be removed but remove is disabled." msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu." -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:796 msgid "Internal error, Ordering didn't finish" msgstr "Error internu, ordenar nun finó" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 +#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nun pudo lleese la llista de fontes." -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:837 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Que raro.. Los tamańos nun concasen, escribe a apt@packages.debian.org" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Hai que descargar %sB/%sB d'archivos.\n" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:845 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Hai que descargar %sB d'archivos.\n" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:850 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:853 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s." msgstr "Nun tienes espaciu libre bastante en %s." -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Conseńose Trivial Only pero ésta nun ye una operación trivial." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:892 msgid "Yes, do as I say!" msgstr "Sí, Ąfacer lo que digo!" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:894 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -874,28 +875,28 @@ msgstr "" "Pa continuar escribe la frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919 msgid "Abort." msgstr "Encaboxar." -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:915 msgid "Do you want to continue [Y/n]? " msgstr "żQuies continuar [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1400 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1005 msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1012 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -903,47 +904,47 @@ msgstr "" "Nun pudieron algamase dellos archivos, żseique executando apt-get update o " "tentando --fix-missing?" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1016 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1021 msgid "Unable to correct missing packages." msgstr "Nun pudieron iguase los paquetes que falten." -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1022 msgid "Aborting install." msgstr "Encaboxando la instalación." -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1056 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, escoyendo %s nel llugar de %s\n" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s ye un paquete virtual ufríu por:\n" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1107 msgid " [Installed]" msgstr " [Instaláu]" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1112 msgid "You should explicitly select one to install." msgstr "Has d'escoyer esplícitamente unu pa instalar." -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1117 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -954,53 +955,58 @@ msgstr "" "Esto puede significar que falta el paquete, ta arrumbáu, o sólo\n" "ta disponible dende otra fonte\n" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1136 msgid "However the following packages replace it:" msgstr "Sicasí, los siguientes paquetes reemplacenlu:" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1139 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s nun tien candidatu pa instalación" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1159 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1167 #, c-format msgid "%s is already the newest version.\n" msgstr "%s yá ta na versión más nueva.\n" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1196 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nun s'alcontró la distribución '%s' pa '%s'" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1198 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nun s'alcontró la versión '%s' pa '%s'" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1204 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Escoyida la versión %s (%s) pa %s\n" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1310 +#, c-format +msgid "No source package '%s' picking '%s' instead\n" +msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' ehí\n" + +#: cmdline/apt-get.cc:1348 msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1361 msgid "Unable to lock the list directory" msgstr "Nun pudo bloquiase'l direutoriu de llista" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" -#: cmdline/apt-get.cc:1435 +#: cmdline/apt-get.cc:1445 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1008,11 +1014,11 @@ msgstr "" "Los siguientes paquetes instalaronse de manera automática y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1447 msgid "Use 'apt-get autoremove' to remove them." msgstr "Usa 'apt-get autoremove' pa desinstalalos." -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1452 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1030,43 +1036,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información pue aidar a resolver la situación:" -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1459 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error internu, AutoRemover rompió coses" -#: cmdline/apt-get.cc:1468 +#: cmdline/apt-get.cc:1478 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error internu, AllUpgrade rompió coses" -#: cmdline/apt-get.cc:1523 +#: cmdline/apt-get.cc:1533 #, c-format msgid "Couldn't find task %s" msgstr "Nun pudo alcontrase la tarea %s" -#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:1661 +#: cmdline/apt-get.cc:1671 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escoyendo %s pa la espresión regular '%s'\n" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1702 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustáu como instaláu manualmente.\n" -#: cmdline/apt-get.cc:1705 +#: cmdline/apt-get.cc:1715 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Habríes d'executar `apt-get -f install' para iguar estos:" -#: cmdline/apt-get.cc:1708 +#: cmdline/apt-get.cc:1718 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1074,7 +1080,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "conseńa una solución)." -#: cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:1730 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" @@ -1086,117 +1092,117 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1748 msgid "Broken packages" msgstr "Paquetes frańaos" -#: cmdline/apt-get.cc:1767 +#: cmdline/apt-get.cc:1777 msgid "The following extra packages will be installed:" msgstr "Instalaránse los siguientes paquetes extra:" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1866 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: cmdline/apt-get.cc:1857 +#: cmdline/apt-get.cc:1867 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1896 msgid "Calculating upgrade... " msgstr "Calculando l'autualización... " -#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:1904 msgid "Done" msgstr "Fecho" -#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes frańó coses" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2079 msgid "Must specify at least one package to fetch source for" msgstr "Has de conseńar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 +#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2186 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" -#: cmdline/apt-get.cc:2181 +#: cmdline/apt-get.cc:2192 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2195 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2201 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2232 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2260 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n" -#: cmdline/apt-get.cc:2261 +#: cmdline/apt-get.cc:2272 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2273 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: cmdline/apt-get.cc:2279 +#: cmdline/apt-get.cc:2290 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2309 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:2314 +#: cmdline/apt-get.cc:2325 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que conseńar polo menos un paquete pa verificar les dependencies de " "construcción" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2353 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase información de dependencies de construcción pa %s" -#: cmdline/apt-get.cc:2362 +#: cmdline/apt-get.cc:2373 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:2414 +#: cmdline/apt-get.cc:2425 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1205,7 +1211,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:2467 +#: cmdline/apt-get.cc:2478 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1214,32 +1220,32 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versión " "disponible del paquete %s satisfaz los requisitos de versión" -#: cmdline/apt-get.cc:2503 +#: cmdline/apt-get.cc:2514 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye " "demasiao nuevu" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2541 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2555 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construcción de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:2546 +#: cmdline/apt-get.cc:2559 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:2591 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1255,7 +1261,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove and purge packages\n" +" purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1292,8 +1298,8 @@ msgstr "" "\n" "Comandos:\n" " update - Algamar nueva llista de paquetes\n" -" upgrade - Facer una actualización\n" -" install - Instalar nuevos paquetes (pkg ye libc6 no libc6.deb)\n" +" upgrade - Facer una anovación\n" +" install - Instalar nuevos paquetes (pkg ye libc6 non libc6.deb)\n" " remove - Desaniciar paquetes\n" " autoremove - Desaniciar automáticamente tolos paquetes non usaos\n" " purge - Quitar y desaniciar paquetes\n" @@ -1310,7 +1316,7 @@ msgstr "" " -q Salida Log - ensín indicación de progresu\n" " -qq Ensín salida excepto pa fallos\n" " -d Baxar sólo - NON instalar o desempaquetar los archivos\n" -" -s No aición. Facer una simulación ordenada\n" +" -s Non aición. Facer una simulación ordenada\n" " -y Asumir Yes pa toles entruges y nun visualizar la petición\n" " -f Intentar correxir un sistema con dependencies frayaes\n" " -m Intentar siguir si los archivos nun tan disponibles\n" @@ -1325,6 +1331,19 @@ msgstr "" "pa más información y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" +#: cmdline/apt-get.cc:2799 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" +"NOTA: ĄEsto sólo ye una simulación!\n" +" apt-get necesita privilexos de root pa la execución real.\n" +" ĄTen tamién en cuenta que'l bloquéu ta desactiváu,\n" +" asina que nun dependen de la pertinencia de la verdadera situación " +"actual!" + #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "Oxe " @@ -1557,7 +1576,7 @@ msgstr "Sobreescribiendo concordancia del paquete ensin versión pa %s" msgid "File %s/%s overwrites the one in the package %s" msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format @@ -1858,7 +1877,7 @@ msgstr "Gandió'l tiempu de conexón col zócalu de datos" msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexón" -#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" @@ -1942,40 +1961,40 @@ msgstr "Daqué raru pasó resolviendo '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Nun se pudo coneutar a %s %s:" -#: methods/gpgv.cc:65 +#: methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Nun se pudo acceder al aniellu de claves '%s'" -#: methods/gpgv.cc:101 +#: methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando." -#: methods/gpgv.cc:205 +#: methods/gpgv.cc:223 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so güella dixital?!" -#: methods/gpgv.cc:210 +#: methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." msgstr "Atopóse polo menos una robla mala." -#: methods/gpgv.cc:214 +#: methods/gpgv.cc:232 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Nun se pudo executar '%s' pa verificar la robla (żta instaláu gpgv?)" -#: methods/gpgv.cc:219 +#: methods/gpgv.cc:237 msgid "Unknown error executing gpgv" msgstr "Fallu desconocíu al executar gpgv" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:271 methods/gpgv.cc:278 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:257 +#: methods/gpgv.cc:285 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1993,80 +2012,80 @@ msgstr "Nun se pudo abrir una tubería pa %s" msgid "Read error from %s process" msgstr "Fallu de llectura dende'l procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:379 msgid "Waiting for headers" msgstr "Esperando les testeres" -#: methods/http.cc:523 +#: methods/http.cc:525 #, c-format msgid "Got a single header line over %u chars" msgstr "Obtúvose una sola llinia de testera penriba de %u carauteres" -#: methods/http.cc:531 +#: methods/http.cc:533 msgid "Bad header line" msgstr "Fallu na llinia testera" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:552 methods/http.cc:559 msgid "The HTTP server sent an invalid reply header" msgstr "El sirvidor HTTP mandó una testera incorreuta de rempuesta" -#: methods/http.cc:586 +#: methods/http.cc:588 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:605 msgid "This HTTP server has broken range support" msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" -#: methods/http.cc:627 +#: methods/http.cc:629 msgid "Unknown date format" msgstr "Formatu de data desconocíu" -#: methods/http.cc:774 +#: methods/http.cc:782 msgid "Select failed" msgstr "Falló la escoyeta" -#: methods/http.cc:779 +#: methods/http.cc:787 msgid "Connection timed out" msgstr "Gandió'l tiempu de conexón" -#: methods/http.cc:802 +#: methods/http.cc:810 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:833 +#: methods/http.cc:841 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:861 +#: methods/http.cc:869 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:875 +#: methods/http.cc:883 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón." -#: methods/http.cc:877 +#: methods/http.cc:885 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "Falló al francer el ficheru" -#: methods/http.cc:1105 +#: methods/http.cc:1141 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/http.cc:1122 methods/http.cc:1177 +#: methods/http.cc:1158 methods/http.cc:1213 msgid "Connection failed" msgstr "Fallo la conexón" -#: methods/http.cc:1229 +#: methods/http.cc:1305 msgid "Internal error" msgstr "Fallu internu" @@ -2088,7 +2107,31 @@ msgstr "" "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamańu de APT::Cache-" "Limit. El valor actual ye : %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/strutl.cc:1014 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:335 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:342 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:349 +#, c-format +msgid "%limin %lis" +msgstr "%limin %lis" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:354 +#, c-format +msgid "%lis" +msgstr "%lis" + +#: apt-pkg/contrib/strutl.cc:1029 #, c-format msgid "Selection %s not found" msgstr "Escoyeta %s que nun s'atopa" @@ -2103,43 +2146,43 @@ msgstr "Triba d'abreviatura que nun se reconoz: «%c»" msgid "Opening configuration file %s" msgstr "Abriendo ficheros de configuración %s" -#: apt-pkg/contrib/configuration.cc:662 +#: apt-pkg/contrib/configuration.cc:663 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque." -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Fallu de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:699 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempués del valor" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:739 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Les directives pueden facese sólo nel nivel cimeru" -#: apt-pkg/contrib/configuration.cc:745 +#: apt-pkg/contrib/configuration.cc:746 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones ańeraes" -#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí" -#: apt-pkg/contrib/configuration.cc:758 +#: apt-pkg/contrib/configuration.cc:759 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada" -#: apt-pkg/contrib/configuration.cc:809 +#: apt-pkg/contrib/configuration.cc:810 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru" @@ -2282,101 +2325,105 @@ msgstr "Hai problemes desvenceyando'l ficheru %s" msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" msgstr "Caché de paquetes balera." -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:139 msgid "The package cache file is corrupted" msgstr "El ficheru de caché de paquetes ta tollíu" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:144 msgid "The package cache file is an incompatible version" msgstr "El ficheru de caché de paquetes ye una versión incompatible" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Esti APT nun soporta'l sistema de versiones '%s'" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" msgstr "La caché de paquetes creóse pa una arquitectura estremada" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Depends" msgstr "Depende de" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "PreDepends" msgstr "Predepende de" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Suggests" msgstr "Suxer" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Conflicts" msgstr "En conflictu con" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Replaces" msgstr "Sustituye a" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Obsoletes" msgstr "Fai obsoletu a" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Breaks" msgstr "Ruempe" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:227 +msgid "Enhances" +msgstr "Aumenta" + +#: apt-pkg/pkgcache.cc:238 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "required" msgstr "requeríu" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 msgid "Building dependency tree" msgstr "Creando árbol de dependencies" -#: apt-pkg/depcache.cc:122 +#: apt-pkg/depcache.cc:124 msgid "Candidate versions" msgstr "Versiones candidates" -#: apt-pkg/depcache.cc:151 +#: apt-pkg/depcache.cc:153 msgid "Dependency generation" msgstr "Xeneración de dependencies" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" msgstr "Lleendo información d'estáu" -#: apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:221 #, c-format msgid "Failed to open StateFile %s" msgstr "Nun se pudo abrir el ficheru d'estáu %s" -#: apt-pkg/depcache.cc:225 +#: apt-pkg/depcache.cc:227 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Falló la escritura del ficheru temporal d'estáu %s" @@ -2464,7 +2511,7 @@ msgid "" msgstr "" "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." -#: apt-pkg/algorithms.cc:1107 +#: apt-pkg/algorithms.cc:1147 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2472,11 +2519,11 @@ msgstr "" "Error, pkgProblemResolver::Resolve xeneró frańaures, esto puede ser pola mor " "de paquetes reteníos." -#: apt-pkg/algorithms.cc:1109 +#: apt-pkg/algorithms.cc:1149 msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frańaos retenidos." -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 +#: apt-pkg/algorithms.cc:1426 apt-pkg/algorithms.cc:1428 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2516,7 +2563,7 @@ msgstr "Nun pudo alncontrase'l controlador de métodu %s." msgid "Method %s did not start correctly" msgstr "El métodu %s nun entamó correchamente" -#: apt-pkg/acquire-worker.cc:399 +#: apt-pkg/acquire-worker.cc:413 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro." @@ -2548,17 +2595,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Has d'executar apt-get update pa iguar estos problemes" -#: apt-pkg/policy.cc:267 +#: apt-pkg/policy.cc:281 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Rexistru inválidu nel ficheru de preferencies, nun hai cabecera Paquete" -#: apt-pkg/policy.cc:289 +#: apt-pkg/policy.cc:303 #, c-format msgid "Did not understand pin type %s" msgstr "Nun s'entiende'l tipu de pin %s" -#: apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:311 msgid "No priority (or zero) specified for pin" msgstr "Nun hai prioridá (o ye cero) conseńada pa pin" @@ -2884,12 +2931,16 @@ msgstr "Preparándose pa desinstalar dafechu %s" msgid "Completely removed %s" msgstr "Desinstalóse dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:791 +#: apt-pkg/deb/dpkgpm.cc:789 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nun puede escribise nel rexistru, falló openpty() (ż/dev/pts nun ta " "montáu?)\n" +#: apt-pkg/deb/debsystem.cc:100 +msgid "Not locked" +msgstr "Non bloquiáu" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Nun fui quien a parchiar el ficheru" @@ -1,21 +1,23 @@ # German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. -# Holger Wansing <linux@wansing-online.de>, 2008. +# Holger Wansing <linux@wansing-online.de>, 2008, 2009. # Jens Seidel <jensseidel@users.sf.net>, 2008. # Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2006. # RĂŒdiger Kuhlmann <Uebersetzung@ruediger-kuhlmann.de>, 2002. # +# msgid "" msgstr "" -"Project-Id-Version: apt 0.7.14\n" +"Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2008-11-13 21:31+0100\n" +"POT-Creation-Date: 2009-06-30 14:09+0200\n" +"PO-Revision-Date: 2009-07-12 01:12+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" -"Language-Team: <debian-l10n-german@lists.debian.org>\n" +"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);>\n" #: cmdline/apt-cache.cc:143 #, c-format @@ -158,7 +160,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s fĂŒr %s, kompiliert am %s %s\n" @@ -201,7 +203,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"Aufruf: apt-cache [Optionen] Befehl\n" +"Aufruf: apt-cache [Optionen] befehl\n" " apt-cache [Optionen] add datei1 [datei2 ...]\n" " apt-cache [Optionen] showpkg paket1 [paket2 ...]\n" " apt-cache [Optionen] showsrc paket1 [paket2 ...]\n" @@ -663,79 +665,79 @@ msgstr "Problem beim Unlinking von %s" msgid "Failed to rename %s to %s" msgstr "Konnte %s nicht in %s umbenennen" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulĂ€ren Ausdrucks â %s" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben nicht erfĂŒllte AbhĂ€ngigkeiten:" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:353 msgid " or" msgstr " oder" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurĂŒckgehalten worden:" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert:" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "Die folgenden Pakete werden DEAKTUALISIERT:" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "Die folgenden gehaltenen Pakete werden verĂ€ndert:" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -743,145 +745,145 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, auĂer Sie wissen genau, was Sie tun!" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "%lu deaktualisiert, " -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:596 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollstĂ€ndig installiert oder entfernt.\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:670 msgid "Correcting dependencies..." msgstr "AbhĂ€ngigkeiten werden korrigiert..." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:673 msgid " failed." msgstr " fehlgeschlagen." -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:676 msgid "Unable to correct dependencies" msgstr "Kann AbhĂ€ngigkeiten nicht korrigieren" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:679 msgid "Unable to minimize the upgrade set" msgstr "Kann die Menge zu aktualisierender Pakete nicht minimieren" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:681 msgid " Done" msgstr " Fertig" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:685 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:688 msgid "Unmet dependencies. Try using -f." msgstr "Nicht erfĂŒllte AbhĂ€ngigkeiten. Versuchen Sie, -f zu benutzen." -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:710 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:714 msgid "Authentication warning overridden.\n" msgstr "Authentifizierungswarnung ĂŒberstimmt.\n" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:721 msgid "Install these packages without verification [y/N]? " msgstr "Diese Pakete ohne ĂberprĂŒfung installieren [j/N]? " -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:723 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:776 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:785 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete mĂŒssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:796 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036 msgid "Unable to lock the download directory" msgstr "Kann das Downloadverzeichnis nicht sperren." -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:837 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwĂŒrdig ... die GröĂen haben nicht ĂŒbereingestimmt; schreiben Sie an " "apt@packages.debian.org" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es mĂŒssen noch %sB von %sB an Archiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:845 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es mĂŒssen %sB an Archiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:850 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz zusĂ€tzlich benutzt.\n" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:853 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:892 msgid "Yes, do as I say!" msgstr "Ja, tue was ich sage!" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:894 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -892,28 +894,28 @@ msgstr "" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:915 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1400 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1005 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1012 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -921,48 +923,48 @@ msgstr "" "Konnte einige Archive nicht herunterladen; vielleicht »apt-get update« " "ausfĂŒhren oder mit »--fix-missing« probieren?" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1016 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstĂŒtzt" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1021 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1022 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1056 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Hinweis: wĂ€hle %s an Stelle von %s\n" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Ăberspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1107 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1112 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswĂ€hlen." -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1117 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -973,60 +975,60 @@ msgstr "" "Paket referenziert. Das kann heiĂen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfĂŒgbar ist.\n" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1136 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1139 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1159 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Erneute Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1167 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1196 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release »%s« fĂŒr »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1198 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« fĂŒr »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1204 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "GewĂ€hlte Version %s (%s) fĂŒr %s\n" -#: cmdline/apt-get.cc:1307 +#: cmdline/apt-get.cc:1310 #, c-format msgid "No source package '%s' picking '%s' instead\n" -msgstr "" +msgstr "Kein Quellpaket »%s«, wĂ€hle stattdessen »%s«\n" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1348 msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1361 msgid "Unable to lock the list directory" msgstr "Kann das Listenverzeichnis nicht sperren" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1413 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Es soll nichts gelöscht werden, kann AutoRemover nicht starten" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1445 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1034,11 +1036,11 @@ msgstr "" "Die folgenden Pakete wurden automatisch installiert und werden nicht lĂ€nger " "benötigt:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 msgid "Use 'apt-get autoremove' to remove them." msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1452 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1057,44 +1059,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1459 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1478 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1533 #, c-format msgid "Couldn't find task %s" msgstr "Konnte Task %s nicht finden" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1671 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Hinweis: wĂ€hle %s fĂŒr regulĂ€ren Ausdruck »%s«\n" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1702 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1715 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1718 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1102,7 +1104,7 @@ msgstr "" "Nicht erfĂŒllte AbhĂ€ngigkeiten. Versuchen Sie »apt-get -f install« ohne " "jegliche Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1730 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" @@ -1114,120 +1116,120 @@ msgstr "" "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" "erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1748 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1777 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusĂ€tzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1866 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1867 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1896 msgid "Calculating upgrade... " msgstr "Berechne Upgrade (Paketaktualisierung) ..." -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1904 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2079 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket fĂŒr %s nicht finden" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ăberspringe schon heruntergeladene Datei »%s«\n" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2186 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2192 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es mĂŒssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2195 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es mĂŒssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2201 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2232 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2260 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ăberspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2272 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2273 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ĂberprĂŒfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2290 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2309 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2325 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Bau-AbhĂ€ngigkeiten\n" "ĂŒberprĂŒft werden sollen." -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2353 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bau-AbhĂ€ngigkeiten fĂŒr %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2373 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bau-AbhĂ€ngigkeiten.\n" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2425 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1236,7 +1238,7 @@ msgstr "" "%s-AbhĂ€ngigkeit fĂŒr %s kann nicht erfĂŒllt werden, da Paket %s nicht gefunden " "werden kann." -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2478 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1245,33 +1247,32 @@ msgstr "" "%s-AbhĂ€ngigkeit fĂŒr %s kann nicht erfĂŒllt werden, da keine verfĂŒgbare " "Version von Paket %s die Versionsanforderungen erfĂŒllen kann." -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2514 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-AbhĂ€ngigkeit fĂŒr %s nicht erfĂŒllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2541 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-AbhĂ€ngigkeit fĂŒr %s nicht erfĂŒllen: %s" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2555 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bau-AbhĂ€ngigkeiten fĂŒr %s konnten nicht erfĂŒllt werden." -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2559 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bau-AbhĂ€ngigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2591 msgid "Supported modules:" msgstr "UnterstĂŒtzte Module:" -#: cmdline/apt-get.cc:2628 -#, fuzzy +#: cmdline/apt-get.cc:2632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1330,7 +1331,7 @@ msgstr "" " remove â Pakete entfernen\n" " autoremove â alle nicht mehr verwendeten Pakete automatisch " "entfernen\n" -" purge â entferne Pakete restlos\n" +" purge â entferne Pakete restlos (inkl. Konfigurationsdateien)\n" " source â Quellarchive herunterladen\n" " build-dep â die Bau-AbhĂ€ngigkeiten fĂŒr Quellpakete konfigurieren\n" " dist-upgrade â spezielles Upgrade (Paketaktualisierung) fĂŒr die " @@ -1362,6 +1363,19 @@ msgstr "" "weitergehende Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-KrĂ€fte.\n" +#: cmdline/apt-get.cc:2799 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" +"HINWEIS: Dies ist nur eine Simulation!\n" +" apt-get benötigt root-Privilegien fĂŒr die reale AusfĂŒhrung.\n" +" Behalten Sie ebenfalls in Hinterkopf, dass die Sperren deaktiviert\n" +" sind, verlassen Sie sich also bezĂŒglich des realen aktuellen\n" +" Status' der Sperre nicht darauf!" + #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "OK " @@ -1597,7 +1611,7 @@ msgstr "Ăberschreibe Paket-Treffer ohne Version fĂŒr %s" msgid "File %s/%s overwrites the one in the package %s" msgstr "Datei %s/%s ĂŒberschreibt die Datei in Paket %s" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format @@ -2135,32 +2149,34 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"Nicht genĂŒgend Platz fĂŒr Dynamic MMap. Bitte erhöhen Sie den Wert von APT::" +"Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:335 #, c-format msgid "%lid %lih %limin %lis" -msgstr "" +msgstr "%liT %liS %liMin %lis" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:342 #, c-format msgid "%lih %limin %lis" -msgstr "" +msgstr "%liS %liMin %lis" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:349 #, c-format msgid "%limin %lis" -msgstr "" +msgstr "%liMin %lis" #. s means seconds #: apt-pkg/contrib/strutl.cc:354 #, c-format msgid "%lis" -msgstr "" +msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1029 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" @@ -2175,43 +2191,43 @@ msgstr "Nicht erkannte TypabkĂŒrzung: »%c«" msgid "Opening configuration file %s" msgstr "Ăffne Konfigurationsdatei %s" -#: apt-pkg/contrib/configuration.cc:662 +#: apt-pkg/contrib/configuration.cc:663 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfehler %s:%u: Block fĂ€ngt ohne Namen an." -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" -#: apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:699 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfehler %s:%u: ZusĂ€tzlicher MĂŒll nach Wert" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:739 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden" -#: apt-pkg/contrib/configuration.cc:745 +#: apt-pkg/contrib/configuration.cc:746 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (include)" -#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfehler %s:%u: EingefĂŒgt von hier" -#: apt-pkg/contrib/configuration.cc:758 +#: apt-pkg/contrib/configuration.cc:759 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfehler %s:%u: Nicht unterstĂŒtzte Direktive »%s«" -#: apt-pkg/contrib/configuration.cc:809 +#: apt-pkg/contrib/configuration.cc:810 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: ZusĂ€tzlicher MĂŒll am Dateiende" @@ -2355,101 +2371,105 @@ msgstr "Beim Unlinking der Datei trat ein Problem auf" msgid "Problem syncing the file" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" msgstr "Leerer Paket-Cache" -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:139 msgid "The package cache file is corrupted" msgstr "Die Paket-Cache-Datei ist beschĂ€digt" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:144 msgid "The package cache file is an incompatible version" msgstr "Die Paket-Cache-Datei liegt in einer inkompatiblen Version vor" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Dieses APT unterstĂŒtzt das Versionssystem »%s« nicht" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" msgstr "Der Paket-Cache wurde fĂŒr eine andere Architektur aufgebaut" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Depends" msgstr "HĂ€ngt ab" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "PreDepends" msgstr "HĂ€ngt ab (vorher)" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Suggests" msgstr "SchlĂ€gt vor" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Recommends" msgstr "Empfiehlt" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Conflicts" msgstr "Kollidiert" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Replaces" msgstr "Ersetzt" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Obsoletes" msgstr "Veraltet" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Breaks" msgstr "Stört" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:227 +msgid "Enhances" +msgstr "Wertet auf" + +#: apt-pkg/pkgcache.cc:238 msgid "important" msgstr "wichtig" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "required" msgstr "erforderlich" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 msgid "Building dependency tree" msgstr "AbhĂ€ngigkeitsbaum wird aufgebaut" -#: apt-pkg/depcache.cc:122 +#: apt-pkg/depcache.cc:124 msgid "Candidate versions" msgstr "Mögliche Versionen" -#: apt-pkg/depcache.cc:151 +#: apt-pkg/depcache.cc:153 msgid "Dependency generation" msgstr "AbhĂ€ngigkeits-Generierung" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" msgstr "Lese Status-Informationen ein" -#: apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:221 #, c-format msgid "Failed to open StateFile %s" msgstr "Konnte Statusdatei %s nicht öffnen" -#: apt-pkg/depcache.cc:225 +#: apt-pkg/depcache.cc:227 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Konnte temporĂ€re Statusdatei %s nicht schreiben" @@ -2539,7 +2559,7 @@ msgstr "" "Das Paket %s muss neu installiert werden, ich kann aber kein Archiv dafĂŒr " "finden." -#: apt-pkg/algorithms.cc:1107 +#: apt-pkg/algorithms.cc:1147 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2547,11 +2567,11 @@ msgstr "" "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies " "könnte durch gehaltene Pakete hervorgerufen worden sein." -#: apt-pkg/algorithms.cc:1109 +#: apt-pkg/algorithms.cc:1149 msgid "Unable to correct problems, you have held broken packages." msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene defekte Pakete." -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 +#: apt-pkg/algorithms.cc:1426 apt-pkg/algorithms.cc:1428 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2628,16 +2648,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." -#: apt-pkg/policy.cc:267 +#: apt-pkg/policy.cc:281 msgid "Invalid record in the preferences file, no Package header" msgstr "UngĂŒltiger Eintrag in Einstellungsdatei, keine »Package«-Kopfzeilen" -#: apt-pkg/policy.cc:289 +#: apt-pkg/policy.cc:303 #, c-format msgid "Did not understand pin type %s" msgstr "Konnte Pinning-Typ (pin type) %s nicht verstehen" -#: apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:311 msgid "No priority (or zero) specified for pin" msgstr "Keine PrioritĂ€t (oder Null) fĂŒr Pin angegeben" @@ -2979,7 +2999,7 @@ msgstr "" #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" -msgstr "" +msgstr "Nicht gesperrt" #: methods/rred.cc:219 msgid "Could not patch file" @@ -2988,17 +3008,3 @@ msgstr "Konnte Datei nicht patchen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung zu frĂŒh beendet" - -#~ msgid "Dynamic MMap ran out of room" -#~ msgstr "Kein Platz fĂŒr Dynamic MMap" - -#~ 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" -#~ "that package should be filed." -#~ msgstr "" -#~ "Da Sie nur eine einzige Operation angefordert haben, ist es sehr " -#~ "wahrscheinlich,\n" -#~ "dass das Paket einfach nicht installierbar ist; Sie sollten einen " -#~ "Fehlerbericht\n" -#~ "gegen dieses Paket erstellen." @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2009-06-02 07:36+0200\n" +"POT-Creation-Date: 2009-06-30 14:09+0200\n" +"PO-Revision-Date: 2009-07-01 22:48+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -159,7 +159,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilĂ© sur %s %s\n" @@ -661,79 +661,79 @@ msgstr "ProblĂšme en dĂ©liant %s" msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dĂ©pendances non satisfaites :" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "mais %s est installĂ©" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra ĂȘtre installĂ©" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "mais il n'est pas installĂ©" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "mais ne sera pas installĂ©" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:353 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installĂ©s :" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVĂS :" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont Ă©tĂ© conservĂ©s :" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis Ă jour :" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis Ă une VERSION INFĂRIEURE :" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changĂ©s :" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -742,139 +742,139 @@ msgstr "" "Vous NE devez PAS faire ceci, Ă moins de savoir exactement ce\n" "que vous ĂȘtes en train de faire." -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis Ă jour, %lu nouvellement installĂ©s, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "%lu rĂ©installĂ©s, " -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "%lu remis Ă une version infĂ©rieure, " -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu Ă enlever et %lu non mis Ă jour.\n" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:596 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installĂ©s ou enlevĂ©s.\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:670 msgid "Correcting dependencies..." msgstr "Correction des dĂ©pendances..." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:673 msgid " failed." msgstr " a Ă©chouĂ©." -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:676 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dĂ©pendances" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:679 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis Ă jour" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:681 msgid " Done" msgstr " Fait" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:685 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problĂšmes." -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:688 msgid "Unmet dependencies. Try using -f." msgstr "DĂ©pendances manquantes. Essayez d'utiliser l'option -f." -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:710 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENTION : les paquets suivants n'ont pas Ă©tĂ© authentifiĂ©s." -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:714 msgid "Authentication warning overridden.\n" msgstr "Avertissement d'authentification ignorĂ©.\n" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:721 msgid "Install these packages without verification [y/N]? " msgstr "Faut-il installer ces paquets sans vĂ©rification (o/N) ? " -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:723 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu ĂȘtre authentifiĂ©s" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problĂšmes et -y a Ă©tĂ© employĂ© sans --force-yes" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:776 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erreur interne, « InstallPackages » appelĂ© avec des paquets cassĂ©s." -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:785 msgid "Packages need to be removed but remove is disabled." msgstr "" "Les paquets doivent ĂȘtre enlevĂ©s mais la dĂ©sinstallation est dĂ©sactivĂ©e." -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:796 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a Ă©tĂ© interrompu." -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le rĂ©pertoire de tĂ©lĂ©chargement" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 +#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut ĂȘtre lue." -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:837 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Ătrangement, les tailles ne correspondent pas. Veuillez le signaler par " "courriel Ă apt@packages.debian.org." -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est nĂ©cessaire de prendre %so/%so dans les archives.\n" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:845 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est nĂ©cessaire de prendre %so dans les archives.\n" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:850 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" "AprĂšs cette opĂ©ration, %so d'espace disque supplĂ©mentaires seront utilisĂ©s.\n" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:853 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "AprĂšs cette opĂ©ration, %so d'espace disque seront libĂ©rĂ©s.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de dĂ©terminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a Ă©tĂ© indiquĂ©e mais il ne s'agit pas d'une opĂ©ration " @@ -882,11 +882,11 @@ msgstr "" # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:892 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis !" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:894 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -897,28 +897,28 @@ msgstr "" "Pour continuer, tapez la phrase « %s »\n" " ?]" -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:915 msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1400 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de rĂ©cupĂ©rer %s %s\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1005 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu ĂȘtre tĂ©lĂ©chargĂ©s." -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236 msgid "Download complete and in download only mode" msgstr "TĂ©lĂ©chargement achevĂ© et dans le mode tĂ©lĂ©chargement uniquement" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1012 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -926,48 +926,48 @@ msgstr "" "Impossible de rĂ©cupĂ©rer quelques archives, peut-ĂȘtre devrez-vous lancer apt-" "get update ou essayer avec --fix-missing ?" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1016 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "l'option --fix-missing et l'Ă©change de support ne sont pas encore reconnus." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1021 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1022 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1056 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, sĂ©lection de %s au lieu de %s\n" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est dĂ©jĂ installĂ© et la mise Ă jour n'est pas prĂ©vue.\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Le paquet %s n'est pas installĂ©, et ne peut donc ĂȘtre supprimĂ©\n" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par :\n" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1107 msgid " [Installed]" msgstr " [InstallĂ©]" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1112 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement sĂ©lectionner un paquet Ă installer." -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1117 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -979,56 +979,61 @@ msgstr "" "devenu obsolĂšte\n" "ou qu'il n'est disponible que sur une autre source\n" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1136 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent :" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1139 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1159 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "La rĂ©installation de %s est impossible, il ne peut pas ĂȘtre tĂ©lĂ©chargĂ©.\n" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1167 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est dĂ©jĂ la plus rĂ©cente version disponible.\n" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1196 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1198 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version « %s » de « %s » n'a pu ĂȘtre trouvĂ©e" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1204 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1310 +#, c-format +msgid "No source package '%s' picking '%s' instead\n" +msgstr "Pas de paquet source « %s ». Utilisation de « %s » Ă la place\n" + +#: cmdline/apt-get.cc:1348 msgid "The update command takes no arguments" msgstr "La commande de mise Ă jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1361 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le rĂ©pertoire de liste" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Aucune suppression n'est sensĂ©e se produire : impossible de lancer " "« Autoremover »" -#: cmdline/apt-get.cc:1435 +#: cmdline/apt-get.cc:1445 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1036,11 +1041,11 @@ msgstr "" "Les paquets suivants ont Ă©tĂ© installĂ©s automatiquement et ne sont plus " "nĂ©cessaires :" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1447 msgid "Use 'apt-get autoremove' to remove them." msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer." -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1452 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1059,44 +1064,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider Ă rĂ©soudre la situation : " -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1459 msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Erreur interne, l'outil de suppression automatique a cassĂ© quelque chose." -#: cmdline/apt-get.cc:1468 +#: cmdline/apt-get.cc:1478 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassĂ© le boulot !" -#: cmdline/apt-get.cc:1523 +#: cmdline/apt-get.cc:1533 #, c-format msgid "Couldn't find task %s" msgstr "Impossible de trouver la tĂąche %s" -#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1661 +#: cmdline/apt-get.cc:1671 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, sĂ©lectionne %s pour l'expression rationnelle « %s »\n" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1702 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passĂ© en « installĂ© manuellement ».\n" -#: cmdline/apt-get.cc:1705 +#: cmdline/apt-get.cc:1715 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problĂšmes :" -#: cmdline/apt-get.cc:1708 +#: cmdline/apt-get.cc:1718 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1104,7 +1109,7 @@ msgstr "" "DĂ©pendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:1730 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" @@ -1116,119 +1121,119 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "Ă©tĂ© crĂ©Ă©s ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1748 msgid "Broken packages" msgstr "Paquets dĂ©fectueux" -#: cmdline/apt-get.cc:1767 +#: cmdline/apt-get.cc:1777 msgid "The following extra packages will be installed:" msgstr "Les paquets supplĂ©mentaires suivants seront installĂ©s : " -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1866 msgid "Suggested packages:" msgstr "Paquets suggĂ©rĂ©s :" -#: cmdline/apt-get.cc:1857 +#: cmdline/apt-get.cc:1867 msgid "Recommended packages:" msgstr "Paquets recommandĂ©s :" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1896 msgid "Calculating upgrade... " msgstr "Calcul de la mise Ă jour... " -#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Ăchec" -#: cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:1904 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de rĂ©solution du problĂšme a cassĂ© certaines " "parties" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2079 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spĂ©cifier au moins un paquet source" -#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 +#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du tĂ©lĂ©chargement du fichier « %s », dĂ©jĂ tĂ©lĂ©chargĂ©\n" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2186 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:2181 +#: cmdline/apt-get.cc:2192 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "NĂ©cessitĂ© de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2195 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "NĂ©cessitĂ© de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2201 #, c-format msgid "Fetch source %s\n" msgstr "RĂ©cupĂ©ration des sources %s\n" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2232 msgid "Failed to fetch some archives." msgstr "Ăchec lors de la rĂ©cupĂ©ration de quelques archives." -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2260 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du dĂ©compactage des paquets sources dĂ©jĂ dĂ©compactĂ©s dans %s\n" -#: cmdline/apt-get.cc:2261 +#: cmdline/apt-get.cc:2272 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de dĂ©compactage « %s » a Ă©chouĂ©.\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2273 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vĂ©rifier si le paquet dpkg-dev est installĂ©.\n" -#: cmdline/apt-get.cc:2279 +#: cmdline/apt-get.cc:2290 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a Ă©chouĂ©.\n" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2309 msgid "Child process failed" msgstr "Ăchec du processus fils" -#: cmdline/apt-get.cc:2314 +#: cmdline/apt-get.cc:2325 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spĂ©cifier au moins un paquet pour vĂ©rifier les dĂ©pendances de " "construction" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2353 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dĂ©pendances de construction pour %s" -#: cmdline/apt-get.cc:2362 +#: cmdline/apt-get.cc:2373 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dĂ©pendance de construction.\n" -#: cmdline/apt-get.cc:2414 +#: cmdline/apt-get.cc:2425 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1237,7 +1242,7 @@ msgstr "" "La dĂ©pendance %s vis-Ă -vis de %s ne peut ĂȘtre satisfaite car le paquet %s ne " "peut ĂȘtre trouvĂ©" -#: cmdline/apt-get.cc:2467 +#: cmdline/apt-get.cc:2478 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1246,32 +1251,32 @@ msgstr "" "La dĂ©pendance %s vis-Ă -vis de %s ne peut ĂȘtre satisfaite car aucune version " "du paquet %s ne peut satisfaire Ă la version requise" -#: cmdline/apt-get.cc:2503 +#: cmdline/apt-get.cc:2514 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dĂ©pendance %s pour %s : le paquet installĂ© %s " "est trop rĂ©cent" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2541 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dĂ©pendances %s pour %s : %s" -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2555 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dĂ©pendances de compilation pour %s ne peuvent pas ĂȘtre satisfaites." -#: cmdline/apt-get.cc:2546 +#: cmdline/apt-get.cc:2559 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dĂ©pendances de construction" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:2591 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2632 #| msgid "" #| "Usage: apt-get [options] command\n" #| " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1287,7 +1292,7 @@ msgstr "Modules reconnus :" #| " install - Install new packages (pkg is libc6 not libc6.deb)\n" #| " remove - Remove packages\n" #| " autoremove - Remove automatically all unused packages\n" -#| " purge - Remove packages and config files\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" @@ -1328,7 +1333,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove and purge packages\n" +" purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1369,7 +1374,7 @@ msgstr "" " install - Installe de nouveaux paquets (pkg1 est libc6 et non libc6.deb)\n" " remove - Supprime des paquets\n" " autoremove - Supprime tous les paquets installĂ©s automatiquement\n" -" purge - Supprime et purge des paquets\n" +" purge - Supprime des paquets et leurs fichiers de configuration\n" " source - TĂ©lĂ©charge les archives de sources\n" " build-dep - Configure build-dependencies pour les paquets sources\n" " dist-upgrade - Met Ă jour la distribution, reportez-vous Ă apt-get(8)\n" @@ -1397,6 +1402,20 @@ msgstr "" "apt.conf(5) pour plus d'informations et d'option.\n" " Cet APT a les « Super Cow Powers »\n" +#: cmdline/apt-get.cc:2799 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" +"NOTE: Ceci n'est qu'une simulation !\n" +" apt-get a besoin des privilĂšges du superutilisateur " +" pour pouvoir vraiment fonctionner.\n" +" Veuillez aussi noter que le verrouillage est dĂ©sactivĂ©,\n" +" et la situation n'est donc pas forcĂ©ment reprĂ©sentative " +" de la rĂ©alitĂ©Â !" + #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "Atteint " @@ -1632,7 +1651,7 @@ msgstr "Ăcrase la correspondance de paquet sans version pour %s " msgid "File %s/%s overwrites the one in the package %s" msgstr "Le fichier %s/%s Ă©crase celui inclus dans le paquet %s" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format @@ -1940,7 +1959,7 @@ msgstr "DĂ©lai de connexion au port de donnĂ©es dĂ©passĂ©" msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ProblĂšme de hachage du fichier" @@ -2026,43 +2045,43 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Impossible de se connecter Ă %s %s :" -#: methods/gpgv.cc:65 +#: methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Impossible d'accĂ©der au porte-clĂ©s : « %s »" -#: methods/gpgv.cc:101 +#: methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: liste de paramĂštres trop longue pour Acquire::gpgv::Options. Abandon." -#: methods/gpgv.cc:205 +#: methods/gpgv.cc:223 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de dĂ©terminer " "l'empreinte de la clĂ©." -#: methods/gpgv.cc:210 +#: methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a Ă©tĂ© rencontrĂ©e." -#: methods/gpgv.cc:214 +#: methods/gpgv.cc:232 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Impossible d'exĂ©cuter « %s » pour contrĂŽler la signature\n" "(veuillez vĂ©rifier si gpgv est installĂ©)." -#: methods/gpgv.cc:219 +#: methods/gpgv.cc:237 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue Ă l'exĂ©cution de gpgv" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:271 methods/gpgv.cc:278 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:257 +#: methods/gpgv.cc:285 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2080,80 +2099,80 @@ msgstr "Ne parvient pas Ă ouvrir le tube pour %s" msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:377 +#: methods/http.cc:379 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tĂȘte" -#: methods/http.cc:523 +#: methods/http.cc:525 #, c-format msgid "Got a single header line over %u chars" msgstr "J'ai une simple ligne d'en-tĂȘte au-dessus du caractĂšre %u" -#: methods/http.cc:531 +#: methods/http.cc:533 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tĂȘte" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:552 methods/http.cc:559 msgid "The HTTP server sent an invalid reply header" msgstr "Le serveur http a envoyĂ© une rĂ©ponse dont l'en-tĂȘte est invalide" -#: methods/http.cc:586 +#: methods/http.cc:588 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Le serveur http a envoyĂ© un en-tĂȘte « Content-Length » invalide" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Le serveur http a envoyĂ© un en-tĂȘte « Content-Range » invalide" -#: methods/http.cc:603 +#: methods/http.cc:605 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possĂšde un support des limites non-valide" -#: methods/http.cc:627 +#: methods/http.cc:629 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:774 +#: methods/http.cc:782 msgid "Select failed" msgstr "SĂ©lection dĂ©faillante" -#: methods/http.cc:779 +#: methods/http.cc:787 msgid "Connection timed out" msgstr "DĂ©lai de connexion dĂ©passĂ©" -#: methods/http.cc:802 +#: methods/http.cc:810 msgid "Error writing to output file" msgstr "Erreur d'Ă©criture du fichier de sortie" -#: methods/http.cc:833 +#: methods/http.cc:841 msgid "Error writing to file" msgstr "Erreur d'Ă©criture sur un fichier" -#: methods/http.cc:861 +#: methods/http.cc:869 msgid "Error writing to the file" msgstr "Erreur d'Ă©criture sur le fichier" -#: methods/http.cc:875 +#: methods/http.cc:883 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clĂŽture de la connexion" -#: methods/http.cc:877 +#: methods/http.cc:885 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "Ăchec de la troncature du fichier" -#: methods/http.cc:1105 +#: methods/http.cc:1141 msgid "Bad header data" msgstr "Mauvais en-tĂȘte de donnĂ©e" -#: methods/http.cc:1122 methods/http.cc:1177 +#: methods/http.cc:1158 methods/http.cc:1213 msgid "Connection failed" msgstr "Ăchec de la connexion" -#: methods/http.cc:1229 +#: methods/http.cc:1305 msgid "Internal error" msgstr "Erreur interne" @@ -2176,7 +2195,31 @@ msgstr "" "Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur " "actuelle est de %lu (voir « man 5 apt.conf »)." -#: apt-pkg/contrib/strutl.cc:1014 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:335 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:342 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:349 +#, c-format +msgid "%limin %lis" +msgstr "%limin %lis" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:354 +#, c-format +msgid "%lis" +msgstr "%lis" + +#: apt-pkg/contrib/strutl.cc:1029 #, c-format msgid "Selection %s not found" msgstr "La sĂ©lection %s n'a pu ĂȘtre trouvĂ©e" @@ -2191,44 +2234,44 @@ msgstr "Type d'abrĂ©viation non reconnue : « %c »" msgid "Opening configuration file %s" msgstr "Ouverture du fichier de configuration %s" -#: apt-pkg/contrib/configuration.cc:662 +#: apt-pkg/contrib/configuration.cc:663 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom." -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erreur syntaxique %s:%u : balise mal formĂ©e" -#: apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:699 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:739 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erreur syntaxique %s:%u : ces directives ne peuvent ĂȘtre appliquĂ©es qu'au " "niveau le plus haut" -#: apt-pkg/contrib/configuration.cc:745 +#: apt-pkg/contrib/configuration.cc:746 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes" -#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erreur syntaxique %s:%u : inclus Ă partir d'ici" -#: apt-pkg/contrib/configuration.cc:758 +#: apt-pkg/contrib/configuration.cc:759 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erreur syntaxique %s:%u : directive « %s » non tolĂ©rĂ©e" -#: apt-pkg/contrib/configuration.cc:809 +#: apt-pkg/contrib/configuration.cc:810 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erreur syntaxique %s:%u : valeur aberrante Ă la fin du fichier" @@ -2371,101 +2414,105 @@ msgstr "ProblĂšme d'effacement du fichier" msgid "Problem syncing the file" msgstr "ProblĂšme de synchronisation du fichier" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" msgstr "Cache des paquets vide" -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:139 msgid "The package cache file is corrupted" msgstr "Le fichier de cache des paquets est corrompu" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:144 msgid "The package cache file is an incompatible version" msgstr "Le fichier de cache des paquets a une version incompatible" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Cet APT ne supporte pas le systĂšme de version « %s »" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" msgstr "Le cache des paquets a Ă©tĂ© construit pour une architecture diffĂ©rente" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Depends" msgstr "DĂ©pend" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "PreDepends" msgstr "PrĂ©-DĂ©pend" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Suggests" msgstr "SuggĂšre" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Recommends" msgstr "Recommande" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Conflicts" msgstr "Est en conflit avec" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Replaces" msgstr "Remplace" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Obsoletes" msgstr "Rend obsolĂšte" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Breaks" msgstr "Casse" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:227 +msgid "Enhances" +msgstr "AmĂ©liore" + +#: apt-pkg/pkgcache.cc:238 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "required" msgstr "nĂ©cessaire" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "optional" msgstr "optionnel" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "extra" msgstr "supplĂ©mentaire" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 msgid "Building dependency tree" msgstr "Construction de l'arbre des dĂ©pendances" -#: apt-pkg/depcache.cc:122 +#: apt-pkg/depcache.cc:124 msgid "Candidate versions" msgstr "Versions possibles" -#: apt-pkg/depcache.cc:151 +#: apt-pkg/depcache.cc:153 msgid "Dependency generation" msgstr "GĂ©nĂ©ration des dĂ©pendances" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" msgstr "Lecture des informations d'Ă©tat" -#: apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:221 #, c-format msgid "Failed to open StateFile %s" msgstr "Impossible d'ouvrir le fichier d'Ă©tat %s" -#: apt-pkg/depcache.cc:225 +#: apt-pkg/depcache.cc:227 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Erreur d'Ă©criture du fichier d'Ă©tat temporaire %s" @@ -2558,7 +2605,7 @@ msgstr "" "Le paquet %s doit ĂȘtre rĂ©installĂ©, mais il est impossible de trouver son " "archive." -#: apt-pkg/algorithms.cc:1107 +#: apt-pkg/algorithms.cc:1147 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2566,13 +2613,13 @@ msgstr "" "Erreur, pkgProblemResolver::Resolve a gĂ©nĂ©rĂ© des ruptures, ce qui a pu ĂȘtre " "causĂ© par les paquets devant ĂȘtre gardĂ©s en l'Ă©tat." -#: apt-pkg/algorithms.cc:1109 +#: apt-pkg/algorithms.cc:1149 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problĂšmes, des paquets dĂ©fectueux sont en mode " "« garder en l'Ă©tat »." -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 +#: apt-pkg/algorithms.cc:1426 apt-pkg/algorithms.cc:1428 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2612,7 +2659,7 @@ msgstr "Le pilote pour la mĂ©thode %s n'a pu ĂȘtre trouvĂ©." msgid "Method %s did not start correctly" msgstr "La mĂ©thode %s n'a pas dĂ©marrĂ© correctement" -#: apt-pkg/acquire-worker.cc:399 +#: apt-pkg/acquire-worker.cc:413 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2648,18 +2695,18 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problĂšmes." -#: apt-pkg/policy.cc:267 +#: apt-pkg/policy.cc:281 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Enregistrement invalide dans votre fichier « prĂ©fĂ©rences », aucune entrĂ©e " "« Package »." -#: apt-pkg/policy.cc:289 +#: apt-pkg/policy.cc:303 #, c-format msgid "Did not understand pin type %s" msgstr "Ătiquette %s inconnue" -#: apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:311 msgid "No priority (or zero) specified for pin" msgstr "Aucune prioritĂ© (ou zĂ©ro) n'a Ă©tĂ© spĂ©cifiĂ©e pour l'Ă©tiquette" @@ -2995,12 +3042,16 @@ msgstr "PrĂ©paration de la suppression complĂšte de %s" msgid "Completely removed %s" msgstr "%s complĂštement supprimĂ©" -#: apt-pkg/deb/dpkgpm.cc:791 +#: apt-pkg/deb/dpkgpm.cc:789 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossible d'Ă©crire le journal, Ă©chec d'openpty()\n" "(/dev/pts est-il montĂ©Â ?)\n" +#: apt-pkg/deb/debsystem.cc:100 +msgid "Not locked" +msgstr "Non verrouillĂ©" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Impossible de corriger le fichier" @@ -3009,23 +3060,5 @@ msgstr "Impossible de corriger le fichier" msgid "Connection closed prematurely" msgstr "Connexion fermĂ©e prĂ©maturĂ©ment" -#~ msgid "No source package '%s' picking '%s' instead\n" -#~ msgstr "Pas de paquet source « %s ». Utilisation de « %s » Ă la place\n" - -#~ msgid "%lid %lih %limin %lis" -#~ msgstr "%lid %lih %limin %lis" - -#~ msgid "%lih %limin %lis" -#~ msgstr "%lih %limin %lis" - -#~ msgid "%limin %lis" -#~ msgstr "%limin %lis" - -#~ msgid "%lis" -#~ msgstr "%lis" - -#~ msgid "Not locked" -#~ msgstr "Non verrouillĂ©" - #~ msgid "Dynamic MMap ran out of room" #~ msgstr "La zone dynamique d'allocation mĂ©moire n'a plus de place" |