diff options
112 files changed, 2741 insertions, 1673 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3288a6a77..d3bf9c892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,7 +183,7 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>") -set(PACKAGE_VERSION "1.7.0~alpha2") +set(PACKAGE_VERSION "1.7.0") if (NOT DEFINED DPKG_DATADIR) execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;" diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b40c67ec1..83c793093 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -277,6 +277,27 @@ static HashStringList GetExpectedHashesFromFor(metaIndex * const Parser, std::st } /*}}}*/ +class pkgAcquire::Item::Private /*{{{*/ +{ +public: + struct AlternateURI + { + std::string URI; + std::unordered_map<std::string, std::string> changefields; + AlternateURI(std::string &&u, decltype(changefields) &&cf) : URI(u), changefields(cf) {} + }; + std::list<AlternateURI> AlternativeURIs; + std::vector<std::string> BadAlternativeSites; + std::vector<std::string> PastRedirections; + std::unordered_map<std::string, std::string> CustomFields; + unsigned int Retries; + + Private() : Retries(_config->FindI("Acquire::Retries", 0)) + { + } +}; + /*}}}*/ + // all ::HashesRequired and ::GetExpectedHashes implementations /*{{{*/ /* ::GetExpectedHashes is abstract and has to be implemented by all subclasses. It is best to implement it as broadly as possible, while ::HashesRequired defaults @@ -748,25 +769,6 @@ class APT_HIDDEN CleanupItem : public pkgAcqTransactionItem /*{{{*/ /*}}}*/ // Acquire::Item::Item - Constructor /*{{{*/ -class pkgAcquire::Item::Private -{ -public: - struct AlternateURI - { - std::string URI; - std::unordered_map<std::string, std::string> changefields; - AlternateURI(std::string &&u, decltype(changefields) &&cf) : URI(u), changefields(cf) {} - }; - std::list<AlternateURI> AlternativeURIs; - std::vector<std::string> BadAlternativeSites; - std::vector<std::string> PastRedirections; - std::unordered_map<std::string, std::string> CustomFields; - unsigned int Retries; - - Private() : Retries(_config->FindI("Acquire::Retries", 0)) - { - } -}; APT_IGNORE_DEPRECATED_PUSH pkgAcquire::Item::Item(pkgAcquire * const owner) : FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false), Local(false), @@ -1045,7 +1047,7 @@ void pkgAcquire::Item::Done(string const &/*Message*/, HashStringList const &Has } Status = StatDone; ErrorText.clear(); - Owner->Dequeue(this); + Dequeue(); } /*}}}*/ // Acquire::Item::Rename - Rename a file /*{{{*/ @@ -1070,6 +1072,7 @@ bool pkgAcquire::Item::Rename(string const &From,string const &To) /*}}}*/ void pkgAcquire::Item::Dequeue() /*{{{*/ { + d->AlternativeURIs.clear(); Owner->Dequeue(this); } /*}}}*/ @@ -1272,7 +1275,7 @@ void pkgAcqMetaBase::AbortTransaction() { (*I)->ExpectedAdditionalItems = 0; if ((*I)->Status != pkgAcquire::Item::StatFetching) - Owner->Dequeue(*I); + (*I)->Dequeue(); (*I)->TransactionState(TransactionAbort); } Transaction.clear(); diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 0fee80c5d..541785b03 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -1329,7 +1329,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) { std::chrono::duration<double> Delta = std::chrono::seconds(NewTime.tv_sec - Time.tv_sec) + - std::chrono::microseconds(NewTime.tv_sec - Time.tv_usec); + std::chrono::microseconds(NewTime.tv_usec - Time.tv_usec); // Compute the CPS value if (Delta < std::chrono::milliseconds(10)) @@ -1423,7 +1423,7 @@ void pkgAcquireStatus::Stop() std::chrono::duration<double> Delta = std::chrono::seconds(NewTime.tv_sec - StartTime.tv_sec) + - std::chrono::microseconds(NewTime.tv_sec - StartTime.tv_usec); + std::chrono::microseconds(NewTime.tv_usec - StartTime.tv_usec); // Compute the CPS value if (Delta < std::chrono::milliseconds(10)) diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index 6776f96ef..34621a2b8 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -34,7 +34,7 @@ namespace Configuration { /*{{{*/ * in the Dir::Bin group. * * \param Cached saves the result so we need to calculated it only once - * this parameter should ony be used for testing purposes. + * this parameter should only be used for testing purposes. * * \return a vector of the compression types in the preferred usage order */ @@ -57,9 +57,9 @@ namespace Configuration { /*{{{*/ * * \param All return all codes or only codes for languages we want to use * \param Cached saves the result so we need to calculated it only once - * this parameter should ony be used for testing purposes. + * this parameter should only be used for testing purposes. * \param Locale don't get the locale from the system but use this one instead - * this parameter should ony be used for testing purposes. + * this parameter should only be used for testing purposes. * * \return a vector of (all) Language Codes in the preferred usage order */ @@ -77,7 +77,7 @@ namespace Configuration { /*{{{*/ /** \brief Returns a vector of Architectures we support * * \param Cached saves the result so we need to calculated it only once - * this parameter should ony be used for testing purposes. + * this parameter should only be used for testing purposes. * * \return a vector of Architectures in preferred order */ @@ -108,7 +108,7 @@ namespace Configuration { /*{{{*/ /** \brief Return a vector of Compressors supported for data.tar's * * \param Cached saves the result so we need to calculated it only once - * this parameter should ony be used for testing purposes. + * this parameter should only be used for testing purposes. * * \return a vector of Compressors */ diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index a22804c36..9a1a6cfa9 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -35,12 +35,18 @@ #include <apti18n.h> /*}}}*/ + +struct pkgCacheFile::Private +{ + bool WithLock = false; +}; + // CacheFile::CacheFile - Constructor /*{{{*/ -pkgCacheFile::pkgCacheFile() : d(NULL), ExternOwner(false), Map(NULL), Cache(NULL), +pkgCacheFile::pkgCacheFile() : d(new Private()), ExternOwner(false), Map(NULL), Cache(NULL), DCache(NULL), SrcList(NULL), Policy(NULL) { } -pkgCacheFile::pkgCacheFile(pkgDepCache * const Owner) : d(NULL), ExternOwner(true), +pkgCacheFile::pkgCacheFile(pkgDepCache * const Owner) : d(new Private()), ExternOwner(true), Map(&Owner->GetCache().GetMap()), Cache(&Owner->GetCache()), DCache(Owner), SrcList(NULL), Policy(NULL) { @@ -59,8 +65,10 @@ pkgCacheFile::~pkgCacheFile() } delete Policy; delete SrcList; - if (ExternOwner == false) + if (d->WithLock == true) _system->UnLock(true); + + delete d; } /*}}}*/ // CacheFile::BuildCaches - Open and build the cache files /*{{{*/ @@ -97,8 +105,11 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) } if (WithLock == true) + { if (_system->Lock() == false) return false; + d->WithLock = true; + } if (_error->PendingError() == true) return false; @@ -337,7 +348,11 @@ void pkgCacheFile::Close() ExternOwner = false; delete Policy; delete SrcList; - _system->UnLock(true); + if (d->WithLock == true) + { + _system->UnLock(true); + d->WithLock = false; + } Map = NULL; DCache = NULL; diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index 097876b3a..ed5d5c57c 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -36,8 +36,9 @@ class OpProgress; class pkgCacheFile { + struct Private; /** \brief dpointer placeholder (for later in case we need it) */ - void * const d; + Private *const d; bool ExternOwner; protected: diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 157f6139e..b00fc7318 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -479,7 +479,7 @@ APT_IGNORE_DEPRECATED_POP return FromTask(Cache, pattern, helper); } - /** \brief returns all packages in the cache whose name matchs a given pattern + /** \brief returns all packages in the cache whose name matches a given pattern A simple helper responsible for executing a regular expression on all package names in the cache. Optional it prints a notice about the diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 85d7b36c7..eab05de4f 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -24,6 +24,7 @@ #include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/macros.h> +#include <apt-pkg/pkgsystem.h> #include <apt-pkg/sptr.h> #include <apt-pkg/strutl.h> @@ -101,6 +102,8 @@ bool RunScripts(const char *Cnf) // This is the child if (Child == 0) { + if (_system != nullptr && _system->IsLocked() == true && (stringcasecmp(Cnf, "dpkg::post-invoke") == 0 || stringcasecmp(Cnf, "dpkg::pre-invoke") == 0)) + setenv("DPKG_FRONTEND_LOCKED", "true", 1); if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") { std::cerr << "Chrooting into " diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 6cbed85a7..9c7c70784 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -1043,6 +1043,7 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type /*{{{*/ auto const tv = *t; mytargets.erase(t); mytargets.emplace_back(tv); + break; } if (Changed == false) break; diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 790019b98..074e52b3f 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -102,8 +102,8 @@ APT_PURE static unsigned int EnvironmentSize() /*{{{*/ class pkgDPkgPMPrivate /*{{{*/ { public: - pkgDPkgPMPrivate() : stdin_is_dev_null(false), dpkgbuf_pos(0), - term_out(NULL), history_out(NULL), + pkgDPkgPMPrivate() : stdin_is_dev_null(false), status_fd_reached_end_of_file(false), + dpkgbuf_pos(0), term_out(NULL), history_out(NULL), progress(NULL), tt_is_valid(false), master(-1), slave(NULL), protect_slave_from_dying(-1), direct_stdin(false) @@ -114,6 +114,7 @@ public: { } bool stdin_is_dev_null; + bool status_fd_reached_end_of_file; // the buffer we use for the dpkg status-fd reading char dpkgbuf[1024]; size_t dpkgbuf_pos; @@ -141,12 +142,12 @@ namespace // Maps the dpkg "processing" info to human readable names. Entry 0 // of each array is the key, entry 1 is the value. const std::pair<const char *, const char *> PackageProcessingOps[] = { - std::make_pair("install", N_("Installing %s")), + std::make_pair("install", N_("Preparing %s")), // we don't care for the difference - std::make_pair("upgrade", N_("Installing %s")), - std::make_pair("configure", N_("Configuring %s")), - std::make_pair("remove", N_("Removing %s")), - std::make_pair("purge", N_("Completely removing %s")), + std::make_pair("upgrade", N_("Preparing %s")), + std::make_pair("configure", N_("Preparing to configure %s")), + std::make_pair("remove", N_("Preparing for removal of %s")), + std::make_pair("purge", N_("Preparing to completely remove %s")), std::make_pair("disappear", N_("Noting disappearance of %s")), std::make_pair("trigproc", N_("Running post-installation trigger %s")) }; @@ -480,6 +481,9 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) strprintf(hookfd, "%d", InfoFD); setenv("APT_HOOK_INFO_FD", hookfd.c_str(), 1); + if (_system != nullptr && _system->IsLocked() == true && stringcasecmp(Cnf, "DPkg::Pre-Install-Pkgs") == 0) + setenv("DPKG_FRONTEND_LOCKED", "true", 1); + debSystem::DpkgChrootDirectory(); const char *Args[4]; Args[0] = "/bin/sh"; @@ -958,11 +962,19 @@ void pkgDPkgPM::handleCrossUpgradeAction(string const &pkgname) /*{{{*/ // DPkgPM::DoDpkgStatusFd /*{{{*/ void pkgDPkgPM::DoDpkgStatusFd(int statusfd) { - ssize_t const len = read(statusfd, &d->dpkgbuf[d->dpkgbuf_pos], - (sizeof(d->dpkgbuf)/sizeof(d->dpkgbuf[0])) - d->dpkgbuf_pos); - if(len <= 0) - return; - d->dpkgbuf_pos += (len / sizeof(d->dpkgbuf[0])); + auto const remainingBuffer = (sizeof(d->dpkgbuf) / sizeof(d->dpkgbuf[0])) - d->dpkgbuf_pos; + if (likely(remainingBuffer > 0) && d->status_fd_reached_end_of_file == false) + { + auto const len = read(statusfd, &d->dpkgbuf[d->dpkgbuf_pos], remainingBuffer); + if (len < 0) + return; + else if (len == 0 && d->dpkgbuf_pos == 0) + { + d->status_fd_reached_end_of_file = true; + return; + } + d->dpkgbuf_pos += (len / sizeof(d->dpkgbuf[0])); + } // process line by line from the buffer char *p = d->dpkgbuf, *q = nullptr; @@ -1145,30 +1157,26 @@ void pkgDPkgPM::BuildPackagesProgressMap() { // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) - static const std::array<std::array<DpkgState, 3>, 4> DpkgStatesOpMap = {{ + static const std::array<std::array<DpkgState, 2>, 4> DpkgStatesOpMap = {{ // Install operation {{ - {"half-installed", N_("Preparing %s")}, - {"unpacked", N_("Unpacking %s") }, - {nullptr, nullptr} + {"half-installed", N_("Unpacking %s")}, + {"unpacked", N_("Installing %s") }, }}, // Configure operation {{ - {"unpacked",N_("Preparing to configure %s") }, {"half-configured", N_("Configuring %s") }, { "installed", N_("Installed %s")}, }}, // Remove operation {{ - {"half-configured", N_("Preparing for removal of %s")}, + {"half-configured", N_("Removing %s")}, {"half-installed", N_("Removing %s")}, - {"config-files", N_("Removed %s")}, }}, // Purge operation {{ - {"config-files", N_("Preparing to completely remove %s")}, + {"config-files", N_("Completely removing %s")}, {"not-installed", N_("Completely removed %s")}, - {nullptr, nullptr} }}, }}; static_assert(Item::Purge == 3, "Enum item has unexpected index for mapping array"); @@ -1184,21 +1192,16 @@ void pkgDPkgPM::BuildPackagesProgressMap() string const name = I.Pkg.FullName(); PackageOpsDone[name] = 0; - auto AddToPackageOps = std::back_inserter(PackageOps[name]); - if (I.Op == Item::Purge && I.Pkg->CurrentVer != 0) - { - // purging a package which is installed first passes through remove states - auto const DpkgOps = DpkgStatesOpMap[Item::Remove]; - std::copy(DpkgOps.begin(), DpkgOps.end(), AddToPackageOps); + auto AddToPackageOps = [&](decltype(I.Op) const Op) { + auto const DpkgOps = DpkgStatesOpMap[Op]; + std::copy(DpkgOps.begin(), DpkgOps.end(), std::back_inserter(PackageOps[name])); PackagesTotal += DpkgOps.size(); - } - auto const DpkgOps = DpkgStatesOpMap[I.Op]; - std::copy_if(DpkgOps.begin(), DpkgOps.end(), AddToPackageOps, [&](DpkgState const &state) { - if (state.state == nullptr) - return false; - ++PackagesTotal; - return true; - }); + }; + // purging a package which is installed first passes through remove states + if (I.Op == Item::Purge && I.Pkg->CurrentVer != 0) + AddToPackageOps(Item::Remove); + AddToPackageOps(I.Op); + if ((I.Op == Item::Remove || I.Op == Item::Purge) && I.Pkg->CurrentVer != 0) { if (I.Pkg->CurrentState == pkgCache::State::UnPacked || @@ -1622,9 +1625,9 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) approvedStates.Remove(*Ver); Purges.erase(Ver); auto && RemOp = PackageOps[C.first->Pkg.FullName()]; - if (RemOp.size() == 5) + if (RemOp.size() == 4) { - RemOp.erase(std::next(RemOp.begin(), 3), RemOp.end()); + RemOp.erase(std::next(RemOp.begin(), 2), RemOp.end()); PackagesTotal -= 2; } else @@ -2022,6 +2025,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) // we read from dpkg here int const _dpkgin = fd[0]; close(fd[1]); // close the write end of the pipe + d->status_fd_reached_end_of_file = false; // apply ionice if (_config->FindB("DPkg::UseIoNice", false) == true) @@ -2041,14 +2045,24 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) int Status = 0; int res; bool waitpid_failure = false; - while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { - if(res < 0) { - // error handling, waitpid returned -1 - if (errno == EINTR) - continue; - waitpid_failure = true; - break; + bool dpkg_finished = false; + do + { + if (dpkg_finished == false) + { + if ((res = waitpid(Child, &Status, WNOHANG)) == Child) + dpkg_finished = true; + else if (res < 0) + { + // error handling, waitpid returned -1 + if (errno == EINTR) + continue; + waitpid_failure = true; + break; + } } + if (dpkg_finished && d->status_fd_reached_end_of_file) + break; // wait for input or output here FD_ZERO(&rfds); @@ -2078,7 +2092,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) DoStdin(d->master); if(FD_ISSET(_dpkgin, &rfds)) DoDpkgStatusFd(_dpkgin); - } + + } while (true); close(_dpkgin); // Restore sig int/quit diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 7c016a5e7..510f2d3f0 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -413,7 +413,7 @@ bool pkgDepCache::CheckDep(DepIterator const &Dep,int const Type,PkgIterator &Re /*}}}*/ // DepCache::AddSizes - Add the packages sizes to the counters /*{{{*/ // --------------------------------------------------------------------- -/* Call with Inverse = true to perform the inverse opration */ +/* Call with Inverse = true to perform the inverse operation */ void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const Inverse) { StateCache &P = PkgState[Pkg->ID]; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 22693d2a2..9a51e31e7 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -204,7 +204,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.CndSet("Acquire::IndexTargets::deb-src::Sources::flatDescription", "$(RELEASE) Sources"); Cnf.CndSet("Acquire::IndexTargets::deb-src::Sources::Optional", false); - Cnf.CndSet("Acquire::Changelogs::URI::Origin::Debian", "http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog"); + Cnf.CndSet("Acquire::Changelogs::URI::Origin::Debian", "https://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog"); Cnf.CndSet("Acquire::Changelogs::URI::Origin::Tanglu", "http://metadata.tanglu.org/changelogs/@CHANGEPATH@_changelog"); Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ubuntu", "https://changelogs.ubuntu.com/changelogs/pool/@CHANGEPATH@/changelog"); Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ultimedia", "http://packages.ultimediaos.com/changelogs/pool/@CHANGEPATH@/changelog.txt"); @@ -249,7 +249,7 @@ bool pkgInitConfig(Configuration &Cnf) return good; } /*}}}*/ -// pkgInitSystem - Initialize the _system calss /*{{{*/ +// pkgInitSystem - Initialize the _system class /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 670b5e2bd..a826f2853 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -12,7 +12,7 @@ This is a modified version of Manoj's Routine B. It consists of four independent ordering algorithms that can be applied at for different - points in the ordering. By appling progressivly fewer ordering + points in the ordering. By applying progressivly fewer ordering operations it is possible to give each consideration it's own priority and create an order that satisfies the lowest applicable consideration. @@ -562,7 +562,7 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical) // OrderList::VisitNode - Recursive ordering director /*{{{*/ // --------------------------------------------------------------------- /* This is the core ordering routine. It calls the set dependency - consideration functions which then potentialy call this again. Finite + consideration functions which then potentially call this again. Finite depth is achieved through the colouring mechinism. */ bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from) { diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index c4dc50a10..8b59c43de 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -133,7 +133,7 @@ class pkgTagSection * @param MaxLength is the size of valid data in the stream pointed to by Start * @param Restart if enabled internal state will be cleared, otherwise it is * assumed that now more data is available in the stream and the parsing will - * start were it encountered insufficent data the last time. + * start were it encountered insufficient data the last time. * * @return \b true if section end was found, \b false otherwise. * Beware that internal state will be inconsistent if \b false is returned! diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h index d20d00b68..3370bd03a 100644 --- a/apt-private/private-cacheset.h +++ b/apt-private/private-cacheset.h @@ -26,6 +26,7 @@ public: {} const pkgCache::DescFile * CachedDescFile() const { return descFile; } operator pkgCache::VerIterator() const { return iter; } + map_id_t ID() const { return iter->ID; } }; struct VersionSortDescriptionLocality /*{{{*/ @@ -36,17 +37,21 @@ struct VersionSortDescriptionLocality /*{{{*/ pkgCache::DescFile const *A = v_lhs.CachedDescFile(); pkgCache::DescFile const *B = v_rhs.CachedDescFile(); - if (A == nullptr && B == nullptr) - return false; - if (A == nullptr) + { + if (B == nullptr) + return v_lhs.ID() < v_rhs.ID(); return true; - - if (B == nullptr) + } + else if (B == nullptr) return false; if (A->File == B->File) + { + if (A->Offset == B->Offset) + return v_lhs.ID() < v_rhs.ID(); return A->Offset < B->Offset; + } return A->File < B->File; } diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index 2c9b349a3..7c8c89777 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -129,7 +129,7 @@ bool DoList(CommandLine &Cmd) else ListSingleVersion(CacheFile, records, V, outs, format); output_map.insert(std::make_pair<std::string, std::string>( - V.ParentPkg().Name(), outs.str())); + V.ParentPkg().FullName(), outs.str())); } // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status) diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 15c05d420..b69008ec9 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -42,7 +42,7 @@ pkgRecords::Parser &LookupParser(pkgRecords &Recs, pkgCache::VerIterator const & return Recs.Lookup(Vf); } /*}}}*/ -static APT_PURE char const *skipDescriptionFields(char const *DescP, size_t const Length) /*{{{*/ +static APT_PURE char const *skipDescription(char const *DescP, size_t const Length, bool fields) /*{{{*/ { auto const backup = DescP; char const * const TagName = "\nDescription"; @@ -51,7 +51,7 @@ static APT_PURE char const *skipDescriptionFields(char const *DescP, size_t cons { if (DescP[1] == ' ') DescP += 2; - else if (strncmp((char*)DescP, TagName, TagLen) == 0) + else if (fields && strncmp((char *)DescP, TagName, TagLen) == 0) DescP += TagLen; else break; @@ -78,19 +78,43 @@ static APT_PURE char const *findDescriptionField(char const *DescP, size_t const return DescP; } /*}}}*/ +static APT_PURE char const *skipColonSpaces(char const *Buffer, size_t const Length) /*{{{*/ +{ + // skipping withspace before and after the field-value separating colon + char const *const Start = Buffer; + for (; isspace(*Buffer) != 0 && Length - (Buffer - Start) > 0; ++Buffer) + ; + if (*Buffer != ':') + return nullptr; + ++Buffer; + for (; isspace(*Buffer) != 0 && Length - (Buffer - Start) > 0; ++Buffer) + ; + if (Length - (Buffer - Start) <= 0) + return nullptr; + return Buffer; +} + /*}}}*/ bool DisplayRecordV1(pkgCacheFile &, pkgRecords &Recs, /*{{{*/ - pkgCache::VerIterator const &V, pkgCache::VerFileIterator const &, + pkgCache::VerIterator const &V, pkgCache::VerFileIterator const &Vf, char const *Buffer, size_t Length, std::ostream &out) { - if (unlikely(Length == 0)) + if (unlikely(Length < 4)) return false; auto const Desc = V.TranslatedDescription(); if (Desc.end()) { - // we have no translation output whatever we have got - return FileFd::Write(STDOUT_FILENO, Buffer, Length); + /* This handles the unusual case that we have no description whatsoever. + The slightly more common case of only having a short-description embedded + in the record could be handled here, but apt supports also having multiple + descriptions embedded in the record, so we deal with that case later */ + if (FileFd::Write(STDOUT_FILENO, Buffer, Length) == false) + return false; + if (strncmp((Buffer + Length - 4), "\r\n\r\n", 4) != 0 && + strncmp((Buffer + Length - 2), "\n\n", 2) != 0) + out << std::endl; + return true; } // Get a pointer to start of Description field @@ -111,18 +135,41 @@ bool DisplayRecordV1(pkgCacheFile &, pkgRecords &Recs, /*{{{*/ else snprintf(desctag, sizeof(desctag), "\nDescription-%s", langcode); - out << desctag + 1 << ": "; + out << desctag + 1 << ": " << std::flush; auto const Df = Desc.FileList(); if (Df.end() == false) { - pkgRecords::Parser &P = Recs.Lookup(Df); - out << P.LongDesc(); + if (Desc.FileList()->File == Vf->File) + { + /* If we have the file already open look in the buffer for the + description we want to display. Note that this might not be the + only one we can encounter in this record */ + char const *Start = DescP; + do + { + if (strncmp(Start, desctag + 1, strlen(desctag) - 1) != 0) + continue; + Start += strlen(desctag) - 1; + Start = skipColonSpaces(Start, Length - (Start - Buffer)); + if (Start == nullptr) + continue; + char const *End = skipDescription(Start, Length - (Start - Buffer), false); + if (likely(End != nullptr)) + FileFd::Write(STDOUT_FILENO, Start, End - (Start + 1)); + break; + } while ((Start = findDescriptionField(Start, Length - (Start - Buffer))) != nullptr); + } + else + { + pkgRecords::Parser &P = Recs.Lookup(Df); + out << P.LongDesc(); + } } out << std::endl << "Description-md5: " << Desc.md5() << std::endl; // Find the first field after the description (if there is any) - DescP = skipDescriptionFields(DescP, Length - (DescP - Buffer)); + DescP = skipDescription(DescP, Length - (DescP - Buffer), true); // write the rest of the buffer, but skip mixed in Descriptions* fields while (DescP != nullptr) @@ -150,7 +197,7 @@ bool DisplayRecordV1(pkgCacheFile &, pkgRecords &Recs, /*{{{*/ ++End; } else - DescP = skipDescriptionFields(End + strlen("Description"), Length - (End - Buffer)); + DescP = skipDescription(End + strlen("Description"), Length - (End - Buffer), true); size_t const length = End - Start; if (length != 0 && FileFd::Write(STDOUT_FILENO, Start, length) == false) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9b64e285e..39855e05a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -13,7 +13,7 @@ update - Resyncronize the package files from their sources upgrade - Smart-Download the newest versions of all packages dselect-upgrade - Follows dselect's changes to the Status: field - and installes new and removes old packages + and installs new and removes old packages dist-upgrade - Powerful upgrader designed to handle the issues with a new distribution. install - Download and install a given package (by name, not by .deb) diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 8315efa12..927b31d2f 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -301,7 +301,7 @@ static std::vector<aptDispatchWithHelp> GetCommands() /*{{{*/ {"purge",&DoSelection, nullptr}, {"showauto",&ShowAuto, _("Print the list of automatically installed packages")}, {"showmanual",&ShowAuto, _("Print the list of manually installed packages")}, - {"showhold",&ShowSelection, _("Print the list of package on hold")}, {"showholds",&ShowSelection, nullptr}, + {"showhold",&ShowSelection, _("Print the list of packages on hold")}, {"showholds",&ShowSelection, nullptr}, {"showinstall",&ShowSelection, nullptr}, {"showinstalls",&ShowSelection, nullptr}, {"showdeinstall",&ShowSelection, nullptr}, {"showdeinstalls",&ShowSelection, nullptr}, {"showremove",&ShowSelection, nullptr}, {"showremoves",&ShowSelection, nullptr}, diff --git a/debian/changelog b/debian/changelog index 8d4734637..741abcbd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,74 @@ +apt (1.7.0) unstable; urgency=medium + + [ Julian Andres Klode ] + * Fix calculation of elapsed usec in downloads + * pkgCacheFile: Only unlock in destructor if locked before (LP: #1794053) + * Set DPKG_FRONTEND_LOCKED when running {pre,post}-invoke scripts. + Some post-invoke scripts install packages, which fails because + the environment variable is not set. This sets the variable for + all three kinds of scripts {pre,post-}invoke and pre-install-pkgs, + but we will only allow post-invoke at a later time. + * prepare-release: Fix last-modification detection for manpages + + [ David Kalnischkies ] + * Show APT::Compressor example in apt.conf(5) (Closes: #909712) + + [ Muhamed Huseinbašić ] + * apt-mark: showhold: typo-fix (package -> packages) + + -- Julian Andres Klode <jak@debian.org> Sun, 07 Oct 2018 07:56:02 +0200 + +apt (1.7.0~rc2) unstable; urgency=medium + + [ David Kalnischkies ] + * Deal with descriptions embedded in displayed record correctly + (Closes: #909155) + + -- Julian Andres Klode <jak@debian.org> Thu, 20 Sep 2018 21:03:54 +0200 + +apt (1.7.0~rc1) unstable; urgency=medium + + [ Laurent Bigonville ] + * fr.po: Do not translate the apt-ftparchive commands (Closes: #907481) + + [ David Kalnischkies ] + * Don't use invalid iterator in Fallback-Of handling. + Thanks to David Binderman for reporting + * Process status-fd completely before finishing dpkg call + * Don't expect duplicated dpkg status-fd messages + * Reorder progress report messages + * Show all architectures in 'apt list' output (Closes: #908218) + + [ Julian Andres Klode ] + * http: Stop pipeline after close only if it was not filled before + + -- Julian Andres Klode <jak@debian.org> Tue, 18 Sep 2018 16:12:38 +0200 + +apt (1.7.0~alpha3) experimental; urgency=medium + + [ David Kalnischkies ] + * SECURITY UPDATE: Fallback in the mirror method allowed a later server to + supply any InRelease file without it having to be verified. (LP: #1787752) + - apt-pkg/acquire-item.cc:: clear alternative URIs for mirror:// between steps + - CVE-2018-0501 + - https://mirror.fail/ + + [ Jean-Ralph Aviles ] + * Add trailing newline to output of edit-sources. + + [ Julian Andres Klode ] + * Add support for dpkg frontend lock (Closes: #869546) + * Set DPKG_FRONTEND_LOCKED as needed when doing selection changes + * Update symbols files + + [ Boyuan Yang ] + * Simplified Chinese program translation update (Closes: #903695) + + [ David Kalnischkies ] + * Report (soon) worthless keys if gpg uses fpr for GOODSIG + + -- Julian Andres Klode <jak@debian.org> Mon, 20 Aug 2018 17:44:19 +0200 + apt (1.7.0~alpha2) experimental; urgency=medium * Handle JSON hooks that just close the file/exit and fix some other errors @@ -30,7 +101,7 @@ apt (1.7.0~alpha1) experimental; urgency=medium * Extend apt build-dep pkg/release to switch dep as needed * Support release selector for volatile files as well * Start pkg records for deb files with dpkg output - * Deprectate buggy/incorrect Rls/PkgFile::IsOk methods + * Deprecate buggy/incorrect Rls/PkgFile::IsOk methods * Support --with-source in show & search commands * Support local files as arguments in show command (Closes: 883206) * Drop alternative URIs we got a hash-based fail from diff --git a/debian/libapt-inst2.0.symbols b/debian/libapt-inst2.0.symbols index 3687ac95a..94130bcb3 100644 --- a/debian/libapt-inst2.0.symbols +++ b/debian/libapt-inst2.0.symbols @@ -62,6 +62,8 @@ libapt-inst.so.2.0 libapt-inst2.0 #MINVER# (c++)"vtable for debDebFile::MemControlExtract@APTINST_2.0" 0.8.0 ### gcc artifacts (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@APTINST_2.0" 0.8.12 + (c++|optional=std)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char*>(char*, char*, std::forward_iterator_tag)@APTINST_2.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char const*>(char const*, char const*, std::forward_iterator_tag)@APTINST_2.0" 1.7.0~alpha3~ ### symbol versioning APTINST_2.0@APTINST_2.0 1.1~exp9 ### try to ignore std:: template instances diff --git a/debian/libapt-pkg5.0.symbols b/debian/libapt-pkg5.0.symbols index 86a38d540..882180c78 100644 --- a/debian/libapt-pkg5.0.symbols +++ b/debian/libapt-pkg5.0.symbols @@ -1510,8 +1510,25 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER# (c++|optional=std)"void std::vector<pkgAcquireStatus::ReleaseInfoChange, std::allocator<pkgAcquireStatus::ReleaseInfoChange> >::emplace_back<pkgAcquireStatus::ReleaseInfoChange>(pkgAcquireStatus::ReleaseInfoChange&&)@APTPKG_5.0" 1.5~beta2~ (c++)"vtable for pkgAcquireStatus2@APTPKG_5.0" 1.5~beta2~ (c++)"pkgAcqMethod::FetchItem::Proxy[abi:cxx11]()@APTPKG_5.0" 1.6~alpha1~ + (c++)"pkgSystem::IsLocked()@APTPKG_5.0" 1.7.0~alpha3~ + (c++)"pkgSystem::LockInner()@APTPKG_5.0" 1.7.0~alpha3~ + (c++)"pkgSystem::UnLockInner(bool)@APTPKG_5.0" 1.7.0~alpha3~ # gcc-8 artifacts (c++|optional=std)"URI::operator std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >[abi:cxx11]()@APTPKG_5.0" 0.8.0 (c++|optional=std)"std::enable_if<std::__and_<std::__not_<std::__is_tuple_like<APT::Configuration::Compressor> >, std::is_move_constructible<APT::Configuration::Compressor>, std::is_move_assignable<APT::Configuration::Compressor> >::value, void>::type std::swap<APT::Configuration::Compressor>(APT::Configuration::Compressor&, APT::Configuration::Compressor&)@APTPKG_5.0" 1.1~exp9 (c++|optional=std)"std::ostream_iterator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, char, std::char_traits<char> > std::__copy_move_a<false, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*, std::ostream_iterator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, char, std::char_traits<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*, std::ostream_iterator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, char, std::char_traits<char> >)@APTPKG_5.0" 1.3~exp1 (c++|optional=std)"std::enable_if<std::__and_<std::__not_<std::__is_tuple_like<IndexTarget> >, std::is_move_constructible<IndexTarget>, std::is_move_assignable<IndexTarget> >::value, void>::type std::swap<IndexTarget>(IndexTarget&, IndexTarget&)@APTPKG_5.0" 1.5~beta2~ + (c++|optional=std)"pkgAcqMethod::SendMessage(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::unordered_map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::hash<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [3], char const (&) [4], char const (&) [3], char const (&) [3], char const (&) [3], int>(char const (&) [3], char const (&) [4], char const (&) [3], char const (&) [3], char const (&) [3], int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [3], char const (&) [4], char const (&) [6], decltype(nullptr), decltype(nullptr), int>(char const (&) [3], char const (&) [4], char const (&) [6], decltype(nullptr)&&, decltype(nullptr)&&, int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [4], char const (&) [5], char const (&) [4], char const (&) [3], char const (&) [3], int>(char const (&) [4], char const (&) [5], char const (&) [4], char const (&) [3], char const (&) [3], int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [4], char const (&) [5], char const (&) [6], decltype(nullptr), decltype(nullptr), int>(char const (&) [4], char const (&) [5], char const (&) [6], decltype(nullptr)&&, decltype(nullptr)&&, int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [5], char const (&) [4], char const (&) [5], char const (&) [4], char const (&) [3], int>(char const (&) [5], char const (&) [4], char const (&) [5], char const (&) [4], char const (&) [3], int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [5], char const (&) [4], char const (&) [6], decltype(nullptr), decltype(nullptr), int>(char const (&) [5], char const (&) [4], char const (&) [6], decltype(nullptr)&&, decltype(nullptr)&&, int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [5], char const (&) [5], char const (&) [5], char const (&) [4], char const (&) [3], int>(char const (&) [5], char const (&) [5], char const (&) [5], char const (&) [4], char const (&) [3], int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [5], char const (&) [5], char const (&) [6], decltype(nullptr), decltype(nullptr), int>(char const (&) [5], char const (&) [5], char const (&) [6], decltype(nullptr)&&, decltype(nullptr)&&, int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [5], char const (&) [6], char const (&) [5], char const (&) [3], char const (&) [3], int>(char const (&) [5], char const (&) [6], char const (&) [5], char const (&) [3], char const (&) [3], int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [5], char const (&) [6], char const (&) [6], decltype(nullptr), decltype(nullptr), int>(char const (&) [5], char const (&) [6], char const (&) [6], decltype(nullptr)&&, decltype(nullptr)&&, int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [6], char const (&) [5], char const (&) [6], char const (&) [3], char const (&) [3], int>(char const (&) [6], char const (&) [5], char const (&) [6], char const (&) [3], char const (&) [3], int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::emplace_back<char const (&) [6], char const (&) [5], char const (&) [6], decltype(nullptr), decltype(nullptr), int>(char const (&) [6], char const (&) [5], char const (&) [6], decltype(nullptr)&&, decltype(nullptr)&&, int&&)@APTPKG_5.0" 1.7.0~alpha3~ + (c++|optional=std)"void std::vector<re_pattern_buffer*, std::allocator<re_pattern_buffer*> >::emplace_back<re_pattern_buffer*>(re_pattern_buffer*&&)@APTPKG_5.0" 1.7.0~alpha3~ diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 5726e00f2..b8c6aa989 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2016-11-25T00:00:00Z</date> + <date>2016-08-16T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 0a9305132..246cc03d3 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2016-11-25T00:00:00Z</date> + <date>2016-11-11T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 541bf08ea..b1099aa56 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2018-06-25T00:00:00Z</date> + <date>2017-07-27T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 279c417c7..a1c677d65 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2016-11-25T00:00:00Z</date> + <date>2016-11-22T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 50f99d3c3..e334df9ca 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2017-04-12T00:00:00Z</date> + <date>2016-08-06T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-transport-http.1.xml b/doc/apt-transport-http.1.xml index 03e77246d..f239da554 100644 --- a/doc/apt-transport-http.1.xml +++ b/doc/apt-transport-http.1.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2018-06-25T00:00:00Z</date> + <date>2018-05-11T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml index 353c0a564..e00dd7c62 100644 --- a/doc/apt-transport-https.1.xml +++ b/doc/apt-transport-https.1.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2018-06-25T00:00:00Z</date> + <date>2018-05-11T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 85a634233..c323cf5a8 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -268,7 +268,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "1.7.0~alpha2"> +<!ENTITY apt-product-version "1.7.0"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "jessie"> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index aa374ead8..55bc9d20d 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -19,7 +19,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2018-06-25T00:00:00Z</date> + <date>2018-09-27T00:00:00Z</date> </refentryinfo> <refmeta> @@ -182,7 +182,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; would allow apt to download and uncompress as well as create and store files with the low-cost <literal>.reversed</literal> file extension which it will pass to the command <command>rev</command> without additional - commandline parameters for compression and uncompression: + commandline parameters for compression and uncompression:</para> <informalexample><programlisting> APT::Compressor::rev { Name "rev"; @@ -193,7 +193,7 @@ APT::Compressor::rev { Cost "10"; }; </programlisting></informalexample> - </para></listitem> + </listitem> </varlistentry> <varlistentry><term><option>Build-Profiles</option></term> diff --git a/doc/apt_auth.conf.5.xml b/doc/apt_auth.conf.5.xml index 8621cdee2..37e4fbc98 100644 --- a/doc/apt_auth.conf.5.xml +++ b/doc/apt_auth.conf.5.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2017-08-17T00:00:00Z</date> + <date>2017-07-07T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 71ec57be0..65590f17b 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -362,7 +362,7 @@ Acquire // Location of the changelogs with the placeholder @CHANGEPATH@ (e.g. "main/a/apt/apt_1.1") Changelogs::URI { - // Origin::Debian "http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog"; + // Origin::Debian "https://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog"; Origin::* "<STRING>"; Label::* "<STRING>"; Override::Origin::* "<STRING>"; diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 0920aff3e..1c7b58ff4 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.7.0~alpha2\n" +"Project-Id-Version: apt-doc 1.7.0\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-07-09 16:03+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3010,7 +3010,7 @@ msgid "" "parameters for compression and uncompression:" msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" diff --git a/doc/po/de.po b/doc/po/de.po index 5ac6cd4e4..76d08e45f 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-04-18 17:22+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2018-02-03 13:12+0200\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -4276,7 +4276,7 @@ msgstr "" "zusätzliche Befehlszeilenparameter zum Komprimieren und Dekomprimieren an " "den Befehl <command>rev</command> übergeben:" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" diff --git a/doc/po/es.po b/doc/po/es.po index 8f419acda..ba7fd28af 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-04-18 17:22+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -4272,7 +4272,7 @@ msgid "" "parameters for compression and uncompression:" msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" diff --git a/doc/po/fr.po b/doc/po/fr.po index b29f046e8..b1eb022b0 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-04-18 17:22+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2018-03-16 00:54+0100\n" "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -4270,7 +4270,7 @@ msgstr "" "command> sans paramètre supplémentaire en ligne de commande pour la " "compression et la décompression :" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" diff --git a/doc/po/it.po b/doc/po/it.po index 870550dc7..4c36d1a68 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-04-18 17:22+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2017-03-27 19:05+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -4286,7 +4286,7 @@ msgstr "" "command> senza parametri aggiuntivi per la compressione e la decompressione " "nella riga di comando:" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" @@ -7580,8 +7580,8 @@ msgstr "Formato in stile deb822" #| "character at the start of the line marks the entire line as a comment. An " #| "entry can hence be disabled by commenting out each line belonging to the " #| "stanza, but it is usually easier to add the field \"Enabled: no\" to the " -#| "stanza to disable the entry. Removing the field or setting it to yes " -#| "re-enables it. Options have the same syntax as every other field: A " +#| "stanza to disable the entry. Removing the field or setting it to yes re-" +#| "enables it. Options have the same syntax as every other field: A " #| "fieldname separated by a colon (<literal>:</literal>) and optionally " #| "spaces from its value(s). Note especially that multiple values are " #| "separated by spaces, not by commas as in the one-line format. Multivalue " diff --git a/doc/po/ja.po b/doc/po/ja.po index 8f7975c8e..6721ba080 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-04-18 17:22+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2017-01-06 04:50+0900\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -4135,7 +4135,7 @@ msgstr "" "し、<command>rev</command> による圧縮と展開の際に渡すコマンドラインパラメータ" "を追加しない設定となります:" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" @@ -7272,8 +7272,8 @@ msgstr "deb822 スタイル形式" #| "character at the start of the line marks the entire line as a comment. An " #| "entry can hence be disabled by commenting out each line belonging to the " #| "stanza, but it is usually easier to add the field \"Enabled: no\" to the " -#| "stanza to disable the entry. Removing the field or setting it to yes " -#| "re-enables it. Options have the same syntax as every other field: A " +#| "stanza to disable the entry. Removing the field or setting it to yes re-" +#| "enables it. Options have the same syntax as every other field: A " #| "fieldname separated by a colon (<literal>:</literal>) and optionally " #| "spaces from its value(s). Note especially that multiple values are " #| "separated by spaces, not by commas as in the one-line format. Multivalue " diff --git a/doc/po/nl.po b/doc/po/nl.po index 0e2be9bed..ccc80daae 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.6.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-02 10:57+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2018-05-19 23:38+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -4366,7 +4366,7 @@ msgstr "" "<command>rev</command> zal gebruiken zonder bijkomende " "commandoregelparameters:" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" diff --git a/doc/po/pl.po b/doc/po/pl.po index 47b14b041..8361a2dbf 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-04-18 17:22+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@ -4268,7 +4268,7 @@ msgid "" "parameters for compression and uncompression:" msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" diff --git a/doc/po/pt.po b/doc/po/pt.po index b8b138117..394f06b66 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-04-18 17:22+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2014-08-29 00:34+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -4203,7 +4203,7 @@ msgid "" "parameters for compression and uncompression:" msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 33ad7a358..0c37b896b 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-04-18 17:22+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -2973,7 +2973,7 @@ msgid "" "parameters for compression and uncompression:" msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt.conf.5.xml #, no-wrap msgid "" diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 20903652a..1890c28d0 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -401,7 +401,7 @@ bool CacheDB::LoadContents(bool const &GenOnly) return true; } /*}}}*/ -// CacheDB::GetHashes - Get the hashs /*{{{*/ +// CacheDB::GetHashes - Get the hashes /*{{{*/ static std::string bytes2hex(uint8_t *bytes, size_t length) { char buf[3]; std::string space; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 61489f73a..dbc097af6 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -291,7 +291,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, unsigned long long &DeLinkBytes, unsigned long long const &FileSize) { - // See if this isn't an internaly prefix'd file name. + // See if this isn't an internally prefix'd file name. if (InternalPrefix.empty() == false && InternalPrefix.length() < FileName.length() && stringcmp(FileName.begin(),FileName.begin() + InternalPrefix.length(), diff --git a/methods/basehttp.cc b/methods/basehttp.cc index 3d95ba7df..f8dd7c020 100644 --- a/methods/basehttp.cc +++ b/methods/basehttp.cc @@ -39,6 +39,10 @@ string BaseHttpMethod::FailFile; int BaseHttpMethod::FailFd = -1; time_t BaseHttpMethod::FailTime = 0; +// Number of successful requests in a pipeline needed to continue +// pipelining after a connection reset. +constexpr int PIPELINE_MIN_SUCCESSFUL_ANSWERS_TO_CONTINUE = 3; + // ServerState::RunHeaders - Get the headers before the data /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header @@ -215,8 +219,11 @@ bool RequestState::HeaderLine(string const &Line) /*{{{*/ /* Some servers send error pages (as they are dynamically generated) for simplicity via a connection close instead of e.g. chunked, so assuming an always closing server only if we get a file + close */ - if (Result >= 200 && Result < 300) + if (Result >= 200 && Result < 300 && Server->PipelineAnswersReceived < PIPELINE_MIN_SUCCESSFUL_ANSWERS_TO_CONTINUE) + { Server->PipelineAllowed = false; + Server->PipelineAnswersReceived = 0; + } } else if (stringcasecmp(Val,"keep-alive") == 0) Server->Persistent = true; @@ -267,6 +274,7 @@ void ServerState::Reset() /*{{{*/ Pipeline = false; PipelineAllowed = true; RangesAllowed = true; + PipelineAnswersReceived = 0; } /*}}}*/ @@ -593,8 +601,10 @@ int BaseHttpMethod::Loop() Server->Close(); // Reset the pipeline - if (Server->IsOpen() == false) + if (Server->IsOpen() == false) { QueueBack = Queue; + Server->PipelineAnswersReceived = 0; + } // Connect to the host switch (Server->Open()) @@ -752,6 +762,10 @@ int BaseHttpMethod::Loop() BeforeI = I; } } + if (Server->Pipeline == true) + { + Server->PipelineAnswersReceived++; + } Res.TakeHashes(*resultHashes); URIDone(Res); } @@ -861,9 +875,9 @@ unsigned long long BaseHttpMethod::FindMaximumObjectSizeInQueue() const /*{{{*/ return MaxSizeInQueue; } /*}}}*/ -BaseHttpMethod::BaseHttpMethod(std::string &&Binary, char const * const Ver,unsigned long const Flags) :/*{{{*/ - aptAuthConfMethod(std::move(Binary), Ver, Flags), Server(nullptr), PipelineDepth(10), - AllowRedirect(false), Debug(false) +BaseHttpMethod::BaseHttpMethod(std::string &&Binary, char const *const Ver, unsigned long const Flags) /*{{{*/ + : aptAuthConfMethod(std::move(Binary), Ver, Flags), Server(nullptr), + AllowRedirect(false), Debug(false), PipelineDepth(10) { } /*}}}*/ diff --git a/methods/basehttp.h b/methods/basehttp.h index 8220c1b3c..5fdff69e0 100644 --- a/methods/basehttp.h +++ b/methods/basehttp.h @@ -67,6 +67,7 @@ struct ServerState bool Persistent; bool PipelineAllowed; bool RangesAllowed; + unsigned long PipelineAnswersReceived; bool Pipeline; URI ServerName; @@ -122,7 +123,6 @@ class BaseHttpMethod : public aptAuthConfMethod std::unique_ptr<ServerState> Server; std::string NextURI; - unsigned long PipelineDepth; bool AllowRedirect; // Find the biggest item in the fetch queue for the checking of the maximum @@ -131,6 +131,7 @@ class BaseHttpMethod : public aptAuthConfMethod public: bool Debug; + unsigned long PipelineDepth; /** \brief Result of the header parsing */ enum DealWithHeadersResult { diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 8de15c48a..84b8c3e59 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -94,7 +94,10 @@ struct Signer { std::string note; }; static bool IsTheSameKey(std::string const &validsig, std::string const &goodsig) { - // VALIDSIG reports a keyid (40 = 24 + 16), GOODSIG is a longid (16) only + // VALIDSIG reports a fingerprint (40 = 24 + 16), GOODSIG can be longid (16) or + // fingerprint according to documentation in DETAILS.gz + if (goodsig.length() == 40 + strlen("GOODSIG ")) + return validsig.compare(0, 40, goodsig, strlen("GOODSIG "), 40) == 0; return validsig.compare(24, 16, goodsig, strlen("GOODSIG "), 16) == 0; } @@ -254,46 +257,32 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, if (keyIsID == true) { if (Debug == true) - std::clog << "GoodSigs needs to be limited to keyid " << key << std::endl; - bool foundGood = false; - for (auto const &k: VectorizeString(key, ',')) + std::clog << "GoodSigs needs to be limited to keyid(s) " << key << std::endl; + auto const limitedTo = VectorizeString(key, ','); + std::vector<std::string> filteredGood; + for (auto &&good: GoodSigners) { - if (std::find(ValidSigners.begin(), ValidSigners.end(), k) == ValidSigners.end()) - continue; - // we look for GOODSIG here as well as an expired sig is a valid sig as well (but not a good one) - std::string const goodfingerprint = "GOODSIG " + k; - std::string const goodlongkeyid = "GOODSIG " + k.substr(24, 16); - foundGood = std::find(GoodSigners.begin(), GoodSigners.end(), goodfingerprint) != GoodSigners.end(); if (Debug == true) - std::clog << "Key " << k << " is valid sig, is " << goodfingerprint << " also a good one? " << (foundGood ? "yes" : "no") << std::endl; - std::string goodsig; - if (foundGood == false) + std::clog << "Key " << good << " is good sig, is it also a valid and allowed one? "; + bool found = false; + for (auto const &l : limitedTo) { - foundGood = std::find(GoodSigners.begin(), GoodSigners.end(), goodlongkeyid) != GoodSigners.end(); - if (Debug == true) - std::clog << "Key " << k << " is valid sig, is " << goodlongkeyid << " also a good one? " << (foundGood ? "yes" : "no") << std::endl; - goodsig = goodlongkeyid; + if (IsTheSameKey(l, good) == false) + continue; + // GOODSIG might be "just" a longid, so we check VALIDSIG which is always a fingerprint + if (std::find(ValidSigners.begin(), ValidSigners.end(), l) == ValidSigners.end()) + continue; + found = true; + break; } + if (Debug) + std::clog << (found ? "yes" : "no") << "\n"; + if (found) + filteredGood.emplace_back(std::move(good)); else - goodsig = goodfingerprint; - if (foundGood == false) - continue; - std::copy(GoodSigners.begin(), GoodSigners.end(), std::back_insert_iterator<std::vector<std::string> >(NoPubKeySigners)); - GoodSigners.clear(); - GoodSigners.push_back(goodsig); - NoPubKeySigners.erase( - std::remove(NoPubKeySigners.begin(), - std::remove(NoPubKeySigners.begin(), NoPubKeySigners.end(), goodfingerprint), - goodlongkeyid), - NoPubKeySigners.end() - ); - break; - } - if (foundGood == false) - { - std::copy(GoodSigners.begin(), GoodSigners.end(), std::back_insert_iterator<std::vector<std::string> >(NoPubKeySigners)); - GoodSigners.clear(); + NoPubKeySigners.emplace_back(std::move(good)); } + GoodSigners = std::move(filteredGood); } int status; diff --git a/po/apt-all.pot b/po/apt-all.pot index 3d1f855d1..18534b8a2 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 1.7.0~alpha2\n" +"Project-Id-Version: apt 1.7.0\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-07-09 16:03+0200\n" +"POT-Creation-Date: 2018-10-07 07:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1052,13 +1052,12 @@ msgstr "" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1070,28 +1069,40 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" +msgid "Preparing %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" +msgid "Preparing to configure %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" +msgid "Preparing for removal of %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" +msgid "Preparing to completely remove %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc @@ -1109,6 +1120,11 @@ msgstr "" msgid "Installed %s" msgstr "" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1122,32 +1138,22 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" +msgid "Installing %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" +msgid "Removing %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" +msgid "Completely removing %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc @@ -2843,7 +2849,7 @@ msgid "Print the list of manually installed packages" msgstr "" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -1065,13 +1065,12 @@ msgstr "" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "تعذر قفل دليل القائمة" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1083,29 +1082,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "تعذر قفل دليل القائمة" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Installing %s" -msgstr "تم تثبيت %s" +#, c-format +msgid "Preparing %s" +msgstr "تحضير %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "تهيئة %s" +msgid "Preparing to configure %s" +msgstr "التحضير لتهيئة %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "إزالة %s" +msgid "Preparing for removal of %s" +msgstr "التحضير لإزالة %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "تمت إزالة %s بالكامل" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "التحضير لإزالة %s بالكامل" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1122,6 +1133,11 @@ msgstr "" msgid "Installed %s" msgstr "تم تثبيت %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "تهيئة %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1135,33 +1151,23 @@ msgstr "فشل إغلاق الملف %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "تحضير %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "فتح %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to configure %s" -msgstr "التحضير لتهيئة %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "التحضير لإزالة %s" +#, fuzzy, c-format +msgid "Installing %s" +msgstr "تم تثبيت %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "تم إزالة %s" +msgid "Removing %s" +msgstr "إزالة %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "التحضير لإزالة %s بالكامل" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "تمت إزالة %s بالكامل" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2895,7 +2901,7 @@ msgid "Print the list of manually installed packages" msgstr "إلا أنه سيتم تثبيت %s" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3643,6 +3649,9 @@ msgstr "" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "تم إزالة %s" + #, fuzzy #~ msgid "Can not read mirror file '%s'" #~ msgstr "فشل إغلاق الملف %s" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (ast)\n" @@ -1081,17 +1081,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu " "usándolu?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1105,29 +1108,43 @@ msgstr "" "problema. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu " +"usándolu?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Non bloquiáu" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Instalando %s" +msgid "Preparing %s" +msgstr "Preparando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +msgid "Preparing to configure %s" +msgstr "Preparándose pa configurar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Desinstalando %s" +msgid "Preparing for removal of %s" +msgstr "Preparándose pa desinstalar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Desinstalóse dafechu %s" +msgid "Preparing to completely remove %s" +msgstr "Preparándose pa desinstalar dafechu %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1144,6 +1161,11 @@ msgstr "Executando activador de post-instalación de %s" msgid "Installed %s" msgstr "%s instaláu" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Configurando %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1157,33 +1179,23 @@ msgstr "Nun pudo abrise'l ficheru '%s'" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Preparando %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Preparándose pa configurar %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Preparándose pa desinstalar %s" +msgid "Installing %s" +msgstr "Instalando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s desinstaláu" +msgid "Removing %s" +msgstr "Desinstalando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparándose pa desinstalar dafechu %s" +msgid "Completely removing %s" +msgstr "Desinstalóse dafechu %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3008,7 +3020,7 @@ msgid "Print the list of manually installed packages" msgstr "%s axustáu como instaláu manualmente.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3804,6 +3816,9 @@ msgstr "Conexón encaboxada prematuramente" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "%s desinstaláu" + #~ msgid "Package file %s is out of sync." #~ msgstr "El ficheru de paquetes %s nun ta sincronizáu." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov <dmn@debian.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -1103,17 +1103,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Неуспех при анализирането на пакетен файл %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Неуспех при заключване на административната директория (%s). Може би се " "използва от друг процес?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Неуспех при заключване на административната директория (%s). Може би липсват " "административни права?" @@ -1129,29 +1132,45 @@ msgstr "" "изпълнение на „%s“." #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Неуспех при заключване на административната директория (%s). Може би се " +"използва от друг процес?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Неуспех при заключване на административната директория (%s). Може би липсват " +"административни права?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Без заключване" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Инсталиране на %s" +msgid "Preparing %s" +msgstr "Подготвяне на %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Конфигуриране на %s" +msgid "Preparing to configure %s" +msgstr "Подготвяне на %s за конфигуриране" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Премахване на %s" +msgid "Preparing for removal of %s" +msgstr "Подготвяне за премахване на %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Окончателно премахване на %s" +msgid "Preparing to completely remove %s" +msgstr "Подготовка за пълно премахване на %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1168,6 +1187,11 @@ msgstr "Изпълнение на тригер след инсталиране % msgid "Installed %s" msgstr "%s е инсталиран" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Конфигуриране на %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1181,33 +1205,23 @@ msgstr "Неуспех при отваряне на файла „%s“" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Подготвяне на %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Подготвяне на %s за конфигуриране" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Подготвяне за премахване на %s" +msgid "Installing %s" +msgstr "Инсталиране на %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s е премахнат" +msgid "Removing %s" +msgstr "Премахване на %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Подготовка за пълно премахване на %s" +msgid "Completely removing %s" +msgstr "Окончателно премахване на %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3056,7 +3070,7 @@ msgid "Print the list of manually installed packages" msgstr "" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3857,6 +3871,9 @@ msgstr "Връзката прекъсна преждевременно" msgid "Empty files can't be valid archives" msgstr "Празни файлове не могат да бъдат валидни архиви" +#~ msgid "Removed %s" +#~ msgstr "%s е премахнат" + #~ msgid "Package file %s is out of sync." #~ msgstr "Пакетният файл %s не е синхронизиран." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -1060,13 +1060,12 @@ msgstr "" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1078,29 +1077,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Installing %s" -msgstr " Instalirano:" +msgid "Preparing %s" +msgstr "Otvaram %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Configuring %s" -msgstr "Povezujem se sa %s" +#, c-format +msgid "Preparing to configure %s" +msgstr "" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Otvaram %s" +#, c-format +msgid "Preparing for removal of %s" +msgstr "" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Ne mogu ukloniti %s" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1117,6 +1128,11 @@ msgstr "" msgid "Installed %s" msgstr " Instalirano:" +#: apt-pkg/deb/dpkgpm.cc +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Povezujem se sa %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1130,33 +1146,23 @@ msgstr "Ne mogu otvoriti %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Preparing %s" -msgstr "Otvaram %s" - -#: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to configure %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "" +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Instalirano:" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Removed %s" -msgstr "Preporučuje" +msgid "Removing %s" +msgstr "Otvaram %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Ne mogu ukloniti %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -2877,7 +2883,7 @@ msgid "Print the list of manually installed packages" msgstr "ali se %s treba instalirati" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3624,6 +3630,10 @@ msgid "Empty files can't be valid archives" msgstr "" #, fuzzy +#~ msgid "Removed %s" +#~ msgstr "Preporučuje" + +#, fuzzy #~ msgid "Can not read mirror file '%s'" #~ msgstr "Ne mogu otvoriti %s" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4~beta1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2016-12-05 21:09+0100\n" "Last-Translator: Oriol Debian <oriol.debian@gmail.com>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -1145,17 +1145,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "No es pot analitzar el fitxer del paquet %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre " "procés utilitzant-lo?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "No es pot blocar el directori d'administració (%s), sou root?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1169,29 +1172,43 @@ msgstr "" "el problema." #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre " +"procés utilitzant-lo?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "No es pot blocar el directori d'administració (%s), sou root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "No blocat" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "S'està instal·lant %s" +msgid "Preparing %s" +msgstr "S'està preparant el paquet %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "S'està configurant el paquet %s" +msgid "Preparing to configure %s" +msgstr "S'està preparant per a configurar el paquet %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "S'està suprimint el paquet %s" +msgid "Preparing for removal of %s" +msgstr "S'està preparant per a la supressió del paquet %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "S'ha suprimit completament %s" +msgid "Preparing to completely remove %s" +msgstr "S'està preparant per a suprimir completament el paquet %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1208,6 +1225,11 @@ msgstr "S'està executant l'activador de postinstal·lació %s" msgid "Installed %s" msgstr "S'ha instal·lat el paquet %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "S'està configurant el paquet %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1221,33 +1243,23 @@ msgstr "No s'ha pogut obrir el fitxer «%s»" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "S'està preparant el paquet %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "S'està preparant per a configurar el paquet %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "S'està preparant per a la supressió del paquet %s" +msgid "Installing %s" +msgstr "S'està instal·lant %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "S'ha suprimit el paquet %s" +msgid "Removing %s" +msgstr "S'està suprimint el paquet %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "S'està preparant per a suprimir completament el paquet %s" +msgid "Completely removing %s" +msgstr "S'ha suprimit completament %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3134,7 +3146,7 @@ msgid "Print the list of manually installed packages" msgstr "Mostra la llista dels paquets instal·lats manualment" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Mostra la llista dels paquets retinguts" #: cmdline/apt-sortpkgs.cc @@ -3945,6 +3957,9 @@ msgstr "La connexió s'ha tancat prematurament" msgid "Empty files can't be valid archives" msgstr "Els fitxers buits no poden ser arxius vàlids" +#~ msgid "Removed %s" +#~ msgstr "S'ha suprimit el paquet %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "El fitxer %s del paquet està desincronitzat." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2017-05-06 11:08+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -1111,15 +1111,18 @@ msgid "Unable to parse package file %s (%d)" msgstr "Nelze zpracovat soubor %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"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?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Nelze uzamknout administrační adresář (%s). Jste root?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1131,29 +1134,41 @@ msgid "" msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%s“." #: apt-pkg/deb/debsystem.cc +#, c-format +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?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Nelze uzamknout administrační adresář (%s). Jste root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Není uzamčen" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Instaluje se %s" +msgid "Preparing %s" +msgstr "Připravuje se %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Nastavuje se %s" +msgid "Preparing to configure %s" +msgstr "Připravuje se nastavení %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Odstraňuje se %s" +msgid "Preparing for removal of %s" +msgstr "Připravuje se odstranění %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Kompletně se odstraňuje %s" +msgid "Preparing to completely remove %s" +msgstr "Připravuje se úplné odstranění %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1170,6 +1185,11 @@ msgstr "Spouští se poinstalační spouštěč %s" msgid "Installed %s" msgstr "Nainstalován %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Nastavuje se %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1183,33 +1203,23 @@ msgstr "Nelze otevřít soubor „%s“" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Připravuje se %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Rozbaluje se %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Připravuje se nastavení %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Připravuje se odstranění %s" +msgid "Installing %s" +msgstr "Instaluje se %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Odstraněn %s" +msgid "Removing %s" +msgstr "Odstraňuje se %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Připravuje se úplné odstranění %s" +msgid "Completely removing %s" +msgstr "Kompletně se odstraňuje %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3048,7 +3058,7 @@ msgid "Print the list of manually installed packages" msgstr "Vypíše seznam balíků instalovaných ručně" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Vypíše seznam podržených balíků" #: cmdline/apt-sortpkgs.cc @@ -3844,6 +3854,9 @@ msgstr "Spojení bylo předčasně ukončeno" msgid "Empty files can't be valid archives" msgstr "Prázdné soubory nejsou platnými archivy" +#~ msgid "Removed %s" +#~ msgstr "Odstraněn %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Soubor balíku %s je špatně synchronizovaný." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -1088,13 +1088,12 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1106,29 +1105,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Installing %s" -msgstr " Wedi Sefydlu: " +msgid "Preparing %s" +msgstr "Yn agor %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Configuring %s" -msgstr "Yn cysylltu i %s" +msgid "Preparing to configure %s" +msgstr "Yn agor y ffeil cyfluniad %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Yn agor %s" +#, c-format +msgid "Preparing for removal of %s" +msgstr "" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Methwyd dileu %s" +msgid "Preparing to completely remove %s" +msgstr "Yn agor y ffeil cyfluniad %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1145,6 +1156,11 @@ msgstr "" msgid "Installed %s" msgstr " Wedi Sefydlu: " +#: apt-pkg/deb/dpkgpm.cc +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Yn cysylltu i %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -1158,33 +1174,23 @@ msgstr "Methwyd agor ffeil %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Preparing %s" -msgstr "Yn agor %s" - -#: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Preparing to configure %s" -msgstr "Yn agor y ffeil cyfluniad %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "" +msgid "Installing %s" +msgstr " Wedi Sefydlu: " #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Removed %s" -msgstr "Argymell" +msgid "Removing %s" +msgstr "Yn agor %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Preparing to completely remove %s" -msgstr "Yn agor y ffeil cyfluniad %s" +msgid "Completely removing %s" +msgstr "Methwyd dileu %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -3028,7 +3034,7 @@ msgid "Print the list of manually installed packages" msgstr "ond mae %s yn mynd i gael ei sefydlu" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3837,6 +3843,10 @@ msgstr "Caewyd y cysylltiad yn gynnar" msgid "Empty files can't be valid archives" msgstr "" +#, fuzzy +#~ msgid "Removed %s" +#~ msgstr "Argymell" + #~ msgid "Package file %s is out of sync." #~ msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4~rc2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2017-03-02 23:51+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -1123,16 +1123,19 @@ msgid "Unable to parse package file %s (%d)" msgstr "Kunne ikke tolke pakkefilen %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1144,29 +1147,42 @@ msgid "" msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Ikke låst" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Installerer %s" +msgid "Preparing %s" +msgstr "Klargør %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Sætter %s op" +msgid "Preparing to configure %s" +msgstr "Gør klar til at sætte %s op" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Fjerner %s" +msgid "Preparing for removal of %s" +msgstr "Gør klar til afinstallation af %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Fjerner %s helt" +msgid "Preparing to completely remove %s" +msgstr "Gør klar til at fjerne %s helt" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1183,6 +1199,11 @@ msgstr "Kører førinstallationsudløser %s" msgid "Installed %s" msgstr "Installerede %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Sætter %s op" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1196,33 +1217,23 @@ msgstr "Kunne ikke åbne filen »%s«" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Klargør %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Gør klar til at sætte %s op" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Gør klar til afinstallation af %s" +msgid "Installing %s" +msgstr "Installerer %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Fjernede %s" +msgid "Removing %s" +msgstr "Fjerner %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Gør klar til at fjerne %s helt" +msgid "Completely removing %s" +msgstr "Fjerner %s helt" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3074,7 +3085,7 @@ msgid "Print the list of manually installed packages" msgstr "Vis listen over manuelt installerede pakker" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Vis listen over tilbageholdte pakker" #: cmdline/apt-sortpkgs.cc @@ -3882,6 +3893,9 @@ msgstr "Forbindelsen lukkedes for hurtigt" msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" +#~ msgid "Removed %s" +#~ msgstr "Fjernede %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Pakkefilen %s er ude af trit." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2018-01-11 21:11+0100\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1161,17 +1161,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (%d)." #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von " "einem anderen Prozess verwendet?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?" @@ -1186,29 +1189,44 @@ msgstr "" "das Problem zu beheben." #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von " +"einem anderen Prozess verwendet?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Nicht gesperrt" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "%s wird installiert." +msgid "Preparing %s" +msgstr "%s wird vorbereitet." #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s wird konfiguriert." +msgid "Preparing to configure %s" +msgstr "Konfiguration von %s wird vorbereitet." #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s wird entfernt." +msgid "Preparing for removal of %s" +msgstr "Entfernen von %s wird vorbereitet." #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "%s wird vollständig entfernt." +msgid "Preparing to completely remove %s" +msgstr "Vollständiges Entfernen von %s wird vorbereitet." #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1225,6 +1243,11 @@ msgstr "Aufruf des Nach-Installations-Triggers %s" msgid "Installed %s" msgstr "%s installiert" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s wird konfiguriert." + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1238,33 +1261,23 @@ msgstr "Datei »%s« konnte nicht geöffnet werden." #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s wird vorbereitet." - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s wird entpackt." #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Konfiguration von %s wird vorbereitet." - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Entfernen von %s wird vorbereitet." +msgid "Installing %s" +msgstr "%s wird installiert." #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s entfernt" +msgid "Removing %s" +msgstr "%s wird entfernt." #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Vollständiges Entfernen von %s wird vorbereitet." +msgid "Completely removing %s" +msgstr "%s wird vollständig entfernt." #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3193,7 +3206,7 @@ msgid "Print the list of manually installed packages" msgstr "eine Liste aller manuell installierten Pakete anzeigen" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "eine Liste aller zurückgehaltenen Pakete anzeigen" #: cmdline/apt-sortpkgs.cc @@ -4029,6 +4042,9 @@ msgstr "Verbindung vorzeitig beendet" msgid "Empty files can't be valid archives" msgstr "Leere Dateien können kein gültiges Archiv sein." +#~ msgid "Removed %s" +#~ msgstr "%s entfernt" + #~ msgid "Package file %s is out of sync." #~ msgstr "Paketdatei %s ist nicht synchronisiert." @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -1069,13 +1069,12 @@ msgstr "%s (%d)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འ #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1087,29 +1086,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Installing %s" -msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" +#, c-format +msgid "Preparing %s" +msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" +msgid "Preparing to configure %s" +msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" +msgid "Preparing for removal of %s" +msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1126,6 +1137,11 @@ msgstr "" msgid "Installed %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -1139,33 +1155,23 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to configure %s" -msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" +#, fuzzy, c-format +msgid "Installing %s" +msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" +msgid "Removing %s" +msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2973,7 +2979,7 @@ msgid "Print the list of manually installed packages" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3777,6 +3783,9 @@ msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལ msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" + #~ msgid "Package file %s is out of sync." #~ msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།" @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -1088,13 +1088,12 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Αδύνατο το κλείδωμα του καταλόγου" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1106,29 +1105,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Αδύνατο το κλείδωμα του καταλόγου" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Εγκατάσταση του %s" +msgid "Preparing %s" +msgstr "Προετοιμασία του %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Ρύθμιση του %s" +msgid "Preparing to configure %s" +msgstr "Προετοιμασία ρύθμισης του %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Αφαιρώ το %s" +msgid "Preparing for removal of %s" +msgstr "Προετοιμασία για την αφαίρεση του %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Το %s διαγράφηκε πλήρως" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1145,6 +1156,11 @@ msgstr "Εκτέλεση του post-installation trigger %s" msgid "Installed %s" msgstr "Έγινε εγκατάσταση του %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Ρύθμιση του %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1158,33 +1174,23 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Προετοιμασία του %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Προετοιμασία ρύθμισης του %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Προετοιμασία για την αφαίρεση του %s" +msgid "Installing %s" +msgstr "Εγκατάσταση του %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Αφαίρεσα το %s" +msgid "Removing %s" +msgstr "Αφαιρώ το %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Το %s διαγράφηκε πλήρως" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3001,7 +3007,7 @@ msgid "Print the list of manually installed packages" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3806,6 +3812,9 @@ msgstr "Η σύνδεση έκλεισε πρόωρα" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "Αφαίρεσα το %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο." @@ -34,7 +34,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2016-01-26 01:51+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox." "org>\n" @@ -1208,17 +1208,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "No se pudo analizar el archivo de paquetes %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún " "otro proceso utilizándolo?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "No se pudo bloquear el directorio de administración (%s), ¿está como " "superusuario?" @@ -1234,29 +1237,45 @@ msgstr "" "corregir el problema" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún " +"otro proceso utilizándolo?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"No se pudo bloquear el directorio de administración (%s), ¿está como " +"superusuario?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "No bloqueado" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Instalando %s" +msgid "Preparing %s" +msgstr "Preparando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +msgid "Preparing to configure %s" +msgstr "Preparándose para configurar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Eliminando %s" +msgid "Preparing for removal of %s" +msgstr "Preparándose para eliminar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Borrando completamente %s" +msgid "Preparing to completely remove %s" +msgstr "Preparándose para eliminar completamente %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1273,6 +1292,11 @@ msgstr "Ejecutando disparador post-instalación %s" msgid "Installed %s" msgstr "%s instalado" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Configurando %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1286,33 +1310,23 @@ msgstr "No se pudo abrir el fichero «%s»" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Preparando %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Preparándose para configurar %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Preparándose para eliminar %s" +msgid "Installing %s" +msgstr "Instalando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s eliminado" +msgid "Removing %s" +msgstr "Eliminando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparándose para eliminar completamente %s" +msgid "Completely removing %s" +msgstr "Borrando completamente %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3191,7 +3205,7 @@ msgid "Print the list of manually installed packages" msgstr "Muestra la lista de paquetes instalados manualmente" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Muestra la lista de paquetes retenidos" #: cmdline/apt-sortpkgs.cc @@ -4005,6 +4019,9 @@ msgstr "La conexión se cerró prematuramente" msgid "Empty files can't be valid archives" msgstr "Los ficheros vacíos no pueden ser archivos válidos" +#~ msgid "Removed %s" +#~ msgstr "%s eliminado" + #~ msgid "Package file %s is out of sync." #~ msgstr "El archivo de paquetes %s está desincronizado." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" @@ -1073,13 +1073,12 @@ msgstr "Ezin da %s pakete fitxategia analizatu (%d)" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Ezin da zerrenda direktorioa blokeatu" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1091,29 +1090,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Ezin da zerrenda direktorioa blokeatu" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "%s Instalatzen" +msgid "Preparing %s" +msgstr "%s prestatzen" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s konfiguratzen" +msgid "Preparing to configure %s" +msgstr "%s konfiguratzeko prestatzen" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s kentzen" +msgid "Preparing for removal of %s" +msgstr "%s kentzeko prestatzen" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s guztiz ezabatu da" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s guztiz ezabatzeko prestatzen" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1130,6 +1141,11 @@ msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen" msgid "Installed %s" msgstr "%s Instalatuta" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s konfiguratzen" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1143,33 +1159,23 @@ msgstr "%s fitxategia ezin izan da ireki" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s prestatzen" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s irekitzen" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "%s konfiguratzeko prestatzen" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s kentzeko prestatzen" +msgid "Installing %s" +msgstr "%s Instalatzen" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s kendurik" +msgid "Removing %s" +msgstr "%s kentzen" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "%s guztiz ezabatzeko prestatzen" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s guztiz ezabatu da" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2974,7 +2980,7 @@ msgid "Print the list of manually installed packages" msgstr "%s eskuz instalatua bezala ezarri.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3773,6 +3779,9 @@ msgstr "Konexioa behar baino lehenago itxi da" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "%s kendurik" + #~ msgid "Package file %s is out of sync." #~ msgstr "%s pakete fitxategia ez dago sinkronizatuta." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -1067,13 +1067,12 @@ msgstr "Pakettitiedostoa %s ei voi jäsentää (%d)" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Luettelokansiota ei voitu lukita" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1085,29 +1084,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Luettelokansiota ei voitu lukita" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Asennetaan %s" +msgid "Preparing %s" +msgstr "Valmistellaan %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Tehdään asetukset: %s" +msgid "Preparing to configure %s" +msgstr "Valmistaudutaan tekemään asetukset: %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Poistetaan %s" +msgid "Preparing for removal of %s" +msgstr "Valmistaudutaan poistamaan %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s poistettiin kokonaan" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Valmistaudutaan poistamaan %s kokonaan" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1124,6 +1135,11 @@ msgstr "Suoritetaan jälkiasennusliipaisin %s" msgid "Installed %s" msgstr "%s asennettu" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Tehdään asetukset: %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1137,33 +1153,23 @@ msgstr "Tiedostoa %s ei voitu avata" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Valmistellaan %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Puretaan %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Valmistaudutaan tekemään asetukset: %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Valmistaudutaan poistamaan %s" +msgid "Installing %s" +msgstr "Asennetaan %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s poistettu" +msgid "Removing %s" +msgstr "Poistetaan %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Valmistaudutaan poistamaan %s kokonaan" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s poistettiin kokonaan" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2965,7 +2971,7 @@ msgid "Print the list of manually installed packages" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3765,6 +3771,9 @@ msgstr "Yhteys katkesi ennenaikaisesti" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "%s poistettu" + #~ msgid "Package file %s is out of sync." #~ msgstr "Pakettitiedosto %s ei ole ajan tasalla." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2018-01-02 15:09+0100\n" "Last-Translator: Julien Patriarca <leatherface@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1160,17 +1160,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Impossible de traiter le fichier %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Impossible de verrouiller le répertoire d'administration (%s). Il est " "possible qu'un autre processus l'utilise." #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les " "privilèges du superutilisateur ?" @@ -1186,29 +1189,45 @@ msgstr "" "problème." #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Impossible de verrouiller le répertoire d'administration (%s). Il est " +"possible qu'un autre processus l'utilise." + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les " +"privilèges du superutilisateur ?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Non verrouillé" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Installation de %s" +msgid "Preparing %s" +msgstr "Préparation de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Configuration de %s" +msgid "Preparing to configure %s" +msgstr "Préparation de la configuration de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Suppression de %s" +msgid "Preparing for removal of %s" +msgstr "Préparation de la suppression de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Suppression complète de %s" +msgid "Preparing to completely remove %s" +msgstr "Préparation de la suppression complète de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1225,6 +1244,11 @@ msgstr "Exécution des actions différées (« trigger ») de %s" msgid "Installed %s" msgstr "%s installé" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Configuration de %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1238,33 +1262,23 @@ msgstr "Impossible d'ouvrir le fichier « %s »" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Préparation de %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Décompression de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Préparation de la configuration de %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Préparation de la suppression de %s" +msgid "Installing %s" +msgstr "Installation de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s supprimé" +msgid "Removing %s" +msgstr "Suppression de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Préparation de la suppression complète de %s" +msgid "Completely removing %s" +msgstr "Suppression complète de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3207,7 +3221,7 @@ msgid "Print the list of manually installed packages" msgstr "Afficher la liste des paquets installés manuellement" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Afficher la liste des paquets maintenus dans une version" #: cmdline/apt-sortpkgs.cc @@ -3391,7 +3405,7 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" "Usage : apt-ftparchive [options] commande\n" -"Commandes : paquets binarypath [fichier d'« override » [chemin du " +"Commandes : packages binarypath [fichier d'« override » [chemin du " "préfixe]]\n" " sources srcpath [fichier d'« override » [chemin du préfixe]]\n" " contents path\n" @@ -4030,6 +4044,9 @@ msgstr "Connexion fermée prématurément" msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent être des archives valables" +#~ msgid "Removed %s" +#~ msgstr "%s supprimé" + #~ msgid "Package file %s is out of sync." #~ msgstr "Fichier du paquet %s désynchronisé." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: galician <proxecto@trasno.net>\n" @@ -1099,17 +1099,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Non é posíbel bloquear o directorio de administración (%s). Esta usandoo " "algún outro proceso?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Non é posíbel bloquear o directorio de administración (%s). É o " "administrador?" @@ -1124,29 +1127,45 @@ msgstr "" "dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Non é posíbel bloquear o directorio de administración (%s). Esta usandoo " +"algún outro proceso?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Non é posíbel bloquear o directorio de administración (%s). É o " +"administrador?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Non está bloqueado" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Instalando %s" +msgid "Preparing %s" +msgstr "Preparando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +msgid "Preparing to configure %s" +msgstr "Preparandose para configurar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Retirando %s" +msgid "Preparing for removal of %s" +msgstr "Preparándose para o retirado de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "%s completamente retirado" +msgid "Preparing to completely remove %s" +msgstr "Preparándose para retirar %s completamente" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1163,6 +1182,11 @@ msgstr "Executando o disparador de post-instalación %s" msgid "Installed %s" msgstr "Instalouse %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Configurando %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1176,33 +1200,23 @@ msgstr "Non foi posíbel abrir o ficheiro «%s»" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Preparando %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Preparandose para configurar %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Preparándose para o retirado de %s" +msgid "Installing %s" +msgstr "Instalando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Retirouse %s" +msgid "Removing %s" +msgstr "Retirando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparándose para retirar %s completamente" +msgid "Completely removing %s" +msgstr "%s completamente retirado" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3038,7 +3052,7 @@ msgid "Print the list of manually installed packages" msgstr "%s cambiado a instalado manualmente.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3839,6 +3853,9 @@ msgstr "A conexión pechouse prematuramente" msgid "Empty files can't be valid archives" msgstr "Os ficheiros baleiros non poden ser arquivadores válidos" +#~ msgid "Removed %s" +#~ msgstr "Retirouse %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "O ficheiro de paquete %s está sen sincronizar." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2016-04-10 19:46+0200\n" "Last-Translator: Gabor Kelemen <kelemeng@ubuntu.com>\n" "Language-Team: Hungarian <gnome-hu-list@gnome.org>\n" @@ -1142,17 +1142,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat " "használja?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Az adminisztrációs könyvtár (%s) nem zárolható, rendszergazdaként próbálja?" @@ -1167,29 +1170,44 @@ msgstr "" "probléma megoldásához. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat " +"használja?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Az adminisztrációs könyvtár (%s) nem zárolható, rendszergazdaként próbálja?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Nincs zárolva" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "%s telepítése" +msgid "Preparing %s" +msgstr "%s előkészítése" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s konfigurálása" +msgid "Preparing to configure %s" +msgstr "%s konfigurálásának előkészítése" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s eltávolítása" +msgid "Preparing for removal of %s" +msgstr "%s eltávolításának előkészítése" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "%s teljes eltávolítása" +msgid "Preparing to completely remove %s" +msgstr "%s teljes eltávolításának előkészítése" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1206,6 +1224,11 @@ msgstr "A(z) %s telepítés utáni trigger futtatása" msgid "Installed %s" msgstr "%s telepítve" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s konfigurálása" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1219,33 +1242,23 @@ msgstr "A(z) „%s” fájl megnyitása sikertelen" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s előkészítése" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "%s konfigurálásának előkészítése" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s eltávolításának előkészítése" +msgid "Installing %s" +msgstr "%s telepítése" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s eltávolítva" +msgid "Removing %s" +msgstr "%s eltávolítása" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s teljes eltávolításának előkészítése" +msgid "Completely removing %s" +msgstr "%s teljes eltávolítása" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3095,7 +3108,7 @@ msgid "Print the list of manually installed packages" msgstr "Kézileg telepített csomagok listájának kiírása" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Visszatartott csomagok listájának megjelölése" #: cmdline/apt-sortpkgs.cc @@ -3904,6 +3917,9 @@ msgstr "A kapcsolat idő előtt lezárult" msgid "Empty files can't be valid archives" msgstr "Az üres fájlok biztosan nem érvényes csomagok" +#~ msgid "Removed %s" +#~ msgstr "%s eltávolítva" + #~ msgid "Package file %s is out of sync." #~ msgstr "%s csomagfájl nincs szinkronban." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.6~alpha5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2017-11-27 13:57+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -1154,17 +1154,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Impossibile analizzare il file di pacchetto %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un " "altro processo potrebbe tenerla occupata." #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Impossibile acquisire il blocco sulla directory di amministrazione (%s). È " "necessario essere root." @@ -1180,29 +1183,45 @@ msgstr "" "problema. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un " +"altro processo potrebbe tenerla occupata." + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È " +"necessario essere root." + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Non bloccato" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Installazione di %s" +msgid "Preparing %s" +msgstr "Preparazione di %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Configurazione di %s" +msgid "Preparing to configure %s" +msgstr "Preparazione alla configurazione di %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Rimozione di %s" +msgid "Preparing for removal of %s" +msgstr "Preparazione alla rimozione di %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Rimozione completa di %s" +msgid "Preparing to completely remove %s" +msgstr "Preparazione alla rimozione completa di %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1219,6 +1238,11 @@ msgstr "Esecuzione comando di post installazione %s" msgid "Installed %s" msgstr "Pacchetto %s installato" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Configurazione di %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1232,33 +1256,23 @@ msgstr "Impossibile aprire il file \"%s\"" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Preparazione di %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Estrazione di %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Preparazione alla configurazione di %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Preparazione alla rimozione di %s" +msgid "Installing %s" +msgstr "Installazione di %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Pacchetto %s rimosso" +msgid "Removing %s" +msgstr "Rimozione di %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparazione alla rimozione completa di %s" +msgid "Completely removing %s" +msgstr "Rimozione completa di %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3156,7 +3170,7 @@ msgid "Print the list of manually installed packages" msgstr "Stampa l'elenco dei pacchetti installati manualmente" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Stampa l'elenco dei pacchetti bloccati" #: cmdline/apt-sortpkgs.cc @@ -3982,6 +3996,9 @@ msgstr "Connessione chiusa prematuramente" msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" +#~ msgid "Removed %s" +#~ msgstr "Pacchetto %s rimosso" + #~ msgid "Package file %s is out of sync." #~ msgstr "Il file dei pacchetti %s non è sincronizzato." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2017-01-06 04:50+0900\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -1135,17 +1135,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "パッケージファイル %s を解釈することができません (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい" "ませんか?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "管理用ディレクトリ (%s) をロックできません。root 権限で実行していますか?" @@ -1160,29 +1163,44 @@ msgstr "" "す。" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい" +"ませんか?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"管理用ディレクトリ (%s) をロックできません。root 権限で実行していますか?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "ロックされていません" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "%s をインストールしています" +msgid "Preparing %s" +msgstr "%s を準備しています" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s を設定しています" +msgid "Preparing to configure %s" +msgstr "%s の設定を準備しています" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s を削除しています" +msgid "Preparing for removal of %s" +msgstr "%s の削除を準備しています" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "%s を完全に削除しています" +msgid "Preparing to completely remove %s" +msgstr "%s を完全に削除する準備をしています" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1199,6 +1217,11 @@ msgstr "インストール後トリガ %s を実行しています" msgid "Installed %s" msgstr "%s をインストールしました" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s を設定しています" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1212,33 +1235,23 @@ msgstr "ファイル '%s' をオープンできませんでした" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s を準備しています" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s を展開しています" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "%s の設定を準備しています" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s の削除を準備しています" +msgid "Installing %s" +msgstr "%s をインストールしています" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s を削除しました" +msgid "Removing %s" +msgstr "%s を削除しています" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s を完全に削除する準備をしています" +msgid "Completely removing %s" +msgstr "%s を完全に削除しています" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3091,7 +3104,7 @@ msgid "Print the list of manually installed packages" msgstr "手作業でインストールしたパッケージの一覧を表示する" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "保留されているパッケージの一覧を表示する" #: cmdline/apt-sortpkgs.cc @@ -3887,6 +3900,9 @@ msgstr "途中で接続がクローズされました" msgid "Empty files can't be valid archives" msgstr "空のファイルは有効なアーカイブと認められません" +#~ msgid "Removed %s" +#~ msgstr "%s を削除しました" + #~ msgid "Package file %s is out of sync." #~ msgstr "Package ファイル %s が同期していません。" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -1070,13 +1070,12 @@ msgstr "មិនអាចញែកឯកសារកញ្ចប់ %s (% #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "មិនអាចចាក់សោថតបញ្ជីបានឡើយ" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1088,29 +1087,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "មិនអាចចាក់សោថតបញ្ជីបានឡើយ" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Installing %s" -msgstr "បានដំឡើង %s" +#, c-format +msgid "Preparing %s" +msgstr "កំពុងរៀបចំ %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "កំពុងកំណត់រចនាសម្ព័ន្ធ %s" +msgid "Preparing to configure %s" +msgstr "កំពុងរៀបចំកំណត់រចនាសម្ព័ន្ធ %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "កំពុងយក %s ចេញ" +msgid "Preparing for removal of %s" +msgstr "កំពុងរៀបចំដើម្បីការយកចេញនៃ %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "បានយក %s ចេញទាំងស្រុង" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "កំពុងរៀបចំយក %s ចេញទាំងស្រុង" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1127,6 +1138,11 @@ msgstr "" msgid "Installed %s" msgstr "បានដំឡើង %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "កំពុងកំណត់រចនាសម្ព័ន្ធ %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -1140,33 +1156,23 @@ msgstr "មិនអាចបើកឯកសារ %s បានឡ #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "កំពុងរៀបចំ %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "កំពុងស្រាយ %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to configure %s" -msgstr "កំពុងរៀបចំកំណត់រចនាសម្ព័ន្ធ %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "កំពុងរៀបចំដើម្បីការយកចេញនៃ %s" +#, fuzzy, c-format +msgid "Installing %s" +msgstr "បានដំឡើង %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "បានយក %s ចេញ" +msgid "Removing %s" +msgstr "កំពុងយក %s ចេញ" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "កំពុងរៀបចំយក %s ចេញទាំងស្រុង" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "បានយក %s ចេញទាំងស្រុង" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2959,7 +2965,7 @@ msgid "Print the list of manually installed packages" msgstr "ប៉ុន្តែ %s នឹងត្រូវបានដំឡើង" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3749,6 +3755,9 @@ msgstr "បានបិទការតភ្ជាប់មុន msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "បានយក %s ចេញ" + #~ msgid "Package file %s is out of sync." #~ msgstr "ឯកសារកញ្ចប់ %s នៅខាងក្រៅការធ្វើសមកាលកម្ម ។" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -1068,17 +1068,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니" "까?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1091,29 +1094,43 @@ msgstr "" "dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오." #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니" +"까?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "잠기지 않음" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "%s 설치하는 중입니다" +msgid "Preparing %s" +msgstr "%s 준비 중입니다" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s 설정 중입니다" +msgid "Preparing to configure %s" +msgstr "%s 패키지를 설정할 준비하는 중입니다" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s 패키지를 지우는 중입니다" +msgid "Preparing for removal of %s" +msgstr "%s 패키지를 지울 준비하는 중입니다" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "%s 패키지를 완전히 지우는 중입니다" +msgid "Preparing to completely remove %s" +msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1130,6 +1147,11 @@ msgstr "설치 후 트리거 %s 실행하는 중입니다" msgid "Installed %s" msgstr "%s 설치" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s 설정 중입니다" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1143,33 +1165,23 @@ msgstr "'%s' 파일을 열 수 없습니다" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s 준비 중입니다" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s 푸는 중입니다" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "%s 패키지를 설정할 준비하는 중입니다" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s 패키지를 지울 준비하는 중입니다" +msgid "Installing %s" +msgstr "%s 설치하는 중입니다" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s 지움" +msgid "Removing %s" +msgstr "%s 패키지를 지우는 중입니다" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" +msgid "Completely removing %s" +msgstr "%s 패키지를 완전히 지우는 중입니다" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2971,7 +2983,7 @@ msgid "Print the list of manually installed packages" msgstr "%s 패키지 수동설치로 지정합니다.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3763,6 +3775,9 @@ msgstr "연결이 너무 빨리 끊어졌습니다" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "%s 지움" + #~ msgid "Package file %s is out of sync." #~ msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -1061,13 +1061,12 @@ msgstr "Pakêt nehate dîtin %s" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Pelrêça daxistinê nayê quflekirin" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1079,29 +1078,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Pelrêça daxistinê nayê quflekirin" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Installing %s" -msgstr "%s hatine sazkirin" +#, c-format +msgid "Preparing %s" +msgstr "%s tê amadekirin" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s tê mîhengkirin" +msgid "Preparing to configure %s" +msgstr "Mîhengkirina %s tê amadekirin" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s tê rakirin" +msgid "Preparing for removal of %s" +msgstr "Rakirina %s tê amadekirin" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s bi tevahî hatine rakirin" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Bi tevahî rakirina %s tê amadekirin" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1118,6 +1129,11 @@ msgstr "" msgid "Installed %s" msgstr "%s hatine sazkirin" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s tê mîhengkirin" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1131,33 +1147,23 @@ msgstr "Nikarî pelê %s veke" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s tê amadekirin" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s tê derxistin" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to configure %s" -msgstr "Mîhengkirina %s tê amadekirin" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Rakirina %s tê amadekirin" +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s hatine sazkirin" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s hatine rakirin" +msgid "Removing %s" +msgstr "%s tê rakirin" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Bi tevahî rakirina %s tê amadekirin" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s bi tevahî hatine rakirin" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2902,7 +2908,7 @@ msgid "Print the list of manually installed packages" msgstr "lê %s dê were sazkirin" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3647,6 +3653,9 @@ msgstr "Girêdan zû hatiye girtin" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "%s hatine rakirin" + #~ msgid "Package file %s is out of sync." #~ msgstr "Pakêta dosya %s li derveyî demê ye." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -1065,13 +1065,12 @@ msgstr "" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Nepavyko užrakinti sąrašo aplanko" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1083,29 +1082,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Nepavyko užrakinti sąrašo aplanko" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Installing %s" -msgstr "Įdiegta %s" +#, c-format +msgid "Preparing %s" +msgstr "Ruošiamas %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Konfigūruojamas %s" +msgid "Preparing to configure %s" +msgstr "Ruošiamasi konfigūruoti %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Šalinamas %s" +msgid "Preparing for removal of %s" +msgstr "Ruošiamasi %s pašalinimui" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Visiškai pašalintas %s" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Ruošiamasi visiškai pašalinti %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1122,6 +1133,11 @@ msgstr "" msgid "Installed %s" msgstr "Įdiegta %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Konfigūruojamas %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1135,33 +1151,23 @@ msgstr "Nepavyko atverti failo %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Ruošiamas %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Išpakuojamas %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to configure %s" -msgstr "Ruošiamasi konfigūruoti %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Ruošiamasi %s pašalinimui" +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Įdiegta %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Pašalintas %s" +msgid "Removing %s" +msgstr "Šalinamas %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Ruošiamasi visiškai pašalinti %s" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Visiškai pašalintas %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2948,7 +2954,7 @@ msgid "Print the list of manually installed packages" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3743,6 +3749,9 @@ msgstr "" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "Pašalintas %s" + #, fuzzy #~ msgid "Can not read mirror file '%s'" #~ msgstr "Nepavyko atverti failo %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada <sampadanakhare@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -1067,13 +1067,12 @@ msgstr "%s पॅकेज फाईल पार्स करण्यात #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1085,29 +1084,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "%s संस्थापित होत आहे" +msgid "Preparing %s" +msgstr "%s तयार करित आहे" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s संरचित होत आहे" +msgid "Preparing to configure %s" +msgstr "%s संरचने साठी तयार करत आहे" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s काढून टाकत आहे" +msgid "Preparing for removal of %s" +msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s संपूर्ण काढून टाकले" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1124,6 +1135,11 @@ msgstr "संस्थापना-पश्चात ट्रिगर %s च msgid "Installed %s" msgstr "%s संस्थापित झाले" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s संरचित होत आहे" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1137,33 +1153,23 @@ msgstr "%s फाईल उघडता येत नाही" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s तयार करित आहे" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s सुटे/मोकळे करीत आहे " #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "%s संरचने साठी तयार करत आहे" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" +msgid "Installing %s" +msgstr "%s संस्थापित होत आहे" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s काढून टाकले" +msgid "Removing %s" +msgstr "%s काढून टाकत आहे" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s संपूर्ण काढून टाकले" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2955,7 +2961,7 @@ msgid "Print the list of manually installed packages" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3748,6 +3754,9 @@ msgstr "जोडणी अकाली बंद झाली" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "%s काढून टाकले" + #~ msgid "Package file %s is out of sync." #~ msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2016-06-11 22:38+0200\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n" @@ -1086,16 +1086,19 @@ msgid "Unable to parse package file %s (%d)" msgstr "Klarer ikke å fortolke pakkefila %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1107,29 +1110,42 @@ msgid "" msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet," #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Ikke låst" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Installerer %s" +msgid "Preparing %s" +msgstr "Forbereder %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Setter opp %s" +msgid "Preparing to configure %s" +msgstr "Forbereder oppsett av %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Fjerner %s" +msgid "Preparing for removal of %s" +msgstr "Forbereder fjerning av %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Fjerner %s fullstendig" +msgid "Preparing to completely remove %s" +msgstr "Forbereder å fullstendig slette %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1146,6 +1162,11 @@ msgstr "Kjører etter-installasjonsutløser %s" msgid "Installed %s" msgstr "Installerte %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Setter opp %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1159,33 +1180,23 @@ msgstr "Klarte ikke åpne fila «%s»" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Forbereder %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Forbereder oppsett av %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Forbereder fjerning av %s" +msgid "Installing %s" +msgstr "Installerer %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Fjernet %s" +msgid "Removing %s" +msgstr "Fjerner %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Forbereder å fullstendig slette %s" +msgid "Completely removing %s" +msgstr "Fjerner %s fullstendig" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3024,7 +3035,7 @@ msgid "Print the list of manually installed packages" msgstr "%s satt til manuell installasjon.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Skriv listen med pakker som holdes tilbake" #: cmdline/apt-sortpkgs.cc @@ -3821,6 +3832,9 @@ msgstr "Forbindelsen ble uventet stengt" msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" +#~ msgid "Removed %s" +#~ msgstr "Fjernet %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Pakkefila %s er ikke oppdatert." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -1066,13 +1066,12 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1084,29 +1083,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Installing %s" -msgstr " %s स्थापना भयो" +#, c-format +msgid "Preparing %s" +msgstr " %s तयार गरिदैछ" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr " %s कनफिगर गरिदैछ" +msgid "Preparing to configure %s" +msgstr " %s कनफिगर गर्न तयार गरिदैछ" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr " %s हटाइदैछ" +msgid "Preparing for removal of %s" +msgstr " %s हटाउन तयार गरिदैछ" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr " %s पूर्ण रुपले हट्यो" +#, c-format +msgid "Preparing to completely remove %s" +msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1123,6 +1134,11 @@ msgstr "" msgid "Installed %s" msgstr " %s स्थापना भयो" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr " %s कनफिगर गरिदैछ" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -1136,33 +1152,23 @@ msgstr "फाइल %s खोल्न सकिएन" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr " %s तयार गरिदैछ" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr " %s अनप्याक गरिदैछ" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to configure %s" -msgstr " %s कनफिगर गर्न तयार गरिदैछ" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr " %s हटाउन तयार गरिदैछ" +#, fuzzy, c-format +msgid "Installing %s" +msgstr " %s स्थापना भयो" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr " %s हट्यो" +msgid "Removing %s" +msgstr " %s हटाइदैछ" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr " %s पूर्ण रुपले हट्यो" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2956,7 +2962,7 @@ msgid "Print the list of manually installed packages" msgstr "तर %s स्थापना हुनुपर्यो" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3748,6 +3754,9 @@ msgstr "जडान असमायिक बन्द भयो" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr " %s हट्यो" + #~ msgid "Package file %s is out of sync." #~ msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.6.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-02 09:53+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2018-05-13 16:26+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -1151,17 +1151,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Kon pakketbestand %s niet ontleden (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander " "proces?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1174,29 +1177,43 @@ msgstr "" "dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander " +"proces?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Niet vergrendeld" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "%s wordt geïnstalleerd" +msgid "Preparing %s" +msgstr "%s wordt voorbereid" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s wordt geconfigureerd" +msgid "Preparing to configure %s" +msgstr "Configuratie van %s wordt voorbereid" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s wordt verwijderd" +msgid "Preparing for removal of %s" +msgstr "Verwijderen van %s wordt voorbereid" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "%s wordt volledig verwijderd" +msgid "Preparing to completely remove %s" +msgstr "Volledig verwijderen van %s wordt voorbereid" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1213,6 +1230,11 @@ msgstr "Post-installatie-trigger %s wordt uitgevoerd" msgid "Installed %s" msgstr "%s is geïnstalleerd" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s wordt geconfigureerd" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1226,33 +1248,23 @@ msgstr "Kon het bestand '%s' niet openen" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s wordt voorbereid" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Configuratie van %s wordt voorbereid" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Verwijderen van %s wordt voorbereid" +msgid "Installing %s" +msgstr "%s wordt geïnstalleerd" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s is verwijderd" +msgid "Removing %s" +msgstr "%s wordt verwijderd" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Volledig verwijderen van %s wordt voorbereid" +msgid "Completely removing %s" +msgstr "%s wordt volledig verwijderd" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3143,7 +3155,7 @@ msgid "Print the list of manually installed packages" msgstr "Toon de lijst van manueel geïnstalleerde pakketten" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Toon de lijst van te handhaven pakketten" #: cmdline/apt-sortpkgs.cc @@ -3966,6 +3978,9 @@ msgstr "Verbinding werd voortijdig afgebroken" msgid "Empty files can't be valid archives" msgstr "Lege bestanden kunnen geen geldige archieven zijn" +#~ msgid "Removed %s" +#~ msgstr "%s is verwijderd" + #~ msgid "Package file %s is out of sync." #~ msgstr "Pakketbestand %s is niet meer gesynchroniseerd." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -1073,13 +1073,12 @@ msgstr "Klarte ikkje tolka pakkefila %s (%d)" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Klarte ikkje lsa listekatalogen" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1091,29 +1090,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Klarte ikkje lsa listekatalogen" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Installing %s" -msgstr " Installert: " +msgid "Preparing %s" +msgstr "Opnar %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Configuring %s" -msgstr "Koplar til %s" +msgid "Preparing to configure %s" +msgstr "Opnar oppsettsfila %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Opnar %s" +#, c-format +msgid "Preparing for removal of %s" +msgstr "" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Klarte ikkje fjerna %s" +msgid "Preparing to completely remove %s" +msgstr "Opnar oppsettsfila %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1130,6 +1141,11 @@ msgstr "" msgid "Installed %s" msgstr " Installert: " +#: apt-pkg/deb/dpkgpm.cc +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Koplar til %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -1143,33 +1159,23 @@ msgstr "Klarte ikkje opna fila %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Preparing %s" -msgstr "Opnar %s" - -#: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Preparing to configure %s" -msgstr "Opnar oppsettsfila %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "" +msgid "Installing %s" +msgstr " Installert: " #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Removed %s" -msgstr "Tilrdingar" +msgid "Removing %s" +msgstr "Opnar %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format -msgid "Preparing to completely remove %s" -msgstr "Opnar oppsettsfila %s" +msgid "Completely removing %s" +msgstr "Klarte ikkje fjerna %s" #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -2973,7 +2979,7 @@ msgid "Print the list of manually installed packages" msgstr "men %s skal installerast" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3762,6 +3768,10 @@ msgstr "Sambandet vart uventa stengd" msgid "Empty files can't be valid archives" msgstr "" +#, fuzzy +#~ msgid "Removed %s" +#~ msgstr "Tilrdingar" + #~ msgid "Package file %s is out of sync." #~ msgstr "Pakkefila %s er ute av takt." @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -1105,18 +1105,21 @@ msgid "Unable to parse package file %s (%d)" msgstr "Nie udało się zanalizować pliku pakietu %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go " "używa?" # Musi pasować do su i sudo. #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Nie udało się zablokować katalogu administracyjnego (%s), czy użyto " "uprawnień administratora?" @@ -1131,29 +1134,46 @@ msgstr "" "dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem." #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go " +"używa?" + +# Musi pasować do su i sudo. +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Nie udało się zablokować katalogu administracyjnego (%s), czy użyto " +"uprawnień administratora?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Niezablokowany" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Instalowanie %s" +msgid "Preparing %s" +msgstr "Przygotowywanie %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Konfigurowanie %s" +msgid "Preparing to configure %s" +msgstr "Przygotowywanie do konfiguracji %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Usuwanie %s" +msgid "Preparing for removal of %s" +msgstr "Przygotowywanie do usunięcia %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Całkowite usuwanie %s" +msgid "Preparing to completely remove %s" +msgstr "Przygotowywanie do całkowitego usunięcia %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1170,6 +1190,11 @@ msgstr "Uruchamianie wyzwalacza post-installation %s" msgid "Installed %s" msgstr "Pakiet %s został zainstalowany" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Konfigurowanie %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1183,33 +1208,23 @@ msgstr "Nie udało się otworzyć pliku \"%s\"" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Przygotowywanie %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Przygotowywanie do konfiguracji %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Przygotowywanie do usunięcia %s" +msgid "Installing %s" +msgstr "Instalowanie %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Pakiet %s został usunięty" +msgid "Removing %s" +msgstr "Usuwanie %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Przygotowywanie do całkowitego usunięcia %s" +msgid "Completely removing %s" +msgstr "Całkowite usuwanie %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3083,7 +3098,7 @@ msgid "Print the list of manually installed packages" msgstr "" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3884,6 +3899,9 @@ msgstr "Połączenie zostało przedwcześnie zamknięte" msgid "Empty files can't be valid archives" msgstr "Puste pliki nie mogą być prawidłowymi archiwami" +#~ msgid "Removed %s" +#~ msgstr "Pakiet %s został usunięty" + #~ msgid "Package file %s is out of sync." #~ msgstr "Plik pakietu %s jest przestarzały." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -1108,17 +1108,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Não foi possível obter acesso exclusivo ao directório de administração (%s), " "outro processo está a utilizá-lo?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Não foi possível criar acesso exclusivo ao directório de administração (%s), " "é root?" @@ -1134,29 +1137,45 @@ msgstr "" "'%s'" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Não foi possível obter acesso exclusivo ao directório de administração (%s), " +"outro processo está a utilizá-lo?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Não foi possível criar acesso exclusivo ao directório de administração (%s), " +"é root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Sem acesso exclusivo" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "A instalar %s" +msgid "Preparing %s" +msgstr "A preparar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "A configurar %s" +msgid "Preparing to configure %s" +msgstr "A preparar para configurar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "A remover %s" +msgid "Preparing for removal of %s" +msgstr "A preparar a remoção de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "A remover completamente %s" +msgid "Preparing to completely remove %s" +msgstr "A preparar para remover completamente %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1173,6 +1192,11 @@ msgstr "A correr o 'trigger' de pós-instalação %s" msgid "Installed %s" msgstr "%s instalado" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "A configurar %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1186,33 +1210,23 @@ msgstr "Não foi possível abrir ficheiro o '%s'" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "A preparar %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "A preparar para configurar %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "A preparar a remoção de %s" +msgid "Installing %s" +msgstr "A instalar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s removido" +msgid "Removing %s" +msgstr "A remover %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "A preparar para remover completamente %s" +msgid "Completely removing %s" +msgstr "A remover completamente %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3062,7 +3076,7 @@ msgid "Print the list of manually installed packages" msgstr "" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3861,6 +3875,9 @@ msgstr "Ligação encerrada prematuramente" msgid "Empty files can't be valid archives" msgstr "Ficheiros vazios não podem ser arquivos válidos" +#~ msgid "Removed %s" +#~ msgstr "%s removido" + #~ msgid "Package file %s is out of sync." #~ msgstr "O ficheiro do pacote %s está dessincronizado." diff --git a/po/pt_BR.po b/po/pt_BR.po index 8f03cecbb..d3064616a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -1075,13 +1075,12 @@ msgstr "Impossível analisar arquivo de pacote %s (%d)" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Impossível criar trava no diretório de listas" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1093,29 +1092,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Impossível criar trava no diretório de listas" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Instalando %s" +msgid "Preparing %s" +msgstr "Preparando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +msgid "Preparing to configure %s" +msgstr "Preparando para configurar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Removendo %s" +msgid "Preparing for removal of %s" +msgstr "Preparando para a remoção de %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s completamente removido" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparando para remover completamente %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1132,6 +1143,11 @@ msgstr "Executando gatilho pós-instalação %s" msgid "Installed %s" msgstr "%s instalado" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Configurando %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1145,33 +1161,23 @@ msgstr "Não foi possível abrir arquivo %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Preparando %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Preparando para configurar %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Preparando para a remoção de %s" +msgid "Installing %s" +msgstr "Instalando %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s removido" +msgid "Removing %s" +msgstr "Removendo %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparando para remover completamente %s" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s completamente removido" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2988,7 +2994,7 @@ msgid "Print the list of manually installed packages" msgstr "%s configurado para instalar manualmente.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3792,6 +3798,9 @@ msgstr "Conexão encerrada prematuramente" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "%s removido" + #~ msgid "Package file %s is out of sync." #~ msgstr "O arquivo de pacote %s está fora de sincronia." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -1079,13 +1079,12 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (%d)" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Nu pot încuia directorul cu lista" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1097,29 +1096,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Nu pot încuia directorul cu lista" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Se instalează %s" +msgid "Preparing %s" +msgstr "Se pregătește %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Se configurează %s" +msgid "Preparing to configure %s" +msgstr "Se pregătește configurarea %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Se șterge %s" +msgid "Preparing for removal of %s" +msgstr "Se pregătește ștergerea lui %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Șters complet %s" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Se pregătește ștergerea completă a %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1136,6 +1147,11 @@ msgstr "Se rulează declanșatorul post-instalare %s" msgid "Installed %s" msgstr "Instalat %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Se configurează %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1149,33 +1165,23 @@ msgstr "Nu s-a putut deschide fișierul %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Se pregătește %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Se pregătește configurarea %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Se pregătește ștergerea lui %s" +msgid "Installing %s" +msgstr "Se instalează %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Șters %s" +msgid "Removing %s" +msgstr "Se șterge %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Se pregătește ștergerea completă a %s" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Șters complet %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2994,7 +3000,7 @@ msgid "Print the list of manually installed packages" msgstr "%s este marcat ca fiind instalat manual.\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3805,6 +3811,9 @@ msgstr "Conexiune închisă prematur" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "Șters %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Fișierul pachetului %s este desincronizat." @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2018-05-14 20:24+0300\n" "Last-Translator: Aleksej Shilin <rootlexx@mail.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -1140,17 +1140,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Невозможно разобрать содержимое файла пакета %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Невозможно выполнить блокировку управляющего каталога (%s); он уже " "используется другим процессом?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" "Невозможно выполнить блокировку управляющего каталога (%s); у вас есть права " "суперпользователя?" @@ -1166,29 +1169,45 @@ msgstr "" "проблемы. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Невозможно выполнить блокировку управляющего каталога (%s); он уже " +"используется другим процессом?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Невозможно выполнить блокировку управляющего каталога (%s); у вас есть права " +"суперпользователя?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Не заблокирован" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Устанавливается %s" +msgid "Preparing %s" +msgstr "Подготавливается %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Настраивается %s" +msgid "Preparing to configure %s" +msgstr "Подготавливается для настройки %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Удаляется %s" +msgid "Preparing for removal of %s" +msgstr "Подготавливается для удаления %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Выполняется полное удаление %s" +msgid "Preparing to completely remove %s" +msgstr "Подготовка к полному удалению %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1205,6 +1224,11 @@ msgstr "Выполняется послеустановочный триггер msgid "Installed %s" msgstr "Установлен %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Настраивается %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1218,33 +1242,23 @@ msgstr "Не удалось открыть файл «%s»" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Подготавливается %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Подготавливается для настройки %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Подготавливается для удаления %s" +msgid "Installing %s" +msgstr "Устанавливается %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Удалён %s" +msgid "Removing %s" +msgstr "Удаляется %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Подготовка к полному удалению %s" +msgid "Completely removing %s" +msgstr "Выполняется полное удаление %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3126,7 +3140,7 @@ msgid "Print the list of manually installed packages" msgstr "вывести список пакетов, установленных вручную" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "вывести список зафиксированных пакетов" #: cmdline/apt-sortpkgs.cc @@ -3951,6 +3965,9 @@ msgstr "Соединение закрыто преждевременно" msgid "Empty files can't be valid archives" msgstr "Пустые файлы не могут быть допустимыми архивами" +#~ msgid "Removed %s" +#~ msgstr "Удалён %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Список пакетов %s рассинхронизирован." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -1090,15 +1090,18 @@ msgid "Unable to parse package file %s (%d)" msgstr "Súbor %s sa nedá spracovať (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1110,29 +1113,41 @@ msgid "" msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s“. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Nie je zamknuté" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Inštaluje sa %s" +msgid "Preparing %s" +msgstr "Pripravuje sa %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Nastavuje sa %s" +msgid "Preparing to configure %s" +msgstr "Pripravuje sa nastavenie %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Odstraňuje sa %s" +msgid "Preparing for removal of %s" +msgstr "Pripravuje sa odstránenie %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Úplne sa odstraňuje %s" +msgid "Preparing to completely remove %s" +msgstr "Pripravuje sa úplné odstránenie %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1149,6 +1164,11 @@ msgstr "Vykonáva sa spúšťač post-installation %s" msgid "Installed %s" msgstr "Nainštalovaný balík %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Nastavuje sa %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1162,33 +1182,23 @@ msgstr "Nedá sa otvoriť súbor „%s“" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Pripravuje sa %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Pripravuje sa nastavenie %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Pripravuje sa odstránenie %s" +msgid "Installing %s" +msgstr "Inštaluje sa %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Odstránený balík %s" +msgid "Removing %s" +msgstr "Odstraňuje sa %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Pripravuje sa úplné odstránenie %s" +msgid "Completely removing %s" +msgstr "Úplne sa odstraňuje %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3033,7 +3043,7 @@ msgid "Print the list of manually installed packages" msgstr "" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3824,6 +3834,9 @@ msgstr "Spojenie bolo predčasne ukončené" msgid "Empty files can't be valid archives" msgstr "Prázdne súbory nemôžu byť platné archívy" +#~ msgid "Removed %s" +#~ msgstr "Odstránený balík %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Súbor balíkov %s je neaktuálny." @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -1086,16 +1086,19 @@ msgid "Unable to parse package file %s (%d)" msgstr "Ni mogoče razčleniti datoteke paketa %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1107,29 +1110,42 @@ msgid "" msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Ni zaklenjeno" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Nameščanje %s" +msgid "Preparing %s" +msgstr "Pripravljanje %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Nastavljanje %s" +msgid "Preparing to configure %s" +msgstr "Pripravljanje na nastavljanje %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Odstranjevanje %s" +msgid "Preparing for removal of %s" +msgstr "Pripravljanje na odstranitev %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "%s je bil popolnoma odstranjen" +msgid "Preparing to completely remove %s" +msgstr "Pripravljanje na popolno odstranitev %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1146,6 +1162,11 @@ msgstr "Poganjanje sprožilca po namestitvi %s" msgid "Installed %s" msgstr "%s je bil nameščen" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Nastavljanje %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1159,33 +1180,23 @@ msgstr "Ni mogoče odpreti datoteke '%s'" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Pripravljanje %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Razširjanje %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Pripravljanje na nastavljanje %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Pripravljanje na odstranitev %s" +msgid "Installing %s" +msgstr "Nameščanje %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s je bil odstranjen" +msgid "Removing %s" +msgstr "Odstranjevanje %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Pripravljanje na popolno odstranitev %s" +msgid "Completely removing %s" +msgstr "%s je bil popolnoma odstranjen" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3037,7 +3048,7 @@ msgid "Print the list of manually installed packages" msgstr "" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3829,6 +3840,9 @@ msgstr "Povezava se je prezgodaj zaprla" msgid "Empty files can't be valid archives" msgstr "Prazne datoteke ne morejo biti veljavni arhivi" +#~ msgid "Removed %s" +#~ msgstr "%s je bil odstranjen" + #~ msgid "Package file %s is out of sync." #~ msgstr "Datoteka paketa %s ni usklajena." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2015-08-19 21:33+0200\n" "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -1104,16 +1104,19 @@ msgid "Unable to parse package file %s (%d)" msgstr "Kunde inte tolka paketfilen %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1126,29 +1129,42 @@ msgstr "" "dpkg avbröts. Du måste köra ”%s” manuellt för att korrigera problemet. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Inte låst" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Installerar %s" +msgid "Preparing %s" +msgstr "Förbereder %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Konfigurerar %s" +msgid "Preparing to configure %s" +msgstr "Förbereder konfigurering av %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Tar bort %s" +msgid "Preparing for removal of %s" +msgstr "Förbereder borttagning av %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Tar bort hela %s" +msgid "Preparing to completely remove %s" +msgstr "Förbereder borttagning av hela %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1165,6 +1181,11 @@ msgstr "Kör efterinstallationsutlösare %s" msgid "Installed %s" msgstr "Installerade %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Konfigurerar %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1178,33 +1199,23 @@ msgstr "Kunde inte öppna filen ”%s”" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Förbereder %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Packar upp %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Förbereder konfigurering av %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Förbereder borttagning av %s" +msgid "Installing %s" +msgstr "Installerar %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Tog bort %s" +msgid "Removing %s" +msgstr "Tar bort %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Förbereder borttagning av hela %s" +msgid "Completely removing %s" +msgstr "Tar bort hela %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3060,7 +3071,7 @@ msgid "Print the list of manually installed packages" msgstr "Visa listan över manuellt installerade paket" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Visa listan över tillbakahållna paket" #: cmdline/apt-sortpkgs.cc @@ -3864,6 +3875,9 @@ msgstr "Anslutningen stängdes i förtid" msgid "Empty files can't be valid archives" msgstr "Tomma filer kan inte vara giltiga arkiv" +#~ msgid "Removed %s" +#~ msgstr "Tog bort %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Paketfilen %s är inte synkroniserad." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2014-12-12 13:00+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -1073,15 +1073,18 @@ msgid "Unable to parse package file %s (%d)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1093,29 +1096,41 @@ msgid "" msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "ไม่ได้ล็อคอยู่" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "กำลังติดตั้ง %s" +msgid "Preparing %s" +msgstr "กำลังเตรียม %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "กำลังตั้งค่า %s" +msgid "Preparing to configure %s" +msgstr "กำลังเตรียมตั้งค่า %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "กำลังถอดถอน %s" +msgid "Preparing for removal of %s" +msgstr "กำลังเตรียมถอดถอน %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "กำลังถอดถอน %s อย่างสมบูรณ์" +msgid "Preparing to completely remove %s" +msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1132,6 +1147,11 @@ msgstr "กำลังเรียกการสะกิด %s หลัง msgid "Installed %s" msgstr "ติดตั้ง %s แล้ว" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "กำลังตั้งค่า %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1145,33 +1165,23 @@ msgstr "ไม่สามารถเปิดแฟ้ม '%s'" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "กำลังเตรียม %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "กำลังแตกแพกเกจ %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "กำลังเตรียมตั้งค่า %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "กำลังเตรียมถอดถอน %s" +msgid "Installing %s" +msgstr "กำลังติดตั้ง %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "ถอดถอน %s แล้ว" +msgid "Removing %s" +msgstr "กำลังถอดถอน %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" +msgid "Completely removing %s" +msgstr "กำลังถอดถอน %s อย่างสมบูรณ์" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2971,7 +2981,7 @@ msgid "Print the list of manually installed packages" msgstr "แสดงรายชื่อของแพกเกจที่ติดตั้งแบบเลือกเอง" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "แสดงรายชื่อของแพกเกจที่คงรุ่นอยู่" #: cmdline/apt-sortpkgs.cc @@ -3745,6 +3755,9 @@ msgstr "การเชื่อมต่อถูกปิดก่อนเว msgid "Empty files can't be valid archives" msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้" +#~ msgid "Removed %s" +#~ msgstr "ถอดถอน %s แล้ว" + #~ msgid "Package file %s is out of sync." #~ msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -1084,13 +1084,12 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (%d)" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Hindi maaldaba ang directory ng talaan" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1102,29 +1101,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Hindi maaldaba ang directory ng talaan" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Installing %s" -msgstr "Iniluklok ang %s" +#, c-format +msgid "Preparing %s" +msgstr "Hinahanda ang %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Isasaayos ang %s" +msgid "Preparing to configure %s" +msgstr "Hinahanda ang %s upang isaayos" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Tinatanggal ang %s" +msgid "Preparing for removal of %s" +msgstr "Naghahanda para sa pagtanggal ng %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Natanggal ng lubusan ang %s" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Naghahanda upang tanggalin ng lubusan ang %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1141,6 +1152,11 @@ msgstr "" msgid "Installed %s" msgstr "Iniluklok ang %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Isasaayos ang %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, fuzzy, c-format @@ -1154,33 +1170,23 @@ msgstr "Hindi mabuksan ang talaksang %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Hinahanda ang %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to configure %s" -msgstr "Hinahanda ang %s upang isaayos" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Naghahanda para sa pagtanggal ng %s" +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Iniluklok ang %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Tinanggal ang %s" +msgid "Removing %s" +msgstr "Tinatanggal ang %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Naghahanda upang tanggalin ng lubusan ang %s" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Natanggal ng lubusan ang %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2982,7 +2988,7 @@ msgid "Print the list of manually installed packages" msgstr "" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3785,6 +3791,9 @@ msgstr "Nagsara ng maaga ang koneksyon" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "Tinanggal ang %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Wala sa sync ang talaksan ng paketeng %s." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2018-01-03 16:32+0300\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" "Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n" @@ -1129,17 +1129,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Paket dosyası (%s) ayrıştırılamadı (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor " "olmasın?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Yönetim dizini (%s) kilitlenemiyor, root kullanıcısı mısınız?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1152,29 +1155,43 @@ msgstr "" "dpkg kesintiye uğradı, sorunu düzeltmek için elle '%s' komutunu çalıştırın. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor " +"olmasın?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Yönetim dizini (%s) kilitlenemiyor, root kullanıcısı mısınız?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Kilitlenmemiş" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "%s kuruluyor" +msgid "Preparing %s" +msgstr "%s hazırlanıyor" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "%s yapılandırılıyor" +msgid "Preparing to configure %s" +msgstr "%s paketini yapılandırmaya hazırlanılıyor" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "%s kaldırılıyor" +msgid "Preparing for removal of %s" +msgstr "%s paketinin kaldırılmasına hazırlanılıyor" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "%s tamamen kaldırılıyor" +msgid "Preparing to completely remove %s" +msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1191,6 +1208,11 @@ msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor" msgid "Installed %s" msgstr "%s kuruldu" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "%s yapılandırılıyor" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1204,33 +1226,23 @@ msgstr "'%s' dosyası açılamadı" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "%s hazırlanıyor" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "%s paketi açılıyor" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "%s paketini yapılandırmaya hazırlanılıyor" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s paketinin kaldırılmasına hazırlanılıyor" +msgid "Installing %s" +msgstr "%s kuruluyor" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "%s kaldırıldı" +msgid "Removing %s" +msgstr "%s kaldırılıyor" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" +msgid "Completely removing %s" +msgstr "%s tamamen kaldırılıyor" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3092,7 +3104,7 @@ msgid "Print the list of manually installed packages" msgstr "Elle kurulmuş paketlerin listesini görüntüle" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "Tutulur durumda olan paketlerin listesini görüntüle" #: cmdline/apt-sortpkgs.cc @@ -3895,6 +3907,9 @@ msgstr "Bağlantı vaktinden önce kapandı" msgid "Empty files can't be valid archives" msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar" +#~ msgid "Removed %s" +#~ msgstr "%s kaldırıldı" + #~ msgid "Package file %s is out of sync." #~ msgstr "%s paket dosyası eş zamanlı değil." @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -1106,17 +1106,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Неможливо проаналізувати файл пакунку %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Неможливо заблокувати адміністративну директорію (%s), може її використовує " "інший процес?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1130,29 +1133,43 @@ msgstr "" "проблему. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Неможливо заблокувати адміністративну директорію (%s), може її використовує " +"інший процес?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Не заблоковано" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Встановлюється %s" +msgid "Preparing %s" +msgstr "Підготовка %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Налаштовується %s" +msgid "Preparing to configure %s" +msgstr "Підготовка до конфігурації %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Видаляється %s" +msgid "Preparing for removal of %s" +msgstr "Підготовка до видалення %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Повністю видаляється %s" +msgid "Preparing to completely remove %s" +msgstr "Підготовка до повного видалення %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1169,6 +1186,11 @@ msgstr "Виконується післяустановочний ініціат msgid "Installed %s" msgstr "Встановлено %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Налаштовується %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1182,33 +1204,23 @@ msgstr "Неможливо відкрити файл '%s'" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Підготовка %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Розпакування %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Підготовка до конфігурації %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Підготовка до видалення %s" +msgid "Installing %s" +msgstr "Встановлюється %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Видалено %s" +msgid "Removing %s" +msgstr "Видаляється %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Підготовка до повного видалення %s" +msgid "Completely removing %s" +msgstr "Повністю видаляється %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3077,7 +3089,7 @@ msgid "Print the list of manually installed packages" msgstr "" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3885,6 +3897,9 @@ msgstr "З'єднання завершено передчасно" msgid "Empty files can't be valid archives" msgstr "Пусті файли не можуть бути правильними архівами" +#~ msgid "Removed %s" +#~ msgstr "Видалено %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Перелік пакунків %s розсинхронізований." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2014-09-12 13:48+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -1096,17 +1096,20 @@ msgid "Unable to parse package file %s (%d)" msgstr "Không thể phân tích tập tin gói %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" "Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " "phải không?" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1120,29 +1123,43 @@ msgstr "" "vấn đề này. " #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " +"phải không?" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "Chưa được khoá" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "Đang cài đặt %s" +msgid "Preparing %s" +msgstr "Đang chuẩn bị %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "Đang cấu hình %s" +msgid "Preparing to configure %s" +msgstr "Đang chuẩn bị cấu hình %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "Đang gỡ bỏ %s" +msgid "Preparing for removal of %s" +msgstr "Đang chuẩn bị gỡ bỏ %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "Đang gỡ bỏ hoàn toàn %s" +msgid "Preparing to completely remove %s" +msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1159,6 +1176,11 @@ msgstr "Đang chạy bẫy sau-cài-đặt %s" msgid "Installed %s" msgstr "Đã cài đặt %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "Đang cấu hình %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1172,33 +1194,23 @@ msgstr "Không thể mở tập tin “%s”" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "Đang chuẩn bị %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "Đang chuẩn bị cấu hình %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "Đang chuẩn bị gỡ bỏ %s" +msgid "Installing %s" +msgstr "Đang cài đặt %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "Đã gỡ bỏ %s" +msgid "Removing %s" +msgstr "Đang gỡ bỏ %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" +msgid "Completely removing %s" +msgstr "Đang gỡ bỏ hoàn toàn %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -3046,7 +3058,7 @@ msgid "Print the list of manually installed packages" msgstr "In ra danh sách các gói được cài đặt bằng tay" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "In ra danh sách các gói được giữ lại" #: cmdline/apt-sortpkgs.cc @@ -3853,6 +3865,9 @@ msgstr "Kết nối bị đóng bất ngờ" msgid "Empty files can't be valid archives" msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ" +#~ msgid "Removed %s" +#~ msgstr "Đã gỡ bỏ %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "Tập tin gói %s không đồng bộ được." diff --git a/po/zh_CN.po b/po/zh_CN.po index 7564c4615..82a407b91 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,20 +5,22 @@ # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006. # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010. # Mo Zhou <cdluminate@gmail.com>, 2014, 2015, 2016, 2017. +# Boyuan Yang <073plan@gmail.com>, 2018. # msgid "" msgstr "" -"Project-Id-Version: apt 1.5.x\n" +"Project-Id-Version: apt 1.7.x\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" -"PO-Revision-Date: 2017-10-08 11:00+0000\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" +"PO-Revision-Date: 2018-07-13 18:16+0800\n" "Last-Translator: Mo Zhou <cdluminate@gmail.com>\n" -"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" +"Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 2.0.8\n" #: apt-inst/contrib/arfile.cc msgid "Invalid archive signature" @@ -324,7 +326,7 @@ msgstr "" msgid "" "Skipping acquire of configured file '%s' as repository '%s' provides only " "weak security information for it" -msgstr "鉴于仓库 '%2$s' 提供的安全信息强度太低，跳过配置文件 '%1$s' 的获取。" +msgstr "鉴于仓库 '%2$s' 提供的安全信息强度太低，跳过配置文件 '%1$s' 的获取" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formatted in the same way as in @@ -335,21 +337,17 @@ msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -"%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。" +"%s 的 Release 文件已经过期(自 %s 起处于无效状态)。该仓库的更新将不会应用。" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. 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 "" -"%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。" +msgstr "%s 的 Release 文件已经过期(已经过期了 %s)。该仓库的更新将不会应用。" #: apt-pkg/acquire-item.cc #, c-format @@ -425,12 +423,12 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" #: apt-pkg/acquire-worker.cc #, c-format msgid "Is the package %s installed?" -msgstr "请检查是否安装了 %s 软件包" +msgstr "是否安装了 %s 软件包？" #: apt-pkg/acquire-worker.cc #, c-format msgid "Method %s did not start correctly" -msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" +msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动" #: apt-pkg/acquire-worker.cc #, c-format @@ -473,7 +471,7 @@ msgstr "%s 的 Clean (清理)不被支持" #: apt-pkg/acquire.cc #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)" +msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s)" #: apt-pkg/acquire.cc #, c-format @@ -623,8 +621,8 @@ msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构" -"架。" +"无法确定任何包文件的位置，可能这不是一张 Debian 盘片，或者是选择了错误的硬件" +"架构？" #: apt-pkg/cdrom.cc #, c-format @@ -687,7 +685,7 @@ msgstr "不能理解命令行选项 “%c” [来自 %s] 与其他选项的搭 msgid "" "Command line option %s is not understood in combination with the other " "options" -msgstr "不能理解命令行选项 “%s” 与其他选项的搭配。" +msgstr "不能理解命令行选项 “%s” 与其他选项的搭配" #: apt-pkg/contrib/cmndline.cc #, c-format @@ -697,12 +695,12 @@ msgstr "命令行选项 %s 不是布尔值" #: apt-pkg/contrib/cmndline.cc #, c-format msgid "Option %s requires an argument." -msgstr "选项 %s 要求有一个参数" +msgstr "选项 %s 要求有一个参数。" #: apt-pkg/contrib/cmndline.cc #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定" +msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定。" #: apt-pkg/contrib/cmndline.cc #, c-format @@ -717,7 +715,7 @@ msgstr "选项“%s”太长" #: apt-pkg/contrib/cmndline.cc #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "不能识别参数 %s，请用 true 或 false" +msgstr "不能识别参数 %s，请用 true 或 false。" #: apt-pkg/contrib/cmndline.cc #, c-format @@ -732,7 +730,7 @@ msgstr "无法识别的类型缩写：“%c”" #: apt-pkg/contrib/configuration.cc #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "语法错误 %s:%u：配置小节没有以名字开头" +msgstr "语法错误 %s:%u：配置小节没有以名字开头。" #: apt-pkg/contrib/configuration.cc #, c-format @@ -829,7 +827,7 @@ msgstr "等待子进程 %s 的退出，但是它并不存在" #: apt-pkg/contrib/fileutl.cc #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "子进程 %s 发生了段错误" +msgstr "子进程 %s 发生了段错误。" #: apt-pkg/contrib/fileutl.cc #, c-format @@ -1082,15 +1080,18 @@ msgid "Unable to parse package file %s (%d)" msgstr "无法解析软件包文件 %s (%d)" #: apt-pkg/deb/debsystem.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unable to lock the administration directory (%s), is another process " +#| "using it?" msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？" #: apt-pkg/deb/debsystem.cc -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +#, fuzzy, c-format +#| msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1102,29 +1103,41 @@ msgid "" msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？" + +#: apt-pkg/deb/debsystem.cc +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "未锁定" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "正在安装 %s" +msgid "Preparing %s" +msgstr "正在准备 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "正在配置 %s" +msgid "Preparing to configure %s" +msgstr "正在准备配置 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "正在删除 %s" +msgid "Preparing for removal of %s" +msgstr "正在准备 %s 的删除操作" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Completely removing %s" -msgstr "完全删除 %s" +msgid "Preparing to completely remove %s" +msgstr "正在准备完全删除 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1141,6 +1154,11 @@ msgstr "执行安装后执行的触发器 %s" msgid "Installed %s" msgstr "已安装 %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "正在配置 %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1150,12 +1168,7 @@ msgstr "目录 %s 缺失" #: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc #, c-format msgid "Could not open file '%s'" -msgstr "无法打开文件 %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing %s" -msgstr "正在准备 %s" +msgstr "无法打开文件“%s”" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1164,23 +1177,18 @@ msgstr "正在解压缩 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "正在准备配置 %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "正在准备 %s 的删除操作" +msgid "Installing %s" +msgstr "正在安装 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "已删除 %s" +msgid "Removing %s" +msgstr "正在删除 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to completely remove %s" -msgstr "正在准备完全删除 %s" +msgid "Completely removing %s" +msgstr "完全删除 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1688,7 +1696,7 @@ msgstr "[已安装]" #: apt-private/private-cacheset.cc msgid " [Not candidate version]" -msgstr " [无候选]" +msgstr " [无候选版本]" #: apt-private/private-cacheset.cc msgid "You should explicitly select one to install." @@ -2077,7 +2085,7 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!\n" msgstr "" -"注意：这只是模拟！\n" +"注意：这只是一次模拟！\n" " %s 需要 root 特权进行实际的执行。\n" " 同时请记住此时并未锁定，所以请勿完全相信当前的情况！\n" @@ -2436,9 +2444,10 @@ msgid "Failed to parse %s. Edit again? " msgstr "解析 %s 失败。请重新编辑之后再试。" #: apt-private/private-sources.cc -#, c-format +#, fuzzy, c-format +#| msgid "Your '%s' file changed, please run 'apt-get update'." msgid "Your '%s' file changed, please run 'apt-get update'.\n" -msgstr "您的 %s 文件有过改动，请执行 ‘apt-get update’。\n" +msgstr "您的 %s 文件有过改动，请执行 ‘apt-get update’。" #: apt-private/private-unmet.cc #, c-format @@ -2751,7 +2760,7 @@ msgstr "卸载所有自动安装且不再使用的软件包" #: cmdline/apt-get.cc msgid "Distribution upgrade, see apt-get(8)" -msgstr "发布版升级，见 apt-get(8)" +msgstr "发行版升级，见 apt-get(8)" #: cmdline/apt-get.cc msgid "Follow dselect selections" @@ -2783,7 +2792,7 @@ msgstr "下载指定的二进制包到当前目录" #: cmdline/apt-get.cc msgid "Download and display the changelog for the given package" -msgstr "下载指定软件包，并显示其changelog" +msgstr "下载指定软件包，并显示其变更日志（changelog）" #: cmdline/apt-helper.cc msgid "Need one URL as argument" @@ -2823,7 +2832,7 @@ msgstr "将 URI 指定的文件下载到目标路径" #: cmdline/apt-helper.cc msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" -msgstr "查阅一个 SRV 记录 (如： _http._tcp.ftp.debian.org)" +msgstr "查询一个 SRV 记录 (如： _http._tcp.ftp.debian.org)" #: cmdline/apt-helper.cc msgid "concatenate files, with automatic decompression" @@ -2839,7 +2848,7 @@ msgstr "等待系统上线" #: cmdline/apt-helper.cc msgid "drop privileges before running given command" -msgstr "" +msgstr "运行给定命令前先降低权限" #: cmdline/apt-internal-planner.cc msgid "" @@ -2960,7 +2969,7 @@ msgid "Print the list of manually installed packages" msgstr "列出所有手动安装的软件包" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "列出设为保留的软件包" #: cmdline/apt-sortpkgs.cc @@ -3455,10 +3464,9 @@ msgid "[IP: %s %s]" msgstr "[IP: %s %s]" #: methods/connect.cc -#, fuzzy, c-format -#| msgid "Connecting to %s (%s)" +#, c-format msgid "Connected to %s (%s)" -msgstr "正在连接 %s (%s)" +msgstr "已连接到 %s (%s)" #: methods/connect.cc methods/http.cc #, c-format @@ -3747,6 +3755,9 @@ msgstr "连接被永久关闭" msgid "Empty files can't be valid archives" msgstr "空文件不是有效归档" +#~ msgid "Removed %s" +#~ msgstr "已删除 %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "软件包文件 %s 尚未同步。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6ef5f501b..d232e1319 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.2.X\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-06-25 17:12+0200\n" +"POT-Creation-Date: 2018-09-18 16:15+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet <tetralet@gmail.com>\n" "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists." @@ -1068,13 +1068,12 @@ msgstr "無法辨識套件檔 %s (%d)" #: apt-pkg/deb/debsystem.cc #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" #: apt-pkg/deb/debsystem.cc #, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "無法鎖定列表目錄" #. TRANSLATORS: the %s contains the recovery command, usually @@ -1086,29 +1085,41 @@ msgid "" msgstr "" #: apt-pkg/deb/debsystem.cc +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "無法鎖定列表目錄" + +#: apt-pkg/deb/debsystem.cc msgid "Not locked" msgstr "" #. we don't care for the difference #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Installing %s" -msgstr "正在安裝 %s" +msgid "Preparing %s" +msgstr "正在準備 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Configuring %s" -msgstr "正在設定 %s" +msgid "Preparing to configure %s" +msgstr "正在準備設定 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removing %s" -msgstr "正在移除 %s" +msgid "Preparing for removal of %s" +msgstr "正在準備移除 %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "已完整移除 %s" +#, c-format +msgid "Preparing to completely remove %s" +msgstr "正在準備完整移除 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1125,6 +1136,11 @@ msgstr "正在執行安裝後套件後續處理程式 %s" msgid "Installed %s" msgstr "已安裝 %s" +#: apt-pkg/deb/dpkgpm.cc +#, c-format +msgid "Configuring %s" +msgstr "正在設定 %s" + #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1138,33 +1154,23 @@ msgstr "無法開啟檔案 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing %s" -msgstr "正在準備 %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format msgid "Unpacking %s" msgstr "正在解開 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Preparing to configure %s" -msgstr "正在準備設定 %s" - -#: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing for removal of %s" -msgstr "正在準備移除 %s" +msgid "Installing %s" +msgstr "正在安裝 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format -msgid "Removed %s" -msgstr "已移除 %s" +msgid "Removing %s" +msgstr "正在移除 %s" #: apt-pkg/deb/dpkgpm.cc -#, c-format -msgid "Preparing to completely remove %s" -msgstr "正在準備完整移除 %s" +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "已完整移除 %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -2942,7 +2948,7 @@ msgid "Print the list of manually installed packages" msgstr "%s 被設定為手動安裝。\n" #: cmdline/apt-mark.cc -msgid "Print the list of package on hold" +msgid "Print the list of packages on hold" msgstr "" #: cmdline/apt-sortpkgs.cc @@ -3727,6 +3733,9 @@ msgstr "連線突然終止" msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Removed %s" +#~ msgstr "已移除 %s" + #~ msgid "Package file %s is out of sync." #~ msgstr "套件檔 %s 未同步。" diff --git a/prepare-release b/prepare-release index d62212eff..c93976f9a 100755 --- a/prepare-release +++ b/prepare-release @@ -81,10 +81,11 @@ if [ "$1" = 'pre-export' ]; then # update the last-modification field of manpages based on git changes grep --files-with-matches '<date>' doc/*.xml | while read file; do \ - LASTMOD="$(date -d "@$(git log --format='%at' --max-count=1 --invert-grep --fixed-strings --grep 'review + LASTMOD="$(date -d "@$(git log -i --format='%at' --max-count=1 --invert-grep --fixed-strings --grep 'review typo release -Git-Dch: Ignore' "$file")" '+%Y-%m-%dT00:00:00Z')" +Git-Dch: Ignore +Gbp-Dch: ignore' "$file")" '+%Y-%m-%dT00:00:00Z')" sed -i -e "s#^\([ ]\+\)<date>.*</date>\$#\1<date>$LASTMOD</date>#" "$file" done @@ -235,21 +236,33 @@ elif [ "$1" = 'spellcheckers' -o "$1" = 'lint' ]; then echo '### codespell in source directories:' codespell --enable-colors $(find . -mindepth 1 -maxdepth 1 -type d \! -name '.git' \! -name 'doc' \! -name 'po' \! -name 'build' \! -name 'test') \ | grep -v -e '^.*debian/changelog.*Troup.*==>.*Troupe.*$' \ + -e '^.*debian/changelog.*readd.*==>.*readd.*$' \ + -e '^.*debian/changelog.*Tim.*==>.*Time.*$' \ -e '^.*apt-pkg/contrib/fileutl\.cc.*creat.*==>.*create.*$' \ + -e '^.*apt-pkg/pkgcache\.h.*mmaped.*==>.*mapped.*$' \ + -e '^.*apt-pkg/pkgcachegen\.cc.*mmaped.*==>.*mapped.*$' \ + -e '^.*apt-pkg/contrib/mmap\.h.*mmaped.*==>.*mapped.*$' \ + -e '^.*cmdline/apt-key\.in.*dashs.*==>.*dashes.*$' \ -e '^.*methods/aptmethod\.h.*creat.*==>.*create.*$' \ -e '^.*dselect/install.*ans.*==>.*and.*$' \ + -e '^.*ftparchive/writer\.h.*Delink.*==>.*Unlink.*$' \ + -e '^.*ftparchive/writer\.cc.*De[Ll]ink.*==>.*[Uu]nlink.*$' \ || true echo '### codespell in testcases:' codespell --enable-colors $(find test -type f \! -name 'status-*' \! -name 'Packages-*' \! -name '*.deb' \! -name '*.sec' \! -name '*.pub' \! -name '*.db') \ | grep -v -e '^.*test/libapt/file-helpers\.cc.*creat.*==>.*create.*$' \ -e '^.*test/libapt/tagfile_test\.cc.*tyes.*==>.*types.*$' \ -e '^.*test/libapt/strutil_test\.cc.*Fiel.*==>.*Feel.*$' \ + -e '^.*test/libapt/cdromfindpackages_test\.cc.*Signatur.*==>.*Signature.*$' \ -e '^.*test/integration/skip-bug-601016-description-translation.*Paket.*==>.*Packet.*$' \ -e '^.*test/integration/skip-bug-601016-description-translation.*Wege.*==>.*Wedge.*$' \ + -e '^.*test/integration/skip-bug-601016-description-translation.*Methoden.*==>.*Methods.*$' \ + -e '^.*test/integration/test-apt-update-not-modified.*readd.*==>.*readd.*$' \ || true echo '### codespell in documentation:' codespell --enable-colors doc/*.xml doc/*.txt doc/*.dbk doc/*.ent doc/*.cmake.in doc/xml.add doc/po4a.conf doc/examples doc/po/apt-doc.pot \ po/apt-all.pot README.* COPYING \ + | grep -v -e '^.*po/apt-all\.pot.*DeLink.*==>.*unlink.*$' \ || true fi if is_available 'lintian' 'spellintian'; then diff --git a/test/integration/framework b/test/integration/framework index cfd621105..b0456096c 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -475,8 +475,11 @@ EOF # prefer our apt binaries over the system apt binaries export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin" export LC_ALL=C - unset LANGUAGE APT_CONFIG - unset GREP_OPTIONS DEB_BUILD_PROFILES + unset LANGUAGE COLUMNS NLSPATH + unset APT_CONFIG DPKG_ADMINDIR DPKG_COLORS + unset DEB_CHECK_COMMAND DEB_SIGN_KEYID DEB_BUILD_OPTIONS DEB_BUILD_PROFILES + unset DH_VERBOSE DH_QUIET DH_COMPAT DH_NO_ACT DH_OPTIONS DH_EXTRA_ADDONS + unset GREP_OPTIONS POSIXLY_CORRECT unset http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy # Make gcov shut up diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files index ff04b6346..928c703e1 100755 --- a/test/integration/test-apt-acquire-additional-files +++ b/test/integration/test-apt-acquire-additional-files @@ -214,9 +214,12 @@ testequal "$(readfile Contents-all)" aptget indextargets --format '$(FILENAME)' testsuccess cmp "rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstable_main_Contents-all" 'aptarchive/dists/unstable/main/Contents-all' rm ./rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstable_main_Contents-all -rm -f rootdir/etc/apt/apt.conf.d/content-target.conf msgmsg "No Contents file" - +cat > rootdir/etc/apt/apt.conf.d/content-target-notdefault.conf <<EOF +Acquire::IndexTargets::deb::Contents::DefaultEnabled "no"; +Acquire::IndexTargets::deb::Contents2::DefaultEnabled "no"; +Acquire::IndexTargets::deb::Contents3::DefaultEnabled "no"; +EOF testequal "'http://localhost:${APTHTTPPORT}/dists/unstable/InRelease' localhost:${APTHTTPPORT}_dists_unstable_InRelease 0 'http://localhost:${APTHTTPPORT}/dists/unstable/main/source/Sources.xz' localhost:${APTHTTPPORT}_dists_unstable_main_source_Sources 0 'http://localhost:${APTHTTPPORT}/dists/unstable/main/binary-amd64/Packages.xz' localhost:${APTHTTPPORT}_dists_unstable_main_binary-amd64_Packages 0 @@ -227,3 +230,17 @@ testsuccessequal "Hit:1 http://localhost:${APTHTTPPORT} unstable InRelease Reading package lists..." aptget update testempty find rootdir/var/lib/apt/lists -name '*Contents*' + +msgmsg "Order of Contents files" +sameupdateoutput() { + testsuccessequal "'http://localhost:${APTHTTPPORT}/dists/unstable/InRelease' localhost:${APTHTTPPORT}_dists_unstable_InRelease 0 +'http://localhost:${APTHTTPPORT}/dists/unstable/main/Contents-i386.xz' localhost:${APTHTTPPORT}_dists_unstable_main_Contents-i386 0 " aptget update --print-uris +} +sed -i -e 's#deb\(-src\)\? http#deb\1 [target=Contents3,Contents2,Contents] http#' rootdir/etc/apt/sources.list.d/* +sameupdateoutput +sed -i -e 's#deb\(-src\)\? \[target=[^]]\+\] http#deb\1 [target=Contents2,Contents3,Contents] http#' rootdir/etc/apt/sources.list.d/* +sameupdateoutput +sed -i -e 's#deb\(-src\)\? \[target=[^]]\+\] http#deb\1 [target=Contents3,Contents,Contents2] http#' rootdir/etc/apt/sources.list.d/* +sameupdateoutput +sed -i -e 's#deb\(-src\)\? \[target=[^]]\+\] http#deb\1 [target=Contents,Contents3,Contents2] http#' rootdir/etc/apt/sources.list.d/* +sameupdateoutput diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list index f87208a08..3a9ca2c15 100755 --- a/test/integration/test-apt-cli-list +++ b/test/integration/test-apt-cli-list @@ -5,7 +5,7 @@ TESTDIR="$(readlink -f "$(dirname "$0")")" . "$TESTDIR/framework" setupenvironment -configarchitecture "i386" +configarchitecture 'i386' 'armel' insertpackage 'unstable' 'foo' 'all' '1.0' insertinstalledpackage 'bar' 'i386' '1.0' @@ -17,6 +17,10 @@ insertinstalledpackage 'baz' 'all' '0.1' insertpackage 'testing' 'baz' 'all' '1.0' insertpackage 'unstable' 'baz' 'all' '2.0' +insertinstalledpackage 'foreign' 'armel' '1.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'foreign' 'i386,armel' '2.0' 'Multi-Arch: foreign' +insertpackage 'unstable' 'lib' 'i386,armel' '2.0' 'Multi-Arch: same' + setupaptarchive testsuccessequal "Listing... @@ -24,7 +28,11 @@ bar/now 1.0 i386 [installed,local] baz/unstable 2.0 all [upgradable from: 0.1] dpkg/now 1.16.2+fake all [installed,local] foo/unstable 1.0 all -foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list +foobar/unstable 2.0 i386 [upgradable from: 1.0] +foreign/unstable 2.0 armel [upgradable from: 1.0] +foreign/unstable 2.0 i386 +lib/unstable 2.0 armel +lib/unstable 2.0 i386" apt list testsuccessequal "Listing... foo/unstable 1.0 all @@ -32,15 +40,17 @@ foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list "foo*" testsuccessequal "Listing... baz/unstable 2.0 all [upgradable from: 0.1] -foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable +foobar/unstable 2.0 i386 [upgradable from: 1.0] +foreign/unstable 2.0 armel [upgradable from: 1.0]" apt list --upgradable # FIXME: hm, hm - does it make sense to have this different? shouldn't -# we use "installed,upgradable" consitently? +# we use "installed,upgradable" consistently? testsuccessequal "Listing... bar/now 1.0 i386 [installed,local] baz/now 0.1 all [installed,upgradable to: 2.0] dpkg/now 1.16.2+fake all [installed,local] -foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed +foobar/now 1.0 i386 [installed,upgradable to: 2.0] +foreign/now 1.0 armel [installed,upgradable to: 2.0]" apt list --installed testsuccessequal "Listing... bar/now 1.0 i386 [installed,local] @@ -72,3 +82,12 @@ baz/now 0.1 all [installed,upgradable to: 2.0] # test format strings for machine parseable output testsuccessequal 'bar - 1.0 - 1.0 baz - 0.1 - 2.0' apt list -qq bar baz -o APT::Cmd::use-format=true -o APT::Cmd::format="\${Package} - \${installed:Version} - \${candidate:Version}" + + +insertinstalledpackage 'lib' 'i386,armel' '1.0' 'Multi-Arch: same' +testsuccessequal 'Listing... +baz/unstable 2.0 all [upgradable from: 0.1] +foobar/unstable 2.0 i386 [upgradable from: 1.0] +foreign/unstable 2.0 armel [upgradable from: 1.0] +lib/unstable 2.0 armel [upgradable from: 1.0] +lib/unstable 2.0 i386 [upgradable from: 1.0]' apt list --upgradeable diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index 935d93d86..a37dbd8e6 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -7,11 +7,19 @@ TESTDIR="$(readlink -f "$(dirname "$0")")" setupenvironment configarchitecture 'i386' 'amd64' +generatelotsofnames() { + for i in $(seq 0 10000); do + printf ', this-is-a-long-pkg-name-%s (= 0.a.long.version)' "$i" + done +} + DESCR='Some description That has multiple lines' insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR" insertpackage 'unstable' 'bar' 'i386,amd64' '1' '' '' "$DESCR" insertpackage 'unstable' 'big' 'i386,amd64' '1' 'Installed-Size: 4129421' '' "$DESCR" +insertpackage 'unstable' 'large' 'all' '1' "Provides: pkga$(generatelotsofnames)" '' "$DESCR" +insertpackage 'unstable' 'large2' 'all' '1' "Provides: foobar, pkga$(generatelotsofnames)" '' "$DESCR" insertinstalledpackage 'foo' 'all' '1.0' setupaptarchive @@ -66,6 +74,31 @@ Description: Some description That has multiple lines " apt show big:amd64 +testsuccessequal "Package: large +Version: 1 +Priority: optional +Section: other +Maintainer: Joe Sixpack <joe@example.org> +Installed-Size: 43.0 kB +Provides: pkga$(generatelotsofnames) +Download-Size: unknown +APT-Sources: file:$APTARCHIVE unstable/main all Packages +Description: Some description + That has multiple lines +" apt show large +testsuccessequal "Package: large2 +Version: 1 +Priority: optional +Section: other +Maintainer: Joe Sixpack <joe@example.org> +Installed-Size: 43.0 kB +Provides: foobar, pkga$(generatelotsofnames) +Download-Size: unknown +APT-Sources: file:$APTARCHIVE unstable/main all Packages +Description: Some description + That has multiple lines +" apt show large2 + # this is the default, but disabled by the testcases testsuccess apt show foo -o Apt::Cmd::Disable-Script-Warning=0 cp rootdir/tmp/testsuccess.output aptshow.output diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog index 2a632d6db..15c3dd50f 100755 --- a/test/integration/test-apt-get-changelog +++ b/test/integration/test-apt-get-changelog @@ -18,8 +18,8 @@ setupaptarchive --no-update changetowebserver testsuccess aptget update -testsuccessequal "'http://metadata.ftp-master.debian.org/changelogs/main/f/foo/foo_1.0_changelog' foo.changelog -'http://metadata.ftp-master.debian.org/changelogs/main/libb/libbar/libbar_1.0_changelog' libbar.changelog" aptget changelog foo libbar --print-uris +testsuccessequal "'https://metadata.ftp-master.debian.org/changelogs/main/f/foo/foo_1.0_changelog' foo.changelog +'https://metadata.ftp-master.debian.org/changelogs/main/libb/libbar/libbar_1.0_changelog' libbar.changelog" aptget changelog foo libbar --print-uris releasechanger() { # modifying the Release files in lists… bad stuff. Good that this is only a test… diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key index 1e2c8362b..d690a9026 100755 --- a/test/integration/test-apt-key +++ b/test/integration/test-apt-key @@ -192,7 +192,7 @@ gpg: unchanged: 1' aptkey --fakeroot update ${TESTSTATE} aptkey --fakeroot add "${KEYDIR}/marvin paránöid.pub.${EXT}" testaptkeys 'Joe Sixpack' 'Marvin Paranoid' cp -a "${ROOTDIR}/etc/apt/trusted.gpg" "${KEYDIR}/testcase-multikey.pub.gpg" # store for reuse - gpg --no-default-keyring --keyring "${KEYDIR}/testcase-multikey.pub.gpg" --armor --export > "${KEYDIR}/testcase-multikey.pub.asc" + aptkey --keyring "${KEYDIR}/testcase-multikey.pub.gpg" export > "${KEYDIR}/testcase-multikey.pub.asc" msgtest 'Test key removal with' 'multi key in real file' cleanplate diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd index 57728ca81..4c19a7b00 100755 --- a/test/integration/test-apt-progress-fd +++ b/test/integration/test-apt-progress-fd @@ -10,7 +10,7 @@ configarchitecture 'amd64' 'i386' buildsimplenativepackage 'testing' 'amd64' '0.1' 'stable' buildsimplenativepackage 'testing' 'amd64' '0.8.15' 'stable' buildsimplenativepackage 'testing2' 'amd64,i386' '0.8.15' 'stable' -setupaptarchive +setupaptarchive # install native exec 3> apt-progress.log @@ -18,14 +18,13 @@ testsuccess aptget install testing=0.1 -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'dlstatus:1:0.0000:Retrieving file 1 of 1 dlstatus:1:100.0000:Retrieving file 1 of 1 pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing:0.0000:Installing testing (amd64) -pmstatus:testing:16.6667:Preparing testing (amd64) -pmstatus:testing:33.3333:Unpacking testing (amd64) -pmstatus:testing:50.0000:Preparing to configure testing (amd64) -pmstatus:dpkg-exec:50.0000:Running dpkg -pmstatus:testing:50.0000:Configuring testing (amd64) -pmstatus:testing:66.6667:Configuring testing (amd64) -pmstatus:testing:83.3333:Installed testing (amd64)' +pmstatus:testing:0.0000:Preparing testing (amd64) +pmstatus:testing:20.0000:Unpacking testing (amd64) +pmstatus:testing:40.0000:Installing testing (amd64) +pmstatus:dpkg-exec:40.0000:Running dpkg +pmstatus:testing:40.0000:Preparing to configure testing (amd64) +pmstatus:testing:60.0000:Configuring testing (amd64) +pmstatus:testing:80.0000:Installed testing (amd64)' # upgrade exec 3> apt-progress.log @@ -33,14 +32,13 @@ testsuccess aptget install testing=0.8.15 -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'dlstatus:1:0.0000:Retrieving file 1 of 1 dlstatus:1:100.0000:Retrieving file 1 of 1 pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing:0.0000:Installing testing (amd64) -pmstatus:testing:16.6667:Preparing testing (amd64) -pmstatus:testing:33.3333:Unpacking testing (amd64) -pmstatus:testing:50.0000:Preparing to configure testing (amd64) -pmstatus:dpkg-exec:50.0000:Running dpkg -pmstatus:testing:50.0000:Configuring testing (amd64) -pmstatus:testing:66.6667:Configuring testing (amd64) -pmstatus:testing:83.3333:Installed testing (amd64)' +pmstatus:testing:0.0000:Preparing testing (amd64) +pmstatus:testing:20.0000:Unpacking testing (amd64) +pmstatus:testing:40.0000:Installing testing (amd64) +pmstatus:dpkg-exec:40.0000:Running dpkg +pmstatus:testing:40.0000:Preparing to configure testing (amd64) +pmstatus:testing:60.0000:Configuring testing (amd64) +pmstatus:testing:80.0000:Installed testing (amd64)' # reinstall exec 3> apt-progress.log @@ -48,24 +46,22 @@ testsuccess aptget install testing=0.8.15 --reinstall -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'dlstatus:1:0.0000:Retrieving file 1 of 1 dlstatus:1:100.0000:Retrieving file 1 of 1 pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing:0.0000:Installing testing (amd64) -pmstatus:testing:16.6667:Preparing testing (amd64) -pmstatus:testing:33.3333:Unpacking testing (amd64) -pmstatus:testing:50.0000:Preparing to configure testing (amd64) -pmstatus:dpkg-exec:50.0000:Running dpkg -pmstatus:testing:50.0000:Configuring testing (amd64) -pmstatus:testing:66.6667:Configuring testing (amd64) -pmstatus:testing:83.3333:Installed testing (amd64)' +pmstatus:testing:0.0000:Preparing testing (amd64) +pmstatus:testing:20.0000:Unpacking testing (amd64) +pmstatus:testing:40.0000:Installing testing (amd64) +pmstatus:dpkg-exec:40.0000:Running dpkg +pmstatus:testing:40.0000:Preparing to configure testing (amd64) +pmstatus:testing:60.0000:Configuring testing (amd64) +pmstatus:testing:80.0000:Installed testing (amd64)' # and remove exec 3> apt-progress.log testsuccess aptget remove testing -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing:0.0000:Removing testing (amd64) -pmstatus:testing:25.0000:Preparing for removal of testing (amd64) -pmstatus:testing:50.0000:Removing testing (amd64) -pmstatus:testing:75.0000:Removed testing (amd64) -pmstatus:dpkg-exec:75.0000:Running dpkg' +pmstatus:testing:0.0000:Preparing for removal of testing (amd64) +pmstatus:testing:33.3333:Removing testing (amd64) +pmstatus:testing:66.6667:Removing testing (amd64) +pmstatus:dpkg-exec:66.6667:Running dpkg' # install non-native and ensure we get proper progress info exec 3> apt-progress.log @@ -73,13 +69,12 @@ testsuccess aptget install testing2:i386 -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'dlstatus:1:0.0000:Retrieving file 1 of 1 dlstatus:1:100.0000:Retrieving file 1 of 1 pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing2:0.0000:Installing testing2 (i386) -pmstatus:testing2:16.6667:Preparing testing2 (i386) -pmstatus:testing2:33.3333:Unpacking testing2 (i386) -pmstatus:testing2:50.0000:Preparing to configure testing2 (i386) -pmstatus:dpkg-exec:50.0000:Running dpkg -pmstatus:testing2:50.0000:Configuring testing2 (i386) -pmstatus:testing2:66.6667:Configuring testing2 (i386) -pmstatus:testing2:83.3333:Installed testing2 (i386)' +pmstatus:testing2:0.0000:Preparing testing2 (i386) +pmstatus:testing2:20.0000:Unpacking testing2 (i386) +pmstatus:testing2:40.0000:Installing testing2 (i386) +pmstatus:dpkg-exec:40.0000:Running dpkg +pmstatus:testing2:40.0000:Preparing to configure testing2 (i386) +pmstatus:testing2:60.0000:Configuring testing2 (i386) +pmstatus:testing2:80.0000:Installed testing2 (i386)' rm -f apt-progress*.log diff --git a/test/integration/test-apt-progress-fd-deb822 b/test/integration/test-apt-progress-fd-deb822 index d9a4505d1..dd66e28a9 100755 --- a/test/integration/test-apt-progress-fd-deb822 +++ b/test/integration/test-apt-progress-fd-deb822 @@ -10,7 +10,7 @@ configarchitecture 'amd64' 'i386' buildsimplenativepackage 'testing' 'amd64' '0.1' 'stable' buildsimplenativepackage 'testing' 'all' '0.8.15' 'stable' buildsimplenativepackage 'testing2' 'amd64,i386' '0.8.15' 'stable' -setupaptarchive +setupaptarchive # install native exec 3> apt-progress.log @@ -23,40 +23,35 @@ Message: Running dpkg Status: progress Package: testing:amd64 Percent: 0.0000 -Message: Installing testing (amd64) - -Status: progress -Package: testing:amd64 -Percent: 16.6667 Message: Preparing testing (amd64) Status: progress Package: testing:amd64 -Percent: 33.3333 +Percent: 20.0000 Message: Unpacking testing (amd64) Status: progress Package: testing:amd64 -Percent: 50.0000 -Message: Preparing to configure testing (amd64) +Percent: 40.0000 +Message: Installing testing (amd64) Status: progress -Percent: 50.0000 +Percent: 40.0000 Message: Running dpkg Status: progress Package: testing:amd64 -Percent: 50.0000 -Message: Configuring testing (amd64) +Percent: 40.0000 +Message: Preparing to configure testing (amd64) Status: progress Package: testing:amd64 -Percent: 66.6667 +Percent: 60.0000 Message: Configuring testing (amd64) Status: progress Package: testing:amd64 -Percent: 83.3333 +Percent: 80.0000 Message: Installed testing (amd64) ' diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error index 4439c042a..39c1053a1 100755 --- a/test/integration/test-apt-progress-fd-error +++ b/test/integration/test-apt-progress-fd-error @@ -18,8 +18,8 @@ setupaptarchive exec 3> apt-progress.log testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3 -msgtest 'Ensure correct error message' -testsuccess --nomsg grep "foo2_0.8.15_[^.]\+.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log +msgtest 'Ensure correct error message' 'file-conflict' +testsuccess --nomsg grep "foo2_0.8.15_[^.]\+.deb:[0-9.]\+:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log testsuccess test -s rootdir/var/crash/foo2.0.crash testsuccess grep '^Package: foo2 0.8.15$' rootdir/var/crash/foo2.0.crash diff --git a/test/integration/test-bug-624218-Translation-file-handling b/test/integration/test-bug-624218-Translation-file-handling index b629dd665..c116278ee 100755 --- a/test/integration/test-bug-624218-Translation-file-handling +++ b/test/integration/test-bug-624218-Translation-file-handling @@ -6,24 +6,78 @@ TESTDIR="$(readlink -f "$(dirname "$0")")" setupenvironment configarchitecture 'i386' -buildsimplenativepackage 'coolstuff' 'all' '1.0' 'unstable' +insertpackage 'unstable' 'unrelated' 'i386' '1' +insertpackage 'unstable' 'ancientstuff' 'all' '1' +insertpackage 'unstable' 'boringstuff' 'all' '1' '' '' 'shared short description' +insertpackage 'unstable' 'coolstuff' 'all' '1' +insertpackage 'unstable' 'dullstuff' 'all' '1' '' '' 'shared short description' +insertpackage 'unstable' 'evilstuff' 'all' '1' +insertpackage 'unstable' 'foostuff' 'all' '1' '' '' 'shared short description' +insertpackage 'unstable' 'goodstuff' 'all' '1' +insertpackage 'unstable' "longdesc" 'all' '1' '' '' "$(for i in $(seq 0 100); do printf '%s' 'lorem ipsum '; done)" setupaptarchive --no-update - changetowebserver + +testsuccess aptget update +PKGORDER='coolstuff foostuff coolstuff foostuff' +msgtest 'Prepare expectation for' 'aptcache show' +if aptcache show $PKGORDER | grep -v '^ ' > aptcacheshow.out 2>&1; then + msgpass +else + cat aptcacheshow.out || true + msgfail +fi +testsuccessequal '4' grep -c '^Package: ' aptcacheshow.out +msgtest 'Prepare expectation for' 'apt show' +if apt show $PKGORDER | grep -v -e '^ ' -e '^[A-Z][a-z]\+-Size: ' > aptshow.out 2>&1; then + msgpass +else + cat aptshow.out || true + msgfail +fi +testsuccessequal '4' grep -c '^Package: ' aptshow.out rm -rf rootdir/var/lib/apt/lists +checkaptshow() { + testsuccess aptcache show $PKGORDER + sed -i -e 's#^Description: #Description-en: #' rootdir/tmp/testsuccess.output + testequal "$(cat aptcacheshow.out) +" grep -v '^ ' rootdir/tmp/testsuccess.output + + testsuccess apt show $PKGORDER + sed -i -e 's#^Description-en: #Description: #' rootdir/tmp/testsuccess.output + testequal "$(cat aptshow.out) +" grep -v -e '^ ' -e '^[A-Z][a-z]\+-Size: ' rootdir/tmp/testsuccess.output + + if [ -n "$(ls rootdir/var/lib/apt/lists/*Translation* 2>/dev/null)" ]; then + testsuccess find rootdir/var/lib/apt/lists/ -name '*Translation*' -delete + + testsuccess aptcache show $PKGORDER + sed -i -e 's#^Description: #Description-en: #' rootdir/tmp/testsuccess.output + testequal "$(cat aptcacheshow.out) +" grep -v '^ ' rootdir/tmp/testsuccess.output + + testsuccess apt show $PKGORDER + sed -i -e 's#^Description-en: #Description: #' rootdir/tmp/testsuccess.output + testequal "$(cat aptshow.out) +" grep -v -e '^ ' -e '^[A-Z][a-z]\+-Size: ' rootdir/tmp/testsuccess.output + fi +} + translationslisted() { msgtest 'No download of non-existent locals' "$1" export LC_ALL="" testsuccess --nomsg aptget update -o Acquire::Languages=en testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testsuccess.output + checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download of existent locals' "$1" testsuccess --nomsg aptget update cp rootdir/tmp/testsuccess.output testsuccess.output testsuccess grep -q -e 'Translation-en ' testsuccess.output + checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download of en in LC_ALL=C' "$1" @@ -31,6 +85,7 @@ translationslisted() { testsuccess --nomsg aptget update cp rootdir/tmp/testsuccess.output testsuccess.output testsuccess grep -q -e 'Translation-en ' testsuccess.output + checkaptshow rm -rf rootdir/var/lib/apt/lists unset LC_ALL @@ -38,21 +93,25 @@ translationslisted() { testsuccess --nomsg aptget update -o Acquire::Languages=en cp rootdir/tmp/testsuccess.output testsuccess.output testsuccess grep -q -e 'Translation-en ' testsuccess.output + checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download of nothing else in forced language' "$1" testsuccess --nomsg aptget update -o Acquire::Languages=en testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testsuccess.output + checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download no Translation- if forced language is non-existent' "$1" testsuccess --nomsg aptget update -o Acquire::Languages=ast_DE testfailure grep -q -e 'Translation-' rootdir/tmp/testsuccess.output + checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download of nothing if none is forced' "$1" testsuccess --nomsg aptget update -o Acquire::Languages=none testfailure grep -q -e 'Translation' rootdir/tmp/testsuccess.output + checkaptshow rm -rf rootdir/var/lib/apt/lists } @@ -66,26 +125,31 @@ echo 'Acquire::AllowInsecureRepositories "true";' > rootdir/etc/apt/apt.conf.d/ msgtest 'Download of en as forced language' 'without Index' testwarning --nomsg aptget update -o Acquire::Languages=en testsuccess grep -q -e 'Translation-en ' rootdir/tmp/testwarning.output +checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download of nothing else in forced language' 'without Index' testwarning --nomsg aptget update -o Acquire::Languages=en testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testwarning.output +checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download of ast_DE as forced language' 'without Index' testwarning --nomsg aptget update -o Acquire::Languages=ast_DE testsuccess grep -q -e 'Translation-ast_DE$' rootdir/tmp/testwarning.output +checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download of nothing else in forced language' 'without Index' testwarning --nomsg aptget update -o Acquire::Languages=ast_DE testfailure grep -q -e 'Translation-[^a][^s]' rootdir/tmp/testwarning.output +checkaptshow rm -rf rootdir/var/lib/apt/lists msgtest 'Download of nothing if none is forced' 'without Index' testwarning --nomsg aptget update -o Acquire::Languages=none testfailure grep -q -e 'Translation' rootdir/tmp/testwarning.output +checkaptshow rm -rf rootdir/var/lib/apt/lists mkdir -p rootdir/var/lib/apt/lists @@ -94,6 +158,7 @@ touch rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstable_main_i18 msgtest 'Download of builtin files' 'without Index' testwarning --nomsg aptget update testsuccess grep -q -e 'Translation-ast_DE' rootdir/tmp/testwarning.output +checkaptshow rm -rf rootdir/var/lib/apt/lists mkdir -p rootdir/var/lib/apt/lists @@ -102,4 +167,5 @@ touch rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstable_main_i18 msgtest 'Download of nothing (even builtin) if none is forced' 'without Index' testwarning --nomsg aptget update -o Acquire::Languages=none testfailure grep -q -e 'Translation' rootdir/tmp/testwarning.output +checkaptshow rm -rf rootdir/var/lib/apt/lists diff --git a/test/integration/test-bug-722207-print-uris-even-if-very-quiet b/test/integration/test-bug-722207-print-uris-even-if-very-quiet index 82c1d715f..8d17507cb 100755 --- a/test/integration/test-bug-722207-print-uris-even-if-very-quiet +++ b/test/integration/test-bug-722207-print-uris-even-if-very-quiet @@ -23,7 +23,7 @@ testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.d testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 SHA256:0000000000000000000000000000000000000000000000000000000000000000" aptget download apt -qq --print-uris testsuccessequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 9 SHA256:7776436a6d741497f1cd958014e1a05b352224231428152aae39da3c17fd2fd4 'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 12 SHA256:f57f565eabe3fde0ec6e6e0bcc8db1d86fe2b4d6344a380a23520ddbb7728e99" aptget source apt -qq --print-uris -testsuccessequal "'http://metadata.ftp-master.debian.org/changelogs/main/a/apt/apt_2_changelog' apt.changelog" aptget changelog apt -qq --print-uris +testsuccessequal "'https://metadata.ftp-master.debian.org/changelogs/main/a/apt/apt_2_changelog' apt.changelog" aptget changelog apt -qq --print-uris testsuccessequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 9 SHA256:7776436a6d741497f1cd958014e1a05b352224231428152aae39da3c17fd2fd4 'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 12 SHA256:f57f565eabe3fde0ec6e6e0bcc8db1d86fe2b4d6344a380a23520ddbb7728e99 diff --git a/test/integration/test-cve-2018-0501-mirror-alternatives b/test/integration/test-cve-2018-0501-mirror-alternatives new file mode 100755 index 000000000..f15454765 --- /dev/null +++ b/test/integration/test-cve-2018-0501-mirror-alternatives @@ -0,0 +1,31 @@ +#!/bin/sh +set -e +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" + +setupenvironment +configarchitecture "i386" + +buildsimplenativepackage 'foo' 'all' '1' 'stable' +setupaptarchive --no-update +changetohttpswebserver + +# User has mirror method configured in apt >= 1.6~alpha6 & +# Eve has enough MITM control over the network to +# a) have the mirror file include at least two mirrors and +# b) can send her bad InRelease files for both mirrors +sed -i -e 's# https:# mirror+https:#' -e 's#/ stable#/mirror.txt stable#' rootdir/etc/apt/sources.list.d/*-stable-* +echo "http://localhost:${APTHTTPPORT} +https://localhost:${APTHTTPSPORT}" > aptarchive/mirror.txt + +# real Eve would do something worse… +sed -i "/^Date: / a\ +Evil: yes" $(find ./aptarchive -name 'Release' -o -name 'InRelease') + +# progress display shows that the InRelease file was bad, +# but it is used anyhow as the bad file causes a fallback to +# a request to the second mirror which completes successful +# causing apt to believe the verify completed successfully… +testfailure apt update +testfailure grep '^Evil:' rootdir/var/lib/apt/lists/*Release +testfailure apt show foo diff --git a/test/integration/test-frontend-lock b/test/integration/test-frontend-lock new file mode 100755 index 000000000..939344afc --- /dev/null +++ b/test/integration/test-frontend-lock @@ -0,0 +1,80 @@ +#!/bin/sh +set -e + +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" + +setupenvironment +configarchitecture 'i386' + +insertinstalledpackage 'package1' 'i386' '1.0' +insertinstalledpackage 'package2' 'i386' '1.0' +insertinstalledpackage 'package3' 'i386' '1.0' +insertinstalledpackage 'package4' 'i386' '1.0' +insertinstalledpackage 'package5' 'i386' '1.0' +insertinstalledpackage 'package6' 'i386' '1.0' +buildsimplenativepackage 'foo' 'all' '1' + +setupaptarchive + +buildsimplenativepackage 'bar' 'all' '1' + + +# Checks that the correct variable is set +msgmsg 'Post-Invoke script has DPKG_FRONTEND_LOCKED set' +testsuccess aptget -q -y -o Dpkg::Post-Invoke::="echo DPKG_FRONTEND_LOCKED=\$DPKG_FRONTEND_LOCKED" remove package1 +cp rootdir/tmp/testsuccess.output install.output +testsuccess grep DPKG_FRONTEND_LOCKED=true install.output + +msgmsg 'Pre-Invoke script has DPKG_FRONTEND_LOCKED set' +testsuccess aptget -q -y -o Dpkg::Pre-Invoke::="echo DPKG_FRONTEND_LOCKED=\$DPKG_FRONTEND_LOCKED" remove package2 +cp rootdir/tmp/testsuccess.output install.output +testsuccess grep DPKG_FRONTEND_LOCKED=true install.output + +msgmsg 'Pre-Install-Pkgs script has DPKG_FRONTEND_LOCKED set' +testsuccess aptget -q -y -o DPkg::Pre-Install-Pkgs::="echo DPKG_FRONTEND_LOCKED=\$DPKG_FRONTEND_LOCKED" remove package3 +cp rootdir/tmp/testsuccess.output install.output +testsuccess grep DPKG_FRONTEND_LOCKED=true install.output + + +# Check that the frontend lock is hold by apt-get +msgmsg 'Post-Invoke script runs while frontend is locked' +testfailure aptget -q -y -o Dpkg::Post-Invoke::="apt-get remove" remove package4 +cp rootdir/tmp/testfailure.output install.output +testsuccess grep "E: Unable to acquire the dpkg frontend lock (${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/lock-frontend), is another process using it?" install.output +testsuccess grep "E: Problem executing scripts DPkg::Post-Invoke 'apt-get remove'" install.output + +msgmsg 'Pre-Invoke script runs while frontend is locked' +testfailure aptget -q -y -o Dpkg::Pre-Invoke::="apt-get remove" remove package5 +cp rootdir/tmp/testfailure.output install.output +testsuccess grep "E: Unable to acquire the dpkg frontend lock (${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/lock-frontend), is another process using it?" install.output +testsuccess grep "E: Problem executing scripts DPkg::Pre-Invoke 'apt-get remove'" install.output + +msgmsg 'Pre-Install-Pkgs runs while frontend is locked' +testfailure aptget -q -y -o DPkg::Pre-Install-Pkgs::="apt-get remove" remove package6 +cp rootdir/tmp/testfailure.output install.output +testsuccess grep "E: Unable to acquire the dpkg frontend lock (${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/lock-frontend), is another process using it?" install.output +testsuccess grep "E: Sub-process apt-get remove returned an error code (100)" install.output +testsuccess grep "Failure running script apt-get remove" install.output + + +# Applied test case from DonKult +msgmsg 'Applied case of frontend locking' +cat > ./post-invoke <<EOF +#!/bin/sh +set -e +#export DPKG_FRONTEND_LOCKED=true +${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg -i ${TMPWORKINGDIRECTORY}/incoming/bar_1_all.deb +EOF +chmod +x ./post-invoke +echo "dpkg::post-invoke:: \"${TMPWORKINGDIRECTORY}/post-invoke\";" > rootdir/etc/apt/apt.conf.d/01dpkgpostinvoke + +testdpkgnotinstalled 'foo' 'bar' +testsuccess apt show foo +testfailure apt show bar + +testsuccess apt install foo -s +testdpkgnotinstalled 'foo' 'bar' + +testsuccess apt install foo +testdpkginstalled 'foo' 'bar' diff --git a/test/integration/test-method-gpgv b/test/integration/test-method-gpgv index 86559b7cb..5e00b1f13 100755 --- a/test/integration/test-method-gpgv +++ b/test/integration/test-method-gpgv @@ -40,6 +40,20 @@ testrun() { testgpgv 'Good signed with fingerprint' 'Good: GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE,' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> [GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 11 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' + testgpgv 'Untrusted signed with long keyid' 'Worthless: 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE,' '[GNUPG:] GOODSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> +[GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 1 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' + testsuccess grep '^\s\+Good:\s\+$' method.output + testgpgv 'Untrusted signed with fingerprint' 'Worthless: 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE,' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> +[GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 1 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' + testsuccess grep '^\s\+Good:\s\+$' method.output + + testgpgv 'Weak signed with long keyid' 'Good: GOODSIG 5A90D141DBAC8DAE,' '[GNUPG:] GOODSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> +[GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 2 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' + testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak digest algorithm (SHA1)$' method.output + testgpgv 'Weak signed with fingerprint' 'Good: GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE,' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> +[GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 2 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' + testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak digest algorithm (SHA1)$' method.output + testgpgv 'No Pubkey with long keyid' 'NoPubKey: NO_PUBKEY E8525D47528144E2,' '[GNUPG:] ERRSIG E8525D47528144E2 1 11 00 1472744666 9 [GNUPG:] NO_PUBKEY E8525D47528144E2' testgpgv 'No Pubkey with fingerprint' 'NoPubKey: NO_PUBKEY DE66AECA9151AFA1877EC31DE8525D47528144E2,' '[GNUPG:] ERRSIG DE66AECA9151AFA1877EC31DE8525D47528144E2 1 11 00 1472744666 9 @@ -55,6 +69,7 @@ gpgvmethod() { echo '601 Configuration Config-Item: Debug::Acquire::gpgv=1 Config-Item: Dir::Bin::apt-key=./faked-apt-key +Config-Item: APT::Hashes::SHA1::Weak=true 600 URI Acquire URI: file:///dev/null @@ -67,6 +82,7 @@ gpgvmethod() { echo '601 Configuration Config-Item: Debug::Acquire::gpgv=1 Config-Item: Dir::Bin::apt-key=./faked-apt-key +Config-Item: APT::Hashes::SHA1::Weak=true 600 URI Acquire URI: file:///dev/null @@ -75,3 +91,12 @@ Signed-By: 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE ' | runapt "${METHODSDIR}/gpgv" } testrun + +testgpgv 'Good signed with long keyid but not signed-by key' 'NoPubKey: GOODSIG 4BC0A39C27CE74F9,' '[GNUPG:] GOODSIG 4BC0A39C27CE74F9 Rex Expired <rex@example.org> +[GNUPG:] VALIDSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 2016-09-01 1472742625 0 4 0 1 11 00 891CC50E605796A0C6E733F74BC0A39C27CE74F9' +testsuccess grep '^\s\+Good:\s\+$' method.output +testsuccess grep 'verified because the public key is not available: GOODSIG' method.output +testgpgv 'Good signed with fingerprint' 'NoPubKey: GOODSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9,' '[GNUPG:] GOODSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 Rex Expired <rex@example.org> +[GNUPG:] VALIDSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 2016-09-01 1472742625 0 4 0 1 11 00 891CC50E605796A0C6E733F74BC0A39C27CE74F9' +testsuccess grep '^\s\+Good:\s\+$' method.output +testsuccess grep 'verified because the public key is not available: GOODSIG' method.output diff --git a/test/integration/test-method-mirror b/test/integration/test-method-mirror index 38d6be9a9..56c9a10a0 100755 --- a/test/integration/test-method-mirror +++ b/test/integration/test-method-mirror @@ -196,6 +196,7 @@ msgmsg 'The prefix for the mirrorlist is' 'passed on' echo 'Dir::Bin::Methods::foo+mirror+file "mirror"; Dir::Bin::Methods::foo+mirror+http "mirror"; Dir::Bin::Methods::foo+http "http"; +Dir::Bin::Methods::foo+https "https"; ' > rootdir/etc/apt/apt.conf.d/99add-foo-method echo "http://localhost:${APTHTTPPORT}/redirectme " > aptarchive/mirror.txt @@ -241,3 +242,14 @@ Building dependency tree... Reading state information... All packages are up to date." apt update testrundownload 'foo=2' + +echo "https://localhost:${APTHTTPSPORT}/ +http://localhost:${APTHTTPPORT}/redirectme" > aptarchive/mirror.txt +rm -rf rootdir/var/lib/apt/lists +sed -i -e "s# foo+# [signed-by=$(readlink -f ./keys/joesixpack.pub)] foo+#g" rootdir/etc/apt/sources.list.d/apt-test-unstable-deb* +testsuccess apt update +testrundownload 'foo=2' + +rm -rf rootdir/var/lib/apt/lists +sed -i -e "s# \[signed-by=[^]]\+\] foo+# [signed-by=$(readlink -f ./keys/marvinparanoid.pub)] foo+#g" rootdir/etc/apt/sources.list.d/apt-test-unstable-deb* +testfailure apt update diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts index 747af69ff..85b3d0ee1 100755 --- a/test/integration/test-no-fds-leaked-to-maintainer-scripts +++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts @@ -55,7 +55,15 @@ checkinstall() { tail -n +3 rootdir/var/log/apt/term.log | head -n -1 > terminal.log testfileequal 'terminal.log' "$(cat terminal.output)" - testequal "startup archives unpack + testequalor2 "startup archives unpack +install $PKGNAME <none> 1.0 +status half-installed $PKGNAME 1.0 +status unpacked $PKGNAME 1.0 +startup packages configure +configure $PKGNAME 1.0 <none> +status unpacked $PKGNAME 1.0 +status half-configured $PKGNAME 1.0 +status installed $PKGNAME 1.0" "startup archives unpack install $PKGNAME <none> 1.0 status half-installed $PKGNAME 1.0 status unpacked $PKGNAME 1.0 @@ -78,7 +86,18 @@ checkpurge() { testfileequal 'terminal.log' "$(cat terminal.output)" if dpkg --compare-versions "$(dpkg_version)" 'ge' '1.18.11'; then - testequal "startup packages remove + testequalor2 "startup packages remove +status installed $PKGNAME 1.0 +remove $PKGNAME 1.0 <none> +status half-configured $PKGNAME 1.0 +status half-installed $PKGNAME 1.0 +status config-files $PKGNAME 1.0 +startup packages configure +startup packages purge +purge $PKGNAME 1.0 <none> +status config-files $PKGNAME 1.0 +status not-installed $PKGNAME <none> +startup packages configure" "startup packages remove status installed $PKGNAME 1.0 remove $PKGNAME 1.0 <none> status half-configured $PKGNAME 1.0 @@ -96,7 +115,19 @@ status config-files $PKGNAME 1.0 status not-installed $PKGNAME <none> startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log else - testequal "startup packages remove + testequalor2 "startup packages remove +status installed $PKGNAME 1.0 +remove $PKGNAME 1.0 <none> +status half-configured $PKGNAME 1.0 +status half-installed $PKGNAME 1.0 +status config-files $PKGNAME 1.0 +startup packages configure +startup packages purge +remove $PKGNAME 1.0 <none> +purge $PKGNAME 1.0 <none> +status config-files $PKGNAME 1.0 +status not-installed $PKGNAME <none> +startup packages configure" "startup packages remove status installed $PKGNAME 1.0 remove $PKGNAME 1.0 <none> status half-configured $PKGNAME 1.0 diff --git a/test/integration/test-sourceslist-target-plusminus-options b/test/integration/test-sourceslist-target-plusminus-options index e4ce8e282..5c79af2d9 100755 --- a/test/integration/test-sourceslist-target-plusminus-options +++ b/test/integration/test-sourceslist-target-plusminus-options @@ -122,3 +122,7 @@ testtargets 'explicit + activate' 'Packages' 'Contents' 'Contents2' echo 'deb [Contents=yes,target+=Contents] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list testtargets 'duplications are okay' 'Packages' 'Translations' 'Contents' 'Contents2' + +# we can't check if it really reorders here +echo 'deb [target+=Contents2,Contents] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testtargets 'reordered fallback order' 'Packages' 'Translations' 'Contents' 'Contents2' diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index 4bc344178..461484f6e 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -956,6 +956,7 @@ int main(int const argc, const char * argv[]) _config->CndSet("aptwebserver::response-header::Server", "APT webserver"); _config->CndSet("aptwebserver::response-header::Accept-Ranges", "bytes"); _config->CndSet("aptwebserver::directoryindex", "index.html"); + APT::Configuration::getCompressors(); size_t id = 0; while (true) diff --git a/test/libapt/CMakeLists.txt b/test/libapt/CMakeLists.txt index cc1d024f8..035ff07b1 100644 --- a/test/libapt/CMakeLists.txt +++ b/test/libapt/CMakeLists.txt @@ -1,3 +1,4 @@ +set(PROJECT_TEST_LIBRARIES apt-private apt-inst) find_path(GTEST_ROOT src/gtest.cc /usr/src/googletest/googletest /usr/src/gtest @@ -31,13 +32,13 @@ if(GTEST_FOUND) # is expanded at CMake time, so you have to rerun cmake if you add or remove # a file (you can just run cmake . in the build directory) file(GLOB files gtest_runner.cc *-helpers.cc *_test.cc) - add_executable(libapt_test ${files}) - target_include_directories(libapt_test PRIVATE ${GTEST_INCLUDE_DIRS}) - target_link_libraries(libapt_test ${GTEST_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} apt-private apt-inst) + add_executable(lib${PROJECT_NAME}_test ${files}) + target_include_directories(lib${PROJECT_NAME}_test PRIVATE ${GTEST_INCLUDE_DIRS}) + target_link_libraries(lib${PROJECT_NAME}_test ${GTEST_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${PROJECT_TEST_LIBRARIES}) if (GTEST_DEPENDENCIES) - add_dependencies(libapt_test ${GTEST_DEPENDENCIES}) + add_dependencies(lib${PROJECT_NAME}_test ${GTEST_DEPENDENCIES}) endif() - add_test(NAME AptTests - COMMAND libapt_test + add_test(NAME ${PROJECT_NAME}Tests + COMMAND lib${PROJECT_NAME}_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endif() |