diff -Nru apt-2.5.6/apt-pkg/acquire-item.cc apt-2.6.0/apt-pkg/acquire-item.cc --- apt-2.5.6/apt-pkg/acquire-item.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/acquire-item.cc 2023-03-06 12:26:39.000000000 +0000 @@ -2030,7 +2030,6 @@ string const PartialRelease = GetPartialFileNameFromURI(DetachedDataTarget.URI); string const FinalInRelease = GetFinalFilename(); Rename(DestFile, PartialRelease); - TransactionManager->TransactionStageCopy(this, PartialRelease, FinalRelease); LoadLastMetaIndexParser(TransactionManager, FinalRelease, FinalInRelease); // we parse the indexes here because at this point the user wanted @@ -2038,7 +2037,10 @@ if (TransactionManager->MetaIndexParser->Load(PartialRelease, &ErrorText) == false || VerifyVendor(Message) == false) /* expired Release files are still a problem you need extra force for */; else + { + TransactionManager->TransactionStageCopy(this, PartialRelease, FinalRelease); TransactionManager->QueueIndexes(true); + } } } } @@ -2247,9 +2249,10 @@ if (MetaIndex->VerifyVendor(Message) == false) /* expired Release files are still a problem you need extra force for */; else + { + TransactionManager->TransactionStageCopy(MetaIndex, MetaIndex->DestFile, FinalRelease); TransactionManager->QueueIndexes(GoodLoad); - - TransactionManager->TransactionStageCopy(MetaIndex, MetaIndex->DestFile, FinalRelease); + } } else if (TransactionManager->IMSHit == false) Rename(MetaIndex->DestFile, MetaIndex->DestFile + ".FAILED"); @@ -3710,17 +3713,62 @@ pkgCache::PkgIterator const Pkg = Ver.ParentPkg(); if (Pkg->CurrentVer != 0 && Pkg.CurrentVer() == Ver) { - std::string const root = _config->FindDir("Dir"); - std::string const basename = root + std::string("usr/share/doc/") + Pkg.Name() + "/changelog"; - std::string const debianname = basename + ".Debian"; - if (FileExists(debianname)) - return "copy://" + debianname; - else if (FileExists(debianname + ".gz")) - return "store://" + debianname + ".gz"; - else if (FileExists(basename)) - return "copy://" + basename; - else if (FileExists(basename + ".gz")) - return "store://" + basename + ".gz"; + auto const LocalFile = [](pkgCache::PkgIterator const &Pkg) -> std::string { + std::string const root = _config->FindDir("Dir"); + std::string const basename = root + std::string("usr/share/doc/") + Pkg.Name() + "/changelog"; + std::string const debianname = basename + ".Debian"; + auto const exts = APT::Configuration::getCompressorExtensions(); // likely we encounter only .gz + for (auto file : { debianname, basename }) + { + if (FileExists(file)) + return "copy://" + file; + for (auto const& ext : exts) + { + auto const compressedfile = file + ext; + if (FileExists(compressedfile)) + return "store://" + compressedfile; + } + } + return ""; + }(Pkg); + if (not LocalFile.empty()) + { + _error->PushToStack(); + FileFd trimmed; + if (APT::String::Startswith(LocalFile, "copy://")) + trimmed.Open(LocalFile.substr(7), FileFd::ReadOnly, FileFd::None); + else + trimmed.Open(LocalFile.substr(8), FileFd::ReadOnly, FileFd::Extension); + + bool trimmedFile = false; + if (trimmed.IsOpen()) + { + /* We want to look at the last line… in a (likely) compressed file, + which means we more or less have to uncompress the entire file. + So we skip ahead the filesize minus our choosen line size in + the hope that changelogs don't grow by being compressed to + avoid doing this costly dance on at least a bit of the file. */ + char buffer[150]; + if (auto const filesize = trimmed.FileSize(); filesize > sizeof(buffer)) + trimmed.Skip(filesize - sizeof(buffer)); + std::string_view giveaways[] = { + "# To read the complete changelog use", // Debian + "# For older changelog entries, run", // Ubuntu + }; + while (trimmed.ReadLine(buffer, sizeof(buffer)) != nullptr) + { + std::string_view const line{buffer}; + if (std::any_of(std::begin(giveaways), std::end(giveaways), [=](auto const gw) { return line.compare(0, gw.size(), gw) == 0; })) + { + trimmedFile = true; + break; + } + } + } + _error->RevertToStack(); + if (not trimmedFile) + return LocalFile; + } } } diff -Nru apt-2.5.6/apt-pkg/cdrom.cc apt-2.6.0/apt-pkg/cdrom.cc --- apt-2.5.6/apt-pkg/cdrom.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/cdrom.cc 2023-03-06 12:26:39.000000000 +0000 @@ -222,6 +222,8 @@ Res += 20; if (Path.find("/non-free/") != string::npos) Res += 20; + if (Path.find("/non-free-firmware/") != string::npos) + Res += 20; if (Path.find("/non-US/") != string::npos) Res += 20; if (Path.find("/source/") != string::npos) diff -Nru apt-2.5.6/apt-pkg/contrib/cmndline.cc apt-2.6.0/apt-pkg/contrib/cmndline.cc --- apt-2.5.6/apt-pkg/contrib/cmndline.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/cmndline.cc 2023-03-06 12:26:39.000000000 +0000 @@ -1,9 +1,13 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### Command Line Class - Sophisticated command line parser + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe . diff -Nru apt-2.5.6/apt-pkg/contrib/configuration.cc apt-2.6.0/apt-pkg/contrib/configuration.cc --- apt-2.5.6/apt-pkg/contrib/configuration.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/configuration.cc 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -8,9 +9,12 @@ for a tree-oriented configuration environment. All runtime configuration is stored in here. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe . - + ##################################################################### */ /*}}}*/ // Include files /*{{{*/ diff -Nru apt-2.5.6/apt-pkg/contrib/error.cc apt-2.6.0/apt-pkg/contrib/error.cc --- apt-2.5.6/apt-pkg/contrib/error.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/error.cc 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -7,6 +8,9 @@ We use a simple STL vector to store each error record. A PendingFlag is kept which indicates when the vector contains a Sever error. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. diff -Nru apt-2.5.6/apt-pkg/contrib/error.h apt-2.6.0/apt-pkg/contrib/error.h --- apt-2.5.6/apt-pkg/contrib/error.h 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/error.h 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -31,6 +32,9 @@ if (open(..)) return _error->Errno(..); + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. diff -Nru apt-2.5.6/apt-pkg/contrib/fileutl.cc apt-2.6.0/apt-pkg/contrib/fileutl.cc --- apt-2.5.6/apt-pkg/contrib/fileutl.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/fileutl.cc 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -7,6 +8,9 @@ CopyFile - Buffered copy of a single file GetLock - dpkg compatible lock file manipulation (fcntl) + This file had this historic note, but now includes further changes + under the GPL-2.0+: + Most of this source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe . @@ -14,6 +18,10 @@ The exception is RunScripts() it is under the GPLv2 + We believe that this reference to GPLv2 was not meant to exclude later + versions as that would have changed the overall project license from GPL-2+ + to GPL-2. + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ diff -Nru apt-2.5.6/apt-pkg/contrib/fileutl.h apt-2.6.0/apt-pkg/contrib/fileutl.h --- apt-2.5.6/apt-pkg/contrib/fileutl.h 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/fileutl.h 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -12,6 +13,9 @@ The file class is a handy abstraction for various functions+classes that need to accept filenames. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. diff -Nru apt-2.5.6/apt-pkg/contrib/macros.h apt-2.6.0/apt-pkg/contrib/macros.h --- apt-2.5.6/apt-pkg/contrib/macros.h 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/macros.h 2023-03-06 12:26:39.000000000 +0000 @@ -1,9 +1,13 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### Macros Header - Various useful macro definitions + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Brian C. White. diff -Nru apt-2.5.6/apt-pkg/contrib/mmap.h apt-2.6.0/apt-pkg/contrib/mmap.h --- apt-2.5.6/apt-pkg/contrib/mmap.h 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/mmap.h 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -16,9 +17,12 @@ generators. It provides a large allocated workspace and members to allocate space from the workspace in an efficient fashion. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. - + ##################################################################### */ /*}}}*/ #ifndef PKGLIB_MMAP_H diff -Nru apt-2.5.6/apt-pkg/contrib/netrc.cc apt-2.6.0/apt-pkg/contrib/netrc.cc --- apt-2.5.6/apt-pkg/contrib/netrc.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/netrc.cc 2023-03-06 12:26:39.000000000 +0000 @@ -1,10 +1,14 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### netrc file parser - returns the login and password of a give host in a specified netrc-type file + This file had this historic note, but now includes further changes + under the GPL-2.0+: + Originally written by Daniel Stenberg, , et al. and placed into the Public Domain, do with it what you will. diff -Nru apt-2.5.6/apt-pkg/contrib/netrc.h apt-2.6.0/apt-pkg/contrib/netrc.h --- apt-2.5.6/apt-pkg/contrib/netrc.h 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/netrc.h 2023-03-06 12:26:39.000000000 +0000 @@ -1,10 +1,14 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### netrc file parser - returns the login and password of a give host in a specified netrc-type file + This file had this historic note, but now includes further changes + under the GPL-2.0+: + Originally written by Daniel Stenberg, , et al. and placed into the Public Domain, do with it what you will. diff -Nru apt-2.5.6/apt-pkg/contrib/strutl.cc apt-2.6.0/apt-pkg/contrib/strutl.cc --- apt-2.5.6/apt-pkg/contrib/strutl.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/strutl.cc 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -8,6 +9,9 @@ things to strings. They are useful in file parsers, URI handlers and especially in APT methods. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe diff -Nru apt-2.5.6/apt-pkg/contrib/strutl.h apt-2.6.0/apt-pkg/contrib/strutl.h --- apt-2.5.6/apt-pkg/contrib/strutl.h 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/contrib/strutl.h 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -7,6 +8,9 @@ _strstrip is a function to remove whitespace from the front and end of a string. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe diff -Nru apt-2.5.6/apt-pkg/depcache.cc apt-2.6.0/apt-pkg/depcache.cc --- apt-2.5.6/apt-pkg/depcache.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-pkg/depcache.cc 2023-03-06 12:26:39.000000000 +0000 @@ -67,24 +67,38 @@ /*}}}*/ // helper for Install-Recommends-Sections and Never-MarkAuto-Sections /*{{{*/ -static bool -ConfigValueInSubTree(const char* SubTree, const char *needle) +// FIXME: Has verbatim copy in cmdline/apt-mark.cc +static bool ConfigValueInSubTree(const char* SubTree, std::string_view const needle) { - Configuration::Item const *Opts; - Opts = _config->Tree(SubTree); - if (Opts != 0 && Opts->Child != 0) + if (needle.empty()) + return false; + Configuration::Item const *Opts = _config->Tree(SubTree); + if (Opts != nullptr && Opts->Child != nullptr) { Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) + for (; Opts != nullptr; Opts = Opts->Next) { - if (Opts->Value.empty() == true) + if (Opts->Value.empty()) continue; - if (strcmp(needle, Opts->Value.c_str()) == 0) + if (needle == Opts->Value) return true; } } return false; } +static bool SectionInSubTree(char const * const SubTree, std::string_view Needle) +{ + if (ConfigValueInSubTree(SubTree, Needle)) + return true; + auto const sub = Needle.rfind('/'); + if (sub == std::string_view::npos) + { + std::string special{"/"}; + special.append(Needle); + return ConfigValueInSubTree(SubTree, special); + } + return ConfigValueInSubTree(SubTree, Needle.substr(sub + 1)); +} /*}}}*/ pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) : /*{{{*/ d(NULL), cache(cache), released(false) @@ -1050,7 +1064,7 @@ // We do not check for or-groups here as we don't know which package takes care of // providing the feature the user likes e.g.: browser1 | browser2 | browser3 // Temporary removals are effected by this as well, which is bad, but unlikely in practice - bool const PinNeverMarkAutoSection = (PV->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", PV.Section())); + bool const PinNeverMarkAutoSection = (PV->Section != 0 && SectionInSubTree("APT::Never-MarkAuto-Sections", PV.Section())); if (PinNeverMarkAutoSection) { for (DepIterator D = PV.DependsList(); D.end() != true; ++D) @@ -1761,8 +1775,8 @@ VerIterator const CurVer = Pkg.CurrentVer(); if (not CurVer.end() && CurVer->Section != 0 && strcmp(CurVer.Section(), PV.Section()) != 0) { - bool const CurVerInMoveSection = ConfigValueInSubTree("APT::Move-Autobit-Sections", CurVer.Section()); - bool const InstVerInMoveSection = ConfigValueInSubTree("APT::Move-Autobit-Sections", PV.Section()); + bool const CurVerInMoveSection = SectionInSubTree("APT::Move-Autobit-Sections", CurVer.Section()); + bool const InstVerInMoveSection = SectionInSubTree("APT::Move-Autobit-Sections", PV.Section()); return (not CurVerInMoveSection && InstVerInMoveSection); } return false; @@ -2254,7 +2268,7 @@ // FIXME: this is a meant as a temporary solution until the // recommends are cleaned up const char *sec = Dep.ParentVer().Section(); - if (sec && ConfigValueInSubTree("APT::Install-Recommends-Sections", sec)) + if (sec && SectionInSubTree("APT::Install-Recommends-Sections", sec)) return true; } else if(Dep->Type == pkgCache::Dep::Suggests) diff -Nru apt-2.5.6/apt-private/private-update.cc apt-2.6.0/apt-private/private-update.cc --- apt-2.5.6/apt-private/private-update.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/apt-private/private-update.cc 2023-03-06 12:26:39.000000000 +0000 @@ -21,13 +21,32 @@ #include #include +#include #include /*}}}*/ // DoUpdate - Update the package lists /*{{{*/ -// --------------------------------------------------------------------- -/* */ +static bool isDebianBookwormRelease(pkgCache::RlsFileIterator const &RlsFile) +{ + std::tuple const affected[] = { + {"Debian", "Debian", "bookworm"}, + {"Debian", "Debian", "sid"}, + }; + if (RlsFile.end() || RlsFile->Origin == nullptr || RlsFile->Label == nullptr || RlsFile->Codename == nullptr) + return false; + std::tuple const release{RlsFile.Origin(), RlsFile.Label(), RlsFile.Codename()}; + return std::find(std::begin(affected), std::end(affected), release) != std::end(affected); +} +static void suggestDebianNonFreeFirmware(char const *const repo, char const *const val, + char const *const from, char const *const to) +{ + // Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc + _error->Notice(_("Repository '%s' changed its '%s' value from '%s' to '%s'"), repo, val, from, to); + std::string notes; + strprintf(notes, "https://www.debian.org/releases/bookworm/%s/release-notes/ch-information.html#non-free-split", _config->Find("APT::Architecture").c_str()); + _error->Notice(_("More information about this can be found online in the Release notes at: %s"), notes.c_str()); +} bool DoUpdate(CommandLine &CmdL) { if (CmdL.FileSize() != 1) @@ -81,44 +100,135 @@ if (Cache.BuildCaches(false) == false) return false; - if (_config->FindB("APT::Get::Update::SourceListWarnings", true)) - { + bool const SLWarnings = _config->FindB("APT::Get::Update::SourceListWarnings", true); + if (SLWarnings) List = Cache.GetSourceList(); - for (pkgSourceList::const_iterator S = List->begin(); S != List->end(); ++S) - { - if (APT::String::Startswith((*S)->GetURI(), "ftp://") == false) - continue; - pkgCache::RlsFileIterator const RlsFile = (*S)->FindInCache(Cache, false); - if (RlsFile.end() || RlsFile->Origin == 0 || RlsFile->Label == 0) - continue; - char const *const affected[][2] = { - {"Debian", "Debian"}, - {"Debian", "Debian-Security"}, - {"Debian Backports", "Debian Backports"}, - }; - auto const matchRelease = [&](decltype(affected[0]) a) { - return strcmp(RlsFile.Origin(), a[0]) == 0 && strcmp(RlsFile.Label(), a[1]) == 0; - }; - if (std::find_if(std::begin(affected), std::end(affected), matchRelease) != std::end(affected)) - _error->Warning("Debian shuts down public FTP services currently still used in your sources.list(5) as '%s'.\n" - "See press release %s for details.", - (*S)->GetURI().c_str(), "https://debian.org/News/2017/20170425"); - } - for (pkgSourceList::const_iterator S = List->begin(); S != List->end(); ++S) + + if (_config->FindB("APT::Get::Update::SourceListWarnings::APTAuth", SLWarnings)) + { + constexpr std::string_view const affected_method[] = {"http", "https", "tor+http", "tor+https", "ftp"}; + for (auto *S : *List) { - URI uri((*S)->GetURI()); + URI uri(S->GetURI()); if (uri.User.empty() && uri.Password.empty()) continue; // we can't really predict if a +http method supports everything http does, // so we play it safe and use an allowlist here. - char const *const affected[] = {"http", "https", "tor+http", "tor+https", "ftp"}; - if (std::find(std::begin(affected), std::end(affected), uri.Access) != std::end(affected)) + if (std::find(std::begin(affected_method), std::end(affected_method), uri.Access) != std::end(affected_method)) // TRANSLATOR: the first two are manpage references, the last the URI from a sources.list _error->Notice(_("Usage of %s should be preferred over embedding login information directly in the %s entry for '%s'"), "apt_auth.conf(5)", "sources.list(5)", URI::ArchiveOnly(uri).c_str()); } } + if (_config->FindB("APT::Get::Update::SourceListWarnings::NonFreeFirmware", SLWarnings)) + { + // If a Debian source has a non-free component, suggest adding non-free-firmware + bool found_affected_release = false; + bool found_non_free = false; + bool found_non_free_firmware = false; + for (auto *S : *List) + { + if (not isDebianBookwormRelease(S->FindInCache(Cache, false))) + continue; + + for (auto PkgFile = Cache.GetPkgCache()->FileBegin(); not PkgFile.end(); ++PkgFile) + { + if (PkgFile.Flagged(pkgCache::Flag::NoPackages)) + continue; + found_affected_release = true; + const auto * const comp = PkgFile.Component(); + if (comp == nullptr) + continue; + if (strcmp(comp, "non-free") == 0) + found_non_free = true; + else if (strcmp(comp, "non-free-firmware") == 0) + { + found_non_free_firmware = true; + break; + } + } + if (found_non_free_firmware) + break; + } + if (not found_non_free_firmware && found_non_free && found_affected_release) + { + /* See if a well-known firmware package is installable from this codename + if so, we likely operate with new apt on an old snapshot not supporting non-free-firmware */ + bool suggest_non_free_firmware = true; + if (auto const Grp = Cache.GetPkgCache()->FindGrp("firmware-linux-nonfree"); not Grp.end()) + { + for (auto Pkg = Grp.PackageList(); not Pkg.end() && suggest_non_free_firmware; Pkg = Grp.NextPkg(Pkg)) + { + for (auto Ver = Pkg.VersionList(); not Ver.end(); ++Ver) + { + if (not Ver.Downloadable()) + continue; + for (auto VerFile = Ver.FileList(); not VerFile.end(); ++VerFile) + { + auto const PkgFile = VerFile.File(); + if (PkgFile.end()) + continue; + if (not isDebianBookwormRelease(PkgFile.ReleaseFile())) + continue; + suggest_non_free_firmware = false; + break; + } + if (not suggest_non_free_firmware) + break; + } + } + } + if (suggest_non_free_firmware) + suggestDebianNonFreeFirmware("Debian bookworm", "non-free component", "non-free", "non-free non-free-firmware"); + } + + if (not found_non_free_firmware && not found_non_free && found_affected_release) + { + /* Try to notify users who have installed firmware packages at some point, but + have not enabled non-free currently – they might want to opt into updates now */ + APT::StringView const affected_pkgs[] = { + "amd64-microcode", "atmel-firmware", "bluez-firmware", "dahdi-firmware-nonfree", + "firmware-amd-graphics", "firmware-ast", "firmware-atheros", "firmware-bnx2", + "firmware-bnx2x", "firmware-brcm80211", "firmware-cavium", "firmware-intel-sound", + "firmware-intelwimax", "firmware-ipw2x00", "firmware-ivtv", "firmware-iwlwifi", + "firmware-libertas", "firmware-linux", "firmware-linux-nonfree", "firmware-misc-nonfree", + "firmware-myricom", "firmware-netronome", "firmware-netxen", "firmware-qcom-media", + "firmware-qcom-soc", "firmware-qlogic", "firmware-realtek", "firmware-realtek-rtl8723cs-bt", + "firmware-samsung", "firmware-siano", "firmware-sof-signed", "firmware-ti-connectivity", + "firmware-zd1211", "intel-microcode", "midisport-firmware", "raspi-firmware", + }; + bool suggest_non_free_firmware = false; + for (auto pkgname : affected_pkgs) + { + auto const Grp = Cache.GetPkgCache()->FindGrp(pkgname); + if (Grp.end()) + continue; + for (auto Pkg = Grp.PackageList(); not Pkg.end(); Pkg = Grp.NextPkg(Pkg)) + { + auto const Ver = Pkg.CurrentVer(); + if (Ver.end() || Ver.Downloadable()) + continue; + bool another = false; + for (auto V = Pkg.VersionList(); not V.end(); ++V) + if (V.Downloadable()) + { + another = true; + break; + } + if (another) + continue; + suggest_non_free_firmware = true; + break; + } + if (suggest_non_free_firmware) + break; + } + if (suggest_non_free_firmware) + suggestDebianNonFreeFirmware("Debian bookworm", "firmware component", "non-free", "non-free-firmware"); + } + } + // show basic stats (if the user whishes) if (_config->FindB("APT::Cmd::Show-Update-Stats", false) == true) { diff -Nru apt-2.5.6/CMakeLists.txt apt-2.6.0/CMakeLists.txt --- apt-2.5.6/CMakeLists.txt 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/CMakeLists.txt 2023-03-06 12:26:39.000000000 +0000 @@ -205,7 +205,7 @@ # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -set(PACKAGE_VERSION "2.5.6") +set(PACKAGE_VERSION "2.6.0") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff -Nru apt-2.5.6/cmdline/apt-mark.cc apt-2.6.0/cmdline/apt-mark.cc --- apt-2.5.6/cmdline/apt-mark.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/cmdline/apt-mark.cc 2023-03-06 12:26:39.000000000 +0000 @@ -140,25 +140,38 @@ } /*}}}*/ // helper for Install-Recommends-Sections and Never-MarkAuto-Sections /*{{{*/ -static bool -ConfigValueInSubTree(const char *SubTree, const char *needle) +// FIXME: Copied verbatim from apt-pkg/depcache.cc +static bool ConfigValueInSubTree(const char* SubTree, std::string_view const needle) { - // copied from depcache.cc - Configuration::Item const *Opts; - Opts = _config->Tree(SubTree); - if (Opts != 0 && Opts->Child != 0) + if (needle.empty()) + return false; + Configuration::Item const *Opts = _config->Tree(SubTree); + if (Opts != nullptr && Opts->Child != nullptr) { Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) + for (; Opts != nullptr; Opts = Opts->Next) { - if (Opts->Value.empty() == true) + if (Opts->Value.empty()) continue; - if (strcmp(needle, Opts->Value.c_str()) == 0) + if (needle == Opts->Value) return true; } } return false; } +static bool SectionInSubTree(char const * const SubTree, std::string_view Needle) +{ + if (ConfigValueInSubTree(SubTree, Needle)) + return true; + auto const sub = Needle.rfind('/'); + if (sub == std::string_view::npos) + { + std::string special{"/"}; + special.append(Needle); + return ConfigValueInSubTree(SubTree, special); + } + return ConfigValueInSubTree(SubTree, Needle.substr(sub + 1)); +} /*}}}*/ /* DoMinimize - minimize manually installed {{{*/ /* Traverses dependencies of meta packages and marks them as manually @@ -179,7 +192,7 @@ auto ver = pkg.CurrentVer(); return ver.end() == false && ((*DepCache)[pkg].Flags & pkgCache::Flag::Auto) == 0 && ver->Section != 0 && - ConfigValueInSubTree("APT::Never-MarkAuto-Sections", ver.Section()); + SectionInSubTree("APT::Never-MarkAuto-Sections", ver.Section()); }; APT::PackageSet roots; diff -Nru apt-2.5.6/COPYING apt-2.6.0/COPYING --- apt-2.5.6/COPYING 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/COPYING 2023-03-06 12:26:39.000000000 +0000 @@ -1,22 +1,155 @@ -Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. -Apt is currently developed by APT Development Team . +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: apt +Upstream-Contact: APT Development Team +Source: https://salsa.debian.org/apt-team/apt +Comment: + APT is an old software with lots of contributors over its lifetime. This + file is a best effort to document the statements of copyright and licenses + as stated in the file, but is not a complete representation of all copyright + holders - those have been lost to times. + . + Several bits of apt-pkg/contrib have had public domain dedications but + contributions from authors in countries not recognizing a public domain + concept. We believe that these contributions have been done in good faith, + and we treat them as if they had been made under the GPL-2+ as we believe + some contributors may have missed these facts and the overall license statement + for the project has always been GPL-2+, so we cannot be sure that contributors + meant to grant additional permissions. + . + Translation files are considered to generally be GPL-2+, + but they also include strings used by methods/rsh.cc which appears to be GPL-2. + As the translations are split into separate domains later on, + these strings are not loaded by library users outside of apt + (they are in the 'apt' translation domain). + . + The apt-pkg/contrib/fileutl.cc file states "RunScripts()" is "GPLv2". + We believe that this was not meant to exclude later versions of the GPL, + as that would have changed the overall project license. -License: GPLv2+ +Files: * +Copyright: 1997-1999 Jason Gunthorpe and others + 2018, 2019 Canonical Ltd + 2009, 2010, 2015, 2016 Julian Andres Klode + 1998, Ben Gertzfield + 2002-2019 Free Software Foundation, Inc. + 2003, 2004, 2005, 2009, 2010, 2012 Software in the Public Interest + 2002-2003 Lars Bahner + 2003-2004 Axel Bojer + 2004 Klaus Ade Johnstad + 2004 Bjorn Steensrud + 2003, 2005-2010 Hans Fredrik Nordhaug + 2016, 2018 Petter Reinholdtsen + 2009 Rosetta Contributors and Canonical Ltd 2009 + 2013 Debian L10n Turkish 2013 + 2013-2018 Mert Dirik + 2004 Krzysztof Fiertek + 2000-2004, 2010, 2012 Robert Luberda + 2000-2017 Debian Italian l10n team + 2003-2017 Debian Japanese List + 2000-2018 Debian French l10n team + 1997 Manoj Srivastava + 1997 Tom Lees + 2014 Anthony Towns +License: GPL-2+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -See /usr/share/common-licenses/GPL-2, or - for the terms of the latest version -of the GNU General Public License. +Files: methods/rsh.cc +Copyright: 2000 Ben Collins +License: GPL-2 +Comment: + This file stated: + Licensed under the GNU General Public License v2 [no exception clauses] + . + We believe that this was intended to be not a statement against future + versions of the GPL, but meant to exclude the Qt license exception in + place in APT until that time. + . + We received permission from Ben in 2021 to relicense under GPL-2+, + contributions from Adam Heath and Daniel Hartwig may still have to + be considered GPL-2 for the time being. + . + Other contributions are GPL-2+ + +Files: CMake/FindBerkeley.cmake +Copyright: 2006, Alexander Dymo, + 2016, Julian Andres Klode +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: CMake/Documentation.cmake + CMake/FindLFS.cmake +Copyright: 2016 Julian Andres Klode +License: Expat + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms version 2 of the GNU General Public License + as published by the Free Software Foundation. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see +Comment: + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +Comment: + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru apt-2.5.6/debian/apt.conf.autoremove apt-2.6.0/debian/apt.conf.autoremove --- apt-2.5.6/debian/apt.conf.autoremove 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/debian/apt.conf.autoremove 2023-03-06 12:26:39.000000000 +0000 @@ -22,23 +22,11 @@ Never-MarkAuto-Sections { "metapackages"; - "contrib/metapackages"; - "non-free/metapackages"; - "restricted/metapackages"; - "universe/metapackages"; - "multiverse/metapackages"; "tasks"; - "contrib/tasks"; - "non-free/tasks"; }; Move-Autobit-Sections { "oldlibs"; - "contrib/oldlibs"; - "non-free/oldlibs"; - "restricted/oldlibs"; - "universe/oldlibs"; - "multiverse/oldlibs"; }; }; diff -Nru apt-2.5.6/debian/apt.lintian-overrides apt-2.6.0/debian/apt.lintian-overrides --- apt-2.5.6/debian/apt.lintian-overrides 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/debian/apt.lintian-overrides 2023-03-06 12:26:39.000000000 +0000 @@ -1,11 +1,10 @@ # the private library is for internal sharing only apt: package-name-doesnt-match-sonames -apt: exit-in-shared-library usr/lib*/libapt-private.so.0.0.0 -apt: no-symbols-control-file usr/lib*/libapt-private.so.0.0.0 +apt: exit-in-shared-library [usr/lib*/libapt-private.so.0.0.0] # we are implementing our own fallback and it is a minor usecase only -apt: missing-depends-on-sensible-utils sensible-pager usr/lib*/libapt-private.so.0.0.0 +apt: missing-depends-on-sensible-utils sensible-pager [usr/lib*/libapt-private.so.0.0.0] # these man pages document usage/config for things called via apt -apt: spare-manual-page usr/share/man*/man1/apt-transport-http.1.gz -apt: spare-manual-page usr/share/man*/man1/apt-transport-https.1.gz -apt: spare-manual-page usr/share/man*/man1/apt-transport-mirror.1.gz -apt: spare-manual-page usr/share/man*/man8/apt-secure.8.gz +apt: spare-manual-page [usr/share/man*/man1/apt-transport-http.1.gz] +apt: spare-manual-page [usr/share/man*/man1/apt-transport-https.1.gz] +apt: spare-manual-page [usr/share/man*/man1/apt-transport-mirror.1.gz] +apt: spare-manual-page [usr/share/man*/man8/apt-secure.8.gz] diff -Nru apt-2.5.6/debian/changelog apt-2.6.0/debian/changelog --- apt-2.5.6/debian/changelog 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/debian/changelog 2023-03-06 12:26:39.000000000 +0000 @@ -1,3 +1,44 @@ +apt (2.6.0) unstable; urgency=medium + + * The "unhappy bookworm" release. Too many changes needed to clarify + licensing. + + [ Cyril Brulebois ] + * Teach apt-cdrom's scoring system about non-free-firmware (Closes: #1029751) + + [ David Kalnischkies ] + * More support for non-free-firmware + - Have values in Section config trees refer to them in all components + - Add non-free-firmware component in documentation + - Suggest using non-free-firmware in update for Debian + * other bookworm regressions: + - Bump codenames in docs in preparation for Debian 12 + - Detect trimmed changelogs and pick online instead (Closes: #1024457) + * Do not store trusted=yes Release file unconditionally + + [ Miroslav Kure ] + * Czech program translation update (Closes: #1031008) + + [ Bastian Germann ] + * machine-readable version of COPYING (Closes: #1019273), initial version + + [ Julian Andres Klode ] + * Update lintian override info format in d/apt.lintian-overrides + * Further work on machine-readable COPYING file and the source code comments + to address licensing inadequacies: + - Address statements of public domain + - po/nb.po: Relicensing GPL-2.0 -> GPL-2.0+. Thanks Petter for chasing + down the copyright holders and getting agreement. + - COPYING: Group by license + - Address translation licensing concerns + - COPYING: Address RunScripts() + - We do not believe rsh was supposed to exclude GPL-3 + This unfortunately creates a bit of churn, but updating the COPYING file + without addressing the actual licensing issues would not have solved the + bug. + + -- Julian Andres Klode Mon, 06 Mar 2023 13:26:39 +0100 + apt (2.5.6) unstable; urgency=medium [ MichaIng ] diff -Nru apt-2.5.6/debian/copyright apt-2.6.0/debian/copyright --- apt-2.5.6/debian/copyright 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/debian/copyright 2023-03-06 12:26:39.000000000 +0000 @@ -1,22 +1,155 @@ -Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. -Apt is currently developed by APT Development Team . +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: apt +Upstream-Contact: APT Development Team +Source: https://salsa.debian.org/apt-team/apt +Comment: + APT is an old software with lots of contributors over its lifetime. This + file is a best effort to document the statements of copyright and licenses + as stated in the file, but is not a complete representation of all copyright + holders - those have been lost to times. + . + Several bits of apt-pkg/contrib have had public domain dedications but + contributions from authors in countries not recognizing a public domain + concept. We believe that these contributions have been done in good faith, + and we treat them as if they had been made under the GPL-2+ as we believe + some contributors may have missed these facts and the overall license statement + for the project has always been GPL-2+, so we cannot be sure that contributors + meant to grant additional permissions. + . + Translation files are considered to generally be GPL-2+, + but they also include strings used by methods/rsh.cc which appears to be GPL-2. + As the translations are split into separate domains later on, + these strings are not loaded by library users outside of apt + (they are in the 'apt' translation domain). + . + The apt-pkg/contrib/fileutl.cc file states "RunScripts()" is "GPLv2". + We believe that this was not meant to exclude later versions of the GPL, + as that would have changed the overall project license. -License: GPLv2+ +Files: * +Copyright: 1997-1999 Jason Gunthorpe and others + 2018, 2019 Canonical Ltd + 2009, 2010, 2015, 2016 Julian Andres Klode + 1998, Ben Gertzfield + 2002-2019 Free Software Foundation, Inc. + 2003, 2004, 2005, 2009, 2010, 2012 Software in the Public Interest + 2002-2003 Lars Bahner + 2003-2004 Axel Bojer + 2004 Klaus Ade Johnstad + 2004 Bjorn Steensrud + 2003, 2005-2010 Hans Fredrik Nordhaug + 2016, 2018 Petter Reinholdtsen + 2009 Rosetta Contributors and Canonical Ltd 2009 + 2013 Debian L10n Turkish 2013 + 2013-2018 Mert Dirik + 2004 Krzysztof Fiertek + 2000-2004, 2010, 2012 Robert Luberda + 2000-2017 Debian Italian l10n team + 2003-2017 Debian Japanese List + 2000-2018 Debian French l10n team + 1997 Manoj Srivastava + 1997 Tom Lees + 2014 Anthony Towns +License: GPL-2+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -See /usr/share/common-licenses/GPL-2, or - for the terms of the latest version -of the GNU General Public License. +Files: methods/rsh.cc +Copyright: 2000 Ben Collins +License: GPL-2 +Comment: + This file stated: + Licensed under the GNU General Public License v2 [no exception clauses] + . + We believe that this was intended to be not a statement against future + versions of the GPL, but meant to exclude the Qt license exception in + place in APT until that time. + . + We received permission from Ben in 2021 to relicense under GPL-2+, + contributions from Adam Heath and Daniel Hartwig may still have to + be considered GPL-2 for the time being. + . + Other contributions are GPL-2+ + +Files: CMake/FindBerkeley.cmake +Copyright: 2006, Alexander Dymo, + 2016, Julian Andres Klode +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: CMake/Documentation.cmake + CMake/FindLFS.cmake +Copyright: 2016 Julian Andres Klode +License: Expat + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms version 2 of the GNU General Public License + as published by the Free Software Foundation. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see +Comment: + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +Comment: + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru apt-2.5.6/doc/apt.conf.5.xml apt-2.6.0/doc/apt.conf.5.xml --- apt-2.5.6/doc/apt.conf.5.xml 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/apt.conf.5.xml 2023-03-06 12:26:39.000000000 +0000 @@ -19,7 +19,7 @@ &apt-email; &apt-product; - 2016-01-03T00:00:00Z + 2016-01-02T00:00:00Z diff -Nru apt-2.5.6/doc/apt-ftparchive.1.xml apt-2.6.0/doc/apt-ftparchive.1.xml --- apt-2.5.6/doc/apt-ftparchive.1.xml 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/apt-ftparchive.1.xml 2023-03-06 12:26:39.000000000 +0000 @@ -14,7 +14,7 @@ &apt-email; &apt-product; - 2019-05-10T00:00:00Z + 2023-01-29T00:00:00Z @@ -369,7 +369,7 @@ This is a space separated list of sections which appear under the distribution; typically this is something like - main contrib non-free + main contrib non-free non-free-firmware diff -Nru apt-2.5.6/doc/apt-verbatim.ent apt-2.6.0/doc/apt-verbatim.ent --- apt-2.5.6/doc/apt-verbatim.ent 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/apt-verbatim.ent 2023-03-06 12:26:39.000000000 +0000 @@ -274,20 +274,20 @@ "> - + - - - - - + + + + + - - + + "> diff -Nru apt-2.5.6/doc/examples/apt-ftparchive.conf apt-2.6.0/doc/examples/apt-ftparchive.conf --- apt-2.5.6/doc/examples/apt-ftparchive.conf 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/examples/apt-ftparchive.conf 2023-03-06 12:26:39.000000000 +0000 @@ -38,6 +38,13 @@ Contents "dists/sid/non-free/Contents-i386"; }; +// And this is (you guessed it) the same for the non-free-firmware section +BinDirectory "pool/non-free-firmware" { + Packages "dists/sid/non-free-firmware/binary-i386/Packages"; + Sources "dists/sid/non-free-firmware/source/Sources"; + Contents "dists/sid/non-free-firmware/Contents-i386"; +}; + // By default all Packages should have the extension ".deb" Default { Packages { diff -Nru apt-2.5.6/doc/examples/configure-index apt-2.6.0/doc/examples/configure-index --- apt-2.5.6/doc/examples/configure-index 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/examples/configure-index 2023-03-06 12:26:39.000000000 +0000 @@ -123,7 +123,11 @@ Update { InteractiveReleaseInfoChanges ""; - SourceListWarnings ""; + SourceListWarnings "" + { + APTAuth ""; + NonFreeFirmware ""; + }; }; }; diff -Nru apt-2.5.6/doc/guide.dbk apt-2.6.0/doc/guide.dbk --- apt-2.5.6/doc/guide.dbk 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/guide.dbk 2023-03-06 12:26:39.000000000 +0000 @@ -252,9 +252,9 @@ Please give the components to get - The components are typically something like: main contrib non-free + The components are typically something like: main contrib non-free non-free-firmware - Components [main contrib non-free]: + Components [main contrib non-free non-free-firmware]: The components list refers to the list of sub distributions to fetch. The diff -Nru apt-2.5.6/doc/po/apt-doc.pot apt-2.6.0/doc/po/apt-doc.pot --- apt-2.5.6/doc/po/apt-doc.pot 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/apt-doc.pot 2023-03-06 12:26:39.000000000 +0000 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 2.5.6\n" +"Project-Id-Version: apt-doc 2.6.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-02-08 17:09+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5641,11 +5641,11 @@ "stable or testing or a codename like " "&debian-stable-codename; or " "&debian-testing-codename; while component is one of " -"main, contrib or " -"non-free. The deb-src type references " -"a Debian distribution's source code in the same form as the " -"deb type. A deb-src line is required " -"to fetch source indexes." +"main, contrib, " +"non-free or non-free-firmware. The " +"deb-src type references a Debian distribution's source " +"code in the same form as the deb type. A " +"deb-src line is required to fetch source indexes." msgstr "" #. type: Content of: @@ -5880,7 +5880,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -6143,13 +6143,13 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6159,7 +6159,7 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6170,7 +6170,7 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6180,7 +6180,7 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6191,7 +6191,9 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "" +"deb-src file:/home/apt/debian unstable main contrib non-free " +"non-free-firmware" msgstr "" #. type: Content of: @@ -6201,7 +6203,7 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6892,7 +6894,7 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib " -"non-free" +"non-free non-free-firmware" msgstr "" #. type: Content of: @@ -9066,9 +9068,10 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free " +"non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" #. type: Content of: diff -Nru apt-2.5.6/doc/po/de.po apt-2.6.0/doc/po/de.po --- apt-2.5.6/doc/po/de.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/de.po 2023-03-06 12:26:39.000000000 +0000 @@ -8064,10 +8064,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" "Der deb-Typ beschreibt ein typisches zweistufiges Debian-" "Archiv, Distribution/Bestandteil. " @@ -8075,11 +8075,11 @@ "stable oder testing oder ein Codename " "wie &debian-stable-codename; oder &debian-" "testing-codename; während Bestandteil entweder main, contrib oder non-free ist. " -"Der deb-src-Typ beschreibt den Quellcode einer Debian-" -"Distribution in der gleichen Form wie den deb-Typ. Eine " -"deb-src-Zeile wird benötigt, um Quellindizes " -"herunterzuladen." +"literal>, contrib, non-free oder " +"non-free-firmware ist. Der deb-src-Typ " +"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie " +"den deb-Typ. Eine deb-src-Zeile wird " +"benötigt, um Quellindizes herunterzuladen." #. type: Content of: #: sources.list.5.xml @@ -8436,7 +8436,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8853,16 +8853,17 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "benutzt die lokal gespeicherten (oder per NFS eingehängten) Archive in /home/" -"apt/debian für stable/main, stable/contrib und stable/non-free." +"apt/debian für stable/main, stable/contrib, stable/non-free und stable/non-" +"free-firmware." #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8871,12 +8872,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8887,8 +8888,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8897,12 +8898,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8912,8 +8913,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8922,12 +8923,12 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9880,11 +9881,11 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" "Dies ist eine durch Leerzeichen getrennte Liste der Abschnitte, die unter " "der Distribution erscheint, typischerweise etwas wie main contrib " -"non-free" +"non-free non-free-firmware" #. type: Content of: #: apt-ftparchive.1.xml @@ -11876,10 +11877,8 @@ #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?name(REGEX)" msgid "?codename(REGEX)" -msgstr "?name(REGULÄRER_AUSDRUCK)" +msgstr "?codename(REGULÄRER_AUSDRUCK)" #. type: Content of: #: apt-patterns.7.xml @@ -12040,115 +12039,83 @@ #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?not(PATTERN)" msgid "?depends(PATTERN)" -msgstr "?not(MUSTER)" +msgstr "?depends(MUSTER)" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "!PATTERN" msgid "~DPATTERN" -msgstr "!MUSTER" +msgstr "~DMUSTER" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?not(PATTERN)" msgid "?pre-depends(PATTERN)" -msgstr "?not(MUSTER)" +msgstr "?pre-depends(MUSTER)" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "!PATTERN" msgid "~DPre-Depends:PATTERN" -msgstr "!MUSTER" +msgstr "~DPre-Depends:MUSTER" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?not(PATTERN)" msgid "?suggests(PATTERN)" -msgstr "?not(MUSTER)" +msgstr "?suggests(MUSTER)" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "!PATTERN" msgid "~DSuggests:PATTERN" -msgstr "!MUSTER" +msgstr "~DSuggests:MUSTER" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?not(PATTERN)" msgid "?conflicts(PATTERN)" -msgstr "?not(MUSTER)" +msgstr "?conflicts(MUSTER)" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?not(PATTERN)" msgid "~DConflicts:PATTERN" -msgstr "?not(MUSTER)" +msgstr "~DConflicts:MUSTER" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "(PATTERN)" msgid "?replaces(PATTERN)" -msgstr "(MUSTER)" +msgstr "?replaces(MUSTER)" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "!PATTERN" msgid "~DReplaces:PATTERN" -msgstr "!MUSTER" +msgstr "~DReplaces:MUSTER" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?not(PATTERN)" msgid "?obsoletes(PATTERN)" -msgstr "?not(MUSTER)" +msgstr "?obsoletes(MUSTER)" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?not(PATTERN)" msgid "~DObsoletes:PATTERN" -msgstr "?not(MUSTER)" +msgstr "~DObsoletes:MUSTER" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "(PATTERN)" msgid "?breaks(PATTERN)" -msgstr "(MUSTER)" +msgstr "?breaks(MUSTER)" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "!PATTERN" msgid "~DBreaks:PATTERN" -msgstr "!MUSTER" +msgstr "~DBreaks:MUSTER" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "?not(PATTERN)" msgid "?enhances(PATTERN)" -msgstr "?not(MUSTER)" +msgstr "?enhances(MUSTER)" #. type: Content of: #: apt-patterns.7.xml -#, fuzzy -#| msgid "!PATTERN" msgid "~DEnhances:PATTERN" -msgstr "!MUSTER" +msgstr "~DEnhances:MUSTER" #. type: Content of: #: apt-patterns.7.xml @@ -12824,14 +12791,14 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Bitte geben Sie die Bestandteile an, die Sie erhalten möchten\n" -" Die Bestandteile sind normalerweise etwas wie: »main« »contrib« »non-free«\n" +" Die Bestandteile sind normalerweise etwas wie: »main« »contrib« »non-free« »non-free-firmware«\n" "\n" -" Bestandteile [main contrib non-free]:\n" +" Bestandteile [main contrib non-free non-free-firmware]:\n" #. type: Content of: #: guide.dbk diff -Nru apt-2.5.6/doc/po/es.po apt-2.6.0/doc/po/es.po --- apt-2.5.6/doc/po/es.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/es.po 2023-03-06 12:26:39.000000000 +0000 @@ -7943,10 +7943,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" "El tipo deb hace referencia a un típico archivo de Debian " "de dos niveles, distribución/componente. Habitualmente, " @@ -8282,7 +8282,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8596,16 +8596,17 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Utiliza el archivo local (o montado mediante NFS) en «/home/apt/debian» para " -"«stable/main», «stable/contrib», y «stable/non-free»." +"«stable/main», «stable/contrib», «stable/non-free», y «stable/non-free-" +"firmware»." #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8614,12 +8615,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8630,8 +8631,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8640,12 +8641,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8657,8 +8658,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8667,12 +8668,12 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9637,11 +9638,11 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" "Es una lista de secciones separadas por espacios que aparecen bajo la " -"distribución; habitualmente, es similar a main contrib non-free." +"distribución; habitualmente, es similar a main contrib non-free non-" +"free-firmware." #. type: Content of: #: apt-ftparchive.1.xml @@ -12152,14 +12153,14 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" #. type: Content of: #: guide.dbk @@ -13769,19 +13770,6 @@ #~ msgid "Some examples:" #~ msgstr "Algunos ejemplos:" -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " - #~ msgid "apt" #~ msgstr "apt" diff -Nru apt-2.5.6/doc/po/fr.po apt-2.6.0/doc/po/fr.po --- apt-2.5.6/doc/po/fr.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/fr.po 2023-03-06 12:26:39.000000000 +0000 @@ -8017,10 +8017,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" "Le type deb décrit une archive Debian classique à deux " "niveaux, distribution/composant. distributionstable ou testing ou bien un nom de " "code comme &debian-stable-codename; ou &debian-" "testing-codename;, alors que composant prend les valeurs : " -"main, contrib ou non-free. Le type deb-src décrit une archive de " -"distribution de code source pour une distribution Debian dans le même format " -"que le type deb. Une ligne deb-src est " -"nécessaire pour récupérer les index des sources." +"main, contrib, non-free, ou non-free-firmware. Le type deb-src décrit une archive de distribution de code source pour une " +"distribution Debian dans le même format que le type deb. " +"Une ligne deb-src est nécessaire pour récupérer les index " +"des sources." #. type: Content of: #: sources.list.5.xml @@ -8386,7 +8387,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8800,16 +8801,17 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Utiliser l'archive stockée localement (ou montée via NFS) dans /home/apt/" -"debian pour stable/main, stable/contrib et stable/non-free." +"debian pour stable/main, stable/contrib, stable/non-free et stable/non-free-" +"firmware." #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8818,12 +8820,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8835,8 +8837,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8845,12 +8847,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8860,8 +8862,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8870,12 +8872,12 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9820,11 +9822,11 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" "C'est une liste de sections séparées par des espaces qui appartiennent à une " -"distribution ; classiquement, on trouve main contrib non-free." +"distribution ; classiquement, on trouve main contrib non-free non-" +"free-firmware." #. type: Content of: #: apt-ftparchive.1.xml @@ -12651,15 +12653,15 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Veuillez indiquer les composants à utiliser\n" " Les composants sont en général de la forme suivante :\n" -" main contrib non-free\n" +" main contrib non-free non-free-firmware\n" "\n" -" Composants [main contrib non-free] :\n" +" Composants [main contrib non-free non-free-firmware] :\n" #. type: Content of: #: guide.dbk @@ -14363,19 +14365,6 @@ #~ msgid "Some examples:" #~ msgstr "Exemples :" -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " - #~ msgid "apt" #~ msgstr "apt" diff -Nru apt-2.5.6/doc/po/it.po apt-2.6.0/doc/po/it.po --- apt-2.5.6/doc/po/it.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/it.po 2023-03-06 12:26:39.000000000 +0000 @@ -8032,10 +8032,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" "Il tipo deb è un riferimento a un tipico archivio Debian " "a due livelli, distribuzione/componente. " @@ -8043,11 +8043,11 @@ "stable o testing, oppure un nome in " "codice come &debian-stable-codename; o &debian-" "testing-codename;; componente è uno tra main, " -"contrib o non-free. Il tipo " -"deb-src è un riferimento al codice sorgente di una " -"distribuzione Debian nella stessa forma di quella del tipo deb. Per recuperare gli indici dei pacchetti sorgente è necessaria una " -"riga deb-src." +"contrib, non-free o non-free-" +"firmware. Il tipo deb-src è un riferimento al " +"codice sorgente di una distribuzione Debian nella stessa forma di quella del " +"tipo deb. Per recuperare gli indici dei pacchetti " +"sorgente è necessaria una riga deb-src." #. type: Content of: #: sources.list.5.xml @@ -8398,7 +8398,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8765,16 +8765,16 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Usa l'archivio memorizzato in locale (o montato via NFS) in /home/apt/debian " -"per stable/main, stable/contrib e stable/non-free." +"per stable/main, stable/contrib, stable/non-free e stable/non-free-firmware." #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8783,12 +8783,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8800,8 +8800,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8810,12 +8810,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8825,8 +8825,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8835,12 +8835,12 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9777,10 +9777,11 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" "Questa è una lista di sezioni che appaiono sotto la distribuzione, separate " -"da spazi; tipicamente è simile a main contrib non-free." +"da spazi; tipicamente è simile a main contrib non-free non-free-" +"firmware." #. type: Content of: #: apt-ftparchive.1.xml @@ -12432,14 +12433,14 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" #. type: Content of: #: guide.dbk @@ -14172,19 +14173,6 @@ #~ msgid "Some examples:" #~ msgstr "Alcuni esempi:" -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " - #~ msgid "apt" #~ msgstr "apt" diff -Nru apt-2.5.6/doc/po/ja.po apt-2.6.0/doc/po/ja.po --- apt-2.5.6/doc/po/ja.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/ja.po 2023-03-06 12:26:39.000000000 +0000 @@ -7717,10 +7717,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" "deb タイプでは典型的な 2 段階の Debian アーカイブ " "distribution/component を参照します。" @@ -7728,10 +7728,10 @@ "testing または &debian-stable-codename; や &debian-testing-codename; のようなコード名にな" "ります。component は、main, contrib, " -"non-free のどれかです。deb-src タイプで" -"は、debian ディストリビューションのソースコードを、deb タ" -"イプと同じ形式で参照します。deb-src 行は、ソースインデック" -"スを取得するのに必要です。" +"non-free, non-free-firmware のどれかで" +"す。deb-src タイプでは、debian ディストリビューションの" +"ソースコードを、deb タイプと同じ形式で参照します。" +"deb-src 行は、ソースインデックスを取得するのに必要です。" #. type: Content of: #: sources.list.5.xml @@ -8064,7 +8064,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8420,16 +8420,17 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "/home/apt/debian に格納されている stable/main, stable/contrib, stable/non-" -"free 用のローカル (または NFS) アーカイブを使用します。" +"free, stable/non-free-firmware 用のローカル (または NFS) アーカイブを使用しま" +"す。" #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8438,12 +8439,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8453,8 +8454,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8463,12 +8464,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8478,8 +8479,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8488,12 +8489,12 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9409,10 +9410,10 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、" -"main contrib non-free のようになります。" +"main contrib non-free non-free-firmware のようになります。" #. type: Content of: #: apt-ftparchive.1.xml @@ -11932,14 +11933,14 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " 取得するコンポーネントを指定してください\n" -" コンポーネントには以下のようなものがあります: main contrib non-free\n" +" コンポーネントには以下のようなものがあります: main contrib non-free non-free-firmware\n" "\n" -" コンポーネント [main contrib non-free]:\n" +" コンポーネント [main contrib non-free non-free-firmware]:\n" #. type: Content of: #: guide.dbk diff -Nru apt-2.5.6/doc/po/nl.po apt-2.6.0/doc/po/nl.po --- apt-2.5.6/doc/po/nl.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/nl.po 2023-03-06 12:26:39.000000000 +0000 @@ -8228,10 +8228,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" "Het type deb verwijst naar een typisch Debian-archief met " "twee niveaus, distributie/component. De " @@ -8239,11 +8239,12 @@ "zoals stable of testing of een " "codenaam zoals &debian-stable-codename; of " "&debian-testing-codename;, terwijl component een van de " -"volgende kan zijn: main, contrib of " -"non-free. Het type deb-src verwijst in " -"dezelfde vorm als het type deb naar de broncode van een " -"Debian distributie. Om bronnenindexen te kunnen ophalen is een deb-" -"src-regel noodzakelijk." +"volgende kan zijn: main, contrib, " +"non-free of non-free-firmware. Het " +"type deb-src verwijst in dezelfde vorm als het type " +"deb naar de broncode van een Debian distributie. Om " +"bronnenindexen te kunnen ophalen is een deb-src-regel " +"noodzakelijk." #. type: Content of: #: sources.list.5.xml @@ -8602,7 +8603,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8617,7 +8618,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -9021,16 +9022,17 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Gebruikt het lokaal opgeslagen (of via NFS aangekoppelde) archief in /home/" -"apt/debian voor stable/main, stable/contrib, en stable/non-free." +"apt/debian voor stable/main, stable/contrib, stable/non-free, en stable/non-" +"free-firmware." #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9039,12 +9041,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9056,8 +9058,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9066,12 +9068,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9081,8 +9083,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9091,12 +9093,12 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -10060,11 +10062,11 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" "Dit is een door spaties gescheiden lijst van secties die onder de " "distributie te vinden zijn. Doorgaans is dat iets zoals main " -"contrib non-free" +"contrib non-free non-free-firmware" #. type: Content of: #: apt-ftparchive.1.xml @@ -12976,14 +12978,14 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Voer de op te halen componenten in\n" -" Componenten zijn typisch iets zoals: main contrib non-free\n" +" Componenten zijn typisch iets zoals: main contrib non-free non-free-firmware\n" "\n" -" Componenten [main contrib non-free]:\n" +" Componenten [main contrib non-free non-free-firmware]:\n" #. type: Content of: #: guide.dbk diff -Nru apt-2.5.6/doc/po/pl.po apt-2.6.0/doc/po/pl.po --- apt-2.5.6/doc/po/pl.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/pl.po 2023-03-06 12:26:39.000000000 +0000 @@ -7373,10 +7373,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" "Typ deb opisuje typowe dwupoziomowe archiwum Debiana: " "dystrybucja/komponent. Zazwyczaj dystrybucja #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian " -#| "for stable/main, stable/contrib, and stable/non-free." msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Użycie archiwum lokalnego (lub montowanego przez NFS) w katalogu /home/jason/" -"debian dla zasobów stable/main, stable/contrib i stable/non-free." +"debian dla zasobów stable/main, stable/contrib, stable/non-free i stable/non-" +"free-firmware." #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb file:/home/jason/debian stable main contrib non-free" -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/jason/debian stable main contrib non-free" +#, no-wrap +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb file:/home/jason/debian stable main contrib non-free" +#, no-wrap msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" -msgstr "deb file:/home/jason/debian stable main contrib non-free" +"Components: main contrib non-free non-free-firmware" +msgstr "" +"Types: deb\n" +"URIs: file:/home/apt/debian\n" +"Suites: stable\n" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8064,21 +8063,23 @@ #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb file:/home/jason/debian unstable main contrib non-free" -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/jason/debian unstable main contrib non-free" +#, no-wrap +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb file:/home/jason/debian unstable main contrib non-free" +#, no-wrap msgid "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" -msgstr "deb file:/home/jason/debian unstable main contrib non-free" +"Components: main contrib non-free non-free-firmware" +msgstr "" +"Types: deb\n" +"URIs: file:/home/apt/debian\n" +"Suites: unstable\n" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8089,21 +8090,23 @@ #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free" -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" +#, no-wrap +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free" +#, no-wrap msgid "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" -msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" +"Components: main contrib non-free non-free-firmware" +msgstr "" +"Types: deb-src\n" +"URIs: file:/home/apt/debian\n" +"Suites: unstable\n" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8118,23 +8121,17 @@ #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "" -#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" +#, no-wrap msgid "" "deb http://deb.debian.org/debian &debian-stable-codename; main\n" "deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" +"deb http://deb.debian.org/debian &debian-stable-codename; main\n" +"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main" #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "" -#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n" -#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" +#, no-wrap msgid "" "Types: deb\n" "URIs: http://deb.debian.org/debian\n" @@ -8147,8 +8144,16 @@ "Components: main\n" "Architectures: amd64 armel\n" msgstr "" -"deb http://ftp.debian.org/debian &debian-stable-codename; main\n" -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main" +"Types: deb\n" +"URIs: http://deb.debian.org/debian\n" +"Suites: &debian-stable-codename;\n" +"Components: main\n" +"\n" +"Types: deb\n" +"URIs: http://deb.debian.org/debian\n" +"Suites: &debian-stable-codename;\n" +"Components: main\n" +"Architectures: amd64 armel\n" #. type: Content of: #: sources.list.5.xml @@ -8167,14 +8172,17 @@ #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb http://archive.debian.org/debian-archive hamm main" +#, no-wrap msgid "" "Types: deb\n" "URIs: http://archive.debian.org/debian-archive\n" "Suites: hamm\n" "Components: main" -msgstr "deb http://archive.debian.org/debian-archive hamm main" +msgstr "" +"Types: deb\n" +"URIs: http://archive.debian.org/debian-archive\n" +"Suites: hamm\n" +"Components: main" #. type: Content of: #: sources.list.5.xml @@ -8193,14 +8201,17 @@ #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +#, no-wrap msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" "Suites: &debian-stable-codename;\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib" +msgstr "" +"Types: deb\n" +"URIs: ftp://ftp.debian.org/debian\n" +"Suites: &debian-stable-codename;\n" +"Components: contrib" #. type: Content of: #: sources.list.5.xml @@ -8223,14 +8234,17 @@ #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb ftp://ftp.debian.org/debian unstable contrib" +#, no-wrap msgid "" "Types: deb\n" "URIs: ftp://ftp.debian.org/debian\n" "Suites: unstable\n" "Components: contrib" -msgstr "deb ftp://ftp.debian.org/debian unstable contrib" +msgstr "" +"Types: deb\n" +"URIs: ftp://ftp.debian.org/debian\n" +"Suites: unstable\n" +"Components: contrib" #. type: Content of: #: sources.list.5.xml @@ -8240,13 +8254,15 @@ #. type: Content of: #: sources.list.5.xml -#, fuzzy, no-wrap -#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" +#, no-wrap msgid "" "Types: deb\n" "URIs: http://ftp.tlh.debian.org/universe\n" "Suites: unstable/binary-$(ARCH)/" -msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" +msgstr "" +"Types: deb\n" +"URIs: http://ftp.tlh.debian.org/universe\n" +"Suites: unstable/binary-$(ARCH)/" #. type: Content of: #: sources.list.5.xml @@ -8307,10 +8323,8 @@ #. type: Content of: #: sources.list.5.xml -#, fuzzy -#| msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;" -msgstr "&apt-cache;, &apt-config;, &apt-preferences;." +msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;." #. type: Content of: #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml @@ -8882,7 +8896,7 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" #. type: Content of: @@ -11299,14 +11313,14 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Proszę podać komponenty do pobrania\n" -" Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free\n" +" Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free non-free-firmware\n" "\n" -" Komponenty [main contrib non-free]:\n" +" Komponenty [main contrib non-free non-free-firmware]:\n" #. type: Content of: #: guide.dbk @@ -12677,19 +12691,6 @@ #~ msgid "Some examples:" #~ msgstr "Kilka przykładów:" -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " - #~ msgid "apt" #~ msgstr "apt" diff -Nru apt-2.5.6/doc/po/pt_BR.po apt-2.6.0/doc/po/pt_BR.po --- apt-2.5.6/doc/po/pt_BR.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/pt_BR.po 2023-03-06 12:26:39.000000000 +0000 @@ -5982,10 +5982,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" #. type: Content of: @@ -6215,7 +6215,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -6475,13 +6475,13 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6491,7 +6491,7 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6502,7 +6502,7 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6512,7 +6512,7 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6523,7 +6523,7 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -6533,7 +6533,7 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" #. type: Content of: @@ -7228,7 +7228,7 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" #. type: Content of: @@ -9421,9 +9421,9 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" #. type: Content of: diff -Nru apt-2.5.6/doc/po/pt.po apt-2.6.0/doc/po/pt.po --- apt-2.5.6/doc/po/pt.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/po/pt.po 2023-03-06 12:26:39.000000000 +0000 @@ -8003,10 +8003,10 @@ "stable or testing or a codename like " "&debian-stable-codename; or &debian-testing-" "codename; while component is one of main, " -"contrib or non-free. The deb-" -"src type references a Debian distribution's source code in the " -"same form as the deb type. A deb-src " -"line is required to fetch source indexes." +"contrib, non-free or non-free-" +"firmware. The deb-src type references a Debian " +"distribution's source code in the same form as the deb " +"type. A deb-src line is required to fetch source indexes." msgstr "" "O tipo deb descreve um arquivo Debian típico de dois " "níveis, distribution/component. A " @@ -8014,10 +8014,11 @@ "stable ou testing ou um nome de código " "como &debian-stable-codename; ou &debian-testing-" "codename; enquanto que componente é um de main, " -"contrib ou non-free. O tipo " -"deb-src faz referência a um código fonte de distribuição " -"Debian no mesmo formato que o tipo deb. É necessária uma " -"linha deb-src para obter índices das fontes." +"contrib, non-free ou non-free-" +"firmware. O tipo deb-src faz referência a um " +"código fonte de distribuição Debian no mesmo formato que o tipo " +"deb. É necessária uma linha deb-src " +"para obter índices das fontes." #. type: Content of: #: sources.list.5.xml @@ -8363,7 +8364,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8378,7 +8379,7 @@ "Types: deb\n" "URIs: https://deb.debian.org\n" "Suites: stable\n" -"Components: main contrib non-free\n" +"Components: main contrib non-free non-free-firmware\n" "Signed-By:\n" " -----BEGIN PGP PUBLIC KEY BLOCK-----\n" " .\n" @@ -8773,16 +8774,16 @@ #: sources.list.5.xml msgid "" "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for " -"stable/main, stable/contrib, and stable/non-free." +"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware." msgstr "" "Usa o arquivo armazenado localmente (ou montagem NFS) em /home/apt/debian " -"para stable/main, stable/contrib, e stable/non-free." +"para stable/main, stable/contrib, stable/non-free e stable/non-free-firmware." #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian stable main contrib non-free" -msgstr "deb file:/home/apt/debian stable main contrib non-free" +msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8791,12 +8792,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: stable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8807,8 +8808,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb file:/home/apt/debian unstable main contrib non-free" -msgstr "deb file:/home/apt/debian unstable main contrib non-free" +msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8817,12 +8818,12 @@ "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8832,8 +8833,8 @@ #. type: Content of: #: sources.list.5.xml #, no-wrap -msgid "deb-src file:/home/apt/debian unstable main contrib non-free" -msgstr "deb-src file:/home/apt/debian unstable main contrib non-free" +msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" +msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -8842,12 +8843,12 @@ "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" msgstr "" "Types: deb-src\n" "URIs: file:/home/apt/debian\n" "Suites: unstable\n" -"Components: main contrib non-free" +"Components: main contrib non-free non-free-firmware" #. type: Content of: #: sources.list.5.xml @@ -9793,11 +9794,11 @@ msgid "" "This is a space separated list of sections which appear under the " "distribution; typically this is something like main contrib non-" -"free" +"free non-free-firmware" msgstr "" "Isto é uma lista de secções separada por espaços que aparece sob a " -"distribuição, tipicamente isto é algo como main contrib non-free" +"distribuição, tipicamente isto é algo como main contrib non-free " +"non-free-firmware" #. type: Content of: #: apt-ftparchive.1.xml @@ -12634,14 +12635,14 @@ #, no-wrap msgid "" " Please give the components to get\n" -" The components are typically something like: main contrib non-free\n" +" The components are typically something like: main contrib non-free non-free-firmware\n" "\n" -" Components [main contrib non-free]:\n" +" Components [main contrib non-free non-free-firmware]:\n" msgstr "" " Por favor forneça os componentes a obter\n" -" Tipicamente os componentes são algo como: main contrib non-free\n" +" Tipicamente os componentes são algo como: main contrib non-free non-free-firmware\n" "\n" -" Componentes [main contrib non-free]:\n" +" Componentes [main contrib non-free non-free-firmware]:\n" #. type: Content of: #: guide.dbk @@ -14321,25 +14322,6 @@ #~ msgid "Some examples:" #~ msgstr "Alguns exemplos:" -#, fuzzy -#~| msgid "" -#~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-" -#~| "free\n" -#~| "deb http://security.debian.org/ &stable-codename;/updates main contrib " -#~| "non-free\n" -#~| " " -#~ msgid "" -#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib " -#~ "non-free\n" -#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main " -#~ "contrib non-free\n" -#~ " " -#~ msgstr "" -#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib " -#~ "non-free\n" -#~ " " - #~ msgid "" #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if " #~ "it encounters unauthenticated archives to give a slightly longer grace " diff -Nru apt-2.5.6/doc/sources.list.5.xml apt-2.6.0/doc/sources.list.5.xml --- apt-2.5.6/doc/sources.list.5.xml 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/doc/sources.list.5.xml 2023-03-06 12:26:39.000000000 +0000 @@ -14,7 +14,7 @@ &apt-email; &apt-product; - 2022-02-22T00:00:00Z + 2023-01-29T00:00:00Z @@ -129,8 +129,8 @@ distribution is generally a suite name like stable or testing or a codename like &debian-stable-codename; or &debian-testing-codename; - while component is one of main, contrib or - non-free. The + while component is one of main, contrib, + non-free or non-free-firmware. The deb-src type references a Debian distribution's source code in the same form as the deb type. A deb-src line is required to fetch source indexes. @@ -321,7 +321,7 @@ Types: deb URIs: https://deb.debian.org Suites: stable -Components: main contrib non-free +Components: main contrib non-free non-free-firmware Signed-By: -----BEGIN PGP PUBLIC KEY BLOCK----- . @@ -505,26 +505,26 @@ Examples Uses the archive stored locally (or NFS mounted) at /home/apt/debian - for stable/main, stable/contrib, and stable/non-free. - deb file:/home/apt/debian stable main contrib non-free + for stable/main, stable/contrib, stable/non-free and stable/non-free-firmware. + deb file:/home/apt/debian stable main contrib non-free non-free-firmware Types: deb URIs: file:/home/apt/debian Suites: stable -Components: main contrib non-free +Components: main contrib non-free non-free-firmware As above, except this uses the unstable (development) distribution. - deb file:/home/apt/debian unstable main contrib non-free + deb file:/home/apt/debian unstable main contrib non-free non-free-firmware Types: deb URIs: file:/home/apt/debian Suites: unstable -Components: main contrib non-free +Components: main contrib non-free non-free-firmware Sources specification for the above. - deb-src file:/home/apt/debian unstable main contrib non-free + deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware Types: deb-src URIs: file:/home/apt/debian Suites: unstable -Components: main contrib non-free +Components: main contrib non-free non-free-firmware The first line gets package information for the architectures in APT::Architectures while the second always retrieves amd64 and armel. diff -Nru apt-2.5.6/dselect/setup apt-2.6.0/dselect/setup --- apt-2.5.6/dselect/setup 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/dselect/setup 2023-03-06 12:26:39.000000000 +0000 @@ -30,8 +30,8 @@ my @known_types = ('deb'); my @known_access = ('http', 'ftp', 'file'); -my @typical_distributions = ('stable', 'unstable', 'testing', 'non-US'); -my @typical_components = ('main', 'contrib', 'non-free'); +my @typical_distributions = ('stable', 'unstable', 'testing'); +my @typical_components = ('main', 'contrib', 'non-free', 'non-free-firmware'); my %known_access = map {($_,$_)} @known_access; my %typical_distributions = map {($_,$_)} @typical_distributions; @@ -118,9 +118,9 @@ } $type = 'deb'; - $urn = "http://http.us.debian.org/debian" unless $urn; + $urn = "http://deb.debian.org/debian" unless $urn; $distribution = "stable" unless $distribution; - $components = "main contrib non-free" unless $components; + $components = "main contrib non-free non-free-firmware" unless $components; $rec->{'Type'} = 'deb'; diff -Nru apt-2.5.6/methods/rsh.cc apt-2.6.0/methods/rsh.cc --- apt-2.5.6/methods/rsh.cc 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/methods/rsh.cc 2023-03-06 12:26:39.000000000 +0000 @@ -5,8 +5,22 @@ RSH method - Transfer files via rsh compatible program Written by Ben Collins , Copyright (c) 2000 + + This file stated: Licensed under the GNU General Public License v2 [no exception clauses] + We believe that this was intended to be not a statement against future + versions of the GPL, but meant to exclude the Qt license exception in + place in APT until that time. + + We received permission from Ben in 2021 to relicense under GPL-2+, + contributions from Adam Heath and Daniel Hartwig may still have to + be considered GPL-2 for the time being. + + Other contributions are GPL-2+ + + See https://lists.debian.org/deity/2021/04/msg00013.html for details + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ diff -Nru apt-2.5.6/po/apt-all.pot apt-2.6.0/po/apt-all.pot --- apt-2.5.6/po/apt-all.pot 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/apt-all.pot 2023-03-06 12:26:39.000000000 +0000 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.5.6\n" +"Project-Id-Version: apt 2.6.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-02-08 17:09+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -174,7 +174,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -185,7 +186,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ar.po apt-2.6.0/po/ar.po --- apt-2.5.6/po/ar.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ar.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,9 @@ # translation of apt_po.po to Arabic +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Ossama M. Khayat , 2005, 2006. @@ -6,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -182,7 +187,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -193,7 +199,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ast.po apt-2.6.0/po/ast.po --- apt-2.5.6/po/ast.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ast.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,10 +1,14 @@ +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # iñigo varela , 2010. # maacub , 2010. msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -177,7 +181,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -188,7 +193,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/bg.po apt-2.6.0/po/bg.po --- apt-2.5.6/po/bg.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/bg.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,6 +1,10 @@ # translation of apt-all.pot to Bulgarian # Bulgarian translation of apt. # Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # # Yavor Doganov , 2006. @@ -10,7 +14,7 @@ msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -190,7 +194,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -201,7 +206,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/bs.po apt-2.6.0/po/bs.po --- apt-2.5.6/po/bs.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/bs.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,9 @@ # APT - Advanced Package Transfer +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Safir Šećerović , 2004 # @@ -6,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -176,7 +181,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -187,7 +193,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ca.po apt-2.6.0/po/ca.po --- apt-2.5.6/po/ca.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ca.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,8 @@ # Catalan translation of APT. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011, 2012 Software in the Public Interest, Inc. # Antoni Bella Perez , 2002, 2003. # Matt Bonner , 2003. @@ -9,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 1.4~beta1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2020-08-09 22:43+0200\n" "Last-Translator: Aleix Vidal i Gaya \n" "Language-Team: Catalan \n" @@ -204,7 +208,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució conflictiva: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "El dipòsit «%s» ha canviat el seu valor «%s» de «%s» a «%s»" @@ -217,7 +222,7 @@ "%hi." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/cs.po apt-2.6.0/po/cs.po --- apt-2.5.6/po/cs.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/cs.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,14 +1,19 @@ # Czech translation of APT +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. -# Miroslav Kure , 2004-2017. +# Miroslav Kure , 2004-2023. # # msgid "" msgstr "" -"Project-Id-Version: apt 1.4.2\n" +"Project-Id-Version: apt 2.5.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" -"PO-Revision-Date: 2017-05-06 11:08+0200\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" +"PO-Revision-Date: 2023-02-10 12:58+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "Language: cs\n" @@ -135,16 +140,13 @@ msgstr "Chyba GPG: %s: %s" #: apt-pkg/acquire-item.cc -#, fuzzy, c-format -#| msgid "" -#| "Skipping acquire of configured file '%s' as repository '%s' doesn't " -#| "support architecture '%s'" +#, c-format msgid "" "Skipping acquire of configured file '%s' as repository '%s' doesn't have the " "component '%s' (component misspelt in sources.list?)" msgstr "" -"Přeskakuje se stažení souboru „%s“, protože repositář „%s“ nepodporuje " -"architekturu „%s“" +"Přeskakuje se stažení souboru „%s“, protože repositář „%s“ neobsahuje " +"komponentu „%s“ (není v sources.list překlep v názvu?)" #: apt-pkg/acquire-item.cc #, c-format @@ -156,16 +158,13 @@ "architekturu „%s“" #: apt-pkg/acquire-item.cc -#, fuzzy, c-format -#| msgid "" -#| "Skipping acquire of configured file '%s' as repository '%s' doesn't " -#| "support architecture '%s'" +#, c-format msgid "" "Skipping acquire of configured file '%s' as repository '%s' does not seem to " "provide it (sources.list entry misspelt?)" msgstr "" -"Přeskakuje se stažení souboru „%s“, protože repositář „%s“ nepodporuje " -"architekturu „%s“" +"Přeskakuje se stažení souboru „%s“, protože repositář „%s“ ho neposkytuje " +"(překlep v sources.list?)" #: apt-pkg/acquire-item.cc #, c-format @@ -192,38 +191,36 @@ #. the time until the file will be valid - formatted in the same way as in #. the download progress display (e.g. 7d 3h 42min 1s) #: apt-pkg/acquire-item.cc -#, fuzzy, c-format -#| msgid "" -#| "Release file for %s is expired (invalid since %s). Updates for this " -#| "repository will not be applied." +#, c-format msgid "" "Release file for %s is not valid yet (invalid for another %s). Updates for " "this repository will not be applied." msgstr "" -"Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " -"repositáře se nepoužijí." +"Soubor Release pro %s ještě není platný (a nebude po dalších %s). " +"Aktualizace z tohoto repositáře se nepoužijí." #: apt-pkg/acquire-item.cc #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" -msgstr "" +msgstr "Repositář „%s“ změnil svou hodnotu „%s“ z „%s“ na „%s“" #: apt-pkg/acquire-item.cc #, c-format msgid "Repository '%s' changed its default priority for %s from %hi to %hi." -msgstr "" +msgstr "Repositář „%s“ změnil svou výchozí prioritu pro %s z %hi na %hi." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" -msgstr "" +msgstr "Více informací naleznete online v Poznámkách k vydání na: %s" #. TRANSLATOR: %s is the name of the manpage in question, e.g. apt-secure(8) #: apt-pkg/acquire-item.cc @@ -232,6 +229,8 @@ "This must be accepted explicitly before updates for this repository can be " "applied. See %s manpage for details." msgstr "" +"Než se začnou používat aktualizace z tohoto repositáře, je nutné to " +"explicitně akceptovat. Podrobnosti naleznete v manuálové stránce %s." #: apt-pkg/acquire-item.cc apt-pkg/update.cc apt-private/private-download.cc #, c-format @@ -264,6 +263,9 @@ "The method '%s' is unsupported and disabled by default. Consider switching " "to http(s). Set Dir::Bin::Methods::%s to \"%s\" to enable it again." msgstr "" +"Metoda „%s“ není podporovaná a je ve výchozím nastavení zakázaná. Zvažte " +"přechod na http(s). Pro znovupovolení nastavte Dir::Bin::Methods::%s na " +"\"%s\"." #: apt-pkg/acquire-worker.cc #, c-format @@ -675,10 +677,9 @@ msgstr "Kontrolní součet taru selhal, archiv je poškozený" #: apt-pkg/contrib/extracttar.cc -#, fuzzy, c-format -#| msgid "Unknown TAR header type %u, member %s" +#, c-format msgid "Unknown TAR header type %u" -msgstr "Neznámá hlavička TARu typ %u, člen %s" +msgstr "Neznámá hlavička TARu typ %u" #: apt-pkg/contrib/fileutl.cc #, c-format @@ -701,15 +702,14 @@ msgstr "Nepoužívá se zamykání pro zámkový soubor %s připojený přes nfs" #: apt-pkg/contrib/fileutl.cc -#, fuzzy, c-format -#| msgid "Could not get lock %s" +#, c-format msgid "Could not get lock %s. It is held by process %d" -msgstr "Nelze získat zámek %s" +msgstr "Nelze získat zámek %s. Drží ho proces %d" #: apt-pkg/contrib/fileutl.cc #, c-format msgid "Could not get lock %s. It is held by process %d (%s)" -msgstr "" +msgstr "Nelze získat zámek %s. Drží ho proces %d (%s)" #: apt-pkg/contrib/fileutl.cc #, c-format @@ -721,6 +721,7 @@ "Be aware that removing the lock file is not a solution and may break your " "system." msgstr "" +"Mějte na paměti, že odstranění zámku není řešení a může poškodit systém." #: apt-pkg/contrib/fileutl.cc #, c-format @@ -899,6 +900,8 @@ "%s: Credentials for %s match, but the protocol is not encrypted. Annotate " "with %s:// to use." msgstr "" +"%s: Přihlašovací údaje pro %s odpovídají, ale protokol není šifrovaný. Pro " +"použití předřaďte %s://." #: apt-pkg/contrib/progress.cc #, c-format @@ -915,16 +918,14 @@ msgstr "…" #: apt-pkg/contrib/progress.cc -#, fuzzy, c-format -#| msgid "%c%s... %u%%" +#, c-format msgid "%c%s... %llu/%llus" -msgstr "%c%s… %u%%" +msgstr "%c%s… %llu/%llus" #: apt-pkg/contrib/progress.cc -#, fuzzy, c-format -#| msgid "%c%s... %u%%" +#, c-format msgid "%c%s... %llus" -msgstr "%c%s… %u%%" +msgstr "%c%s… %llus" #: apt-pkg/contrib/progress.cc #, c-format @@ -975,10 +976,9 @@ msgstr "Nezpracovatelný kontrolní soubor" #: apt-pkg/deb/debindexfile.cc -#, fuzzy, c-format -#| msgid "Could not get lock %s" +#, c-format msgid "Could not read meta data from %s" -msgstr "Nelze získat zámek %s" +msgstr "Nelze přečíst metadata z %s" #. TRANSLATOR: an identifier like Packages; Releasefile key indicating #. a file like main/binary-amd64/Packages; another identifier like Contents; @@ -1047,25 +1047,20 @@ msgstr "Nelze zpracovat soubor %s (%d)" #: apt-pkg/deb/debsystem.cc -#, fuzzy, c-format -#| msgid "Waiting for headers" +#, c-format msgid "Waiting for cache lock: %s" -msgstr "Čeká se na hlavičky" +msgstr "Čeká se na zámek cache: %s" #: apt-pkg/deb/debsystem.cc -#, fuzzy, c-format -#| msgid "" -#| "Unable to lock the administration directory (%s), is another process " -#| "using it?" +#, c-format msgid "" "Unable to acquire the dpkg frontend lock (%s), is another process using it?" -msgstr "Nelze uzamknout administrační adresář (%s). Používá jej jiný proces?" +msgstr "Nelze získat zámek dpkg frontendu (%s). Nepoužívá jej jiný proces?" #: apt-pkg/deb/debsystem.cc -#, fuzzy, c-format -#| msgid "Unable to lock the administration directory (%s), are you root?" +#, c-format msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" -msgstr "Nelze uzamknout administrační adresář (%s). Jste root?" +msgstr "Nelze získat zámek dpkg frontendu (%s). Jste root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a @@ -1080,7 +1075,7 @@ msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" -msgstr "Nelze uzamknout administrační adresář (%s). Používá jej jiný proces?" +msgstr "Nelze uzamknout administrační adresář (%s). Nepoužívá jej jiný proces?" #: apt-pkg/deb/debsystem.cc #, c-format @@ -1522,6 +1517,7 @@ msgid "" "%s: The special 'Pin-Priority: %s' can only be used for 'Package: *' records" msgstr "" +"%s: Speciální „Pin-Priority: %s“ lze použít jen pro záznamy „Package: *“" #: apt-pkg/policy.cc #, c-format @@ -1564,10 +1560,8 @@ msgstr "Zadán nepodporovaný soubor %s" #: apt-pkg/srcrecords.cc -#, fuzzy -#| msgid "You must put some 'source' URIs in your sources.list" msgid "You must put some 'deb-src' URIs in your sources.list" -msgstr "Do sources.list musíte zadat „zdrojové“ URI" +msgstr "Do sources.list musíte zadat „deb-src“ URI" #: apt-pkg/tagfile.cc #, c-format @@ -1637,7 +1631,7 @@ msgid "" "Do you want to accept these changes and continue updating from this " "repository?" -msgstr "" +msgstr "Chcete přijmout tyto změny a pokračovat v používání tohoto repositáře?" #: apt-private/private-cachefile.cc msgid "Correcting dependencies..." @@ -1938,6 +1932,8 @@ "Removing essential system-critical packages is not permitted. This might " "break the system." msgstr "" +"Odstranění nezbytných systémově-kritických balíků není povoleno. Může to " +"rozbít systém." #: apt-private/private-install.cc cmdline/apt-mark.cc msgid "Do you want to continue?" @@ -2325,7 +2321,7 @@ #: apt-private/private-show.cc msgid "phased" -msgstr "" +msgstr "fázována" #: apt-private/private-source.cc #, c-format @@ -2458,6 +2454,7 @@ msgid "" "Invalid operator '%c' at offset %d, did you mean '%c%c' or '%c='? - in: %s" msgstr "" +"Neplatný operátor „%c“ na pozici %d, mysleli jste „%c%c“ nebo „%c=“? V: %s" #: apt-private/private-source.cc #, c-format @@ -2499,6 +2496,8 @@ "Usage of %s should be preferred over embedding login information directly in " "the %s entry for '%s'" msgstr "" +"Použití %s je preferováno před zadáním přihlašovacích údajů přímo v %s v " +"záznamu „%s“" #: apt-private/private-update.cc #, c-format @@ -2793,10 +2792,8 @@ msgstr "Instaluje nové balíky (balík je libc6, ne libc6.deb)" #: cmdline/apt-get.cc -#, fuzzy -#| msgid "Install new packages (pkg is libc6 not libc6.deb)" msgid "Reinstall packages (pkg is libc6 not libc6.deb)" -msgstr "Instaluje nové balíky (balík je libc6, ne libc6.deb)" +msgstr "Přeinstaluje balíky (balík je libc6, ne libc6.deb)" #: cmdline/apt-get.cc msgid "Remove packages" @@ -2808,7 +2805,7 @@ #: cmdline/apt-get.cc msgid "Remove automatically all unused packages" -msgstr "automaticky odstraní nepoužívané balíky" +msgstr "Automaticky odstraní nepoužívané balíky" #: cmdline/apt-get.cc msgid "Distribution upgrade, see apt-get(8)" @@ -2823,10 +2820,8 @@ msgstr "Pro zdrojové balíky nastaví build-dependencies" #: cmdline/apt-get.cc -#, fuzzy -#| msgid "Building dependency tree" msgid "Satisfy dependency strings" -msgstr "Vytváří se strom závislostí" +msgstr "Splní řetězec závislostí" #: cmdline/apt-get.cc msgid "Erase downloaded archive files" @@ -2904,15 +2899,15 @@ #: cmdline/apt-helper.cc msgid "wait for system to be online" -msgstr "" +msgstr "počká, až bude systém online" #: cmdline/apt-helper.cc msgid "drop privileges before running given command" -msgstr "" +msgstr "před spuštěním příkazu zahodí oprávnění" #: cmdline/apt-helper.cc msgid "analyse a pattern" -msgstr "" +msgstr "analyzuje výraz" #: cmdline/apt-internal-planner.cc msgid "" @@ -2957,13 +2952,11 @@ #: cmdline/apt-mark.cc msgid "No changes necessary" -msgstr "" +msgstr "Žádné změny nejsou nutné" #: cmdline/apt-mark.cc -#, fuzzy -#| msgid "The following NEW packages will be installed:" msgid "The following packages will be marked as automatically installed:" -msgstr "Následující NOVÉ balíky budou nainstalovány:" +msgstr "Následující balíky budou označeny jako instalované automaticky:" #: cmdline/apt-mark.cc #, c-format @@ -3028,10 +3021,8 @@ msgstr "Označí dané balíky jako instalované ručně" #: cmdline/apt-mark.cc -#, fuzzy -#| msgid "Mark the given packages as automatically installed" msgid "Mark all dependencies of meta packages as automatically installed." -msgstr "Označí dané balíky jako instalované automaticky" +msgstr "Označí všechny závislosti metabalíků jako instalované automaticky" #: cmdline/apt-mark.cc msgid "Mark a package as held back" @@ -3107,18 +3098,14 @@ msgstr "nainstaluje balíky" #: cmdline/apt.cc -#, fuzzy -#| msgid "install packages" msgid "reinstall packages" -msgstr "nainstaluje balíky" +msgstr "přeinstaluje balíky" #: cmdline/apt.cc msgid "remove packages" msgstr "odstraní balíky" #: cmdline/apt.cc -#, fuzzy -#| msgid "Remove automatically all unused packages" msgid "automatically remove all unused packages" msgstr "automaticky odstraní nepoužívané balíky" @@ -3141,10 +3128,8 @@ msgstr "upraví soubor se zdroji balíků" #: cmdline/apt.cc -#, fuzzy -#| msgid "Failed to satisfy %s dependency for %s: %s" msgid "satisfy dependency strings" -msgstr "Selhalo splnění závislosti %s pro %s: %s" +msgstr "splní řetězec závislostí" #: dselect/install msgid "Bad default setting!" @@ -3516,6 +3501,8 @@ #, c-format msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?" msgstr "" +"Soubor má neočekávanou velikost (%llu != %llu). Neprobíhá synchronizace " +"zrcadla?" #: methods/basehttp.cc #, c-format @@ -3572,10 +3559,9 @@ msgstr "[IP: %s %s]" #: methods/connect.cc -#, fuzzy, c-format -#| msgid "Connecting to %s (%s)" +#, c-format msgid "Connected to %s (%s)" -msgstr "Připojování k %s (%s)" +msgstr "Připojeno k %s (%s)" #: methods/connect.cc methods/http.cc #, c-format @@ -3817,6 +3803,8 @@ "Key is stored in legacy trusted.gpg keyring (%s), see the DEPRECATION " "section in apt-key(8) for details." msgstr "" +"Klíč je uložen v zastaralé klíčence trusted.gpg (%s), podrobnosti viz část " +"DEPRECATION v manuálové stránce apt-key(8)." #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc @@ -4089,30 +4077,6 @@ #~ "\n" #~ "Řádkové rozhraní pro apt.\n" -#, fuzzy -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text\n" -#~ " -d CD-ROM mount point\n" -#~ " -r Rename a recognized CD-ROM\n" -#~ " -m No mounting\n" -#~ " -f Fast mode, don't check package files\n" -#~ " -a Thorough scan mode\n" -#~ " --no-auto-detect Do not try to auto detect drive and mount point\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See fstab(5)\n" -#~ msgstr "" -#~ "Volby:\n" -#~ " -h Tato nápověda.\n" -#~ " -q Nezobrazí indikátor postupu - vhodné pro záznam\n" -#~ " -qq Nezobrazí nic než chyby\n" -#~ " -s Pouze simuluje prováděné akce\n" -#~ " -f Přečte/zapíše ruční/automatické značky z/do daného souboru\n" -#~ " -c=? Načte daný konfigurační soubor\n" -#~ " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#~ "Více informací viz manuálové stránky apt-mark(8) a apt.conf(5)." - #~ msgid "" #~ "Options:\n" #~ " -h This help text.\n" diff -Nru apt-2.5.6/po/cy.po apt-2.6.0/po/cy.po --- apt-2.5.6/po/cy.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/cy.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,8 @@ # APT yn Gymraeg: APT in Welsh. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is under the same licence as APT itself. # Dafydd Harries , 2004. # @@ -6,7 +10,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -177,7 +181,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -188,7 +193,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/da.po apt-2.6.0/po/da.po --- apt-2.5.6/po/da.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/da.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,9 @@ # Danish translation apt. # Copyright (C) 2014 apt & nedenstående oversættere. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Claus Hindsgaul , 2002, 2003, 2004, 2005, 2006, 2007. # Joe Hansen , 2010, 2012, 2013, 2014, 2017. @@ -12,7 +16,7 @@ msgstr "" "Project-Id-Version: apt 1.4~rc2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2017-03-02 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -215,7 +219,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -226,7 +231,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/de.po apt-2.6.0/po/de.po --- apt-2.5.6/po/de.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/de.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,9 @@ # German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Helge Kreutzmann , 2020-2023. # Holger Wansing , 2008, 2009, 2010, 2012, 2014, 2017, 2018. # Jens Seidel , 2008. @@ -11,7 +15,7 @@ msgstr "" "Project-Id-Version: apt 2.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2023-01-20 16:58+0100\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" @@ -209,7 +213,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "Für das Depot »%s« wurde der »%s«-Wert von »%s« in »%s« geändert." @@ -222,7 +227,7 @@ "geändert." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" @@ -4629,4 +4634,3 @@ #~ msgid "Release file expired, ignoring %s (invalid since %s)" #~ msgstr "Release-Datei abgelaufen, %s wird ignoriert (ungültig seit %s)" - diff -Nru apt-2.5.6/po/dz.po apt-2.6.0/po/dz.po --- apt-2.5.6/po/dz.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/dz.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,10 +1,15 @@ +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Kinley Tshering , 2006 msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -178,7 +183,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -189,7 +195,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/el.po apt-2.6.0/po/el.po --- apt-2.5.6/po/el.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/el.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,6 +1,11 @@ # translation of apt_po_el.po to Greek # translation of apt_po_el.po to # Greek Translation of APT. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Fanis Dokianakis , 2003. @@ -17,7 +22,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2020-12-30 12:20+0200\n" "Last-Translator: Vangelis Skarmoutsos \n" "Language-Team: Greek \n" @@ -190,7 +195,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -201,7 +207,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/es.po apt-2.6.0/po/es.po --- apt-2.5.6/po/es.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/es.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,6 +1,9 @@ # Advanced Package Transfer - APT message translation catalog # Copyright (C) 2002-2010 Free Software Foundation, Inc. # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # # Current translator: # - Manuel "Venturi" Porras Peralta , 2014-2016 @@ -34,7 +37,7 @@ msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2016-01-26 01:51+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta \n" @@ -269,7 +272,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -280,7 +284,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/eu.po apt-2.6.0/po/eu.po --- apt-2.5.6/po/eu.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/eu.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,8 @@ # translation of apt_po_eu.po to Euskara +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Hizkuntza Politikarako Sailburuordetza , 2005. @@ -7,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -178,7 +182,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -189,7 +194,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/fi.po apt-2.6.0/po/fi.po --- apt-2.5.6/po/fi.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/fi.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,10 @@ # translation of fi.po to Finnish # Finnish translation of apt. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Tapio Lehtonen , 2004-2006,2008. # @@ -8,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -178,7 +183,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -189,7 +195,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/fr.po apt-2.6.0/po/fr.po --- apt-2.5.6/po/fr.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/fr.po 2023-03-06 12:26:39.000000000 +0000 @@ -2,6 +2,9 @@ # Advanced Package Transfer - APT message translation catalog # French messages # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Pierre Machard , 2002,2003,2004. # Christian Perrier , 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. # Julien Patriarca , 2013, 2017, 2018. @@ -10,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2019-01-21 09:19+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -206,7 +209,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "Le dépôt « %s » a modifié sa valeur « %s » de « %s » à « %s »" @@ -219,7 +223,7 @@ "« %hi »." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/gl.po apt-2.6.0/po/gl.po --- apt-2.5.6/po/gl.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/gl.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,10 @@ # translation of apt_po_gl.po to galician # Galician translation of apt +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Jacobo Tarrío , 2005, 2007, 2008. @@ -10,7 +15,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -185,7 +190,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -196,7 +202,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/he.po apt-2.6.0/po/he.po --- apt-2.5.6/po/he.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/he.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,9 @@ # English translation of apt_po. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Lior Kaplan , 2004. # diff -Nru apt-2.5.6/po/hu.po apt-2.6.0/po/hu.po --- apt-2.5.6/po/hu.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/hu.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,13 +1,16 @@ # Advanced Package Transfer - APT message translation catalog # Hungarian messages # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # PASZTOR Gyorgy , 2002. # Gabor Kelemen , 2004, 2005, 2011, 2012, 2016. msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2016-04-10 19:46+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -213,7 +216,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -224,7 +228,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/it.po apt-2.6.0/po/it.po --- apt-2.5.6/po/it.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/it.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,9 @@ # Italian translation of apt # Copyright (C) 2002-2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019 The Free Software Foundation, Inc. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Samuele Giovanni Tonon , 2002. # Milo Casagrande , 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019. @@ -8,7 +12,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2019-03-04 11:05+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -204,7 +208,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "Il repository \"%s\" ha modificato il valore \"%s\" da \"%s\" a \"%s\"" @@ -217,7 +222,7 @@ "%hi." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ja.po apt-2.6.0/po/ja.po --- apt-2.5.6/po/ja.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ja.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,9 @@ # Japanese messages for apt. # Copyright (C) 2001 Free Software Foundation, Inc. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Project Vine, Daisuke SUZUKI , 2001-2002 # Debian Project, Masato Taruishi , 2002 # Debian Project, Keita Maehara , 2003 @@ -10,7 +14,7 @@ msgstr "" "Project-Id-Version: apt 2.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2022-08-14 14:30+0900\n" "Last-Translator: Hideki Yamane \n" "Language-Team: Japanese \n" @@ -213,7 +217,8 @@ "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -224,7 +229,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/km.po apt-2.6.0/po/km.po --- apt-2.5.6/po/km.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/km.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,9 @@ # translation of apt_po_km.po to Khmer # translation of apt_po_km.po to +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Eng Vannak , 2006. @@ -10,7 +14,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -182,7 +186,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -193,7 +198,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ko.po apt-2.6.0/po/ko.po --- apt-2.5.6/po/ko.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ko.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,3 +1,6 @@ +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Sunjae Park , 2006-2007, 2008. # Changwoo Ryu , 2004-2005, 2008, 2010. # @@ -5,7 +8,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -177,7 +180,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -188,7 +192,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ku.po apt-2.6.0/po/ku.po --- apt-2.5.6/po/ku.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ku.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,7 @@ # Kurdish translation for apt +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # # Erdal Ronahi , 2008. @@ -6,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -176,7 +179,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -187,7 +191,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/lt.po apt-2.6.0/po/lt.po --- apt-2.5.6/po/lt.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/lt.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,8 @@ # Lithuanian translation for apt # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Gintautas Miliauskas , 2008. # Andrius Kokiančiks , 2008. @@ -8,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -180,7 +183,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -191,7 +195,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/mr.po apt-2.6.0/po/mr.po --- apt-2.5.6/po/mr.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/mr.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,9 @@ # Marathi messages for the apt suite. # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Sampada , 2008 # @@ -7,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -178,7 +182,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -189,7 +194,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/nb.po apt-2.6.0/po/nb.po --- apt-2.5.6/po/nb.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/nb.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,10 @@ # Norsk Bokmal translation of messages in APT. -# The file is available under Gnu Public License version 2. +# SPDX-License-Identifier: GPL-2.0+ +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# The file is available under Gnu Public License version 2, +# or (at your option) any later version. # Get the license from http://www.gnu.org/licenses/gpl.txt # Copyright: # Lars Bahner , 2002-2003. @@ -12,7 +17,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2018-10-30 20:53+0100\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål \n" @@ -191,7 +196,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "Depot «%s» endret sin «%s»-verdi fra «%s» til «%s»." @@ -202,7 +208,7 @@ msgstr "Depot «%s» endret sin standardprioritet for %s fra %hi til %hi." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ne.po apt-2.6.0/po/ne.po --- apt-2.5.6/po/ne.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ne.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,7 @@ # translation of apt_po.po to Nepali +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Mahesh Subedi , 2006. # Shyam Krishna Bal , 2006. # Shiva Pokharel , 2006. @@ -6,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -178,7 +181,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -189,7 +193,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/nl.po apt-2.6.0/po/nl.po --- apt-2.5.6/po/nl.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/nl.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,7 @@ # Dutch po-file for apt +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # # Guus Sliepen , 2002. @@ -12,7 +15,7 @@ msgstr "" "Project-Id-Version: apt 2.4.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2022-04-08 20:34+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -211,7 +214,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Tegenstrijdige distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "Bij pakketbron '%s' is de '%s'-waarde gewijzigd van '%s' naar '%s'" @@ -224,7 +228,7 @@ "%hi." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/nn.po apt-2.6.0/po/nn.po --- apt-2.5.6/po/nn.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/nn.po 2023-03-06 12:26:39.000000000 +0000 @@ -2,6 +2,10 @@ # translation of apt.po to Norwegian nynorsk # translation of nn.po to Norwegian Nynorsk # translation of apt.po to Norwegian Nynorsk +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Gaute Hvoslef Kvalnes , 2003. # Havard Korsvoll , 2004, 2005. # @@ -9,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -181,7 +185,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -192,7 +197,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/pl.po apt-2.6.0/po/pl.po --- apt-2.5.6/po/pl.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/pl.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,7 @@ # Advanced Package Transfer - APT message translation catalog +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Polish translation by: # # Nazewnictwo i spójność tłumaczeń programów apt, aptitude, synaptic i innych: @@ -11,7 +14,7 @@ msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -192,7 +195,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -203,7 +207,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/pt_BR.po apt-2.6.0/po/pt_BR.po --- apt-2.5.6/po/pt_BR.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/pt_BR.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,7 @@ # Brazilian Portuguese translation for apt. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Copyright (C) 2002 Free Software Foundation, Inc. # Gustavo Noronha Silva , 2002. # Andre Luis Lopes , 2002-2005. @@ -7,7 +10,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -188,7 +191,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -199,7 +203,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ro.po apt-2.6.0/po/ro.po --- apt-2.5.6/po/ro.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ro.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,9 @@ # translation of ro.po to Romanian +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Sorin Batariuc , 2004, 2005, 2006. @@ -7,7 +12,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -179,7 +184,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -190,7 +196,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/ru.po apt-2.6.0/po/ru.po --- apt-2.5.6/po/ru.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/ru.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,7 @@ # Russian messages for the apt suite. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # # Vadim Kutchin , 2002. # Ilgiz Kalmetev , 2002. @@ -15,7 +18,7 @@ msgstr "" "Project-Id-Version: apt 2.2.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2021-02-22 20:02+0300\n" "Last-Translator: Алексей Шилин \n" "Language-Team: русский \n" @@ -210,7 +213,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Противоречивый выпуск: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "Репозиторий «%s» изменил значение поля «%s» с «%s» на «%s»" @@ -222,7 +226,7 @@ "Репозиторий «%s» изменил свой приоритет по умолчанию для %s с %hi на %hi." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/sk.po apt-2.6.0/po/sk.po --- apt-2.5.6/po/sk.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/sk.po 2023-03-06 12:26:39.000000000 +0000 @@ -3,6 +3,9 @@ # initial sk.po made from Czech translation (cs.po) # thanks to Miroslav Kure # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Peter Mann , 2006. # Ivan Masár , 2008, 2009, 2010, 2011, 2012. # @@ -10,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -189,7 +192,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -200,7 +204,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/sl.po apt-2.6.0/po/sl.po --- apt-2.5.6/po/sl.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/sl.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,10 +1,13 @@ # translation of apt.po to Slovenian +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Matjaz Horvat , 2004. msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -189,7 +192,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -200,7 +204,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/sv.po apt-2.6.0/po/sv.po --- apt-2.5.6/po/sv.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/sv.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,6 +1,9 @@ # Advanced Package Tool - APT message translation catalog # Swedish messages # Copyright © 2002-2015 Free Software Foundation, Inc. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Peter Karlsson , 2002-2008. # Daniel Nylander , 2005-2010. @@ -10,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2015-08-19 21:33+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -193,7 +196,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -204,7 +208,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/th.po apt-2.6.0/po/th.po --- apt-2.5.6/po/th.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/th.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,8 @@ # Thai translation of apt. # Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Theppiak Karoonboonyanan , 2007-2008, 2012, 2014. # Arthit Suriyawongkul , 2008. @@ -8,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2014-12-12 13:00+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -188,7 +191,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -199,7 +203,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/tl.po apt-2.6.0/po/tl.po --- apt-2.5.6/po/tl.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/tl.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,8 @@ # Tagalog messages for apt debconf. # Copyright (C) 2005 Software in the Public Interest, Inc. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as apt. # Itong talaksan ay ipinapamahagi sa parehong lisensya ng apt. # Eric Pareja , 2005 @@ -10,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -181,7 +184,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -192,7 +196,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/tr.po apt-2.6.0/po/tr.po --- apt-2.5.6/po/tr.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/tr.po 2023-03-06 12:26:39.000000000 +0000 @@ -2,13 +2,16 @@ # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 # Copyright (c) 2013 Debian L10n Turkish 2013 # Mert Dirik , 2013-2018. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Rosetta Contributors, 2009. msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2018-01-03 16:32+0300\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish \n" @@ -210,7 +213,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "'%s' deposu '%s' değerini '%s' yerine '%s' olarak değiştirmiş" @@ -223,7 +227,7 @@ "değiştirdi." #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/uk.po apt-2.6.0/po/uk.po --- apt-2.5.6/po/uk.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/uk.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,9 @@ # translation of apt-all.po to Українська +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # A. Bondarenko , 2006, 2012. @@ -12,7 +17,7 @@ msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -193,7 +198,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -204,7 +210,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/vi.po apt-2.6.0/po/vi.po --- apt-2.5.6/po/vi.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/vi.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,5 +1,10 @@ # Vietnamese Translation for Apt. # Bản dịch tiếng Việt dành cho Apt. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Clytie Siddall , 2005, 2006, 2007, 2008, 2009, 2010. # Trần Ngọc Quân , 2012-2014. @@ -8,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2014-09-12 13:48+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -193,7 +198,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "" @@ -204,7 +210,7 @@ msgstr "" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/zh_CN.po apt-2.6.0/po/zh_CN.po --- apt-2.5.6/po/zh_CN.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/zh_CN.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,9 @@ # Chinese/Simplified translation of apt. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Deng Xiyue , 2007, 2008. # Tchaikov , 2005, 2007. @@ -11,7 +16,7 @@ msgstr "" "Project-Id-Version: apt 2.5.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2022-10-05 17:20-0400\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" @@ -189,7 +194,8 @@ msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc +#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "Repository '%s' changed its '%s' value from '%s' to '%s'" msgstr "仓库'%s'将其'%s'值从'%s'修改到了'%s'" @@ -200,7 +206,7 @@ msgstr "仓库'%s'将其'%s'的默认优先级从'%hi'修改到了'%hi'。" #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change -#: apt-pkg/acquire-item.cc +#: apt-pkg/acquire-item.cc apt-private/private-update.cc #, c-format msgid "" "More information about this can be found online in the Release notes at: %s" diff -Nru apt-2.5.6/po/zh_TW.po apt-2.6.0/po/zh_TW.po --- apt-2.5.6/po/zh_TW.po 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/po/zh_TW.po 2023-03-06 12:26:39.000000000 +0000 @@ -1,4 +1,7 @@ # 先進包裝工具 (apt) 繁體中文訊息 +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Translators: 黃思文 # Asho Yeh # Kanru Chen @@ -9,7 +12,7 @@ msgstr "" "Project-Id-Version: apt 1.2.X\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2023-01-17 16:33+0100\n" +"POT-Creation-Date: 2023-03-06 12:29+0000\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] aptarchive/Release fi + if [ -n "$VALIDUNTIL" ]; then + sed -i "/^Date: / a\ +Valid-Until: $(date -u -d "$VALIDUNTIL" -R)" $(find ./aptarchive -name 'Release') + fi if [ -n "$DATE" -a "$DATE" != "now" ]; then for release in $(find ./aptarchive -name 'Release'); do sed -i "s/^Date: .*$/Date: $(date -u -d "$DATE" -R)/" "$release" touch -d "$DATE" "$release" done fi - if [ -n "$VALIDUNTIL" ]; then - sed -i "/^Date: / a\ -Valid-Until: $(date -u -d "$VALIDUNTIL" -R)" $(find ./aptarchive -name 'Release') - fi msgdone "info" } diff -Nru apt-2.5.6/test/integration/test-apt-get-changelog apt-2.6.0/test/integration/test-apt-get-changelog --- apt-2.5.6/test/integration/test-apt-get-changelog 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/test/integration/test-apt-get-changelog 2023-03-06 12:26:39.000000000 +0000 @@ -127,6 +127,13 @@ testsuccessequal "'http://localhost:${APTHTTPPORT}/pool/main/a/awesome/awesome_42/changelog' awesome.changelog" apt changelog awesome --print-uris -o Acquire::Changelogs::AlwaysOnline=false -o Acquire::Changelogs::AlwaysOnline::Origin::Ubuntu=true testsuccessequal "'copy://${TMPWORKINGDIRECTORY}/rootdir/usr/share/doc/awesome/changelog' awesome.changelog" apt changelog awesome --print-uris -o Acquire::Changelogs::AlwaysOnline=false -o Acquire::Changelogs::AlwaysOnline::Origin::Debian=true +printf '\n# Older entries have been removed from this changelog.' >> rootdir/usr/share/doc/awesome/changelog +testsuccessequal "'copy://${TMPWORKINGDIRECTORY}/rootdir/usr/share/doc/awesome/changelog' awesome.changelog" apt changelog awesome --print-uris -o Acquire::Changelogs::AlwaysOnline=false +printf '\n# To read the complete changelog use `apt changelog awesome`.' >> rootdir/usr/share/doc/awesome/changelog +testsuccessequal "'http://localhost:${APTHTTPPORT}/pool/main/a/awesome/awesome_42/changelog' awesome.changelog" apt changelog awesome --print-uris -o Acquire::Changelogs::AlwaysOnline=false +printf '\n# No guarantees the trigger is the last line' >> rootdir/usr/share/doc/awesome/changelog +testsuccessequal "'http://localhost:${APTHTTPPORT}/pool/main/a/awesome/awesome_42/changelog' awesome.changelog" apt changelog awesome --print-uris -o Acquire::Changelogs::AlwaysOnline=false + testsuccess apt changelog awesome -d testfilestats 'awesome.changelog' '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644" head -n 3 awesome.changelog > awesome.change diff -Nru apt-2.5.6/test/integration/test-apt-get-update-sourceslist-warning apt-2.6.0/test/integration/test-apt-get-update-sourceslist-warning --- apt-2.5.6/test/integration/test-apt-get-update-sourceslist-warning 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/test/integration/test-apt-get-update-sourceslist-warning 2023-03-06 12:26:39.000000000 +0000 @@ -11,35 +11,64 @@ testsuccess apt update testsuccess apt update --no-download -echo 'deb ftp://ftp.tlh.debian.org/debian zurg main' > rootdir/etc/apt/sources.list.d/ftpshutdown.list -cat > rootdir/var/lib/apt/lists/ftp.tlh.debian.org_debian_dists_zurg_Release < rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_Release < rootdir/etc/apt/sources.list.d/ftpshutdown.list -testsuccessequal "Reading package lists... -Building dependency tree... -All packages are up to date. -N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'http://ftp.tlh.debian.org/debian'" apt update --no-download - - -echo 'deb tor+https://apt:debian@ftp.tlh.debian.org/debian zurg main' > rootdir/etc/apt/sources.list.d/ftpshutdown.list -testsuccessequal "Reading package lists... -Building dependency tree... -All packages are up to date. -N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'tor+https://ftp.tlh.debian.org/debian'" apt update --no-download +msgmsg 'Do not suggest new non-free-firmware component if no non-free' +echo 'deb http://example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list +testsuccessequal "$BOILERPLATE" apt update --no-download +echo 'deb-src http://example.org/debian bookworm main non-free' > rootdir/etc/apt/sources.list.d/example.list +testsuccessequal "$BOILERPLATE" apt update --no-download + +msgmsg 'Is non-free-firmware missing?' +echo 'deb http://example.org/debian bookworm main non-free' > rootdir/etc/apt/sources.list.d/example.list +cat >> rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free_binary-amd64_Packages < rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free_binary-amd64_Packages +testsuccessequal "$BOILERPLATE +N: Repository 'Debian bookworm' changed its 'non-free component' value from 'non-free' to 'non-free non-free-firmware' +N: More information about this can be found online in the Release notes at: $NOTESURL" apt update --no-download + +msgmsg 'Component already present' +echo 'deb http://example.org/debian bookworm non-free non-free-firmware' > rootdir/etc/apt/sources.list.d/example.list +testsuccessequal "$BOILERPLATE" apt update --no-download +echo 'deb http://example.org/debian bookworm non-free +deb http://example.org/debian bookworm non-free-firmware' > rootdir/etc/apt/sources.list.d/example.list +testsuccessequal "$BOILERPLATE" apt update --no-download + +msgmsg 'Detect login info embedded in sources.list' +echo 'deb http://apt:debian@example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list +testsuccessequal "$BOILERPLATE +N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'http://example.org/debian'" apt update --no-download +echo 'deb tor+https://apt:debian@example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list +testsuccessequal "$BOILERPLATE +N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'tor+https://example.org/debian'" apt update --no-download + +msgmsg 'Firmware packages without upgrades' +echo 'deb http://example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list +insertinstalledpackage 'firmware-linux-nonfree' 'all' '1' +testsuccessequal "$BOILERPLATE +N: Repository 'Debian bookworm' changed its 'firmware component' value from 'non-free' to 'non-free-firmware' +N: More information about this can be found online in the Release notes at: $NOTESURL" apt update --no-download diff -Nru apt-2.5.6/test/integration/test-apt-move-and-forget-manual-sections apt-2.6.0/test/integration/test-apt-move-and-forget-manual-sections --- apt-2.5.6/test/integration/test-apt-move-and-forget-manual-sections 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/test/integration/test-apt-move-and-forget-manual-sections 2023-03-06 12:26:39.000000000 +0000 @@ -11,15 +11,18 @@ buildsimplenativepackage 'libabc' 'native' '1' 'stable' '' '' 'libs' buildsimplenativepackage 'libabc' 'native' '2' 'unstable' 'Depends: libdef' '' 'oldlibs' +buildsimplenativepackage 'libzoo' 'native' '1' 'stable' '' '' 'libs' +buildsimplenativepackage 'libzoo' 'native' '2' 'unstable' 'Depends: libdef' '' 'non-free/oldlibs' buildsimplenativepackage 'libdef' 'native' '1' 'unstable' '' '' 'libs' setupaptarchive testmarkedauto testmarkedmanual +msgmsg 'Move bit on install of replacement' testsuccess aptget install libabc/stable -y testdpkginstalled 'libabc' -testdpkgnotinstalled 'libdef' +testdpkgnotinstalled 'libdef' 'libzoo' testmarkedmanual 'libabc' testmarkedauto @@ -29,3 +32,43 @@ testmarkedauto 'libabc' testmarkedmanual 'libdef' + +testsuccess apt autopurge -y +testdpkgnotinstalled 'libabc' 'libzoo' + +msgmsg 'Do not move bit if replacement is already installed' +testsuccess aptget install libzoo/stable -y +testdpkginstalled 'libzoo' + +testmarkedmanual 'libzoo' 'libdef' +testmarkedauto + +testsuccess aptmark auto libdef +testmarkedauto 'libdef' + +testsuccess aptget dist-upgrade -y +testdpkginstalled 'libzoo' 'libdef' + +testmarkedmanual 'libzoo' +testmarkedauto 'libdef' + +testsuccess apt autopurge -y libzoo- +testdpkgnotinstalled 'libabc' 'libzoo' 'libdef' + +msgmsg 'Move bit on install of replacement (subsection)' +testfailure grep '^non-free/oldlibs$' move-autobit.sections +testsuccess aptget install libzoo/stable -y +testdpkginstalled 'libzoo' +testdpkgnotinstalled 'libdef' 'libabc' + +testmarkedmanual 'libzoo' +testmarkedauto + +testsuccess aptget dist-upgrade -y +testdpkginstalled 'libzoo' 'libdef' + +testmarkedauto 'libzoo' +testmarkedmanual 'libdef' + +testsuccess apt autopurge -y +testdpkgnotinstalled 'libabc' 'libzoo' diff -Nru apt-2.5.6/test/integration/test-apt-never-markauto-sections apt-2.6.0/test/integration/test-apt-never-markauto-sections --- apt-2.5.6/test/integration/test-apt-never-markauto-sections 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/test/integration/test-apt-never-markauto-sections 2023-03-06 12:26:39.000000000 +0000 @@ -8,12 +8,13 @@ aptconfig dump --no-empty --format '%v%n' APT::Never-MarkAuto-Sections > nevermarkauto.sections testsuccess grep '^metapackages$' nevermarkauto.sections +testfailure grep '^universe/metapackages$' nevermarkauto.sections buildsimplenativepackage 'mydesktop' 'all' '1' 'unstable' 'Depends: mydesktop-core, foreignpkg Recommends: notavailable' '' 'metapackages' buildsimplenativepackage 'mydesktop-core' 'amd64' '1' 'unstable' 'Depends: bad-texteditor | texteditor, browser (>= 42), nosection, foreignpkg Recommends: notavailable -Multi-Arch: foreign' '' 'metapackages' +Multi-Arch: foreign' '' 'universe/metapackages' buildsimplenativepackage 'browser' 'amd64' '41' 'stable' buildsimplenativepackage 'browser' 'amd64' '42' 'unstable' buildsimplenativepackage 'texteditor' 'amd64' '1' 'stable' diff -Nru apt-2.5.6/test/integration/test-apt-update-failure-propagation apt-2.6.0/test/integration/test-apt-update-failure-propagation --- apt-2.5.6/test/integration/test-apt-update-failure-propagation 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/test/integration/test-apt-update-failure-propagation 2023-03-06 12:26:39.000000000 +0000 @@ -26,6 +26,9 @@ sed -i -e 's#https:#http:#' -e "s#:${APTHTTPSPORT}/#:${APTHTTPPORT}/#" "$FILE" done +# these tests are designed to fail, retries are just a waste of time here +echo 'Acquire::Retries 0;' > rootdir/etc/apt/apt.conf.d/disable-retries.conf + pretest() { msgmsg "$@" rm -rf rootdir/var/lib/apt/lists diff -Nru apt-2.5.6/test/integration/test-releasefile-date-older apt-2.6.0/test/integration/test-releasefile-date-older --- apt-2.5.6/test/integration/test-releasefile-date-older 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/test/integration/test-releasefile-date-older 2023-03-06 12:26:39.000000000 +0000 @@ -102,3 +102,31 @@ sed -i '/^Date: / d' $(find ./aptarchive -name 'Release') signreleasefiles testwarning aptget update + +# the repo is now signed by unknown key, but marked as trusted +rm -rf rootdir/etc/apt/trusted.gpg.d +sed -i -e 's#\(deb\(-src\)\?\) #\1 [trusted=yes] #' rootdir/etc/apt/sources.list.d/* + +msgmsg 'Forgot to disable in follow-up' 'Check-Date' +rm -rf rootdir/var/lib/apt/lists +generatereleasefiles 'now + 3 days' 'now + 7 days' +signreleasefiles +testfailure aptget update +testwarning aptget update -o Acquire::Check-Date=no +listcurrentlistsdirectory > listsdir.lst +generatereleasefiles 'now + 5 days' 'now + 13 days' +signreleasefiles +testfailure aptget update +testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)" +testwarning aptget update -o Acquire::Check-Date=no +testsuccess cmp "$(find aptarchive/ -name 'InRelease')" "$(find rootdir/var/lib/apt/ -name '*_Release')" + +msgmsg 'Force-Trusted InRelease file is silently ignored' 'new Date is before old Date' +rm -rf rootdir/var/lib/apt/lists +generatereleasefiles 'now' 'now + 7 days' +signreleasefiles +testwarning aptget update +listcurrentlistsdirectory > listsdir.lst +redatereleasefiles 'now - 2 days' +testwarning aptget update +testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)" diff -Nru apt-2.5.6/vendor/debian/apt-vendor.ent apt-2.6.0/vendor/debian/apt-vendor.ent --- apt-2.5.6/vendor/debian/apt-vendor.ent 2023-02-08 16:07:38.000000000 +0000 +++ apt-2.6.0/vendor/debian/apt-vendor.ent 2023-03-06 12:26:39.000000000 +0000 @@ -6,15 +6,15 @@ - + +Components: main contrib non-free non-free-firmware">