summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUGS9
-rw-r--r--README.ddtp74
-rw-r--r--apt-pkg/acquire-item.cc49
-rw-r--r--apt-pkg/acquire-item.h17
-rw-r--r--apt-pkg/acquire-worker.cc7
-rw-r--r--apt-pkg/algorithms.cc114
-rw-r--r--apt-pkg/cacheiterators.h84
-rw-r--r--apt-pkg/cdrom.cc47
-rw-r--r--apt-pkg/cdrom.h7
-rw-r--r--apt-pkg/contrib/strutl.cc43
-rw-r--r--apt-pkg/contrib/strutl.h3
-rw-r--r--apt-pkg/deb/debindexfile.cc174
-rw-r--r--apt-pkg/deb/debindexfile.h30
-rw-r--r--apt-pkg/deb/deblistparser.cc46
-rw-r--r--apt-pkg/deb/deblistparser.h4
-rw-r--r--apt-pkg/deb/debmetaindex.cc17
-rw-r--r--apt-pkg/deb/debrecords.cc23
-rw-r--r--apt-pkg/deb/debrecords.h2
-rw-r--r--apt-pkg/deb/dpkgpm.cc2
-rw-r--r--apt-pkg/deb/dpkgpm.h2
-rw-r--r--apt-pkg/depcache.cc484
-rw-r--r--apt-pkg/depcache.h220
-rw-r--r--apt-pkg/indexcopy.cc183
-rw-r--r--apt-pkg/indexcopy.h13
-rw-r--r--apt-pkg/indexfile.cc63
-rw-r--r--apt-pkg/indexfile.h7
-rw-r--r--apt-pkg/init.cc3
-rw-r--r--apt-pkg/init.h2
-rw-r--r--apt-pkg/makefile2
-rw-r--r--apt-pkg/orderlist.cc17
-rw-r--r--apt-pkg/packagemanager.cc15
-rw-r--r--apt-pkg/packagemanager.h32
-rw-r--r--apt-pkg/pkgcache.cc41
-rw-r--r--apt-pkg/pkgcache.h50
-rw-r--r--apt-pkg/pkgcachegen.cc125
-rw-r--r--apt-pkg/pkgcachegen.h6
-rw-r--r--apt-pkg/pkgrecords.cc9
-rw-r--r--apt-pkg/pkgrecords.h2
-rw-r--r--apt-pkg/tagfile.cc1
-rw-r--r--cmdline/apt-cache.cc110
-rw-r--r--cmdline/apt-get.cc349
-rwxr-xr-xcmdline/apt-key6
-rwxr-xr-xcmdline/apt-mark63
-rw-r--r--configure.in2
-rw-r--r--debian/apt.conf.ubuntu10
-rw-r--r--debian/apt.cron.daily16
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/apt.postinst2
-rw-r--r--debian/changelog364
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules11
-rw-r--r--doc/apt-cache.8.xml2
-rw-r--r--doc/apt_preferences.5.xml2
-rw-r--r--doc/cache.sgml3
-rw-r--r--doc/dpkg-tech.sgml2
-rw-r--r--doc/examples/configure-index9
-rw-r--r--doc/examples/sources.list13
-rw-r--r--methods/http.cc4
-rw-r--r--methods/makefile2
-rw-r--r--po/apt-all.pot447
-rw-r--r--po/bg.po342
-rw-r--r--po/bs.po339
-rw-r--r--po/ca.po341
-rw-r--r--po/cs.po340
-rw-r--r--po/cy.po340
-rw-r--r--po/da.po340
-rw-r--r--po/de.po342
-rw-r--r--po/el.po342
-rw-r--r--po/en_GB.po340
-rw-r--r--po/es.po342
-rw-r--r--po/eu.po340
-rw-r--r--po/fi.po340
-rw-r--r--po/fr.po342
-rw-r--r--po/gl.po340
-rw-r--r--po/hu.po340
-rw-r--r--po/it.po340
-rw-r--r--po/ja.po340
-rw-r--r--po/ko.po340
-rw-r--r--po/makefile3
-rw-r--r--po/nb.po340
-rw-r--r--po/nl.po340
-rw-r--r--po/nn.po340
-rw-r--r--po/pl.po340
-rw-r--r--po/pt.po340
-rw-r--r--po/pt_BR.po340
-rw-r--r--po/ro.po341
-rw-r--r--po/ru.po340
-rw-r--r--po/sk.po340
-rw-r--r--po/sl.po340
-rw-r--r--po/sv.po340
-rw-r--r--po/tl.po342
-rw-r--r--po/vi.po340
-rw-r--r--po/zh_CN.po340
-rw-r--r--po/zh_TW.po340
-rw-r--r--share/debian-archive.gpgbin4171 -> 2717 bytes
95 files changed, 9048 insertions, 5637 deletions
diff --git a/BUGS b/BUGS
new file mode 100644
index 000000000..a7b6b1114
--- /dev/null
+++ b/BUGS
@@ -0,0 +1,9 @@
+
+DDTP problems:
+--------------
+- apt-get update clean the /var/lib/apt/lists dir
+ from all Translation-$index that are not in the current
+ enviroment or Translations apt variable
+- there needs to be a list of locales (pt, sv, en) that need
+ both language and country code to get the right file
+ (is in the code in indexfile::LanguageCode(), just a bit ugly
diff --git a/README.ddtp b/README.ddtp
new file mode 100644
index 000000000..98f6109aa
--- /dev/null
+++ b/README.ddtp
@@ -0,0 +1,74 @@
+TODO:
+- URL-Remap for the translation files (to hack around the problem that
+ they are not on any ftp server yet but only on http://ddtp.debian.org/)
+
+Here is the original announcement of the ddtp support:
+
+* To: debian-devel-announce@lists.debian.org
+* Subject: Translate files
+* From: Michael Bramer <grisu@debian.org>
+* Date: Sun, 6 Oct 2002 21:56:06 +0200
+* Mail-followup-to: debian-devel@lists.debian.org
+* Message-id: <20021006195605.GA30516@home.debsupport.de>
+* Old-return-path: <michael@home.debsupport.de>
+* User-agent: Mutt/1.3.28i
+
+Hello all
+
+After some discussion between Anthony Towns (a ftpmaster), Jason
+Gunthorpe (APT Developer) and some DDTP Coordinators we find a way to
+transfer the translated package descriptions from the archive to the
+user.
+
+The translated descriptions need to be downloadable befor any
+installation process, like the other package meta information. We
+choose a new file per languages with all translated package
+descriptions. The package system can download one or more of this
+files at 'apt-get update' time and know the translations.
+
+The new files are names 'Translate-$lang' and the file have this
+rfc822-format:
+ Package: &lt;package-name&gt;
+ Description-md5: &lt;the md5 checksum of the english description&gt;
+ Description-$lang.$encoding: &lt;translated headline&gt;
+ &lt;translated section&gt;
+
+The encoding of the Description is 'UTF-8' in all languages normal.
+The files will be located at 'debian/dists/sid/main/i18n/' on the ftp
+server (for all architecture). In addition of the plain
+'Translate-$lang' file, there will be a 'gz' and a 'bz2' version and
+in future also the new incremental format version.
+
+The &lt;the md5 checksum of the english description&gt; is the md5 checksum
+of the full english description, without the 'Description: '-tag and
+with all spaces and newlines. Look at this example:
+ Description: XXX
+ YYY
+ .
+ ZZZ
+is md5(&quot;XXX\n YYY\n .\n ZZZ\n&quot;) (perl-syntax).
+
+
+A future APT version will download one or some 'Translate-$lang'
+file(s) at 'update'-time. After this download it show a translated
+description instead of the english form, if it found a translated
+description of the package with the right md5 chechsum. The enviroment
+of the user will controlled this process (LANG, LANGUAGE, LC_MESSAGES,
+etc). With this the package system will never show a outdated
+translation.
+
+The translations come all from the DDTP. A daily process on
+ddtp.debian.org make new 'Translated-$lang' files and a script on
+ftp-master request this files and move this to the debian archive.
+Now the first files are accessable at
+ <a href="http://ddtp.debian.org/pdesc/translatefiles/">http://ddtp.debian.org/pdesc/translatefiles/</a>
+
+If you found wrong translations, please read the guides on
+ddtp.debian.org, make a better translation and send this per mail to
+the DDTP server. Don't bug the package maintainer!
+
+Thanks
+Grisu
+--
+Michael Bramer - a Debian Linux Developer <a href="http://www.debsupport.de">http://www.debsupport.de</a>
+PGP: finger grisu@db.debian.org -- Linux Sysadmin -- Use Debian Linux
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 421288007..2ecb77814 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -75,7 +75,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
Dequeue();
return;
}
-
+
Status = StatError;
Dequeue();
}
@@ -308,6 +308,35 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
Mode = decompProg;
}
+// AcqIndexTrans::pkgAcqIndexTrans - Constructor /*{{{*/
+// ---------------------------------------------------------------------
+/* The Translation file is added to the queue */
+pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
+ string URI,string URIDesc,string ShortDesc) :
+ pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, "", "")
+{
+}
+
+ /*}}}*/
+// AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgAcqIndexTrans::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+{
+ if (Cnf->LocalOnly == true ||
+ StringToBool(LookupTag(Message,"Transient-Failure"),false) == false)
+ {
+ // Ignore this
+ Status = StatDone;
+ Complete = false;
+ Dequeue();
+ return;
+ }
+
+ Item::Failed(Message,Cnf);
+}
+ /*}}}*/
+
pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
string URI,string URIDesc,string ShortDesc,
string MetaIndexURI, string MetaIndexURIDesc,
@@ -321,8 +350,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
- // remove any partial downloaded sig-file. it may confuse proxies
- // and is too small to warrant a partial download anyway
+ // remove any partial downloaded sig-file in partial/.
+ // it may confuse proxies and is too small to warrant a
+ // partial download anyway
unlink(DestFile.c_str());
// Create the item
@@ -389,17 +419,22 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
/*}}}*/
void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
+ string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
// if we get a network error we fail gracefully
- if(LookupTag(Message,"FailReason") == "Timeout" ||
- LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
- LookupTag(Message,"FailReason") == "ConnectionRefused") {
+ if(Status == StatTransientNetworkError)
+ {
Item::Failed(Message,Cnf);
+ // move the sigfile back on network failures (and re-authenticated?)
+ if(FileExists(DestFile))
+ Rename(DestFile,Final);
+
+ // set the status back to , Item::Failed likes to reset it
+ Status = pkgAcquire::Item::StatTransientNetworkError;
return;
}
// Delete any existing sigfile when the acquire failed
- string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
unlink(Final.c_str());
// queue a pkgAcqMetaIndex with no sigfile
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index da1bea801..3a0a690e1 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -9,8 +9,8 @@
the Owner Acquire class. Derived classes will then call QueueURI to
register all the URI's they wish to fetch at the initial moment.
- Two item classes are provided to provide functionality for downloading
- of Index files and downloading of Packages.
+ Three item classes are provided to provide functionality for
+ downloading of Index, Translation and Packages files.
A Archive class is provided for downloading .deb files. It does Md5
checking and source location as well as a retry algorithm.
@@ -48,7 +48,8 @@ class pkgAcquire::Item
public:
// State of the item
- enum {StatIdle, StatFetching, StatDone, StatError, StatAuthError} Status;
+ enum {StatIdle, StatFetching, StatDone, StatError,
+ StatAuthError, StatTransientNetworkError} Status;
string ErrorText;
unsigned long FileSize;
unsigned long PartialSize;
@@ -107,6 +108,16 @@ class pkgAcqIndex : public pkgAcquire::Item
string ShortDesct, string ExpectedMD5, string compressExt="");
};
+// Item class for translated package index files
+class pkgAcqIndexTrans : public pkgAcqIndex
+{
+ public:
+
+ virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
+ pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc,
+ string ShortDesct);
+};
+
struct IndexTarget
{
string URI;
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index d06024178..8ab67778b 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -307,6 +307,13 @@ bool pkgAcquire::Worker::RunMessages()
pkgAcquire::Item *Owner = Itm->Owner;
pkgAcquire::ItemDesc Desc = *Itm;
OwnerQ->ItemDone(Itm);
+
+ // set some status
+ if(LookupTag(Message,"FailReason") == "Timeout" ||
+ LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+ LookupTag(Message,"FailReason") == "ConnectionRefused")
+ Owner->Status = pkgAcquire::Item::StatTransientNetworkError;
+
Owner->Failed(Message,Config);
ItemDone();
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 479927d65..f50c52a32 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -20,10 +20,12 @@
#include <apt-pkg/algorithms.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
+#include <apt-pkg/version.h>
#include <apt-pkg/sptr.h>
+
#include <apti18n.h>
-
+#include <sys/types.h>
#include <iostream>
/*}}}*/
using namespace std;
@@ -100,6 +102,7 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/)
DepIterator End;
D.GlobOr(Start,End);
if (Start->Type == pkgCache::Dep::Conflicts ||
+ Start->Type == pkgCache::Dep::DpkgBreaks ||
Start->Type == pkgCache::Dep::Obsoletes ||
End->Type == pkgCache::Dep::PreDepends)
{
@@ -149,6 +152,8 @@ bool pkgSimulate::Configure(PkgIterator iPkg)
cout << " Obsoletes:" << D.TargetPkg().Name();
else if (D->Type == pkgCache::Dep::Conflicts)
cout << " Conflicts:" << D.TargetPkg().Name();
+ else if (D->Type == pkgCache::Dep::DpkgBreaks)
+ cout << " Breaks:" << D.TargetPkg().Name();
else
cout << " Depends:" << D.TargetPkg().Name();
}
@@ -220,6 +225,8 @@ void pkgSimulate::ShortBreaks()
the necessary calculations to deal with the problems. */
bool pkgApplyStatus(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
{
if (I->VersionList == 0)
@@ -230,13 +237,13 @@ bool pkgApplyStatus(pkgDepCache &Cache)
I->InstState == pkgCache::State::HoldReInstReq)
{
if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true)
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
else
{
// Is this right? Will dpkg choke on an upgrade?
if (Cache[I].CandidateVer != 0 &&
Cache[I].CandidateVerIter(Cache).Downloadable() == true)
- Cache.MarkInstall(I);
+ Cache.MarkInstall(I, false, 0, false);
else
return _error->Error(_("The package %s needs to be reinstalled, "
"but I can't find an archive for it."),I.Name());
@@ -253,12 +260,12 @@ bool pkgApplyStatus(pkgDepCache &Cache)
case pkgCache::State::HalfConfigured:
if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) ||
I.State() != pkgCache::PkgIterator::NeedsUnpack)
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
else
{
if (Cache[I].CandidateVer != 0 &&
Cache[I].CandidateVerIter(Cache).Downloadable() == true)
- Cache.MarkInstall(I);
+ Cache.MarkInstall(I, true, 0, false);
else
Cache.MarkDelete(I);
}
@@ -284,10 +291,12 @@ bool pkgApplyStatus(pkgDepCache &Cache)
on the result. */
bool pkgFixBroken(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
// Auto upgrade all broken packages
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
if (Cache[I].NowBroken() == true)
- Cache.MarkInstall(I,true);
+ Cache.MarkInstall(I, true, 0, false);
/* Fix packages that are in a NeedArchive state but don't have a
downloadable install version */
@@ -300,7 +309,7 @@ bool pkgFixBroken(pkgDepCache &Cache)
if (Cache[I].InstVerIter(Cache).Downloadable() == false)
continue;
- Cache.MarkInstall(I,true);
+ Cache.MarkInstall(I, true, 0, false);
}
pkgProblemResolver Fix(&Cache);
@@ -317,23 +326,25 @@ bool pkgFixBroken(pkgDepCache &Cache)
*/
bool pkgDistUpgrade(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
/* Auto upgrade all installed packages, this provides the basis
for the installation */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
if (I->CurrentVer != 0)
- Cache.MarkInstall(I,true);
+ Cache.MarkInstall(I, true, 0, false);
/* Now, auto upgrade all essential packages - this ensures that
the essential packages are present and working */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
- Cache.MarkInstall(I,true);
+ Cache.MarkInstall(I, true, 0, false);
/* We do it again over all previously installed packages to force
conflict resolution on them all. */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
if (I->CurrentVer != 0)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
pkgProblemResolver Fix(&Cache);
@@ -345,7 +356,7 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
if (I->SelectedState == pkgCache::State::Hold)
{
Fix.Protect(I);
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
}
}
}
@@ -360,6 +371,8 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
to install packages not marked for install */
bool pkgAllUpgrade(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
pkgProblemResolver Fix(&Cache);
if (Cache.BrokenCount() != 0)
@@ -376,7 +389,7 @@ bool pkgAllUpgrade(pkgDepCache &Cache)
continue;
if (I->CurrentVer != 0 && Cache[I].InstallVer != 0)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
}
return Fix.ResolveByKeep();
@@ -389,6 +402,8 @@ bool pkgAllUpgrade(pkgDepCache &Cache)
the package is restored. */
bool pkgMinimizeUpgrade(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
if (Cache.BrokenCount() != 0)
return false;
@@ -405,9 +420,9 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
continue;
// Keep it and see if that is OK
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
if (Cache.BrokenCount() != 0)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
else
{
// If keep didnt actually do anything then there was no change..
@@ -565,6 +580,8 @@ void pkgProblemResolver::MakeScores()
installable */
bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
{
+ pkgDepCache::ActionGroup group(Cache);
+
if ((Flags[Pkg->ID] & Upgradable) == 0 || Cache[Pkg].Upgradable() == false)
return false;
if ((Flags[Pkg->ID] & Protected) == Protected)
@@ -573,7 +590,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
Flags[Pkg->ID] &= ~Upgradable;
bool WasKept = Cache[Pkg].Keep();
- Cache.MarkInstall(Pkg,false);
+ Cache.MarkInstall(Pkg, false, 0, false);
// This must be a virtual package or something like that.
if (Cache[Pkg].InstVerIter(Cache).end() == true)
@@ -637,6 +654,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
/* We let the algorithm deal with conflicts on its next iteration,
it is much smarter than us */
if (Start->Type == pkgCache::Dep::Conflicts ||
+ Start->Type == pkgCache::Dep::DpkgBreaks ||
Start->Type == pkgCache::Dep::Obsoletes)
break;
@@ -658,7 +676,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
if (Fail == true)
{
if (WasKept == true)
- Cache.MarkKeep(Pkg);
+ Cache.MarkKeep(Pkg, false, false);
else
Cache.MarkDelete(Pkg);
return false;
@@ -685,6 +703,8 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
upgrade packages to advoid problems. */
bool pkgProblemResolver::Resolve(bool BrokenFix)
{
+ pkgDepCache::ActionGroup group(Cache);
+
unsigned long Size = Cache.Head().PackageCount;
// Record which packages are marked for install
@@ -700,7 +720,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
{
if (Cache[I].InstBroken() == true && BrokenFix == true)
{
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
if (Cache[I].Install() == true)
Again = true;
}
@@ -766,14 +786,14 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
pkgCache::Version *OldVer = Cache[I].InstallVer;
Flags[I->ID] &= ReInstateTried;
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
if (Cache[I].InstBroken() == true ||
OldBreaks < Cache.BrokenCount())
{
if (OldVer == 0)
Cache.MarkDelete(I);
else
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
}
else
if (Debug == true)
@@ -818,7 +838,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
{
if (Debug == true)
clog << " Or group keep for " << I.Name() << endl;
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
Change = true;
}
}
@@ -857,6 +877,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
SPtrArray<pkgCache::Version *> VList = Start.AllTargets();
if (*VList == 0 && (Flags[I->ID] & Protected) != Protected &&
Start->Type != pkgCache::Dep::Conflicts &&
+ Start->Type != pkgCache::Dep::DpkgBreaks &&
Start->Type != pkgCache::Dep::Obsoletes &&
Cache[I].NowBroken() == false)
{
@@ -868,7 +889,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
}
Change = true;
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
break;
}
@@ -887,6 +908,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
if (Scores[I->ID] <= Scores[Pkg->ID] ||
((Cache[Start] & pkgDepCache::DepNow) == 0 &&
End->Type != pkgCache::Dep::Conflicts &&
+ End->Type != pkgCache::Dep::DpkgBreaks &&
End->Type != pkgCache::Dep::Obsoletes))
{
// Try a little harder to fix protected packages..
@@ -905,7 +927,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
/* See if a keep will do, unless the package is protected,
then installing it will be necessary */
bool Installed = Cache[I].Install();
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
if (Cache[I].InstBroken() == false)
{
// Unwind operation will be keep now
@@ -914,7 +936,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
// Restore
if (InOr == true && Installed == true)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
if (Debug == true)
clog << " Holding Back " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;
@@ -952,7 +974,21 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
(Start->Type == pkgCache::Dep::Conflicts ||
Start->Type == pkgCache::Dep::Obsoletes))
continue;
-
+
+ if (Start->Type == pkgCache::Dep::DpkgBreaks)
+ {
+ /* Would it help if we upgraded? */
+ if (Cache[End] & pkgDepCache::DepGCVer) {
+ if (Debug)
+ clog << " Upgrading " << Pkg.Name() << " due to Breaks field in " << I.Name() << endl;
+ Cache.MarkInstall(Pkg, false, 0, false);
+ continue;
+ }
+ if (Debug)
+ clog << " Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() <<endl;
+ continue;
+ }
+
// Skip adding to the kill list if it is protected
if ((Flags[Pkg->ID] & Protected) != 0)
continue;
@@ -973,6 +1009,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
// Hm, nothing can possibly satisify this dep. Nuke it.
if (VList[0] == 0 &&
Start->Type != pkgCache::Dep::Conflicts &&
+ Start->Type != pkgCache::Dep::DpkgBreaks &&
Start->Type != pkgCache::Dep::Obsoletes &&
(Flags[I->ID] & Protected) != Protected)
{
@@ -986,7 +1023,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
// Restore
if (InOr == true && Installed == true)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
if (Debug == true)
clog << " Holding Back " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl;
@@ -1031,7 +1068,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
{
if (Debug == true)
clog << " Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl;
- Cache.MarkKeep(J->Pkg);
+ Cache.MarkKeep(J->Pkg, false, false);
}
if (Counter > 1)
@@ -1061,6 +1098,20 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
return _error->Error(_("Unable to correct problems, you have held broken packages."));
}
+ // set the auto-flags (mvo: I'm not sure if we _really_ need this, but
+ // I didn't managed
+ pkgCache::PkgIterator I = Cache.PkgBegin();
+ for (;I.end() != true; I++) {
+ if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) {
+ if(_config->FindI("Debug::pkgAutoRemove",false)) {
+ std::clog << "Resolve installed new pkg: " << I.Name()
+ << " (now marking it as auto)" << std::endl;
+ }
+ Cache[I].Flags |= pkgCache::Flag::Auto;
+ }
+ }
+
+
return true;
}
/*}}}*/
@@ -1071,6 +1122,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
system was non-broken previously. */
bool pkgProblemResolver::ResolveByKeep()
{
+ pkgDepCache::ActionGroup group(Cache);
+
unsigned long Size = Cache.Head().PackageCount;
if (Debug == true)
@@ -1104,7 +1157,7 @@ bool pkgProblemResolver::ResolveByKeep()
{
if (Debug == true)
clog << "Keeping package " << I.Name() << endl;
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
if (Cache[I].InstBroken() == false)
{
K = PList - 1;
@@ -1152,7 +1205,7 @@ bool pkgProblemResolver::ResolveByKeep()
{
if (Debug == true)
clog << " Keeping Package " << Pkg.Name() << " due to dep" << endl;
- Cache.MarkKeep(Pkg);
+ Cache.MarkKeep(Pkg, false, false);
}
if (Cache[I].InstBroken() == false)
@@ -1189,6 +1242,8 @@ bool pkgProblemResolver::ResolveByKeep()
/* This is used to make sure protected packages are installed */
void pkgProblemResolver::InstallProtect()
{
+ pkgDepCache::ActionGroup group(Cache);
+
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
{
if ((Flags[I->ID] & Protected) == Protected)
@@ -1196,7 +1251,7 @@ void pkgProblemResolver::InstallProtect()
if ((Flags[I->ID] & ToRemove) == ToRemove)
Cache.MarkDelete(I);
else
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
}
}
}
@@ -1232,3 +1287,4 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
qsort(List,Count,sizeof(*List),PrioComp);
}
/*}}}*/
+
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 2b326bd65..d5a9c7b0d 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -99,7 +99,7 @@ class pkgCache::VerIterator
{
Version *Ver;
pkgCache *Owner;
-
+
void _dummy();
public:
@@ -128,6 +128,8 @@ class pkgCache::VerIterator
inline const char *Section() const {return Ver->Section == 0?0:Owner->StrP + Ver->Section;};
inline const char *Arch() const {return Ver->Arch == 0?0:Owner->StrP + Ver->Arch;};
inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Ver->ParentPkg);};
+ inline DescIterator DescriptionList() const;
+ DescIterator TranslatedDescription() const;
inline DepIterator DependsList() const;
inline PrvIterator ProvidesList() const;
inline VerFileIterator FileList() const;
@@ -148,6 +150,50 @@ class pkgCache::VerIterator
};
};
+// Description Iterator
+class pkgCache::DescIterator
+{
+ Description *Desc;
+ pkgCache *Owner;
+
+ void _dummy();
+
+ public:
+
+ // Iteration
+ void operator ++(int) {if (Desc != Owner->DescP) Desc = Owner->DescP + Desc->NextDesc;};
+ inline void operator ++() {operator ++(0);};
+ inline bool end() const {return Desc == Owner->DescP?true:false;};
+ inline void operator =(const DescIterator &B) {Desc = B.Desc; Owner = B.Owner;};
+
+ // Comparison
+ inline bool operator ==(const DescIterator &B) const {return Desc == B.Desc;};
+ inline bool operator !=(const DescIterator &B) const {return Desc != B.Desc;};
+ int CompareDesc(const DescIterator &B) const;
+
+ // Accessors
+ inline Description *operator ->() {return Desc;};
+ inline Description const *operator ->() const {return Desc;};
+ inline Description &operator *() {return *Desc;};
+ inline Description const &operator *() const {return *Desc;};
+ inline operator Description *() {return Desc == Owner->DescP?0:Desc;};
+ inline operator Description const *() const {return Desc == Owner->DescP?0:Desc;};
+ inline pkgCache *Cache() {return Owner;};
+
+ inline const char *LanguageCode() const {return Owner->StrP + Desc->language_code;};
+ inline const char *md5() const {return Owner->StrP + Desc->md5sum;};
+ inline DescFileIterator FileList() const;
+ inline unsigned long Index() const {return Desc - Owner->DescP;};
+
+ inline DescIterator() : Desc(0), Owner(0) {};
+ inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Desc(Trg),
+ Owner(&Owner)
+ {
+ if (Desc == 0)
+ Desc = Owner.DescP;
+ };
+};
+
// Dependency iterator
class pkgCache::DepIterator
{
@@ -338,6 +384,38 @@ class pkgCache::VerFileIterator
inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {};
};
+// Description File
+class pkgCache::DescFileIterator
+{
+ pkgCache *Owner;
+ DescFile *FileP;
+
+ public:
+
+ // Iteration
+ void operator ++(int) {if (FileP != Owner->DescFileP) FileP = Owner->DescFileP + FileP->NextFile;};
+ inline void operator ++() {operator ++(0);};
+ inline bool end() const {return FileP == Owner->DescFileP?true:false;};
+
+ // Comparison
+ inline bool operator ==(const DescFileIterator &B) const {return FileP == B.FileP;};
+ inline bool operator !=(const DescFileIterator &B) const {return FileP != B.FileP;};
+
+ // Accessors
+ inline DescFile *operator ->() {return FileP;};
+ inline DescFile const *operator ->() const {return FileP;};
+ inline DescFile const &operator *() const {return *FileP;};
+ inline operator DescFile *() {return FileP == Owner->DescFileP?0:FileP;};
+ inline operator DescFile const *() const {return FileP == Owner->DescFileP?0:FileP;};
+ inline pkgCache *Cache() {return Owner;};
+
+ inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);};
+ inline unsigned long Index() const {return FileP - Owner->DescFileP;};
+
+ inline DescFileIterator() : Owner(0), FileP(0) {};
+ inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Owner(&Owner), FileP(Trg) {};
+};
+
// Inlined Begin functions cant be in the class because of order problems
inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const
{return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);};
@@ -347,11 +425,15 @@ inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const
{return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);};
inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const
{return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);};
+inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const
+ {return DescIterator(*Owner,Owner->DescP + Ver->DescriptionList);};
inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const
{return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);};
inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const
{return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);};
inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
{return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);};
+inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const
+ {return DescFileIterator(*Owner,Owner->DescFileP + Desc->FileList);};
#endif
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index ce1beb39b..b42c82dd0 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -30,12 +30,16 @@ using namespace std;
search that short circuits when it his a package file in the dir.
This speeds it up greatly as the majority of the size is in the
binary-* sub dirs. */
-bool pkgCdrom::FindPackages(string CD,vector<string> &List,
- vector<string> &SList, vector<string> &SigList,
+bool pkgCdrom::FindPackages(string CD,
+ vector<string> &List,
+ vector<string> &SList,
+ vector<string> &SigList,
+ vector<string> &TransList,
string &InfoDir, pkgCdromStatus *log,
unsigned int Depth)
{
static ino_t Inodes[9];
+ DIR *D;
// if we have a look we "pulse" now
if(log)
@@ -90,8 +94,28 @@ bool pkgCdrom::FindPackages(string CD,vector<string> &List,
if (_config->FindB("APT::CDROM::Thorough",false) == false)
return true;
}
+
+ // see if we find translatin indexes
+ if (stat("i18n",&Buf) == 0)
+ {
+ D = opendir("i18n");
+ for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
+ {
+ if(strstr(Dir->d_name,"Translation") != NULL)
+ {
+ if (_config->FindB("Debug::aptcdrom",false) == true)
+ std::clog << "found translations: " << Dir->d_name << "\n";
+ string file = Dir->d_name;
+ if(file.substr(file.size()-3,file.size()) == ".gz")
+ file = file.substr(0,file.size()-3);
+ TransList.push_back(CD+"i18n/"+ file);
+ }
+ }
+ closedir(D);
+ }
+
- DIR *D = opendir(".");
+ D = opendir(".");
if (D == 0)
return _error->Errno("opendir","Unable to read %s",CD.c_str());
@@ -127,7 +151,7 @@ bool pkgCdrom::FindPackages(string CD,vector<string> &List,
Inodes[Depth] = Buf.st_ino;
// Descend
- if (FindPackages(CD + Dir->d_name,List,SList,SigList,InfoDir,log,Depth+1) == false)
+ if (FindPackages(CD + Dir->d_name,List,SList,SigList,TransList,InfoDir,log,Depth+1) == false)
break;
if (chdir(CD.c_str()) != 0)
@@ -612,9 +636,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
vector<string> List;
vector<string> SourceList;
vector<string> SigList;
+ vector<string> TransList;
string StartDir = SafeGetCWD();
string InfoDir;
- if (FindPackages(CDROM,List,SourceList, SigList,InfoDir,log) == false)
+ if (FindPackages(CDROM,List,SourceList, SigList,TransList,InfoDir,log) == false)
{
log->Update("\n");
return false;
@@ -642,11 +667,13 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
DropRepeats(List,"Packages");
DropRepeats(SourceList,"Sources");
DropRepeats(SigList,"Release.gpg");
+ DropRepeats(TransList,"");
if(log) {
msg.str("");
- ioprintf(msg, _("Found %i package indexes, %i source indexes and "
- "%i signatures\n"),
- List.size(), SourceList.size(), SigList.size());
+ ioprintf(msg, _("Found %i package indexes, %i source indexes, "
+ "%i translation indexes and %i signatures\n"),
+ List.size(), SourceList.size(), TransList.size(),
+ SigList.size());
log->Update(msg.str(), STEP_SCAN);
}
@@ -736,8 +763,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
// Copy the package files to the state directory
PackageCopy Copy;
SourceCopy SrcCopy;
+ TranslationsCopy TransCopy;
if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
- SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false)
+ SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
+ TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)
return false;
// reduce the List so that it takes less space in sources.list
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 085eb64e2..e18aaff3e 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -50,8 +50,11 @@ class pkgCdrom
};
- bool FindPackages(string CD,vector<string> &List,
- vector<string> &SList, vector<string> &SigList,
+ bool FindPackages(string CD,
+ vector<string> &List,
+ vector<string> &SList,
+ vector<string> &SigList,
+ vector<string> &TransList,
string &InfoDir, pkgCdromStatus *log,
unsigned int Depth = 0);
bool DropBinaryArch(vector<string> &List);
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index d96155917..37d263794 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -32,12 +32,55 @@
#include <regex.h>
#include <errno.h>
#include <stdarg.h>
+#include <iconv.h>
#include "config.h"
using namespace std;
/*}}}*/
+// UTF8ToCodeset - Convert some UTF-8 string for some codeset /*{{{*/
+// ---------------------------------------------------------------------
+/* This is handy to use before display some information for enduser */
+bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
+{
+ iconv_t cd;
+ const char *inbuf;
+ char *inptr, *outbuf, *outptr;
+ size_t insize, outsize;
+
+ cd = iconv_open(codeset, "UTF-8");
+ if (cd == (iconv_t)(-1)) {
+ // Something went wrong
+ if (errno == EINVAL)
+ _error->Error("conversion from 'UTF-8' to '%s' not available",
+ codeset);
+ else
+ perror("iconv_open");
+
+ // Clean the destination string
+ *dest = "";
+
+ return false;
+ }
+
+ insize = outsize = orig.size();
+ inbuf = orig.data();
+ inptr = (char *)inbuf;
+ outbuf = new char[insize+1];
+ outptr = outbuf;
+
+ iconv(cd, &inptr, &insize, &outptr, &outsize);
+ *outptr = '\0';
+
+ *dest = outbuf;
+ delete[] outbuf;
+
+ iconv_close(cd);
+
+ return true;
+}
+ /*}}}*/
// strstrip - Remove white space from the front and back of a string /*{{{*/
// ---------------------------------------------------------------------
/* This is handy to use when parsing a file. It also removes \n's left
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 6ec2b7811..254087267 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -38,7 +38,8 @@ using std::ostream;
#define APT_FORMAT2
#define APT_FORMAT3
#endif
-
+
+bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest);
char *_strstrip(char *String);
char *_strtabexpand(char *String,size_t Len);
bool ParseQuoteWord(const char *&String,string &Res);
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index ff8bce85d..38ecdd16a 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -320,6 +320,170 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
}
/*}}}*/
+// TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section) :
+ pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section)
+{
+}
+ /*}}}*/
+// TranslationIndex::Trans* - Return the URI to the translation files /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+inline string debTranslationsIndex::IndexFile(const char *Type) const
+{
+ return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
+}
+string debTranslationsIndex::IndexURI(const char *Type) const
+{
+ string Res;
+ if (Dist[Dist.size() - 1] == '/')
+ {
+ if (Dist != "/")
+ Res = URI + Dist;
+ else
+ Res = URI;
+ }
+ else
+ Res = URI + "dists/" + Dist + '/' + Section +
+ "/i18n/Translation-";
+
+ Res += Type;
+ return Res;
+}
+ /*}}}*/
+// TranslationsIndex::GetIndexes - Fetch the index files /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const
+{
+ if (TranslationsAvailable()) {
+ string TranslationFile = "Translation-" + LanguageCode();
+ new pkgAcqIndexTrans(Owner, IndexURI(LanguageCode().c_str()),
+ Info(TranslationFile.c_str()),
+ TranslationFile);
+ }
+
+ return true;
+}
+ /*}}}*/
+// TranslationsIndex::Describe - Give a descriptive path to the index /*{{{*/
+// ---------------------------------------------------------------------
+/* This should help the user find the index in the sources.list and
+ in the filesystem for problem solving */
+string debTranslationsIndex::Describe(bool Short) const
+{
+ char S[300];
+ if (Short == true)
+ snprintf(S,sizeof(S),"%s",Info(TranslationFile().c_str()).c_str());
+ else
+ snprintf(S,sizeof(S),"%s (%s)",Info(TranslationFile().c_str()).c_str(),
+ IndexFile(LanguageCode().c_str()).c_str());
+ return S;
+}
+ /*}}}*/
+// TranslationsIndex::Info - One liner describing the index URI /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debTranslationsIndex::Info(const char *Type) const
+{
+ string Info = ::URI::SiteOnly(URI) + ' ';
+ if (Dist[Dist.size() - 1] == '/')
+ {
+ if (Dist != "/")
+ Info += Dist;
+ }
+ else
+ Info += Dist + '/' + Section;
+ Info += " ";
+ Info += Type;
+ return Info;
+}
+ /*}}}*/
+bool debTranslationsIndex::HasPackages() const
+{
+ if(!TranslationsAvailable())
+ return false;
+
+ return FileExists(IndexFile(LanguageCode().c_str()));
+}
+
+// TranslationsIndex::Exists - Check if the index is available /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool debTranslationsIndex::Exists() const
+{
+ return FileExists(IndexFile(LanguageCode().c_str()));
+}
+ /*}}}*/
+// TranslationsIndex::Size - Return the size of the index /*{{{*/
+// ---------------------------------------------------------------------
+/* This is really only used for progress reporting. */
+unsigned long debTranslationsIndex::Size() const
+{
+ struct stat S;
+ if (stat(IndexFile(LanguageCode().c_str()).c_str(),&S) != 0)
+ return 0;
+ return S.st_size;
+}
+ /*}}}*/
+// TranslationsIndex::Merge - Load the index file into a cache /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const
+{
+ // Check the translation file, if in use
+ string TranslationFile = IndexFile(LanguageCode().c_str());
+ if (TranslationsAvailable() && FileExists(TranslationFile))
+ {
+ FileFd Trans(TranslationFile,FileFd::ReadOnly);
+ debListParser TransParser(&Trans);
+ if (_error->PendingError() == true)
+ return false;
+
+ Prog.SubProgress(0, Info(TranslationFile.c_str()));
+ if (Gen.SelectFile(TranslationFile,string(),*this) == false)
+ return _error->Error("Problem with SelectFile %s",TranslationFile.c_str());
+
+ // Store the IMS information
+ pkgCache::PkgFileIterator TransFile = Gen.GetCurFile();
+ struct stat TransSt;
+ if (fstat(Trans.Fd(),&TransSt) != 0)
+ return _error->Errno("fstat","Failed to stat");
+ TransFile->Size = TransSt.st_size;
+ TransFile->mtime = TransSt.st_mtime;
+
+ if (Gen.MergeList(TransParser) == false)
+ return _error->Error("Problem with MergeList %s",TranslationFile.c_str());
+ }
+
+ return true;
+}
+ /*}}}*/
+// TranslationsIndex::FindInCache - Find this index /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
+{
+ string FileName = IndexFile(LanguageCode().c_str());
+
+ pkgCache::PkgFileIterator File = Cache.FileBegin();
+ for (; File.end() == false; File++)
+ {
+ if (FileName != File.FileName())
+ continue;
+
+ struct stat St;
+ if (stat(File.FileName(),&St) != 0)
+ return pkgCache::PkgFileIterator(Cache);
+ if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
+ return pkgCache::PkgFileIterator(Cache);
+ return File;
+ }
+ return File;
+}
+ /*}}}*/
// StatusIndex::debStatusIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -416,6 +580,11 @@ class debIFTypePkg : public pkgIndexFile::Type
};
debIFTypePkg() {Label = "Debian Package Index";};
};
+class debIFTypeTrans : public debIFTypePkg
+{
+ public:
+ debIFTypeTrans() {Label = "Debian Translation Index";};
+};
class debIFTypeStatus : public pkgIndexFile::Type
{
public:
@@ -428,6 +597,7 @@ class debIFTypeStatus : public pkgIndexFile::Type
};
static debIFTypeSrc _apt_Src;
static debIFTypePkg _apt_Pkg;
+static debIFTypeTrans _apt_Trans;
static debIFTypeStatus _apt_Status;
const pkgIndexFile::Type *debSourcesIndex::GetType() const
@@ -438,6 +608,10 @@ const pkgIndexFile::Type *debPackagesIndex::GetType() const
{
return &_apt_Pkg;
}
+const pkgIndexFile::Type *debTranslationsIndex::GetType() const
+{
+ return &_apt_Trans;
+}
const pkgIndexFile::Type *debStatusIndex::GetType() const
{
return &_apt_Status;
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index a1b9583a4..57005222f 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -74,6 +74,36 @@ class debPackagesIndex : public pkgIndexFile
debPackagesIndex(string URI,string Dist,string Section,bool Trusted);
};
+class debTranslationsIndex : public pkgIndexFile
+{
+ string URI;
+ string Dist;
+ string Section;
+
+ string Info(const char *Type) const;
+ string IndexFile(const char *Type) const;
+ string IndexURI(const char *Type) const;
+
+ inline string TranslationFile() const {return "Translation-" + LanguageCode();};
+
+ public:
+
+ virtual const Type *GetType() const;
+
+ // Interface for acquire
+ virtual string Describe(bool Short) const;
+ virtual bool GetIndexes(pkgAcquire *Owner) const;
+
+ // Interface for the Cache Generator
+ virtual bool Exists() const;
+ virtual bool HasPackages() const;
+ virtual unsigned long Size() const;
+ virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
+ virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
+
+ debTranslationsIndex(string URI,string Dist,string Section);
+};
+
class debSourcesIndex : public pkgIndexFile
{
string URI;
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index d0dc7a260..074abea6d 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -15,6 +15,7 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/crc-16.h>
+#include <apt-pkg/md5.h>
#include <ctype.h>
@@ -104,6 +105,8 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
return false;
if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false)
return false;
+ if (ParseDepends(Ver,"Breaks",pkgCache::Dep::DpkgBreaks) == false)
+ return false;
if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false)
return false;
@@ -117,6 +120,48 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
return true;
}
/*}}}*/
+// ListParser::Description - Return the description string /*{{{*/
+// ---------------------------------------------------------------------
+/* This is to return the string describing the package in debian
+ form. If this returns the blank string then the entry is assumed to
+ only describe package properties */
+string debListParser::Description()
+{
+ if (DescriptionLanguage().empty())
+ return Section.FindS("Description");
+ else
+ return Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str());
+}
+ /*}}}*/
+// ListParser::DescriptionLanguage - Return the description lang string /*{{{*/
+// ---------------------------------------------------------------------
+/* This is to return the string describing the language of
+ description. If this returns the blank string then the entry is
+ assumed to describe original description. */
+string debListParser::DescriptionLanguage()
+{
+ return Section.FindS("Description").empty() ? pkgIndexFile::LanguageCode() : "";
+}
+ /*}}}*/
+// ListParser::Description - Return the description_md5 MD5SumValue /*{{{*/
+// ---------------------------------------------------------------------
+/* This is to return the md5 string to allow the check if it is the right
+ description. If no Description-md5 is found in the section it will be
+ calculated.
+ */
+MD5SumValue debListParser::Description_md5()
+{
+ string value = Section.FindS("Description-md5");
+
+ if (value.empty())
+ {
+ MD5Summation md5;
+ md5.Add((Description() + "\n").c_str());
+ return md5.Result();
+ } else
+ return MD5SumValue(value);
+}
+ /*}}}*/
// ListParser::UsePackage - Update a package structure /*{{{*/
// ---------------------------------------------------------------------
/* This is called to update the package with any new information
@@ -150,6 +195,7 @@ unsigned short debListParser::VersionHash()
// "Suggests",
// "Recommends",
"Conflicts",
+ "Breaks",
"Replaces",0};
unsigned long Result = INIT_FCS;
char S[1024];
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 3a0e0421b..34bb29c72 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -12,6 +12,7 @@
#define PKGLIB_DEBLISTPARSER_H
#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/indexfile.h>
#include <apt-pkg/tagfile.h>
class debListParser : public pkgCacheGenerator::ListParser
@@ -47,6 +48,9 @@ class debListParser : public pkgCacheGenerator::ListParser
virtual string Package();
virtual string Version();
virtual bool NewVersion(pkgCache::VerIterator Ver);
+ virtual string Description();
+ virtual string DescriptionLanguage();
+ virtual MD5SumValue Description_md5();
virtual unsigned short VersionHash();
virtual bool UsePackage(pkgCache::PkgIterator Pkg,
pkgCache::VerIterator Ver);
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 85e5b16b3..8cf31b326 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -157,6 +157,16 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const
ComputeIndexTargets(),
new indexRecords (Dist));
+ // Queue the translations
+ for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin();
+ I != SectionEntries.end(); I++) {
+
+ if((*I)->IsSrc)
+ continue;
+ debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section);
+ i.GetIndexes(Owner);
+ }
+
return true;
}
@@ -181,11 +191,16 @@ vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()
Indexes = new vector <pkgIndexFile*>;
for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin();
- I != SectionEntries.end(); I++)
+ I != SectionEntries.end(); I++) {
if ((*I)->IsSrc)
Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted()));
else
+ {
Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted()));
+ Indexes->push_back(new debTranslationsIndex(URI, Dist, (*I)->Section));
+ }
+ }
+
return Indexes;
}
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 6652a6ad9..518988bb6 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -12,7 +12,9 @@
#pragma implementation "apt-pkg/debrecords.h"
#endif
#include <apt-pkg/debrecords.h>
+#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
+#include <langinfo.h>
/*}}}*/
// RecordParser::debRecordParser - Constructor /*{{{*/
@@ -31,6 +33,10 @@ bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver)
{
return Tags.Jump(Section,Ver->Offset);
}
+bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
+{
+ return Tags.Jump(Section,Desc->Offset);
+}
/*}}}*/
// RecordParser::FileName - Return the archive filename on the site /*{{{*/
// ---------------------------------------------------------------------
@@ -77,7 +83,7 @@ string debRecordParser::Maintainer()
/* */
string debRecordParser::ShortDesc()
{
- string Res = Section.FindS("Description");
+ string Res = LongDesc();
string::size_type Pos = Res.find('\n');
if (Pos == string::npos)
return Res;
@@ -89,7 +95,20 @@ string debRecordParser::ShortDesc()
/* */
string debRecordParser::LongDesc()
{
- return Section.FindS("Description");
+ string orig, dest;
+ char *codeset = nl_langinfo(CODESET);
+
+ if (!Section.FindS("Description").empty())
+ orig = Section.FindS("Description").c_str();
+ else
+ orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str();
+
+ if (strcmp(codeset,"UTF-8") != 0) {
+ UTF8ToCodeset(codeset, orig, &dest);
+ orig = dest;
+ }
+
+ return orig;
}
/*}}}*/
// RecordParser::SourcePkg - Return the source package name if any /*{{{*/
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index efef2e588..24e5aab88 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -19,6 +19,7 @@
#endif
#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/indexfile.h>
#include <apt-pkg/tagfile.h>
class debRecordParser : public pkgRecords::Parser
@@ -30,6 +31,7 @@ class debRecordParser : public pkgRecords::Parser
protected:
virtual bool Jump(pkgCache::VerFileIterator const &Ver);
+ virtual bool Jump(pkgCache::DescFileIterator const &Desc);
public:
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index bf0434ccc..93dff390d 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -474,6 +474,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
case Item::Install:
Args[n++] = "--unpack";
Size += strlen(Args[n-1]);
+ Args[n++] = "--auto-deconfigure";
+ Size += strlen(Args[n-1]);
break;
}
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 2ff8a9ac7..0b181dc43 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -47,7 +47,7 @@ class pkgDPkgPM : public pkgPackageManager
bool RunScripts(const char *Cnf);
bool RunScriptsWithPkgs(const char *Cnf);
bool SendV2Pkgs(FILE *F);
-
+
// The Actuall installation implementation
virtual bool Install(PkgIterator Pkg,string File);
virtual bool Configure(PkgIterator Pkg);
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index a031fa068..15d7bac43 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -16,15 +16,52 @@
#include <apt-pkg/error.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/algorithms.h>
+
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/tagfile.h>
+
+#include <iostream>
+#include <sstream>
+#include <set>
+
#include <apti18n.h>
- /*}}}*/
+
+pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
+ cache(cache), released(false)
+{
+ ++cache.group_level;
+}
+
+void pkgDepCache::ActionGroup::release()
+{
+ if(!released)
+ {
+ if(cache.group_level == 0)
+ std::cerr << "W: Unbalanced action groups, expect badness" << std::endl;
+ else
+ {
+ --cache.group_level;
+
+ if(cache.group_level == 0)
+ cache.MarkAndSweep();
+ }
+
+ released = false;
+ }
+}
+
+pkgDepCache::ActionGroup::~ActionGroup()
+{
+ release();
+}
// DepCache::pkgDepCache - Constructors /*{{{*/
// ---------------------------------------------------------------------
/* */
pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) :
- Cache(pCache), PkgState(0), DepState(0)
+ group_level(0), Cache(pCache), PkgState(0), DepState(0)
{
delLocalPolicy = 0;
LocalPolicy = Plcy;
@@ -47,6 +84,10 @@ pkgDepCache::~pkgDepCache()
/* This allocats the extension buffers and initializes them. */
bool pkgDepCache::Init(OpProgress *Prog)
{
+ // Suppress mark updates during this operation (just in case) and
+ // run a mark operation when Init terminates.
+ ActionGroup actions(*this);
+
delete [] PkgState;
delete [] DepState;
PkgState = new StateCache[Head().PackageCount];
@@ -72,7 +113,7 @@ bool pkgDepCache::Init(OpProgress *Prog)
// Find the proper cache slot
StateCache &State = PkgState[I->ID];
State.iFlags = 0;
-
+
// Figure out the install version
State.CandidateVer = GetCandidateVer(I);
State.InstallVer = I.CurrentVer();
@@ -94,11 +135,130 @@ bool pkgDepCache::Init(OpProgress *Prog)
if(Prog != 0)
Prog->Done();
-
+
return true;
}
/*}}}*/
+bool pkgDepCache::readStateFile(OpProgress *Prog)
+{
+ FileFd state_file;
+ string state = _config->FindDir("Dir::State") + "extended_states";
+ if(FileExists(state)) {
+ state_file.Open(state, FileFd::ReadOnly);
+ int file_size = state_file.Size();
+ if(Prog != NULL)
+ Prog->OverallProgress(0, file_size, 1,
+ _("Reading state information"));
+
+ pkgTagFile tagfile(&state_file);
+ pkgTagSection section;
+ int amt=0;
+ while(tagfile.Step(section)) {
+ string pkgname = section.FindS("Package");
+ pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
+ // Silently ignore unknown packages and packages with no actual
+ // version.
+ if(!pkg.end() && !pkg.VersionList().end()) {
+ short reason = section.FindI("Auto-Installed", 0);
+ if(reason > 0)
+ PkgState[pkg->ID].Flags |= Flag::Auto;
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::cout << "Auto-Installed : " << pkgname << std::endl;
+ amt+=section.size();
+ if(Prog != NULL)
+ Prog->OverallProgress(amt, file_size, 1,
+ _("Reading state information"));
+ }
+ if(Prog != NULL)
+ Prog->OverallProgress(file_size, file_size, 1,
+ _("Reading state information"));
+ }
+ }
+
+ return true;
+}
+
+bool pkgDepCache::writeStateFile(OpProgress *prog)
+{
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::clog << "pkgDepCache::writeStateFile()" << std::endl;
+
+ FileFd StateFile;
+ string state = _config->FindDir("Dir::State") + "extended_states";
+
+ // if it does not exist, create a empty one
+ if(!FileExists(state))
+ {
+ StateFile.Open(state, FileFd::WriteEmpty);
+ StateFile.Close();
+ }
+
+ // open it
+ if(!StateFile.Open(state, FileFd::ReadOnly))
+ return _error->Error(_("Failed to open StateFile %s"),
+ state.c_str());
+
+ FILE *OutFile;
+ string outfile = state + ".tmp";
+ if((OutFile = fopen(outfile.c_str(),"w")) == NULL)
+ return _error->Error(_("Failed to write temporary StateFile %s"),
+ outfile.c_str());
+
+ // first merge with the existing sections
+ pkgTagFile tagfile(&StateFile);
+ pkgTagSection section;
+ std::set<string> pkgs_seen;
+ const char *nullreorderlist[] = {0};
+ while(tagfile.Step(section)) {
+ string pkgname = section.FindS("Package");
+ // Silently ignore unknown packages and packages with no actual
+ // version.
+ pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
+ if(pkg.end() || pkg.VersionList().end())
+ continue;
+ bool oldAuto = section.FindI("Auto-Installed");
+ bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto);
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::clog << "Update exisiting AutoInstall info: "
+ << pkg.Name() << std::endl;
+ TFRewriteData rewrite[2];
+ rewrite[0].Tag = "Auto-Installed";
+ rewrite[0].Rewrite = newAuto ? "1" : "0";
+ rewrite[0].NewTag = 0;
+ rewrite[1].Tag = 0;
+ TFRewrite(OutFile, section, nullreorderlist, rewrite);
+ fprintf(OutFile,"\n");
+ pkgs_seen.insert(pkgname);
+ }
+
+ // then write the ones we have not seen yet
+ std::ostringstream ostr;
+ for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) {
+ if(PkgState[pkg->ID].Flags & Flag::Auto) {
+ if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) {
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::clog << "Skipping already written " << pkg.Name() << std::endl;
+ continue;
+ }
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::clog << "Writing new AutoInstall: "
+ << pkg.Name() << std::endl;
+ ostr.str(string(""));
+ ostr << "Package: " << pkg.Name()
+ << "\nAuto-Installed: 1\n\n";
+ fprintf(OutFile,ostr.str().c_str());
+ fprintf(OutFile,"\n");
+ }
+ }
+ fclose(OutFile);
+
+ // move the outfile over the real file
+ rename(outfile.c_str(), state.c_str());
+
+ return true;
+}
+
// DepCache::CheckDep - Checks a single dependency /*{{{*/
// ---------------------------------------------------------------------
/* This first checks the dependency against the main target package and
@@ -113,7 +273,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res)
we allow it anyhow because dpkg does. Technically it is a packaging
bug. Conflicts may never self match */
if (Dep.TargetPkg() != Dep.ParentPkg() ||
- (Dep->Type != Dep::Conflicts && Dep->Type != Dep::Obsoletes))
+ (Dep->Type != Dep::Conflicts && Dep->Type != Dep::DpkgBreaks && Dep->Type != Dep::Obsoletes))
{
PkgIterator Pkg = Dep.TargetPkg();
// Check the base package
@@ -143,7 +303,8 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res)
{
/* Provides may never be applied against the same package if it is
a conflicts. See the comment above. */
- if (P.OwnerPkg() == Pkg && Dep->Type == Dep::Conflicts)
+ if (P.OwnerPkg() == Pkg &&
+ (Dep->Type == Dep::Conflicts || Dep->Type == Dep::DpkgBreaks))
continue;
// Check if the provides is a hit
@@ -297,7 +458,9 @@ void pkgDepCache::BuildGroupOrs(VerIterator const &V)
/* Invert for Conflicts. We have to do this twice to get the
right sense for a conflicts group */
- if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes)
+ if (D->Type == Dep::Conflicts ||
+ D->Type == Dep::DpkgBreaks ||
+ D->Type == Dep::Obsoletes)
State = ~State;
// Add to the group if we are within an or..
@@ -308,7 +471,9 @@ void pkgDepCache::BuildGroupOrs(VerIterator const &V)
Group = 0;
// Invert for Conflicts
- if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes)
+ if (D->Type == Dep::Conflicts ||
+ D->Type == Dep::DpkgBreaks ||
+ D->Type == Dep::Obsoletes)
State = ~State;
}
}
@@ -441,7 +606,9 @@ void pkgDepCache::Update(OpProgress *Prog)
Group = 0;
// Invert for Conflicts
- if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes)
+ if (D->Type == Dep::Conflicts ||
+ D->Type == Dep::DpkgBreaks ||
+ D->Type == Dep::Obsoletes)
State = ~State;
}
}
@@ -454,12 +621,14 @@ void pkgDepCache::Update(OpProgress *Prog)
if (Prog != 0)
Prog->Progress(Done);
+
+ readStateFile(Prog);
}
/*}}}*/
// DepCache::Update - Update the deps list of a package /*{{{*/
// ---------------------------------------------------------------------
/* This is a helper for update that only does the dep portion of the scan.
- It is mainly ment to scan reverse dependencies. */
+ It is mainly meant to scan reverse dependencies. */
void pkgDepCache::Update(DepIterator D)
{
// Update the reverse deps
@@ -469,7 +638,9 @@ void pkgDepCache::Update(DepIterator D)
State = DependencyState(D);
// Invert for Conflicts
- if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes)
+ if (D->Type == Dep::Conflicts ||
+ D->Type == Dep::DpkgBreaks ||
+ D->Type == Dep::Obsoletes)
State = ~State;
RemoveStates(D.ParentPkg());
@@ -511,7 +682,7 @@ void pkgDepCache::Update(PkgIterator const &Pkg)
// DepCache::MarkKeep - Put the package in the keep state /*{{{*/
// ---------------------------------------------------------------------
/* */
-void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft)
+void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser)
{
// Simplifies other routines.
if (Pkg.end() == true)
@@ -523,6 +694,9 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft)
Pkg.CurrentVer().Downloadable() == false)
return;
+ /** \todo Can this be moved later in the method? */
+ ActionGroup group(*this);
+
/* We changed the soft state all the time so the UI is a bit nicer
to use */
StateCache &P = PkgState[Pkg->ID];
@@ -539,7 +713,8 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft)
if (Pkg->VersionList == 0)
return;
- P.Flags &= ~Flag::Auto;
+ if(FromUser && !P.Marked)
+ P.Flags &= ~Flag::Auto;
RemoveSizes(Pkg);
RemoveStates(Pkg);
@@ -565,6 +740,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
if (Pkg.end() == true)
return;
+ ActionGroup group(*this);
+
// Check that it is not already marked for delete
StateCache &P = PkgState[Pkg->ID];
P.iFlags &= ~(AutoKept | Purge);
@@ -587,7 +764,6 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
else
P.Mode = ModeDelete;
P.InstallVer = 0;
- P.Flags &= Flag::Auto;
AddStates(Pkg);
Update(Pkg);
@@ -598,7 +774,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
// ---------------------------------------------------------------------
/* */
void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
- unsigned long Depth, bool ForceImportantDeps)
+ unsigned long Depth, bool FromUser,
+ bool ForceImportantDeps)
{
if (Depth > 100)
return;
@@ -607,6 +784,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
if (Pkg.end() == true)
return;
+ ActionGroup group(*this);
+
/* Check that it is not already marked for install and that it can be
installed */
StateCache &P = PkgState[Pkg->ID];
@@ -616,7 +795,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
P.CandidateVer == (Version *)Pkg.CurrentVer()))
{
if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0)
- MarkKeep(Pkg);
+ MarkKeep(Pkg, false, FromUser);
return;
}
@@ -634,7 +813,20 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
P.Mode = ModeInstall;
P.InstallVer = P.CandidateVer;
- P.Flags &= ~Flag::Auto;
+
+ if(FromUser)
+ {
+ // Set it to manual if it's a new install or cancelling the
+ // removal of a garbage package.
+ if(P.Status == 2 || (!Pkg.CurrentVer().end() && !P.Marked))
+ P.Flags &= ~Flag::Auto;
+ }
+ else
+ {
+ // Set it to auto if this is a new install.
+ if(P.Status == 2)
+ P.Flags |= Flag::Auto;
+ }
if (P.CandidateVer == (Version *)Pkg.CurrentVer())
P.Mode = ModeKeep;
@@ -713,7 +905,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
/* This bit is for processing the possibilty of an install/upgrade
fixing the problem */
SPtrArray<Version *> List = Start.AllTargets();
- if ((DepState[Start->ID] & DepCVer) == DepCVer)
+ if (Start->Type != Dep::DpkgBreaks &&
+ (DepState[Start->ID] & DepCVer) == DepCVer)
{
// Right, find the best version to install..
Version **Cur = List;
@@ -744,33 +937,37 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
}
}
- if (InstPkg.end() == false)
+ if (InstPkg.end() == false)
{
if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
std::clog << "Installing " << InstPkg.Name()
<< " as dep of " << Pkg.Name()
<< std::endl;
- MarkInstall(InstPkg,true,Depth + 1, ForceImportantDeps);
+ MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps);
// Set the autoflag, after MarkInstall because MarkInstall unsets it
if (P->CurrentVer == 0)
PkgState[InstPkg->ID].Flags |= Flag::Auto;
}
-
continue;
}
-
+
/* For conflicts we just de-install the package and mark as auto,
- Conflicts may not have or groups */
- if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes)
+ Conflicts may not have or groups. For dpkg's Breaks we try to
+ upgrade the package. */
+ if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes ||
+ Start->Type == Dep::DpkgBreaks)
{
for (Version **I = List; *I != 0; I++)
{
VerIterator Ver(*this,*I);
PkgIterator Pkg = Ver.ParentPkg();
-
- MarkDelete(Pkg);
- PkgState[Pkg->ID].Flags |= Flag::Auto;
+
+ if (Start->Type != Dep::DpkgBreaks)
+ MarkDelete(Pkg);
+ else
+ if (PkgState[Pkg->ID].CandidateVer != *I)
+ MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps);
}
continue;
}
@@ -782,6 +979,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
/* */
void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To)
{
+ ActionGroup group(*this);
+
RemoveSizes(Pkg);
RemoveStates(Pkg);
@@ -800,9 +999,11 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To)
/* */
void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
{
+ ActionGroup group(*this);
+
pkgCache::PkgIterator Pkg = TargetVer.ParentPkg();
StateCache &P = PkgState[Pkg->ID];
-
+
RemoveSizes(Pkg);
RemoveStates(Pkg);
@@ -815,6 +1016,18 @@ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
Update(Pkg);
AddSizes(Pkg);
}
+
+void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto)
+{
+ StateCache &state = PkgState[Pkg->ID];
+
+ ActionGroup group(*this);
+
+ if(Auto)
+ state.Flags |= Flag::Auto;
+ else
+ state.Flags &= ~Flag::Auto;
+}
/*}}}*/
// StateCache::Update - Compute the various static display things /*{{{*/
// ---------------------------------------------------------------------
@@ -897,6 +1110,221 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg)
return Last;
}
/*}}}*/
+ /*}}}*/
+
+pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc()
+ : constructedSuccessfully(false)
+{
+ Configuration::Item const *Opts;
+ Opts = _config->Tree("APT::NeverAutoRemove");
+ if (Opts != 0 && Opts->Child != 0)
+ {
+ Opts = Opts->Child;
+ for (; Opts != 0; Opts = Opts->Next)
+ {
+ if (Opts->Value.empty() == true)
+ continue;
+
+ regex_t *p = new regex_t;
+ if(regcomp(p,Opts->Value.c_str(),
+ REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0)
+ {
+ regfree(p);
+ delete p;
+ _error->Error("Regex compilation error for APT::NeverAutoRemove");
+ return;
+ }
+
+ rootSetRegexp.push_back(p);
+ }
+ }
+
+ constructedSuccessfully = true;
+}
+
+pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()
+{
+ for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
+ {
+ regfree(rootSetRegexp[i]);
+ delete rootSetRegexp[i];
+ }
+}
+
+
+bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg)
+{
+ for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
+ if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0)
+ return true;
+
+ return false;
+}
+
+pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()
+{
+ DefaultRootSetFunc *f = new DefaultRootSetFunc;
+ if(f->wasConstructedSuccessfully())
+ return f;
+ else
+ {
+ delete f;
+ return NULL;
+ }
+}
+
+bool pkgDepCache::MarkFollowsRecommends()
+{
+ return _config->FindB("APT::AutoRemove::RecommendsImportant", true);
+}
+
+bool pkgDepCache::MarkFollowsSuggests()
+{
+ return _config->FindB("APT::AutoRemove::SuggestsImportant", false);
+}
+
+// the main mark algorithm
+bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
+{
+ bool follow_recommends;
+ bool follow_suggests;
+
+ // init the states
+ for(PkgIterator p = PkgBegin(); !p.end(); ++p)
+ {
+ PkgState[p->ID].Marked = false;
+ PkgState[p->ID].Garbage = false;
+
+ // debug output
+ if(_config->FindB("Debug::pkgAutoRemove",false)
+ && PkgState[p->ID].Flags & Flag::Auto)
+ std::clog << "AutoDep: " << p.Name() << std::endl;
+ }
+
+ // init vars
+ follow_recommends = MarkFollowsRecommends();
+ follow_suggests = MarkFollowsSuggests();
+
+
+
+ // do the mark part, this is the core bit of the algorithm
+ for(PkgIterator p = PkgBegin(); !p.end(); ++p)
+ {
+ if(!(PkgState[p->ID].Flags & Flag::Auto) ||
+ (p->Flags & Flag::Essential) ||
+ userFunc.InRootSet(p))
+
+ {
+ // the package is installed (and set to keep)
+ if(PkgState[p->ID].Keep() && !p.CurrentVer().end())
+ MarkPackage(p, p.CurrentVer(),
+ follow_recommends, follow_suggests);
+ // the package is to be installed
+ else if(PkgState[p->ID].Install())
+ MarkPackage(p, PkgState[p->ID].InstVerIter(*this),
+ follow_recommends, follow_suggests);
+ }
+ }
+
+ return true;
+}
+
+// mark a single package in Mark-and-Sweep
+void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
+ const pkgCache::VerIterator &ver,
+ bool follow_recommends,
+ bool follow_suggests)
+{
+ pkgDepCache::StateCache &state = PkgState[pkg->ID];
+ VerIterator candver = state.CandidateVerIter(*this);
+ VerIterator instver = state.InstVerIter(*this);
+
+#if 0
+ // If a package was garbage-collected but is now being marked, we
+ // should re-select it
+ // For cases when a pkg is set to upgrade and this trigger the
+ // removal of a no-longer used dependency. if the pkg is set to
+ // keep again later it will result in broken deps
+ if(state.Delete() && state.RemoveReason = Unused)
+ {
+ if(ver==candver)
+ mark_install(pkg, false, false, NULL);
+ else if(ver==pkg.CurrentVer())
+ MarkKeep(pkg, false, false);
+
+ instver=state.InstVerIter(*this);
+ }
+#endif
+
+ // Ignore versions other than the InstVer, and ignore packages
+ // that are already going to be removed or just left uninstalled.
+ if(!(ver == instver && !instver.end()))
+ return;
+
+ // if we are marked already we are done
+ if(state.Marked)
+ return;
+
+ //std::cout << "Setting Marked for: " << pkg.Name() << std::endl;
+ state.Marked=true;
+
+ if(!ver.end())
+ {
+ for(DepIterator d = ver.DependsList(); !d.end(); ++d)
+ {
+ if(d->Type == Dep::Depends ||
+ d->Type == Dep::PreDepends ||
+ (follow_recommends &&
+ d->Type == Dep::Recommends) ||
+ (follow_suggests &&
+ d->Type == Dep::Suggests))
+ {
+ // Try all versions of this package.
+ for(VerIterator V = d.TargetPkg().VersionList();
+ !V.end(); ++V)
+ {
+ if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer()))
+ {
+ MarkPackage(V.ParentPkg(), V,
+ follow_recommends, follow_suggests);
+ }
+ }
+ // Now try virtual packages
+ for(PrvIterator prv=d.TargetPkg().ProvidesList();
+ !prv.end(); ++prv)
+ {
+ if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp,
+ d.TargetVer()))
+ {
+ MarkPackage(prv.OwnerPkg(), prv.OwnerVer(),
+ follow_recommends, follow_suggests);
+ }
+ }
+ }
+ }
+ }
+}
+
+bool pkgDepCache::Sweep()
+{
+ // do the sweep
+ for(PkgIterator p=PkgBegin(); !p.end(); ++p)
+ {
+ StateCache &state=PkgState[p->ID];
+
+ // if it is not marked and it is installed, it's garbage
+ if(!state.Marked && (!p.CurrentVer().end() || state.Install()) &&
+ !state.Delete())
+ {
+ state.Garbage=true;
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::cout << "Garbage: " << p.Name() << std::endl;
+ }
+ }
+
+ return true;
+}
+
// Policy::IsImportantDep - True if the dependency is important /*{{{*/
// ---------------------------------------------------------------------
/* */
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 042abb5cc..5cd5ea354 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -1,4 +1,4 @@
-// -*- mode: cpp; mode: fold -*-
+// -*- mode: c++; mode: fold -*-
// Description /*{{{*/
// $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $
/* ######################################################################
@@ -45,9 +45,71 @@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/progress.h>
+#include <regex.h>
+
+#include <vector>
+
class pkgDepCache : protected pkgCache::Namespace
{
public:
+
+ /** \brief An arbitrary predicate on packages. */
+ class InRootSetFunc
+ {
+ public:
+ virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;};
+ virtual ~InRootSetFunc() {};
+ };
+
+ private:
+ /** \brief Mark a single package and all its unmarked important
+ * dependencies during mark-and-sweep.
+ *
+ * Recursively invokes itself to mark all dependencies of the
+ * package.
+ *
+ * \param pkg The package to mark.
+ *
+ * \param ver The version of the package that is to be marked.
+ *
+ * \param follow_recommends If \b true, recommendations of the
+ * package will be recursively marked.
+ *
+ * \param follow_suggests If \b true, suggestions of the package
+ * will be recursively marked.
+ */
+ void MarkPackage(const pkgCache::PkgIterator &pkg,
+ const pkgCache::VerIterator &ver,
+ bool follow_recommends,
+ bool follow_suggests);
+
+ /** \brief Update the Marked field of all packages.
+ *
+ * Each package's StateCache::Marked field will be set to \b true
+ * if and only if it can be reached from the root set. By
+ * default, the root set consists of the set of manually installed
+ * or essential packages, but it can be extended using the
+ * parameter #rootFunc.
+ *
+ * \param rootFunc A callback that can be used to add extra
+ * packages to the root set.
+ *
+ * \return \b false if an error occured.
+ */
+ bool MarkRequired(InRootSetFunc &rootFunc);
+
+ /** \brief Set the StateCache::Garbage flag on all packages that
+ * should be removed.
+ *
+ * Packages that were not marked by the last call to #MarkRequired
+ * are tested to see whether they are actually garbage. If so,
+ * they are marked as such.
+ *
+ * \return \b false if an error occured.
+ */
+ bool Sweep();
+
+ public:
// These flags are used in DepState
enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2),
@@ -63,6 +125,84 @@ class pkgDepCache : protected pkgCache::Namespace
enum VersionTypes {NowVersion, InstallVersion, CandidateVersion};
enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2};
+
+ /** \brief Represents an active action group.
+ *
+ * An action group is a group of actions that are currently being
+ * performed. While an active group is active, certain routine
+ * clean-up actions that would normally be performed after every
+ * cache operation are delayed until the action group is
+ * completed. This is necessary primarily to avoid inefficiencies
+ * when modifying a large number of packages at once.
+ *
+ * This class represents an active action group. Creating an
+ * instance will create an action group; destroying one will
+ * destroy the corresponding action group.
+ *
+ * The following operations are suppressed by this class:
+ *
+ * - Keeping the Marked and Garbage flags up to date.
+ *
+ * \note This can be used in the future to easily accumulate
+ * atomic actions for undo or to display "what apt did anyway";
+ * e.g., change the counter of how many action groups are active
+ * to a std::set of pointers to them and use those to store
+ * information about what happened in a group in the group.
+ */
+ class ActionGroup
+ {
+ pkgDepCache &cache;
+
+ bool released;
+
+ /** Action groups are noncopyable. */
+ ActionGroup(const ActionGroup &other);
+ public:
+ /** \brief Create a new ActionGroup.
+ *
+ * \param cache The cache that this ActionGroup should
+ * manipulate.
+ *
+ * As long as this object exists, no automatic cleanup
+ * operations will be undertaken.
+ */
+ ActionGroup(pkgDepCache &cache);
+
+ /** \brief Clean up the action group before it is destroyed.
+ *
+ * If it is destroyed later, no second cleanup wil be run.
+ */
+ void release();
+
+ /** \brief Destroy the action group.
+ *
+ * If this is the last action group, the automatic cache
+ * cleanup operations will be undertaken.
+ */
+ ~ActionGroup();
+ };
+
+ /** \brief Returns \b true for packages matching a regular
+ * expression in APT::NeverAutoRemove.
+ */
+ class DefaultRootSetFunc : public InRootSetFunc
+ {
+ std::vector<regex_t *> rootSetRegexp;
+ bool constructedSuccessfully;
+
+ public:
+ DefaultRootSetFunc();
+ ~DefaultRootSetFunc();
+
+ /** \return \b true if the class initialized successfully, \b
+ * false otherwise. Used to avoid throwing an exception, since
+ * APT classes generally don't.
+ */
+ bool wasConstructedSuccessfully() const { return constructedSuccessfully; }
+
+ bool InRootSet(const pkgCache::PkgIterator &pkg);
+ };
+
struct StateCache
{
// Epoch stripped text versions of the two version fields
@@ -79,6 +219,17 @@ class pkgDepCache : protected pkgCache::Namespace
unsigned short Flags;
unsigned short iFlags; // Internal flags
+ /** \brief \b true if this package can be reached from the root set. */
+ bool Marked;
+
+ /** \brief \b true if this package is unused and should be removed.
+ *
+ * This differs from !#Marked, because it is possible that some
+ * unreachable packages will be protected from becoming
+ * garbage.
+ */
+ bool Garbage;
+
// Various tree indicators
signed char Status; // -1,0,1,2
unsigned char Mode; // ModeList
@@ -121,6 +272,14 @@ class pkgDepCache : protected pkgCache::Namespace
virtual ~Policy() {};
};
+
+ private:
+ /** The number of open "action groups"; certain post-action
+ * operations are suppressed if this number is > 0.
+ */
+ int group_level;
+
+ friend class ActionGroup;
protected:
@@ -185,16 +344,69 @@ class pkgDepCache : protected pkgCache::Namespace
inline StateCache &operator [](PkgIterator const &I) {return PkgState[I->ID];};
inline unsigned char &operator [](DepIterator const &I) {return DepState[I->ID];};
- // Manipulators
- void MarkKeep(PkgIterator const &Pkg,bool Soft = false);
+ /** \return A function identifying packages in the root set other
+ * than manually installed packages and essential packages, or \b
+ * NULL if an error occurs.
+ *
+ * \todo Is this the best place for this function? Perhaps the
+ * settings for mark-and-sweep should be stored in a single
+ * external class?
+ */
+ virtual InRootSetFunc *GetRootSetFunc();
+
+ /** \return \b true if the garbage collector should follow recommendations.
+ */
+ virtual bool MarkFollowsRecommends();
+
+ /** \return \b true if the garbage collector should follow suggestions.
+ */
+ virtual bool MarkFollowsSuggests();
+
+ /** \brief Update the Marked and Garbage fields of all packages.
+ *
+ * This routine is implicitly invoked after all state manipulators
+ * and when an ActionGroup is destroyed. It invokes #MarkRequired
+ * and #Sweep to do its dirty work.
+ *
+ * \param rootFunc A predicate that returns \b true for packages
+ * that should be added to the root set.
+ */
+ bool MarkAndSweep(InRootSetFunc &rootFunc)
+ {
+ return MarkRequired(rootFunc) && Sweep();
+ }
+
+ bool MarkAndSweep()
+ {
+ std::auto_ptr<InRootSetFunc> f(GetRootSetFunc());
+ if(f.get() != NULL)
+ return MarkAndSweep(*f.get());
+ else
+ return false;
+ }
+
+ /** \name State Manipulators
+ */
+ // @{
+ void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
+ bool FromUser = true);
void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
- unsigned long Depth = 0, bool ForceImportantDeps = false);
+ unsigned long Depth = 0, bool FromUser = true,
+ bool ForceImportantDeps = false);
void SetReInstall(PkgIterator const &Pkg,bool To);
void SetCandidateVersion(VerIterator TargetVer);
+
+ /** Set the "is automatically installed" flag of Pkg. */
+ void MarkAuto(const PkgIterator &Pkg, bool Auto);
+ // @}
// This is for debuging
void Update(OpProgress *Prog = 0);
+
+ // read persistent states
+ bool readStateFile(OpProgress *prog);
+ bool writeStateFile(OpProgress *prog);
// Size queries
inline double UsrSize() {return iUsrSize;};
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 1f65062f7..c9dded134 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -32,6 +32,8 @@
using namespace std;
+
+
// IndexCopy::CopyPackages - Copy the package files from the CD /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -512,10 +514,10 @@ bool SourceCopy::RewriteEntry(FILE *Target,string File)
fputc('\n',Target);
return true;
}
-
-
/*}}}*/
-
+// SigVerify::Verify - Verify a files md5sum against its metaindex /*{{{*/
+// ---------------------------------------------------------------------
+/* */
bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
{
const indexRecords::checkSum *Record = MetaIndex->Lookup(file);
@@ -670,3 +672,178 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
return true;
}
+
+
+bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector<string> &List,
+ pkgCdromStatus *log)
+{
+ OpProgress *Progress = NULL;
+ if (List.size() == 0)
+ return true;
+
+ if(log)
+ Progress = log->GetOpProgress();
+
+ bool Debug = _config->FindB("Debug::aptcdrom",false);
+
+ // Prepare the progress indicator
+ unsigned long TotalSize = 0;
+ for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+ {
+ struct stat Buf;
+ if (stat(string(*I).c_str(),&Buf) != 0 &&
+ stat(string(*I + ".gz").c_str(),&Buf) != 0)
+ return _error->Errno("stat","Stat failed for %s",
+ string(*I).c_str());
+ TotalSize += Buf.st_size;
+ }
+
+ unsigned long CurrentSize = 0;
+ unsigned int NotFound = 0;
+ unsigned int WrongSize = 0;
+ unsigned int Packages = 0;
+ for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+ {
+ string OrigPath = string(*I,CDROM.length());
+ unsigned long FileSize = 0;
+
+ // Open the package file
+ FileFd Pkg;
+ if (FileExists(*I) == true)
+ {
+ Pkg.Open(*I,FileFd::ReadOnly);
+ FileSize = Pkg.Size();
+ }
+ else
+ {
+ FileFd From(*I + ".gz",FileFd::ReadOnly);
+ if (_error->PendingError() == true)
+ return false;
+ FileSize = From.Size();
+
+ // Get a temp file
+ FILE *tmp = tmpfile();
+ if (tmp == 0)
+ return _error->Errno("tmpfile","Unable to create a tmp file");
+ Pkg.Fd(dup(fileno(tmp)));
+ fclose(tmp);
+
+ // Fork gzip
+ pid_t Process = fork();
+ if (Process < 0)
+ return _error->Errno("fork","Couldn't fork gzip");
+
+ // The child
+ if (Process == 0)
+ {
+ dup2(From.Fd(),STDIN_FILENO);
+ dup2(Pkg.Fd(),STDOUT_FILENO);
+ SetCloseExec(STDIN_FILENO,false);
+ SetCloseExec(STDOUT_FILENO,false);
+
+ const char *Args[3];
+ string Tmp = _config->Find("Dir::bin::gzip","gzip");
+ Args[0] = Tmp.c_str();
+ Args[1] = "-d";
+ Args[2] = 0;
+ execvp(Args[0],(char **)Args);
+ exit(100);
+ }
+
+ // Wait for gzip to finish
+ if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false)
+ return _error->Error("gzip failed, perhaps the disk is full.");
+
+ Pkg.Seek(0);
+ }
+ pkgTagFile Parser(&Pkg);
+ if (_error->PendingError() == true)
+ return false;
+
+ // Open the output file
+ char S[400];
+ snprintf(S,sizeof(S),"cdrom:[%s]/%s",Name.c_str(),
+ (*I).c_str() + CDROM.length());
+ string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
+ TargetF += URItoFileName(S);
+ if (_config->FindB("APT::CDROM::NoAct",false) == true)
+ TargetF = "/dev/null";
+ FileFd Target(TargetF,FileFd::WriteEmpty);
+ FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
+ if (_error->PendingError() == true)
+ return false;
+ if (TargetFl == 0)
+ return _error->Errno("fdopen","Failed to reopen fd");
+
+ // Setup the progress meter
+ if(Progress)
+ Progress->OverallProgress(CurrentSize,TotalSize,FileSize,
+ string("Reading Translation Indexes"));
+
+ // Parse
+ if(Progress)
+ Progress->SubProgress(Pkg.Size());
+ pkgTagSection Section;
+ this->Section = &Section;
+ string Prefix;
+ unsigned long Hits = 0;
+ unsigned long Chop = 0;
+ while (Parser.Step(Section) == true)
+ {
+ if(Progress)
+ Progress->Progress(Parser.Offset());
+
+ const char *Start;
+ const char *Stop;
+ Section.GetSection(Start,Stop);
+ fwrite(Start,Stop-Start, 1, TargetFl);
+ fputc('\n',TargetFl);
+
+ Packages++;
+ Hits++;
+ }
+ fclose(TargetFl);
+
+ if (Debug == true)
+ cout << " Processed by using Prefix '" << Prefix << "' and chop " << Chop << endl;
+
+ if (_config->FindB("APT::CDROM::NoAct",false) == false)
+ {
+ // Move out of the partial directory
+ Target.Close();
+ string FinalF = _config->FindDir("Dir::State::lists");
+ FinalF += URItoFileName(S);
+ if (rename(TargetF.c_str(),FinalF.c_str()) != 0)
+ return _error->Errno("rename","Failed to rename");
+ }
+
+
+ CurrentSize += FileSize;
+ }
+ if(Progress)
+ Progress->Done();
+
+ // Some stats
+ if(log) {
+ stringstream msg;
+ if(NotFound == 0 && WrongSize == 0)
+ ioprintf(msg, _("Wrote %i records.\n"), Packages);
+ else if (NotFound != 0 && WrongSize == 0)
+ ioprintf(msg, _("Wrote %i records with %i missing files.\n"),
+ Packages, NotFound);
+ else if (NotFound == 0 && WrongSize != 0)
+ ioprintf(msg, _("Wrote %i records with %i mismatched files\n"),
+ Packages, WrongSize);
+ if (NotFound != 0 && WrongSize != 0)
+ ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize);
+ }
+
+ if (Packages == 0)
+ _error->Warning("No valid records were found.");
+
+ if (NotFound + WrongSize > 10)
+ _error->Warning("Alot of entries were discarded, something may be wrong.\n");
+
+
+ return true;
+}
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 4dcb2b46d..7778ae595 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -70,6 +70,17 @@ class SourceCopy : public IndexCopy
public:
};
+class TranslationsCopy
+{
+ protected:
+ pkgTagSection *Section;
+
+ public:
+ bool CopyTranslations(string CDROM,string Name,vector<string> &List,
+ pkgCdromStatus *log);
+};
+
+
class SigVerify
{
bool Verify(string prefix,string file, indexRecords *records);
@@ -81,4 +92,6 @@ class SigVerify
vector<string> PkgList,vector<string> SrcList);
};
+
+
#endif
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 49665161d..bb2210bf6 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -12,8 +12,11 @@
#pragma implementation "apt-pkg/indexfile.h"
#endif
+#include <apt-pkg/configuration.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/error.h>
+
+#include <clocale>
/*}}}*/
// Global list of Item supported
@@ -67,3 +70,63 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
return string();
}
/*}}}*/
+// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgIndexFile::TranslationsAvailable()
+{
+ const string Translation = _config->Find("APT::Acquire::Translation");
+
+ if (Translation.compare("none") != 0)
+ return CheckLanguageCode(LanguageCode().c_str());
+ else
+ return false;
+}
+ /*}}}*/
+// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+/* common cases: de_DE, de_DE@euro, de_DE.UTF-8, de_DE.UTF-8@euro,
+ de_DE.ISO8859-1, tig_ER
+ more in /etc/gdm/locale.conf
+*/
+
+bool pkgIndexFile::CheckLanguageCode(const char *Lang)
+{
+ if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_'))
+ return true;
+
+ if (strcmp(Lang,"C") != 0)
+ _error->Warning("Wrong language code %s", Lang);
+
+ return false;
+}
+ /*}}}*/
+// IndexFile::LanguageCode - Return the Language Code /*{{{*/
+// ---------------------------------------------------------------------
+/* return the language code */
+string pkgIndexFile::LanguageCode()
+{
+ const string Translation = _config->Find("APT::Acquire::Translation");
+
+ if (Translation.compare("environment") == 0)
+ {
+ string lang = std::setlocale(LC_MESSAGES,NULL);
+
+ // we have a mapping of the language codes that contains all the language
+ // codes that need the country code as well
+ // (like pt_BR, pt_PT, sv_SE, zh_*, en_*)
+ char *need_full_langcode[] = { "pt","sv","zh","en", NULL };
+ for(char **s = need_full_langcode;*s != NULL; s++)
+ if(lang.find(*s) == 0)
+ return lang.substr(0,5);
+
+ if(lang.size() > 2)
+ return lang.substr(0,2);
+ else
+ return lang;
+ }
+ else
+ return Translation;
+}
+ /*}}}*/
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 61049f4bd..d5d1cf57a 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -5,10 +5,11 @@
Index File - Abstraction for an index of archive/source file.
- There are 3 primary sorts of index files, all represented by this
+ There are 4 primary sorts of index files, all represented by this
class:
Binary index files
+ Binary translation files
Bianry index files decribing the local system
Source index files
@@ -80,6 +81,10 @@ class pkgIndexFile
virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;};
virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
+ static bool TranslationsAvailable();
+ static bool CheckLanguageCode(const char *Lang);
+ static string LanguageCode();
+
bool IsTrusted() const { return Trusted; };
pkgIndexFile(bool Trusted): Trusted(Trusted) {};
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index a26f1d01c..579a19ab9 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -104,6 +104,9 @@ bool pkgInitConfig(Configuration &Cnf)
bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
}
#endif
+
+ // Translation
+ Cnf.Set("APT::Acquire::Translation", "environment");
return true;
}
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index 8255b406a..b036b8609 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -18,7 +18,7 @@
// See the makefile
#define APT_PKG_MAJOR 3
-#define APT_PKG_MINOR 11
+#define APT_PKG_MINOR 51
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 7e5feae53..6cc1414b2 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -13,7 +13,7 @@ include ../buildlib/defaults.mak
# methods/makefile - FIXME
LIBRARY=apt-pkg
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=3.11
+MAJOR=3.51
MINOR=0
SLIBS=$(PTHREADLIB) $(INTLLIBS)
APT_DOMAIN:=libapt-pkg$(MAJOR)
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 8d3a97983..61d8d914e 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -491,11 +491,13 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical)
continue;
if (D->Type != pkgCache::Dep::Conflicts &&
+ D->Type != pkgCache::Dep::DpkgBreaks &&
D->Type != pkgCache::Dep::Obsoletes &&
Cache[Pkg].InstallVer != *I)
continue;
if ((D->Type == pkgCache::Dep::Conflicts ||
+ D->Type == pkgCache::Dep::DpkgBreaks ||
D->Type == pkgCache::Dep::Obsoletes) &&
(Version *)Pkg.CurrentVer() != *I)
continue;
@@ -630,6 +632,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D)
/* Forward critical dependencies MUST be correct before the
package can be unpacked. */
if (D->Type != pkgCache::Dep::Conflicts &&
+ D->Type != pkgCache::Dep::DpkgBreaks &&
D->Type != pkgCache::Dep::Obsoletes &&
D->Type != pkgCache::Dep::PreDepends)
continue;
@@ -668,7 +671,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D)
}
return true;
}
- /*}}}*/
+
// OrderList::DepUnPackPreD - Critical UnPacking ordering with depends /*{{{*/
// ---------------------------------------------------------------------
/* Critical PreDepends (also configure immediate and essential) strives to
@@ -803,9 +806,20 @@ bool pkgOrderList::DepUnPackDep(DepIterator D)
return false;
}
else
+ {
if (D->Type == pkgCache::Dep::Depends)
if (VisitProvides(D,false) == false)
return false;
+
+ if (D->Type == pkgCache::Dep::DpkgBreaks)
+ {
+ if (CheckDep(D) == true)
+ continue;
+
+ if (VisitNode(D.TargetPkg()) == false)
+ return false;
+ }
+ }
}
return true;
}
@@ -953,6 +967,7 @@ bool pkgOrderList::CheckDep(DepIterator D)
/* Conflicts requires that all versions are not present, depends
just needs one */
if (D->Type != pkgCache::Dep::Conflicts &&
+ D->Type != pkgCache::Dep::DpkgBreaks &&
D->Type != pkgCache::Dep::Obsoletes)
{
/* Try to find something that does not have the after flag set
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 4b3dd8be2..b0dd43629 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -106,7 +106,7 @@ bool pkgPackageManager::FixMissing()
// Okay, this file is missing and we need it. Mark it for keep
Bad = true;
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
}
// We have to empty the list otherwise it will not have the new changes
@@ -631,14 +631,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
// ---------------------------------------------------------------------
/* This uses the filenames in FileNames and the information in the
DepCache to perform the installation of packages.*/
-pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd)
+pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
{
- OrderResult Res = OrderInstall();
- if(Debug)
- std::clog << "OrderInstall() returned: " << Res << std::endl;
- if (Res != Failed)
- if (Go(status_fd) == false)
- return Failed;
- return Res;
+ if(DoInstallPreFork() == Failed)
+ return Failed;
+
+ return DoInstallPostFork(statusFd);
}
/*}}}*/
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index f64637d03..48f53576c 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -28,7 +28,9 @@
#endif
#include <string>
+#include <iostream>
#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/depcache.h>
using std::string;
@@ -70,13 +72,39 @@ class pkgPackageManager : protected pkgCache::Namespace
virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
virtual bool Go(int statusFd=-1) {return true;};
virtual void Reset() {};
-
+
+ // the result of the operation
+ OrderResult Res;
+
public:
// Main action members
bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
pkgRecords *Recs);
- OrderResult DoInstall(int statusFd=-1);
+
+ // Do the installation
+ OrderResult DoInstall(int statusFd=-1);
+
+ // stuff that needs to be done before the fork() of a library that
+ // uses apt
+ OrderResult DoInstallPreFork() {
+ Res = OrderInstall();
+ return Res;
+ };
+
+ // stuff that needs to be done after the fork
+ OrderResult DoInstallPostFork(int statusFd=-1) {
+ bool goResult = Go(statusFd);
+ if(goResult == false)
+ return Failed;
+
+ // if all was fine update the state file
+ if(Res == Completed) {
+ Cache.writeStateFile(NULL);
+ }
+ return Res;
+ };
+
bool FixMissing();
pkgPackageManager(pkgDepCache *Cache);
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 9926befe9..93ad56641 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -26,6 +26,7 @@
#endif
#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/indexfile.h>
#include <apt-pkg/version.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
@@ -43,6 +44,7 @@
using std::string;
+
// Cache::Header::Header - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* Simply initialize the header */
@@ -52,7 +54,7 @@ pkgCache::Header::Header()
/* Whenever the structures change the major version should be bumped,
whenever the generator changes the minor version should be bumped. */
- MajorVersion = 4;
+ MajorVersion = 6;
MinorVersion = 0;
Dirty = false;
@@ -60,17 +62,22 @@ pkgCache::Header::Header()
PackageSz = sizeof(pkgCache::Package);
PackageFileSz = sizeof(pkgCache::PackageFile);
VersionSz = sizeof(pkgCache::Version);
+ DescriptionSz = sizeof(pkgCache::Description);
DependencySz = sizeof(pkgCache::Dependency);
ProvidesSz = sizeof(pkgCache::Provides);
VerFileSz = sizeof(pkgCache::VerFile);
+ DescFileSz = sizeof(pkgCache::DescFile);
PackageCount = 0;
VersionCount = 0;
+ DescriptionCount = 0;
DependsCount = 0;
PackageFileCount = 0;
VerFileCount = 0;
+ DescFileCount = 0;
ProvidesCount = 0;
MaxVerFileSize = 0;
+ MaxDescFileSize = 0;
FileList = 0;
StringList = 0;
@@ -89,8 +96,10 @@ bool pkgCache::Header::CheckSizes(Header &Against) const
PackageSz == Against.PackageSz &&
PackageFileSz == Against.PackageFileSz &&
VersionSz == Against.VersionSz &&
+ DescriptionSz == Against.DescriptionSz &&
DependencySz == Against.DependencySz &&
VerFileSz == Against.VerFileSz &&
+ DescFileSz == Against.DescFileSz &&
ProvidesSz == Against.ProvidesSz)
return true;
return false;
@@ -115,8 +124,10 @@ bool pkgCache::ReMap()
HeaderP = (Header *)Map.Data();
PkgP = (Package *)Map.Data();
VerFileP = (VerFile *)Map.Data();
+ DescFileP = (DescFile *)Map.Data();
PkgFileP = (PackageFile *)Map.Data();
VerP = (Version *)Map.Data();
+ DescP = (Description *)Map.Data();
ProvideP = (Provides *)Map.Data();
DepP = (Dependency *)Map.Data();
StringItemP = (StringItem *)Map.Data();
@@ -217,8 +228,8 @@ const char *pkgCache::DepType(unsigned char Type)
{
const char *Types[] = {"",_("Depends"),_("PreDepends"),_("Suggests"),
_("Recommends"),_("Conflicts"),_("Replaces"),
- _("Obsoletes")};
- if (Type < 8)
+ _("Obsoletes"),_("Breaks")};
+ if (Type < sizeof(Types)/sizeof(*Types))
return Types[Type];
return "";
}
@@ -235,11 +246,11 @@ const char *pkgCache::Priority(unsigned char Prio)
return 0;
}
/*}}}*/
-
// Bases for iterator classes /*{{{*/
void pkgCache::VerIterator::_dummy() {}
void pkgCache::DepIterator::_dummy() {}
void pkgCache::PrvIterator::_dummy() {}
+void pkgCache::DescIterator::_dummy() {}
/*}}}*/
// PkgIterator::operator ++ - Postfix incr /*{{{*/
// ---------------------------------------------------------------------
@@ -281,10 +292,11 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
// DepIterator::IsCritical - Returns true if the dep is important /*{{{*/
// ---------------------------------------------------------------------
/* Currently critical deps are defined as depends, predepends and
- conflicts. */
+ conflicts (including dpkg's Breaks fields). */
bool pkgCache::DepIterator::IsCritical()
{
if (Dep->Type == pkgCache::Dep::Conflicts ||
+ Dep->Type == pkgCache::Dep::DpkgBreaks ||
Dep->Type == pkgCache::Dep::Obsoletes ||
Dep->Type == pkgCache::Dep::Depends ||
Dep->Type == pkgCache::Dep::PreDepends)
@@ -370,6 +382,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets()
continue;
if ((Dep->Type == pkgCache::Dep::Conflicts ||
+ Dep->Type == pkgCache::Dep::DpkgBreaks ||
Dep->Type == pkgCache::Dep::Obsoletes) &&
ParentPkg() == I.ParentPkg())
continue;
@@ -386,6 +399,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets()
continue;
if ((Dep->Type == pkgCache::Dep::Conflicts ||
+ Dep->Type == pkgCache::Dep::DpkgBreaks ||
Dep->Type == pkgCache::Dep::Obsoletes) &&
ParentPkg() == I.OwnerPkg())
continue;
@@ -599,3 +613,20 @@ string pkgCache::PkgFileIterator::RelStr()
return Res;
}
/*}}}*/
+// VerIterator::TranslatedDescription - Return the a DescIter for locale/*{{{*/
+// ---------------------------------------------------------------------
+/* return a DescIter for the current locale or the default if none is
+ * found
+ */
+pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
+{
+ pkgCache::DescIterator DescDefault = DescriptionList();
+ pkgCache::DescIterator Desc = DescDefault;
+ for (; Desc.end() == false; Desc++)
+ if (pkgIndexFile::LanguageCode() == Desc.LanguageCode())
+ break;
+ if (Desc.end() == true) Desc = DescDefault;
+ return Desc;
+};
+
+ /*}}}*/
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 587d97534..970759492 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -38,32 +38,42 @@ class pkgCache
struct Package;
struct PackageFile;
struct Version;
+ struct Description;
struct Provides;
struct Dependency;
struct StringItem;
struct VerFile;
+ struct DescFile;
// Iterators
class PkgIterator;
class VerIterator;
+ class DescIterator;
class DepIterator;
class PrvIterator;
class PkgFileIterator;
class VerFileIterator;
+ class DescFileIterator;
friend class PkgIterator;
friend class VerIterator;
+ friend class DescInterator;
friend class DepIterator;
friend class PrvIterator;
friend class PkgFileIterator;
friend class VerFileIterator;
+ friend class DescFileIterator;
class Namespace;
// These are all the constants used in the cache structures
+
+ // WARNING - if you change these lists you must also edit
+ // the stringification in pkgcache.cc and also consider whether
+ // the cache file will become incompatible.
struct Dep
{
enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4,
- Conflicts=5,Replaces=6,Obsoletes=7};
+ Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8};
enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3,
Greater=0x4,Equals=0x5,NotEquals=0x6};
};
@@ -98,8 +108,10 @@ class pkgCache
Header *HeaderP;
Package *PkgP;
VerFile *VerFileP;
+ DescFile *DescFileP;
PackageFile *PkgFileP;
Version *VerP;
+ Description *DescP;
Provides *ProvideP;
Dependency *DepP;
StringItem *StringItemP;
@@ -151,16 +163,20 @@ struct pkgCache::Header
unsigned short PackageSz;
unsigned short PackageFileSz;
unsigned short VersionSz;
+ unsigned short DescriptionSz;
unsigned short DependencySz;
unsigned short ProvidesSz;
unsigned short VerFileSz;
+ unsigned short DescFileSz;
// Structure counts
unsigned long PackageCount;
unsigned long VersionCount;
+ unsigned long DescriptionCount;
unsigned long DependsCount;
unsigned long PackageFileCount;
unsigned long VerFileCount;
+ unsigned long DescFileCount;
unsigned long ProvidesCount;
// Offsets
@@ -169,10 +185,11 @@ struct pkgCache::Header
map_ptrloc VerSysName; // StringTable
map_ptrloc Architecture; // StringTable
unsigned long MaxVerFileSize;
+ unsigned long MaxDescFileSize;
/* Allocation pools, there should be one of these for each structure
excluding the header */
- DynamicMMap::Pool Pools[7];
+ DynamicMMap::Pool Pools[8];
// Rapid package name lookup
map_ptrloc HashTable[2*1048];
@@ -193,7 +210,7 @@ struct pkgCache::Package
map_ptrloc NextPackage; // Package
map_ptrloc RevDepends; // Dependency
map_ptrloc ProvidesList; // Provides
-
+
// Install/Remove/Purge etc
unsigned char SelectedState; // What
unsigned char InstState; // Flags
@@ -232,6 +249,14 @@ struct pkgCache::VerFile
unsigned short Size;
};
+struct pkgCache::DescFile
+{
+ map_ptrloc File; // PackageFile
+ map_ptrloc NextFile; // PkgVerFile
+ map_ptrloc Offset; // File offset
+ unsigned short Size;
+};
+
struct pkgCache::Version
{
map_ptrloc VerStr; // Stringtable
@@ -241,6 +266,7 @@ struct pkgCache::Version
// Lists
map_ptrloc FileList; // VerFile
map_ptrloc NextVer; // Version
+ map_ptrloc DescriptionList; // Description
map_ptrloc DependsList; // Dependency
map_ptrloc ParentPkg; // Package
map_ptrloc ProvidesList; // Provides
@@ -252,6 +278,22 @@ struct pkgCache::Version
unsigned char Priority;
};
+struct pkgCache::Description
+{
+ // Language Code store the description translation language code. If
+ // the value has a 0 lenght then this is readed using the Package
+ // file else the Translation-CODE are used.
+ map_ptrloc language_code; // StringTable
+ map_ptrloc md5sum; // StringTable
+
+ // Linked list
+ map_ptrloc FileList; // DescFile
+ map_ptrloc NextDesc; // Description
+ map_ptrloc ParentPkg; // Package
+
+ unsigned short ID;
+};
+
struct pkgCache::Dependency
{
map_ptrloc Version; // Stringtable
@@ -299,11 +341,13 @@ class pkgCache::Namespace
typedef pkgCache::PkgIterator PkgIterator;
typedef pkgCache::VerIterator VerIterator;
+ typedef pkgCache::DescIterator DescIterator;
typedef pkgCache::DepIterator DepIterator;
typedef pkgCache::PrvIterator PrvIterator;
typedef pkgCache::PkgFileIterator PkgFileIterator;
typedef pkgCache::VerFileIterator VerFileIterator;
typedef pkgCache::Version Version;
+ typedef pkgCache::Description Description;
typedef pkgCache::Package Package;
typedef pkgCache::Header Header;
typedef pkgCache::Dep Dep;
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index de854bee5..8ec6a1719 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -26,6 +26,8 @@
#include <apt-pkg/sptr.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/tagfile.h>
+
#include <apti18n.h>
#include <vector>
@@ -125,16 +127,46 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
string Version = List.Version();
if (Version.empty() == true)
{
+ // we first process the package, then the descriptions
+ // (this has the bonus that we get MMap error when we run out
+ // of MMap space)
if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)
return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
PackageName.c_str());
+
+ // Find the right version to write the description
+ MD5SumValue CurMd5 = List.Description_md5();
+ pkgCache::VerIterator Ver = Pkg.VersionList();
+ map_ptrloc *LastVer = &Pkg->VersionList;
+
+ for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
+ {
+ pkgCache::DescIterator Desc = Ver.DescriptionList();
+ map_ptrloc *LastDesc = &Ver->DescriptionList;
+
+ for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++)
+ {
+
+ if (MD5SumValue(Desc.md5()) == CurMd5)
+ {
+ // Add new description
+ *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
+ Desc->ParentPkg = Pkg.Index();
+
+ if (NewFileDesc(Desc,List) == false)
+ return _error->Error(_("Error occured while processing %s (NewFileDesc1)"),PackageName.c_str());
+ break;
+ }
+ }
+ }
+
continue;
}
pkgCache::VerIterator Ver = Pkg.VersionList();
- map_ptrloc *Last = &Pkg->VersionList;
+ map_ptrloc *LastVer = &Pkg->VersionList;
int Res = 1;
- for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
+ for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
{
Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
if (Res >= 0)
@@ -168,7 +200,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
// Skip to the end of the same version set.
if (Res == 0)
{
- for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
+ for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
{
Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
if (Res != 0)
@@ -177,9 +209,10 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
}
// Add a new version
- *Last = NewVersion(Ver,Version,*Last);
+ *LastVer = NewVersion(Ver,Version,*LastVer);
Ver->ParentPkg = Pkg.Index();
Ver->Hash = Hash;
+
if (List.NewVersion(Ver) == false)
return _error->Error(_("Error occurred while processing %s (NewVersion1)"),
PackageName.c_str());
@@ -199,6 +232,21 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
FoundFileDeps |= List.HasFileDeps();
return true;
}
+
+ /* Record the Description data. Description data always exist in
+ Packages and Translation-* files. */
+ pkgCache::DescIterator Desc = Ver.DescriptionList();
+ map_ptrloc *LastDesc = &Ver->DescriptionList;
+
+ // Skip to the end of description set
+ for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++);
+
+ // Add new description
+ *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
+ Desc->ParentPkg = Pkg.Index();
+
+ if (NewFileDesc(Desc,List) == false)
+ return _error->Error(_("Error occured while processing %s (NewFileDesc2)"),PackageName.c_str());
}
FoundFileDeps |= List.HasFileDeps();
@@ -209,6 +257,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
return _error->Error(_("Wow, you exceeded the number of versions "
"this APT is capable of."));
+ if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
+ return _error->Error(_("Wow, you exceeded the number of descriptions "
+ "this APT is capable of."));
if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
return _error->Error(_("Wow, you exceeded the number of dependencies "
"this APT is capable of."));
@@ -271,7 +322,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name
Pkg = Cache.FindPkg(Name);
if (Pkg.end() == false)
return true;
-
+
// Get a structure
unsigned long Package = Map.Allocate(sizeof(pkgCache::Package));
if (Package == 0)
@@ -349,6 +400,62 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
return Version;
}
/*}}}*/
+// CacheGenerator::NewFileDesc - Create a new File<->Desc association /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
+ ListParser &List)
+{
+ if (CurrentFile == 0)
+ return true;
+
+ // Get a structure
+ unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile));
+ if (DescFile == 0)
+ return 0;
+
+ pkgCache::DescFileIterator DF(Cache,Cache.DescFileP + DescFile);
+ DF->File = CurrentFile - Cache.PkgFileP;
+
+ // Link it to the end of the list
+ map_ptrloc *Last = &Desc->FileList;
+ for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++)
+ Last = &D->NextFile;
+
+ DF->NextFile = *Last;
+ *Last = DF.Index();
+
+ DF->Offset = List.Offset();
+ DF->Size = List.Size();
+ if (Cache.HeaderP->MaxDescFileSize < DF->Size)
+ Cache.HeaderP->MaxDescFileSize = DF->Size;
+ Cache.HeaderP->DescFileCount++;
+
+ return true;
+}
+ /*}}}*/
+// CacheGenerator::NewDescription - Create a new Description /*{{{*/
+// ---------------------------------------------------------------------
+/* This puts a description structure in the linked list */
+map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
+ const string &Lang, const MD5SumValue &md5sum,
+ map_ptrloc Next)
+{
+ // Get a structure
+ map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description));
+ if (Description == 0)
+ return 0;
+
+ // Fill it in
+ Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);
+ Desc->NextDesc = Next;
+ Desc->ID = Cache.HeaderP->DescriptionCount++;
+ Desc->language_code = Map.WriteString(Lang);
+ Desc->md5sum = Map.WriteString(md5sum.Value());
+
+ return Description;
+}
+ /*}}}*/
// ListParser::NewDepends - Create a dependency element /*{{{*/
// ---------------------------------------------------------------------
/* This creates a dependency element in the tree. It is linked to the
@@ -571,8 +678,10 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start,
if ((*Start)->Exists() == false)
{
+#if 0 // mvo: we no longer give a message here (Default Sources spec)
_error->WarningE("stat",_("Couldn't stat source package list %s"),
(*Start)->Describe().c_str());
+#endif
continue;
}
@@ -580,7 +689,7 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start,
pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
if (File.end() == true)
return false;
-
+
Visited[File->ID] = true;
}
@@ -676,7 +785,7 @@ static bool BuildCache(pkgCacheGenerator &Gen,
bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
MMap **OutMap,bool AllowMem)
{
- unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024);
+ unsigned long MapSize = _config->FindI("APT::Cache-Limit",16*1024*1024);
vector<pkgIndexFile *> Files;
for (vector<metaIndex *>::const_iterator i = List.begin();
@@ -823,7 +932,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
/* */
bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
{
- unsigned long MapSize = _config->FindI("APT::Cache-Limit",8*1024*1024);
+ unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024);
vector<pkgIndexFile *> Files;
unsigned long EndOfSource = Files.size();
if (_system->AddStatusFiles(Files) == false)
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 9a729eea4..fae1a60a6 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -24,6 +24,7 @@
#endif
#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/md5.h>
class pkgSourceList;
class OpProgress;
@@ -55,7 +56,9 @@ class pkgCacheGenerator
bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg);
bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
+ bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
+ map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
public:
@@ -108,6 +111,9 @@ class pkgCacheGenerator::ListParser
virtual string Package() = 0;
virtual string Version() = 0;
virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
+ virtual string Description() = 0;
+ virtual string DescriptionLanguage() = 0;
+ virtual MD5SumValue Description_md5() = 0;
virtual unsigned short VersionHash() = 0;
virtual bool UsePackage(pkgCache::PkgIterator Pkg,
pkgCache::VerIterator Ver) = 0;
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index 9c2655d6a..b22f3e73f 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -63,3 +63,12 @@ pkgRecords::Parser &pkgRecords::Lookup(pkgCache::VerFileIterator const &Ver)
return *Files[Ver.File()->ID];
}
/*}}}*/
+// Records::Lookup - Get a parser for the package description file /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgRecords::Parser &pkgRecords::Lookup(pkgCache::DescFileIterator const &Desc)
+{
+ Files[Desc.File()->ID]->Jump(Desc);
+ return *Files[Desc.File()->ID];
+}
+ /*}}}*/
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 08f004414..31c444dbf 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -38,6 +38,7 @@ class pkgRecords
// Lookup function
Parser &Lookup(pkgCache::VerFileIterator const &Ver);
+ Parser &Lookup(pkgCache::DescFileIterator const &Desc);
// Construct destruct
pkgRecords(pkgCache &Cache);
@@ -49,6 +50,7 @@ class pkgRecords::Parser
protected:
virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;
+ virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0;
public:
friend class pkgRecords;
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 8fcbeb23b..146829566 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -422,6 +422,7 @@ static const char *iTFRewritePackageOrder[] = {
"Recommends",
"Suggests",
"Conflicts",
+ "Breaks",
"Conffiles",
"Filename",
"Size",
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index aea9ebeba..cc4c1559e 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -71,6 +71,12 @@ void LocalitySort(pkgCache::VerFile **begin,
{
qsort(begin,Count,Size,LocalityCompare);
}
+
+void LocalitySort(pkgCache::DescFile **begin,
+ unsigned long Count,size_t Size)
+{
+ qsort(begin,Count,Size,LocalityCompare);
+}
/*}}}*/
// UnMet - Show unmet dependencies /*{{{*/
// ---------------------------------------------------------------------
@@ -96,13 +102,15 @@ bool UnMet(CommandLine &CmdL)
if (End->Type != pkgCache::Dep::PreDepends &&
End->Type != pkgCache::Dep::Depends &&
End->Type != pkgCache::Dep::Suggests &&
- End->Type != pkgCache::Dep::Recommends)
+ End->Type != pkgCache::Dep::Recommends &&
+ End->Type != pkgCache::Dep::DpkgBreaks)
continue;
// Important deps only
if (Important == true)
if (End->Type != pkgCache::Dep::PreDepends &&
- End->Type != pkgCache::Dep::Depends)
+ End->Type != pkgCache::Dep::Depends &&
+ End->Type != pkgCache::Dep::DpkgBreaks)
continue;
// Verify the or group
@@ -182,7 +190,14 @@ bool DumpPackage(CommandLine &CmdL)
{
cout << Cur.VerStr();
for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; Vf++)
- cout << "(" << Vf.File().FileName() << ")";
+ cout << " (" << Vf.File().FileName() << ")";
+ cout << endl;
+ for (pkgCache::DescIterator D = Cur.DescriptionList(); D.end() == false; D++)
+ {
+ cout << " Description Language: " << D.LanguageCode() << endl
+ << " File: " << D.FileList().File().FileName() << endl
+ << " MD5: " << D.md5() << endl;
+ }
cout << endl;
}
@@ -277,11 +292,15 @@ bool Stats(CommandLine &Cmd)
cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" <<
SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl;
+ cout << _("Total Distinct Descriptions: ") << Cache.Head().DescriptionCount << " (" <<
+ SizeToStr(Cache.Head().DescriptionCount*Cache.Head().DescriptionSz) << ')' << endl;
cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" <<
SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl;
cout << _("Total ver/file relations: ") << Cache.Head().VerFileCount << " (" <<
SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl;
+ cout << _("Total Desc/File relations: ") << Cache.Head().DescFileCount << " (" <<
+ SizeToStr(Cache.Head().DescFileCount*Cache.Head().DescFileSz) << ')' << endl;
cout << _("Total Provides mappings: ") << Cache.Head().ProvidesCount << " (" <<
SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl;
@@ -344,6 +363,12 @@ bool Dump(CommandLine &Cmd)
for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++)
cout << " Depends: " << D.TargetPkg().Name() << ' ' <<
DeNull(D.TargetVer()) << endl;
+ for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++)
+ {
+ cout << " Description Language: " << D.LanguageCode() << endl
+ << " File: " << D.FileList().File().FileName() << endl
+ << " MD5: " << D.md5() << endl;
+ }
}
}
@@ -846,6 +871,7 @@ bool XVcg(CommandLine &CmdL)
then show the relation but do not recurse */
if (Hit == false &&
(D->Type == pkgCache::Dep::Conflicts ||
+ D->Type == pkgCache::Dep::DpkgBreaks ||
D->Type == pkgCache::Dep::Obsoletes))
{
if (Show[D.TargetPkg()->ID] == None &&
@@ -867,6 +893,9 @@ bool XVcg(CommandLine &CmdL)
case pkgCache::Dep::Conflicts:
printf("label: \"conflicts\" color: lightgreen }\n");
break;
+ case pkgCache::Dep::DpkgBreaks:
+ printf("label: \"breaks\" color: lightgreen }\n");
+ break;
case pkgCache::Dep::Obsoletes:
printf("label: \"obsoletes\" color: lightgreen }\n");
break;
@@ -1192,17 +1221,50 @@ bool DisplayRecord(pkgCache::VerIterator V)
if (_error->PendingError() == true)
return false;
- // Read the record and then write it out again.
+ // Read the record
unsigned char *Buffer = new unsigned char[GCache->HeaderP->MaxVerFileSize+1];
Buffer[V.FileList()->Size] = '\n';
if (PkgF.Seek(V.FileList()->Offset) == false ||
- PkgF.Read(Buffer,V.FileList()->Size) == false ||
- fwrite(Buffer,1,V.FileList()->Size+1,stdout) < (size_t)(V.FileList()->Size+1))
+ PkgF.Read(Buffer,V.FileList()->Size) == false)
{
delete [] Buffer;
return false;
}
-
+
+ // Get a pointer to start of Description field
+ const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:");
+
+ // Write all but Description
+ if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer))
+ {
+ delete [] Buffer;
+ return false;
+ }
+
+ // Show the right description
+ pkgRecords Recs(*GCache);
+ pkgCache::DescIterator Desc = V.TranslatedDescription();
+ pkgRecords::Parser &P = Recs.Lookup(Desc.FileList());
+ cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc();
+
+ // Find the first field after the description (if there is any)
+ for(DescP++;DescP != &Buffer[V.FileList()->Size];DescP++)
+ {
+ if(*DescP == '\n' && *(DescP+1) != ' ')
+ {
+ // write the rest of the buffer
+ const unsigned char *end=&Buffer[V.FileList()->Size];
+ if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP))
+ {
+ delete [] Buffer;
+ return false;
+ }
+
+ break;
+ }
+ }
+ // write a final newline (after the description)
+ cout<<endl;
delete [] Buffer;
return true;
@@ -1211,9 +1273,9 @@ bool DisplayRecord(pkgCache::VerIterator V)
// Search - Perform a search /*{{{*/
// ---------------------------------------------------------------------
/* This searches the package names and pacakge descriptions for a pattern */
-struct ExVerFile
+struct ExDescFile
{
- pkgCache::VerFile *Vf;
+ pkgCache::DescFile *Df;
bool NameMatch;
};
@@ -1253,35 +1315,35 @@ bool Search(CommandLine &CmdL)
return false;
}
- ExVerFile *VFList = new ExVerFile[Cache.HeaderP->PackageCount+1];
- memset(VFList,0,sizeof(*VFList)*Cache.HeaderP->PackageCount+1);
+ ExDescFile *DFList = new ExDescFile[Cache.HeaderP->PackageCount+1];
+ memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->PackageCount+1);
// Map versions that we want to write out onto the VerList array.
for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
{
- VFList[P->ID].NameMatch = NumPatterns != 0;
+ DFList[P->ID].NameMatch = NumPatterns != 0;
for (unsigned I = 0; I != NumPatterns; I++)
{
if (regexec(&Patterns[I],P.Name(),0,0,0) == 0)
- VFList[P->ID].NameMatch &= true;
+ DFList[P->ID].NameMatch &= true;
else
- VFList[P->ID].NameMatch = false;
+ DFList[P->ID].NameMatch = false;
}
// Doing names only, drop any that dont match..
- if (NamesOnly == true && VFList[P->ID].NameMatch == false)
+ if (NamesOnly == true && DFList[P->ID].NameMatch == false)
continue;
// Find the proper version to use.
pkgCache::VerIterator V = Plcy.GetCandidateVer(P);
if (V.end() == false)
- VFList[P->ID].Vf = V.FileList();
+ DFList[P->ID].Df = V.DescriptionList().FileList();
}
// Include all the packages that provide matching names too
for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
{
- if (VFList[P->ID].NameMatch == false)
+ if (DFList[P->ID].NameMatch == false)
continue;
for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++)
@@ -1289,18 +1351,18 @@ bool Search(CommandLine &CmdL)
pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg());
if (V.end() == false)
{
- VFList[Prv.OwnerPkg()->ID].Vf = V.FileList();
- VFList[Prv.OwnerPkg()->ID].NameMatch = true;
+ DFList[Prv.OwnerPkg()->ID].Df = V.DescriptionList().FileList();
+ DFList[Prv.OwnerPkg()->ID].NameMatch = true;
}
}
}
-
- LocalitySort(&VFList->Vf,Cache.HeaderP->PackageCount,sizeof(*VFList));
+
+ LocalitySort(&DFList->Df,Cache.HeaderP->PackageCount,sizeof(*DFList));
// Iterate over all the version records and check them
- for (ExVerFile *J = VFList; J->Vf != 0; J++)
+ for (ExDescFile *J = DFList; J->Df != 0; J++)
{
- pkgRecords::Parser &P = Recs.Lookup(pkgCache::VerFileIterator(Cache,J->Vf));
+ pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(Cache,J->Df));
bool Match = true;
if (J->NameMatch == false)
@@ -1331,7 +1393,7 @@ bool Search(CommandLine &CmdL)
}
}
- delete [] VFList;
+ delete [] DFList;
for (unsigned I = 0; I != NumPatterns; I++)
regfree(&Patterns[I]);
if (ferror(stdout))
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 58976351c..7b70de3bd 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -60,6 +60,7 @@
#include <errno.h>
#include <regex.h>
#include <sys/wait.h>
+#include <sstream>
/*}}}*/
using namespace std;
@@ -649,7 +650,7 @@ bool CacheFile::CheckDeps(bool AllowBroken)
// upgrade all policy-broken packages with ForceImportantDeps=True
for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++)
if ((*DCache)[I].NowPolicyBroken() == true)
- DCache->MarkInstall(I,true,0,true);
+ DCache->MarkInstall(I,true,0,false, true);
}
}
@@ -1009,7 +1010,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
cerr << _("Unable to correct missing packages.") << endl;
return _error->Error(_("Aborting install."));
}
-
+
_system->UnLock();
int status_fd = _config->FindI("APT::Status-Fd",-1);
pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd);
@@ -1371,20 +1372,29 @@ bool DoUpdate(CommandLine &CmdL)
return false;
bool Failed = false;
+ bool TransientNetworkFailure = false;
for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
{
if ((*I)->Status == pkgAcquire::Item::StatDone)
continue;
(*I)->Finished();
-
+
fprintf(stderr,_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(),
(*I)->ErrorText.c_str());
+
+ if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError)
+ {
+ TransientNetworkFailure = true;
+ continue;
+ }
+
Failed = true;
}
// Clean out any old list files
- if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true)
+ if (!TransientNetworkFailure &&
+ _config->FindB("APT::Get::List-Cleanup",true) == true)
{
if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false ||
Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false)
@@ -1396,12 +1406,71 @@ bool DoUpdate(CommandLine &CmdL)
if (Cache.BuildCaches() == false)
return false;
- if (Failed == true)
+ if (TransientNetworkFailure == true)
+ _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
+ else if (Failed == true)
return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead."));
-
+
return true;
}
/*}}}*/
+// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/
+// ---------------------------------------------------------------------
+/* Remove unused automatic packages */
+bool DoAutomaticRemove(CacheFile &Cache)
+{
+ bool Debug = _config->FindI("Debug::pkgAutoRemove",false);
+ pkgDepCache::ActionGroup group(*Cache);
+
+ if(Debug)
+ std::cout << "DoAutomaticRemove()" << std::endl;
+
+ if (_config->FindB("APT::Get::Remove",true) == false)
+ return _error->Error(_("We are not supposed to delete stuff, can't "
+ "start AutoRemover"));
+
+ string autoremovelist, autoremoveversions;
+ // look over the cache to see what can be removed
+ for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg)
+ {
+ if (Cache[Pkg].Garbage)
+ {
+ if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
+ if(Debug)
+ std::cout << "We could delete %s" << Pkg.Name() << std::endl;
+
+ autoremovelist += string(Pkg.Name()) + " ";
+ autoremoveversions += string(Cache[Pkg].CandVersion) + " ";
+ if (_config->FindB("APT::Get::AutomaticRemove"))
+ {
+ if(Pkg.CurrentVer() != 0 &&
+ Pkg->CurrentState != pkgCache::State::ConfigFiles)
+ Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false));
+ else
+ Cache->MarkKeep(Pkg, false, false);
+ }
+ }
+ }
+ ShowList(c1out, _("The following packages where automatically installed and are no longer required:"), autoremovelist, autoremoveversions);
+ if (!_config->FindB("APT::Get::AutomaticRemove") &&
+ autoremovelist.size() > 0)
+ c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl;
+
+ // Now see if we destroyed anything
+ if (Cache->BrokenCount() != 0)
+ {
+ c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n"
+ "shouldn't happen. Please file a bug report against apt.") << endl;
+ c1out << endl;
+ c1out << _("The following information may help to resolve the situation:") << endl;
+ c1out << endl;
+ ShowBroken(c1out,Cache,false);
+
+ return _error->Error(_("Internal Error, AutoRemover broke stuff"));
+ }
+ return true;
+}
+
// DoUpgrade - Upgrade all packages /*{{{*/
// ---------------------------------------------------------------------
/* Upgrade all packages without installing new packages or erasing old
@@ -1444,155 +1513,166 @@ bool DoInstall(CommandLine &CmdL)
bool DefRemove = false;
if (strcasecmp(CmdL.FileList[0],"remove") == 0)
DefRemove = true;
+ else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0)
+ {
+ _config->Set("APT::Get::AutomaticRemove", "true");
+ DefRemove = true;
+ }
- for (const char **I = CmdL.FileList + 1; *I != 0; I++)
+ // new scope for the ActionGroup
{
- // Duplicate the string
- unsigned int Length = strlen(*I);
- char S[300];
- if (Length >= sizeof(S))
- continue;
- strcpy(S,*I);
-
- // See if we are removing and special indicators..
- bool Remove = DefRemove;
- char *VerTag = 0;
- bool VerIsRel = false;
- while (Cache->FindPkg(S).end() == true)
+ pkgDepCache::ActionGroup group(Cache);
+ for (const char **I = CmdL.FileList + 1; *I != 0; I++)
{
- // Handle an optional end tag indicating what to do
- if (Length >= 1 && S[Length - 1] == '-')
- {
- Remove = true;
- S[--Length] = 0;
+ // Duplicate the string
+ unsigned int Length = strlen(*I);
+ char S[300];
+ if (Length >= sizeof(S))
continue;
- }
-
- if (Length >= 1 && S[Length - 1] == '+')
+ strcpy(S,*I);
+
+ // See if we are removing and special indicators..
+ bool Remove = DefRemove;
+ char *VerTag = 0;
+ bool VerIsRel = false;
+ while (Cache->FindPkg(S).end() == true)
{
- Remove = false;
- S[--Length] = 0;
- continue;
- }
+ // Handle an optional end tag indicating what to do
+ if (Length >= 1 && S[Length - 1] == '-')
+ {
+ Remove = true;
+ S[--Length] = 0;
+ continue;
+ }
- char *Slash = strchr(S,'=');
- if (Slash != 0)
- {
- VerIsRel = false;
- *Slash = 0;
- VerTag = Slash + 1;
- }
+ if (Length >= 1 && S[Length - 1] == '+')
+ {
+ Remove = false;
+ S[--Length] = 0;
+ continue;
+ }
- Slash = strchr(S,'/');
- if (Slash != 0)
- {
- VerIsRel = true;
- *Slash = 0;
- VerTag = Slash + 1;
- }
+ char *Slash = strchr(S,'=');
+ if (Slash != 0)
+ {
+ VerIsRel = false;
+ *Slash = 0;
+ VerTag = Slash + 1;
+ }
- break;
- }
+ Slash = strchr(S,'/');
+ if (Slash != 0)
+ {
+ VerIsRel = true;
+ *Slash = 0;
+ VerTag = Slash + 1;
+ }
+
+ break;
+ }
- // Locate the package
- pkgCache::PkgIterator Pkg = Cache->FindPkg(S);
- Packages++;
- if (Pkg.end() == true)
- {
- // Check if the name is a regex
- const char *I;
- for (I = S; *I != 0; I++)
- if (*I == '?' || *I == '*' || *I == '|' ||
- *I == '[' || *I == '^' || *I == '$')
- break;
- if (*I == 0)
- return _error->Error(_("Couldn't find package %s"),S);
+ // Locate the package
+ pkgCache::PkgIterator Pkg = Cache->FindPkg(S);
+ Packages++;
+ if (Pkg.end() == true)
+ {
+ // Check if the name is a regex
+ const char *I;
+ for (I = S; *I != 0; I++)
+ if (*I == '?' || *I == '*' || *I == '|' ||
+ *I == '[' || *I == '^' || *I == '$')
+ break;
+ if (*I == 0)
+ return _error->Error(_("Couldn't find package %s"),S);
- // Regexs must always be confirmed
- ExpectedInst += 1000;
+ // Regexs must always be confirmed
+ ExpectedInst += 1000;
- // Compile the regex pattern
- regex_t Pattern;
- int Res;
- if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
- REG_NOSUB)) != 0)
- {
- char Error[300];
- regerror(Res,&Pattern,Error,sizeof(Error));
- return _error->Error(_("Regex compilation error - %s"),Error);
- }
+ // Compile the regex pattern
+ regex_t Pattern;
+ int Res;
+ if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
+ REG_NOSUB)) != 0)
+ {
+ char Error[300];
+ regerror(Res,&Pattern,Error,sizeof(Error));
+ return _error->Error(_("Regex compilation error - %s"),Error);
+ }
- // Run over the matches
- bool Hit = false;
- for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
- {
- if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
- continue;
+ // Run over the matches
+ bool Hit = false;
+ for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
+ {
+ if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
+ continue;
+
+ ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
+ Pkg.Name(),S);
- ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
- Pkg.Name(),S);
+ if (VerTag != 0)
+ if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
+ return false;
+ Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,
+ ExpectedInst,false);
+ }
+ regfree(&Pattern);
+
+ if (Hit == false)
+ return _error->Error(_("Couldn't find package %s"),S);
+ }
+ else
+ {
if (VerTag != 0)
if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
return false;
-
- Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,
- ExpectedInst,false);
- }
- regfree(&Pattern);
-
- if (Hit == false)
- return _error->Error(_("Couldn't find package %s"),S);
- }
- else
- {
- if (VerTag != 0)
- if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
+ if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false)
return false;
- if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false)
- return false;
- }
- }
+ }
+ }
- /* If we are in the Broken fixing mode we do not attempt to fix the
- problems. This is if the user invoked install without -f and gave
- packages */
- if (BrokenFix == true && Cache->BrokenCount() != 0)
- {
- c1out << _("You might want to run `apt-get -f install' to correct these:") << endl;
- ShowBroken(c1out,Cache,false);
+ /* If we are in the Broken fixing mode we do not attempt to fix the
+ problems. This is if the user invoked install without -f and gave
+ packages */
+ if (BrokenFix == true && Cache->BrokenCount() != 0)
+ {
+ c1out << _("You might want to run `apt-get -f install' to correct these:") << endl;
+ ShowBroken(c1out,Cache,false);
- return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
- }
+ return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
+ }
- // Call the scored problem resolver
- Fix.InstallProtect();
- if (Fix.Resolve(true) == false)
- _error->Discard();
+ // Call the scored problem resolver
+ Fix.InstallProtect();
+ if (Fix.Resolve(true) == false)
+ _error->Discard();
- // Now we check the state of the packages,
- if (Cache->BrokenCount() != 0)
- {
- c1out <<
- _("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"
- "distribution that some required packages have not yet been created\n"
- "or been moved out of Incoming.") << endl;
- if (Packages == 1)
+ // Now we check the state of the packages,
+ if (Cache->BrokenCount() != 0)
{
- c1out << endl;
c1out <<
- _("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.") << endl;
- }
+ _("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"
+ "distribution that some required packages have not yet been created\n"
+ "or been moved out of Incoming.") << endl;
+ if (Packages == 1)
+ {
+ c1out << endl;
+ c1out <<
+ _("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.") << endl;
+ }
+
+ c1out << _("The following information may help to resolve the situation:") << endl;
+ c1out << endl;
+ ShowBroken(c1out,Cache,false);
+ return _error->Error(_("Broken packages"));
+ }
+ }
+ if (!DoAutomaticRemove(Cache))
+ return false;
- c1out << _("The following information may help to resolve the situation:") << endl;
- c1out << endl;
- ShowBroken(c1out,Cache,false);
- return _error->Error(_("Broken packages"));
- }
-
/* Print out a list of packages that are going to be installed extra
to what the user asked */
if (Cache->InstCount() != ExpectedInst)
@@ -1612,8 +1692,8 @@ bool DoInstall(CommandLine &CmdL)
if (*J == 0) {
List += string(I.Name()) + " ";
- VersionsList += string(Cache[I].CandVersion) + "\n";
- }
+ VersionsList += string(Cache[I].CandVersion) + "\n";
+ }
}
ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList);
@@ -1748,6 +1828,8 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
return false;
+ pkgDepCache::ActionGroup group(Cache);
+
// Install everything with the install flag set
pkgCache::PkgIterator I = Cache->PkgBegin();
for (;I.end() != true; I++)
@@ -2500,6 +2582,7 @@ void GetInitialize()
_config->Set("APT::Get::Fix-Broken",false);
_config->Set("APT::Get::Force-Yes",false);
_config->Set("APT::Get::List-Cleanup",true);
+ _config->Set("APT::Get::AutomaticRemove",false);
}
/*}}}*/
// SigWinch - Window size change signal handler /*{{{*/
@@ -2555,6 +2638,7 @@ int main(int argc,const char *argv[])
{0,"remove","APT::Get::Remove",0},
{0,"only-source","APT::Get::Only-Source",0},
{0,"arch-only","APT::Get::Arch-Only",0},
+ {0,"auto-remove","APT::Get::AutomaticRemove",0},
{0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0},
{0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
{0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
@@ -2565,6 +2649,7 @@ int main(int argc,const char *argv[])
{"upgrade",&DoUpgrade},
{"install",&DoInstall},
{"remove",&DoInstall},
+ {"autoremove",&DoInstall},
{"dist-upgrade",&DoDistUpgrade},
{"dselect-upgrade",&DoDSelectUpgrade},
{"build-dep",&DoBuildDep},
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7460a24be..be2b19a1a 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-archive-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
new file mode 100755
index 000000000..533ed8715
--- /dev/null
+++ b/cmdline/apt-mark
@@ -0,0 +1,63 @@
+#!/usr/bin/python
+
+from optparse import OptionParser
+
+try:
+ import apt_pkg
+except ImportError:
+ print "Error importing apt_pkg, is python-apt installed?"
+
+import sys
+import os.path
+
+actions = { "markauto" : 1,
+ "unmarkauto": 0
+ }
+
+if __name__ == "__main__":
+ apt_pkg.init()
+
+ # option parsing
+ parser = OptionParser()
+ parser.usage = "%prog [options] {markauto|unmarkauto} packages..."
+ parser.add_option("-f", "--file", action="store", type="string",
+ dest="filename",
+ help="read/write a different file")
+ parser.add_option("-v", "--verbose",
+ action="store_true", dest="verbose", default=False,
+ help="print verbose status messages to stdout")
+ (options, args) = parser.parse_args()
+ if len(args) < 2:
+ parser.error("not enough argument")
+
+ # get pkgs to change
+ if args[0] not in actions.keys():
+ parser.error("first argument must be 'markauto' or 'unmarkauto'")
+ pkgs = args[1:]
+ action = actions[args[0]]
+
+ # get the state-file
+ if not options.filename:
+ STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states"
+ else:
+ STATE_FILE=options.state_file
+
+ # open the statefile
+ if os.path.exists(STATE_FILE):
+ tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
+ outfile = open(STATE_FILE+".tmp","w")
+ while tagfile.Step():
+ pkgname = tagfile.Section.get("Package")
+ autoInst = tagfile.Section.get("Auto-Installed")
+ if pkgname in pkgs:
+ if options.verbose:
+ print "changing %s to %s" % (pkgname,action)
+ newsec = apt_pkg.RewriteSection(tagfile.Section,
+ [],
+ [ ("Auto-Installed",str(action)) ]
+ )
+ outfile.write(newsec+"\n")
+ else:
+ outfile.write(str(tagfile.Section)+"\n")
+ # all done, rename the tmpfile
+ os.rename(outfile.name, STATE_FILE)
diff --git a/configure.in b/configure.in
index f0b0d6703..58fc4f60d 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu7")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/apt.conf.ubuntu b/debian/apt.conf.ubuntu
new file mode 100644
index 000000000..8d095f17e
--- /dev/null
+++ b/debian/apt.conf.ubuntu
@@ -0,0 +1,10 @@
+APT
+{
+ NeverAutoRemove
+ {
+ "^linux-image.*";
+ "^linux-restricted-modules.*";
+ };
+
+ Install-Recommends-Section "metapackages";
+};
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 26dfa2530..b4cbf1c8a 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -14,6 +14,12 @@
# "APT::Periodic::AutocleanInterval"
# - Do "apt-get autoclean" every n-days (0=disable)
#
+# "APT::Periodic::Unattended-Upgrade"
+# - Run the "unattended-upgrade" security upgrade script
+# every n-days (0=disabled)
+# Requires the package "unattended-upgrades" and will write
+# a log in /var/log/unattended-upgrades
+#
# "APT::Archives::MaxAge",
# - Set maximum allowed age of a cache package file. If a cache
# package file is older it is deleted (0=disable)
@@ -148,6 +154,10 @@ eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists Downl
AutocleanInterval=$DownloadUpgradeableInterval
eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean)
+UnattendedUpgradeInterval=0
+eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
+
+
# laptop check, on_ac_power returns:
# 0 (true) System is on mains power
# 1 (false) System is not on mains power
@@ -182,5 +192,11 @@ if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
update_stamp $AUTOCLEAN_STAMP
fi
+UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
+if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
+ unattended-upgrade
+ update_stamp $UPGRADE_STAMP
+fi
+
# check cache size
check_size_constraints
diff --git a/debian/apt.dirs b/debian/apt.dirs
index e1cb738fa..1543e8bb1 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -2,6 +2,7 @@ usr/bin
usr/lib/apt/methods
usr/lib/dpkg/methods/apt
etc/apt
+etc/apt/apt.conf.d
etc/apt/sources.list.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
diff --git a/debian/apt.postinst b/debian/apt.postinst
index ae1801198..df0433057 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -17,7 +17,7 @@ case "$1" in
configure)
if ! test -f /etc/apt/trusted.gpg; then
- cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
fi
;;
diff --git a/debian/changelog b/debian/changelog
index 65ec82cc1..c76ca0f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,66 @@
-apt (0.6.45.2) unstable; urgency=low
+apt (0.6.45ubuntu7) edgy; urgency=low
- * added "--install-recommends" to handle recommends as
- dependencies (closes: #42266)
+ * apt-pkg/depcache.cc:
+ - fix a bug in the install-recommends-section code
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 18:22:38 +0200
-apt (0.6.45.1) unstable; urgency=low
+apt (0.6.45ubuntu6) edgy; urgency=low
+
+ [Michael Vogt]
+ * cmdline/apt-get.cc:
+ - always show auto-removable packages and give a hint how to remove
+ them
+ * debian/apt.conf.ubuntu:
+ - exlucde linux-image and linux-restricted-modules from ever being
+ auto-removed
+ - added "metapackages" as the section we want to install recommends
+ by default
+ * apt-pkg/depcache.cc:
+ - added support to turn install-recommends selectively on/off by
+ section
+ [Ian Jackson]
+ * Tests pass without code changes! Except that we need this:
+ * Bump cache file major version to force rebuild so that Breaks
+ dependencies are included.
+ * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
+ --auto-deconfigure is very very old and dpkg-dev's Breaks support
+ is more or less orthogonal.
+ * Initial draft of `Breaks' implementation. Appears to compile,
+ but as yet *completely untested*.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200
+
+apt (0.6.45ubuntu5) edgy; urgency=low
+
+ * apt-pkg/pkgcachegen.cc:
+ - increase the APT::Cache-Limit to deal with the increased demand due
+ to the translated descriptions
+ * apt-pkg/deb/dpkgpm.cc:
+ - pass "--auto-deconfigure" to dpkg on install to support the
+ new "breaks" in dpkg
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 12:06:26 +0200
+
+apt (0.6.45ubuntu4) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the new --fix-polciy code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200
+
+apt (0.6.45ubuntu3) edgy; urgency=low
+
+ * ABI break
+ * merged latest apt--install-recommends (closes: #559000)
+ * added "--fix-policy" option to can be used as "--fix-broken" and
+ will install missing weak depends (recommends, and/or suggests
+ depending on the settings)
+ * merged the apt--ddtp branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200
+
+apt (0.6.45ubuntu2) edgy; urgency=low
* debian/control:
- switched to libdb4.4 for building (closes: #381019)
@@ -14,8 +69,18 @@ apt (0.6.45.1) unstable; urgency=low
versions of the package (closes: #257054)
- properly handle recommends/suggests or-groups when printing the list of
suggested/recommends packages (closes: #311619)
+ * merged "apt--install-recommends" branch:
+ - added "{no-}install-recommends" commandline option
+ - added APT::Install-{Recommends,Suggests} option
+ - currently Install-Recommends defaults to "False"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200
+
+apt (0.6.45ubuntu1) edgy; urgency=low
- -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 14:27:54 +0200
+ * merged with debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200
apt (0.6.45) unstable; urgency=low
@@ -56,7 +121,38 @@ apt (0.6.45) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200
-apt (0.6.44.2) unstable; urgency=low
+apt (0.6.44.2ubuntu4) edgy; urgency=low
+
+ * Make apt-get dselect-upgrade happy again
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200
+
+apt (0.6.44.2ubuntu3) edgy; urgency=low
+
+ * Close extended_states file after writing it.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100
+
+apt (0.6.44.2ubuntu2) edgy; urgency=low
+
+ * create a empty extended_states file if none exists already
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200
+
+apt (0.6.44.2ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+ * merged the "auto-mark" branch to support aptitude like
+ marking of automatically installed dependencies and added
+ "apt-get remove --auto-remove" to remove unused auto-installed
+ packages again
+ * changed library version from 3.11 to 3.50 to make it clearly
+ different from the debian version (we are ABI incompatible because
+ of the auto-mark patch)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200
+
+apt (0.6.44.2) unstable; urgency=low
* apt-pkg/depcache.cc:
- added Debug::pkgDepCache::AutoInstall (thanks to infinity)
@@ -124,6 +220,26 @@ apt (0.6.44) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200
+apt (0.6.43.3ubuntu3) dapper; urgency=low
+
+ * methods/http.cc:
+ - fix the user-agent string
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200
+
+apt (0.6.43.3ubuntu2) dapper; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200
+
+apt (0.6.43.3ubuntu1) dapper; urgency=low
+
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in
+ the status-fd (ubuntu #28954)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200
+
apt (0.6.43.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
@@ -133,16 +249,46 @@ apt (0.6.43.3) unstable; urgency=low
* pl.po: Completed to 512t. Closes: #349514
* sk.po: Completed to 512t. Closes: #349474
* gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
* sv.po: Completed to 512 strings Closes: #349210
* ru.po: Completed to 512 strings Closes: #349154
* da.po: Completed to 512 strings Closes: #349084
* fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
* vi.po: Completed to 511 strings Closes: #348968
- * zh_CN.po: Completed to 512t. Closes: #353936
- * it.po: Completed to 512t. Closes: #352803
- * pt_BR.po: Completed to 512t. Closes: #352419
+ * apt-pkg/deb/deblistparser.cc:
+ - don't explode on a DepCompareOp in a Provides line, but warn about
+ it and ignore it otherwise (thanks to James Troup for reporting it)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
+
+ -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+
+apt (0.6.43.2ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
* LINGUAS: Add Welsh
* *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
* apt-pkg/deb/deblistparser.cc:
- don't explode on a DepCompareOp in a Provides line, but warn about
it and ignore it otherwise (thanks to James Troup for reporting it)
@@ -153,8 +299,10 @@ apt (0.6.43.3) unstable; urgency=low
* make apt-cache madison work without deb-src entries (#352583)
* cmdline/apt-get.cc: only run the list-cleaner if a update was
successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
- -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100
apt (0.6.43.2) unstable; urgency=low
@@ -179,8 +327,26 @@ apt (0.6.43.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
-apt (0.6.43.1) unstable; urgency=low
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+ * added APT::Periodic::Unattended-Upgrade (requires the package
+ "unattended-upgrade")
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+
+apt (0.6.43.1) unstable; urgency=low
+
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
* fr.po: Completed to 510 strings
* it.po: Completed to 510t
@@ -202,6 +368,19 @@ apt (0.6.43.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100
+apt (0.6.43ubuntu2) dapper; urgency=low
+
+ * merged some missing bits that wheren't merged by baz in the previous
+ upload (*grumble*)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100
+
+apt (0.6.43ubuntu1) dapper; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
+
apt (0.6.43) unstable; urgency=medium
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
@@ -222,6 +401,22 @@ apt (0.6.43) unstable; urgency=medium
-- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
+apt (0.6.42.3ubuntu2) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:
+ * zh_CN.po: Completed to 507 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100
+
+apt (0.6.42.3ubuntu1) dapper; urgency=low
+
+ * synced with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
+
apt (0.6.42.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@ -269,13 +464,13 @@ apt (0.6.42) unstable; urgency=low
- unmount the cdrom when apt failed to locate any package files
* allow cdrom failures and fallback to other sources in that case
(closes: #44135)
- * better error text when dpkg-source fails
+ * better error text when dpkg-source fails
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
- patch-99: Added Galician translation
- patch-100: Completed Danish translation (Closes: #325686)
- patch-104: French translation completed
- patch-109: Italian translation completed
- - patch-112: Swedish translation update
+ - patch-112: Swedish translation update
- patch-115: Basque translation completed (Closes: #333299)
* applied french man-page update (thanks to Philippe Batailler)
(closes: #316638, #327456)
@@ -289,12 +484,12 @@ apt (0.6.42) unstable; urgency=low
* apt-pkg/contrib/md5.cc:
- fix a alignment problem on sparc64 that gives random bus errors
(thanks to Fabbione for providing a test-case)
- * init the default ScreenWidth to 79 columns by default
+ * init the default ScreenWidth to 79 columns by default
(Closes: #324921)
- * cmdline/apt-cdrom.cc:
+ * cmdline/apt-cdrom.cc:
- fix some missing gettext() calls (closes: #334539)
* doc/apt-cache.8.xml: fix typo (closes: #334714)
-
+
-- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2005 22:02:09 +0200
apt (0.6.41) unstable; urgency=low
@@ -302,8 +497,8 @@ apt (0.6.41) unstable; urgency=low
* improved the support for "error" and "conffile" reporting from
dpkg, added the format to README.progress-reporting
* added README.progress-reporting to the apt-doc package
- * improved the network timeout handling, if a index file from a
- sources.list times out or EAI_AGAIN is returned from getaddrinfo,
+ * improved the network timeout handling, if a index file from a
+ sources.list times out or EAI_AGAIN is returned from getaddrinfo,
don't try to get the other files from that entry
* Support architecture-specific extra overrides
(closes: #225947). Thanks to Anthony Towns for idea and
@@ -311,10 +506,10 @@ apt (0.6.41) unstable; urgency=low
* Javier Fernandez-Sanguino Pen~a:
- Added a first version of an apt-secure.8 manpage, and modified
apt-key and apt.end accordingly. Also added the 'update'
- argument to apt-key which was previously not documented
+ argument to apt-key which was previously not documented
(Closes: #322120)
* Andreas Pakulat:
- - added example apt-ftparchive.conf file to doc/examples
+ - added example apt-ftparchive.conf file to doc/examples
(closes: #322483)
* Fix a incorrect example in the man-page (closes: #282918)
* Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
@@ -323,10 +518,84 @@ apt (0.6.41) unstable; urgency=low
* Change pkgPolicy::Pin from private to protected to let subclasses
access it too (closes: #321799)
* add default constructor for PrvIterator (closes: #322267)
- * Reread status configuration on debSystem::Initialize()
+ * Reread status configuration on debSystem::Initialize()
(needed for apt-proxy, thanks to Otavio for this patch)
-
+
-- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+
+apt (0.6.40.1ubuntu8) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
+ - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
+ * po/de.po, po/fr.po:
+ - updated the translations
+ * po/makefile:
+ - create a single pot file in each domain dir to make rosetta happy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200
+
+apt (0.6.40.1ubuntu7) breezy; urgency=low
+
+ * updated the pot/po files , no code changes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200
+
+apt (0.6.40.1ubuntu6) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
+ - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
+
+apt (0.6.40.1ubuntu2) breezy; urgency=low
+
+ * improved the support for "error" and "conffile" reporting from
+ dpkg, added the format to README.progress-reporting
+ * added README.progress-reporting to the apt-doc package
+ * Do md5sum checking for file and cdrom method (closes: #319142)
+ * Change pkgPolicy::Pin from private to protected to let subclasses
+ access it too (closes: #321799)
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
apt (0.6.40.1) unstable; urgency=low
@@ -337,6 +606,12 @@ apt (0.6.40.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+apt (0.6.40ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+
apt (0.6.40) unstable; urgency=low
* Patch from Jordi Mallach to mark some additional strings for translation
@@ -352,6 +627,39 @@ apt (0.6.40) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -362,7 +670,14 @@ apt (0.6.39) unstable; urgency=low
* Update priority of apt-utils to important, to match the override file
* Install only one keyring on each branch (Closes: #316119)
- -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+ -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:35:21 -0700
+
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
apt (0.6.38) unstable; urgency=low
@@ -394,6 +709,7 @@ apt (0.6.37) breezy; urgency=low
* Add Welsh translation from Dafydd Harries
(daf@muse.19inch.net--2005/apt--main--0--patch-1)
* Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ * Fix a incorrect example in the man-page (closes: #282918)
-- Matt Zimmerman <mdz@ubuntu.com> Tue, 24 May 2005 14:38:25 -0700
diff --git a/debian/control b/debian/control
index 3cba50acb..dfcebf41e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}
Priority: important
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
-Recommends: debian-archive-keyring
+Recommends: ubuntu-keyring
Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
Section: admin
Description: Advanced front-end for dpkg
diff --git a/debian/rules b/debian/rules
index a8bf88762..2007370c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,10 +210,15 @@ apt: build debian/shlibs.local
cp debian/bugscript debian/$@/usr/share/bug/apt/script
- cp share/debian-archive.gpg debian/$@/usr/share/$@
-
+ cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
+ cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
# head -n 500 ChangeLog > debian/ChangeLog
+ # make rosetta happy and remove pot files in po/ (but leave stuff
+ # in po/domains/* untouched) and cp *.po into each domain dir
+ rm -f build/po/*.pot
+ rm -f po/*.pot
+
dh_installexamples -p$@ $(BLD)/docs/examples/*
dh_installman -p$@
dh_installcron -p$@
@@ -338,4 +343,4 @@ arch-build:
mkdir -p debian/arch-build/apt-$(APT_DEBVER)
tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -)
$(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
- (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG))
+ (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 2779f2501..c1e65332d 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -151,7 +151,7 @@ Reverse Provides:
a dependency but were not provided by any package. Missing packages may
be in evidence if a full distribution is not accessed, or if a package
(real or virtual) has been dropped from the distribution. Usually they
- are referenced from Conflicts statements.</para>
+ are referenced from Conflicts or Breaks statements.</para>
</listitem>
<listitem><para><literal>Total distinct</literal> versions is the number of package versions
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 3e50bef8c..12b03196a 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -183,7 +183,7 @@ belonging to any distribution whose Archive name is "<literal>unstable</literal>
<programlisting>
Package: *
Pin: release a=unstable
-Pin-Priority: 50
+Pin-Priority: 500
</programlisting>
<simpara>The following record assigns a high priority to all package versions
diff --git a/doc/cache.sgml b/doc/cache.sgml
index aa87db986..e257dcd81 100644
--- a/doc/cache.sgml
+++ b/doc/cache.sgml
@@ -492,7 +492,7 @@ This is the parsed priority value of the package.
Dependency contains the information for a single dependency record. The records
are split up like this to ease processing by the client. The base of list
linked list is Version.DependsList. All forms of dependencies are recorded
-here including Conflicts, Suggests and Recommends.
+here including Conflicts, Breaks, Suggests and Recommends.
<p>
Multiple depends on the same package must be grouped together in
@@ -671,6 +671,7 @@ of them.
#define pkgDEP_Recommends 4
#define pkgDEP_Conflicts 5
#define pkgDEP_Replaces 6
+#define pkgDEP_Breaks 8
</example>
</sect1>
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 23372d71f..7c6e023dd 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -46,6 +46,8 @@ The basic dpkg package control file supports the following major features:-
productivity of the package
<item>Conflicts, to specify a package which must NOT be installed
in order for the package to be configured
+ <item>Breaks, to specify a package which is broken by the
+ package and which should therefore not be configured while broken
</list>
Each of these dependencies can specify a version and a depedency on that
version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index c4329dfa0..5b3c1a55c 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -24,11 +24,15 @@ APT
{
Architecture "i386";
Build-Essential "build-essential";
-
+
+ NeverAutoRemove { "linux-kernel.*"; }; // packages that should never
+ // considered for autoRemove
+
// Options for apt-get
Get
{
Arch-Only "false";
+ AutomaticRemove "false";
Download-Only "false";
Simulate "false";
Assume-Yes "false";
@@ -255,7 +259,8 @@ Debug
pkgDPkgPM "false";
pkgDPkgProgressReporting "false";
pkgOrderList "false";
-
+ pkgAutoRemove "false"; // show information about automatic removes
+
pkgInitialize "false"; // This one will dump the configuration space
NoLocking "false";
Acquire::Ftp "false"; // Show ftp command traffic
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 9f2343277..a958899ae 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,10 +1,11 @@
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed through the apt-cdrom tool.
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu dapper main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+deb http://security.ubuntu.com/ubuntu dapper-security main restricted
+deb-src http://security.ubuntu.com/ubuntu dapper-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted
diff --git a/methods/http.cc b/methods/http.cc
index 341de94e3..1833f41ef 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -657,7 +657,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
will glitch HTTP/1.0 proxies because they do not filter it out and
pass it on, HTTP/1.1 says the connection should default to keep alive
and we expect the proxy to do this */
- if (Proxy.empty() == true)
+ if (Proxy.empty() == true || Proxy.Host.empty())
sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n",
QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str());
else
@@ -714,7 +714,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
- Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n";
+ Req += "User-Agent: Ubuntu APT-HTTP/1.3\r\n\r\n";
if (Debug == true)
cerr << Req << endl;
diff --git a/methods/makefile b/methods/makefile
index 1e3b1ef85..2e3abe55c 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
BIN := $(BIN)/methods
# FIXME..
-LIB_APT_PKG_MAJOR = 3.11
+LIB_APT_PKG_MAJOR = 3.51
APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
# The file method
diff --git a/po/apt-all.pot b/po/apt-all.pot
index d6d146428..a329525a6 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-09 18:35+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -148,7 +148,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2389 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -243,7 +243,8 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
+#: apt-pkg/pkgcachegen.cc:819
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -542,221 +543,221 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1508
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr ""
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr ""
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr ""
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr ""
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr ""
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr ""
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr ""
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr ""
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr ""
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr ""
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:693
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:702
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:755
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:764
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1853
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1901 cmdline/apt-get.cc:2137
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:816
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1991
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:868
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -764,74 +765,74 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:995
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1058
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1069
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1091
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -839,79 +840,97 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1110
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1113
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1172
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1328
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1444
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1495 cmdline/apt-get.cc:1531
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1548
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1563
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -919,163 +938,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1576
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1605
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1715
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1718 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1788 cmdline/apt-get.cc:1796
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1896
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1926 cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1994
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2039
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2067
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2080
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2097
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2132
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2160
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2180
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2232
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2284
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2344
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2358
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1360,9 +1375,11 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844 apt-pkg/pkgcachegen.cc:752
+#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
+#: apt-pkg/pkgcachegen.cc:949
msgid "Reading package lists"
msgstr ""
@@ -1834,7 +1851,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:938
+#: apt-pkg/contrib/strutl.cc:938 apt-pkg/contrib/strutl.cc:981
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2031,87 +2048,101 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:126
+#: apt-pkg/pkgcache.cc:126 apt-pkg/pkgcache.cc:137
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:132 apt-pkg/pkgcache.cc:143
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:148
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:142 apt-pkg/pkgcache.cc:153
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:147
+#: apt-pkg/pkgcache.cc:147 apt-pkg/pkgcache.cc:158
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:220
+#: apt-pkg/pkgcache.cc:220 apt-pkg/pkgcache.cc:231
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:232 apt-pkg/pkgcache.cc:243
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:232 apt-pkg/pkgcache.cc:243
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr ""
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+msgid "Reading state information"
+msgstr ""
+
+#: apt-pkg/depcache.cc:199
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr ""
+
+#: apt-pkg/depcache.cc:205
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr ""
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2152,7 +2183,7 @@ msgstr ""
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 apt-pkg/cdrom.cc:450
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
@@ -2185,19 +2216,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245 apt-pkg/algorithms.cc:248
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075 apt-pkg/algorithms.cc:1096
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077 apt-pkg/algorithms.cc:1098
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2233,17 +2264,17 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:122 apt-pkg/init.cc:125
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:138 apt-pkg/init.cc:141
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2277,82 +2308,83 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131 apt-pkg/pkgcachegen.cc:134
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152 apt-pkg/pkgcachegen.cc:182
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156 apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186 apt-pkg/pkgcachegen.cc:217
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190 apt-pkg/pkgcachegen.cc:221
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194 apt-pkg/pkgcachegen.cc:225
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:255
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212 apt-pkg/pkgcachegen.cc:258
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215 apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243 apt-pkg/pkgcachegen.cc:292
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256 apt-pkg/pkgcachegen.cc:305
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262 apt-pkg/pkgcachegen.cc:311
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577 apt-pkg/pkgcachegen.cc:682
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662 apt-pkg/pkgcachegen.cc:767
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
+#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
msgid "IO Error saving source cache"
msgstr ""
@@ -2361,35 +2393,36 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
+#: apt-pkg/acquire-item.cc:980
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646 apt-pkg/acquire-item.cc:675
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759 apt-pkg/acquire-item.cc:788
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818 apt-pkg/acquire-item.cc:847
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854 apt-pkg/acquire-item.cc:883
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941 apt-pkg/acquire-item.cc:970
msgid "Size mismatch"
msgstr ""
@@ -2398,41 +2431,42 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:507
+#: apt-pkg/cdrom.cc:507 apt-pkg/cdrom.cc:531
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 apt-pkg/cdrom.cc:540
+#: apt-pkg/cdrom.cc:622
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:565
#, c-format
msgid "Stored label: %s \n"
msgstr ""
-#: apt-pkg/cdrom.cc:561
+#: apt-pkg/cdrom.cc:561 apt-pkg/cdrom.cc:585
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:579 apt-pkg/cdrom.cc:603
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:583
+#: apt-pkg/cdrom.cc:583 apt-pkg/cdrom.cc:607
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:591 apt-pkg/cdrom.cc:615
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:609 apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
msgstr ""
@@ -2441,49 +2475,49 @@ msgstr ""
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:710 apt-pkg/cdrom.cc:737
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:726 apt-pkg/cdrom.cc:753
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:730 apt-pkg/cdrom.cc:757
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:754 apt-pkg/cdrom.cc:783
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:763 apt-pkg/cdrom.cc:792
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:803 apt-pkg/cdrom.cc:832
msgid "Unmounting CD-ROM..."
msgstr ""
-#: apt-pkg/indexcopy.cc:261
+#: apt-pkg/indexcopy.cc:261 apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:263
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:266
+#: apt-pkg/indexcopy.cc:266 apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:269
+#: apt-pkg/indexcopy.cc:269 apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2541,3 +2575,28 @@ msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
+
+#: apt-pkg/pkgcache.cc:231
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:157
+#, c-format
+msgid "Error occured while processing %s (NewFileDesc1)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:249
+#, c-format
+msgid "Error occured while processing %s (NewFileDesc2)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:261
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:673
+#, c-format
+msgid ""
+"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"signatures\n"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 2aeff7eb5..7c783d194 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-03-31 22:05+0300\n"
"Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s за %s %s, компилиран на %s %s\n"
@@ -306,7 +306,7 @@ msgstr ""
" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Неуспех при записа на %s"
@@ -648,79 +648,79 @@ msgstr "Неуспех при премахването на връзка на %s
msgid "Failed to rename %s to %s"
msgstr "Неуспех при преименуването на %s на %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Следните пакети имат неудовлетворени зависимости:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "но е инсталиран %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "но ще бъде инсталиран %s"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "но той не може да бъде инсталиран"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "но той е виртуален пакет"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "но той не е инсталиран"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "но той няма да бъде инсталиран"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " или"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Следните пакети няма да бъдат променени:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Следните пакети ще бъдат актуализирани:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Следните задържани пакети ще бъдат променени:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (поради %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -728,146 +728,146 @@ msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu актуализирани, %lu нови инсталирани, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu преинсталирани, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu върнати към по-стара версия, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu за премахване и %lu без промяна.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu не са напълно инсталирани или премахнати.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Коригиране на зависимостите..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " пропадна."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Неуспех при коригирането на зависимостите"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Неуспех при минимизирането на набора актуализации"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Готово"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
"неизправности."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Инсталиране на тези пакети без проверка [y/N]?"
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Някои пакети не можаха да бъдат удостоверени"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Вътрешна грешка, „Ordering“ не завърши"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Списъкът с източници не можа да бъде прочетен."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "След разпакетирането ще бъде използвано %sB дисково пространство.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Нямате достатъчно свободно пространство в %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Да, прави каквото казвам!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -878,28 +878,28 @@ msgstr ""
"За да продължите, въведете фразата „%s“\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Прекъсване."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Искате ли да продължите [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Някои файлове не можаха да бъдат изтеглени"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -907,47 +907,47 @@ msgstr ""
"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
"или да опитате с „--fix-missing“?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Неуспех при коригирането на липсващите пакети."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Прекъсване на инсталирането."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Забележете, избиране на %s вместо %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Пакетът %s е виртуален пакет, осигурен от:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Инсталиран]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Трябва изрично да изберете един за инсталиране."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -958,49 +958,49 @@ msgstr ""
"Това може да означава, че пакета липсва, остарял е, или е достъпен\n"
"само от друг източник\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Обаче следните пакети го заместват:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Пакетът %s няма кандидат за инсталиране"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s вече е най-новата версия.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Не е намерено издание „%s“ на „%s“"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Не е намерена версия „%s“ на „%s“"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Избрана е версия %s (%s) за %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Командата „update“ не възприема аргументи"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Неуспех при заключването на директорията със списъка на пакетите"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1008,25 +1008,45 @@ msgstr ""
"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или "
"са използвани по-стари."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Следната информация може да помогне за намиране на изход от ситуацията:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1034,7 +1054,7 @@ msgstr ""
"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
"укажете разрешение)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1046,7 +1066,7 @@ msgstr ""
"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
"са били преместени от Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1056,123 +1076,118 @@ msgstr ""
"да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n"
"доклад за грешка за този пакет."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-"Следната информация може да помогне за намиране на изход от ситуацията:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Счупени пакети"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Предложени пакети:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Препоръчвани пакети:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Неуспех"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Нямате достатъчно свободно пространство в %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1181,7 +1196,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1191,32 +1206,32 @@ msgstr ""
"налични версии на пакета %s, които могат да удовлетворят изискването за "
"версия"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1557,9 +1572,9 @@ msgstr ""
"Директориите info и temp трябва да бъдат на една и съща файлова система"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Четене на списъците с пакети"
@@ -2317,18 +2332,33 @@ msgstr "незадължителен"
msgid "extra"
msgstr "допълнителен"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Изграждане на дървото със зависимости"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Версии кандидати"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Генериране на зависимости"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Смесване на наличната информация"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Неуспех при отварянето на %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Неуспех при запис на файл %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2410,7 +2440,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Не се поддържа индексен файл от типа „%s“"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2418,7 +2448,7 @@ msgstr ""
"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
"него."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2426,7 +2456,7 @@ msgstr ""
"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
"причинено от задържани пакети."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
@@ -2463,7 +2493,7 @@ msgstr "Неуспех при намирането на драйвер за ме
msgid "Method %s did not start correctly"
msgstr "Методът %s не стартира правилно"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
@@ -2510,86 +2540,86 @@ msgstr "Неизвестен тип за отбиване %s"
msgid "No priority (or zero) specified for pin"
msgstr "Няма указан приоритет (или е нула) на отбиването"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Кешът има несъвместима система за версии"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Възникна грешка при обработката на %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Възникна грешка при обработката на %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Възникна грешка при обработката на %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Възникна грешка при обработката на %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Възникна грешка при обработката на %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Възникна грешка при обработката на %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
"APT."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Възникна грешка при обработката на %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Възникна грешка при обработката на %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Събиране на информация за „Осигурява“"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
@@ -2598,15 +2628,15 @@ msgstr "Входно/изходна грешка при запазването
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването се провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2615,7 +2645,7 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2624,14 +2654,14 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Несъответствие на размера"
diff --git a/po/bs.po b/po/bs.po
index 14d363583..e26b6677b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -147,7 +147,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -254,7 +254,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
@@ -554,223 +554,223 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ali je %s instaliran"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ali se ne može instalirati"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ali je virtuelni paket"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ali nije instaliran"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ali se neće instalirati"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ili"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Slijedeći paketi će biti UKLONJENI:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Slijedeći paketi su zadržani:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Ispravljam zavisnosti..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ne mogu ispraviti zavisnosti"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Urađeno"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Da, uradi kako kažem!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -778,75 +778,75 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Odustani."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Odustajem od instalacije."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr "[Instalirano]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -854,79 +854,97 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1444
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -934,163 +952,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1375,9 +1389,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Čitam spiskove paketa"
@@ -2120,18 +2134,33 @@ msgstr "opcionalno"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Gradim stablo zavisnosti"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Verzije kandidata"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Stvaranje zavisnosti"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Sastavljam dostupne informacije"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2205,19 +2234,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2253,7 +2282,7 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2297,82 +2326,82 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr ""
@@ -2381,35 +2410,35 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 1bf2fd868..a8d529182 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-02-05 22:00+0100\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s per a %s %s compilat el %s %s\n"
@@ -303,7 +303,7 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
@@ -641,79 +641,79 @@ msgstr "S'ha trobat un problema treient l'enllaç %s"
msgid "Failed to rename %s to %s"
msgstr "No s'ha pogut canviar el nom de %s a %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Els següents paquets tenen dependències sense satisfer:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "però està instal·lat %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "però s'instal·larà %s"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "però no és instal·lable"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "però és un paquet virtual"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "però no està instal·lat"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "però no serà instal·lat"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "S'instal·laran els següents paquets NOUS:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "S'ELIMINARAN els següents paquets:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "S'han mantingut els següents paquets:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "S'actualitzaran els següents paquets:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Es DESACTUALITZARAN els següents paquets:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Es canviaran els següents paquets mantinguts:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (per %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -721,146 +721,146 @@ msgstr ""
"AVÍS: Els següents paquets essencials seran eliminats.\n"
"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualitzats, %lu nous a instal·lar, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstal·lats, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a eliminar i %lu no actualitzats.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instal·lats o eliminats completament.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "S'estan corregint les dependències..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " ha fallat."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "No es poden corregir les dependències"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "No es pot minimitzar el joc de versions revisades"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Fet"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependències sense satisfer. Proveu-ho usant -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVÍS: No es poden autenticar els següents paquets!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "S'ha descartat l'avís d'autenticació.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "No s'ha pogut autenticar alguns paquets"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Hi ha problemes i s'ha usat -y sense --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
"trencats!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es necessita obtenir %sB/%sB d'arxius.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es necessita obtenir %sB d'arxius.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No teniu prou espai lliure en %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Es va especificar Trivial Only però aquesta operació no és trivial."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Sí, fes el que et dic!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -871,28 +871,28 @@ msgstr ""
"Per a continuar escriviu la frase «%s»\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Avortat."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut descarregar"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de només descàrrega"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -900,48 +900,48 @@ msgstr ""
"No es poden descarregar alguns arxius, potser executant apt-get update o "
"intenteu-ho amb --fix-missing."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "No es poden corregir els paquets que falten."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "S'està avortant la instal·lació."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "El paquet %s és un paquet virtual proveït per:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instal·lat]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -952,50 +952,50 @@ msgstr ""
"en fa referència. Això normalment vol dir que el paquet falta,\n"
"s'ha tornat obsolet o només és disponible des d'una altra font.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Tot i que els següents paquets el reemplacen:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "El paquet %s no té candidat d'instal·lació"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ja es troba en la versió més recent.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió «%s» per a «%s»"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versió seleccionada %s (%s) per a %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "No es pot blocar el directori de la llista"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1003,25 +1003,45 @@ msgstr ""
"No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc "
"s'han usat els antics."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1029,7 +1049,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1041,7 +1061,7 @@ msgstr ""
"unstable i alguns paquets requerits encara no han estat creats o bé\n"
"encara no els hi han afegit."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1051,124 +1071,120 @@ msgstr ""
"probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n"
"un informe d'error en contra d'aquest per a arxivar-lo."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a descarregar"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No es pot trobar un paquet de fonts per a %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja descarregat «%s»\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita descarregar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"S'ha d'especificar un paquet per a verificar les dependències de construcció "
"per a"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"No es pot obtenir informació sobre les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1177,7 +1193,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1186,32 +1202,32 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
"s pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
"és massa nou"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1555,9 +1571,9 @@ msgstr ""
"fitxers"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "S'està llegint la llista de paquets"
@@ -2309,18 +2325,33 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "S'està construint l'arbre de dependències"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versions candidates"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Dependències que genera"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "S'està fusionant la informació disponible"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2398,14 +2429,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "El tipus de fitxer índex '%s', no està suportat"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2413,7 +2444,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
"causat per paquets mantinguts."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No es poden corregir els problemes, teniu paquets mantinguts que estan "
@@ -2451,7 +2482,7 @@ msgstr "No s'ha pogut trobar el mètode de control %s."
msgid "Method %s did not start correctly"
msgstr "El mètode %s no s'ha iniciat correctament"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
@@ -2497,86 +2528,86 @@ msgstr "No s'ha entès el pin de tipus %s"
msgid "No priority (or zero) specified for pin"
msgstr "No hi ha prioritat especificada per al pin (o és zero)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "La memòria cau té un sistema de versions incompatible"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "S'ha produït un error durant el processament de %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "S'ha produït un error durant el processament de %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "S'ha produït un error durant el processament de %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. "
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Uau, heu excedit el nombre de dependències de les que aquest APT és capaç."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "S'ha produït un error durant el processament de %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
"S'ha produït un error durant el processament de %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No s'ha pogut llegir la llista de paquets font %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "S'estan recollint els fitxers que proveeixen"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
@@ -2585,15 +2616,15 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2603,7 +2634,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2612,7 +2643,7 @@ msgstr ""
"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
"d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2620,7 +2651,7 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "La mida no concorda"
diff --git a/po/cs.po b/po/cs.po
index 51b2f23fb..e4ca6486c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-05-14 18:36+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -147,7 +147,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pro %s %s zkompilován na %s %s\n"
@@ -298,7 +298,7 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Nemohu zapsat do %s"
@@ -635,79 +635,79 @@ msgstr "Problém s odlinkováním %s"
msgid "Failed to rename %s to %s"
msgstr "Selhalo přejmenování %s na %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Následující balíky mají nesplněné závislosti:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ale %s je nainstalován"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s se bude instalovat"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ale je to virtuální balík"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ale není nainstalovaný"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ale nebude se instalovat"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " nebo"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Následující NOVÉ balíky budou nainstalovány:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Následující balíky budou ODSTRANĚNY:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Následující balíky budou aktualizovány:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Následující balíky budou DEGRADOVÁNY:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Následující podržené balíky budou změněny:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -715,144 +715,144 @@ msgstr ""
"VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizováno, %lu nově instalováno, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalováno, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Opravuji závislosti..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " selhalo."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Nemohu opravit závislosti"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Nemohu minimalizovat sadu pro aktualizaci"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Pro opravení můžete spustit `apt-get -f install'."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplněné závislosti. Zkuste použít -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Autentizační varování potlačeno.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalovat tyto balíky bez ověření [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Některé balíky nemohly být autentizovány"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Potřebuji stáhnout %sB archivů.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozbalení bude na disku použito dalších %sB.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nemohu určit volné místo v %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "V %s nemáte dostatek volného místa."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Udáno 'pouze triviální', ovšem toto není triviální operace."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ano, udělej to tak, jak říkám!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -863,28 +863,28 @@ msgstr ""
"Pro pokračování opište frázi '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Přerušeno."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -892,47 +892,47 @@ msgstr ""
"Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
"fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Nemohu opravit chybějící balíky."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Přerušuji instalaci."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Pozn: Vybírám %s místo %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Přeskakuji %s, protože je již nainstalován.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Balík %s je virtuální balík poskytovaný:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr "[Instalovaný]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Měli byste explicitně vybrat jeden k instalaci."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -943,49 +943,49 @@ msgstr ""
"To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
"pouze z jiného zdroje\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Nicméně následující balíky jej nahrazují:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Balík %s nemá kandidáta pro instalaci"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je již nejnovější verze.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Vydání '%s' pro '%s' nebylo nalezeno"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verze '%s' pro '%s' nebyla nalezena"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vybraná verze %s (%s) pro %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -993,25 +993,44 @@ msgstr ""
"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou "
"použity starší verze."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pro opravení následujících můžete spustit `apt-get -f install':"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1019,7 +1038,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1030,7 +1049,7 @@ msgstr ""
"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1040,128 +1059,124 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Následující extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1170,31 +1185,31 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1529,9 +1544,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Adresáře info a temp musí být na stejném souborovém systému"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Čtu seznamy balíků"
@@ -2280,18 +2295,33 @@ msgstr "volitelný"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Vytvářím strom závislostí"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidátské verze"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generování závislostí"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Slučuji dostupné informace"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nelze otevřít %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Selhal zápis souboru %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2368,13 +2398,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexový typ souboru '%s' není podporován"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2382,7 +2412,7 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
"podrženými balíky."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu."
@@ -2418,7 +2448,7 @@ msgstr "Ovladač metody %s nemohl být nalezen."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nebyla spuštěna správně"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter."
@@ -2463,84 +2493,84 @@ msgstr "Nerozumím vypíchnutí typu %s"
msgid "No priority (or zero) specified for pin"
msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cache má nekompatibilní systém správy verzí"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Při zpracování %s se objevila chyba (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Při zpracování %s se objevila chyba (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Při zpracování %s se objevila chyba (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Při zpracování %s se objevila chyba (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Při zpracování %s se objevila chyba (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Wow, překročili jste počet jmen balíků, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Wow, překročili jste počet závislostí, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Chyba při zpracování %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Při zpracování závislostí nebyl nalezen balík %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
@@ -2549,15 +2579,15 @@ msgstr "Chyba IO při ukládání zdrojové cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2566,7 +2596,7 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
"tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2575,14 +2605,14 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
diff --git a/po/cy.po b/po/cy.po
index ccdeca312..8a68f8613 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -164,7 +164,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
@@ -324,7 +324,7 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
@@ -666,82 +666,82 @@ msgstr "Gwall wrth datgysylltu %s"
msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " neu"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -751,147 +751,147 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Yn cywiro dibyniaethau..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " wedi methu."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ni ellir cywiro dibyniaethau"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Ni ellir bychanu y set uwchraddio"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Wedi Gorffen"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
#, fuzzy
msgid "Some packages could not be authenticated"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
#, fuzzy
msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Does dim digon o le rhydd gennych yn %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -902,29 +902,29 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -932,49 +932,49 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Dylech ddewis un yn benodol i'w sefydlu."
# FIXME: punctuation
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, fuzzy, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -986,49 +986,49 @@ msgstr ""
"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
"ffeil sources.list.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1036,27 +1036,46 @@ msgstr ""
"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
"rai eu defnyddio yn lle."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc:1463
#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
# FIXME
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1065,7 +1084,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1078,7 +1097,7 @@ msgstr ""
"heb gael eu symud allan o Incoming."
# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1087,122 +1106,118 @@ msgstr ""
"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1211,7 +1226,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1220,34 +1235,34 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1595,9 +1610,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
#, fuzzy
msgid "Reading package lists"
msgstr "Yn Darllen Rhestrau Pecynnau"
@@ -2374,21 +2389,36 @@ msgstr "opsiynnol"
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
#, fuzzy
msgid "Building dependency tree"
msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
#, fuzzy
msgid "Candidate versions"
msgstr "Fersiynau Posib"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
#, fuzzy
msgid "Dependency generation"
msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
# FIXME: number?
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
@@ -2468,7 +2498,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2476,7 +2506,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2484,7 +2514,7 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
@@ -2521,7 +2551,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s."
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2572,84 +2602,84 @@ msgstr "Methwyd daeall y math pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Mae can y storfa system fersiwn anghyfaddas"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, fuzzy, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, fuzzy, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
@@ -2658,16 +2688,16 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2676,7 +2706,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2685,14 +2715,14 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
diff --git a/po/da.po b/po/da.po
index 625eae15d..d2827b147 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-01-20 22:23+0100\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -153,7 +153,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s oversat p %s %s\n"
@@ -305,7 +305,7 @@ msgstr ""
" -c=? Ls denne opstningsfil\n"
" -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
@@ -642,79 +642,79 @@ msgstr "Problem under aflnkning af %s"
msgid "Failed to rename %s to %s"
msgstr "Kunne ikke omdbe %s til %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulrt udtryk - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Flgende pakker har uopfyldte afhngigheder:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "men %s er installeret"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "men %s forventes installeret"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "men det er en virtuel pakke"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "men den er ikke installeret"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "men den bliver ikke installeret"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Flgende NYE pakker vil blive installeret:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Flgende pakker vil blive AFINSTALLERET:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Flgende pakker er blevet holdt tilbage:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Flgende pakker vil blive opgraderet:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Flgende pakker vil blive NEDGRADERET:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Flgende tilbageholdte pakker vil blive ndret:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -722,143 +722,143 @@ msgstr ""
"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n"
"Dette br IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderes, %lu nyinstalleres, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleres, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderes, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Retter afhngigheder..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " mislykkedes."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Kunne ikke rette afhngigheder"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Kunne ikke minimere opgraderingssttet"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Frdig"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Uopfyldte afhngigheder. Prv med -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Flgende pakkers autensitet kunne ikke verificeres!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Autentifikationsadvarsel tilsidesat.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installr disse pakker uden verifikation (y/N)? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Nogle pakker kunne ikke autentificeres"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Der er problemer og -y blev brugt uden --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern fejl. InstallPackages blev kaldt med delagte pakker!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldfrt"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Kunne ikke lse nedhentningsmappen"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke lses."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "Mystisk.. Strrelserne passede ikke, skriv til apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%sB/%sB skal hentes fra arkiverne.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB skal hentes fra arkiverne.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikke nok ledig plads i %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, gr som jeg siger!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -869,28 +869,28 @@ msgstr ""
"For at fortstte, skal du skrive '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Afbryder."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortstte [J/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -898,49 +898,49 @@ msgstr ""
"Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' "
"eller prv med --fix-missing."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og medieskift understttes endnu ikke"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Kunne ikke rette manglende pakker."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Afbryder installationen."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Bemrk, at %s vlges fremfor %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Overspringer %s, da den allerede er installeret og opgradering er "
"deaktiveret.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installeret]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Du br eksplicit vlge en at installere."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -951,49 +951,49 @@ msgstr ""
"anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n"
"kun kan hentes fra andre kilder\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Dog kan flgende pakker erstatte den:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakken %s har ingen installationskandidat"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s er i forvejen den nyeste version.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Udgaven '%s' for '%s' blev ikke fundet"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versionen '%s' for '%s' blev ikke fundet"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Valgte version %s (%s) af %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kunne ikke lse listemappen"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1001,25 +1001,44 @@ msgstr ""
"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle "
"bruges i stedet."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern fejl. Problemlseren delagde noget"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade delagde noget"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1027,7 +1046,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1038,7 +1057,7 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgngelige."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1047,119 +1066,115 @@ msgstr ""
"Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n"
"ikke installeres og du br indsende en fejlrapport for denne pakke."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemlseren delagde noget"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst n pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1167,7 +1182,7 @@ msgid ""
msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1176,32 +1191,32 @@ msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Understttede moduler:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1542,9 +1557,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Mapperne info og temp skal ligge i samme filsystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Indlser pakkelisterne"
@@ -2294,18 +2309,33 @@ msgstr "frivillig"
msgid "extra"
msgstr "ekstra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Opbygger afhngighedstr"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidatversioner"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Afhngighedsgenerering"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Sammenfletter tilgngelighedsoplysninger"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Kunne ikke bne %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive filen %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2383,14 +2413,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indeksfiler af typen '%s' understttes ikke"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2398,7 +2428,7 @@ msgstr ""
"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
"tilbageholdte pakker."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker."
@@ -2435,7 +2465,7 @@ msgstr "Metodedriveren %s blev ikke fundet."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startede ikke korrekt"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur."
@@ -2479,84 +2509,84 @@ msgstr "Kunne ikke forst pin-type %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Hold da op! Du nede over det antal pakkenavne, denne APT kan hndtere."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhngigheder"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finde kildepakkelisten %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Samler filudbud"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
@@ -2565,16 +2595,16 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
msgid "rename failed, %s (%s -> %s)."
msgstr "omdbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2583,7 +2613,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2592,13 +2622,13 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Strrelsen stemmer ikke"
diff --git a/po/de.po b/po/de.po
index 32f6caf1a..32563174a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-06-15 18:22+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s für %s %s kompiliert am %s %s\n"
@@ -308,7 +308,7 @@ msgstr ""
" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kann nicht nach %s schreiben"
@@ -653,79 +653,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:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "aber %s ist installiert"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "aber %s soll installiert werden"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ist aber nicht installierbar"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ist aber ein virtuelles Paket"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ist aber nicht installiert"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "soll aber nicht installiert werden"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " oder "
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden NEUEN Pakete werden installiert:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Die folgenden Pakete werden DEAKTUALISIERT:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Die folgenden gehaltenen Pakete werden verändert:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -734,147 +734,147 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu deaktualisiert, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Abhängigkeit werden korrigiert..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " fehlgeschlagen."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Kann Abhängigkeiten nicht korrigieren"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Fertig"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
"korrigieren."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Einige Pakete konnten nicht authentifiziert werden"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
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:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
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:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es müssen %sB Archive geholt werden.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Konnte freien Platz in %s nicht bestimmen"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Sie haben nicht genug Platz in %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, tu was ich sage!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -885,28 +885,28 @@ msgstr ""
"Zum Fortfahren geben Sie bitte »%s« ein.\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abbruch."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -914,48 +914,48 @@ msgstr ""
"Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder "
"mit »--fix-missing« probieren?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Konnte fehlende Pakete nicht korrigieren."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Installation abgebrochen."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Achtung, wähle %s an Stelle von %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, 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:1066
+#: cmdline/apt-get.cc:1059
#, 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:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installiert]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Sie sollten eines explizit zum Installieren auswählen."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -966,51 +966,51 @@ 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:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Doch die folgenden Pakete ersetzen es:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paket %s hat keinen Installationskandidaten"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Re-Installation von %s ist nicht möglich,\n"
"es kann nicht heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ist schon die neueste Version.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release »%s« für »%s« konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« nimmt keine Argumente"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1018,27 +1018,47 @@ msgstr ""
"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
"ignoriert oder alte an ihrer Stelle benutzt."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+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:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Achtung, wähle %s für reg. Ausdruck »%s«\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
"korrigieren:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1046,7 +1066,7 @@ msgstr ""
"Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
"jeglich Pakete (oder geben Sie eine Lösung an)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1058,7 +1078,7 @@ msgstr ""
"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1069,124 +1089,119 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1584
-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:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, 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:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, 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:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n"
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden."
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1195,7 +1210,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1204,32 +1219,32 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare "
"Version von Paket %s die Versionsanforderungen erfüllen kann."
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, 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:2352
+#: cmdline/apt-get.cc:2417
#, 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:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1575,9 +1590,9 @@ msgstr ""
"Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Paketlisten werden gelesen"
@@ -2333,18 +2348,33 @@ msgstr "optional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Abhängigkeitsbaum wird aufgebaut"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Mögliche Versionen"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Abhängigkeits-Generierung"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Führe Information zur Verfügbarkeit zusammen"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Konnte %s nicht öffnen"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Konnte nicht in Datei %s schreiben"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2422,7 +2452,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexdateityp »%s« wird nicht unterstützt"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2430,7 +2460,7 @@ msgstr ""
"Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür "
"finden."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2438,7 +2468,7 @@ msgstr ""
"Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies "
"könnte durch gehaltene Pakete hervorgerufen worden sein."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete."
@@ -2475,7 +2505,7 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
msgid "Method %s did not start correctly"
msgstr "Methode %s hat nicht korrekt gestartet"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2527,88 +2557,88 @@ msgstr "Konnte Stecknadeltyp (»pin type«) %s nicht verstehen"
msgid "No priority (or zero) specified for pin"
msgstr "Keine Priorität (oder Null) für Pin angegeben"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben "
"kann."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT "
"handhaben kann."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen."
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Sammle Datei-Empfehlungen ein"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Sichern des Quellcaches"
@@ -2617,15 +2647,15 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2634,7 +2664,7 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2643,14 +2673,14 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
diff --git a/po/el.po b/po/el.po
index e77c0fa4d..e17436928 100644
--- a/po/el.po
+++ b/po/el.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el_new\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-01-18 15:16+0200\n"
"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -163,7 +163,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n"
@@ -318,7 +318,7 @@ msgstr ""
" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Αδύνατη η εγγραφή στο %s"
@@ -659,79 +659,79 @@ msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
msgid "Failed to rename %s to %s"
msgstr "Αποτυχία μετονομασίας του %s σε %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "αλλά το %s είναι εγκατεστημένο"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "αλλά δεν είναι εγκαταστάσημο"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "αλλά είναι ένα εικονικό πακέτο"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "αλλά δεν είναι εγκατεστημένο"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " η"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (λόγω του %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -739,148 +739,148 @@ msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu επανεγκατεστημένα,"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu υποβαθμισμένα, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Διόρθωση εξαρτήσεων..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " απέτυχε."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Ετοιμο"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
"προβλήματα."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
"debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ναι, κανε ότι λέω!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -891,28 +891,28 @@ msgstr ""
"Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Εγκατάλειψη."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -920,49 +920,49 @@ msgstr ""
"Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
"ή το --fix-missing;"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Εγκατάλειψη της εγκατάστασης."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Εγκατεστημένα]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -974,51 +974,51 @@ msgstr ""
"Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
"από άλλη πηγή\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
"του\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το%s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1026,25 +1026,46 @@ msgstr ""
"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
"στη θέση τους."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
+"υλικό"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1052,7 +1073,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1064,7 +1085,7 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1074,124 +1095,120 @@ msgstr ""
"το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
"αναφορά σφάλματος για αυτό το πακέτο."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
"υλικό"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1199,7 +1216,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1208,32 +1225,32 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1574,9 +1591,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Ανάγνωση Λιστών Πακέτων"
@@ -2331,18 +2348,33 @@ msgstr "προαιρετικό"
msgid "extra"
msgstr "επιπλέον"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Υποψήφιες Εκδόσεις"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Παραγωγή Εξαρτήσεων"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγραφής του αρχείου %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2420,7 +2452,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2428,7 +2460,7 @@ msgstr ""
"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
"κάποιας κατάλληλης αρχείοθήκης."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2436,7 +2468,7 @@ msgstr ""
"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
"προκλήθηκε από κρατούμενα πακέτα."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
@@ -2472,7 +2504,7 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι
msgid "Method %s did not start correctly"
msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2521,85 +2553,85 @@ msgid "No priority (or zero) specified for pin"
msgstr ""
"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
"APT."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Συλλογή Παροχών Αρχείου"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
@@ -2608,15 +2640,15 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2625,7 +2657,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2634,7 +2666,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2642,7 +2674,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
diff --git a/po/en_GB.po b/po/en_GB.po
index cf1e7c5fb..b2a265f7a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2002-11-10 20:56+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en@li.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s compiled on %s %s\n"
@@ -300,7 +300,7 @@ msgstr ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Unable to write to %s"
@@ -637,79 +637,79 @@ msgstr "Problem unlinking %s"
msgid "Failed to rename %s to %s"
msgstr "Failed to rename %s to %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "The following packages have unmet dependencies."
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "but %s is installed"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "but %s is to be installed"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "but it is not installable"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "but it is a virtual package"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "but it is not installed"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "but it is not going to be installed"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr "or"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "The following NEW packages will be installed"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "The following packages will be REMOVED"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "The following packages have been kept back:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "The following packages will be upgraded:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "The following packages will be DOWNGRADED:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "The following held packages will be changed:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (due to %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -717,143 +717,143 @@ msgstr ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu upgraded, %lu newly installed, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalled, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu downgraded, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu to remove and %lu not upgraded.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu not fully installed or removed.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Correcting dependencies..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " failed."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Unable to correct dependencies"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Unable to minimize the upgrade set"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr "Done"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "You might want to run ‘apt-get -f install’ to correct these."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Unmet dependencies. Try using -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "WARNING: The following packages cannot be authenticated!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Authentication warning overridden.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Install these packages without verification [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Some packages could not be authenticated"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "There are problems and -y was used without --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Internal error, InstallPackages was called with broken packages!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Packages need to be removed but remove is disabled."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Need to get %sB/%sB of archives.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Need to get %sB of archives.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "After unpacking %sB of additional disk space will be used.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "After unpacking %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "You don't have enough free space in %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only specified but this is not a trivial operation."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -864,28 +864,28 @@ msgstr ""
"To continue type in the phrase ‘%s’\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abort."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -893,47 +893,47 @@ msgstr ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing and media swapping is not currently supported"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Unable to correct missing packages."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Aborting install."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Package %s is not installed, so not removed\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Package %s is a virtual package provided by:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installed]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "You should explicitly select one to install."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -944,49 +944,49 @@ msgstr ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "However the following packages replace it:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Package %s has no installation candidate"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s is already the newest version.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Selected version %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Unable to lock the list directory"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -994,25 +994,44 @@ msgstr ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "The following information may help to resolve the situation:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Internal error, problem resolver broke stuff"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "You might want to run ‘apt-get -f install’ to correct these:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1020,7 +1039,7 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1032,7 +1051,7 @@ msgstr ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1042,119 +1061,115 @@ msgstr ""
"the package is simply not installable and a bug report against\n"
"that package should be filed."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "The following information may help to resolve the situation:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculating upgrade..."
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "Must specify at least one package to check builddeps for"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1163,7 +1178,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1172,31 +1187,31 @@ msgstr ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1533,9 +1548,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "The info and temp directories need to be on the same filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Reading package lists"
@@ -2283,18 +2298,33 @@ msgstr "optional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Building dependency tree"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Candidate versions"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Dependency generation"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Merging available information"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Failed to open %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Failed to write file ‘%s’"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2371,14 +2401,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Index file type ‘%s’ is not supported"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2386,7 +2416,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Unable to correct problems, you have held broken packages."
@@ -2422,7 +2452,7 @@ msgstr "The method driver %s could not be found."
msgid "Method %s did not start correctly"
msgstr "Method %s did not start correctly"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2467,82 +2497,82 @@ msgstr "Did not understand pin type %s"
msgid "No priority (or zero) specified for pin"
msgstr "No priority (or zero) specified for pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cache has an incompatible versioning system"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Error occurred while processing %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Error occurred while processing %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Error occurred while processing %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Error occurred while processing %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Error occurred while processing %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Error occurred while processing %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Error occurred while processing %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Wow, you exceeded the number of package names this APT can handle.."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wow, you exceeded the number of versions this APT can handle."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wow, you exceeded the number of dependencies this APT can handle."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Error occurred while processing %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Error occurred while processing %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Package %s %s was not found while processing file dependencies"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Couldn't stat source package list %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Collecting File Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO Error saving source cache"
@@ -2551,15 +2581,15 @@ msgstr "IO Error saving source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2568,7 +2598,7 @@ msgstr ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2577,14 +2607,14 @@ msgstr ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Size mismatch"
diff --git a/po/es.po b/po/es.po
index 0cd4b2dc1..252206767 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.42.3exp1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-11-16 17:37+0100\n"
"Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado en %s %s\n"
@@ -308,7 +308,7 @@ msgstr ""
" -o=? Establece una opcin de configuracin arbitraria, p. ej. -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "No se puede escribir en %s"
@@ -650,79 +650,79 @@ msgstr "Hay problemas desligando %s"
msgid "Failed to rename %s to %s"
msgstr "Fall el renombre de %s a %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilacin de expresiones regulares - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "pero %s est instalado"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s va a ser instalado"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "pero no es instalable"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "pero es un paquete virtual"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "pero no est instalado"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "pero no va a instalarse"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Se instalarn los siguientes paquetes NUEVOS:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes se ELIMINARN:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes se han retenido:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Se actualizarn los siguientes paquetes:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Se DESACTUALIZARN los siguientes paquetes:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Se cambiarn los siguientes paquetes retenidos:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -730,146 +730,146 @@ msgstr ""
"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
"NO debe hacerse a menos que sepa exactamente lo que est haciendo!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu se instalarn, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para eliminar y %lu no actualizados.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instalados del todo o eliminados.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Corrigiendo dependencias..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " fall."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "No se puede corregir las dependencias"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "No se puede minimizar el conjunto de actualizacin"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Listo"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: No se han podido autenticar los siguientes paquetes!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticacin ignorado.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalar estos paquetes sin verificacin [s/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Algunos paquetes no se pueden autenticar"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Hay problemas y se utiliz -y sin --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Error interno, InstallPackages fue llamado con un paquete roto!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no termin el ordenamiento"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Que raro.. Los tamaos no concuerdan, mande un correo a \n"
"apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Se necesita descargar %sB/%sB de archivos.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Necesito descargar %sB de archivos.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Se utilizarn %sB de espacio de disco adicional despus de desempaquetar.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Se liberarn %sB despus de desempaquetar.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No tiene suficiente espacio libre en %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Se especific Trivial Only pero sta no es una operacin trivial."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "S, haga lo que le digo!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -880,28 +880,28 @@ msgstr ""
"Para continuar escriba la frase %s\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de slo descarga"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -909,47 +909,47 @@ msgstr ""
"No se pudieron obtener algunos archivos, quizs deba ejecutar\n"
"apt-get update o deba intentarlo de nuevo con --fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Actualmente no estn soportados --fix-missing e intercambio de medio"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "No se pudieron corregir los paquetes que faltan."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abortando la instalacin."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, seleccionando %s en lugar de %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ignorando %s, ya esta instalado y la actualizacin no esta activada.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "El paquete %s no esta instalado, no se eliminar\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "El paquete %s es un paquete virtual provisto por:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Necesita seleccionar explcitamente uno para instalar."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -960,49 +960,49 @@ msgstr ""
"a l. Esto puede significar que el paquete falta, est obsoleto o slo se\n"
"encuentra disponible desde alguna otra fuente\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "El paquete %s no tiene candidato para su instalacin"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ya est en su versin ms reciente.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No se encontr la Distribucin '%s' para '%s'"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No se encontr la versin '%s' para '%s'"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versin seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "El comando de actualizacin no toma argumentos"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "No se pudo bloquear el directorio de listas"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1010,25 +1010,46 @@ msgstr ""
"Algunos archivos de ndice no se han podido descargar, se han ignorado,\n"
"o se ha utilizado unos antiguos en su lugar."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"Error interno, el sistema de solucin de problemas rompi\n"
+"algunas cosas"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompi cosas"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresin regular '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1036,7 +1057,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solucin)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1048,7 +1069,7 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1058,123 +1079,119 @@ msgstr ""
"paquete simplemente no sea instalable y debera de rellenar un informe de\n"
"error contra ese paquete."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Se instalarn los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculando la actualizacin... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fall"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solucin de problemas rompi\n"
"algunas cosas"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No se pudo encontrar un paquete de fuentes para %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete dpkg-dev est instalado.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall la orden de construccin '%s'.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Fall el proceso hijo"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus\n"
"dependencias de construccin"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener informacin de dependencias de construccin para %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construccin.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1183,7 +1200,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1192,32 +1209,32 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versin\n"
"disponible del paquete %s satisface los requisitos de versin"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
"demasiado nuevo"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construccin de %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construccin"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Mdulos soportados:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1563,9 +1580,9 @@ msgstr ""
"Los directorios info y temp deben de estar en el mismo sistema de archivos"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Leyendo lista de paquetes"
@@ -2318,18 +2335,33 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Creando rbol de dependencias"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versiones candidatas"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generacin de dependencias"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Fusionando informacin disponible"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No se pudo abrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Fall la escritura del archivo %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2407,7 +2439,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "No se da soporte para el tipo de archivo de ndice '%s'"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2415,7 +2447,7 @@ msgstr ""
"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
"ste."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2423,7 +2455,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve gener cortes, esto puede haber sido "
"causado por paquetes retenidos."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes\n"
@@ -2461,7 +2493,7 @@ msgstr "No se pudo encontrar el mtodo %s."
msgid "Method %s did not start correctly"
msgstr "El mtodo %s no se inici correctamente"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, inserte el disco %s en la unidad %s y presione Intro"
@@ -2508,87 +2540,87 @@ msgstr "No se entiende el pin tipo %s"
msgid "No priority (or zero) specified for pin"
msgstr "No hay prioridad especificada para pin (o es cero)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "La cach tiene una versin incompatible de sistema de versiones"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Ocurri un error mientras se procesaba %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Ocurri un error mientras se procesaba %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Ocurri un error mientras se procesaba %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Ocurri un error mientras se procesaba %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Ocurri un error mientras se procesaba %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Ocurri un error mientras se procesaba %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Vaya, excedi el nmero de nombres de paquetes que este APT es capaz de "
"manejar."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Vaya, excedi el nmero de versiones que este APT es capaz de manejar."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Vaya, excedi el nmero de dependencias que este APT es capaz de manejar."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Ocurri un error mientras procesaba %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Ocurri un error mientras procesaba %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Al procesar las dependencias de archivos no se encontr el\n"
"paquete %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No se puede leer la lista de paquetes fuente %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Recogiendo archivos que proveen"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Error de E/S guardando cach fuente"
@@ -2597,15 +2629,15 @@ msgstr "Error de E/S guardando cach fuente"
msgid "rename failed, %s (%s -> %s)."
msgstr "fall el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2615,7 +2647,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2624,7 +2656,7 @@ msgstr ""
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2632,7 +2664,7 @@ msgstr ""
"Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "El tamao difiere"
diff --git a/po/eu.po b/po/eu.po
index 38e6c7d64..88504571d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-06-17 00:10+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale <librezale@librezale.org>\n"
@@ -153,7 +153,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s) konpilatua: %s %s\n"
@@ -305,7 +305,7 @@ msgstr ""
" -c=? Irakurri konfigurazio-fitxategi hau\n"
" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "%s : ezin da idatzi"
@@ -641,79 +641,79 @@ msgstr "Arazoa %s desestekatzean"
msgid "Failed to rename %s to %s"
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio-errorea - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "baina %s instalatuta dago"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "baina %s instalatzeko dago"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "baina ez da instalagarria"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "baina pakete birtuala da"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "baina ez dago instalatuta"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "baina ez da instalatuko"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " edo"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Ondorengo paketeak KENDUKO dira:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Ondorengo paketeak mantendu egin dira:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (arrazoia: %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -721,145 +721,145 @@ msgstr ""
"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
"EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalatuta, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu aurreko bertsiora itzulita, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ez erabat instalatuta edo kenduta.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Mendekotasunak zuzentzen..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " : huts egin du."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ezin dira mendekotasunak zuzendu"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Ezin da bertsio-berritzeko multzoa minimizatu"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Eginda"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Egiaztapen abisua gainidazten.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Paketeak egiaztapen gabe instalatu [b/E]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Zenbait pakete ezin dira egiaztatu"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga-direktorioa blokeatu"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Ezin izan da iturburu-zerrenda irakurri."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
"berri emanez (ingelesez)"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Bai, egin esandakoa!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -870,28 +870,28 @@ msgstr ""
"Jarratzeko, idatzi '%s' esaldia\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortatu."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -899,47 +899,47 @@ msgstr ""
"Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
"--fix-missing aukerarekin saiatu?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Falta diren paketeak ezin dira zuzendu."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abortatu instalazioa."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s pakete birtual bat da, honek hornitua:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalatuta]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Zehazki bat hautatu behar duzu instalatzeko."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -950,49 +950,49 @@ msgstr ""
"egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n"
"beste iturburu batean bakarrik egongo da erabilgarri\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Baina ondorengo paketeek ordezten dute:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "%s paketeak ez du instalatzeko hautagairik"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s bertsiorik berriena da jada.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Ezin da zerrenda-direktorioa blokeatu"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1000,25 +1000,44 @@ msgstr ""
"Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
"zaharrak erabili dira haien ordez."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Informazio honek arazoa konpontzen lagun dezake:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1026,7 +1045,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1038,7 +1057,7 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1047,121 +1066,117 @@ msgstr ""
"Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n"
"izango, eta pakete horren errorearen berri ematea komeni da."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Informazio honek arazoa konpontzen lagun dezake:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze-mendekotasunik.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1169,7 +1184,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1178,32 +1193,32 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1541,9 +1556,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Pakete Zerrenda irakurtzen"
@@ -2301,18 +2316,33 @@ msgstr "aukerakoa"
msgid "extra"
msgstr "estra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Dependentzia zuhaitza eraikitzen"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Hautagaien bertsioak"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Dependentzi Sormena"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Eskuragarrien datuak biltzen"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Huts egin du %s irekitzean"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s fitxategian idatzi"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2390,14 +2420,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "'%s' motako indize-fitxategirik ez da onartzen"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2405,7 +2435,7 @@ msgstr ""
"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
"atxikitako paketeek eraginda."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
@@ -2441,7 +2471,7 @@ msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu."
msgid "Method %s did not start correctly"
msgstr "%s metodoa ez da behar bezala abiarazi"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
@@ -2485,82 +2515,82 @@ msgstr "Ez da ulertu %s orratz-mota (pin)"
msgid "No priority (or zero) specified for pin"
msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cachearen bertsio-sistema ez da bateragarria"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Errorea gertatu da %s prozesatzean (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Fitxategi-erreferentziak biltzen"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "S/I errorea iturburu-cachea gordetzean"
@@ -2569,15 +2599,15 @@ msgstr "S/I errorea iturburu-cachea gordetzean"
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2586,7 +2616,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2595,7 +2625,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2603,7 +2633,7 @@ msgstr ""
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
diff --git a/po/fi.po b/po/fi.po
index 163fc9dc0..c1eaf0053 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-15 14:09+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n"
@@ -305,7 +305,7 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
@@ -646,79 +646,79 @@ msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
msgid "Failed to rename %s to %s"
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "mutta %s on asennettu"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "mutta %s on merkitty asennettavaksi"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "mutta ei ole asennuskelpoinen"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "mutta on näennäispaketti"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "mutta ei ole asennettu"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "mutta ei ole merkitty asennettavaksi"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " tai"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Seuraavat UUDET paketit asennetaan:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Seuraavat paketit POISTETAAN:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Nämä paketit on jätetty odottamaan:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Nämä paketit päivitetään:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Nämä paketit VARHENNETAAN:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Seuraavat pysytetyt paketit muutetaan:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (syynä %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -727,145 +727,145 @@ msgstr ""
"VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n"
"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu päivitetty, %lu uutta asennusta, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu varhennettua, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Korjataan riippuvuuksia..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " ei onnistunut."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Riippuvuuksien korjaus ei onnistu"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Päivitysjoukon minimointi ei onnistu"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Valmis"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Noudettavaa arkistoa %st/%st.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Noudettavaa arkistoa %st.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Kyllä, tee kuten käsketään!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -876,28 +876,28 @@ msgstr ""
"Jatka kirjoittamalla \"%s\"\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Keskeytä."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -905,47 +905,47 @@ msgstr ""
"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\"auttaa tai "
"kokeile --fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Puuttuvia paketteja ei voi korjata."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Asennus keskeytetään."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Huomautus, valitaan %s eikä %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Asennettu]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Yksi pitää valita asennettavaksi."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -956,49 +956,49 @@ msgstr ""
"Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
"saatavilla vain jostain muusta lähteestä\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paketilla %s ei ole asennettavaa valintaa"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s on jo uusin versio.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1006,25 +1006,44 @@ msgstr ""
"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
"käytetty vanhoja. "
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1032,7 +1051,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1043,7 +1062,7 @@ msgstr ""
"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
"vielä luotu tai siirretty Incoming-kansiosta."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1053,121 +1072,117 @@ msgstr ""
"paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
"tuosta paketista."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1175,7 +1190,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1184,32 +1199,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1547,9 +1562,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Luetaan pakettiluetteloita"
@@ -2296,18 +2311,33 @@ msgstr "valinnainen"
msgid "extra"
msgstr "ylimääräinen"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Muodostetaan riippuvuussuhteiden puu"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Mahdolliset versiot"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Luodaan riippuvuudet"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yhdistetään saatavuustiedot"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Tiedoston %s avaaminen ei onnistunut"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2384,13 +2414,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2398,7 +2428,7 @@ msgstr ""
"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
"paketit."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
@@ -2434,7 +2464,7 @@ msgstr "Menetelmän ajuria %s ei löytynyt"
msgid "Method %s did not start correctly"
msgstr "Menetelmä %s ei käynnistynyt oikein"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2482,83 +2512,83 @@ msgstr "Tunnistetyyppi %s on tuntematon"
msgid "No priority (or zero) specified for pin"
msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia."
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Kootaan tiedostojen tarjoamistietoja"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
@@ -2567,15 +2597,15 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2584,7 +2614,7 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2593,7 +2623,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2601,7 +2631,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Koko ei täsmää"
diff --git a/po/fr.po b/po/fr.po
index 167b5a9f1..a7b74a6b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-05-18 09:31-0500\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pour %s %s est compil le %s %s\n"
@@ -310,7 +310,7 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Spcifie une option de configuration, p.ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Impossible d'crire sur %s"
@@ -652,79 +652,79 @@ msgstr "Problme en dliant %s"
msgid "Failed to rename %s to %s"
msgstr "Impossible de changer le nom %s en %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Les paquets suivants contiennent des dpendances non satisfaites:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "mais %s est install"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "mais %s devra tre install"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "mais il n'est pas installable"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "mais c'est un paquet virtuel"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "mais il n'est pas install"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "mais ne sera pas install"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Les NOUVEAUX paquets suivants seront installs:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Les paquets suivants seront ENLEVS:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Les paquets suivants ont t conservs:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Les paquets suivants seront mis jour:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Les paquets suivants seront mis une VERSION INFRIEURE:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Les paquets retenus suivants seront changs:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (en raison de %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -733,139 +733,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:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu mis jour, %lu nouvellement installs, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu rinstalls, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu remis une version infrieure, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu enlever et %lu non mis jour.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu partiellement installs ou enlevs.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Correction des dpendances..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " a chou."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Impossible de corriger les dpendances"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Impossible de minimiser le nombre des paquets mis jour"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Fait"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dpendances manquantes. Essayez d'utiliser l'option -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENTION: les paquets suivants n'ont pas t authentifis."
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Avertissement d'authentification ignor.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Faut-il installer ces paquets sans vrification (o/N)? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Certains paquets n'ont pas pu tre authentifis"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Il y a des problmes et -y a t employ sans --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erreur interne, InstallPackages appel avec des paquets casss."
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Les paquets doivent tre enlevs mais la dsinstallation est dsactive."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Erreur interne. Le tri a t interrompu."
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le rpertoire de tlchargement"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut tre lue."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
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:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Il est ncessaire de prendre %so/%so dans les archives.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Il est ncessaire de prendre %so dans les archives.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de dterminer l'espace disponible sur %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"L'option --trivial-only a t indique mais il ne s'agit pas d'une opration "
@@ -873,11 +873,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:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Oui, faites ce que je vous dis!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -888,28 +888,28 @@ msgstr ""
"Pour continuer, tapez la phrase %s\n"
"?]"
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Annulation."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Souhaitez-vous continuer [O/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de rcuprer %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Certains fichiers n'ont pu tre tlchargs."
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Tlchargement achev et dans le mode tlchargement uniquement"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -917,48 +917,48 @@ msgstr ""
"Impossible de rcuprer quelques archives, peut-tre devrez-vous lancer apt-"
"get update ou essayer avec --fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
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:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Impossible de corriger le fait que les paquets manquent."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Annulation de l'installation."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Note, slection de %s au lieu de %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Passe %s, il est dj install et la mise jour n'est pas prvue.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, 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:1077
+#: cmdline/apt-get.cc:1070
#, 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:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Install]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Vous devez explicitement slectionner un paquet installer."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -970,50 +970,50 @@ msgstr ""
"devenu obsolte\n"
"ou qu'il n'est disponible que sur une autre source\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Cependant les paquets suivants le remplacent:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Aucun paquet ne correspond au paquet %s"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s est dj la plus rcente version disponible.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "La version %s de %s est introuvable"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "La version %s de %s n'a pu tre trouve"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Version choisie %s (%s) pour %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "La commande de mise jour ne prend pas d'argument"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Impossible de verrouiller le rpertoire de liste"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1021,26 +1021,47 @@ msgstr ""
"Le tlchargement de quelques fichiers d'index a chou, ils ont t "
"ignors, ou les anciens ont t utiliss la place."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "L'information suivante devrait vous aider rsoudre la situation: "
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"Erreur interne, la tentative de rsolution du problme a cass certaines "
+"parties"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erreur interne, AllUpgrade a cass le boulot!"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, slectionne %s pour l'expression rationnelle %s\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Vous pouvez lancer apt-get -f install pour corriger ces problmes:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1048,7 +1069,7 @@ msgstr ""
"Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n"
"(ou indiquez une solution)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1060,7 +1081,7 @@ msgstr ""
"la distribution unstable, que certains paquets n'ont pas encore\n"
"t crs ou ne sont pas sortis d'Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1069,123 +1090,119 @@ msgstr ""
"Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n"
"probablement pas installable et vous devriez envoyer un rapport de bogue."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "L'information suivante devrait vous aider rsoudre la situation: "
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Paquets dfectueux"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Les paquets supplmentaires suivants seront installs: "
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Paquets suggrs:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Paquets recommands:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calcul de la mise jour... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "chec"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Fait"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Erreur interne, la tentative de rsolution du problme a cass certaines "
"parties"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spcifier au moins un paquet source"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, 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:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saut du tlchargement du fichier %s, dj tlcharg\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ncessit de prendre %so/%so dans les sources.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ncessit de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Rcupration des sources %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "chec lors de la rcupration de quelques archives."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de dcompactage %s a chou.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vrifier si le paquet dpkg-dev est install.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction %s a chou.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "chec du processus fils"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Il faut spcifier au moins un paquet pour vrifier les dpendances de "
"construction"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossible d'obtenir les dpendances de construction pour %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dpendance de construction.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1194,7 +1211,7 @@ msgstr ""
"La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne "
"peut tre trouv"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1203,33 +1220,33 @@ msgstr ""
"La dpendance %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:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Impossible de satisfaire la dpendance %s pour %s: le paquet install %s "
"est trop rcent"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossible de satisfaire les dpendances %s pour %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dpendances de construction"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Modules reconnus:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1575,9 +1592,9 @@ msgstr ""
"fichiers"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Lecture des listes de paquets"
@@ -2338,18 +2355,33 @@ msgstr "optionnel"
msgid "extra"
msgstr "supplmentaire"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Construction de l'arbre des dpendances"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versions possibles"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Gnration des dpendances"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Fusion des informations disponibles"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'criture du fichier %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2431,7 +2463,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Le type de fichier d'index %s n'est pas accept"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2439,7 +2471,7 @@ msgstr ""
"Le paquet %s doit tre rinstall, mais je ne parviens pas trouver son "
"archive."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2447,7 +2479,7 @@ msgstr ""
"Erreur, pkgProblemResolver::Resolve a gnr des ruptures, ce qui a pu tre "
"caus par les paquets devant tre gards en l'tat."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossible de corriger les problmes, des paquets dfecteux sont en mode "
@@ -2485,7 +2517,7 @@ msgstr "Le pilote pour la mthode %s n'a pu tre trouv."
msgid "Method %s did not start correctly"
msgstr "La mthode %s n'a pas dmarr correctement"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2536,89 +2568,89 @@ msgstr "tiquette %s inconnue"
msgid "No priority (or zero) specified for pin"
msgstr "Aucune priorit (ou zro) n'a t spcifie pour l'tiquette"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Le cache possde un systme de version incompatible"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Erreur apparue lors du traitement de %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Vous avez dpass le nombre de noms de paquets que cet APT est capable de "
"traiter."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Vous avez dpass le nombre de versions que cet APT est capable de traiter."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Vous avez dpass le nombre de dpendances que cet APT est capable de "
"traiter."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Le paquet %s %s n'a pu tre trouv lors du traitement des dpendances des "
"fichiers"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Impossible de localiser la liste des paquets sources %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Assemblage des fichiers lists dans les champs Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr ""
"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources"
@@ -2628,16 +2660,16 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Somme de contrle MD5 incohrente"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
"Aucune cl publique n'est disponible pour la/les cl(s) suivante(s):\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2647,7 +2679,7 @@ msgstr ""
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2656,7 +2688,7 @@ msgstr ""
"Je ne suis pas parvenu localiser un fichier du paquet %s. Ceci signifie "
"que vous devrez corriger manuellement ce paquet."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2664,7 +2696,7 @@ msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Taille incohrente"
diff --git a/po/gl.po b/po/gl.po
index d497de395..de77c5e08 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-05-11 18:09+0200\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado en %s %s\n"
@@ -305,7 +305,7 @@ msgstr ""
" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Non se puido escribir en %s"
@@ -648,79 +648,79 @@ msgstr "Problema ao borrar %s"
msgid "Failed to rename %s to %s"
msgstr "Non se puido cambiar o nome de %s a %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro na compilación da expresión regular - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "pero %s está instalado"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "pero hase instalar %s"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "pero non é instalable"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "pero é un paquete virtual"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "pero non está instalado"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "pero non se ha instalar"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Os seguintes paquetes hanse ELIMINAR:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Os seguintes paquetes consérvanse:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Os seguintes paquetes hanse actualizar:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Os seguintes paquetes hanse DESACTUALIZAR:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Os seguintes paquetes retidos hanse modificar:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (debido a %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -728,144 +728,144 @@ msgstr ""
"AVISO: Hanse eliminar os seguintes paquetes esenciais.\n"
"¡Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu instalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu hanse eliminar e %lu sen actualizar.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non instalados ou eliminados de todo.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "A corrixir as dependencias..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " fallou."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Non se puido corrixir as dependencias."
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Non se puido minimizar o xogo de actualizacións"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Rematado"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Pode querer executar \"apt-get -f install\" para corrixilos."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependencias incumpridas. Probe a empregar -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Ignórase o aviso de autenticación.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "¿Instalar estes paquetes sen verificación [s/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Non se puido autenticar algúns paquetes"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Houbo problemas e empregouse -y sen --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos."
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, a ordeación non rematou"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Non se puido bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Non se puido ler a lista de orixes."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Hai que recibir %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Hai que recibir %sB de arquivos.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non se puido determinar o espazo libre en %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Non hai espazo libre de abondo en %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "¡Si, fai o que digo!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -876,28 +876,28 @@ msgstr ""
"Para continuar escriba a frase \"%s\"\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortar."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non se puido obter %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Non se puido descargar algúns ficheiros"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -905,49 +905,49 @@ msgstr ""
"Non se puido obter algúns arquivos; probe con apt-get update ou --fix-"
"missing."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"O emprego conxunto de --fix-missing e intercambio de discos non está "
"soportado"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Non se puido corrixir os paquetes non dispoñibles."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "A abortar a instalación."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, escóllese %s no canto de %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "O paquete %s non está instalado, así que non se eliminou\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "O paquete %s é un paquete virtual fornecido por:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Debería escoller un para instalar."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -958,49 +958,49 @@ msgstr ""
"Isto pode significar que o paquete falla, está obsoleto ou só está\n"
"dispoñible noutra fonte.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Nembargantes, os seguintes paquetes substitúeno:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "O paquete %s non ten un candidato para a instalación"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "A reinstalación de %s non é posible, non se pode descargar.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s xa é a versión máis recente.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Non se atopou a versión \"%s\" de \"%s\""
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Non se atopou a versión \"%s\" de \"%s\""
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Escolleuse a versión %s (%s) de %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "A orde \"update\" non toma argumentos"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Non se puido bloquear o directorio de listas"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1008,25 +1008,44 @@ msgstr ""
"Non se puido descargar algúns ficheiros de índices; ignoráronse ou "
"empregáronse uns vellos no seu lugar."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "A seguinte información pode axudar a resolver a situación:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Erro interno, o resolvedor interno rompeu cousas"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade rompeu cousas"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Non se puido atopar o paquete %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1034,7 +1053,7 @@ msgstr ""
"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
"especifique unha solución)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1045,7 +1064,7 @@ msgstr ""
"unha situación imposible ou, se emprega a distribución inestable, que\n"
"algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1054,122 +1073,118 @@ msgstr ""
"Xa que só solicitou unha soa operación, é bastante probable que o\n"
"paquete non sea instalable e que se deba informar dun erro no paquete."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "A seguinte información pode axudar a resolver a situación:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Hanse instalar os seguintes paquetes extra:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Paquetes suxiridos:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "A calcular a actualización... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fallou"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Rematado"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o resolvedor interno rompeu cousas"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Ten que especificar alomenos un paquete para lle descargar o código fonte"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non se puido atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Non hai espazo libre de abondo en %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Non se puido recibir algúns arquivos."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a codificación de %s.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar alomenos un paquete para lle comprobar as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non se puido obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1178,7 +1193,7 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
"o paquete %s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1187,32 +1202,32 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
"dispoñible do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
"novo de máis"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Non se puido procesar as dependencias de compilación"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1553,9 +1568,9 @@ msgstr ""
"Os directorios info e temp teñen que estar no mesmo sistema de ficheiros"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "A ler as listas de paquetes"
@@ -2308,18 +2323,33 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "A construír a árbore de dependencias"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versións candidatas"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Xeración de dependencias"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "A mesturar a información sobre paquetes dispoñibles"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Non se puido abrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non se puido gravar o ficheiro %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2396,14 +2426,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "O tipo de ficheiros de índices \"%s\" non está soportado"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2411,7 +2441,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado "
"por paquetes retidos."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos."
@@ -2447,7 +2477,7 @@ msgstr "Non se puido atopar o controlador de métodos %s."
msgid "Method %s did not start correctly"
msgstr "O método %s non se iniciou correctamente"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
@@ -2495,82 +2525,82 @@ msgid "No priority (or zero) specified for pin"
msgstr ""
"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "A caché ten un sistema de versionamento incompatible"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Ocorreu un erro ao procesar %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Ocorreu un erro ao procesar %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Ocorreu un erro ao procesar %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Ocorreu un erro ao procesar %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Ocorreu un erro ao procesar %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Ocorreu un erro ao procesar %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Guau, superou o número de nomes de paquetes que este APT pode manexar."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Guau, superou o número de versións que este APT pode manexar."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Guau, superou o número de dependencias que este APT pode manexar."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Ocorreu un erro ao procesar %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Non se atopou a lista de paquetes fonte %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "A recoller as provisións de ficheiros"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Erro de E/S ao gravar a caché de fontes"
@@ -2579,16 +2609,16 @@ msgstr "Erro de E/S ao gravar a caché de fontes"
msgid "rename failed, %s (%s -> %s)."
msgstr "fallou o cambio de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Os MD5Sum non coinciden"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2597,7 +2627,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falla a arquitectura)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2606,7 +2636,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2614,7 +2644,7 @@ msgstr ""
"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
diff --git a/po/hu.po b/po/hu.po
index e9fdee0b9..5b49b7de5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-07-02 07:34+0100\n"
"Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10-hungarian>\n"
@@ -153,7 +153,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n"
@@ -305,7 +305,7 @@ msgstr ""
" -c=? Ezt a konfigurációs fájlt olvassa be\n"
" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Nem lehet írni ebbe: %s"
@@ -644,79 +644,79 @@ msgstr "Hiba %s elláncolásakor"
msgid "Failed to rename %s to %s"
msgstr "Nem sikerült átnevezni %s-t erre: %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "de %s van telepítve"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "de csak %s telepíthető"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "de az nem telepíthető"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "de az egy virtuális csomag"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "de az nincs telepítve"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "de az nincs telepítésre megjelölve"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " vagy"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Az alábbi csomagok vissza lesznek tartva:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Az alábbi csomagok frissítve lesznek:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Az alábbi visszafogott csomagokat cserélem:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s miatt) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -724,143 +724,143 @@ msgstr ""
"FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n"
"NE tedd ezt, míg nem tudod pontosan, mit csinálsz!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu frissített, %lu újonnan telepített, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu újratelepítendő, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu kerül öregbítésre, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Függőségek javítása..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " sikertelen."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Nem lehet javítani a függőségeket"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Kész"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Teljesítetlen függőségek. Próbáld a -f használatával."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "A hitelesítési figyelmeztetést átléptem.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Néhány csomag nem hitelesíthető"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Belső hiba, a rendezés nem zárult"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Letöltendő az archívumokból: %sB/%sB\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Letöltés az archívumokból: %sB\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Kicsomagolás után %sB lemezterületet használok fel\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely itt: %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nincs elég szabad hely itt: %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Igen, tedd amit mondok!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -871,28 +871,28 @@ msgstr ""
"A folytatáshoz írd be ezt: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Megszakítva."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a 'csak letöltés' módban"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -900,47 +900,47 @@ msgstr ""
"Nem lehet letölteni néhány archívumot.\n"
" Próbáld ki az apt-get update -et vagy a --fix-missing -et."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing és média csere jelenleg nem támogatott"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Nem lehet javítani a hiányzó csomagokat."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Telepítés megszakítása."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Telepítve]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Egyet név szerint ki kell jelölnöd a telepítésre."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -950,49 +950,49 @@ msgstr ""
"%s csomag nem elérhető, de egy másik hivatkozik rá\n"
".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "De az alábbi csomagok felváltják:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s már a legújabb verzió.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%s' kiadás ehhez: '%s' nem található"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%s' verzió ehhez: '%s' nem található"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Nem tudom a listakönyvtárat zárolni"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1000,25 +1000,44 @@ msgstr ""
"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi "
"változatukat használom."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Belső hiba, hibafeloldó gond"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1026,7 +1045,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
"(vagy telepítsd a függőségeket is!)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1038,7 +1057,7 @@ msgstr ""
"használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1048,122 +1067,118 @@ msgstr ""
"hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
"kitölteni a csomaghoz."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, hibafeloldó gond"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött '%s' fájl kihagyása\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1172,7 +1187,7 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
"található"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1181,32 +1196,32 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
"verzió-követelményt kielégítő elérhető verziója."
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
"friss."
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetőek ki."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1541,9 +1556,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Csomaglisták olvasása"
@@ -2291,18 +2306,33 @@ msgstr "opcionális"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Függőségi fa építése"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Lehetséges verziók"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Függőség-generálás"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Elérhető információk egyesítése"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s megnyitása sikertelen"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s fájl írása sikertelen"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2379,14 +2409,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "A(z) '%s' indexfájltípus nem támogatott"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2394,7 +2424,7 @@ msgstr ""
"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
"csomagok okozhatják."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren."
@@ -2431,7 +2461,7 @@ msgstr "A(z) %s metódus vezérlő nem található."
msgid "Method %s did not start correctly"
msgstr "A(z) %s metódus nem indult el helyesen"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
@@ -2476,87 +2506,87 @@ msgstr "A(z) %s tűtípus nem értelmezhető"
msgid "No priority (or zero) specified for pin"
msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Hiba történt %s feldolgozásakor (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Hiba történt %s feldolgozásakor (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Hiba történt %s feldolgozásakor (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Hiba történt %s feldolgozásakor (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Hiba történt %s feldolgozásakor (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Hiba történt %s feldolgozásakor (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
# FIXME
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "\"Előkészít\" kapcsolatok összegyűjtése"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO hiba a forrás-gyorsítótár mentésekor"
@@ -2565,15 +2595,15 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2582,7 +2612,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2591,14 +2621,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
diff --git a/po/it.po b/po/it.po
index 46e7b0b35..849e52234 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-02-14 11:41+0100\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -147,7 +147,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s per %s %s compilato il %s %s\n"
@@ -302,7 +302,7 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Impossibile scrivere in %s"
@@ -641,79 +641,79 @@ msgstr "Problema nell'unlink di %s"
msgid "Failed to rename %s to %s"
msgstr "Impossibile rinominare %s in %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione della regex - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ma %s installato"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ma %s sta per essere installato"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ma non installabile"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ma un pacchetto virtuale"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ma non installato"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ma non sta per essere installato"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " oppure"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "I seguenti pacchetti saranno RIMOSSI:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "I seguenti pacchetti saranno aggiornati:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (a causa di %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -722,149 +722,149 @@ msgstr ""
"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
"si sta facendo!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aggiornati, %lu installati, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi (downgraded), "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non completamente installati o rimossi.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Correzione delle dipendenze in corso..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " fallita."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Impossibile correggere le dipendenze"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Impossibile minimizzare l'insieme da aggiornare"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Fatto"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
" consigliabile eseguire `apt-get -f install' per correggere questi problemi."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dipendenze non trovate. Riprovare usando -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Avviso di autenticazione disabilitato \n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installare questi pacchetti senza la verifica [s/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Non stato possibile autenticare alcuni pacchetti"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Sussistono dei problemi e -y stata usata senza --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Errore interno, InstallPackages stato chiamato con un pacchetto rotto!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "I pacchetti devono essere rimossi ma il remove disabilitato."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Errore interno, l'ordinamento non terminato"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Impossibile creare un lock sulla directory di download"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La lista dei sorgenti non pu essere letta."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Che strano... le dimensioni non corrispondono, inviare un'email a "
"apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr " necessario prendere %sB/%sB di archivi. \n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr " necessario prendere %sB di archivi. \n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero su %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Lo spazio libero in %s non sufficente."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
" stata specificata la modalit Trivial Only ma questa non un'operazione "
"triviale"
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "SI, esegui come richiesto!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -875,28 +875,28 @@ msgstr ""
"Per continuare scrivere la frase '%s' \n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Interrotto."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile ottenere %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Il download di alcuni file fallito"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Download completato e in modalit download-only"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -904,49 +904,49 @@ msgstr ""
"Impossibile prendere alcuni archivi, forse meglio eseguire apt-get update "
"o provare l'opzione --fix-missing"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing su media estraibili non ancora supportato"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Impossibile correggere i pacchetti mancanti"
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Interruzione dell'installazione in corso."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, si sta selezionando %s al posto di %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s stato saltato, perch gi installato e l'aggiornamento non stato "
"impostato.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Il pacchetto %s non installato, quindi non stato rimosso\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Il pacchetto %s un pacchetto virtuale fornito da:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installato]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Bisogna esplicitamente sceglierne uno da installare."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -957,49 +957,49 @@ msgstr ""
"pacchetto. Questo significa che il pacchetto manca, diventato obsoleto\n"
"o disponibile solo all'interno di un'altra sorgente\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Comunque il seguente pacchetto lo sostituisce:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Il pacchetto %s non ha candidati da installare"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "La reinstallazione di %s non possibile, non pu essere scaricato.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s gi alla versione pi recente.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Non stata trovata la release '%s' per '%s'"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Non stata trovata la versione '%s' per '%s'"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versione selezionata %s (%s) per %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Impossibile creare un lock sulla directory di list"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1007,26 +1007,45 @@ msgstr ""
"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
"si useranno quelli precedenti."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Errore interno, problem resolver ha rotto qualcosa"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, si sta selezionando %s per la regex '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
" consigliabile eseguire 'apt-get -f install' per correggere questi problemi:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1034,7 +1053,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
"specificare una soluzione)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1046,7 +1065,7 @@ msgstr ""
"si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n"
"richiesti non sono ancora stati creati o rimossi da incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1056,121 +1075,117 @@ msgstr ""
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pacchetto non integro"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti verranno inoltre installati:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento in corso... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fallito"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Fatto"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, problem resolver ha rotto qualcosa"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Si saltato il file gi scaricato '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s non sufficente"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr " necessario prendere %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr " necessario prendere %sB di sorgenti\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Prelievo del sorgente %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Non stato possibile scaricare alcuni archivi."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando di costruzione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Processo figlio fallito"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Bisogna specificare almeno un pacchetto di cui controllare la generazione di "
"dipendenze"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di costruzione.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1179,7 +1194,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch non si trova il "
"pacchetto %s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1188,32 +1203,32 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch nessuna versione "
"del pacchetto %s pu soddisfare le richieste di versione"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s "
" troppo nuovo"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s: %s fallita"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Il calcolo delle dipendenze per la costruzione fallito"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1560,9 +1575,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Le directory temp e info devono essere sullo stesso filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Lettura della lista dei pacchetti in corso"
@@ -2320,18 +2335,33 @@ msgstr "opzionale"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Generazione dell'albero delle dipendenze in corso"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versioni candidate"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generazione delle dipendenze"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Aggiornamento delle informazioni disponibili"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Impossibile aprire %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Impossibile scrivere il file %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2408,7 +2438,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Il file indice di tipo '%s' non supportato"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2416,7 +2446,7 @@ msgstr ""
"Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un "
"archivio per esso."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2424,7 +2454,7 @@ msgstr ""
"Errore, pkgProblemResolver::Resolve ha generato uno stop, questo pu essere "
"causato da pacchetti bloccati "
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati"
@@ -2460,7 +2490,7 @@ msgstr "Non stato possibile trovare un driver per il metodo %s."
msgid "Method %s did not start correctly"
msgstr "Il metodo %s non partito correttamente"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2507,89 +2537,89 @@ msgstr "Impossibile capire il tipo di pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nessuna (o zero) priorit specificata per il pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "La cache ha un sistema incompatibile di gestione delle versioni"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Errore nell'analisi di %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Errore nell'analisi di %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Errore nell'analisi di %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Errore nell'analisi di %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Errore nell'analisi di %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Errore nell'analisi di %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Errore nell'analisi di %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"WOW, si ecceduto il numero massimo di nomi di pacchetti che questo APT "
"capace di gestire"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"WOW, si ecceduto il numero massimo di versioni che questo APT capace di "
"gestire"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"WOW, si ecceduto il numero massimo di dipendenze che questo APT capace "
"di gestire"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Errore nell'analisi di %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Errore nell'analisi di %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
" stato impossibile trovare %s %s mentre si processava le dipendenze dei file"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Impossibile controllare la lista dei pacchetti sorgente %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Il File Collezionato Fornisce"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Errore di I/O nel salvataggio del cache sorgente"
@@ -2598,16 +2628,16 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2617,7 +2647,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2626,7 +2656,7 @@ msgstr ""
"Non stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2634,7 +2664,7 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
diff --git a/po/ja.po b/po/ja.po
index 84608b5d1..1d80bcc11 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-01-25 20:55+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s コンパイル日時: %s %s\n"
@@ -302,7 +302,7 @@ msgstr ""
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "%s に書き込めません"
@@ -641,79 +641,79 @@ msgstr "%s のリンク解除で問題が発生しました"
msgid "Failed to rename %s to %s"
msgstr "%s を %s に名前変更できませんでした"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "以下のパッケージには満たせない依存関係があります:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "しかし、%s はインストールされています"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "しかし、%s はインストールされようとしています"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "しかし、インストールすることができません"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "しかし、これは仮想パッケージです"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "しかし、インストールされていません"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "しかし、インストールされようとしていません"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " または"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "以下のパッケージが新たにインストールされます:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "以下のパッケージは「削除」されます:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "以下のパッケージは保留されます:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "以下のパッケージはアップグレードされます:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "以下のパッケージは「ダウングレード」されます:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "以下の変更禁止パッケージは変更されます:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s のため) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -721,146 +721,146 @@ msgstr ""
"警告: 以下の不可欠パッケージが削除されます。\n"
"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "再インストール: %lu 個、"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "ダウングレード: %lu 個、"
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "削除: %lu 個、保留: %lu 個。\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "依存関係を解決しています ..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " 失敗しました。"
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "依存関係を訂正できません"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "アップグレードセットを最小化できません"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " 完了"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
"ん。"
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "未解決の依存関係があります。-f オプションを試してください。"
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "警告: 以下のパッケージは認証されていません!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "認証の警告は上書きされました。\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "いくつかのパッケージを認証できませんでした"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "内部エラー、調整が終わっていません"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "ソースのリストを読むことができません。"
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB のアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "展開後に追加で %sB のディスク容量が消費されます。\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "展開後に %sB のディスク容量が解放されます。\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s に充分な空きスペースがありません。"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -871,28 +871,28 @@ msgstr ""
"続行するには、'%s' というフレーズをタイプしてください。\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "中断しました。"
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "続行しますか [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "いくつかのファイルの取得に失敗しました"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -900,49 +900,49 @@ msgstr ""
"いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-"
"missing オプションを付けて試してみてください。"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "足りないパッケージを直すことができません。"
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "インストールを中断します。"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意、%2$s の代わりに %1$s を選択します\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
"プします。\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [インストール済み]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "インストールするパッケージを明示的に選択する必要があります。"
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -953,49 +953,49 @@ msgstr ""
"おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
"あるいは別のソースからのみしか利用できないという状況が考えられます\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "しかし、以下のパッケージで置き換えられています:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "パッケージ %s にはインストール候補がありません"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s はすでに最新バージョンです。\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "update コマンドは引数をとりません"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "list ディレクトリをロックできません"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1003,27 +1003,46 @@ msgstr ""
"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
"るか、古いものが代わりに使われます。"
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部エラー、問題リゾルバが何かを破壊しました"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部エラー、AllUpgrade が何かを破壊しました"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
"ません:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1031,7 +1050,7 @@ msgstr ""
"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
"を明示してください)。"
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1043,7 +1062,7 @@ msgstr ""
"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
"動されていないことが考えられます。"
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1053,122 +1072,118 @@ msgstr ""
"可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n"
"さい。"
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "壊れたパッケージ"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "以下の特別パッケージがインストールされます:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "提案パッケージ:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "推奨パッケージ:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "完了"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "内部エラー、問題リゾルバが何かを破壊しました"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s に充分な空きスペースがありません"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1177,7 +1192,7 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1186,32 +1201,32 @@ msgstr ""
"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
"する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
"ケージは新しすぎます"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1551,9 +1566,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "パッケージリストを読み込んでいます"
@@ -2300,18 +2315,33 @@ msgstr "任意"
msgid "extra"
msgstr "特別"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "依存関係ツリーを作成しています"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "候補バージョン"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "依存関係の生成"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "入手可能情報をマージしています"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s のオープンに失敗しました"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ファイル %s の書き込みに失敗しました"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2388,7 +2418,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2396,7 +2426,7 @@ msgstr ""
"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
"つけることができませんでした。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2404,7 +2434,7 @@ msgstr ""
"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
"ジが原因です。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
@@ -2440,7 +2470,7 @@ msgstr "メソッドドライバ %s が見つかりません。"
msgid "Method %s did not start correctly"
msgstr "メソッド %s が正常に開始しませんでした"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2492,82 +2522,82 @@ msgstr "pin タイプ %s が理解できませんでした"
msgid "No priority (or zero) specified for pin"
msgstr "pin で優先度 (または 0) が指定されていません"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "キャッシュに非互換なバージョニングシステムがあります"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "%s を処理中にエラーが発生しました (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "%s を処理中にエラーが発生しました (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "%s を処理中にエラーが発生しました (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "%s を処理中にエラーが発生しました (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "%s を処理中にエラーが発生しました (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "%s を処理中にエラーが発生しました (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "この APT が対応している以上の数のパッケージが指定されました。"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "この APT が対応している以上の数のバージョンが要求されました。"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "この APT が対応している以上の数の依存関係が発生しました。"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "%s を処理中にエラーが発生しました (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "ソースパッケージリスト %s の状態を取得できません"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "ファイル提供情報を収集しています"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
@@ -2576,15 +2606,15 @@ msgstr "ソースキャッシュの保存中に IO エラーが発生しまし
msgid "rename failed, %s (%s -> %s)."
msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2593,7 +2623,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2602,7 +2632,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2610,7 +2640,7 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "サイズが適合しません"
diff --git a/po/ko.po b/po/ko.po
index c113d282f..b206f0c02 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-07-20 00:28+0900\n"
"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -146,7 +146,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n"
@@ -298,7 +298,7 @@ msgstr ""
" -c=? 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "%s에 쓸 수 없습니다"
@@ -638,79 +638,79 @@ msgstr "%s의 링크를 해제하는 데 문제가 있습니다"
msgid "Failed to rename %s to %s"
msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "다음 꾸러미의 의존성이 맞지 않습니다:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "하지만 %s 꾸러미를 설치했습니다"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "하지만 %s 꾸러미를 설치할 것입니다"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "하지만 설치할 수 없습니다"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "하지만 가상 꾸러미입니다"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "하지만 설치하지 않았습니다"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "하지만 %s 꾸러미를 설치하지 않을 것입니다"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " 혹은"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "다음 새 꾸러미를 설치할 것입니다:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "다음 꾸러미를 지울 것입니다:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "다음 꾸러미를 과거 버전으로 유지합니다:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "다음 꾸러미를 업그레이드할 것입니다:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "다음 꾸러미를 다운그레이드할 것입니다:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "고정되었던 다음 꾸러미를 바꿀 것입니다:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s때문에) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -718,149 +718,149 @@ msgstr ""
"경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n"
"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu개 다시 설치, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu개 업그레이드, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "의존성을 바로잡는 중입니다..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " 실패."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "의존성을 바로잡을 수 없습니다"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "업그레이드 집합을 최소화할 수 없습니다"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " 완료"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "경고: 다음 꾸러미를 인증할 수 없습니다!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "인증 경고를 무시합니다.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "인증할 수 없는 꾸러미가 있습니다"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "내부 오류. 망가진 꾸러미에서 InstallPackages를 호출했습니다!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "내려받기 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십"
"시오."
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%s바이트 아카이브를 받아야 합니다.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s 안에 충분한 여유 공간이 없습니다."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
"아닙니다."
# 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용.
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -871,28 +871,28 @@ msgstr ""
"계속하시려면 다음 문구를 입력하십시오: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "중단."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "일부 파일을 받는 데 실패했습니다"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -900,48 +900,48 @@ msgstr ""
"아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
"missing 옵션을 줘서 실행해야 할 것입니다."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "빠진 꾸러미를 바로잡을 수 없습니다."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "설치를 중단합니다."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [설치함]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "설치하려면 분명하게 하나를 선택해야 합니다."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -952,49 +952,49 @@ msgstr ""
"해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n"
"꾸러미를 받아와야 하는 경우일 수도 있습니다.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "하지만 다음 꾸러미가 대체합니다:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s 꾸러미를 다시 설치하는 건 불가능합니다. 내려 받을 수 없습니다.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 꾸러미는 이미 최신 버전입니다.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "목록 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1002,26 +1002,45 @@ msgstr ""
"일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버"
"전을 대신 사용합니다."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
# FIXME: specify a solution? 무슨 솔루션?
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1029,7 +1048,7 @@ msgstr ""
"의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1040,7 +1059,7 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1049,119 +1068,115 @@ msgstr ""
"한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
"없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "망가진 꾸러미"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "다음 꾸러미를 더 설치할 것입니다:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "제안하는 꾸러미:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "추천하는 꾸러미:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는 데 실패했습니다."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 꾸러미가 설치되었는지를 확인해주십시오.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1170,7 +1185,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1179,32 +1194,32 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는 데 실패했습니다"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1541,9 +1556,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "꾸러미 목록을 읽는 중입니다"
@@ -2287,18 +2302,33 @@ msgstr "옵션"
msgid "extra"
msgstr "별도"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "의존성 트리를 만드는 중입니다"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "후보 버전"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "의존성 만들기"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "이용 가능 꾸러미 정보를 합칩니다"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s 파일을 여는 데 실패했습니다"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s 파일을 쓰는 데 실패했습니다"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2375,14 +2405,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2390,7 +2420,7 @@ msgstr ""
"오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수"
"도 있습니다."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다."
@@ -2426,7 +2456,7 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
msgid "Method %s did not start correctly"
msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2471,82 +2501,82 @@ msgstr "핀 타입 %s이(가0 무엇인지 이해할 수 없습니다"
msgid "No priority (or zero) specified for pin"
msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "캐시의 버전 시스템이 호환되지 않습니다"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "와우, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "와우, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "와우, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "%s 처리중에 오류가 발생했습니다 (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "%s 처리중에 오류가 발생했습니다 (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "파일 의존성을 처리하는 데, %s %s 꾸러미가 없습니다"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "소스 꾸러미 목록 %s의 정보를 읽을 수 없습니다"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "파일에서 제공하는 것을 모으는 중입니다"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다"
@@ -2555,15 +2585,15 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2572,7 +2602,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2581,14 +2611,14 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
diff --git a/po/makefile b/po/makefile
index 45e5b1e5a..07dc51c07 100644
--- a/po/makefile
+++ b/po/makefile
@@ -40,6 +40,9 @@ $(POTFILES) : $(PO)/%.pot :
--files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
rm -f $(PO)/POTFILES_$*.in
$(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
+ # copy into the domain dirs to make rosetta happy
+ rm -f $(PO)/domains/$*/*.pot
+ cp $@ $(PO)/domains/$*
$(PACKAGE)-all.pot: $(POTFILES)
$(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
diff --git a/po/nb.po b/po/nb.po
index b6b04f973..d1b01881b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-09 10:45+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n"
@@ -162,7 +162,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p %s %s\n"
@@ -320,7 +320,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kan ikke skrive til %s"
@@ -660,79 +660,79 @@ msgstr "Problem ved oppheving av lenken til %s"
msgid "Failed to rename %s to %s"
msgstr "Klarte ikke endre navnet p %s til %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulrt uttrykk - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Flgende pakker har uinnfridde avhengighetsforhold:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installeres"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "men lar seg ikke installere"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "men er en virtuell pakke"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "men er ikke installert"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "men skal ikke installeres"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Flgende NYE pakker vil bli installert:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Flgende pakker vil bli FJERNET:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Flgende pakker er holdt tilbake:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Flgende pakker vil bli oppgradert:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Flgende pakker vil bli NEDGRADERT:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Flgende pakker vil bli endret:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (pga. %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -741,145 +741,145 @@ msgstr ""
"ADVARSEL: Flgende kjernepakker vil bli fjernet\n"
"Dette br IKKE gjres, med mindre du vet nyaktig hva du gjr!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nylig installerte, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert p nytt, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu fjerne og %lu ikke oppgradert.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Retter p avhengighetsforhold ..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " mislyktes."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Klarer ikke rette p avhengighetsforholdene"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Klarer ikke minimere oppgraderingsettet"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Utfrt"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du vil kanskje kjre apt-get -f install for rette p dette."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Uinnfridde avhengighetsforhold - Prv -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Flgende pakker ble ikke autentisert!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installer disse pakkene uten verifikasjon [j/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Noen pakker ble ikke autentisert"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Det oppsto problemer og -y ble brukt uten --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker trenges fjernes, men funksjonen er sltt av."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Det oppsto en intern feil nr avledningen ble lagt til"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Klarer ikke lse nedlastingsmappa"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "M hente %sB/%sB med arkiver.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "M hente %sB med arkiver.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Dessverre, ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Bare trivielle endringer ble angitt, men dette er ikke en triviell endring."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, gjr som jeg sier!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -890,28 +890,28 @@ msgstr ""
"For fortsette, skriv: %s\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Avbryter."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke skaffe %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Noen av filene kunne ikke lastes ned"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullfrt med innstillinga bare nedlasting"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -919,48 +919,48 @@ msgstr ""
"Klarte ikke hente alle arkivene. Du kan prve med apt-get update eller "
"--fix-missing."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og bytte av media stttes n ikke"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Klarer ikke rette p manglende pakker."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Avbryter istallasjonen."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Merk, velger %s istedenfor %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Omgr %s - den er allerede installert eller ikke satt til oppgradering.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installert]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Du m velge en pakke som skal installeres."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -971,49 +971,49 @@ msgstr ""
"Dette kan bety at pakken mangler, er utgtt, eller bare finnes \n"
"tilgjengelig fra en annen kilde.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Flgende pakker erstatter den imidlertid:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakken %s har ingen installasjonskandidat"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Det er ikke mulig installere %s p nytt - den kan ikke nedlastes.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s er allerede nyeste versjon.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgave %s av %s ble ikke funnet"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versjon %s av %s ble ikke funnet"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Utvalgt versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kan ikke lse listemappa"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1021,25 +1021,44 @@ msgstr ""
"Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
"ble brukt isteden. "
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern feil - AllUpgrade dela noe"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke finne pakken %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1047,7 +1066,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller "
"angi en lsning)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1059,7 +1078,7 @@ msgstr ""
"at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1069,127 +1088,123 @@ msgstr ""
"at pakken helt enkelt ikke kan installeres, og du br fylle ut en "
"feilmelding."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Flgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Foresltte pakker:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Utfrt"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Du m angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Klarte ikke skaffe alle arkivene."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m angi minst en pakke du vil sjekke builddeps for"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1198,32 +1213,32 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %"
"s er for ny"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Klarte ikke behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Stttede moduler:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1563,9 +1578,9 @@ msgstr ""
"Infokatalogen og den midlertidige katalogen m vre p det samme filsystemet"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Leser pakkelister"
@@ -2315,18 +2330,33 @@ msgstr "valgfri"
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Skaper oversikt over avhengighetsforhold"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versjons-kandidater"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Oppretter avhengighetsforhold"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Fletter tilgjengelig informasjon"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke pne %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke skrive fila %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2403,14 +2433,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Oversiktsfil av typen %s stttes ikke"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Pakka %s trenger installeres p nytt, men jeg finner ikke lageret for den."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2418,7 +2448,7 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
"som holdes tilbake."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Klarer ikke rette problemene, noen delagte pakker er holdt tilbake."
@@ -2454,7 +2484,7 @@ msgstr "Finner ikke metode-driveren %s."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startet ikke korrekt"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2503,82 +2533,82 @@ msgstr "Forsto ikke spikring av typen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) spesifisert for pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Lageret har et uoverensstemmende versjonssystem"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Feil oppsto under behandling av %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Feil oppsto under behandling av %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Feil oppsto under behandling av %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Feil oppsto under behandling av %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Feil oppsto under behandling av %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Feil oppsto under behandling av %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Jss, du har overgtt antallet pakkenavn denne APT klarer."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jss, du har overgtt antallet versjoner denne APT klarer."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jss, du har overgtt antallet avhengighetsforhold denne APT klarer."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Feil oppsto under behandling av %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Feil oppsto under behandling av %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Samler inn filtilbud"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO-feil ved lagring av kildekode-lager"
@@ -2587,15 +2617,15 @@ msgstr "IO-feil ved lagring av kildekode-lager"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2604,7 +2634,7 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2613,13 +2643,13 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Feil strrelse"
diff --git a/po/nl.po b/po/nl.po
index 6798bed47..9613e03f1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-10 17:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s voor %s %s gecompileerd op %s %s\n"
@@ -306,7 +306,7 @@ msgstr ""
" -c=? Lees dit configuratiebestand.\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kan niet naar %s schrijven"
@@ -650,79 +650,79 @@ msgstr "Probleem bij het ontlinken van %s"
msgid "Failed to rename %s to %s"
msgstr "Hernoemen van %s naar %s is mislukt"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "maar %s is genstalleerd"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "maar %s zal genstalleerd worden"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "maar het is niet installeerbaar"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "maar het is een virtueel pakket"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "maar het is niet genstalleerd"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "maar het zal niet genstalleerd worden"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " of"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "De volgende NIEUWE pakketten zullen genstalleerd worden:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "De volgende pakketten zijn achtergehouden:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegens %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -731,145 +731,145 @@ msgstr ""
"WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden\n"
"Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten genstalleerd, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu opnieuw genstalleerd, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakketten niet volledig genstalleerd of verwijderd.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Vereisten worden verbeterd..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " mislukt."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Kan vereisten niet verbeteren"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Klaar"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Sommige pakketten konden niet geauthenticeerd worden"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout bij het toevoegen van een omleiding"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "U heeft niet voldoende vrije schijfruimte op %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, doe wat ik zeg!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -880,28 +880,28 @@ msgstr ""
"Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Afbreken."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -909,49 +909,49 @@ msgstr ""
"Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
"fix-missing proberen?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Geen oplossing voor de missende pakketten gevonden."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Installatie wordt afgebroken."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Let op, %s wordt geselecteerd in plaats van %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s wordt overgeslagen, het is al genstalleerd en opwaardering is niet "
"gevraagd.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakket %s is niet genstalleerd, en wordt dus niet verwijderd\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakket %s is een virtueel pakket voorzien door:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Genstalleerd]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "U dient er n expliciet te selecteren voor installatie."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -962,50 +962,50 @@ msgstr ""
"een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n"
"verouderd is, of enkel beschikbaar is van een andere bron\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Echter, de volgende pakketten vervangen dit:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakket %s heeft geen installeerbare kandidaat"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s is reeds de nieuwste versie.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' voor '%s' is niet gevonden"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versie '%s' voor '%s' is niet gevonden"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versie %s (%s) geselecteerd voor %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "De 'update'-opdracht aanvaard geen argumenten"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1013,27 +1013,46 @@ msgstr ""
"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
"zijn oudere versies van gebruikt."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "De volgende informatie helpt u mogelijk verder:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
"lossen:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1041,7 +1060,7 @@ msgstr ""
"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1052,7 +1071,7 @@ msgstr ""
"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1062,124 +1081,120 @@ msgstr ""
"waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n"
"best een foutrapport indienen voor dit pakket."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "De volgende informatie helpt u mogelijk verder:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen genstalleerd worden:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald "
"moetworden"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"U dient tenminste n pakket op te geven om de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1188,7 +1203,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1197,32 +1212,32 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
"beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Voldoen van Vereiste %s van pakket %s is mislukt: genstalleerde versie %s "
"is te nieuw"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1571,9 +1586,9 @@ msgstr ""
"De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Pakketlijsten worden ingelezen"
@@ -2333,18 +2348,33 @@ msgstr "optioneel"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Boom van vereisten wordt opgebouwd"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidaat-versies"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generatie vereisten"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "De beschikbare informatie wordt samengevoegd"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Openen van %s is mislukt"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van bestand %s is mislukt"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2422,7 +2452,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexbestandtype '%s' wordt niet ondersteund"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2430,7 +2460,7 @@ msgstr ""
"Pakket %s moet opnieuw genstalleerd worden, maar er kan geen archief voor "
"gevonden worden."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2438,7 +2468,7 @@ msgstr ""
"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
"veroorzaakt worden door vastgehouden pakketten."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt niet-werkende pakketten vast."
@@ -2474,7 +2504,7 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
msgid "Method %s did not start correctly"
msgstr "Methode %s startte niet op de juiste manier"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2525,84 +2555,84 @@ msgstr "Pintype %s wordt niet begrepen"
msgid "No priority (or zero) specified for pin"
msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Fout tijdens verwerken van %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Fout tijdens verwerken van %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Fout tijdens verwerken van %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Fout tijdens verwerken van %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Fout tijdens verwerken van %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Fout tijdens verwerken van %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Wauw, u heeft meer pakketten dan deze APT aankan."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wauw, u heeft meer versies dan deze APT aankan."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Fout tijdens verwerken van %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Fout tijdens verwerken van %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Pakket %s %s werd niet gevonden bij het verwerken van de "
"bestandsafhankelijkheden"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Voorziene bestanden worden verzameld"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
@@ -2611,15 +2641,15 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2628,7 +2658,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2637,7 +2667,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2645,7 +2675,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
diff --git a/po/nn.po b/po/nn.po
index 113810dd5..f2ac29aab 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p %s %s\n"
@@ -307,7 +307,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Klarte ikkje skriva til %s"
@@ -644,79 +644,79 @@ msgstr "Problem ved oppheving av lenkje til %s"
msgid "Failed to rename %s to %s"
msgstr "Klarte ikkje endra namnet p %s til %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "men lt seg ikkje installera"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "men er ein virtuell pakke"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "men er ikkje installert"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "men skal ikkje installerast"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Dei flgjande pakkane vil verta FJERNA:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Dei flgjande pakkane er haldne tilbake:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Dei flgjande pakkane vil verta oppgraderte:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (fordi %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -725,146 +725,146 @@ msgstr ""
"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
"Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nyleg installerte, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installerte p nytt, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Rettar p krav ..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " mislukkast."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Klarte ikkje retta p krav"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Klarte ikkje minimera oppgraderingsmengda"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Ferdig"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nokre krav er ikkje oppfylte. Prv med -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "TVARING: Klarer ikkje autentisere desse pakkane."
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installer desse pakkane utan verifikasjon [j/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Nokre pakkar kunne ikkje bli autentisert"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Det oppstod problem, og -y vart brukt utan --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "M henta %sB/%sB med arkiv.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "M henta %sB med arkiv.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikkje nok ledig plass i %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Trivial Only var spesifisert, men dette er ikkje noka triviell handling."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, gjer som eg seier!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -875,28 +875,28 @@ msgstr ""
"For halda fram, m du skriva nyaktig %s.\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Avbryt."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -904,49 +904,49 @@ msgstr ""
"Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller "
"--fix-missing."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og byte av medium er ikkje sttta for tida"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Klarte ikkje retta opp manglande pakkar."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Avbryt installasjon."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Merk, vel %s i staden for %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar over %s, for den er installert fr fr og ikkje sett til "
"oppgradering.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installert]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Du m velja ein som skal installerast."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -957,49 +957,49 @@ msgstr ""
"av ein annan pakke. Dette tyder at pakket manglar, er gjort overfldig\n"
"eller er berre tilgjengeleg fr ei anna kjelde\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Dei flgjande pakkane kan brukast i staden:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Det finst ingen installasjonskandidat for pakken %s"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Fann ikkje utgva %s av %s"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Fann ikkje versjonen %s av %s"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje lsa listekatalogen"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1007,26 +1007,45 @@ msgstr ""
"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
"filer er brukte i staden."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern feil. AllUpgrade ydelagde noko"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex %s\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1034,7 +1053,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1046,7 +1065,7 @@ msgstr ""
"distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n"
"er laga enno eller at dei framleis ligg i Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1056,127 +1075,123 @@ msgstr ""
"pakken rett og slett ikkje lt seg installera. I sfall br du senda\n"
"feilmelding."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1185,31 +1200,31 @@ msgstr ""
"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1547,9 +1562,9 @@ msgstr ""
"Infokatalogen og den mellombelse katalogen m vera p det same filsystemet"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Les pakkelister"
@@ -2298,18 +2313,33 @@ msgstr "valfri"
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Byggjer kravtre"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidatversjonar"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Genererer kravforhold"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Flettar informasjon om tilgjengelege pakkar"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2387,13 +2417,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indeksfiltypen %s er ikkje sttta"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2401,7 +2431,7 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar "
"som er haldne tilbake."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake."
@@ -2438,7 +2468,7 @@ msgstr "Finn ikkje metodedrivaren %s."
msgid "Method %s did not start correctly"
msgstr "Metoden %s starta ikkje rett"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2486,82 +2516,82 @@ msgstr "Skjnar ikkje spikringstypen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) oppgitt for spiker"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Feil ved behandling av %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Feil ved behandling av %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Feil ved behandling av %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Feil ved behandling av %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Feil ved behandling av %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Feil ved behandling av %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Feil ved behandling av %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Jss, du har overgtt talet p pakkenamn som APT kan handtera."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jss, du har overgtt talet p krav som APT kan handtera."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Feil ved behandling av %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Feil ved behandling av %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Samlar inn filtilbod"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IU-feil ved lagring av kjeldelager"
@@ -2570,15 +2600,15 @@ msgstr "IU-feil ved lagring av kjeldelager"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2587,7 +2617,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2595,14 +2625,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Feil storleik"
diff --git a/po/pl.po b/po/pl.po
index 34aa5a460..ce84c7ab9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-01-23 15:32+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s dla %s %s skompilowany %s %s\n"
@@ -303,7 +303,7 @@ msgstr ""
" -c=? Czytaj ten plik konfiguracyjny.\n"
" -o=? Ustaw dowoln opcj konfiguracji, np. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Nie udao si pisa do %s"
@@ -642,79 +642,79 @@ msgstr "Problem przy usuwaniu %s"
msgid "Failed to rename %s to %s"
msgstr "Nie udao si zmieni nazwy %s na %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Bd kompilacji wyraenia regularnego - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Nastpujce pakiety maj niespenione zalenoci:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ale %s jest zainstalowany"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s ma zosta zainstalowany"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ale nie da si go zainstalowa"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ale jest pakietem wirtualnym"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ale nie jest zainstalowany"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ale nie zostanie zainstalowany"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " lub"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Zostan zainstalowane nastpujce NOWE pakiety:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Nastpujce pakiety zostan USUNITE:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Nastpujce pakiety zostay zatrzymane:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Nastpujce pakiety zostan zaktualizowane:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Zostan zainstalowane STARE wersje nastpujcych pakietw:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Zostan zmienione nastpujce zatrzymane pakiety:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (z powodu %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -722,143 +722,143 @@ msgstr ""
"UWAGA: Zostan usunite nastpujce istotne pakiety.\n"
"Nie powinno si tego robi, chyba e dokadnie wiesz, co robisz!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu przeinstalowywanych, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu cofnitych wersji, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nie w peni zainstalowanych lub usunitych.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Naprawianie zalenoci..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " nie udao si."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Nie udao si naprawi zalenoci"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Nie udao si zminimalizowa zbioru aktualizacji"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Gotowe"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Naley uruchomi `apt-get -f install', aby je naprawi."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Niespenione zalenoci. Sprbuj uy -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UWAGA: Nastpujce pakiety nie mog zosta zweryfikowane!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Ostrzeenie uwierzytelniania zignorowano.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Zainstalowa te pakiety bez weryfikacji [t/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Niektre pakiety nie mogy zosta zweryfikowane"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Byy problemy, a uyto -y bez --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Bd wewntrzny, InstallPackages uyto z zepsutymi pakietami!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Bd wewntrzny, sortowanie niezakoczone"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Nie udao si zablokowa katalogu pobierania"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nie udao si odczyta list rde."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "Dziwne.. rozmiary si nie zgadzaj, zgo pod apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiww.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Konieczne pobranie %sB archiww.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozpakowaniu zostanie dodatkowo uyte %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie udao si ustali iloci wolnego miejsca w %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Niestety w %s nie ma wystarczajcej iloci wolnego miejsca."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Nakazano wykonywa tylko trywialne operacje, a to nie jest trywialne."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Tak, rb jak mwi!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -869,28 +869,28 @@ msgstr ""
"Aby kontynuowa wpisz zdanie '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Przerwane."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Czy chcesz kontynuowa [T/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udao si pobra %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Nie udao si pobra niektrych plikw"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Ukoczono pobieranie w trybie samego pobierania"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -898,48 +898,48 @@ msgstr ""
"Nie udao si pobra niektrych archiww, sprbuj uruchomi apt-get update "
"lub uy opcji --fix-missing"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i zamienianie nonikw nie jest obecnie obsugiwane"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Nie udao si poprawi brakujcych pakietw."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Przerywanie instalacji"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Uwaga, wybieranie %s zamiast %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Pomijanie %s, jest ju zainstalowane, a nie zostao wybrana aktualizacja.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakiet %s nie jest zainstalowany, wic nie zostanie usunity.\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Zainstalowany]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Naley jednoznacznie wybra jeden z nich do instalacji."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -950,50 +950,50 @@ msgstr ""
"Zazwyczaj oznacza to, e pakietu brakuje, zosta zastpiony przez inny\n"
"pakiet lub nie jest dostpny przy pomocy obecnie ustawionych rde.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Jednak nastpujce pakiety go zastpuj:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakiet %s nie ma kandydata do instalacji"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Przeinstalowanie pakietu %s nie jest moliwe, nie moe on zosta pobrany.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s jest ju w najnowszej wersji.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Wydanie '%s' dla '%s' nie zostao znalezione"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Wersja '%s' dla '%s' nie zostaa znaleziona"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Wybrano wersj %s (%s) dla %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga adnych argumentw"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Nie udao si zablokowa katalogu list"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1001,25 +1001,44 @@ msgstr ""
"Nie udao si pobra niektrych plikw indeksu, zostay one zignorowane lub "
"zostaa uyta ich starsza wersja."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udao si odnale pakietu %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Naley uruchomi `apt-get -f install', aby je naprawi:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1027,7 +1046,7 @@ msgstr ""
"Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub "
"podaj rozwizanie)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1039,7 +1058,7 @@ msgstr ""
"w ktrej niektre pakiety nie zostay jeszcze utworzone lub przeniesione\n"
"z katalogu Incoming (\"Przychodzce\")."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1049,124 +1068,120 @@ msgstr ""
"danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n"
"bd."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pakiety s bdne"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Nie udao si"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane "
"rda"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udao si odnale rda dla pakietu %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie ju pobranego pliku '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiww rde.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiww rde.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz rdo %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Nie udao si pobra niektrych archiww."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sprawd czy pakiet 'dpkg-dev' jest zainstalowany.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Proces potomny zawid"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety "
"wymagane do budowania"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Nie udao si pobra informacji o zalenociach na czas budowania dla %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zalenoci czasu budowania.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1175,7 +1190,7 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1184,32 +1199,32 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udao si speni zalenoci %s od %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udao si speni zalenoci na czas budowania od %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Nie udao si przetworzy zalenoci na czas budowania"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Obsugiwane moduy:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1550,9 +1565,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Pliki info i temp musz by na tym samym systemie plikw"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Czytanie list pakietw"
@@ -2303,18 +2318,33 @@ msgstr "opcjonalny"
msgid "extra"
msgstr "dodatkowy"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Budowanie drzewa zalenoci"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandydujce wersje"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generowanie zalenoci"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "czenie informacji o dostpnych pakietach"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie udao si otworzy %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udao si zapisa pliku %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2392,14 +2422,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Plik indeksu typu '%s' nie jest obsugiwany"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Pakiet %s ma zosta przeinstalowany, ale nie mona znale jego archiwum."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2407,7 +2437,7 @@ msgstr ""
"Bd, pkgProblemResolver::Resolve zwrci bd, moe to by spowodowane "
"\"zatrzymanymi\" pakietami."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nie udao si naprawi problemw, zatrzymano uszkodzone pakiety."
@@ -2443,7 +2473,7 @@ msgstr "Nie udao si odnale sterownika metody %s."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nie uruchomia si poprawnie."
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "W do napdu '%s' dysk o nazwie: '%s' i nacinij enter."
@@ -2487,85 +2517,85 @@ msgstr "Nierozpoznany typ przypinania %s"
msgid "No priority (or zero) specified for pin"
msgstr "Brak (lub zerowy) priorytet przypicia"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Magazyn podrczny ma niezgodny system wersji"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Wystpi bd podczas przetwarzania %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Wystpi bd podczas przetwarzania %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Wystpi bd podczas przetwarzania %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Wystpi bd podczas przetwarzania %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Wystpi bd podczas przetwarzania %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Wystpi bd podczas przetwarzania %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Wystpi bd podczas przetwarzania %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Och, przekroczono liczb pakietw, ktr ten APT jest w stanie obsuy."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Och, przekroczono liczb wersji, ktr ten APT jest w stanie obsuy."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Och, przekroczono liczb zalenoci, ktr ten APT jest w stanie obsuy."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Wystpi bd podczas przetwarzania %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Wystpi bd podczas przetwarzania %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Pakiet %s %s nie zosta odnaleziony podczas przetwarzania zalenoci plikw"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nie udao si wykona operacji stat na licie pakietw rdowych %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Zbieranie zapewnie plikw"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde"
@@ -2574,15 +2604,15 @@ msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde"
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udao si zmieni nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Bdna suma MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2591,7 +2621,7 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2600,14 +2630,14 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Bdny rozmiar"
diff --git a/po/pt.po b/po/pt.po
index 84be545a3..e179d0a39 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-03-07 22:20+0000\n"
"Last-Translator: Rui Az. <astronomy@mail.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -147,7 +147,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado em %s %s\n"
@@ -301,7 +301,7 @@ msgstr ""
" -c=? Ler este arquivo de configuração\n"
" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
@@ -639,79 +639,79 @@ msgstr "Problema ao executar unlinking %s"
msgid "Failed to rename %s to %s"
msgstr "Falha ao renomear %s para %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "mas não está instalável"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "mas não vai ser instalado"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Os seguintes NOVOS pacotes serão instalados:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Os seguintes pacotes serão REMOVIDOS:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Os seguintes pacotes serão actualizados:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Aos seguintes pacotes será feito o DOWNGRADE :"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados :"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -719,145 +719,145 @@ msgstr ""
"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu a que foi feito o downgrade, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a remover e %lu não actualizados.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Corrigindo dependências..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " falhou."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Impossível corrigir dependências"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Impossível minimizar o conjunto de actualizações"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Feito"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Você pode querer executar `apt-get -f install' para corrigir isso."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependências não satisfeitas. Tente utilizar -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: Os seguintes pacotes não podem ser autenticados"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticação ultrapassado.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalar estes pacotes sem verificação [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes não puderam ser autenticados"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Há problemas e -y foi usado sem --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno, Ordering não terminou"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no directório de download"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "É necessário fazer o download de %sB de arquivos.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossível de determinar espaço livre em %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço livre suficiente em %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only especificado mas essa não é uma operação trivial."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Sim, faça como eu digo!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -868,28 +868,28 @@ msgstr ""
"Para continuar escreva a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Você deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao obter %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -897,47 +897,47 @@ msgstr ""
"Impossível obter alguns arquivos, execute talvez apt-get update ou tente com "
"--fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mídia não são suportados actualmente"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Impossível corrigir os pacotes em falta."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abortando a Instalação."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, seleccionando %s em vez de %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "O pacote %s não está instalado, então não será removido\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "O pacote %s é um pacote virtual disponibilizado por:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Você deve seleccionar explicitamente um para instalar."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -948,51 +948,51 @@ msgstr ""
"Isso pode significar que o pacote falta, ficou obsoleto ou\n"
"está disponível somente a partir de outra fonte\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "No entanto, os seguintes pacotes substituem-no:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "O pacote %s não tem candidato para instalação"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"A reinstalação de %s não é possível, o download do mesmo não pode ser "
"feito.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s já é a versão mais recente.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' não foi encontrado"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versão '%s' para '%s' não foi encontrada"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Impossível criar lock no directório de listas"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1000,25 +1000,44 @@ msgstr ""
"Falhou o download de alguns ficheiros de índice, foram ignorados ou os "
"antigos foram usados em seu lugar."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "A seguinte informação pode ajudar a resolver a situação:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Erro Interno, o solucionador de problemas estragou coisas"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para a expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1026,7 +1045,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1038,7 +1057,7 @@ msgstr ""
"distribuição instável, que alguns pacotes requisitados ainda não foram \n"
"criados ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1049,123 +1068,119 @@ msgstr ""
"de\n"
"bug sobre esse pacote."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "A seguinte informação pode ajudar a resolver a situação:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculando Actualização... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se obtenha o código fonte"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Código Fonte %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Falha ao obter alguns arquivos."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Saltando a descompactação de pacote código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve especificar pelo menos um pacote para verificar as dependências de "
"compilação"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1174,7 +1189,7 @@ msgstr ""
"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1183,32 +1198,32 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de compilação"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1550,9 +1565,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "A Ler Listas de Pacotes"
@@ -2304,18 +2319,33 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Construindo Árvore de Dependências"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versões Candidatas"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Geração de Dependência"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Juntando informação Disponível"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falhou ao abrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever ficheiro %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2393,7 +2423,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Tipo do ficheiro de índice '%s' não é suportado"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2401,7 +2431,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"repositório para o mesmo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2409,7 +2439,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados."
@@ -2445,7 +2475,7 @@ msgstr "O driver do método %s não pôde ser encontrado."
msgid "Method %s did not start correctly"
msgstr "Método %s não iniciou corretamente"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2493,87 +2523,87 @@ msgstr "Não foi possível entender o tipo de marca %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para marcação"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "A Cache possui um sistema de versões incompatível"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Um erro ocorreu ao processar %s (NovoPacote)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Um erro ocorreu ao processar %s (UsePacote1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Um erro ocorreu ao processar %s (UsePacote2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Um erro ocorreu ao processar %s (NovaVersão1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Um erro ocorreu ao processar %s (UsePacote3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Um erro ocorreu ao processar %s (NovaVersão2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
"suportar."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Uau, você excedeu o número de versões que este APT é capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Um erro ocorreu ao processar %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Obtendo File Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar a cache de código fonte"
@@ -2582,17 +2612,17 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
"Não existe qualquer chave pública disponível para as seguintes IDs de "
"chave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2602,7 +2632,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitectura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2611,7 +2641,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2619,7 +2649,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index eb1182789..7b4985337 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-02-11 17:57-0200\n"
"Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado em %s %s\n"
@@ -304,7 +304,7 @@ msgstr ""
" -c=? Ler esse arquivo de configurao\n"
" -o=? Define uma opo arbitrria de configurao, ex: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Impossvel escrever para %s"
@@ -642,79 +642,79 @@ msgstr "Problema executando unlinking %s"
msgid "Failed to rename %s to %s"
msgstr "Falha ao renomear %s para %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilao de regex - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir tm dependncias desencontradas:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "mas %s est instalado"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s est para ser instalado"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "mas no est instalvel"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "mas um pacote virtual"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "mas no est instalado"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "mas no vai ser instalado"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Os NOVOS pacotes a seguir sero instalados:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Os pacotes a seguir sero REMOVIDOS:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Os pacotes a seguir sero mantidos em suas verses atuais :"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Os pacotes a seguir sero atualizados :"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Os pacotes a seguir sero REBAIXADOS de verso :"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Os pacotes segurados a seguir sero mudados :"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por causa de %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -723,144 +723,144 @@ msgstr ""
"Isso NO deveria ser feito a menos que voc saiba exatamente o que voc est "
"fazendo !"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desatualizados, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu no atualizados.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes no totalmente instalados ou removidos.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Corrigindo dependncias..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " falhou."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Impossvel corrigir dependncias"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Impossvel minimizar o conjunto de atualizaes"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Pronto"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Voc pode querer rodar `apt-get -f install' para corrigir isso."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependncias desencontradas. Tente usar -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO : Os pacotes a seguir no podem ser autenticados !"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticao sobrescrito.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalar estes pacotes sem verificao [s/N] ? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes no puderam ser autenticados"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "H problemas e -y foi usado sem --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro Interno, Install Packages foi chamado com pacotes quebrados !"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam ser removidos mas a remoo est desabilitada."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno, Ordenao no finalizou"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Impossvel criar lock no diretrio de download"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A lista de fontes no pde ser lida."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "Que estranho .. Os tamanhos no batem, informe apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr " preciso fazer o download de %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr " preciso fazer o download de %sB de arquivos.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Depois de desempacotamento, %sB adicionais de espao em disco sero usados.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de desempacotar, %sB de espao em disco sero liberados.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No foi possvel determinar o espao livre em %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Voc no possui espao suficiente em %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Triviais Apenas especificado mas essa no uma operao trivial."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Sim, faa o que eu digo!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -871,28 +871,28 @@ msgstr ""
"Para continuar digite a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Quer continuar [S/n] ? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao baixar %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -900,47 +900,47 @@ msgstr ""
"Impossvel pegar alguns arquivos, talvez rodar apt-get update ou tentar com "
"--fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mdia no so suportados atualmente"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Impossvel corrigir pacotes faltosos."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abortando Instalao."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, selecionando %s ao invs de %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Pulando %s, j est instalado e a atualizao no est configurada.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "O pacote %s no est instalado, ento no ser removido\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "O pacote %s um pacote virtual provido por:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Voc deve selecionar um explicitamente para instalar."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -951,51 +951,51 @@ msgstr ""
"Isso pode significar que o pacote est faltando, ficou obsoleto ou\n"
"est disponvel somente a partir de outra fonte\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "No entanto, os pacotes a seguir o substituem:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "O pacote %s no tem candidato para instalao"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"A reinstalao de %s no possvel, o download do mesmo no pode ser "
"feito.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s j a verso mais nova.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' no foi encontrada"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verso '%s' para '%s' no foi encontrada"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Verso selecionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "O comando update no leva argumentos"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Impossvel criar lock no diretrio de listas"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1003,25 +1003,44 @@ msgstr ""
"Alguns arquivos de ndice falharam no download, eles foram ignorados ou os "
"antigos foram usados em seu lugar."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "A informao a seguir pode ajudar a resolver a situao:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Erro Interno, o solucionador de problemas quebrou coisas"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossvel achar pacote %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expresso regular '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Voc deve querer rodar `apt-get -f install' para corrigir isso:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1029,7 +1048,7 @@ msgstr ""
"Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma soluo)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1041,7 +1060,7 @@ msgstr ""
"distribuio instvel, que alguns pacotes requeridos no foram \n"
"criados ainda ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1051,121 +1070,117 @@ msgstr ""
"esteja simplesmente no instalvel e um relato de erro sobre esse\n"
"pacotes deve ser enviado."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "A informao a seguir pode ajudar a resolver a situao:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir sero instalados:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculando Atualizao... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossvel encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omitindo arquivo j obtido '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Voc no possui espao livre suficiente em %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Fonte %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Falha ao fazer o download de alguns arquivos."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando desempacotamento de pacote fonte j desempacotado em %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote dpkg-dev est instalado.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construo '%s' falhou.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependncias "
"de construo"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossvel conseguir informaes de dependncia de construo para %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tem dependncias de construo.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1174,7 +1189,7 @@ msgstr ""
"a dependncia de %s por %s no pde ser satisfeita porque o pacote %s no "
"pde ser encontrado"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1183,32 +1198,32 @@ msgstr ""
"a dependncia de %s por %s no pode ser satisfeita porque nenhuma verso "
"disponvel do pacote %s pode satisfazer os requerimentos de verso"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependncia %s para %s: Pacote instalado %s muito "
"novo"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer dependncia %s para %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No foi possvel satisfazer as dependncias de compilao para %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependncias de construo"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Mdulos Suportados:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1549,9 +1564,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Os diretrios info e temp precisam estar no mesmo sistema de arquivos"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Lendo Lista de Pacotes"
@@ -2305,18 +2320,33 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Construindo rvore de Dependncias"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Verses Candidatas"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Gerao de Dependncia"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Mesclando informao Disponvel"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falha ao abrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao gravar arquivo %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2394,7 +2424,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Tipo de arquivo de ndice '%s' no suportado"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2402,7 +2432,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas no foi possvel encontrar um "
"repositrio para o mesmo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2410,7 +2440,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossvel corrigir problemas, voc manteve (hold) pacotes quebrados."
@@ -2446,7 +2476,7 @@ msgstr "O driver do mtodo %s no pde ser encontrado."
msgid "Method %s did not start correctly"
msgstr "Mtodo %s no iniciou corretamente"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2495,86 +2525,86 @@ msgstr "Na foi possvel entender o tipo de pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para pinagem"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "O Cache possui um sistema de verses incompatvel"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Um erro ocorreu processando %s (NovoPacote)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Um erro ocorreu processando %s (UsePacote1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Um erro ocorreu processando %s (UsePacote2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Um erro ocorreu processando %s (NovaVerso1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Um erro ocorreu processando %s (UsePacote3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Um erro ocorreu processando %s (NovaVerso2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Ops, voc excedeu o nmero de nomes de pacotes que este APT capaz de "
"suportar."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Ops, voc excedeu o nmero de verses que este APT capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Ops, voc excedeu o nmero de dependncias que este APT capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Um erro ocorreu processando %s (ColetarArquivoFornece)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pacote %s %s no foi encontrado processando dependncias de arquivo"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No foi possvel checar a lista de pacotes fonte %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Coletando File Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar cache fonte"
@@ -2583,15 +2613,15 @@ msgstr "Erro de I/O ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeao falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "No existem chaves pblicas para os seguintes IDs de chaves :\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2601,7 +2631,7 @@ msgstr ""
"que voc precisa consertar manualmente este pacote. (devido a arquitetura "
"no especificada)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2610,7 +2640,7 @@ msgstr ""
"No foi possvel localizar arquivo para o pacote %s. Isto pode significar "
"que voc precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2618,7 +2648,7 @@ msgstr ""
"Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Tamanho incorreto"
diff --git a/po/ro.po b/po/ro.po
index 789b54247..1517414df 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-06-25 12:58+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pentru %s %s compilat pe %s %s\n"
@@ -303,7 +303,7 @@ msgstr ""
" -c=? Citeşte acest fişier de configurare\n"
" -o=? Ajustează o opţiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Nu pot scrie în %s"
@@ -648,79 +648,79 @@ msgstr "Problemă la desfacerea %s"
msgid "Failed to rename %s to %s"
msgstr "Eşuare în a redenumi %s în %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Următoarele pachete au dependenţe neîndeplinite:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "dar %s este instalat"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "dar %s este pe cale de a fi instalat"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "dar nu este instalabil"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "dar este un pachet virtual"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "dar nu este instalat"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "dar nu este pe cale să fie instalat"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " sau"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Următoarele pachete NOI vor fi instalate:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Următoarele pachete vor fi ŞTERSE:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Următoarele pachete au fost reţinute:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Următoarele pachete vor fi ÎNNOITE:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Următoarele pachete vor fi DE-GRADATE:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Următoarele pachete ţinute vor fi schimbate:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -728,145 +728,145 @@ msgstr ""
"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse.\n"
"Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu înnoite, %lu nou instalate, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu de şters şi %lu neînnoite.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalate sau şterse incomplet.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Corectez dependenţele..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " eşuare."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Nu pot corecta dependenţele"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Nu pot micşora mulţimea pachetelor de înnoire"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Terminat"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Aţi putea să porniţi 'apt-get -f install' pentru a corecta acestea."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependenţe neîndeplinite. Încercaţi să folosiţi -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Avertisment de autentificare înlocuit.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalaţi aceste pachete fără verificare [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Unele pachete n-au putut fi autentificate"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă, Ordering nu s-a terminat"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Nu pot încuia directorul de descărcare"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Este nevoie să descărcaţi %sB/%sB de arhive.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Este nevoie să descărcaţi %sB de arhive.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spaţiul disponibil în %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nu aveţi suficient spaţiu în %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Da, fă cum îţi spun!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -877,28 +877,28 @@ msgstr ""
"Pentru a continua tastaţi fraza '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Renunţare."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vreţi să continuaţi [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eşuare în aducerea %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Eşuare în descărcarea unor fişiere"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Descărcare completă şi în modul doar descărcare"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -906,47 +906,47 @@ msgstr ""
"Nu pot aduce unele arhive, poate porniţi 'apt-get update' sau încercaţi cu --"
"fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Nu pot corecta pachetele lipsă."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abandonez instalarea."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Notă, se selectează %s în locul lui %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pachetul %s este un pachet virtual furnizat de către:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalat]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Ar trebui să alegeţi în mod explicit unul pentru instalare."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -957,49 +957,49 @@ msgstr ""
"Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n"
"este disponibil numai din altă sursă\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Oricum următoarele pachete îl înlocuiesc:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pachetul %s nu are nici un candidat la instalare"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' pentru '%s' n-a fost găsită"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1007,25 +1007,45 @@ msgstr ""
"Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au "
"fost folosite în loc unele vechi."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1033,7 +1053,7 @@ msgstr ""
"Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet "
"(sau oferiţi o altă soluţie)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1046,7 +1066,7 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1056,122 +1076,118 @@ msgstr ""
" că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n"
"acest pachet ar trebui completat."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Eşuare"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Terminat"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puţin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu pot găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fişierul deja descărcat '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nu aveţi suficient spaţiu în %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcaţi %sB/%sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcaţi %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Eşuare în a aduce unele arhive."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Eşuare proces copil"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puţin un pachet pentru a-i verifica dependenţele "
"înglobate"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informaţiile despre dependenţele înglobate ale lui %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependenţe înglobate.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1180,7 +1196,7 @@ msgstr ""
"Dependenţa lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1189,32 +1205,32 @@ msgstr ""
"Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eşuare în a satisface dependenţa lui %s de %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependenţele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Eşuare în a prelucra dependenţele înglobate"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1559,9 +1575,9 @@ msgstr ""
"fişiere"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Citire liste de pachete"
@@ -2314,18 +2330,33 @@ msgstr "opţional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Se construieşte arborele de dependenţă"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versiuni candidat"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generare dependenţe"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Unirea informaţiilor disponibile"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Eşuare la deschiderea %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eşuare în scrierea fişierului %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2403,14 +2434,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Tipul de fişier index '%s' nu este suportat"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2418,7 +2449,7 @@ msgstr ""
"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
"cauzată de pachete ţinute."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate."
@@ -2454,7 +2485,7 @@ msgstr "Metoda driver %s nu poate fi găsită."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nu s-a lansat corect"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2502,87 +2533,87 @@ msgstr "Nu s-a înţeles tipul de pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Fără prioritate (sau zero) specificată pentru pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cache are un versioning system incompatibil"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Mamăăă, aţi depăşit numărul de nume de pachete de care este capabil acest "
"APT."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nu pot determina starea listei surse de pachete %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Colectare furnizori fişier"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Eroare IO în timpul salvării sursei cache"
@@ -2591,17 +2622,17 @@ msgstr "Eroare IO în timpul salvării sursei cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
"identificatoare de chei:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2610,7 +2641,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2619,7 +2650,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să depanaţi manual acest pachet."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2627,7 +2658,7 @@ msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
diff --git a/po/ru.po b/po/ru.po
index a683c0e2c..8b94c86ca 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-01-21 14:55+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -157,7 +157,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s для %s %s скомпилирован %s %s\n"
@@ -308,7 +308,7 @@ msgstr ""
" -c=? Читать указанный конфигурационный файл\n"
" -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Невозможно записать в %s"
@@ -656,80 +656,80 @@ msgstr "Не удалось удалить %s"
msgid "Failed to rename %s to %s"
msgstr "Не удалось переименовать %s в %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "но %s уже установлен"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "но %s будет установлен"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "но он не может быть установлен"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "но это виртуальный пакет"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "но он не установлен"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "но он не будет установлен"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " или"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "НОВЫЕ пакеты, которые будут установлены:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Пакеты, которые будут УДАЛЕНЫ:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Пакеты, которые будут оставлены в неизменном виде:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Пакеты, которые будут обновлены:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr ""
"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (вследствие %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -737,151 +737,151 @@ msgstr ""
"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "обновлено %lu, установлено %lu новых пакетов, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "переустановлено %lu переустановлено, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu пакетов заменены на старые версии, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не установлено до конца или удалено %lu пакетов.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Исправление зависимостей..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " не удалось."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Невозможно скорректировать зависимости"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Невозможно минимизировать набор обновлений"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Готово"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install'."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Аутентификационное предупреждение не принято в внимание.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Установить эти пакеты без проверки [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Некоторые пакеты невозможно аутентифицировать"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Существуют проблемы, а опция -y использована без --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
"пакетами!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Пакеты необходимо удалить, но удаление запрещено."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Внутренняя ошибка, Ordering не завершилась"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог для загрузки"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Необходимо скачать %sB/%sB архивов.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Необходимо скачать %sБ архивов.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"После распаковки объем занятого дискового пространства возрастёт на %sB.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
"После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Недостаточно свободного места в %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Запрошено выполнение только тривиальных операций, но это не тривиальная "
"операция."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Да, делать, как я скажу!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -892,28 +892,28 @@ msgstr ""
"Чтобы продолжить, введите фразу: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Аварийное завершение."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось загрузить %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Некоторые файлы не удалось загрузить"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только загрузка\", и загрузка завершена"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -921,48 +921,48 @@ msgstr ""
"Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get "
"update или попытаться повторить запуск с ключом --fix-missing"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Аварийное завершение установки."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Установлен]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Вы должны явно указать, какой именно вы хотите установить."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -973,49 +973,49 @@ msgstr ""
"Это может означать, что пакет отсутствует, устарел, или доступен из "
"источников, не упомянутых в sources.list\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Однако следующие пакеты могут его заменить:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Для пакета %s не найдены кандидаты на установку"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Переустановка %s невозможна, он не загружается.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Уже установлена самая новая версия %s.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Релиз '%s' для '%s' не найден"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Версия '%s' для '%s' не найдена"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Выбрана версия %s (%s) для %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Невозможно заблокировать каталог со списками пакетов"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1023,27 +1023,46 @@ msgstr ""
"Некоторые индексные файлы не загрузились, они были проигнорированы или "
"вместо них были использованы старые версии"
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Следующая информация возможно поможет Вам:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Внутренняя ошибка, решатель проблем всё поломал"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade все поломал"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Не могу найти пакет %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1051,7 +1070,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
"не указывая имени пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1062,7 +1081,7 @@ msgstr ""
"или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n"
"ещё не созданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1072,125 +1091,121 @@ msgstr ""
"пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
"Необходимо послать отчёт об этой ошибке."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Следующая информация возможно поможет Вам:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Предлагаемые пакеты:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Неудачно"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутренняя ошибка, решатель проблем всё поломал"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, для которого необходимо загрузить исходные "
"тексты"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходными текстами для %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже загруженный файл '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Загрузка исходных текстов %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось загрузить."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Распаковка исходных текстов пропущена, так как в %s уже находятся "
"распакованные исходные тексты\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1199,7 +1214,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1208,32 +1223,32 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
"версий пакета %s не удовлетворяет требованиям"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1573,9 +1588,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Каталоги info и temp должны находиться на одной файловой системе"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Чтение списков пакетов"
@@ -2337,18 +2352,33 @@ msgstr "необязательный"
msgid "extra"
msgstr "дополнительный"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Построение дерева зависимостей"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Версии-кандидаты"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Генерирование зависимостей"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Объединение информации о доступных пакетах"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Не удалось открыть %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не удалось записать в файл %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2427,13 +2457,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Не поддерживается индексный файл типа '%s'"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Пакет %s нуждается в переустановке, но я не могу найти архив для него."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2441,7 +2471,7 @@ msgstr ""
"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
"может быть вызвано отложенными (held) пакетами."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Невозможно исправить ошибки, у Вас отложены (held) битые пакеты."
@@ -2477,7 +2507,7 @@ msgstr "Драйвер для метода %s не найден."
msgid "Method %s did not start correctly"
msgstr "Метод %s запустился не корректно"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
@@ -2521,82 +2551,82 @@ msgstr "Неизвестный тип фиксации %s"
msgid "No priority (or zero) specified for pin"
msgstr "Для фиксации не указан приоритет (или указан нулевой)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Кэш имеет несовместимую систему версий"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Произошла ошибка во время обработки %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Произошла ошибка во время обработки %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Произошла ошибка во время обработки %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Произошла ошибка во время обработки %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Произошла ошибка во время обработки %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Произошла ошибка во время обработки %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Превышено допустимое количество имён пакетов."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Превышено допустимое количество версий."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Превышено допустимое количество зависимостей."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Произошла ошибка во время обработки %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Сбор информации о Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кэш исходных текстов"
@@ -2605,15 +2635,15 @@ msgstr "Ошибка ввода/вывода при попытке сохран
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Недоступен общий ключ для следующих ключей (ID):\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2622,7 +2652,7 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2631,13 +2661,13 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Не совпадает размер"
diff --git a/po/sk.po b/po/sk.po
index 639f4bb1a..58308b78f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-05-29 15:33+0200\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pre %s %s skompilovaný na %s %s\n"
@@ -300,7 +300,7 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Do %s sa nedá zapisovať"
@@ -637,79 +637,79 @@ msgstr "Problém s odlinkovaním %s"
msgid "Failed to rename %s to %s"
msgstr "Premenovanie %s na %s zlyhalo"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Nasledovné balíky majú nesplnené závislosti:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ale nainštalovaný je %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ale inštalovať sa bude %s"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ale sa nedá nainštalovať"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ale je to virtuálny balík"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ale nie je nainštalovaný"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ale sa nebude inštalovať"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " alebo"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Nasledovné balíky sa aktualizujú:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Nasledovné pridržané balíky sa zmenia:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvôli %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -717,145 +717,145 @@ msgstr ""
"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
"Ak presne neviete, čo robíte, tak to NEROBTE!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizovaných, %lu nových inštalovaných, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalovaných, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradovaných, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Opravujú sa závislosti..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " zlyhalo."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Závislosti sa nedajú opraviť"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Sada pre aktualizáciu sa nedá minimalizovať"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Na opravu môžete spustiť `apt-get -f install'."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplnené závislosti. Skúste použiť -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Nastali problémy a -y bolo použité bez --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Vnútorná chyba, Triedenie sa neukončilo"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages."
"debian.org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Je potrebné stiahnuť %sB archívov.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozbalení sa na disku použije ďalších %sB.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Na %s nemáte dostatok voľného miesta."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Áno, urob to, čo vravím!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -866,28 +866,28 @@ msgstr ""
"Pre pokračovanie opíšte frázu '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Prerušené."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -895,47 +895,47 @@ msgstr ""
"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
"fix-missing"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výmena média nie sú momentálne podporované"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Chýbajúce balíky sa nedajú opraviť."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Inštalácia sa prerušuje."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Poznámka: %s sa vyberá namiesto %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Balík %s je virtuálny balík poskytovaný:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr "[Inštalovaný]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -945,49 +945,49 @@ msgstr ""
"Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
"že balík chýba, bol zrušený, alebo je dostupný iba z iného zdroja\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Avšak nahrádzajú ho nasledovné balíky:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Balík %s nemá kandidáta na inštaláciu"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je už najnovšej verzie.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nebolo nájdené vydanie '%s' pre '%s'"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nebola nájdená verzia '%s' pre '%s'"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Zvolená verzia %s (%s) pre %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -995,25 +995,44 @@ msgstr ""
"Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa "
"použili staršie verzie."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Vnútorná chyba, problem resolver pokazil veci"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Na opravu nasledovných môžete spustiť `apt-get -f install':"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1021,7 +1040,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1033,7 +1052,7 @@ msgstr ""
"požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
"Novoprichádzajúcich (Incoming) balíkov."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1043,128 +1062,124 @@ msgstr ""
"balík nie je inštalovateľný a mali by ste zaslať hlásenie o chybe\n"
"(bug report) pre daný balík."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, problem resolver pokazil veci"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nedá sa nájsť zdrojový balík pre %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
"zostavenie"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti pre zostavenie %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1173,31 +1188,31 @@ msgstr ""
"%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíku %s, "
"ktorá zodpovedá požiadavke na verziu"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1534,9 +1549,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Načítavajú sa zoznamy balíkov"
@@ -2286,18 +2301,33 @@ msgstr "voliteľný"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Vytvára sa strom závislostí"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidátske verzie"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generovanie závislostí"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Zlučujú sa dostupné informácie"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s sa nedá otvoriť"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Zápis súboru %s zlyhal"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2374,13 +2404,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexový typ súboru '%s' nie je podporovaný"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Je nutné preinštalovať balík %s, ale nemôžem pre neho nájsť archív."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2388,7 +2418,7 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
"pridržanými balíkmi."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
@@ -2424,7 +2454,7 @@ msgstr "Nedá sa nájsť ovládač spôsobu %s."
msgid "Method %s did not start correctly"
msgstr "Spôsob %s nebol správne spustený"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter."
@@ -2468,84 +2498,84 @@ msgstr "Nezrozumiteľné pripevnenie typu %s"
msgid "No priority (or zero) specified for pin"
msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Chyba pri spracovávaní %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Chyba pri spracovávaní %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Chyba pri spracovávaní %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Chyba pri spracovávaní %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Chyba pri spracovávaní %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Chyba pri spracovávaní %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Chyba pri spracovávaní %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
@@ -2554,15 +2584,15 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2571,7 +2601,7 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2580,13 +2610,13 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
diff --git a/po/sl.po b/po/sl.po
index b2f755eca..0dc882690 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure uhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -145,7 +145,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s za %s %s preveden na %s %s\n"
@@ -301,7 +301,7 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Ni mogoe pisati na %s"
@@ -639,79 +639,79 @@ msgstr "Napaka pri odvezovanju %s"
msgid "Failed to rename %s to %s"
msgstr "Ni mogoe preimenovati %s v %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Naslednji paketi imajo nereene odvisnosti:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "vendar je paket %s nameen"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "vendar bo paket %s nameen"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "vendar se ga ne da namestiti"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "vendar je navidezen paket"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "vendar ni nameen"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "vendar ne bo nameen"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ali"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Naslednji NOVI paketi bodo nameeni:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Naslednji paketi so bili zadrani:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Naslednji paketi bodo nadgrajeni:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Naslednji paketi bodo POSTARANI:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Naslednji zadrani paketi bodo spremenjeni:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (zaradi %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -720,144 +720,144 @@ msgstr ""
"OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n"
"To NI priporoljivo, razen e natanno veste, kaj ponete."
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nadgrajenih, %lu na novo nameenih, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu posodobljenih, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu postaranih, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ne popolnoma nameenih ali odstranjenih.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Popravljanje odvisnosti ..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " spodletelo."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ni mogoe popraviti odvisnosti"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Ni mogoe pomanjati zbirke za nadgradnjo"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Opravljeno"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "e elite popraviti napake, poskusite pognati 'apt-get -f install'."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nereene odvisnosti. Poskusite uporabiti -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "POZORO: Naslednjih paketov ni bilo mogoe avtenticirati!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Namestim te pakete brez prevejanje [y/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Nisem uspel avtenticirati nekaterih paketkov"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Prilo je do teav in -y je bil uporabljen brez --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka pri dodajanju odklona"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Ni mogoe zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoe brati."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Potrebno je dobiti %sB arhivov.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "V %s je premalo prostora."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Izbrana je monost Samo preprosto, a to opravilo ni preprosto."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Da, naredi tako kot pravim!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -868,28 +868,28 @@ msgstr ""
"Za nadaljevanje vnesite frazo '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Prekini."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Ali elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoe dobiti %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Prenos dokonan in uporabljen nain samo prenos"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -897,47 +897,47 @@ msgstr ""
"Nekaterih arhivov ni mogoe dobiti. Poskusite uporabiti apt-get update ali --"
"fix-missing."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Ni mogoe popraviti manjkajoih paketov."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Prekinjanje namestitve."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Opomba: izbran %s namesto %s \n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s preskoen, ker je e nameen in ne potrebuje nadgradnje.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paket %s ni nameen, zato ni odstranjen\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paket %s je navidezen in ga je priskrbel:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Nameeno]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Sami izberite paket, ki ga elite namestiti."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -948,49 +948,49 @@ msgstr ""
"To ponavadi pomeni, da paket manjka, je zastaran ali\n"
"pa je na voljo samo iz drugega vira.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paket %s nima kandidata za namestitev"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ponovna namestitev %s ni mona, ker ni moen prenos.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Najnoveja razliica %s je e nameena.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Izdaje '%s' za '%s' ni mogoe najti"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Razliice '%s' za '%s' ni mogoe najti"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Izbrana razliica %s (%s) za %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Ukaz update ne potrebuje argumentov"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Imenika seznamov ni mogoe zakleniti"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -998,25 +998,44 @@ msgstr ""
"Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so "
"uporabljena stareja."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Notranja napaka zaradi AllUpgrade."
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1024,7 +1043,7 @@ msgstr ""
"Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte reitev)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1035,7 +1054,7 @@ msgstr ""
"nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi e niso ustvarjeni ali preneeni iz Prihajajoe."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1045,130 +1064,126 @@ msgstr ""
"preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n"
"o tem paketu."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Priporoeni paketi:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Preraunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoe najti"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoe dobiti."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Otroki proces ni uspel"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1177,31 +1192,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne "
"more zadostiti zahtevi po razliici"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1540,9 +1555,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Podatki in zaasni imeniki morajo biti v istem datotenem sistemu"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Branje seznama paketov"
@@ -2289,18 +2304,33 @@ msgstr "izbirno"
msgid "extra"
msgstr "dodatno"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Gradnja drevesa odvisnosti"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Razliice kandidatov"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Ustvarjanje odvisnosti"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Spajanje informacij na voljo"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ni mogoe odprti %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Napaka pri pisanju datoteke %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2377,14 +2407,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Paket %s mora biti ponovno nameen, vendar ne morem najti arhiva zanj."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2392,7 +2422,7 @@ msgstr ""
"Napaka. pkgProblemResolver::Napake pri razreitvi, ki so jih morda "
"povzroili zadrani paketi."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ni mogoe popraviti teav. Imate zadrane pakete."
@@ -2428,7 +2458,7 @@ msgstr "Ni mogoe najti gonilnika metod %s."
msgid "Method %s did not start correctly"
msgstr "Metoda %s se ni zaela pravilno"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2475,82 +2505,82 @@ msgstr "Ni mogoe razumeti vrste zaponke %s"
msgid "No priority (or zero) specified for pin"
msgstr "Prioriteta zaponke ni doloena ali pa je ni."
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Predpomnilnik ima neustrezen sistem razliic"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Prilo je do napake pri obdelavi %s (Nov paket)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Uau, presegli ste tevilo imen paketov, ki jih zmore APT."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Uau, presegli ste tevilo razliic, ki jih zmore APT."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Uau, presegli ste tevilo odvisnosti, ki jih zmore APT."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Prilo je do napake pri obdelavi %s (Najdi paket)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Prilo je do napake pri obdelavi %s (Zberi dobavitelje datotek)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Paketa %s %s ni bilo mogoe najti med obdelavo odvisnosti"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ni mogoe doloiti seznama izvornih paketov %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Zbiranje dobaviteljev datotek"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
@@ -2559,15 +2589,15 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2576,7 +2606,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket (zaradi manjkajoega arhiva)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2585,7 +2615,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2593,7 +2623,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
diff --git a/po/sv.po b/po/sv.po
index ffad16fb1..d31252566 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-05-18 08:35+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s fr %s %s kompilerad den %s %s\n"
@@ -301,7 +301,7 @@ msgstr ""
" -c=? Ls denna instllningsfil.\n"
" -o=? Ange valfri instllningsflagga. T.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
@@ -644,79 +644,79 @@ msgstr "Problem med att lnka ut %s"
msgid "Failed to rename %s to %s"
msgstr "Misslyckades att byta namn p %s till %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid tolkning av reguljrt uttryck - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Fljande paket har beroenden som inte kan tillfredsstllas:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "men %s r installerat"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skall installeras"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "men det kan inte installeras"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "men det r ett virtuellt paket"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "men det r inte installerat"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "men det kommer inte att installeras"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Fljande NYA paket kommer att installeras:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Fljande paket kommer att TAS BORT:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Fljande paket har hllits tillbaka:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Fljande paket kommer att uppgraderas:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Fljande paket kommer att NEDGRADERAS:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Fljande hllna paket kommer att ndras:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (p grund av %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -724,145 +724,145 @@ msgstr ""
"VARNING: Fljande systemkritiska paket kommer att tas bort\n"
"Detta br INTE gras svida du inte vet exakt vad du gr!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu uppgraderade, %lu nyinstallerade, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ominstallerade, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderade, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu att ta bort och %lu ej uppgraderade.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ej helt installerade eller borttagna.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Rttar beroenden...."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " misslyckades."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Kunde inte rtta beroenden"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Kunde inte minimera uppgraderingsuppsttningen"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Frdig"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan mjligen rtta dessa genom att kra \"apt-get -f install\"."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Otillfredsstllda beroenden. Frsk med -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VARNING: Fljande paket kunde inte autentiseras!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Authentiseringsvarning verkrd.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installera dessa paket utan verifiering [j/N]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Ngra av paketen kunde inte autentiseras"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Problem har uppsttt och -y anvndes utan --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Internt fel. InstallPackages kallades upp med brutna paket!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Paket mste tas bort men \"Remove\" r inaktiverat."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen frdigstlldes inte"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Kunde inte lsa hmtningskatalogen."
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listan ver kllor kunde inte lsas."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Konstigt.. storlekarna stmde inte, skicka e-post till apt@packages.debian."
"org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Behver hmta %sB/%sB arkiv.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Behver hmta %sB arkiv.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anvndas.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter uppackning kommer %sB frigras p disken.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte lsa av ledigt utrymme i %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har inte tillrckligt ledigt utrymme i %s"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "\"Trivial Only\" angavs, men detta r inte en trivial handling."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, gr som jag sger!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -874,28 +874,28 @@ msgstr ""
" ?] "
# Visas d man svarar nej
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Avbryter."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortstta [J/n]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades att hmta %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Misslyckades att hmta vissa filer"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Hmtningen frdig i \"endast-hmta\"-lge"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -903,48 +903,48 @@ msgstr ""
"Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med "
"--fix-missing."
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing och mediabyte stds inte nnu"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Kunde inte rtta saknade paket."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Avbryter installationen."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Observera, vljer %s istllet fr %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar ver %s, det r redan installerat och uppgradering har inte valts.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paketet %s r inte installerat, s tas inte bort\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paketet %s r ett virtuellt paket som tillhandahlls av:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installerat]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Du br explicit ange ett att installera."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -955,49 +955,49 @@ msgstr ""
"Detta betyder vanligen att paketet saknas, har blivit frldrat eller\n"
"bara r tillgngligt frn andra kllor\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Dock kan fljande paket erstta det:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paketet %s har ingen installationskandidat"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ominstallation av %s r inte mjlig, det kan inte hmtas.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s r redan den senaste versionen.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgvan \"%s\" fr \"%s\" hittades inte"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" fr \"%s\" hittades inte"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald version %s (%s) fr %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kunde inte lsa listkatalogen"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1005,25 +1005,44 @@ msgstr ""
"Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla "
"anvnts istllet."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Fljande information kan vara till hjlp fr att lsa situationen:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Internt fel, problemlsaren brt snder saker"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade frstrde ngot"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, vljer %s fr regex \"%s\"\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1031,7 +1050,7 @@ msgstr ""
"Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket "
"(eller ange en lsning)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1043,7 +1062,7 @@ msgstr ""
"distributionen, att ngra krvda paket nnu inte har skapats eller\n"
"lagts in frn \"Incoming\"."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1053,119 +1072,115 @@ msgstr ""
"helt enkelt inte kan installeras och att en felrapport om detta br\n"
"skrivas."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Fljande information kan vara till hjlp fr att lsa situationen:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Fljande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Freslagna paket:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Berknar uppgradering... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlsaren brt snder saker"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Du mste ange tminstone ett paket att hmta kllkod fr"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta ngot kllkodspaket fr %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar ver redan hmtad fil \"%s\"\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillrckligt ledigt utrymme i %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behver hmta %sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Hmtar kllkod %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Misslyckades att hmta vissa arkiv."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan redan uppackad kllkod i %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Kontrollera att paketet \"dpkg-dev\" r installerat.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hmta byggberoendeinformation fr %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1173,7 +1188,7 @@ msgid ""
msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1182,32 +1197,32 @@ msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga "
"versioner av paketet %s uppfyller versionskraven"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s "
"r fr nytt"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden fr %s kunde inte uppfyllas."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Kunde inte hantera byggberoenden"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Moduler som stds:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1552,9 +1567,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Katalogerna info och temp mste ligga p samma filsystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Lser paketlistor"
@@ -2313,18 +2328,33 @@ msgstr "valfri"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Bygger beroendetrd"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandiderande versioner"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Beroendegenerering"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Lgger in tillgnglighetsinformation"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Misslyckades att ppna %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades att skriva filen %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2402,14 +2432,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexfiler av typ \"%s\" stds inte"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2417,7 +2447,7 @@ msgstr ""
"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p "
"hllna paket."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hllt trasiga paket."
@@ -2453,7 +2483,7 @@ msgstr "Metoddrivrutinen %s kunde inte hittas."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startade inte korrekt"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter."
@@ -2499,84 +2529,84 @@ msgstr "Frstod inte nltypen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Prioritet ej angiven (eller noll) fr nl"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cachen har ett inkompatibelt versionssystem"
# NewPackage etc. r funktionsnamn
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Fel uppstod vid hantering av %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Fel uppstod vid hantering av %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Fel uppstod vid hantering av %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Fel uppstod vid hantering av %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Fel uppstod vid hantering av %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Grattis, du verskred antalet paketnamn denna APT kan hantera."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Grattis, du verskred antalet versioner denna APT kan hantera."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Grattis, du verskred antalet beroenden denna APT kan hantera."
# NewPackage etc. r funktionsnamn
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Paketet %s %s hittades inte nr filberoenden hanterades"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunde inte ta status p kllkodspaketlistan %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Samlar filberoenden"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av kllcache"
@@ -2585,15 +2615,15 @@ msgstr "In-/utfel vid lagring av kllcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stmmer inte"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Det finns ingen publik nyckel tillgnglig fr fljande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2602,7 +2632,7 @@ msgstr ""
"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
"manuellt mste reparera detta paket (p grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2611,13 +2641,13 @@ msgstr ""
"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
"manuellt mste reparera detta paket."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Storleken stmmer inte"
diff --git a/po/tl.po b/po/tl.po
index 09f8de19c..b065b128c 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-03-16 15:53+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -152,7 +152,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
@@ -307,7 +307,7 @@ msgstr ""
" -c=? Basahin ang talaksang pagkaayos na ito\n"
" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Hindi makapagsulat sa %s"
@@ -649,79 +649,79 @@ msgstr "Problema sa pag-unlink ng %s"
msgid "Failed to rename %s to %s"
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ngunit ang %s ay nakaluklok"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ngunit hindi ito maaaring iluklok"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ngunit ito ay birtwal na pakete"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ngunit ito ay hindi nakaluklok"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ngunit ito ay hindi iluluklok"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dahil sa %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -729,150 +729,150 @@ msgstr ""
"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu iniluklok muli, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nai-downgrade, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Inaayos ang mga dependensiya..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " ay bigo."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Hindi maayos ang mga dependensiya"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Hindi mai-minimize ang upgrade set"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Tapos"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "May mga problema at -y ay ginamit na walang --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
"org"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Kulang kayo ng libreng puwang sa %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Oo, gawin ang sinasabi ko!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -883,28 +883,28 @@ msgstr ""
"Upang magpatuloy, ibigay ang pariralang '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abort."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -912,48 +912,48 @@ msgstr ""
"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
"subukang may --fix-missing?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Hindi maayos ang mga kulang na pakete."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Ina-abort ang pag-instol."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Nakaluklok]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Dapat kayong mamili ng isa na iluluklok."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -964,49 +964,49 @@ msgstr ""
"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
"sa ibang pinagmulan.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para sa '%s' ay hindi nahanap"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1014,26 +1014,46 @@ msgstr ""
"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
"mga luma na lamang."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Error na internal, may nasira ang problem resolver"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1041,7 +1061,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1052,7 +1072,7 @@ msgstr ""
"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
"kailangan na hindi pa nalikha o linipat mula sa Incoming."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1062,120 +1082,115 @@ msgstr ""
"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Bigo"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1184,7 +1199,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1193,32 +1208,32 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1558,9 +1573,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Binabasa ang Listahan ng mga Pakete"
@@ -2318,18 +2333,33 @@ msgstr "optional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Ginagawa ang puno ng mga dependensiya"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Bersyong Kandidato"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Pagbuo ng Dependensiya"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Pinagsasama ang magagamit na impormasyon"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Bigo ang pagbukas ng %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2407,7 +2437,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2415,7 +2445,7 @@ msgstr ""
"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
"para dito."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2423,7 +2453,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
"ito ng mga paketeng naka-hold."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
@@ -2460,7 +2490,7 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap."
msgid "Method %s did not start correctly"
msgstr "Hindi umandar ng tama ang paraang %s"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2508,84 +2538,84 @@ msgstr "Hindi naintindihan ang uri ng pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Hindi akma ang versioning system ng cache"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "May naganap na error habang prinoseso ang %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Kinukuha ang Talaksang Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO Error sa pag-imbak ng source cache"
@@ -2594,15 +2624,15 @@ msgstr "IO Error sa pag-imbak ng source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2611,7 +2641,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2620,7 +2650,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2628,7 +2658,7 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Di tugmang laki"
diff --git a/po/vi.po b/po/vi.po
index 1195cd78d..f97dc97e4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-05-19 22:19+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -152,7 +152,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s cho %s %s được biên dịch vào %s %s\n"
@@ -317,7 +317,7 @@ msgstr ""
" -c=? \t\tĐọc tập tin cấu hình này\n"
" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Không thể ghi vào %s"
@@ -670,79 +670,79 @@ msgstr "Gặp lỗi khi bỏ liên kết %s"
msgid "Failed to rename %s to %s"
msgstr "Việc đổi tên %s thành %s bị lỗi"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "C"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dich biểu thức chính quy - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có :"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "nhưng mà %s đã được cài đặt"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "nhưng mà %s sẽ được cài đặt"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "nhưng mà nó không có khả năng cài đặt"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "nhưng mà nó là gói ảo"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "nhưng mà nó chưa được cài đặt"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "nhưng mà nó sẽ không được cài đặt"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " hay"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Theo đây có những gói đã được giữ lại:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Theo đây có những gói sẽ được nâng cấp:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Theo đây có những gói sẽ được thay đổi:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (do %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -750,147 +750,147 @@ msgstr ""
"CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n"
"ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác."
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu đã nâng cấp, %lu mới được cài đặt, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu được cài đặt lại, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu được hạ cấp, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Đang sửa cách phụ thuộc..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " đã thất bại."
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Không thể sửa cách phụ thuộc"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Không thể cực tiểu hóa bộ nâng cấp"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Đã xong"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr ""
"Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy "
"chọn « -f »."
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "CẢNH BÁO : không thể xác thực những gói theo đây."
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Cảnh báo xác thực bị đè.\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Một số gói không thể được xác thực"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có « --force-yes »"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng."
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt."
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Không thể khóa thư mục tải về"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Cần phải lấy %sB/%sB kho.\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Cần phải lấy %sB kho.\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể quyết định chỗ rảnh trong %s"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s."
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể."
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Có, làm đi."
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -901,28 +901,28 @@ msgstr ""
"Để tiếp tục thì hãy gõ cụm từ « %s »\n"
"?]"
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Hủy bỏ."
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc gói %s bị lỗi %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Một số tập tin không tải về được"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Mới tải về xong và trong chế độ chỉ tải về"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -930,49 +930,49 @@ msgstr ""
"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy "
"cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi "
"phương tiện."
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Không thể sửa những gói còn thiếu."
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Đang hủy bỏ cài đặt."
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Ghi chú : đang chọn %s thay vì %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Gói %s là gói ảo được cung cấp do :\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Đã cài đặt]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Bạn nên chọn một cách dứt khoát gói cần cài."
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -983,49 +983,49 @@ msgstr ""
"đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n"
"đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Gói %s không có ứng cử cài đặt"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s là phiên bản mơi nhất.\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Không tìm thấy bản phát hành « %s » cho « %s »"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Lệnh cập nhật không chấp nhật đối số"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Không thể khóa thư mục danh sách"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1033,25 +1033,44 @@ msgstr ""
"Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được "
"dùng thay thế."
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1059,7 +1078,7 @@ msgstr ""
"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f "
"install » mà không có gói nào (hoặc ghi rõ cách quyết định)."
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1071,7 +1090,7 @@ msgstr ""
"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
"hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1081,127 +1100,123 @@ msgstr ""
"gói này đơn giản không có khả năng cài đặt, thì bạn hay\n"
"thông báo lỗi về gói này."
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Gói bị ngắt"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Gói được đệ nghị:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Gói được khuyên:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Đang tính nâng cấp... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Bị lỗi"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Xong"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Không tìm thấy gói nguồn cho %s"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Không đủ sức chứa còn rảnh trong %s"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy nguồn %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Việc lấy một số kho bị lỗi."
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1210,31 +1225,31 @@ msgstr ""
"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
"của gói %s có thể thỏa điều kiện phiên bản."
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1584,9 +1599,9 @@ msgstr ""
"thống tập tin"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Đang đọc các danh sách gói..."
@@ -2338,18 +2353,33 @@ msgstr "tùy chọn"
msgid "extra"
msgstr "thêm"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Đang xây dụng cây cách phụ thuộc..."
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Phiên bản ứng cử"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Tạo ra cách phụ thuộc"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Đang hợp nhất các thông tin sẵn sàng..."
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Việc mở %s bị lỗi"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Việc ghi tập tin %s bị lỗi"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2430,13 +2460,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2444,7 +2474,7 @@ msgstr ""
"Lỗi: « pkgProblemResolver::Resolve » (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo "
"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt."
@@ -2480,7 +2510,7 @@ msgstr "Không tìm thấy trình điều khiển phương pháp %s."
msgid "Method %s did not start correctly"
msgstr "Phương pháp %s đã không bắt đầu cho đúng."
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
@@ -2529,84 +2559,84 @@ msgstr "Không hiểu kiểu ghim %s"
msgid "No priority (or zero) specified for pin"
msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - phiên bản mới 1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - dùng gói 3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
"Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là "
"một tập tin)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Đang tập hợp các trường hợp « tập tin miễn là »"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
@@ -2615,15 +2645,15 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
msgid "rename failed, %s (%s -> %s)."
msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum (tổng kiểm) không khớp được"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2632,7 +2662,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2641,7 +2671,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2649,7 +2679,7 @@ msgstr ""
"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Kích cỡ không khớp được"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d59251bbc..c76a4abd9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2006-02-22 14:20+1300\n"
"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s ,编译于 %s %s\n"
@@ -300,7 +300,7 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -637,79 +637,79 @@ msgstr "在 unlink %s 时出错"
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "下列的软件包有不能满足的依赖关系:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装了"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "但却无法安装它"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "但是它只是个虚拟软件包"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "下列的软件包的版本将保持不变:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "下列的软件包将被升级:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -717,143 +717,143 @@ msgstr ""
"【警告】:下列的重要软件包将被卸载 \n"
"请勿尝试,除非您确实知道您在做什么!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "共升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "共重新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包,"
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件未被升级。\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列的软件包不能通过验证!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包么?[y/N] "
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 没有完成"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "怪了……文件大小不符,发信给 apt@packages.debian.org 吧"
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的空余空间"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 中没有足够的空余空间。"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了 Trivial Only,但这不是个日常(trivial)操作。"
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -864,28 +864,28 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -893,47 +893,47 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意,我选了 %s 而非 %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -944,74 +944,93 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃,\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "可是下列的软件包取代了它:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s,因为无法下载它。\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "下列的信息可能会对解决问题有所帮助:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部错误,problem resolver 坏事了"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,AllUpgrade 坏事了"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1019,7 +1038,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1030,7 +1049,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1039,126 +1058,122 @@ msgstr ""
"您仅要求对单一软件包进行操作,这极有可能是因为该软件包安装不上,同时,\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对解决问题有所帮助:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,problem resolver 坏事了"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps),必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1167,30 +1182,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新了"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "被支持模块:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1524,9 +1539,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info 和 temp 目录要求处于同一文件系统之下"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "正在读取软件包列表"
@@ -2269,18 +2284,33 @@ msgstr "可选"
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "生成依赖关系"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "正在合并现有信息"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "无法打开 %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入文件 %s"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2357,13 +2387,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2371,7 +2401,7 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
@@ -2409,7 +2439,7 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
@@ -2453,82 +2483,82 @@ msgstr "无法识别锁定的类型(pin type) %s"
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "处理 %s (UsePackage2)时出错"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "处理 %s (NewVersion1)时出错"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "处理 %s (NewVersion2)时出错"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "糟了,软件包的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "糟了,软件包版本的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "糟了,依赖关系的数量超出了本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
@@ -2537,15 +2567,15 @@ msgstr "无法写入来源缓存文件"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr "以下 key ID 没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2554,7 +2584,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2562,13 +2592,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "大小不符"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6af2b24fd..ffa84044c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 10:16+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-19 22:24+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
@@ -305,7 +305,7 @@ msgstr ""
" -c=? 讀取指定的設定檔案\n"
" -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "無法寫入『%s』。"
@@ -643,79 +643,79 @@ msgstr "在 unlink %s 時出錯"
msgid "Failed to rename %s to %s"
msgstr "無法將 %s 更名為 %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示法出錯 - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "下列的套件有無法滿足的依存關係:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "但是『%s』卻已經安裝好了。"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "但是『%s』卻將被安裝。"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "但是它卻無法安裝。"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "但是它只是虛擬的套件"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "但是『』卻還沒有安裝。"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "但是它卻不會被安裝。"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr "或"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "下列的【新】套件都將被安裝:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "下列的套件都將被【刪除】:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "下列的套件都將維持舊版本:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "下列的套件都將更新:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "下列的套件都將被「降級」:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "下列押後的套件都將被更改:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s(因為 %s)"
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -724,144 +724,144 @@ msgstr ""
"警告:下列的重要套件都將被刪除\n"
"除非您很清楚在做什麼,請勿輕易嘗試。"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "更新 %lu 個套件,新安裝 %lu 個套件,"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安裝 %lu 個套件,"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "降 %lu 個套件的版,"
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "刪除 %lu 個套件,另不更新 %lu 個套件。\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "更正依存關係中..."
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr "失敗"
-#: cmdline/apt-get.cc:663
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "無法更正依存關係。"
-#: cmdline/apt-get.cc:666
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "無法最小化升級的套件集合"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "用『apt-get -f install』指令或許能修正這些問題。"
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "無法滿足相依關係。試試看 -f 選項。"
-#: cmdline/apt-get.cc:697
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "警告:下列的套件驗證失敗!"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "不驗證這些套件就直接安裝?[y/N]"
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "部份套件無法驗證"
-#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
-#: cmdline/apt-get.cc:763
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:772
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "有套件需要被移除,但移除動作被禁止。"
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤:新增轉移(diversion)失敗"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載的目錄"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "無法讀取來源單。"
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n"
-#: cmdline/apt-get.cc:832
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下載 %sB 的檔案。\n"
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "解壓縮後將消耗 %sB 的空間。\n"
-#: cmdline/apt-get.cc:840
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解壓縮後將空出 %sB 的空間。\n"
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "『%s』內沒有足夠的空間。"
-#: cmdline/apt-get.cc:857
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "『%s』內沒有足夠的空間。"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。"
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "是的,請執行我所指定的"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -872,28 +872,28 @@ msgstr ""
"若要繼續的話,就輸入下面的句子“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "放棄執行。"
-#: cmdline/apt-get.cc:897
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "繼續執行嗎? 是按 [Y] 鍵,否按 [n] 鍵 "
-#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法下載『%s』檔案。%s\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "部份檔案無法下載"
-#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "下載完畢,目前是“僅下載”模式"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -901,47 +901,47 @@ msgstr ""
"有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n"
"選項?"
-#: cmdline/apt-get.cc:998
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)"
-#: cmdline/apt-get.cc:1003
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "無法更正遺失的套件。"
-#: cmdline/apt-get.cc:1004
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "放棄安裝。"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意,選擇了 %s 而非 %s\n"
-#: cmdline/apt-get.cc:1048
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n"
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "套件『%s』沒有安裝,所以無法刪除。\n"
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "虛擬套件『%s』的提供者是:\n"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr "【已安裝】"
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "請您明確地選擇一個來進行安裝。"
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -952,73 +952,92 @@ msgstr ""
"這可能意味著這個套件已經消失或捨棄,\n"
"或者只能在其他原碼中找到\n"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "但是下列的套件將取代它:"
-#: cmdline/apt-get.cc:1121
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "套件 %s 還沒有可供安裝的候選版本"
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安裝 %s,因為無法下載它。\n"
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "『%s』已經是最新版本了。\n"
-#: cmdline/apt-get.cc:1178
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”發布版本"
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "選定的版本為 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "無法鎖定列表目錄"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "底下的資訊有助於解決現在的情況:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "內部錯誤,AllUpgrade 造成錯誤"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成錯誤"
-#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "用『apt-get -f install』指令或許能修正這些問題。"
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1026,7 +1045,7 @@ msgstr ""
"無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
"定一個解決辦法)。"
-#: cmdline/apt-get.cc:1571
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1037,7 +1056,7 @@ msgstr ""
"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
"或從 Incoming 目錄移除。"
-#: cmdline/apt-get.cc:1579
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1047,127 +1066,123 @@ msgstr ""
"該套件無法安裝,您最好提交一個針對這個套件\n"
"的臭蟲報告。"
-#: cmdline/apt-get.cc:1584
-msgid "The following information may help to resolve the situation:"
-msgstr "底下的資訊有助於解決現在的情況:"
-
-#: cmdline/apt-get.cc:1587
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "損毀的套件"
-#: cmdline/apt-get.cc:1613
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "下列的【新】套件都將被安裝:"
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "建議(Suggested)的套件:"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "推薦(Recommended)的套件:"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "籌畫升級套件中..."
-#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1731
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,AllUpgrade 造成錯誤"
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "必須指定至少一個對應的套件才能下載源碼"
-#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 套件的源碼"
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2043
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "『%s』內沒有足夠的空間。"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "下載源碼 %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "無法下載某些檔案。"
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
-#: cmdline/apt-get.cc:2087
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "執行解開套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "執行建立套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2124
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的建構相依關係。"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 無建立相依關係訊息。\n"
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1176,30 +1191,30 @@ msgstr ""
"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
"相依關係"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 所要求的建構相依關係。"
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "無法處理建構相依關係"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "支援模組:"
-#: cmdline/apt-get.cc:2443
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1535,9 +1550,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "資料目錄與暫存目錄需在同一檔案系統"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "讀取套件清單中"
@@ -2281,18 +2296,33 @@ msgstr "次要"
msgid "extra"
msgstr "添加"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "了解套件依存關係中"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "候選版本"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "產生套件依存關係"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "結合現有資料中"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "寫入檔案 %s 失敗"
+
#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2368,19 +2398,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "本軟體不支持『%s』型的索引檔。"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "套件『%s』需要重新安裝,但找不到軟件檔案。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr "無法解決依存關係。可能原因是某些套件被押後。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法解決問題,因為某些損毀的套件被押後。"
@@ -2416,7 +2446,7 @@ msgstr "找不到安裝方式『%s』的驅動程式。"
msgid "Method %s did not start correctly"
msgstr "安裝方式『%s』沒有正確啟動。"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2463,82 +2493,82 @@ msgstr "本軟體不支持『%s』型的版本釘子。"
msgid "No priority (or zero) specified for pin"
msgstr "對於釘住的檔案無優先順序"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "套件暫存檔使用的是不相容的版本系統。"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "處理『%s』時發生錯誤 (NewPackage)。"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "處理『%s』時發生錯誤 (UsePackage1)。"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "處理『%s』時發生錯誤 (UsePackage2)。"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "處理『%s』時發生錯誤 (NewVersion1)。"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "處理『%s』時發生錯誤 (UsePackage3)。"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "處理『%s』時發生錯誤 (NewVersion2)。"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "套件數量超過本程式的能力。"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "套件版本數量超過本程式的能力。"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "依存關係數量超過本程式的能力。"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "處理『%s』時發生錯誤 (FindPkg)。"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "當計算相依性時找不到套件 %s %s "
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "無法讀取來源檔『%s』的目錄資料。"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "收集檔案供應"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "無法寫入來源暫存檔。"
@@ -2547,35 +2577,35 @@ msgstr "無法寫入來源暫存檔。"
msgid "rename failed, %s (%s -> %s)."
msgstr "檔名因『%s』更換失敗 (%s → %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:646
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "檔案大小不符合。"
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg
index ce412117d..bb5ed5033 100644
--- a/share/debian-archive.gpg
+++ b/share/debian-archive.gpg
Binary files differ