diff options
37 files changed, 1354 insertions, 989 deletions
diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index 4dbc4a2d7..a55416d6b 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -468,7 +468,7 @@ bool pkgFLCache::AddDiversion(PkgIterator const &Owner, if (FromN->Pointer != 0) Diver = FromN->Pointer; - /* Make sure from and to point to the same diversion, if they dont + /* Make sure from and to point to the same diversion, if they don't then we are trying to intermix diversions - very bad */ if (ToN->Pointer != 0 && ToN->Pointer != Diver) { diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 26c835444..7dcaa25a4 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -2935,6 +2935,10 @@ void pkgAcqChangelog::Init(std::string const &DestDir, std::string const &DestFi return; } DestFile = TemporaryDirectory = tmpname; + + std::string SandboxUser = _config->Find("APT::Sandbox::User"); + ChangeOwnerAndPermissionOfFile("Item::QueueURI", DestFile.c_str(), + SandboxUser.c_str(), "root", 0700); } else DestFile = DestDir; diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index b15340448..176772dde 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -335,9 +335,10 @@ bool pkgAcquire::Worker::RunMessages() for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O) Log->Pulse((*O)->GetOwner()); - std::string const filename = LookupTag(Message, "Filename", Itm->Owner->DestFile.c_str()); HashStringList ReceivedHashes; { + std::string const givenfilename = LookupTag(Message, "Filename"); + std::string const filename = givenfilename.empty() ? Itm->Owner->DestFile : givenfilename; // see if we got hashes to verify for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type) { @@ -358,11 +359,11 @@ bool pkgAcquire::Worker::RunMessages() ReceivedHashes = calc.GetHashStringList(); } } - } - // only local files can refer other filenames and counting them as fetched would be unfair - if (Log != NULL && filename != Itm->Owner->DestFile) - Log->Fetched(ReceivedHashes.FileSize(),atoi(LookupTag(Message,"Resume-Point","0").c_str())); + // only local files can refer other filenames and counting them as fetched would be unfair + if (Log != NULL && Itm->Owner->Complete == false && Itm->Owner->Local == false && givenfilename == filename) + Log->Fetched(ReceivedHashes.FileSize(),atoi(LookupTag(Message,"Resume-Point","0").c_str())); + } std::vector<Item*> const ItmOwners = Itm->Owners; OwnerQ->ItemDone(Itm); diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 0d2b21233..10025a6ef 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -4,7 +4,7 @@ Acquire - File Acquiration - This module contians the Acquire system. It is responsible for bringing + This module contains the Acquire system. It is responsible for bringing files into the local pathname space. It deals with URIs for files and URI handlers responsible for downloading or finding the URIs. diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 214864095..567e0ea9a 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -84,17 +84,14 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) if (WithLock == true) if (_system->Lock() == false) return false; - - if (_config->FindB("Debug::NoLocking",false) == true) - WithLock = false; - + if (_error->PendingError() == true) return false; BuildSourceList(Progress); // Read the caches - bool Res = pkgCacheGenerator::MakeStatusCache(*SrcList,Progress,&Map,!WithLock); + bool Res = pkgCacheGenerator::MakeStatusCache(*SrcList,Progress,&Map, true); if (Progress != NULL) Progress->Done(); if (Res == false) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 48547e564..887d2e691 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -298,7 +298,7 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> { return (S2->CompareOp & pkgCache::Dep::MultiArchImplicit) == pkgCache::Dep::MultiArchImplicit; } /* This covers additionally negative dependencies, which aren't arch-specific, - but change architecture nontheless as a Conflicts: foo does applies for all archs */ + but change architecture nonetheless as a Conflicts: foo does applies for all archs */ bool IsImplicit() const APT_PURE; bool IsSatisfied(VerIterator const &Ver) const APT_PURE; diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index af607a197..6a625184e 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -696,12 +696,12 @@ bool VersionContainerInterface::FromDependency(VersionContainerInterface * const pkgCache::VerIterator VersionContainerInterface::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { pkgCache::VerIterator Cand; - if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) { - if (unlikely(Cache.GetPolicy() == 0)) - return pkgCache::VerIterator(Cache); - Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); - } else { + if (Cache.IsDepCacheBuilt() == true) { Cand = Cache[Pkg].CandidateVerIter(Cache); + } else if (unlikely(Cache.GetPolicy() == nullptr)) { + return pkgCache::VerIterator(Cache); + } else { + Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); } if (Cand.end() == true) return helper.canNotGetVersion(CacheSetHelper::CANDIDATE, Cache, Pkg); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index b2e9eeb00..69e41a6f4 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -154,7 +154,7 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI, Options.insert(std::make_pair("ARCHITECTURE", *A)); Options.insert(std::make_pair("BASE_URI", baseURI)); Options.insert(std::make_pair("REPO_URI", URI)); - Options.insert(std::make_pair("TARGET_OF", "deb-src")); + Options.insert(std::make_pair("TARGET_OF", Type)); Options.insert(std::make_pair("CREATED_BY", *T)); std::string MetaKey = tplMetaKey; @@ -715,10 +715,25 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type /*{{{*/ List.push_back(Deb); } + std::vector<std::string> const alltargets = _config->FindVector(std::string("Acquire::IndexTargets::") + Name, "", true); + std::vector<std::string> mytargets = parsePlusMinusOptions("target", Options, alltargets); + if (mytargets.empty() == false) + for (auto const &target : alltargets) + { + std::map<std::string, std::string>::const_iterator const opt = Options.find(target); + if (opt == Options.end()) + continue; + auto const tarItr = std::find(mytargets.begin(), mytargets.end(), target); + bool const optValue = StringToBool(opt->second); + if (optValue == true && tarItr == mytargets.end()) + mytargets.push_back(target); + else if (optValue == false && tarItr != mytargets.end()) + mytargets.erase(std::remove(mytargets.begin(), mytargets.end(), target), mytargets.end()); + } Deb->AddComponent( IsSrc, Section, - parsePlusMinusOptions("target", Options, _config->FindVector(std::string("Acquire::IndexTargets::") + Name, "", true)), + mytargets, parsePlusMinusOptions("arch", Options, APT::Configuration::getArchitectures()), parsePlusMinusOptions("lang", Options, APT::Configuration::getLanguages(true)) ); diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 1e0640422..d1118e319 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -257,7 +257,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) clog << "** Pass C" << endl; LoopCount = 0; RevDepends = 0; - Remove = 0; // Otherwise the libreadline remove problem occures + Remove = 0; // Otherwise the libreadline remove problem occurs if (DoRun() == false) return false; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 06ec986ed..ceeb60a03 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -268,6 +268,33 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D, return true; } /*}}}*/ +// PM::CheckRBreaks - Look for reverse breaks /*{{{*/ +bool pkgPackageManager::CheckRBreaks(PkgIterator const &Pkg, DepIterator D, + const char * const Ver) +{ + for (;D.end() == false; ++D) + { + if (D->Type != pkgCache::Dep::DpkgBreaks) + continue; + + PkgIterator const DP = D.ParentPkg(); + if (Cache[DP].Delete() == false) + continue; + + // Ignore self conflicts, ignore conflicts from irrelevant versions + if (D.IsIgnorable(Pkg) || D.ParentVer() != DP.CurrentVer()) + continue; + + if (Cache.VS().CheckDep(Ver, D->CompareOp, D.TargetVer()) == false) + continue; + + // no earlyremove() here as user has already agreed to the permanent removal + if (SmartRemove(DP) == false) + return _error->Error("Internal Error, Could not early remove %s (%d)",DP.FullName().c_str(), 4); + } + return true; +} + /*}}}*/ // PM::ConfigureAll - Run the all out configuration /*{{{*/ // --------------------------------------------------------------------- /* This configures every package. It is assumed they are all unpacked and @@ -561,6 +588,14 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) if (Bad == true) return _error->Error(_("Could not configure '%s'. "),Pkg.FullName().c_str()); + // Check for reverse conflicts. + if (CheckRBreaks(Pkg,Pkg.RevDependsList(), instVer.VerStr()) == false) + return false; + + for (PrvIterator P = instVer.ProvidesList(); P.end() == false; ++P) + if (Pkg->Group != P.OwnerPkg()->Group) + CheckRBreaks(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion()); + if (PkgLoop) return true; static std::string const conf = _config->Find("PackageManager::Configure","all"); @@ -847,7 +882,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c clog << OutputInDepth(Depth) << "Because of conflict knot, removing " << ConflictPkg.FullName() << " temporarily" << endl; } if (EarlyRemove(ConflictPkg, &End) == false) - return _error->Error("Internal Error, Could not early remove %s (2)",ConflictPkg.FullName().c_str()); + return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 3); SomethingBad = true; continue; } @@ -889,7 +924,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c if (Debug) clog << OutputInDepth(Depth) << "So temprorary remove/deconfigure " << ConflictPkg.FullName() << " to satisfy " << End << endl; if (EarlyRemove(ConflictPkg, &End) == false) - return _error->Error("Internal Error, Could not early remove %s (2)",ConflictPkg.FullName().c_str()); + return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 2); } } else @@ -901,7 +936,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c clog << OutputInDepth(Depth) << "Removing " << ConflictPkg.FullName() << " now to avoid " << End << endl; // no earlyremove() here as user has already agreed to the permanent removal if (SmartRemove(Pkg) == false) - return _error->Error("Internal Error, Could not early remove %s (1)",ConflictPkg.FullName().c_str()); + return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 1); } } } diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 8de6ab3ad..e4d20fff4 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -76,6 +76,7 @@ class pkgPackageManager : protected pkgCache::Namespace void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0); virtual OrderResult OrderInstall(); bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver); + bool CheckRBreaks(PkgIterator const &Pkg,DepIterator Dep,const char * const Ver); bool CreateOrderList(); // Analysis helpers diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 6daebbc2a..802af172c 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -572,21 +572,31 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name if (APT::Configuration::checkArchitecture(Pkg.Arch()) == true) { pkgCache::PkgIterator const M = Grp.FindPreferredPkg(false); // native or any foreign pkg will do - if (M.end() == false) - for (pkgCache::PrvIterator Prv = M.ProvidesList(); Prv.end() == false; ++Prv) + if (M.end() == false) { + pkgCache::PrvIterator Prv; + Dynamic<pkgCache::PrvIterator> DynPrv(Prv); + for (Prv = M.ProvidesList(); Prv.end() == false; ++Prv) { if ((Prv->Flags & pkgCache::Flag::ArchSpecific) != 0) continue; pkgCache::VerIterator Ver = Prv.OwnerVer(); + Dynamic<pkgCache::VerIterator> DynVer(Ver); if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed || ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign && (Prv->Flags & pkgCache::Flag::MultiArchImplicit) == 0)) if (NewProvides(Ver, Pkg, Prv->ProvideVersion, Prv->Flags) == false) return false; } + } + + + pkgCache::PkgIterator P; + pkgCache::VerIterator Ver; + Dynamic<pkgCache::PkgIterator> DynP(P); + Dynamic<pkgCache::VerIterator> DynVer(Ver); - for (pkgCache::PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P)) - for (pkgCache::VerIterator Ver = P.VersionList(); Ver.end() == false; ++Ver) + for (P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P)) + for (Ver = P.VersionList(); Ver.end() == false; ++Ver) if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) if (NewProvides(Ver, Pkg, Ver->VerStr, pkgCache::Flag::MultiArchImplicit) == false) return false; @@ -594,8 +604,10 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name // and negative dependencies, don't forget negative dependencies { pkgCache::PkgIterator const M = Grp.FindPreferredPkg(false); - if (M.end() == false) - for (pkgCache::DepIterator Dep = M.RevDependsList(); Dep.end() == false; ++Dep) + if (M.end() == false) { + pkgCache::DepIterator Dep; + Dynamic<pkgCache::DepIterator> DynDep(Dep); + for (Dep = M.RevDependsList(); Dep.end() == false; ++Dep) { if ((Dep->CompareOp & (pkgCache::Dep::ArchSpecific | pkgCache::Dep::MultiArchImplicit)) != 0) continue; @@ -603,10 +615,12 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name Dep->Type != pkgCache::Dep::Replaces) continue; pkgCache::VerIterator Ver = Dep.ParentVer(); + Dynamic<pkgCache::VerIterator> DynVer(Ver); map_pointer_t * unused = NULL; if (NewDepends(Pkg, Ver, Dep->Version, Dep->CompareOp, Dep->Type, unused) == false) return false; } + } } // this package is the new last package @@ -1071,7 +1085,9 @@ bool pkgCacheGenerator::NewProvides(pkgCache::VerIterator &Ver, bool pkgCacheListParser::NewProvidesAllArch(pkgCache::VerIterator &Ver, string const &Package, string const &Version, uint8_t const Flags) { pkgCache &Cache = Owner->Cache; - pkgCache::GrpIterator const Grp = Cache.FindGrp(Package); + pkgCache::GrpIterator Grp = Cache.FindGrp(Package); + Dynamic<pkgCache::GrpIterator> DynGrp(Grp); + if (Grp.end() == true) return NewProvides(Ver, Package, Cache.NativeArch(), Version, Flags); else @@ -1085,8 +1101,11 @@ bool pkgCacheListParser::NewProvidesAllArch(pkgCache::VerIterator &Ver, string c bool const isImplicit = (Flags & pkgCache::Flag::MultiArchImplicit) == pkgCache::Flag::MultiArchImplicit; bool const isArchSpecific = (Flags & pkgCache::Flag::ArchSpecific) == pkgCache::Flag::ArchSpecific; - pkgCache::PkgIterator const OwnerPkg = Ver.ParentPkg(); - for (pkgCache::PkgIterator Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg)) + pkgCache::PkgIterator OwnerPkg = Ver.ParentPkg(); + Dynamic<pkgCache::PkgIterator> DynOwnerPkg(OwnerPkg); + pkgCache::PkgIterator Pkg; + Dynamic<pkgCache::PkgIterator> DynPkg(Pkg); + for (Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg)) { if (isImplicit && OwnerPkg == Pkg) continue; @@ -1497,8 +1516,9 @@ APT_DEPRECATED bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, MMap **OutMap, bool AllowMem) { return pkgCacheGenerator::MakeStatusCache(List, &Progress, OutMap, AllowMem); } bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress, - MMap **OutMap,bool AllowMem) + MMap **OutMap,bool) { + // FIXME: deprecate the ignored AllowMem parameter bool const Debug = _config->FindB("Debug::pkgCacheGen", false); std::vector<pkgIndexFile *> Files; @@ -1563,16 +1583,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress if (Debug == true) std::clog << "Do we have write-access to the cache files? " << (Writeable ? "YES" : "NO") << std::endl; - - if (Writeable == false && AllowMem == false) - { - if (CacheFile.empty() == false) - return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str()); - else if (SrcCacheFile.empty() == false) - return _error->Error(_("Unable to write to %s"),flNotFile(SrcCacheFile).c_str()); - else - return _error->Error("Unable to create caches as file usage is disabled, but memory not allowed either!"); - } } // At this point we know we need to construct something, so get storage ready diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 844fcbc7e..3647ca99d 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -675,6 +675,18 @@ bool DoInstall(CommandLine &CmdL) std::map<unsigned short, APT::VersionSet> verset; + for (const char **I = CmdL.FileList; *I != 0; I++) { + // Check for local pkgs like in the loop above. + if(!FileExists(*I) || flExtension(*I) != "deb") + continue; + + pkgCache::PkgIterator pkg = Cache->FindPkg(*I); + + // Set any version providing the .deb as the candidate. + for (auto Prv = pkg.ProvidesList(); Prv.end() == false; Prv++) + Cache.GetDepCache()->SetCandidateVersion(Prv.OwnerVer()); + } + if(!DoCacheManipulationFromCommandLine(CmdL, Cache, verset, 0)) return false; diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 2e98652a5..82cfba394 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -60,7 +60,7 @@ endif INCLUDES := ifndef HAVE_PO4A -# Strip from the source list any man pages we dont have compiled already +# Strip from the source list any man pages we don't have compiled already SOURCE := $(wildcard $(SOURCE)) endif diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index b1260f06a..b6150a423 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1403,10 +1403,7 @@ static bool DoChangelog(CommandLine &CmdL) if (printOnly == false) { - // Disable drop-privs if "_apt" can not write to the target dir - CheckDropPrivsMustBeDisabled(Fetcher); - if (_error->PendingError() == true) - return false; + // Note: CheckDropPrivsMustBeDisabled isn't needed here as the download happens in a dedicated tempdir bool Failed = false; if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true) diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 881f8a990..8c47b5359 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -240,7 +240,7 @@ import_keyring_into_keyring() { shift 2 rm -f "${GPGHOMEDIR}/gpgoutput.log" # the idea is simple: We take keys from one keyring and copy it to another - # we do this with so many checks inbetween to ensure that WE control the + # we do this with so many checks in between to ensure that WE control the # creation, so we know that the (potentially) created $TO keyring is a # simple keyring rather than a keybox as gpg2 would create it which in turn # can't be read by gpgv. diff --git a/debian/changelog b/debian/changelog index 046131304..87fcaec8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,14 +25,14 @@ apt (1.1~exp9) experimental; urgency=medium * Cleanup includes (Thanks iwyu) [ David Kalnischkies ] - * reenable patchsize limit option for pdiffs + * re-enable patchsize limit option for pdiffs * better non-virtual metaIndex.LocalFileName() implementation * mark internal interfaces as hidden * restore ABI of pkgTagSection * streamline display of --help in all tools * allow uninstalled packages to be put on hold * use 'best' hash for source authentication (LP: #1098738) - * reenable support for -s (and co) in apt-get source (Closes: 742578) + * re-enable support for -s (and co) in apt-get source (Closes: 742578) * create directory for extended_states if needed * create our cache and lib directory always with mode 755 * fix file ownership tests to work on kfreebsd @@ -70,7 +70,7 @@ apt (1.1~exp9) experimental; urgency=medium * add more parsing error checking for rred * support hashes for compressed pdiff files * do not request files if we expect an IMS hit - * configureable acquire targets to download additional files + * configurable acquire targets to download additional files * show URI.Path in all acquire item descriptions * implement 'apt-get files' to access index targets * store Release files data in the Cache @@ -233,7 +233,7 @@ apt (1.1~exp9) experimental; urgency=medium * Make auto-remove and auto-clean aliases for the versions without - (Closes: #274159) * apt: Add autoremove and auto-remove commands - * changelog: Replace reenable by re-enable everywhere. + * changelog: Replace spelling reenable by re-enable everywhere. Thanks to Lintian * debian/control: Replace debian by Debian. Thanks to Lintian @@ -350,7 +350,7 @@ apt (1.1~exp5) experimental; urgency=medium * Document Acquire{MaxReleaseFileSize,AllowInsecureRepositories, AllowDowngradeToInsecureRepositories} and --no-allow-insecure-repositories - * Fix backward compatiblity of the new pkgAcquireMethod::DropPrivsOrDie() + * Fix backward compatibility of the new pkgAcquireMethod::DropPrivsOrDie() * Change default of Acquire::AllowInsecureRepositories to "true" so that this change is less disruptive, this will be switched to "false" again after jessie @@ -506,7 +506,7 @@ apt (1.1~exp1) experimental; urgency=low * add Debug::Acquire::Progress debug option * [ABI-Break] lp:~mvo/apt/source-hashes: - use sha{512,256,1} for deb-src when available LP: #1098738 - * [ABI-Break] stop exporting the accidently exported parsenetrc() symbol + * [ABI-Break] stop exporting the accidentally exported parsenetrc() symbol * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines * [ABI BREAK] apt-pkg/pkgcache.h: - adjust pkgCache::State::VerPriority enum, to match reality @@ -941,7 +941,7 @@ apt (1.0.4) unstable; urgency=low * Never parse Version/Architecture tags in a Translation-$lang file * Show upgradable packages after apt update (Closes: 748389) * Fix various errors found by clang -fsanitize=address - * Fix various errors foudn by clang scan-build + * Fix various errors found by clang scan-build * Show unauthenticated warning for source packages as well (Closes: #749795) * Add compat mode for old (32bit FileSize) CacheDB (LP: #1274466) * cmdline/apt-helper.cc: use less generic description/short-description @@ -1766,7 +1766,7 @@ apt (0.9.9) unstable; urgency=low * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting (Closes: 645713) * prefer Essentials over Removals in ordering score - * fix priority sorting by prefering higher in MarkInstall + * fix priority sorting by preferring higher in MarkInstall * try all providers in order if uninstallable in MarkInstall * do unpacks before configures in SmartConfigure (Closes: #707578) * fix support for multiple patterns in apt-cache search (Closes: #691453) @@ -1851,17 +1851,17 @@ apt (0.9.8) unstable; urgency=low - handle language tags for descriptions are unique strings to be shared - factor version string creation out of NewDepends, so we can easily reuse version strings e.g. for implicit multi-arch dependencies - - equal comparisions are used mostly in same-source relations, + - equal comparisons are used mostly in same-source relations, so use this to try to reuse some version strings - sort group and package names in the hashtable on insert - share version strings between same versions (of different architectures) - to save some space and allow quick comparisions later on + to save some space and allow quick comparisons later on * apt-pkg/pkgcache.cc: - assume sorted hashtable entries for groups/packages * apt-pkg/cacheiterators.h: - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck * apt-pkg/deb/debversion.cc: - - add a string-equal shortcut for equal version comparisions + - add a string-equal shortcut for equal version comparisons [ Marc Deslauriers ] * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) @@ -2301,7 +2301,7 @@ apt (0.9.7) unstable; urgency=low - add PackageContainerInterface::FromGroup to support architecture specifications with wildcards on the commandline * apt-pkg/pkgcache.cc: - - do a string comparision for architecture checking in IsMultiArchImplicit + - do a string comparison for architecture checking in IsMultiArchImplicit as 'unique' strings in the pkgcache aren't unique (Closes: #677454) * buildlib/configure.mak: - print a message detailing how to get config.guess and config.sub @@ -2400,7 +2400,7 @@ apt (0.9.5.1) unstable; urgency=low - dup() given compressed fd in OpenDescriptor if AutoClose is disabled as otherwise gzclose() and co will close it * doc/*.xml: - - mark even more stuff as untranslateable and improve the + - mark even more stuff as untranslatable and improve the markup here and there (no real text change) - use docbook DTD 4.5 instead of 4.2 to have valid docs @@ -2494,7 +2494,7 @@ apt (0.9.4) unstable; urgency=low [ Raphael Geissert ] * apt-pkg/acquire*.cc: - handle redirections in the worker with the right method instead of - in the method the redirection occured in (Closes: #668111) + in the method the redirection occurred in (Closes: #668111) * methods/http.cc: - forbid redirects to change protocol * methods/mirror.cc: @@ -3791,7 +3791,7 @@ apt (0.8.13) unstable; urgency=low * mirror method: - when downloading data, show the mirror being used - randomize mirror list after download in a host specific way - to ensure that the load is evenly spreaded accross the mirrors + to ensure that the load is evenly spread across the mirrors - fix some missing "Fail-Ignore" -- Michael Vogt <mvo@debian.org> Wed, 16 Mar 2011 08:04:42 +0100 @@ -5339,7 +5339,7 @@ apt (0.7.24) unstable; urgency=low - when tcgetattr() returns non-zero skip all pty magic (thanks to Simon Richter, closes: #509866) * apt-inst/contrib/arfile.cc: - - show propper error message for Invalid archive members + - show proper error message for Invalid archive members [ David Kalnischkies ] * doc/Doxyfile.in: @@ -5613,7 +5613,7 @@ apt (0.7.22) unstable; urgency=low * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to reduce the number of times we call progress bar updating and debugging configuration settings. - * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unecessary + * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unnecessary temporary allocations. -- Michael Vogt <mvo@debian.org> Wed, 29 Jul 2009 19:16:22 +0200 @@ -5809,7 +5809,7 @@ apt (0.7.17) unstable; urgency=low - Bumped 'Standards-Version' to 3.8.0, no changes needed. - Actualized 'Uploaders' field. * doc/: - - Substituded 'apt-archive' with 'apt-ftparchive' in docs. + - Substituted 'apt-archive' with 'apt-ftparchive' in docs. Patch based on work of Andre Felipe Machado. (Closes: #350865) - Mentioned '/<release>' and '=<version>' for 'apt-get install' and '=<version>' for 'apt-get source' in apt-get manpage. Patch based on @@ -6267,7 +6267,7 @@ apt (0.7.9) unstable; urgency=low - Swedish updated. [ Otavio Salvador ] - * Fix configure script to check for CURL library and headers presense. + * Fix configure script to check for CURL library and headers presence. * Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx> to add backward support for arches that lacks pselect support, closes: #448406. @@ -6579,7 +6579,7 @@ apt (0.7.0) experimental; urgency=low - install new recommends on "upgrade" if --install-recommends is given - new "--fix-policy" option to install all packages with unmet - important dependencies (usefull with --install-recommends to + important dependencies (useful with --install-recommends to see what not-installed recommends are on the system) - fix of recommended packages display (only show CandidateVersion fix or-group handling) @@ -6788,7 +6788,7 @@ apt (0.6.44.2) unstable; urgency=low * apt-pkg/depcache.cc: - added Debug::pkgDepCache::AutoInstall (thanks to infinity) * apt-pkg/acquire-item.cc: - - fix missing chmod() in the new aquire code + - fix missing chmod() in the new acquire code (thanks to Bastian Blank, Closes: #367425) * merged from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: @@ -6843,13 +6843,13 @@ apt (0.6.44) unstable; urgency=low * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: * bg.po: Added, complete to 512t. Closes: #360262 * doc/apt-ftparchive.1.xml: - - fix documentation for "SrcPackages" -> "Sources" + - fix documentation for "SrcPackages" -> "Sources" (thanks to Bart Martens for the patch, closes: #307756) * debian/libapt-pkg-doc.doc-base.cache: - remove broken charackter from description (closes: #361129) - * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: + * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: - i18n fixes (closes: #349298) - * debian/postinst: dont fail on not available + * debian/postinst: don't fail on not available /usr/share/doc/apt/examples/sources.list (closes: #361130) * methods/ftp.cc: - unlink empty file in partial if the download failed because @@ -6858,7 +6858,7 @@ apt (0.6.44) unstable; urgency=low - treats a version string with explicit zero epoch equal than the same without epoch (Policy 5.6.12, closes: #363358) Thanks to Lionel Elie Mamane for the patch - + -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200 apt (0.6.43.3) unstable; urgency=low @@ -6884,12 +6884,12 @@ apt (0.6.43.3) unstable; urgency=low - 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 + - 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 + * 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 + * cmdline/apt-get.cc: only run the list-cleaner if a update was + successful -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 @@ -6996,7 +6996,7 @@ apt (0.6.42.1) unstable; urgency=low - revert patch from last version, it causes trouble on alpha and ia64 (closes: #335102, #335103) * cmdline/apt-get.cc: - - be extra carefull in FindSrc (closes: #335213) + - be extra careful in FindSrc (closes: #335213) -- Michael Vogt <mvo@debian.org> Sat, 22 Oct 2005 23:44:35 +0200 @@ -7196,7 +7196,7 @@ apt (0.6.33) hoary; urgency=low - patch-3: (doc) new config variables added configure-index - patch-4: pkgAcquire::Run() pulse intervall can be configured - patch-5: fix for apt-get update removing Release.gpg files (#6865) - - patch-6: change the path scoring in apt-cdrom, prefer pathes without + - patch-6: change the path scoring in apt-cdrom, prefer paths without symlinks -- Matt Zimmerman <mdz@ubuntu.com> Sat, 26 Feb 2005 15:21:17 -0800 @@ -7218,7 +7218,7 @@ apt (0.6.31) hoary; urgency=low - Fix build/install of Polish offline documentation, based on patch from Christian Perrier (Closes: #270404) * Michael Vogt - - apt-cdrom.cc seperated into frontend (cmdline/apt-cdrom.cc and library + - apt-cdrom.cc separated into frontend (cmdline/apt-cdrom.cc and library apt-pkg/cdrom.{cc,h}) (Ubuntu #5668) -- Matt Zimmerman <mdz@ubuntu.com> Fri, 4 Feb 2005 10:23:01 -0800 @@ -7253,7 +7253,7 @@ apt (0.6.27ubuntu4) hoary; urgency=low (see ubuntu #4769 for the rational) * added apt-key update method (uses ubuntu-keyring) * documented the "--allow-unauthenticated" switch - * added DEB_BUILD_PROG_OPTS to debian/rules (additonal options can be + * added DEB_BUILD_PROG_OPTS to debian/rules (additional options can be passed to DEB_BUILD_PROG like "-S") -- Michael Vogt <mvo@debian.org> Thu, 23 Dec 2004 11:12:51 +0100 @@ -7267,7 +7267,7 @@ apt (0.6.27ubuntu3) hoary; urgency=low apt (0.6.27ubuntu2) hoary; urgency=low - * fixed a bug in the rule file that happend during the big 0.5->0.6 merge + * fixed a bug in the rule file that happened during the big 0.5->0.6 merge -- Michael Vogt <mvo@debian.org> Tue, 14 Dec 2004 12:14:25 +0100 @@ -8270,7 +8270,7 @@ apt (0.5.5) unstable; urgency=low * Update es.po. Closes: #183111. * Add pt_BR translation of apt_preferences(5). Also, build fr manpages. Closes: #183904. - * Add a vcg command to apt-cache, similiar to dotty. Closes: #150512. + * Add a vcg command to apt-cache, similar to dotty. Closes: #150512. * Add option to apt-get to show versions of packages being upgraded/installed. * Be quiet in apt.post{inst,rm}. Closes: #70685. @@ -8318,7 +8318,7 @@ apt (0.5.4) unstable; urgency=low * Whatever. Closes: #89762 * libstdc++ and HURD. Closes: #92025 * More apt-utils verbage. Closes: #86954 - * Fliped comparision operator. Closes: #94618 + * Fliped comparison operator. Closes: #94618 * Used the right copyright file. Closes: #65691 * Randolph's G++3 patches. * Fixed no_proxy tokanizing. Closes: #100046 @@ -8487,7 +8487,7 @@ apt (0.3.19) frozen unstable; urgency=low * Fixed hardcoded path. Closes: #59743 * Fixed Jay's relative path bug * Allowed source only CDs. Closes: #58952 - * Space check is supressed if --print-uris is given. Closes: #58965 + * Space check is suppressed if --print-uris is given. Closes: #58965 * Clarified the documenation examples for non-us. Closes: #58646 * Typo in the package description. Closes: #60230 * Man Page typo. Closes: #60347 @@ -8695,7 +8695,7 @@ apt (0.3.6) unstable; urgency=low * apt-get source support. Closes: #23934, #27190 * Renames .debs that fail MD5 checking, provides automatic corruption recovery. Closes: #35931 - * Fixed autoconf verison. Closes: #37305 + * Fixed autoconf version. Closes: #37305 * Random Segfaulting. Closes: #37312, #37530 * Fixed apt-cache man page. Closes: #36904 * Added a newline to apt-cache showpkg. Closes: #36903 @@ -8756,10 +8756,10 @@ apt (0.1.9) frozen unstable; urgency=low * apt-get dist-upgrade problems fixed * tiny patch for http method to fix an endless loop * nice fix from /usr/doc/lintian/ to remove rpath nastiness from - libtool and add proper shared lib dependancies + libtool and add proper shared lib dependencies * now dh_shlibdeps is called with LD_LIBRARY_PATH=debian/tmp/usr/lib in case an old libpkg is installed while building APT to prevent - spurious dependancies + spurious dependencies -- Ben Gertzfield <che@debian.org> Thu, 5 Nov 1998 17:43:25 -0800 @@ -8789,7 +8789,7 @@ apt (0.1.5) unstable; urgency=low apt (0.1.3) unstable; urgency=low * New upstreamish version. - * ftp method rewritten in C. Removes dependancies on all perl/perl + * ftp method rewritten in C. Removes dependencies on all perl/perl related modules. This fixes many of the ftp method bugs. -- Ben Gertzfield <che@debian.org> Thu, 16 Jul 1998 22:19:00 -0700 @@ -8880,7 +8880,7 @@ apt (0.0.12) experimental; urgency=low apt (0.0.11) experimental; urgency=low - * Change dependancies to pre-depends since breaking your packaging tools + * Change dependencies to pre-depends since breaking your packaging tools in the middle of an installation isn't very good. * Bug fixes to ftp method and general apt-get code @@ -8953,7 +8953,7 @@ apt (0.0.4) experimental; urgency=low * New usage guide. * Various documentation updates and cleanup. - * Added '-f' option to apt-get attempt to fix broken dependancies. + * Added '-f' option to apt-get attempt to fix broken dependencies. -- Scott K. Ellis <scott@debian.org> Sat, 4 Apr 1998 14:36:00 -0500 @@ -8963,7 +8963,7 @@ apt (0.0.3) experimental; urgency=low * Updates to how apt-get handles bad states in installed packages. * Updated rules to make sure build works from a freshly checked out source archive. Building from CVS needs libtool/automake/autoconf, builds from - the distributed source package should have no such dependancy. + the distributed source package should have no such dependency. -- Scott K. Ellis <scott@debian.org> Fri, 3 Apr 1998 11:49:47 -0500 diff --git a/debian/control b/debian/control index 82f455287..b2ab8646d 100644 --- a/debian/control +++ b/debian/control @@ -44,6 +44,7 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: apt (<< 1.1~exp4), libapt-inst1.5 (<< 0.9.9~) +Recommends: apt (>= ${binary:Version}) Section: libs Description: package management runtime library This library provides the common functionality for searching and diff --git a/debian/rules b/debian/rules index f031cfddb..60966b09f 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ export NOISY=1 export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +export PARALLEL = $(or $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))),1) # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) @@ -17,6 +18,9 @@ else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif +# Set the number of procs to be run in parallel from the options. +confflags += --with-procs=$(PARALLEL) + # See below -include build/environment.mak diff --git a/doc/offline.dbk b/doc/offline.dbk index cbfc4f690..2ad1d98d8 100644 --- a/doc/offline.dbk +++ b/doc/offline.dbk @@ -68,7 +68,7 @@ host</emphasis> the one with bad or no connection. <para> This is achieved by creatively manipulating the APT configuration file. The essential premise to tell APT to look on a disc for it's archive files. Note -that the disc should be formated with a filesystem that can handle long file +that the disc should be formatted with a filesystem that can handle long file names such as ext2, fat32 or vfat. </para> </section> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e27eddb0e..4eb3c0ba0 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -222,6 +222,9 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [. which download targets apt will try to acquire from this source. If not specified, the default set is defined by the <option>Acquire::IndexTargets</option> configuration scope. + Aditionally, specific targets can be enabled or disabled by + using the identifier as field name instead of using this + multivalue option. </para></listitem> </itemizedlist> @@ -271,7 +274,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [. repository is considered valid. -Max can be especially useful if the repository provides no Valid-Until field on its Release file to set your own value, while -Min can be used to increase - the valid time on seldomly updated (local) mirrors of a more + the valid time on seldom updated (local) mirrors of a more frequently updated but less accessible archive (which is in the sources.list as well) instead of disabling the check entirely. Default to the value of the configuration options diff --git a/methods/ftp.cc b/methods/ftp.cc index 1a9a1c4eb..d84a194ca 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1072,7 +1072,7 @@ bool FtpMethod::Fetch(FetchItem *Itm) URIStart(Res); FailFile = Itm->DestFile; - FailFile.c_str(); // Make sure we dont do a malloc in the signal handler + FailFile.c_str(); // Make sure we don't do a malloc in the signal handler FailFd = Fd.Fd(); bool Missing; diff --git a/methods/rsh.cc b/methods/rsh.cc index 7ef2f7c7a..44aa7084d 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -504,7 +504,7 @@ bool RSHMethod::Fetch(FetchItem *Itm) URIStart(Res); FailFile = Itm->DestFile; - FailFile.c_str(); // Make sure we dont do a malloc in the signal handler + FailFile.c_str(); // Make sure we don't do a malloc in the signal handler FailFd = Fd.Fd(); bool Missing; diff --git a/methods/server.cc b/methods/server.cc index f61a6fedb..1c42c69c2 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -358,7 +358,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res) } } - /* We have a reply we dont handle. This should indicate a perm server + /* We have a reply we don't handle. This should indicate a perm server failure */ if (Server->Result < 200 || Server->Result >= 300) { @@ -382,7 +382,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res) return ERROR_NOT_FROM_SERVER; FailFile = Queue->DestFile; - FailFile.c_str(); // Make sure we dont do a malloc in the signal handler + FailFile.c_str(); // Make sure we don't do a malloc in the signal handler FailFd = File->Fd(); FailTime = Server->Date; @@ -1,26 +1,28 @@ # Advanced Package Tool - APT message translation catalog # Swedish messages -# Copyright (C) 2002-2010 Free Software Foundation, Inc. +# Copyright © 2002-2015 Free Software Foundation, Inc. # This file is distributed under the same license as the apt package. # Peter Karlsson <peterk@debian.org>, 2002-2008. # Daniel Nylander <po@danielnylander.se>, 2005-2010. +# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015. # msgid "" msgstr "" -"Project-Id-Version: apt 1.0.5\n" +"Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2015-08-21 06:13-0400\n" -"PO-Revision-Date: 2010-08-24 21:18+0100\n" -"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" +"POT-Creation-Date: 2015-08-20 11:22+0200\n" +"PO-Revision-Date: 2015-08-19 21:33+0200\n" +"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.3\n" #: cmdline/apt-cache.cc:149 -#, c-format +#, fuzzy, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" "Paketet %s med version %s har ett beroende som inte kan tillfredsställas:\n" @@ -113,7 +115,7 @@ msgstr "Du måste ange minst ett sökmönster" #: cmdline/apt-cache.cc:1520 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." -msgstr "" +msgstr "Detta kommando är föråldrat. Använd ”apt-mark showauto” istället." #: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762 #, c-format @@ -122,7 +124,7 @@ msgstr "Kunde inte hitta paketet %s" #: cmdline/apt-cache.cc:1649 msgid "Package files:" -msgstr "\"Package\"-filer:" +msgstr "”Package”-filer:" #: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1766 msgid "Cache is out of sync, can't x-ref a package file" @@ -165,7 +167,6 @@ msgid " Version table:" msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1871 -#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -202,25 +203,22 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Användning: apt-cache [flaggor] kommando\n" -" apt-cache [flaggor] add fil1 [fil2 ...]\n" -" apt-cache [flaggor] showpkg paket1 [paket2 ...]\n" -" apt-cache [flaggor] showsrc paket1 [paket2 ...]\n" +" apt-cache [flaggor] showpkg paket1 [paket2 …]\n" +" apt-cache [flaggor] showsrc paket1 [paket2 …]\n" "\n" -"apt-cache är ett lågnivåverktyg för att hantera APTs binära cachefiler\n" -"samt hämta information från dem\n" +"apt-cache är ett lågnivåverktyg för att hämta information\n" +"från APTs binära cachefiler\n" "\n" "Kommandon:\n" -" add - Lägg till en paketfil till källcachen\n" " gencaches - Bygg både paket- och källcache\n" " showpkg - Visa viss allmän information om ett enskilt paket\n" " showsrc - Visa källkodsposter\n" " stats - Visa viss grundläggande statistik\n" " dump - Visa hela filen i koncis form\n" -" dumpavail - Skriv en \"available\"-fil på standard ut\n" +" dumpavail - Skriv en ”available”-fil på standard ut\n" " unmet - Visa otillfredsställbara beroenden\n" " search - Sök i paketlistan med ett reguljärt uttryck\n" " show - Visa en läsbar post för paketet\n" -" showauto - Visa en lista över automatiskt installerade paket\n" " depends - Visa rå information om beroenden för ett paket\n" " rdepends - Visa information om omvända beroenden för ett paket\n" " pkgnames - Lista namnen på alla paket i systemet\n" @@ -233,24 +231,23 @@ msgstr "" " -p=? Paketcachen.\n" " -s=? Källcachen.\n" " -q Inaktivera förloppsindikatorn.\n" -" -i Visa endast viktiga beroenden för \"unmet\"-kommandot.\n" +" -i Visa endast viktiga beroenden för ”unmet”-kommandot.\n" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" #: cmdline/apt-cdrom.cc:77 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\"" +msgstr "Ange ett namn för denna skiva, exempelvis ”Debian 5.0.3 Disk 1”" #: cmdline/apt-cdrom.cc:92 -#, fuzzy msgid "Please insert a Disc in the drive and press [Enter]" -msgstr "Mata in en skiva i enheten och tryck på Enter" +msgstr "Mata in en skiva i enheten och tryck på [Retur]" #: cmdline/apt-cdrom.cc:140 #, c-format msgid "Failed to mount '%s' to '%s'" -msgstr "Misslyckades med att montera \"%s\" till \"%s\"" +msgstr "Misslyckades med att montera ”%s” till ”%s”" #: cmdline/apt-cdrom.cc:179 msgid "" @@ -259,6 +256,12 @@ msgid "" "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " "mount point." msgstr "" +"Ingen cd-rom kunde upptäckas automatiskt eller hittas på standardplatsen för " +"montering.\n" +"Du kan pröva flaggan --cdrom för att ställa in monteringsplatsen för cd-" +"rom.\n" +"Se ”man apt-cdrom” för vidare information om automatisk upptäckt samt " +"monteringsplats för cd-rom." #: cmdline/apt-cdrom.cc:183 msgid "Repeat this process for the rest of the CDs in your set." @@ -297,29 +300,29 @@ msgstr "" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" #: cmdline/apt-get.cc:211 -#, fuzzy, c-format +#, c-format msgid "Can not find a package for architecture '%s'" -msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" +msgstr "Kan inte hitta något paket för arkitekturen ”%s”" #: cmdline/apt-get.cc:287 -#, fuzzy, c-format +#, c-format msgid "Can not find a package '%s' with version '%s'" -msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" +msgstr "Kan inte hitta något paket ”%s” med versionen ”%s”" #: cmdline/apt-get.cc:290 -#, fuzzy, c-format +#, c-format msgid "Can not find a package '%s' with release '%s'" -msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" +msgstr "Kunde inte hitta något paket ”%s” med utgåvan ”%s”" #: cmdline/apt-get.cc:327 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n" +msgstr "Väljer ”%s” som källkodspaket istället för ”%s”\n" #: cmdline/apt-get.cc:386 -#, fuzzy, c-format +#, c-format msgid "Can not find version '%s' of package '%s'" -msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\"" +msgstr "Kan inte hitta versionen ”%s” av paketet ”%s”" #: cmdline/apt-get.cc:417 #, c-format @@ -342,6 +345,8 @@ msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" +"Detta kommando är föråldrat. Använd ”apt-mark auto” och ”apt-mark manual” " +"istället." #: cmdline/apt-get.cc:501 cmdline/apt-get.cc:509 msgid "Internal error, problem resolver broke stuff" @@ -366,25 +371,26 @@ msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -"OBSERVERA: paketering av \"%s\" hanteras i versionshanteringssystemet \"%s\" " +"OBSERVERA: paketering av ”%s” hanteras i versionshanteringssystemet ”%s” " "på:\n" "%s\n" #: cmdline/apt-get.cc:750 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Använd:\n" -"bzr get %s\n" -"för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" +"bzr branch %s\n" +"för att hämta de senaste (möjligen inte utgivna) uppdateringarna av " +"paketet.\n" #: cmdline/apt-get.cc:798 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Hoppar över redan hämtade filen \"%s\"\n" +msgstr "Hoppar över redan hämtade filen ”%s”\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -411,7 +417,7 @@ msgstr "Misslyckades med att hämta vissa arkiv." #: cmdline/apt-get.cc:869 apt-private/private-install.cc:300 msgid "Download complete and in download only mode" -msgstr "Hämtningen färdig i \"endast-hämta\"-läge" +msgstr "Hämtningen färdig i ”endast-hämta”-läge" #: cmdline/apt-get.cc:894 #, c-format @@ -421,21 +427,21 @@ msgstr "Packar inte upp redan uppackad källkod i %s\n" #: cmdline/apt-get.cc:907 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Uppackningskommandot \"%s\" misslyckades.\n" +msgstr "Uppackningskommandot ”%s” misslyckades.\n" #: cmdline/apt-get.cc:908 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" +msgstr "Försäkra dig om att paketet ”dpkg-dev” är installerat.\n" #: cmdline/apt-get.cc:936 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Byggkommandot \"%s\" misslyckades.\n" +msgstr "Byggkommandot ”%s” misslyckades.\n" #: cmdline/apt-get.cc:955 msgid "Child process failed" -msgstr "Barnprocessen misslyckades" +msgstr "Underprocess misslyckades" #: cmdline/apt-get.cc:976 msgid "Must specify at least one package to check builddeps for" @@ -447,16 +453,18 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" +"Ingen arkitekturinformation tillgänglig för %s. Se apt.conf(5) APT::" +"Architectures för inställning" #: cmdline/apt-get.cc:1012 #, c-format msgid "Note, using directory '%s' to get the build dependencies\n" -msgstr "" +msgstr "Observera, använder katalogen ”%s” för att få byggberoendena\n" #: cmdline/apt-get.cc:1022 -#, fuzzy, c-format +#, c-format msgid "Note, using file '%s' to get the build dependencies\n" -msgstr "Misslyckades med att behandla byggberoenden" +msgstr "Observera, använder filen ”%s” för att få byggberoendena\n" #: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050 #, c-format @@ -469,13 +477,13 @@ msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" #: cmdline/apt-get.cc:1240 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " -"hittas" +"%s-beroendet på %s kan inte tillfredsställas eftersom %s inte är tillåtet på " +"”%s”-paket" #: cmdline/apt-get.cc:1258 #, c-format @@ -494,22 +502,22 @@ msgstr "" "paketet %s är för nytt" #: cmdline/apt-get.cc:1320 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " -"versioner av paketet %s tillfredsställer versionskraven" +"%s-beroendet på %s kan inte tillfredsställas eftersom kandidatversionen av " +"paketet %s inte tillfredsställer versionskraven" #: cmdline/apt-get.cc:1326 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " -"hittas" +"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte har " +"någon kandidatversion" #: cmdline/apt-get.cc:1349 #, c-format @@ -530,7 +538,6 @@ msgid "Supported modules:" msgstr "Moduler som stöds:" #: cmdline/apt-get.cc:1595 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -576,11 +583,11 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "Användning: apt-get [flaggor] kommando\n" -" apt-get [flaggor] install|remove paket1 [paket2 ...]\n" -" apt-get [flaggor] source paket1 [paket2 ...]\n" +" apt-get [flaggor] install|remove paket1 [paket2 …]\n" +" apt-get [flaggor] source paket1 [paket2 …]\n" "\n" "apt-get är ett enkelt kommandoradsgränssnitt för att hämta och installera\n" -"paket. De mest använda kommandona är \"update\" och \"install\".\n" +"paket. De mest använda kommandona är ”update” och ”install”.\n" "\n" "Kommandon:\n" " update - Hämta nya paketlistor\n" @@ -596,12 +603,12 @@ msgstr "" " clean - Ta bort hämtade arkivfiler\n" " autoclean - Ta bort gamla hämtade arkivfiler\n" " check - Kontrollera att det inte finns några trasiga beroenden\n" -" markauto - Markera angivna paket som automatiskt installerade\n" -" unmarkauto - Markera angivna paket som manuellt installerade\n" +" changelog - Hämta och visa ändringslogg för det angivna paketet\n" +" download - Hämta det binära paketet till aktuell katalog\n" "\n" "Flaggor:\n" " -h Denna hjälptext.\n" -" -q Utdata lämplig för loggar - ingen förloppsindikator.\n" +" -q Loggbar utdata - ingen förloppsindikator.\n" " -qq Ingen utdata förutom vid fel.\n" " -d Bara hämta - VARKEN installera eller packa upp arkiven.\n" " -s Gör ingenting, simulera vad som skulle hända.\n" @@ -617,30 +624,19 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -#: cmdline/apt-helper.cc:37 +#: cmdline/apt-helper.cc:36 msgid "Need one URL as argument" -msgstr "" +msgstr "Behöver en URL som argument" -#: cmdline/apt-helper.cc:50 -#, fuzzy +#: cmdline/apt-helper.cc:49 msgid "Must specify at least one pair url/filename" -msgstr "Du måste ange minst ett paket att hämta källkod för" +msgstr "Du måste ange minst ett par bestående av url och filnamn" -#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80 +#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79 msgid "Download Failed" -msgstr "" - -#: cmdline/apt-helper.cc:88 -#, fuzzy -msgid "Must specifc at least one srv record" -msgstr "Du måste ange minst ett paket att hämta källkod för" +msgstr "Hämtning misslyckades" -#: cmdline/apt-helper.cc:95 -#, c-format -msgid "GetSrvRec failed for %s" -msgstr "" - -#: cmdline/apt-helper.cc:118 +#: cmdline/apt-helper.cc:92 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -649,57 +645,66 @@ msgid "" "\n" "Commands:\n" " download-file - download the given uri to the target-path\n" -" srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n" " auto-detect-proxy - detect proxy using apt.conf\n" "\n" " This APT helper has Super Meep Powers.\n" msgstr "" +"Användning: apt-helper [flaggor] kommando\n" +" apt-helper [flaggor] download-file uri målsökväg\n" +"\n" +"apt-helper är en intern hjälpare för apt\n" +"\n" +"Kommandon:\n" +" download-file - hämta angiven uri till målsökvägen\n" +" auto-detect-proxy - hitta proxy med hjälp av apt.conf\n" +"\n" +" Denna APT-hjälpare har speciella Meep-krafter.\n" #: cmdline/apt-mark.cc:65 -#, fuzzy, c-format +#, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "men det är inte installerat" +msgstr "%s kan inte markeras eftersom det inte är installerat.\n" #: cmdline/apt-mark.cc:71 -#, fuzzy, c-format +#, c-format msgid "%s was already set to manually installed.\n" -msgstr "%s är satt till manuellt installerad.\n" +msgstr "%s var redan satt till manuellt installerad.\n" #: cmdline/apt-mark.cc:73 -#, fuzzy, c-format +#, c-format msgid "%s was already set to automatically installed.\n" -msgstr "%s är satt till automatiskt installerad.\n" +msgstr "%s var redan satt till automatiskt installerad.\n" #: cmdline/apt-mark.cc:238 -#, fuzzy, c-format +#, c-format msgid "%s was already set on hold.\n" -msgstr "%s är redan den senaste versionen.\n" +msgstr "%s var redan tillbakahållet.\n" #: cmdline/apt-mark.cc:240 -#, fuzzy, c-format +#, c-format msgid "%s was already not hold.\n" -msgstr "%s är redan den senaste versionen.\n" +msgstr "%s var redan ej tillbakahållet.\n" #: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:207 -#: apt-pkg/deb/dpkgpm.cc:1302 +#: apt-pkg/deb/dpkgpm.cc:1302 apt-pkg/contrib/fileutl.cc:850 +#: apt-pkg/contrib/gpgv.cc:207 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" #: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380 -#, fuzzy, c-format +#, c-format msgid "%s set on hold.\n" -msgstr "%s är satt till manuellt installerad.\n" +msgstr "%s är satt till att hållas tillbaka.\n" #: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385 -#, fuzzy, c-format +#, c-format msgid "Canceled hold on %s.\n" -msgstr "Misslyckades med att öppna %s" +msgstr "Avbröt tillbakahållning av %s.\n" #: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403 msgid "Executing dpkg failed. Are you root?" -msgstr "" +msgstr "Körning av dpkg misslyckades. Är du root?" #: cmdline/apt-mark.cc:449 msgid "" @@ -727,8 +732,34 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" +"Användning: apt-mark [flaggor] {auto|manual} paket1 [paket2 …]\n" +"\n" +"apt-mark är ett enkelt kommandoradsgränssnitt för att markera\n" +"paket som manuellt eller automatiskt installerade. Det kan också\n" +"lista markeringar.\n" +"\n" +"Kommandon:\n" +" auto - Markera de angivna paketen som automatiskt installerade\n" +" manual - Markera de angivna paketen som manuellt installerade\n" +" hold - Markera ett paket som tillbakahållet\n" +" unhold - Avmarkera ett paket som är markerat som tillbakahållet\n" +" showauto - Visa listan över automatiskt installerade paket\n" +" showmanual - Visa listan över manuellt installerade paket\n" +" showhold - Visa listan över tillbakahållna paket\n" +"\n" +"Flaggor:\n" +" -h Denna hjälptext.\n" +" -q Loggbar utdata - ingen förloppsindikator\n" +" -qq Ingen utdata förutom vid fel\n" +" -s Gör ingenting, simulera vad som skulle hända.\n" +" -f läs/skriv markering som automatiskt/manuellt installerad i angiven " +"fil\n" +" -c=? Läs denna konfigurationsfil\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" +"Se manualsidorna för apt-mark(8) och apt.conf(5) för mer information." #: cmdline/apt.cc:46 +#, fuzzy msgid "" "Usage: apt [options] command\n" "\n" @@ -750,6 +781,24 @@ msgid "" "\n" " edit-sources - edit the source information file\n" msgstr "" +"Användning: apt [flaggor] kommando\n" +"\n" +"Kommandoradsgränssnitt för apt.\n" +"Grundläggande kommandon: \n" +" list - lista paket baserat på paketnamn\n" +" search - sök i paketbeskrivningar\n" +" show - visa detaljer för paket\n" +"\n" +" update - uppdatera lista över tillgängliga paket\n" +"\n" +" install - installera paket\n" +" remove - ta bort paket\n" +"\n" +" upgrade - uppgradera systemet genom att installera/uppgradera paket\n" +" full-upgrade - uppgradera systemet genom att ta bort/installera/uppgradera " +"paket\n" +"\n" +" edit-sources - redigera källinformationsfilen\n" #: methods/cdrom.cc:203 #, c-format @@ -784,11 +833,11 @@ msgstr "Filen hittades inte" #: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654 #: methods/rred.cc:664 msgid "Failed to stat" -msgstr "Kunde inte ta status" +msgstr "Misslyckades med att ta status" #: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661 msgid "Failed to set modification time" -msgstr "Misslyckades ställa in ändringstid" +msgstr "Misslyckades med att ställa in ändringstid" #: methods/file.cc:49 msgid "Invalid URI, local URIS must not start with //" @@ -833,7 +882,7 @@ msgstr "" #: methods/ftp.cc:282 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s" +msgstr "Kommandot ”%s” i inloggningsskriptet misslyckades, servern sade: %s" #: methods/ftp.cc:308 #, c-format @@ -877,7 +926,7 @@ msgstr "Kunde inte skapa ett uttag (socket)" msgid "Could not connect data socket, connection timed out" msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns" -#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102 +#: methods/ftp.cc:718 methods/connect.cc:116 methods/rsh.cc:102 msgid "Failed" msgstr "Misslyckades" @@ -930,7 +979,7 @@ msgstr "Problem med att lägga filen till hashtabellen" #: methods/ftp.cc:893 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Kunde inte hämta filen, servern sade \"%s\"" +msgstr "Kunde inte hämta filen, servern sade ”%s”" #: methods/ftp.cc:908 methods/rsh.cc:356 msgid "Data socket timed out" @@ -939,7 +988,7 @@ msgstr "Datauttag (socket) fick inte svar inom tidsgränsen" #: methods/ftp.cc:945 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Dataöverföringen misslyckades, servern sade \"%s\"" +msgstr "Dataöverföringen misslyckades, servern sade ”%s”" # Statusmeddelande, byter från substantiv till verb #. Get the files information @@ -951,68 +1000,67 @@ msgstr "Frågar" msgid "Unable to invoke " msgstr "Kunde inte starta " -# Felmeddelande för misslyckad chdir -#: methods/connect.cc:80 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Ansluter till %s (%s)" -#: methods/connect.cc:91 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" # [f]amilj, [t]yp, [p]rotokoll -#: methods/connect.cc:98 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunde inte skapa ett uttag (socket) för %s (f=%u t=%u p=%u)" -#: methods/connect.cc:104 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kunde inte initiera anslutningen till %s:%s (%s)." -#: methods/connect.cc:112 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen överskred tidsgräns" -#: methods/connect.cc:130 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:155 methods/rsh.cc:460 +#: methods/connect.cc:154 methods/rsh.cc:460 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" -#: methods/connect.cc:181 methods/connect.cc:200 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" -msgstr "Kunde inte slå upp \"%s\"" +msgstr "Kunde inte slå upp ”%s”" -#: methods/connect.cc:206 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Temporärt fel vid uppslagning av \"%s\"" +msgstr "Temporärt fel vid uppslagning av ”%s”" # Okänd felkod; %i = koden -#: methods/connect.cc:210 -#, fuzzy, c-format +#: methods/connect.cc:209 +#, c-format msgid "System error resolving '%s:%s'" -msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" +msgstr "Systemfel när ”%s:%s” slogs upp" # Okänd felkod; %i = koden -#: methods/connect.cc:212 +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" +msgstr "Något konstigt hände när ”%s:%s” slogs upp (%i - %s)" -#: methods/connect.cc:259 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s:%s:" @@ -1031,8 +1079,7 @@ msgstr "" #: methods/gpgv.cc:217 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)" msgstr "" -"Kunde inte köra \"apt-key\" för att verifiera signatur (är gnupg " -"installerad?)" +"Kunde inte köra ”apt-key” för att verifiera signatur (är gnupg installerad?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' #: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604 @@ -1041,6 +1088,8 @@ msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" +"Klartextsignerad fil är inte giltig, fick ”%s” (kräver nätverket " +"autentisering?)" #: methods/gpgv.cc:227 msgid "Unknown error executing apt-key" @@ -1060,7 +1109,7 @@ msgstr "" #: methods/gzip.cc:79 msgid "Empty files can't be valid archives" -msgstr "" +msgstr "Tomma filer kan inte vara giltiga arkiv" #: methods/http.cc:515 msgid "Error writing to the file" @@ -1080,7 +1129,7 @@ msgstr "Fel vid skrivning till fil" #: methods/http.cc:627 msgid "Select failed" -msgstr "\"Select\" misslyckades" +msgstr "”Select” misslyckades" #: methods/http.cc:632 msgid "Connection timed out" @@ -1104,11 +1153,11 @@ msgstr "Http-servern sände ett ogiltigt svarshuvud" #: methods/server.cc:173 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik" +msgstr "Http-servern sände en ogiltig Content-Length-rubrik" #: methods/server.cc:200 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik" +msgstr "Http-servern sände en ogiltig Content-Range-rubrik" #: methods/server.cc:202 msgid "This HTTP server has broken range support" @@ -1132,14 +1181,239 @@ msgid "" "Automatically disabled %s due to incorrect response from server/proxy. (man " "5 apt.conf)" msgstr "" +"Inaktiverade automatiskt %s på grund av felaktigt svar från server/proxy. " +"(man 5 apt.conf)" #: methods/server.cc:741 msgid "Internal error" msgstr "Internt fel" +# Förloppsindikator då lista skapas. +#: apt-private/private-list.cc:121 +msgid "Listing" +msgstr "Listar" + +#: apt-private/private-list.cc:151 +#, c-format +msgid "There is %i additional version. Please use the '-a' switch to see it" +msgid_plural "" +"There are %i additional versions. Please use the '-a' switch to see them." +msgstr[0] "" +"Det finns %i ytterligare version. Använd växeln ”-a” för att se den." +msgstr[1] "" +"Det finns %i ytterligare versioner. Använd växeln ”-a” för att se dem." + +#: apt-private/private-cachefile.cc:96 +msgid "Correcting dependencies..." +msgstr "Korrigerar beroenden…" + +#: apt-private/private-cachefile.cc:99 +msgid " failed." +msgstr " misslyckades." + +#: apt-private/private-cachefile.cc:102 +msgid "Unable to correct dependencies" +msgstr "Kunde inte korrigera beroenden" + +#: apt-private/private-cachefile.cc:105 +msgid "Unable to minimize the upgrade set" +msgstr "Kunde inte minimera uppgraderingsuppsättningen" + +#: apt-private/private-cachefile.cc:107 +msgid " Done" +msgstr " Färdig" + +#: apt-private/private-cachefile.cc:111 +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Du bör köra ”apt-get -f install” för att korrigera dessa." + +#: apt-private/private-cachefile.cc:114 +msgid "Unmet dependencies. Try using -f." +msgstr "Otillfredsställda beroenden. Prova med -f." + +#: apt-private/private-output.cc:105 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" +msgstr "okänd" + +#: apt-private/private-output.cc:272 +#, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[installerat,uppgraderingsbart till: %s]" + +#: apt-private/private-output.cc:275 +msgid "[installed,local]" +msgstr "[installerat,lokalt]" + +#: apt-private/private-output.cc:277 +msgid "[installed,auto-removable]" +msgstr "[installerat,automatiskt borttagbart]" + +#: apt-private/private-output.cc:279 +msgid "[installed,automatic]" +msgstr "[installerat,automatiskt]" + +#: apt-private/private-output.cc:281 +msgid "[installed]" +msgstr "[installerat]" + +#: apt-private/private-output.cc:284 +#, c-format +msgid "[upgradable from: %s]" +msgstr "[uppgraderingsbart från: %s]" + +#: apt-private/private-output.cc:288 +msgid "[residual-config]" +msgstr "[kvarvarande-inställning]" + +#: apt-private/private-output.cc:402 +#, c-format +msgid "but %s is installed" +msgstr "men %s är installerat" + +#: apt-private/private-output.cc:404 +#, c-format +msgid "but %s is to be installed" +msgstr "men %s kommer att installeras" + +#: apt-private/private-output.cc:411 +msgid "but it is not installable" +msgstr "men det kan inte installeras" + +#: apt-private/private-output.cc:413 +msgid "but it is a virtual package" +msgstr "men det är ett virtuellt paket" + +#: apt-private/private-output.cc:416 +msgid "but it is not installed" +msgstr "men det är inte installerat" + +#: apt-private/private-output.cc:416 +msgid "but it is not going to be installed" +msgstr "men det kommer inte att installeras" + +#: apt-private/private-output.cc:421 +msgid " or" +msgstr " eller" + +#: apt-private/private-output.cc:435 apt-private/private-output.cc:445 +msgid "The following packages have unmet dependencies:" +msgstr "Följande paket har beroenden som inte kan tillfredsställas:" + +#: apt-private/private-output.cc:455 +msgid "The following NEW packages will be installed:" +msgstr "Följande NYA paket kommer att installeras:" + +#: apt-private/private-output.cc:465 +msgid "The following packages will be REMOVED:" +msgstr "Följande paket kommer att TAS BORT:" + +#: apt-private/private-output.cc:481 +msgid "The following packages have been kept back:" +msgstr "Följande paket har hållits tillbaka:" + +#: apt-private/private-output.cc:497 +msgid "The following packages will be upgraded:" +msgstr "Följande paket kommer att uppgraderas:" + +#: apt-private/private-output.cc:512 +msgid "The following packages will be DOWNGRADED:" +msgstr "Följande paket kommer att NEDGRADERAS:" + +#: apt-private/private-output.cc:525 +msgid "The following held packages will be changed:" +msgstr "Följande tillbakahållna paket kommer att ändras:" + +#: apt-private/private-output.cc:552 +#, c-format +msgid "%s (due to %s)" +msgstr "%s (på grund av %s)" + +#: apt-private/private-output.cc:602 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"VARNING: Följande systemkritiska paket kommer att tas bort.\n" +"Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" + +#: apt-private/private-output.cc:633 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu att uppgradera, %lu att nyinstallera, " + +#: apt-private/private-output.cc:637 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu att installera om, " + +#: apt-private/private-output.cc:639 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu att nedgradera, " + +#: apt-private/private-output.cc:641 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu att ta bort och %lu att inte uppgradera.\n" + +#: apt-private/private-output.cc:645 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu är inte helt installerade eller borttagna.\n" + +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc:667 +msgid "[Y/n]" +msgstr "[J/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc:673 +msgid "[y/N]" +msgstr "[j/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: apt-private/private-output.cc:684 +msgid "Y" +msgstr "J" + +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: apt-private/private-output.cc:690 +msgid "N" +msgstr "N" + +#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Fel vid kompilering av reguljärt uttryck - %s" + +#: apt-private/private-update.cc:31 +msgid "The update command takes no arguments" +msgstr "Uppdateringskommandot tar inga argument" + +#: apt-private/private-update.cc:96 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +"%i paket kan uppgraderas. Kör ”apt list --upgradable” för att se det.\n" +msgstr[1] "" +"%i paket kan uppgraderas. Kör ”apt list --upgradable” för att se dem.\n" + +#: apt-private/private-update.cc:100 +msgid "All packages are up to date." +msgstr "Alla paket är uppdaterade." + #: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65 msgid "Sorting" -msgstr "" +msgstr "Sorterar" #: apt-private/private-cacheset.cc:127 #, c-format @@ -1164,7 +1438,7 @@ msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n" #: apt-private/private-cacheset.cc:168 #, fuzzy msgid " [Installed]" -msgstr " [Installerat]" +msgstr "[installerat]" #: apt-private/private-cacheset.cc:177 msgid " [Not candidate version]" @@ -1201,27 +1475,40 @@ msgstr "Virtuella paket som \"%s\" kan inte tas bort\n" #. TRANSLATORS: Note, this is not an interactive question #: apt-private/private-cacheset.cc:238 apt-private/private-install.cc:915 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Paketet %s är inte installerat, så det tas inte bort\n" +msgstr "" +"Paketet ”%s” är inte installerat, så det tas inte bort. Menade du ”%s”?\n" #: apt-private/private-cacheset.cc:244 apt-private/private-install.cc:921 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Paketet %s är inte installerat, så det tas inte bort\n" +msgstr "Paketet ”%s” är inte installerat, så det tas inte bort\n" #: apt-private/private-cacheset.cc:289 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Observera, väljer \"%s\" istället för \"%s\"\n" +#: apt-private/private-show.cc:158 +#, c-format +msgid "There is %i additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %i additional records. Please use the '-a' switch to see them." +msgstr[0] "Det finns %i ytterligare post. Använd växeln ”-a” för att se den." +msgstr[1] "Det finns %i ytterligare poster. Använd växeln ”-a” för att se dem." + +#: apt-private/private-show.cc:165 +msgid "not a real package (virtual)" +msgstr "inte ett riktigt paket (virtuellt)" + #: apt-private/private-install.cc:87 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internt fel. InstallPackages anropades med trasiga paket!" #: apt-private/private-install.cc:96 msgid "Packages need to be removed but remove is disabled." -msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat." +msgstr "Paketen måste tas bort men ”Remove” är inaktiverat." #: apt-private/private-install.cc:103 apt-private/private-download.cc:118 msgid "" @@ -1242,10 +1529,11 @@ msgid "Packages were downgraded and -y was used without --allow-downgrades." msgstr "Problem har uppstått och -y användes utan --force-yes" #: apt-private/private-install.cc:112 +#, fuzzy msgid "" "Held packages were changed and -y was used without --allow-change-held-" "packages." -msgstr "" +msgstr "Problem har uppstått och -y användes utan --force-yes" #: apt-private/private-install.cc:128 msgid "Internal error, Ordering didn't finish" @@ -1254,7 +1542,7 @@ msgstr "Internt fel. Sorteringen färdigställdes inte" #: apt-private/private-install.cc:166 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Konstigt... storlekarna stämde inte överens, skicka e-post till apt@packages." +"Konstigt… storlekarna stämde inte överens, skicka e-post till apt@packages." "debian.org" #. TRANSLATOR: The required space between number and unit is already included @@ -1288,7 +1576,7 @@ msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" #: apt-private/private-install.cc:202 apt-private/private-install.cc:224 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." +msgstr "”Trivial Only” angavs, men detta är inte en trivial handling." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) @@ -1304,7 +1592,7 @@ msgid "" " ?] " msgstr "" "Du är på väg att göra någonting som kan vara skadligt\n" -"Skriv in frasen \"%s\" för att fortsätta\n" +"Skriv in frasen ”%s” för att fortsätta\n" " ?] " # Visas då man svarar nej @@ -1325,7 +1613,7 @@ msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --" +"Vissa arkiv kunde inte hämtas. Prova att köra ”apt-get update” eller med --" "fix-missing." #: apt-private/private-install.cc:310 @@ -1406,27 +1694,26 @@ msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "" -"%lu paket blev installerade automatiskt och är inte längre nödvändigt.\n" +"%lu paket blev installerat automatiskt och är inte längre nödvändigt.\n" msgstr[1] "" "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n" #: apt-private/private-install.cc:488 -#, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "Använd \"apt-get autoremove\" för att ta bort dem." -msgstr[1] "Använd \"apt-get autoremove\" för att ta bort dem." +msgstr[0] "Använd ”apt-get autoremove” för att ta bort det." +msgstr[1] "Använd ”apt-get autoremove” för att ta bort dem." #: apt-private/private-install.cc:582 msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa:" +msgstr "Du bör köra ”apt-get -f install” för att korrigera dessa:" #: apt-private/private-install.cc:584 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " +"Otillfredsställda beroenden. Prova med ”apt-get -f install” utan paket " "(eller ange en lösning)." #: apt-private/private-install.cc:607 @@ -1439,7 +1726,7 @@ msgstr "" "Några paket kunde inte installeras. Det kan betyda att du har begärt\n" "en omöjlig situation eller, om du använder den instabila utgåvan\n" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" -"ut från \"Incoming\"." +"ut från ”Incoming”." #: apt-private/private-install.cc:628 msgid "Broken packages" @@ -1485,245 +1772,12 @@ msgstr "%s är redan den senaste versionen.\n" #: apt-private/private-install.cc:868 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" -msgstr "Valde version \"%s\" (%s) för \"%s\"\n" +msgstr "Valde version ”%s” (%s) för ”%s”\n" #: apt-private/private-install.cc:873 -#, fuzzy, c-format -msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "Valde version \"%s\" (%s) för \"%s\"\n" - -#: apt-private/private-list.cc:121 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:151 #, c-format -msgid "There is %i additional version. Please use the '-a' switch to see it" -msgid_plural "" -"There are %i additional versions. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" - -#: apt-private/private-cachefile.cc:96 -msgid "Correcting dependencies..." -msgstr "Korrigerar beroenden..." - -#: apt-private/private-cachefile.cc:99 -msgid " failed." -msgstr " misslyckades." - -#: apt-private/private-cachefile.cc:102 -msgid "Unable to correct dependencies" -msgstr "Kunde inte korrigera beroenden" - -#: apt-private/private-cachefile.cc:105 -msgid "Unable to minimize the upgrade set" -msgstr "Kunde inte minimera uppgraderingsuppsättningen" - -#: apt-private/private-cachefile.cc:107 -msgid " Done" -msgstr " Färdig" - -#: apt-private/private-cachefile.cc:111 -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa." - -#: apt-private/private-cachefile.cc:114 -msgid "Unmet dependencies. Try using -f." -msgstr "Otillfredsställda beroenden. Prova med -f." - -#: apt-private/private-output.cc:105 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" -msgstr "" - -#: apt-private/private-output.cc:272 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Installerat]" - -#: apt-private/private-output.cc:275 -#, fuzzy -msgid "[installed,local]" -msgstr " [Installerat]" - -#: apt-private/private-output.cc:277 -msgid "[installed,auto-removable]" -msgstr "" - -#: apt-private/private-output.cc:279 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Installerat]" - -#: apt-private/private-output.cc:281 -#, fuzzy -msgid "[installed]" -msgstr " [Installerat]" - -#: apt-private/private-output.cc:284 -#, c-format -msgid "[upgradable from: %s]" -msgstr "" - -#: apt-private/private-output.cc:288 -msgid "[residual-config]" -msgstr "" - -#: apt-private/private-output.cc:402 -#, c-format -msgid "but %s is installed" -msgstr "men %s är installerat" - -#: apt-private/private-output.cc:404 -#, c-format -msgid "but %s is to be installed" -msgstr "men %s kommer att installeras" - -#: apt-private/private-output.cc:411 -msgid "but it is not installable" -msgstr "men det kan inte installeras" - -#: apt-private/private-output.cc:413 -msgid "but it is a virtual package" -msgstr "men det är ett virtuellt paket" - -#: apt-private/private-output.cc:416 -msgid "but it is not installed" -msgstr "men det är inte installerat" - -#: apt-private/private-output.cc:416 -msgid "but it is not going to be installed" -msgstr "men det kommer inte att installeras" - -#: apt-private/private-output.cc:421 -msgid " or" -msgstr " eller" - -#: apt-private/private-output.cc:435 apt-private/private-output.cc:445 -msgid "The following packages have unmet dependencies:" -msgstr "Följande paket har beroenden som inte kan tillfredsställas:" - -#: apt-private/private-output.cc:455 -msgid "The following NEW packages will be installed:" -msgstr "Följande NYA paket kommer att installeras:" - -#: apt-private/private-output.cc:465 -msgid "The following packages will be REMOVED:" -msgstr "Följande paket kommer att TAS BORT:" - -#: apt-private/private-output.cc:481 -msgid "The following packages have been kept back:" -msgstr "Följande paket har hållits tillbaka:" - -#: apt-private/private-output.cc:497 -msgid "The following packages will be upgraded:" -msgstr "Följande paket kommer att uppgraderas:" - -#: apt-private/private-output.cc:512 -msgid "The following packages will be DOWNGRADED:" -msgstr "Följande paket kommer att NEDGRADERAS:" - -#: apt-private/private-output.cc:525 -msgid "The following held packages will be changed:" -msgstr "Följande tillbakahållna paket kommer att ändras:" - -#: apt-private/private-output.cc:552 -#, c-format -msgid "%s (due to %s)" -msgstr "%s (på grund av %s)" - -#: apt-private/private-output.cc:602 -msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" -msgstr "" -"VARNING: Följande systemkritiska paket kommer att tas bort.\n" -"Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" - -#: apt-private/private-output.cc:633 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu att uppgradera, %lu att nyinstallera, " - -#: apt-private/private-output.cc:637 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu att installera om, " - -#: apt-private/private-output.cc:639 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu att nedgradera, " - -#: apt-private/private-output.cc:641 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu att ta bort och %lu att inte uppgradera.\n" - -#: apt-private/private-output.cc:645 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu är inte helt installerade eller borttagna.\n" - -#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] -#. e.g. "Do you want to continue? [Y/n] " -#. The user has to answer with an input matching the -#. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:667 -msgid "[Y/n]" -msgstr "[J/n]" - -#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] -#. e.g. "Should this file be removed? [y/N] " -#. The user has to answer with an input matching the -#. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:673 -msgid "[y/N]" -msgstr "[j/N]" - -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:684 -msgid "Y" -msgstr "J" - -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:690 -msgid "N" -msgstr "" - -#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Fel vid kompilering av reguljärt uttryck - %s" - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Uppdateringskommandot tar inga argument" - -#: apt-private/private-update.cc:96 -#, c-format -msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" -msgid_plural "" -"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" -msgstr[0] "" -msgstr[1] "" - -#: apt-private/private-update.cc:100 -msgid "All packages are up to date." -msgstr "" - -#: apt-private/private-show.cc:158 -#, c-format -msgid "There is %i additional record. Please use the '-a' switch to see it" -msgid_plural "" -"There are %i additional records. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" - -#: apt-private/private-show.cc:165 -msgid "not a real package (virtual)" -msgstr "" +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Valde version ”%s” (%s) för ”%s” på grund av ”%s”\n" #: apt-private/private-main.cc:34 msgid "" @@ -1743,6 +1797,8 @@ msgid "" "Can't drop privileges for downloading as file '%s' couldn't be accessed by " "user '%s'." msgstr "" +"Kan inte släppa privilegier för hämtning eftersom filen ”%s” inte kunde " +"kommas åt av användaren ”%s”." #: apt-private/private-download.cc:94 msgid "WARNING: The following packages cannot be authenticated!" @@ -1780,31 +1836,28 @@ msgstr "Kunde inte fastställa ledigt utrymme i %s" #: apt-private/private-download.cc:193 #, c-format msgid "You don't have enough free space in %s." -msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" +msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s." #: apt-private/private-sources.cc:58 -#, fuzzy, c-format +#, c-format msgid "Failed to parse %s. Edit again? " -msgstr "Misslyckades med att byta namn på %s till %s" +msgstr "Misslyckades med att tolka %s. Redigera igen? " #: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgstr "Din ”%s”-fil ändrades, kör ”apt-get update”." #: apt-private/private-search.cc:69 msgid "Full Text Search" -msgstr "" +msgstr "Fulltextsökning" -# Måste vara tre bokstäver(?) -# "Hit" = aktuell version är fortfarande giltig #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' #: apt-private/acqprogress.cc:74 #, c-format msgid "Hit:%lu %s" msgstr "Bra:%lu %s" -# "Get:" = hämtar ny version #. TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update' #. Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens #: apt-private/acqprogress.cc:96 @@ -1812,7 +1865,6 @@ msgstr "Bra:%lu %s" msgid "Get:%lu %s" msgstr "Läs:%lu %s" -# "Ign" = hoppar över #. TRANSLATOR: Very short word to be displayed for files in 'apt-get update' #. which failed to download, but the error is ignored (compare "Err:") #: apt-private/acqprogress.cc:126 @@ -1820,7 +1872,6 @@ msgstr "Läs:%lu %s" msgid "Ign:%lu %s" msgstr "Ign:%lu %s" -# "Err" = fel vid hämtning #. TRANSLATOR: Very short word to be displayed for files in 'apt-get update' #. which failed to download and the error is critical (compare "Ign:") #: apt-private/acqprogress.cc:136 @@ -1838,20 +1889,20 @@ msgid " [Working]" msgstr " [Arbetar]" #: apt-private/acqprogress.cc:297 -#, fuzzy, c-format +#, c-format msgid "" "Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press [Enter]\n" msgstr "" "Mediabyte: Mata in skivan med etiketten\n" -" \"%s\"\n" -"i enheten \"%s\" och tryck på Enter\n" +" ”%s”\n" +"i enheten ”%s” och tryck på [Retur]\n" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141 -#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 +#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43 #: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312 #: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488 #: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471 @@ -1860,9 +1911,9 @@ msgid "Unable to read %s" msgstr "Kunde inte läsa %s" # Felmeddelande för misslyckad chdir -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49 -#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563 -#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563 +#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 +#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1873,19 +1924,19 @@ msgstr "Kunde inte byta till %s" #: methods/mirror.cc:280 #, c-format msgid "No mirror file '%s' found " -msgstr "Ingen spegelfil \"%s\" hittades " +msgstr "Ingen spegelfil ”%s” hittades " #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:287 -#, fuzzy, c-format +#, c-format msgid "Can not read mirror file '%s'" -msgstr "Ingen spegelfil \"%s\" hittades " +msgstr "Kan inte läsa spegelfilen ”%s”" #: methods/mirror.cc:315 -#, fuzzy, c-format +#, c-format msgid "No entry found in mirror file '%s'" -msgstr "Ingen spegelfil \"%s\" hittades " +msgstr "Ingen post funnen i spegelfilen ”%s”" #: methods/mirror.cc:445 #, c-format @@ -1906,9 +1957,8 @@ msgstr "Felaktig standardinställning!" #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 #: dselect/install:106 dselect/update:45 -#, fuzzy msgid "Press [Enter] to continue." -msgstr "Tryck på Enter för att fortsätta." +msgstr "Tryck på [Retur] för att fortsätta." #: dselect/install:92 msgid "Do you want to erase any previously downloaded .deb files?" @@ -1933,7 +1983,7 @@ msgstr "av saknade beroenden. Detta är okej, endast felen ovanför detta" #: dselect/install:105 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera igen" +msgstr "meddelande är viktiga. Försök korrigera dem och kör [I]nstallera igen" #: dselect/update:30 msgid "Merging available information" @@ -1942,7 +1992,7 @@ msgstr "Sammanfogar tillgänglig information" #: apt-pkg/install-progress.cc:58 #, c-format msgid "Progress: [%3i%%]" -msgstr "" +msgstr "Förlopp: [%3i%%]" #: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:177 msgid "Running dpkg" @@ -1951,7 +2001,7 @@ msgstr "Kör dpkg" #: apt-pkg/init.cc:176 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Paketsystemet \"%s\" stöds inte" +msgstr "Paketsystemet ”%s” stöds inte" # #: apt-pkg/init.cc:192 @@ -1994,12 +2044,33 @@ msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas." #: apt-pkg/cachefile.cc:105 msgid "You may want to run apt-get update to correct these problems" -msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\"" +msgstr "Du kan möjligen rätta till problemet genom att köra ”apt-get update”" #: apt-pkg/cachefile.cc:123 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." +#: apt-pkg/acquire-worker.cc:111 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Metoddrivrutinen %s kunde inte hittas." + +#: apt-pkg/acquire-worker.cc:113 +#, c-format +msgid "Is the package %s installed?" +msgstr "Är paketet %s installerat?" + +#: apt-pkg/acquire-worker.cc:164 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Metoden %s startade inte korrekt" + +#: apt-pkg/acquire-worker.cc:536 +#, 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 på [Retur]." + # Felmeddelande #: apt-pkg/pkgcache.cc:163 msgid "Empty package cache" @@ -2014,19 +2085,18 @@ msgid "The package cache file is an incompatible version" msgstr "Paketcachefilens version är inkompatibel" #: apt-pkg/pkgcache.cc:177 -#, fuzzy msgid "The package cache file is corrupted, it is too small" -msgstr "Paketcachefilen är skadad" +msgstr "Paketcachefilen är skadad, den är för liten" #: apt-pkg/pkgcache.cc:184 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Denna APT saknar stöd för versionssystemet \"%s\"" +msgstr "Denna APT saknar stöd för versionssystemet ”%s”" #: apt-pkg/pkgcache.cc:194 -#, fuzzy, c-format +#, c-format msgid "The package cache was built for different architectures: %s vs %s" -msgstr "Paketcachen byggdes för en annan arkitektur" +msgstr "Paketcachen byggdes för andra arkitekturer: %s gentemot %s" #: apt-pkg/pkgcache.cc:319 msgid "Depends" @@ -2086,62 +2156,86 @@ msgstr "valfri" msgid "extra" msgstr "extra" -#: apt-pkg/acquire-worker.cc:111 +#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182 +msgid "Calculating upgrade" +msgstr "Beräknar uppgradering" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "The method driver %s could not be found." -msgstr "Metoddrivrutinen %s kunde inte hittas." +msgid "Index file type '%s' is not supported" +msgstr "Indexfiler av typ ”%s” stöds inte" -#: apt-pkg/acquire-worker.cc:113 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" +#: apt-pkg/pkgcachegen.cc:112 +msgid "Cache has an incompatible versioning system" +msgstr "Cachen har ett inkompatibelt versionssystem" -#: apt-pkg/acquire-worker.cc:164 +# NewPackage etc. är funktionsnamn +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299 +#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394 +#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402 +#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428 +#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488 #, c-format -msgid "Method %s did not start correctly" -msgstr "Metoden %s startade inte korrekt" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Fel uppstod vid hantering av %s (%s%d)" -#: apt-pkg/acquire-worker.cc:536 -#, fuzzy, 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 på Enter." +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera." -#: apt-pkg/pkgrecords.cc:38 -#, c-format -msgid "Index file type '%s' is not supported" -msgstr "Indexfiler av typ \"%s\" stöds inte" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera." -#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167 -msgid "Building dependency tree" -msgstr "Bygger beroendeträd" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera." -#: apt-pkg/depcache.cc:140 -msgid "Candidate versions" -msgstr "Kandiderande versioner" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera." -#: apt-pkg/depcache.cc:168 -msgid "Dependency generation" -msgstr "Beroendegenerering" +#: apt-pkg/pkgcachegen.cc:1400 apt-pkg/pkgcachegen.cc:1526 +#: apt-pkg/pkgcachegen.cc:1552 apt-pkg/pkgcachegen.cc:1671 +msgid "Reading package lists" +msgstr "Läser paketlistor" -#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 -msgid "Reading state information" -msgstr "Läser tillståndsinformation" +#: apt-pkg/pkgcachegen.cc:1471 apt-pkg/pkgcachegen.cc:1478 +msgid "IO Error saving source cache" +msgstr "In-/utfel vid lagring av källcache" -#: apt-pkg/depcache.cc:252 +#: apt-pkg/pkgcachegen.cc:1570 apt-pkg/pkgcachegen.cc:1572 +#: apt-pkg/contrib/fileutl.cc:2151 cmdline/apt-extracttemplates.cc:263 #, c-format -msgid "Failed to open StateFile %s" -msgstr "Misslyckades med att öppna StateFile %s" +msgid "Unable to write to %s" +msgstr "Kunde inte skriva till %s" -#: apt-pkg/depcache.cc:257 -#, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Misslyckades med att skriva temporär StateFile %s" +#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210 +msgid "Send scenario to solver" +msgstr "Skicka scenario till lösare" + +#: apt-pkg/edsp.cc:232 +msgid "Send request to solver" +msgstr "Skicka förfrågan till lösare" + +#: apt-pkg/edsp.cc:311 +msgid "Prepare for receiving solution" +msgstr "Förbered för att motta lösning" + +#: apt-pkg/edsp.cc:318 +msgid "External solver failed without a proper error message" +msgstr "Extern lösare misslyckades utan något informativt felmeddelande" + +#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618 +msgid "Execute external solver" +msgstr "Kör extern lösare" #: apt-pkg/acquire-item.cc:116 msgid "Use --allow-insecure-repositories to force the update" -msgstr "" +msgstr "Använd --allow-insecure-repositories för att tvinga uppdateringen" #: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2161 #, c-format @@ -2157,14 +2251,12 @@ msgid "Size mismatch" msgstr "Storleken stämmer inte" #: apt-pkg/acquire-item.cc:595 -#, fuzzy msgid "Invalid file format" -msgstr "Felaktig åtgärd %s" +msgstr "Ogiltigt filformat" #: apt-pkg/acquire-item.cc:600 -#, fuzzy msgid "Signature error" -msgstr "Skrivfel" +msgstr "Signaturfel" #: apt-pkg/acquire-item.cc:789 #, fuzzy, c-format @@ -2188,6 +2280,8 @@ msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" +"Kunde inte hitta förväntad post ”%s” i Release-fil (Felaktig sources.list-" +"post eller fel format på fil)" #: apt-pkg/acquire-item.cc:1026 msgid "There is no public key available for the following key IDs:\n" @@ -2202,6 +2296,8 @@ msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" +"Release-fil för %s har gått ut (ogiltig sedan %s). Uppdateringar för detta " +"förråd kommer inte verkställas." #: apt-pkg/acquire-item.cc:1107 #, c-format @@ -2214,6 +2310,8 @@ msgid "" "The data from '%s' is not signed. Packages from that repository can not be " "authenticated." msgstr "" +"Data från ”%s” är inte signerat. Paket från det förrådet kan inte " +"autentiseras." #: apt-pkg/acquire-item.cc:1326 #, c-format @@ -2221,17 +2319,21 @@ msgid "" "The repository '%s' does not have a Release file. This is deprecated, please " "contact the owner of the repository." msgstr "" +"Förrådet ”%s” har inte en Release-fil. Detta är föråldrat, kontakta " +"förrådets ägare." #: apt-pkg/acquire-item.cc:1459 -#, fuzzy, c-format +#, c-format msgid "The repository '%s' is no longer signed." -msgstr "Katalogen %s är omdirigerad" +msgstr "Förrådet ”%s” är inte längre signerat." #: apt-pkg/acquire-item.cc:1466 msgid "" "This is normally not allowed, but the option Acquire::" "AllowDowngradeToInsecureRepositories was given to override it." msgstr "" +"Detta är vanligen inte tillåtet, men flaggan Acquire::" +"AllowDowngradeToInsecureRepositories gavs för att åsidosätta detta." #: apt-pkg/acquire-item.cc:2611 #, c-format @@ -2245,78 +2347,19 @@ msgstr "" #: apt-pkg/acquire-item.cc:2677 #, c-format msgid "Can't find a source to download version '%s' of '%s'" -msgstr "" +msgstr "Kan inte hitta en källa för att hämta version ”%s” av ”%s”" #: apt-pkg/acquire-item.cc:2715 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." +msgstr "Paketindexfilerna är skadade. Inget ”Filename:”-fält för paketet %s." -# Felmeddelande för misslyckad chdir #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1 #: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3054 #, fuzzy, c-format msgid "Changelog unavailable for %s=%s" -msgstr "Ansluter till %s (%s)" - -#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Indexfiler av typ \"%s\" stöds inte" - -#: apt-pkg/clean.cc:64 -#, c-format -msgid "Unable to stat %s." -msgstr "Kunde inte ta status på %s." - -#: apt-pkg/pkgcachegen.cc:112 -msgid "Cache has an incompatible versioning system" -msgstr "Cachen har ett inkompatibelt versionssystem" - -# NewPackage etc. är funktionsnamn -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299 -#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369 -#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394 -#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402 -#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428 -#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Fel uppstod vid hantering av %s (FindPkg)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera." - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera." - -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera." - -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera." - -#: apt-pkg/pkgcachegen.cc:1400 apt-pkg/pkgcachegen.cc:1526 -#: apt-pkg/pkgcachegen.cc:1552 apt-pkg/pkgcachegen.cc:1671 -msgid "Reading package lists" -msgstr "Läser paketlistor" - -#: apt-pkg/pkgcachegen.cc:1471 apt-pkg/pkgcachegen.cc:1478 -msgid "IO Error saving source cache" -msgstr "In-/utfel vid lagring av källcache" - -#: apt-pkg/pkgcachegen.cc:1570 apt-pkg/pkgcachegen.cc:1572 -#: apt-pkg/contrib/fileutl.cc:2151 cmdline/apt-extracttemplates.cc:263 -#, c-format -msgid "Unable to write to %s" -msgstr "Kunde inte skriva till %s" +msgstr "Ändringslogg för %s (%s)" #: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833 #, c-format @@ -2333,6 +2376,11 @@ msgstr "Arkivkatalogen %spartial saknas." msgid "Unable to lock directory %s" msgstr "Kunde inte låsa katalogen %s" +#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39 +#, c-format +msgid "Clean of %s is not supported" +msgstr "Rensning av %s stöds inte" + #. only show the ETA if it makes sense #. two days #: apt-pkg/acquire.cc:1081 @@ -2345,36 +2393,20 @@ msgstr "Hämtar fil %li av %li (%s återstår)" msgid "Retrieving file %li of %li" msgstr "Hämtar fil %li av %li" -#: apt-pkg/update.cc:76 -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Misslyckades med att hämta %s %s\n" - -#: apt-pkg/update.cc:102 apt-pkg/update.cc:104 -#, fuzzy -msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." -msgstr "" -"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " -"använts istället." - -#: apt-pkg/srcrecords.cc:53 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Du måste lägga till några \"source\"-URI:er i din sources.list" - #: apt-pkg/policy.cc:77 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" +"Värdet ”%s” är ogiltigt för APT::Default-Release eftersom ingen sådan utgåva " +"är tillgänglig i källorna" # "Package" är en sträng i konfigurationsfilen #: apt-pkg/policy.cc:453 #, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas" +msgstr "Ogiltig post i konfigurationsfilen %s, ”Package”-rubriken saknas" #: apt-pkg/policy.cc:475 #, c-format @@ -2390,19 +2422,41 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) för nål" +#: apt-pkg/update.cc:76 +#, fuzzy, c-format +msgid "Failed to fetch %s %s" +msgstr "Misslyckades med att hämta %s %s\n" + +#: apt-pkg/update.cc:102 apt-pkg/update.cc:104 +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" +"Vissa indexfiler kunde inte hämtas. De har ignorerats eller så har de gamla " +"använts istället." + +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Du måste lägga till några ”source”-URI:er i din sources.list" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Kunde inte ta status på %s." + #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:983 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -"Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " +"Kunde inte genomföra omedelbar konfiguration på ”%s”. Se man 5 apt.conf " "under APT::Immediate-Configure för information. (%d)" #: apt-pkg/packagemanager.cc:562 apt-pkg/packagemanager.cc:592 -#, fuzzy, c-format +#, c-format msgid "Could not configure '%s'. " -msgstr "Kunde inte öppna filen \"%s\"" +msgstr "Kunde inte konfigurera ”%s”. " #: apt-pkg/packagemanager.cc:642 #, c-format @@ -2414,7 +2468,7 @@ msgstr "" "För att genomföra installationen måste det systemkritiska paketet %s " "tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. " "Detta är oftast en dålig idé, men om du verkligen vill göra det kan du " -"aktivera flaggan \"APT::Force-LoopBreak\"." +"aktivera flaggan ”APT::Force-LoopBreak”." #: apt-pkg/cdrom.cc:498 #, c-format @@ -2423,7 +2477,7 @@ msgstr "Rad %u är för lång i källistan %s." #: apt-pkg/cdrom.cc:572 msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterar CD-ROM...\n" +msgstr "Avmonterar cd-rom…\n" #: apt-pkg/cdrom.cc:587 #, c-format @@ -2432,24 +2486,24 @@ msgstr "Använder cd-rom-monteringspunkten %s\n" #: apt-pkg/cdrom.cc:600 msgid "Waiting for disc...\n" -msgstr "Väntar på skiva...\n" +msgstr "Väntar på skiva…\n" #: apt-pkg/cdrom.cc:610 msgid "Mounting CD-ROM...\n" -msgstr "Monterar cd-rom...\n" +msgstr "Monterar cd-rom…\n" #: apt-pkg/cdrom.cc:621 msgid "Identifying... " -msgstr "Identifierar... " +msgstr "Identifierar… " #: apt-pkg/cdrom.cc:663 #, c-format msgid "Stored label: %s\n" -msgstr "Lagrad etikett: %s \n" +msgstr "Lagrad etikett: %s\n" #: apt-pkg/cdrom.cc:681 msgid "Scanning disc for index files...\n" -msgstr "Söker efter indexfiler på skivan...\n" +msgstr "Söker efter indexfiler på skivan…\n" #: apt-pkg/cdrom.cc:735 #, c-format @@ -2471,7 +2525,7 @@ msgstr "" #: apt-pkg/cdrom.cc:772 #, c-format msgid "Found label '%s'\n" -msgstr "Hittade etiketten \"%s\"\n" +msgstr "Hittade etiketten ”%s”\n" #: apt-pkg/cdrom.cc:801 msgid "That is not a valid name, try again.\n" @@ -2484,11 +2538,11 @@ msgid "" "'%s'\n" msgstr "" "Denna skiva heter: \n" -"\"%s\"\n" +"”%s”\n" #: apt-pkg/cdrom.cc:820 msgid "Copying package lists..." -msgstr "Kopierar paketlistor..." +msgstr "Kopierar paketlistor…" #: apt-pkg/cdrom.cc:867 msgid "Writing new source list\n" @@ -2498,10 +2552,6 @@ msgstr "Skriver ny källista\n" msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" -#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182 -msgid "Calculating upgrade" -msgstr "Beräknar uppgradering" - #: apt-pkg/algorithms.cc:263 #, c-format msgid "" @@ -2521,25 +2571,31 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "Bygger beroendeträd" -#: apt-pkg/edsp.cc:232 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/depcache.cc:140 +msgid "Candidate versions" +msgstr "Kandiderande versioner" -#: apt-pkg/edsp.cc:311 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/depcache.cc:168 +msgid "Dependency generation" +msgstr "Beroendegenerering" -#: apt-pkg/edsp.cc:318 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 +msgid "Reading state information" +msgstr "Läser tillståndsinformation" -#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/depcache.cc:252 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Misslyckades med att öppna StateFile %s" + +#: apt-pkg/depcache.cc:257 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Misslyckades med att skriva temporär StateFile %s" #: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212 #, c-format @@ -2551,6 +2607,67 @@ msgstr "Kunde inte tolka paketfilen %s (%d)" msgid "Cannot convert %s to integer" msgstr "" +#: apt-pkg/cacheset.cc:500 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Utgåvan ”%s” för ”%s” hittades inte" + +#: apt-pkg/cacheset.cc:503 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Version ”%s” för ”%s” hittades inte" + +#: apt-pkg/cacheset.cc:738 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Kunde inte hitta funktionen ”%s”" + +#: apt-pkg/cacheset.cc:744 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Kunde inte hitta något paket enligt reguljära uttrycket ”%s”" + +#: apt-pkg/cacheset.cc:750 +#, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Kunde inte hitta något paket med sökmönstret ”%s”" + +#: apt-pkg/cacheset.cc:789 +#, c-format +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" +"Kan inte välja versioner från paketet ”%s” eftersom det är helt virtuellt" + +#: apt-pkg/cacheset.cc:828 +#, c-format +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" +"Kan inte välja senaste version från paketet ”%s” eftersom det är helt " +"virtuellt" + +#: apt-pkg/cacheset.cc:836 +#, c-format +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "" +"Kan inte välja kandidatversion från paketet %s eftersom det inte har någon " +"kandidat" + +#: apt-pkg/cacheset.cc:844 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"Kan inte välja installerad version från paketet %s eftersom det inte är " +"installerat" + +#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Kan inte välja installerad version eller kandidatversion från paketet ”%s” " +"eftersom det inte har någon av dem" + # parametrar: filnamn, radnummer #. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports #: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140 @@ -2563,7 +2680,7 @@ msgstr "" #: apt-pkg/sourcelist.cc:251 #, fuzzy, c-format msgid "Malformed entry %u in %s file %s (%s)" -msgstr "Felaktig override %s rad %lu #1" +msgstr "Felaktig åsidosättning %s rad %llu (%s)" #: apt-pkg/sourcelist.cc:355 #, c-format @@ -2578,7 +2695,7 @@ msgstr "Rad %u i källistan %s har fel format (typ)" #: apt-pkg/sourcelist.cc:393 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" +msgstr "Typ ”%s” är inte känd på rad %u i källistan %s" #: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419 #, fuzzy, c-format @@ -2586,70 +2703,215 @@ msgid "Malformed stanza %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" #: apt-pkg/sourcelist.cc:429 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" +msgstr "Typen ”%s” är inte känd i post %u i källistan %s" -#: apt-pkg/cacheset.cc:500 +#: apt-pkg/deb/debmetaindex.cc:229 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" +msgid "Unable to parse Release file %s" +msgstr "Kunde inte tolka Release-filen %s" -#: apt-pkg/cacheset.cc:503 +#: apt-pkg/deb/debmetaindex.cc:238 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Version \"%s\" för \"%s\" hittades inte" +msgid "No sections in Release file %s" +msgstr "Inga sektioner i Release-filen %s" -#: apt-pkg/cacheset.cc:738 +#: apt-pkg/deb/debmetaindex.cc:278 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Kunde inte hitta funktionen \"%s\"" +msgid "No Hash entry in Release file %s" +msgstr "Ingen Hash-post i Release-filen %s" -#: apt-pkg/cacheset.cc:744 +#: apt-pkg/deb/debmetaindex.cc:286 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Ogiltig ”Date”-post i Release-filen %s" -#: apt-pkg/cacheset.cc:750 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" +#: apt-pkg/deb/debmetaindex.cc:307 +#, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Ogiltig ”Valid-Until”-post i Release-filen %s" -#: apt-pkg/cacheset.cc:789 +#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite +#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446 +#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462 +#: apt-pkg/deb/debmetaindex.cc:485 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +msgid "Conflicting values set for option %s concerning source %s %s" msgstr "" -"Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt" -#: apt-pkg/cacheset.cc:828 +#: apt-pkg/deb/debmetaindex.cc:480 #, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +msgid "Invalid value set for option %s concerning source %s %s (%s)" msgstr "" -"Kan inte välja senaste version från paketet \"%s\" eftersom det är helt " -"virtuellt" -#: apt-pkg/cacheset.cc:836 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "Installing %s" +msgstr "Installerar %s" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Configuring %s" +msgstr "Konfigurerar %s" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1014 +#, c-format +msgid "Removing %s" +msgstr "Tar bort %s" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, c-format +msgid "Completely removing %s" +msgstr "Tar bort hela %s" + +#: apt-pkg/deb/dpkgpm.cc:114 +#, c-format +msgid "Noting disappearance of %s" +msgstr "Uppmärksammar försvinnandet av %s" + +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Kör efterinstallationsutlösare %s" + +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:838 +#, c-format +msgid "Directory '%s' missing" +msgstr "Katalogen ”%s” saknas" + +#: apt-pkg/deb/dpkgpm.cc:853 apt-pkg/deb/dpkgpm.cc:875 +#, c-format +msgid "Could not open file '%s'" +msgstr "Kunde inte öppna filen ”%s”" + +#: apt-pkg/deb/dpkgpm.cc:1000 +#, c-format +msgid "Preparing %s" +msgstr "Förbereder %s" + +#: apt-pkg/deb/dpkgpm.cc:1001 +#, c-format +msgid "Unpacking %s" +msgstr "Packar upp %s" + +#: apt-pkg/deb/dpkgpm.cc:1006 +#, c-format +msgid "Preparing to configure %s" +msgstr "Förbereder konfigurering av %s" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Installed %s" +msgstr "Installerade %s" + +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Förbereder borttagning av %s" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Removed %s" +msgstr "Tog bort %s" + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Förbereder borttagning av hela %s" + +#: apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Completely removed %s" +msgstr "Tog bort hela %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, c-format +msgid "Can not write log (%s)" +msgstr "Kan inte skriva logg (%s)" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "Är /dev/pts monterad?" + +#: apt-pkg/deb/dpkgpm.cc:1656 +msgid "Operation was interrupted before it could finish" +msgstr "Åtgärden avbröts innan den kunde slutföras" + +#: apt-pkg/deb/dpkgpm.cc:1718 +msgid "No apport report written because MaxReports is reached already" +msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1723 +msgid "dependency problems - leaving unconfigured" +msgstr "beroendeproblem - lämnar okonfigurerad" + +#: apt-pkg/deb/dpkgpm.cc:1725 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Kan inte välja kandidatversion från paketet %s eftersom det inte har någon " -"kandidat" +"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är " +"ett efterföljande fel från ett tidigare problem." -#: apt-pkg/cacheset.cc:844 +#: apt-pkg/deb/dpkgpm.cc:1731 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" +"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " +"diskutrymmet är slut" + +#: apt-pkg/deb/dpkgpm.cc:1738 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" +"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " +"är slut" + +#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett problem " +"på det lokala systemet" + +#: apt-pkg/deb/dpkgpm.cc:1773 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" +"Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-" +"fel för dpkg" + +#: apt-pkg/deb/debsystem.cc:88 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -"Kan inte välja installerad version från paketet %s eftersom det inte är " -"installerat" +"Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?" -#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860 +#: apt-pkg/deb/debsystem.cc:91 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:107 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" " -"eftersom det inte har någon av dem" +"dpkg avbröts. Du måste köra ”%s” manuellt för att korrigera problemet. " + +#: apt-pkg/deb/debsystem.cc:125 +msgid "Not locked" +msgstr "Inte låst" #. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:420 @@ -2703,23 +2965,25 @@ msgstr "Kunde inte erhålla låset %s" #: apt-pkg/contrib/fileutl.cc:367 apt-pkg/contrib/fileutl.cc:481 #, c-format msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgstr "Lista över filer kan inte skapas eftersom ”%s” inte är en katalog" #: apt-pkg/contrib/fileutl.cc:401 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgstr "Ignorerar ”%s” i katalogen ”%s” eftersom det inte är en vanlig fil" #: apt-pkg/contrib/fileutl.cc:419 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" +"Ignorerar filen ”%s” i katalogen ”%s” eftersom den inte har en filändelse" #: apt-pkg/contrib/fileutl.cc:428 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" +"Ignorerar filen ”%s” i katalogen ”%s” eftersom den har en ogiltig filändelse" #: apt-pkg/contrib/fileutl.cc:862 #, c-format @@ -2765,14 +3029,14 @@ msgid "Failed to exec compressor " msgstr "Misslyckades med att starta komprimerare " #: apt-pkg/contrib/fileutl.cc:1607 -#, fuzzy, c-format +#, c-format msgid "read, still have %llu to read but none left" -msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" +msgstr "läsning, har fortfarande %llu att läsa men ingenting finns kvar" #: apt-pkg/contrib/fileutl.cc:1720 apt-pkg/contrib/fileutl.cc:1742 -#, fuzzy, c-format +#, c-format msgid "write, still have %llu to write but couldn't" -msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" +msgstr "skrivning, har fortfarande %llu att skriva men kunde inte" #: apt-pkg/contrib/fileutl.cc:2008 #, c-format @@ -2794,29 +3058,29 @@ msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" #: apt-pkg/contrib/fileutl.cc:2146 cmdline/apt-extracttemplates.cc:258 -#, fuzzy, c-format +#, c-format msgid "Unable to mkstemp %s" -msgstr "Kunde inte ta status på %s" +msgstr "Kunde inte anropa mkstemp för %s" #: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... Fel!" +msgstr "%c%s… Fel!" #: apt-pkg/contrib/progress.cc:150 #, c-format msgid "%c%s... Done" -msgstr "%c%s... Färdig" +msgstr "%c%s… Färdig" #: apt-pkg/contrib/progress.cc:181 msgid "..." -msgstr "" +msgstr "…" #. Print the spinner #: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format +#, c-format msgid "%c%s... %u%%" -msgstr "%c%s... Färdig" +msgstr "%c%s… %u%%" #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" @@ -2828,9 +3092,9 @@ msgid "Couldn't duplicate file descriptor %i" msgstr "Kunde inte duplicera filhandtag %i" #: apt-pkg/contrib/mmap.cc:119 -#, fuzzy, c-format +#, c-format msgid "Couldn't make mmap of %llu bytes" -msgstr "Kunde inte utföra mmap på %lu byte" +msgstr "Kunde inte utföra mmap på %llu byte" #: apt-pkg/contrib/mmap.cc:146 msgid "Unable to close mmap" @@ -2877,16 +3141,16 @@ msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Kunde inte ta status på monteringspunkten %s." +msgstr "Kunde inte ta status på monteringspunkten %s" #: apt-pkg/contrib/cdromutl.cc:247 msgid "Failed to stat the cdrom" -msgstr "Kunde inte ta status på cd-romen." +msgstr "Kunde inte ta status på cd-romen" #: apt-pkg/contrib/configuration.cc:516 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Okänd typförkortning: \"%c\"" +msgstr "Okänd typförkortning: ”%c”" #: apt-pkg/contrib/configuration.cc:630 #, c-format @@ -2926,7 +3190,7 @@ msgstr "Syntaxfel %s:%u: Inkluderad härifrån" #: apt-pkg/contrib/configuration.cc:894 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte" +msgstr "Syntaxfel %s:%u: Direktivet ”%s” stöds inte" #: apt-pkg/contrib/configuration.cc:897 #, c-format @@ -2943,7 +3207,7 @@ msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" msgid "" "Command line option '%c' [from %s] is not understood in combination with the " "other options." -msgstr "Kommandoradsflaggan \"%c\" [från %s] är inte känd." +msgstr "Kommandoradsflaggan ”%c” [från %s] är inte känd." #: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161 #: apt-pkg/contrib/cmndline.cc:169 @@ -2956,7 +3220,7 @@ msgstr "Förstår inte kommandoradsflaggan %s" #: apt-pkg/contrib/cmndline.cc:174 #, c-format msgid "Command line option %s is not boolean" -msgstr "Kommandoradsflaggan %s är inte boolsk" +msgstr "Kommandoradsflaggan %s är inte boolesk" #: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236 #, c-format @@ -2972,230 +3236,23 @@ msgstr "" #: apt-pkg/contrib/cmndline.cc:284 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\"" +msgstr "Flaggan %s kräver ett heltalsargument, inte ”%s”" #: apt-pkg/contrib/cmndline.cc:315 #, c-format msgid "Option '%s' is too long" -msgstr "Flaggan \"%s\" är för lång" +msgstr "Flaggan ”%s” är för lång" #: apt-pkg/contrib/cmndline.cc:347 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Förstår inte %s, prova med \"true\" eller \"false\"." +msgstr "Förstår inte %s, prova med ”true” eller ”false”." #: apt-pkg/contrib/cmndline.cc:397 #, c-format msgid "Invalid operation %s" msgstr "Felaktig åtgärd %s" -#: apt-pkg/deb/debmetaindex.cc:229 -#, c-format -msgid "Unable to parse Release file %s" -msgstr "Kunde inte tolka \"Release\"-filen %s" - -#: apt-pkg/deb/debmetaindex.cc:238 -#, c-format -msgid "No sections in Release file %s" -msgstr "Inga sektioner i Release-filen %s" - -#: apt-pkg/deb/debmetaindex.cc:278 -#, c-format -msgid "No Hash entry in Release file %s" -msgstr "Ingen Hash-post i Release-filen %s" - -#: apt-pkg/deb/debmetaindex.cc:286 -#, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Ogiltig \"Date\"-post i Release-filen %s" - -#: apt-pkg/deb/debmetaindex.cc:307 -#, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s" - -#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite -#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446 -#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462 -#: apt-pkg/deb/debmetaindex.cc:485 -#, c-format -msgid "Conflicting values set for option %s concerning source %s %s" -msgstr "" - -#: apt-pkg/deb/debmetaindex.cc:480 -#, c-format -msgid "Invalid value set for option %s concerning source %s %s (%s)" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:110 -#, c-format -msgid "Installing %s" -msgstr "Installerar %s" - -#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Configuring %s" -msgstr "Konfigurerar %s" - -#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1014 -#, c-format -msgid "Removing %s" -msgstr "Tar bort %s" - -#: apt-pkg/deb/dpkgpm.cc:113 -#, c-format -msgid "Completely removing %s" -msgstr "Tar bort hela %s" - -#: apt-pkg/deb/dpkgpm.cc:114 -#, c-format -msgid "Noting disappearance of %s" -msgstr "Uppmärksammar försvinnandet av %s" - -#: apt-pkg/deb/dpkgpm.cc:115 -#, c-format -msgid "Running post-installation trigger %s" -msgstr "Kör efterinstallationsutlösare %s" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:838 -#, c-format -msgid "Directory '%s' missing" -msgstr "Katalogen \"%s\" saknas" - -#: apt-pkg/deb/dpkgpm.cc:853 apt-pkg/deb/dpkgpm.cc:875 -#, c-format -msgid "Could not open file '%s'" -msgstr "Kunde inte öppna filen \"%s\"" - -#: apt-pkg/deb/dpkgpm.cc:1000 -#, c-format -msgid "Preparing %s" -msgstr "Förbereder %s" - -#: apt-pkg/deb/dpkgpm.cc:1001 -#, c-format -msgid "Unpacking %s" -msgstr "Packar upp %s" - -#: apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Preparing to configure %s" -msgstr "Förbereder konfigurering av %s" - -#: apt-pkg/deb/dpkgpm.cc:1008 -#, c-format -msgid "Installed %s" -msgstr "Installerade %s" - -#: apt-pkg/deb/dpkgpm.cc:1013 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Förbereder borttagning av %s" - -#: apt-pkg/deb/dpkgpm.cc:1015 -#, c-format -msgid "Removed %s" -msgstr "Tog bort %s" - -#: apt-pkg/deb/dpkgpm.cc:1020 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Förbereder borttagning av hela %s" - -#: apt-pkg/deb/dpkgpm.cc:1021 -#, c-format -msgid "Completely removed %s" -msgstr "Tog bort hela %s" - -#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Kunde inte skriva till %s" - -#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 -msgid "Is /dev/pts mounted?" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1656 -msgid "Operation was interrupted before it could finish" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1718 -msgid "No apport report written because MaxReports is reached already" -msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" - -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1723 -msgid "dependency problems - leaving unconfigured" -msgstr "beroendeproblem - lämnar okonfigurerad" - -#: apt-pkg/deb/dpkgpm.cc:1725 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är " -"ett efterföljande fel från ett tidigare problem." - -#: apt-pkg/deb/dpkgpm.cc:1731 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" -"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " -"diskutrymmet är slut" - -#: apt-pkg/deb/dpkgpm.cc:1738 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" -"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " -"är slut" - -#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751 -#, fuzzy -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" -"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " -"diskutrymmet är slut" - -#: apt-pkg/deb/dpkgpm.cc:1773 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "" -"Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-" -"fel för dpkg" - -#: apt-pkg/deb/debsystem.cc:88 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" -"Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?" - -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?" - -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:107 -#, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" -"dpkg avbröts. Du måste köra \"%s\" manuellt för att korrigera problemet. " - -#: apt-pkg/deb/debsystem.cc:125 -msgid "Not locked" -msgstr "Inte låst" - #: cmdline/apt-extracttemplates.cc:228 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" @@ -3209,7 +3266,7 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Användning: apt-extracttemplates fil1 [fil2 ...]\n" +"Användning: apt-extracttemplates fil1 [fil2 …]\n" "\n" "apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" "och mallinformation från paket\n" @@ -3303,16 +3360,17 @@ msgstr "" "\n" "apt-ftparchive skapar Package-filer från ett träd med .deb-filer.\n" "Packagefilen innehåller alla styrfälten från paketen samt MD5-hashvärdet\n" -"och filstorlek. En overrride-fil stöds för att tvinga värden på Priority\n" +"och filstorlek. En åsidosättningsfil stöds för att tvinga värden på " +"Priority\n" "och Section.\n" "\n" "På samma sätt skapar apt-ftparchive Sources-filer från ett träd med\n" ".dsc-filer. Flaggan --source-override kan användas för att ange en\n" -"override-fil för källkoden.\n" +"åsidosättningsfil för källkoden.\n" "\n" -"Kommandona \"packages\" och \"sources\" bör köras från rotet på trädet.\n" +"Kommandona ”packages” och ”sources” bör köras från roten på trädet.\n" "Binärsökvägen bör peka på basen på den rekursiva sökningen och\n" -"override-filen bör innehålla override-flaggorna de framtvingade flaggorna.\n" +"åsidosättningsfilen bör innehålla de framtvingade flaggorna.\n" "Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel på\n" "hur programmet kan användas från Debianarkivet:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" @@ -3321,10 +3379,10 @@ msgstr "" "Flaggor:\n" " -h Denna hjälptext\n" " --md5 Kontrollera generering av MD5\n" -" -s=? Källkods-override-fil\n" +" -s=? Källåsidosättningsfil\n" " -q Tyst\n" " -d=? Väljer den valfria cachedatabasen\n" -" --no-delink Aktivera \"delinkning\"-felsökningsläget\n" +" --no-delink Aktivera ”delinkning”-felsökningsläget\n" " --contents Styr skapande av contents-fil\n" " -c=? Läs denna konfigurationsfil\n" " -o=? Ställ in en godtycklig konfigurationsflagga" @@ -3336,7 +3394,7 @@ msgstr "Inga val träffades" #: ftparchive/apt-ftparchive.cc:892 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Några filer saknas i paketfilsgruppen \"%s\"" +msgstr "Några filer saknas i paketfilsgruppen ”%s”" #: ftparchive/cachedb.cc:68 #, c-format @@ -3368,9 +3426,8 @@ msgid "Failed to stat %s" msgstr "Misslyckades med att ta status på %s" #: ftparchive/cachedb.cc:327 -#, fuzzy msgid "Failed to read .dsc" -msgstr "Misslyckades med att läsa länken %s" +msgstr "Misslyckades med att läsa .dsc" #: ftparchive/cachedb.cc:360 msgid "Archive has no control record" @@ -3450,7 +3507,7 @@ msgstr "Arkivet har inget package-fält" #: ftparchive/writer.cc:434 ftparchive/writer.cc:698 #, c-format msgid " %s has no override entry\n" -msgstr " %s har ingen post i override-filen\n" +msgstr " %s har ingen post i åsidosättningsfilen\n" # parametrar: paket, ny, gammal #: ftparchive/writer.cc:501 ftparchive/writer.cc:855 @@ -3481,9 +3538,9 @@ msgstr "Kunde inte öppna %s" #. skip spaces #. find end of word #: ftparchive/override.cc:68 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu (%s)" -msgstr "Felaktig override %s rad %lu #1" +msgstr "Felaktig åsidosättning %s rad %llu (%s)" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format @@ -3492,24 +3549,24 @@ msgstr "Misslyckades med att läsa åsidosättningsfilen %s" # parametrar: filnamn, radnummer #: ftparchive/override.cc:166 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #1" -msgstr "Felaktig override %s rad %lu #1" +msgstr "Felaktig åsidosättning %s rad %llu #1" #: ftparchive/override.cc:178 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #2" -msgstr "Felaktig override %s rad %lu #2" +msgstr "Felaktig åsidosättning %s rad %llu #2" #: ftparchive/override.cc:191 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #3" -msgstr "Felaktig override %s rad %lu #3" +msgstr "Felaktig åsidosättning %s rad %llu #3" #: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Okänd komprimeringsalgoritm \"%s\"" +msgstr "Okänd komprimeringsalgoritm ”%s”" # ??? #: ftparchive/multicompress.cc:102 @@ -3523,7 +3580,7 @@ msgstr "Misslyckades med att grena process" #: ftparchive/multicompress.cc:206 msgid "Compress child" -msgstr "Barnprocess för komprimering" +msgstr "Underprocess för komprimering" #: ftparchive/multicompress.cc:229 #, c-format @@ -3549,7 +3606,6 @@ msgid "Failed to rename %s to %s" msgstr "Misslyckades med att byta namn på %s till %s" #: cmdline/apt-internal-solver.cc:50 -#, fuzzy msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3562,14 +3618,15 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Användning: apt-extracttemplates fil1 [fil2 ...]\n" +"Användning: apt-internal-solver\n" "\n" -"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" -"och mallinformation från paket\n" +"apt-internal-solver är ett gränssnitt för att använda den interna\n" +"lösaren som en extern lösare för APT-familjen för felsökning eller\n" +"liknande\n" "\n" "Flaggor:\n" " -h Denna hjälptext.\n" -" -t Ställ in temporärkatalogen.\n" +" -q Loggbar utmatning - ingen förloppsindikator\n" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" @@ -3590,7 +3647,7 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n" +"Användning: apt-sortpkgs [flaggor] fil1 [fil2 …]\n" "\n" "apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n" "-s anges för att ange filens typ.\n" @@ -3698,7 +3755,7 @@ msgstr "Misslyckades med att stänga filen %s" #: apt-inst/deb/debfile.cc:63 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" +msgstr "Detta är inte ett giltigt DEB-arkiv, delen ”%s” saknas" #: apt-inst/deb/debfile.cc:132 #, c-format @@ -3740,7 +3797,7 @@ msgstr "Misslyckades med att skapa rör" #: apt-inst/contrib/extracttar.cc:150 msgid "Failed to exec gzip " -msgstr "Misslyckades med att köra gzip" +msgstr "Misslyckades med att köra gzip " #: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217 msgid "Corrupted archive" @@ -3758,12 +3815,19 @@ msgstr "Okänd TAR-rubriktyp %u, del %s" #~ msgid "%s %s for %s compiled on %s %s\n" #~ msgstr "%s %s för %s kompilerad den %s %s\n" +#, fuzzy +#~ msgid "There are problems and -y was used without --force-yes" +#~ msgstr "Problem har uppstått och -y användes utan --force-yes" + +#, fuzzy +#~ msgid "The following extra packages will be installed:" +#~ msgstr "Följande NYA paket kommer att installeras:" + #~ msgid "Failed to create FILE*" #~ msgstr "Misslyckades med att skapa FILE*" -#, fuzzy #~ msgid "Malformed stanza %u in source list %s (URI parse)" -#~ msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" +#~ msgstr "Post %u i källistan %s har fel format (URI-tolkning)" #~ msgid "Malformed line %lu in source list %s ([option] unparseable)" #~ msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)" @@ -3782,7 +3846,7 @@ msgstr "Okänd TAR-rubriktyp %u, del %s" #~ "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)" #~ msgid "Malformed line %lu in source list %s (URI)" -#~ msgstr "Rad %lu i källistan %s har (URI)" +#~ msgstr "Rad %lu i källistan %s har fel format (URI)" #~ msgid "Malformed line %lu in source list %s (dist)" #~ msgstr "Rad %lu i källistan %s har fel format (dist)" @@ -3806,13 +3870,23 @@ msgstr "Okänd TAR-rubriktyp %u, del %s" #~ msgid "Collecting File Provides" #~ msgstr "Samlar filtillhandahållningar" -#, fuzzy +#~ msgid "Does not start with a cleartext signature" +#~ msgstr "Börjar inte med en klartextsignatur" + #~ msgid "Unable to find hash sum for '%s' in Release file" -#~ msgstr "Kunde inte tolka \"Release\"-filen %s" +#~ msgstr "Kunde inte hitta hash-kontrollsumma för ”%s” i Release-filen" #~ msgid "Vendor block %s contains no fingerprint" #~ msgstr "Leverantörsblocket %s saknar fingeravtryck" +#, fuzzy +#~ msgid "Command line option '%c' [from %s] is not known." +#~ msgstr "Kommandoradsflaggan %s är inte boolesk" + +#, fuzzy +#~ msgid "Command line option %s is not understood" +#~ msgstr "Kommandoradsflaggan %s är inte boolesk" + #~ msgid "Total dependency version space: " #~ msgstr "Totalt utrymme för versionsberoenden: " @@ -3822,6 +3896,26 @@ msgstr "Okänd TAR-rubriktyp %u, del %s" #~ msgid "Done" #~ msgstr "Färdig" +# Måste vara tre bokstäver(?) +# "Hit" = aktuell version är fortfarande giltig +#~ msgid "Hit " +#~ msgstr "Bra " + +# "Get:" = hämtar ny version +#~ msgid "Get:" +#~ msgstr "Läs:" + +# "Ign" = hoppar över +#~ msgid "Ign " +#~ msgstr "Ign " + +# "Err" = fel vid hämtning +#~ msgid "Err " +#~ msgstr "Fel " + +#~ msgid "Unable to parse package file %s (2)" +#~ msgstr "Kunde inte tolka paketfilen %s (2)" + #~ msgid "No keyring installed in %s." #~ msgstr "Ingen nyckelring installerad i %s." diff --git a/test/integration/framework b/test/integration/framework index d9282eede..03f1be114 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1196,9 +1196,16 @@ checkdiff() { } testfileequal() { + local MSG='Test for correctness of file' + if [ "$1" = '--nomsg' ]; then + MSG='' + shift + fi local FILE="$1" shift - msgtest "Test for correctness of file" "$FILE" + if [ -n "$MSG" ]; then + msgtest "$MSG" "$FILE" + fi if [ -z "$*" ]; then echo -n "" | checkdiff - $FILE && msgpass || msgfail else @@ -1555,7 +1562,7 @@ listcurrentlistsdirectory() { } | sort } -### convinience hacks ### +### convenience hacks ### mkdir() { # creating some directories by hand is a tedious task, so make it look simple if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] || diff --git a/test/integration/test-apt-by-hash-update b/test/integration/test-apt-by-hash-update index 2229e991d..cef46a1b8 100755 --- a/test/integration/test-apt-by-hash-update +++ b/test/integration/test-apt-by-hash-update @@ -11,7 +11,7 @@ insertpackage 'unstable' 'foo' 'all' '1.0' setupaptarchive --no-update -# make Packages *only* accessable by-hash for this test +# make Packages *only* accessible by-hash for this test mkdir -p aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512 (cd aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512 && mv ../../Packages* . && diff --git a/test/integration/test-apt-extracttemplates b/test/integration/test-apt-extracttemplates index 5dadc4933..8f335589e 100755 --- a/test/integration/test-apt-extracttemplates +++ b/test/integration/test-apt-extracttemplates @@ -10,7 +10,7 @@ configarchitecture 'amd64' # apt-extracttemplates needs this insertinstalledpackage 'pkg-with-template' 'amd64' '1.0' -# build a simple package that contains a config and a tempalte +# build a simple package that contains a config and a template mkdir -p DEBIAN CONFIG_STR="#!/bin/sh random shell stuff diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog index 5fa8543b9..6ca05d0fa 100755 --- a/test/integration/test-apt-get-changelog +++ b/test/integration/test-apt-get-changelog @@ -60,14 +60,15 @@ testsuccessequal "'http://localhost:8080/main/f/foo/foo_1.0/change.txt' foo.chan echo 'Acquire::Changelogs::URI::Label::Testcases "http://localhost:8080/pool/CHANGEPATH/changelog";' > rootdir/etc/apt/apt.conf.d/changelog.conf testsuccessequal "'http://localhost:8080/pool/main/f/foo/foo_1.0/changelog' foo.changelog" aptget changelog foo --print-uris -cd downloaded testsuccess aptget changelog foo -qq -testfileequal '../rootdir/tmp/testsuccess.output' "$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog)" +testfileequal 'rootdir/tmp/testsuccess.output' "$(cat aptarchive/pool/main/f/foo/foo_1.0/changelog)" testsuccess aptget changelog foo libbar -qq -testfileequal '../rootdir/tmp/testsuccess.output' "$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog) -$(cat ../aptarchive/pool/main/libb/libbar/libbar_1.0/changelog)" +testfileequal 'rootdir/tmp/testsuccess.output' "$(cat aptarchive/pool/main/f/foo/foo_1.0/changelog) +$(cat aptarchive/pool/main/libb/libbar/libbar_1.0/changelog)" + +cd downloaded testsuccess aptget changelog foo -d testfilestats 'foo.changelog' '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644" diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb index bd720bede..65951cede 100755 --- a/test/integration/test-apt-get-install-deb +++ b/test/integration/test-apt-get-install-deb @@ -60,3 +60,21 @@ The following NEW packages will be installed: Remv foo:i386 [1.0] Inst foo (1.0 local-deb [amd64]) Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s -q=0 + +# Check that installing the local deb works if it is not the candidate +echo "Package: foo +Pin: version 1.0 +Pin-Priority: -1" > rootdir/etc/apt/preferences + +testsuccessequal "Reading package lists... +Building dependency tree... +Reading state information... +Note, selecting 'foo' instead of './incoming/foo_1.0_amd64.deb' +The following packages will be REMOVED: + foo:i386 +The following NEW packages will be installed: + foo +0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded. +Remv foo:i386 [1.0] +Inst foo (1.0 local-deb [amd64]) +Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s -q=0 diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source index 22f01b997..03320754b 100755 --- a/test/integration/test-apt-get-source +++ b/test/integration/test-apt-get-source @@ -50,11 +50,20 @@ $DOWNLOAD1" aptget source -q --print-uris foo/stable testsuccessequal "$HEADER Selected version '2.0' (unstable) for foo $DOWNLOAD2" aptget source -q --print-uris foo/unstable +testsuccessequal "$HEADER +Selected version '1.0' (stable) for foo +$DOWNLOAD1" aptget source -q --print-uris foo -t stable +testsuccessequal "$HEADER +Selected version '2.0' (unstable) for foo +$DOWNLOAD2" aptget source -q --print-uris foo -t unstable # select by release: codename testsuccessequal "$HEADER Selected version '2.0' (sid) for foo $DOWNLOAD2" aptget source -q --print-uris foo/sid +testsuccessequal "$HEADER +Selected version '2.0' (sid) for foo +$DOWNLOAD2" aptget source -q --print-uris foo -t sid # select by version testsuccessequal "$HEADER diff --git a/test/integration/test-apt-translation-has-no-packages b/test/integration/test-apt-translation-has-no-packages index ec2e1e43b..fec525568 100755 --- a/test/integration/test-apt-translation-has-no-packages +++ b/test/integration/test-apt-translation-has-no-packages @@ -4,7 +4,7 @@ # Translation-$lang file on disk that is actually a Packages file. In this # case apt used to generate invalid package versions out of the # Translation-$lang file (i.e. apt-cache policy foo) would show a version -# comming out of a Translation file. Downloading this versions fails as +# coming out of a Translation file. Downloading this versions fails as # there is no acquire method available for the package # set -e diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback index 6e9db2cae..dae537c32 100755 --- a/test/integration/test-apt-update-nofallback +++ b/test/integration/test-apt-update-nofallback @@ -115,7 +115,7 @@ test_cve_2012_0214() # the unauthenticated Release file too giving the false impression that # Release was authenticated # - # Note that this is pretty much impossible nowdays because: + # Note that this is pretty much impossible nowadays because: # a) InRelease is left as is, not split to InRelease/Release as it was # in the old days # b) we refuse to go from signed->unsigned diff --git a/test/integration/test-bug-796070-downgrade-realpkg b/test/integration/test-bug-796070-downgrade-realpkg new file mode 100755 index 000000000..3ad4fda3e --- /dev/null +++ b/test/integration/test-bug-796070-downgrade-realpkg @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'i386' + +buildsimplenativepackage 'apt' 'all' '1.0.10.1' 'stable' 'Depends: libapt-pkg4.16 (>= 1.0.10.1)' +buildsimplenativepackage 'libapt-pkg4.16' 'all' '1.0.10.1' 'stable' 'Breaks: apt (<< 0.9.4~), libapt-inst1.5 (<< 0.9.9~)' +buildsimplenativepackage 'libapt-pkg5.0' 'all' '1.1~exp9' 'unstable' 'Breaks: apt (<< 1.1~exp4), libapt-inst1.5 (<< 0.9.9~)' +buildsimplenativepackage 'apt' 'all' '1.1~exp9' 'unstable' 'Depends: libapt-pkg5.0' + +setupaptarchive + +# Check with the APT name, aka essential +testsuccess aptget install apt -t stable -y +testsuccess aptget dist-upgrade -y + +testsuccess aptget install apt/stable -y --allow-downgrades -o Debug::pkgPackageManager=1 #-o Debug::pkgDpkgPM=1 +testdpkginstalled apt libapt-pkg4.16 +testdpkgnotinstalled libapt-pkg5.0 diff --git a/test/integration/test-bug-796070-downgrade-simulate b/test/integration/test-bug-796070-downgrade-simulate new file mode 100755 index 000000000..0b4817d39 --- /dev/null +++ b/test/integration/test-bug-796070-downgrade-simulate @@ -0,0 +1,67 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'i386' + +insertpackage 'unstable' 'apt' 'all' '1.0.10.1' 'Depends: libapt-pkg4.16 (>= 1.0.10.1)' +insertinstalledpackage 'libapt-pkg4.16' 'all' '1.0.10.1' 'Breaks: apt (<< 0.9.4~), libapt-inst1.5 (<< 0.9.9~)' +insertinstalledpackage 'libapt-pkg5.0' 'all' '1.1~exp9' 'Breaks: apt (<< 1.1~exp4), libapt-inst1.5 (<< 0.9.9~)' +insertinstalledpackage 'apt' 'all' '1.1~exp9' 'Depends: libapt-pkg5.0' + +insertpackage 'unstable' 'napt' 'all' '1.0.10.1' 'Depends: nlibapt-pkg4.16 (>= 1.0.10.1)' +insertinstalledpackage 'nlibapt-pkg4.16' 'all' '1.0.10.1' 'Breaks: napt (<< 0.9.4~), nlibapt-inst1.5 (<< 0.9.9~)' +insertinstalledpackage 'nlibapt-pkg5.0' 'all' '1.1~exp9' 'Breaks: napt (<< 1.1~exp4), nlibapt-inst1.5 (<< 0.9.9~)' +insertinstalledpackage 'napt' 'all' '1.1~exp9' 'Depends: nlibapt-pkg5.0' + +insertpackage 'unstable' 'eapt' 'all' '1.0.10.1' 'Depends: elibapt-pkg4.16 (>= 1.0.10.1) +Essential: yes' +insertinstalledpackage 'elibapt-pkg4.16' 'all' '1.0.10.1' 'Breaks: eapt (<< 0.9.4~), elibapt-inst1.5 (<< 0.9.9~)' +insertinstalledpackage 'elibapt-pkg5.0' 'all' '1.1~exp9' 'Breaks: eapt (<< 1.1~exp4), elibapt-inst1.5 (<< 0.9.9~)' +insertinstalledpackage 'eapt' 'all' '1.1~exp9' 'Depends: elibapt-pkg5.0 +Essential: yes' + + +setupaptarchive + + +# Check with a normal package +testsuccessequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + nlibapt-pkg5.0 +The following packages will be DOWNGRADED: + napt +0 upgraded, 0 newly installed, 1 downgraded, 1 to remove and 0 not upgraded. +Remv nlibapt-pkg5.0 [1.1~exp9] [napt:i386 ] +Inst napt [1.1~exp9] (1.0.10.1 unstable [all]) +Conf napt (1.0.10.1 unstable [all])' apt install -s napt=1.0.10.1 + + +# Check with Essential +testsuccessequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + elibapt-pkg5.0 +The following packages will be DOWNGRADED: + eapt +0 upgraded, 0 newly installed, 1 downgraded, 1 to remove and 0 not upgraded. +Inst eapt [1.1~exp9] (1.0.10.1 unstable [all]) [elibapt-pkg5.0:i386 on eapt:i386] [elibapt-pkg5.0:i386 ] +Remv elibapt-pkg5.0 [1.1~exp9] +Conf eapt (1.0.10.1 unstable [all])' apt install -s eapt=1.0.10.1 + + +# Check with the APT name, aka essential +testsuccessequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + libapt-pkg5.0 +The following packages will be DOWNGRADED: + apt +0 upgraded, 0 newly installed, 1 downgraded, 1 to remove and 0 not upgraded. +Inst apt [1.1~exp9] (1.0.10.1 unstable [all]) [libapt-pkg5.0:i386 on apt:i386] [libapt-pkg5.0:i386 ] +Remv libapt-pkg5.0 [1.1~exp9] +Conf apt (1.0.10.1 unstable [all])' apt install -s apt=1.0.10.1 diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index c4d1455eb..60aa4421a 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -264,7 +264,7 @@ Acquire::AllowInsecureRepositories "1"; Acquire::AllowDowngradeToInsecureRepositories "1"; EOF -msgmsg "Runing base test" +msgmsg "Running base test" runtest2 DELETEFILE="InRelease" diff --git a/test/integration/test-sourceslist-target-plusminus-options b/test/integration/test-sourceslist-target-plusminus-options new file mode 100755 index 000000000..00d9085a0 --- /dev/null +++ b/test/integration/test-sourceslist-target-plusminus-options @@ -0,0 +1,66 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +testtargets() { + msgtest 'Test acquired targets for' "$1" + shift + while [ -n "$1" ]; do + echo "$1" + shift + done | sort -u > expectedtargets.lst + aptget indextargets --no-release-info --format='$(CREATED_BY)' | sort -u > gottargets.lst + testfileequal --nomsg ./expectedtargets.lst "$(cat ./gottargets.lst)" +} + +echo 'deb http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'default' 'Packages' 'Translations' + +cat > rootdir/etc/apt/apt.conf.d/content-target.conf <<EOF +Acquire::IndexTargets::deb::Contents { + MetaKey "\$(COMPONENT)/Contents-\$(ARCHITECTURE)"; + ShortDescription "Contents"; + Description "\$(RELEASE)/\$(COMPONENT) \$(ARCHITECTURE) Contents"; +}; +EOF +testtargets 'default + Contents' 'Packages' 'Translations' 'Contents' + +echo 'deb [target=Packages] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'force Packages target' 'Packages' + +echo 'deb [target=Contents] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'force Contents target' 'Contents' + +echo 'deb [target=Translations,Contents] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'force two targets' 'Contents' 'Translations' + +echo 'deb [target+=Translations,Contents] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'add existing' 'Packages' 'Contents' 'Translations' + +echo 'deb [target+=AppStream] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'add non-existing' 'Packages' 'Contents' 'Translations' + +echo 'deb [target-=Translations,Contents] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'remove existing' 'Packages' + +echo 'deb [target-=AppStream] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'remove non-existing' 'Packages' 'Contents' 'Translations' + +echo 'deb [AppStream=yes] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'activate non-existing' 'Packages' 'Contents' 'Translations' + +echo 'deb [AppStream=no] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'deactivate non-existing' 'Packages' 'Contents' 'Translations' + +echo 'deb [Contents=yes] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'activate existing' 'Packages' 'Contents' 'Translations' + +echo 'deb [Contents=no] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'deactivate existing' 'Packages' 'Translations' + +echo 'deb [target=Packages Contents=yes] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'explicit + activate' 'Packages' 'Contents' |